anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #165 from gabrielbazan7/fix/button1

Browse source 
delete fixed button
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-22 17:30:53 -03:00 • committed by GitHub
commit 1fcb596c7c
4 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/confirm.html
View file

@ -51,7 +51,7 @@
<i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i> <i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i>
</div> </div>
</div> </div>
<button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
</ion-content> </ion-content>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
<accept class="accept-slide" ng-if="isCordova && fee"></accept> <accept class="accept-slide" ng-if="isCordova && fee"></accept>
</ion-view> </ion-view>

2
public/views/modals/txp-details.html
View file

@ -160,7 +160,7 @@
<span translate>Delete Payment Proposal</span> <span translate>Delete Payment Proposal</span>
</button> </button>
</div> </div>
<button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
</ion-content> </ion-content>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept> <accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
</ion-modal-view> </ion-modal-view>

4
src/sass/views/confirm.scss
View file

@ -14,8 +14,4 @@
height: 100px; height: 100px;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.accept-button {
position: fixed;
bottom: 49px;
}
} }

4
src/sass/views/includes/txp-details.scss
View file

@ -63,8 +63,4 @@
height: 100px; height: 100px;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.accept-button {
position: fixed;
bottom: 49px;
}
} }