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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser

Browse source 
# Conflicts:
#	www/views/glidera.html
This commit is contained in:
Jamal Jackson 2016-10-12 08:59:04 -04:00
commit 7becb504f4
59 changed files with 500 additions and 28777 deletions
Download patch file Download diff file Expand all files Collapse all files

4
www/views/buyAmazon.html
View file

@ -53,7 +53,7 @@
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<div class="padding">
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-disabled="!formData.fiat"
type="submit">
Buy now
@ -79,7 +79,7 @@
<span ng-show="buy.giftCard.status == 'FAILURE'">
This failure could not be recoverable. Request your refund from your list of cards
</span>
<button class="button button-block button-positive" ng-click="$root.go('amazon')">
<button class="button button-standard button-primary" ng-click="$root.go('amazon')">
Back
</button>
</div>