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

# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss
This commit is contained in:
Jamal Jackson 2016-09-02 06:57:50 -04:00
commit ee7bb0f455
96 changed files with 610 additions and 607 deletions

View file

@ -2,7 +2,7 @@
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary">
<button class="button no-border" href ui-sref="onboarding.backupRequest">
<i class="icon ion-arrow-left-c"></i>
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>