BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Gustavo Maximiliano Cortez 2016-06-15 13:48:27 -03:00 committed by GitHub
parent 284d01db0b 4a9b94f3b5
commit 74a6a98529
11 changed files with 78 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
public/views/modals/addressbook.html
View File

@ -1,29 +1,23 @@
<ion-modal-view ng-controller="addressbookController as addressbookC">
<div ng-init="wallets[0] ? selectedWalletsOpt = true : selectedWalletsOpt = false; checkClipboard()">
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
<div class="left-small">
<a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancelAddress()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</div>
<h1 class="title ellipsis" translate>{{walletName}}</h1>
<div class="right-small" ng-show="!selectedWalletsOpt && !isEmptyList" ng-click="toggleEditAddressbook()">
<a ng-show="!editAddressbook && !addAddressbookEntry" href class="p10">
<span class="text-close" translate>Edit</span>
</a>
<a ng-show="editAddressbook && !addAddressbookEntry" href class="p10">
<span class="text-close" translate>Done</span>
</a>
</div>
</ion-header-bar>
<ion-content ng-style="{'background-color': '#f6f7f9'}" overflow-scroll="true">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancelAddress()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<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">
<span class="text-close" translate>Edit</span>
</a>
<a ng-show="editAddressbook && !addAddressbookEntry" href class="p10">
<span class="text-close" translate>Done</span>
</a>
</section>
</nav>
<div class="modal-content p20b">
<div class="create-tab small-only-text-center" ng-show="!editAddressbook && !addAddressbookEntry">
<div class="row">

14
public/views/modals/coinbase-tx-details.html
View File

@ -1,17 +1,13 @@
<ion-modal-view ng-controller="coinbaseTxDetailsController">
<nav class="tab-bar" ng-style="{'background-color': '#2b71b1'}">
<section class="left-small">
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color': '#2b71b1'}">
<div class="left-small">
<a ng-click="cancel()">
<i class="icon-arrow-left3 icon-back"></i>
<span class="text-back">Back</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis">
Details
</h1>
</section>
</nav>
</div>
<h1 class="title ellipsis" translate>Details</h1>
</ion-header-bar>
<ion-content overflow-scroll="true">
<div class="modal-content fix-modals-touch">

21
public/views/modals/customized-amount.html
View File

@ -1,17 +1,14 @@
<ion-modal-view ng-controller="customAmountController">
<ion-content overflow-scroll="true">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis" translate>Request a specific amount</h1>
</section>
</nav>
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
<div class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</div>
<h1 class="title ellipsis" translate>Request a specific amount</h1>
</ion-header-bar>
<ion-content overflow-scroll="true" ng-style="{'background-color': '#f6f7f9'}">
<div class="modal-content fix-modals-touch">
<div class="m20b" ng-show="customizedAmountBtc">
<h4 class="title m0" translate>QR Code</h4>

14
public/views/modals/glidera-tx-details.html
View File

@ -1,17 +1,13 @@
<ion-modal-view ng-controller="glideraTxDetailsController">
<nav class="tab-bar">
<section class="left-small">
<ion-header-bar align-title="center" class="tab-bar">
<div class="left-small">
<a ng-click="cancel()">
<i class="icon-arrow-left3 icon-back"></i>
<span class="text-back">Back</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis">
Details
</h1>
</section>
</nav>
</div>
<h1 class="title ellipsis" translate>Details</h1>
</ion-header-bar>
<ion-content overflow-scroll="true">
<div class="modal-content fix-modals-touch">

13
public/views/modals/paypro.html
View File

@ -1,15 +1,12 @@
<ion-modal-view ng-controller="payproController as payproC">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
<div class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title" translate>Payment request</h1>
</section>
</nav>
</div>
<h1 class="title ellipsis" translate>Payment request</h1>
</ion-header-bar>
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
<div class="modal-content">

21
public/views/modals/search.html
View File

@ -1,17 +1,14 @@
<ion-modal-view ng-controller="searchController">
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
<div class="left-small">
<a ng-click="cancel(); index.cancelSearch()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</div>
<h1 class="title ellipsis" translate>Search Transactions</h1>
</ion-header-bar>
<ion-content overflow-scroll="true">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<a ng-click="cancel(); index.cancelSearch()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis" translate>Search Transactions</h1>
</section>
</nav>
<div class="row searchBar searchLabel">
<i class="fi-magnifying-glass size-14"></i>
<form>

12
public/views/modals/tx-details.html
View File

@ -1,14 +1,12 @@
<ion-modal-view ng-controller="txDetailsController">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
<div class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis" translate>Transaction</h1>
</section>
</nav>
</div>
<h1 class="title ellipsis" translate>Transaction</h1>
</ion-header-bar>
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
<div class="modal-content">

13
public/views/modals/txp-details.html
View File

@ -1,15 +1,12 @@
<ion-modal-view ng-controller="txpDetailsController">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
<div class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis" translate>Payment Proposal</h1>
</section>
</nav>
</div>
<h1 class="title ellipsis" translate>Payment Proposal</h1>
</ion-header-bar>
<div class="onGoingProcess" ng-show="loading">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">

19
public/views/modals/wallets.html
View File

@ -1,18 +1,15 @@
<ion-modal-view ng-controller="walletsController">
<nav class="tab-bar">
<section class="left-small">
<ion-header-bar align-title="center" class="tab-bar">
<div class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close">Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis">
<span ng-show="type == 'BUY' || type == 'RECEIVE'">Choose your destination wallet</span>
<span ng-show="type == 'SELL' || type == 'SEND'">Choose your source wallet</span>
</h1>
</section>
</nav>
</div>
<h1 class="title ellipsis">
<span ng-show="type == 'BUY' || type == 'RECEIVE'">Choose your destination wallet</span>
<span ng-show="type == 'SELL' || type == 'SEND'">Choose your source wallet</span>
</h1>
</ion-header-bar>
<ion-content class="m20t" overflow-scroll="true">
<div class="modal-content m20t">

9
src/css/ionic-migration.css
View File

@ -20,8 +20,13 @@
z-index: -1;
}
.ng-hide.ng-hide-animate{
display: none !important;
.ng-hide.ng-hide-animate {
display: none !important;
}
.bar .title {
font-size: 14px;
line-height: 48px;
}
.radio-label {

6
src/sass/main.scss
View File

@ -839,7 +839,7 @@ ul.manage li {
.tab-bar {
h1, h2, h3, h4, h5, h6 {
line-height: 2.7rem;
line-height: 48px;
}
}
@ -877,7 +877,7 @@ ul.manage li {
.header-modal {
background: #fff;
width: 100%;
padding-top: 60px;
padding-top: 20px;
padding-bottom: 20px;
position: relative;
}
@ -2005,7 +2005,7 @@ body.modal-open {
.payment-proposal-head {
color: #fff;
padding: 40px 10px 20px 10px;
padding: 10px 10px 20px 10px;
text-align: center;
}