fix click to pay button to bottom of screen like the slide to pay component

This commit is contained in:
Marty Alcala 2016-11-16 15:35:25 -05:00
parent 57ab21dd55
commit e858462107
5 changed files with 30 additions and 17 deletions

View File

@ -19,8 +19,7 @@ $button-secondary-border: transparent;
$button-secondary-active-bg: darken($subtle-gray, 5%);
$button-secondary-active-border: transparent;
%button-standard,
click-to-accept {
%button-standard {
width: 85%;
max-width: 300px;
margin-left: auto;

View File

@ -1,7 +1,18 @@
click-to-accept {
position: fixed;
bottom: 0;
height: 92px;
width: 100%;
.click-to-accept {
&__button.button.button-primary.button-standard {
height: 100%;
max-width: 9999px;
width: 100%;
}
&__button.disable {
pointer-events: none;
}
@ -18,6 +29,9 @@ click-to-accept {
transform: translateY(2rem);
opacity: 0;
pointer-events: none;
display: flex;
align-items: center;
justify-content: center;
&.enter {
transition: transform 250ms ease, opacity 250ms ease;

View File

@ -8,7 +8,7 @@
.list {
background: #f5f5f5;
}
.slide-to-pay {
.add-bottom-for-cta {
bottom: 92px;
}
.head {

View File

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds && !noMatchingWallet}">
<ion-content ng-class="{'add-bottom-for-cta': !insuffientFunds && !noMatchingWallet}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -77,13 +77,13 @@
</div>
</div>
</div>
<click-to-accept
ng-click="approve(statusChangeHandler)"
ng-if="!isCordova && wallets[0]"
click-send-status="sendStatus">
Click to pay
</click-to-accept>
</ion-content>
<click-to-accept
ng-click="approve(statusChangeHandler)"
ng-if="!isCordova && wallets[0]"
click-send-status="sendStatus">
Click to pay
</click-to-accept>
<slide-to-accept
ng-if="isCordova && wallets[0]"
slide-on-confirm="onConfirm()"

View File

@ -11,7 +11,7 @@
</button>
</ion-header-bar>
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && !hasClick}">
<ion-content ng-init="updateCopayerList()" ng-class="{'add-bottom-for-cta': tx.pendingForUs && canSign}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -150,12 +150,6 @@
</div>
</div>
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus">
Click to accept
</click-to-accept>
<div class="m30t text-center" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
<div class="size-12 padding proposal-deletion-help" ng-show="!tx.isGlidera && isShared" translate>
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
@ -167,6 +161,12 @@
</div>
</ion-content>
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus">
Click to accept
</click-to-accept>
<slide-to-accept
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
slide-on-confirm="onConfirm()"