mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #4410 from gabrielbazan7/fix/iosModalDelay
change all modals nav header with ionic header to fix ios delay
This commit is contained in:
commit
74a6a98529
|
@ -1,29 +1,23 @@
|
||||||
<ion-modal-view ng-controller="addressbookController as addressbookC">
|
<ion-modal-view ng-controller="addressbookController as addressbookC">
|
||||||
<div ng-init="wallets[0] ? selectedWalletsOpt = true : selectedWalletsOpt = false; checkClipboard()">
|
<div ng-init="wallets[0] ? selectedWalletsOpt = true : selectedWalletsOpt = false; checkClipboard()">
|
||||||
<ion-content ng-style="{'background-color': '#f6f7f9'}" overflow-scroll="true">
|
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||||
<nav class="tab-bar" ng-style="{'background-color':color}">
|
<div class="left-small">
|
||||||
<section class="left-small">
|
|
||||||
<a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancelAddress()" class="p10">
|
<a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancelAddress()" class="p10">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
|
<h1 class="title ellipsis" translate>{{walletName}}</h1>
|
||||||
<section class="middle tab-bar-section">
|
<div class="right-small" ng-show="!selectedWalletsOpt && !isEmptyList" ng-click="toggleEditAddressbook()">
|
||||||
<h1 class="title ellipsis">
|
|
||||||
{{walletName}}
|
|
||||||
</h1>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="right-small" ng-show="!selectedWalletsOpt && !isEmptyList" ng-click="toggleEditAddressbook()">
|
|
||||||
<a ng-show="!editAddressbook && !addAddressbookEntry" href class="p10">
|
<a ng-show="!editAddressbook && !addAddressbookEntry" href class="p10">
|
||||||
<span class="text-close" translate>Edit</span>
|
<span class="text-close" translate>Edit</span>
|
||||||
</a>
|
</a>
|
||||||
<a ng-show="editAddressbook && !addAddressbookEntry" href class="p10">
|
<a ng-show="editAddressbook && !addAddressbookEntry" href class="p10">
|
||||||
<span class="text-close" translate>Done</span>
|
<span class="text-close" translate>Done</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
</nav>
|
</ion-header-bar>
|
||||||
|
|
||||||
|
<ion-content ng-style="{'background-color': '#f6f7f9'}" overflow-scroll="true">
|
||||||
<div class="modal-content p20b">
|
<div class="modal-content p20b">
|
||||||
<div class="create-tab small-only-text-center" ng-show="!editAddressbook && !addAddressbookEntry">
|
<div class="create-tab small-only-text-center" ng-show="!editAddressbook && !addAddressbookEntry">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
|
@ -1,17 +1,13 @@
|
||||||
<ion-modal-view ng-controller="coinbaseTxDetailsController">
|
<ion-modal-view ng-controller="coinbaseTxDetailsController">
|
||||||
<nav class="tab-bar" ng-style="{'background-color': '#2b71b1'}">
|
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color': '#2b71b1'}">
|
||||||
<section class="left-small">
|
<div class="left-small">
|
||||||
<a ng-click="cancel()">
|
<a ng-click="cancel()">
|
||||||
<i class="icon-arrow-left3 icon-back"></i>
|
<i class="icon-arrow-left3 icon-back"></i>
|
||||||
<span class="text-back">Back</span>
|
<span class="text-back">Back</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
<section class="middle tab-bar-section">
|
<h1 class="title ellipsis" translate>Details</h1>
|
||||||
<h1 class="title ellipsis">
|
</ion-header-bar>
|
||||||
Details
|
|
||||||
</h1>
|
|
||||||
</section>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<ion-content overflow-scroll="true">
|
<ion-content overflow-scroll="true">
|
||||||
<div class="modal-content fix-modals-touch">
|
<div class="modal-content fix-modals-touch">
|
||||||
|
|
|
@ -1,17 +1,14 @@
|
||||||
<ion-modal-view ng-controller="customAmountController">
|
<ion-modal-view ng-controller="customAmountController">
|
||||||
<ion-content overflow-scroll="true">
|
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||||
<nav class="tab-bar" ng-style="{'background-color':color}">
|
<div class="left-small">
|
||||||
<section class="left-small">
|
|
||||||
<a ng-click="cancel()" class="p10">
|
<a ng-click="cancel()" class="p10">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
|
|
||||||
<section class="middle tab-bar-section">
|
|
||||||
<h1 class="title ellipsis" translate>Request a specific amount</h1>
|
<h1 class="title ellipsis" translate>Request a specific amount</h1>
|
||||||
</section>
|
</ion-header-bar>
|
||||||
</nav>
|
|
||||||
|
|
||||||
|
<ion-content overflow-scroll="true" ng-style="{'background-color': '#f6f7f9'}">
|
||||||
<div class="modal-content fix-modals-touch">
|
<div class="modal-content fix-modals-touch">
|
||||||
<div class="m20b" ng-show="customizedAmountBtc">
|
<div class="m20b" ng-show="customizedAmountBtc">
|
||||||
<h4 class="title m0" translate>QR Code</h4>
|
<h4 class="title m0" translate>QR Code</h4>
|
||||||
|
|
|
@ -1,17 +1,13 @@
|
||||||
<ion-modal-view ng-controller="glideraTxDetailsController">
|
<ion-modal-view ng-controller="glideraTxDetailsController">
|
||||||
<nav class="tab-bar">
|
<ion-header-bar align-title="center" class="tab-bar">
|
||||||
<section class="left-small">
|
<div class="left-small">
|
||||||
<a ng-click="cancel()">
|
<a ng-click="cancel()">
|
||||||
<i class="icon-arrow-left3 icon-back"></i>
|
<i class="icon-arrow-left3 icon-back"></i>
|
||||||
<span class="text-back">Back</span>
|
<span class="text-back">Back</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
<section class="middle tab-bar-section">
|
<h1 class="title ellipsis" translate>Details</h1>
|
||||||
<h1 class="title ellipsis">
|
</ion-header-bar>
|
||||||
Details
|
|
||||||
</h1>
|
|
||||||
</section>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<ion-content overflow-scroll="true">
|
<ion-content overflow-scroll="true">
|
||||||
<div class="modal-content fix-modals-touch">
|
<div class="modal-content fix-modals-touch">
|
||||||
|
|
|
@ -1,15 +1,12 @@
|
||||||
<ion-modal-view ng-controller="payproController as payproC">
|
<ion-modal-view ng-controller="payproController as payproC">
|
||||||
<nav class="tab-bar" ng-style="{'background-color':color}">
|
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||||
<section class="left-small">
|
<div class="left-small">
|
||||||
<a ng-click="cancel()" class="p10">
|
<a ng-click="cancel()" class="p10">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
|
<h1 class="title ellipsis" translate>Payment request</h1>
|
||||||
<section class="middle tab-bar-section">
|
</ion-header-bar>
|
||||||
<h1 class="title" translate>Payment request</h1>
|
|
||||||
</section>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
|
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
|
|
|
@ -1,17 +1,14 @@
|
||||||
<ion-modal-view ng-controller="searchController">
|
<ion-modal-view ng-controller="searchController">
|
||||||
<ion-content overflow-scroll="true">
|
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||||
<nav class="tab-bar" ng-style="{'background-color':color}">
|
<div class="left-small">
|
||||||
<section class="left-small">
|
|
||||||
<a ng-click="cancel(); index.cancelSearch()" class="p10">
|
<a ng-click="cancel(); index.cancelSearch()" class="p10">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
|
|
||||||
<section class="middle tab-bar-section">
|
|
||||||
<h1 class="title ellipsis" translate>Search Transactions</h1>
|
<h1 class="title ellipsis" translate>Search Transactions</h1>
|
||||||
</section>
|
</ion-header-bar>
|
||||||
</nav>
|
|
||||||
|
|
||||||
|
<ion-content overflow-scroll="true">
|
||||||
<div class="row searchBar searchLabel">
|
<div class="row searchBar searchLabel">
|
||||||
<i class="fi-magnifying-glass size-14"></i>
|
<i class="fi-magnifying-glass size-14"></i>
|
||||||
<form>
|
<form>
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
<ion-modal-view ng-controller="txDetailsController">
|
<ion-modal-view ng-controller="txDetailsController">
|
||||||
<nav class="tab-bar" ng-style="{'background-color':color}">
|
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||||
<section class="left-small">
|
<div class="left-small">
|
||||||
<a ng-click="cancel()" class="p10">
|
<a ng-click="cancel()" class="p10">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
<section class="middle tab-bar-section">
|
|
||||||
<h1 class="title ellipsis" translate>Transaction</h1>
|
<h1 class="title ellipsis" translate>Transaction</h1>
|
||||||
</section>
|
</ion-header-bar>
|
||||||
</nav>
|
|
||||||
|
|
||||||
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
|
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
|
|
|
@ -1,15 +1,12 @@
|
||||||
<ion-modal-view ng-controller="txpDetailsController">
|
<ion-modal-view ng-controller="txpDetailsController">
|
||||||
<nav class="tab-bar" ng-style="{'background-color':color}">
|
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||||
<section class="left-small">
|
<div class="left-small">
|
||||||
<a ng-click="cancel()" class="p10">
|
<a ng-click="cancel()" class="p10">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
|
|
||||||
<section class="middle tab-bar-section">
|
|
||||||
<h1 class="title ellipsis" translate>Payment Proposal</h1>
|
<h1 class="title ellipsis" translate>Payment Proposal</h1>
|
||||||
</section>
|
</ion-header-bar>
|
||||||
</nav>
|
|
||||||
|
|
||||||
<div class="onGoingProcess" ng-show="loading">
|
<div class="onGoingProcess" ng-show="loading">
|
||||||
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
|
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
|
||||||
|
|
|
@ -1,18 +1,15 @@
|
||||||
<ion-modal-view ng-controller="walletsController">
|
<ion-modal-view ng-controller="walletsController">
|
||||||
<nav class="tab-bar">
|
<ion-header-bar align-title="center" class="tab-bar">
|
||||||
<section class="left-small">
|
<div class="left-small">
|
||||||
<a ng-click="cancel()" class="p10">
|
<a ng-click="cancel()" class="p10">
|
||||||
<span class="text-close">Close</span>
|
<span class="text-close">Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
|
|
||||||
<section class="middle tab-bar-section">
|
|
||||||
<h1 class="title ellipsis">
|
<h1 class="title ellipsis">
|
||||||
<span ng-show="type == 'BUY' || type == 'RECEIVE'">Choose your destination wallet</span>
|
<span ng-show="type == 'BUY' || type == 'RECEIVE'">Choose your destination wallet</span>
|
||||||
<span ng-show="type == 'SELL' || type == 'SEND'">Choose your source wallet</span>
|
<span ng-show="type == 'SELL' || type == 'SEND'">Choose your source wallet</span>
|
||||||
</h1>
|
</h1>
|
||||||
</section>
|
</ion-header-bar>
|
||||||
</nav>
|
|
||||||
|
|
||||||
<ion-content class="m20t" overflow-scroll="true">
|
<ion-content class="m20t" overflow-scroll="true">
|
||||||
<div class="modal-content m20t">
|
<div class="modal-content m20t">
|
||||||
|
|
|
@ -24,6 +24,11 @@
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bar .title {
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 48px;
|
||||||
|
}
|
||||||
|
|
||||||
.radio-label {
|
.radio-label {
|
||||||
text-transform: none;
|
text-transform: none;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
|
|
|
@ -839,7 +839,7 @@ ul.manage li {
|
||||||
|
|
||||||
.tab-bar {
|
.tab-bar {
|
||||||
h1, h2, h3, h4, h5, h6 {
|
h1, h2, h3, h4, h5, h6 {
|
||||||
line-height: 2.7rem;
|
line-height: 48px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -877,7 +877,7 @@ ul.manage li {
|
||||||
.header-modal {
|
.header-modal {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding-top: 60px;
|
padding-top: 20px;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
@ -2005,7 +2005,7 @@ body.modal-open {
|
||||||
|
|
||||||
.payment-proposal-head {
|
.payment-proposal-head {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
padding: 40px 10px 20px 10px;
|
padding: 10px 10px 20px 10px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue