anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
# Conflicts:
#	public/views/onboarding/welcome.html
This commit is contained in:
Jamal Jackson 2016-09-01 10:12:35 -04:00
commit 1caf875ad1
46 changed files with 526 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/onboarding/welcome.html
View file

@ -14,7 +14,7 @@
<button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
</div>
<div class="row">
<button class="button button-block restore col col-75" translate>Restore</button>
<button class="button button-block restore col col-75" translate href ui-sref="tabs.import({'fromOnboarding':true})">Restore</button>
</div>
</ion-content>
</ion-view>