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

# 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

View file

@ -18,7 +18,7 @@
<div ng-if="!giftCards" class="m20t padding text-center">
<button class="button button-block button-positive" ui-sref="tabs.giftcards.amazon.buy">
<button class="button button-standard button-primary" ui-sref="tabs.giftcards.amazon.buy">
Buy now
</button>