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

@ -9,7 +9,7 @@
<div class="card">
<div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div>
</div>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-show="lang != 'en'"
ng-click="openExternalLink(disclaimerUrl, 'Bitpay disclaimer')" translate>
Official English Disclaimer