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

This commit is contained in:
Jamal Jackson 2016-09-15 09:37:36 -04:00
commit be58b7983d
38 changed files with 393 additions and 75 deletions

View file

@ -1,7 +1,7 @@
<div>
<h1 translate>Screenshots are not secure</h1>
<span translate>if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen.</span>
<button ng-click="close()" class="button button-block no-border" translate>
<button ng-click="close()" class="button button-block button-clear" translate>
Got it
</button>
</div>

View file

@ -4,8 +4,8 @@
<div class="card">
<div class="item item-icon-left text-right">
<i class="icon ion-briefcase size-21" ng-style="{'color':wallet.color}"></i>
<span>{{wallet.name || wallet.id}}</span>
<span class="item-note" ng-show="wallet.n > 1 && wallet.isComplete()">
<span>{{wallet.name || wallet.id}}</span>
<span class="item-note m10l" ng-show="wallet.n > 1 && wallet.isComplete()">
{{wallet.m}}-of-{{wallet.n}}
</span>
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>