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

This commit is contained in:
Nick Cardin 2016-09-01 11:40:43 -04:00
commit 3a771e0e21
116 changed files with 1732 additions and 1371 deletions

View file

@ -1,11 +1,11 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="add.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
</button>
</ion-nav-buttons>
<ion-nav-title>Join shared wallet</ion-nav-title>
<ion-nav-title>{{'Join shared wallet' | translate}}</ion-nav-title>
</ion-nav-bar>