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

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

Browse source 
# Conflicts:
#	public/views/onboarding/notifications.html
#	src/js/controllers/onboarding/collectEmail.js
This commit is contained in:
Jamal Jackson 2016-09-14 11:42:33 -04:00
commit fdb5e467b9
28 changed files with 150 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/onboarding/tour.html
View file

@ -14,7 +14,7 @@
</ion-nav-bar>
<ion-slides class="slides" options="options" slider="data.slider">
<ion-slide-page>
<ion-content id="onboard-tour-secure">
<ion-content id="onboard-tour-secure" scroll="false">
<div class="text-center row">
<h2 class="col col-60" translate>Bitcoin is secure, digital money</h2>
</div>
@ -38,7 +38,7 @@
</ion-content>
</ion-slide-page>
<ion-slide-page>
<ion-content id="onboard-tour-currency">
<ion-content id="onboard-tour-currency" scroll="false">
<div class="text-center row">
<h2 class="col col-75" translate>Bitcoin is a currency</h2>
</div>
@ -62,7 +62,7 @@
</ion-content>
</ion-slide-page>
<ion-slide-page>
<ion-content id="onboard-tour-control">
<ion-content id="onboard-tour-control" scroll="false">
<div class="text-center row">
<h2 translate class="col col-75">You control your bitcoin</h2>
</div>