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

Merge pull request #81 from jamal-jackson/feature/onboarding_last_steps

Browse source 
added height breakpoint for disclaimer view agree to terms modal to m…
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-08 15:13:25 -03:00 • committed by GitHub
commit eb92820bce
5 changed files with 64 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,20 +1,23 @@
<ion-view id="onboard-welcome" class="onboarding">
<ion-content ng-controller="welcomeController" ng-init="createProfile()">
<qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner>
<div class="text-center">
<div class="row">
<article id="logo-tagline">
<div class="row text-center">
<img src='img/bitpay-logo.svg' class="logo col col-50" />
</div>
<div class="row">
<div class="row text-center">
<p translate class="text-center col col-60">
Take control of your money - get started with bitcoin
Take control of your money, <br /> get started with bitcoin.
</p>
</div>
</article>
<article id="cta-buttons">
<div class="row">
<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 href ui-sref="onboarding.import({'fromOnboarding':true})">Restore</button>
</div>
</article>
</ion-content>
</ion-view>

9
src/sass/views/onboarding/onboard-disclaimer.scss
View file

@ -71,3 +71,12 @@
}
}
}
@media (max-height:460px){
#onboarding-disclaimer{
#agree-to-terms{
position: relative;
float:left;
}
}
}

5
src/sass/views/onboarding/onboard-tour.scss
View file

@ -3,11 +3,13 @@
#cta {
background-image: url(../img/onboarding-tour-phone.svg);
height: 17rem;
margin-bottom:-1.5rem;
}
}
&-currency {
#cta {
background-image: url(../img/onboarding-tour-currency-bg.svg);
height:18rem;
}
.next-slide {
margin-top: 3rem;
@ -16,7 +18,8 @@
&-control {
#cta {
background-image: url(../img/onboarding-tour-control.svg);
background-size: 70%;
margin-bottom: .05rem;
height: 15rem;
background-position: top;
}
}

40
src/sass/views/onboarding/onboard-welcome.scss
View file

@ -17,7 +17,7 @@
@include center-block();
}
.logo {
margin-top: 13rem;
margin-top: 20rem;
}
button {
@include center-block(1rem);
@ -30,5 +30,43 @@
background: none;
}
}
#cta-buttons {
position: absolute;
bottom: 0;
width: 100%;
button {
max-width: 400px;
min-width: 300px;
}
}
}
}
@media (max-width:500px), (max-height:800px) {
#onboard-welcome {
ion-content {
.logo {
margin-top: 12rem;
}
}
}
}
@media (max-width:420px) {
#onboard-welcome {
ion-content {
.logo {
margin-top: 8rem;
}
}
}
}
@media (max-height:608px) {
#onboard-welcome {
#cta-buttons {
position: relative !important;
float: left;
}
}
}

5
src/sass/views/onboarding/onboarding.scss
View file

@ -7,6 +7,7 @@
background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
color: #fff;
height: 100%;
.bar.bar-header {
background: rgb(30, 49, 134);
color: #fff;
@ -20,6 +21,10 @@
}
}
ion-content {
height: 100%;
.scroll{
height: 100%;
}
color: #fff;
h2, h3{color:#fff;}
h2 {