From 02449532349f1421730ad79c7d75d027941a4da0 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Mon, 19 Sep 2016 14:18:03 -0400 Subject: [PATCH 1/3] imporve height on cta images for when device width exceeds standard phone dimensions --- src/sass/views/onboarding/onboarding.scss | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index 4ca9842a2..0099bc072 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -20,6 +20,10 @@ } } } + .bar.bar-stable{ + border-color: transparent; + border:none; + } ion-content { height: 100%; .scroll{ @@ -50,6 +54,12 @@ button { color:#fff; } + @media (min-width: 450px){ + p{ + font-size: 1.1rem; + line-height: 1.5rem; + } + } } .col { @include center-block(.5rem); @@ -77,7 +87,7 @@ } } -@media (max-width: 400px){ +@media (min-width: 400px){ .onboarding{ ion-content{ h2{ From 8567591fa5c119e24442467f59fcbe6c40f8639d Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Mon, 19 Sep 2016 14:18:24 -0400 Subject: [PATCH 2/3] updated tour cta stylings --- src/sass/views/onboarding/onboard-tour.scss | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/sass/views/onboarding/onboard-tour.scss b/src/sass/views/onboarding/onboard-tour.scss index b955d6c53..6cd9a42ea 100644 --- a/src/sass/views/onboarding/onboard-tour.scss +++ b/src/sass/views/onboarding/onboard-tour.scss @@ -29,7 +29,7 @@ } } -@media (max-width: 400px){ +@media (max-width: 359px){ #onboard-tour{ &-secure, &-currency, &-control{ #cta{ @@ -39,6 +39,16 @@ } } +@media (min-width: 450px){ + #onboard-tour{ + &-secure, &-currency, &-control{ + #cta{ + height: 26rem; + } + } + } +} + @media (min-width: 1000px){ #onboard-tour{ p, h2, h3{ From 4ec7f08e1e9fb7d3fc7d3143dfc5c500d8063260 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Mon, 19 Sep 2016 14:18:51 -0400 Subject: [PATCH 3/3] fix style issues with discomainer view and collect email, mostly checkbox related --- public/views/onboarding/collectEmail.html | 4 ++-- .../onboarding/onboard-collect-email.scss | 19 +++++++++++++++++++ .../views/onboarding/onboard-disclaimer.scss | 11 +++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html index 6e833f25b..465fe84b8 100644 --- a/public/views/onboarding/collectEmail.html +++ b/public/views/onboarding/collectEmail.html @@ -17,8 +17,8 @@ - - Get news and updates from Bitpay + + Get news and updates from Bitpay
diff --git a/src/sass/views/onboarding/onboard-collect-email.scss b/src/sass/views/onboarding/onboard-collect-email.scss index b9d9bc24c..774fce120 100644 --- a/src/sass/views/onboarding/onboard-collect-email.scss +++ b/src/sass/views/onboarding/onboard-collect-email.scss @@ -59,6 +59,25 @@ } } } + #news-updates{ + padding-top:0; + .list{ + max-width: 600px; + text-align: center; + width: 75%; + @include center-block(); + label{ + display: inline-block; + margin-top: 0; + padding-bottom: 1rem; + .item-content{ + margin-left: 15%; + top: .4rem; + position: relative; + } + } + } + } } .item { border: none; diff --git a/src/sass/views/onboarding/onboard-disclaimer.scss b/src/sass/views/onboarding/onboard-disclaimer.scss index aca9e70dc..feffbb90a 100644 --- a/src/sass/views/onboarding/onboard-disclaimer.scss +++ b/src/sass/views/onboarding/onboard-disclaimer.scss @@ -33,6 +33,11 @@ border-color: rgb(19, 229, 182); top:20%; left:11%; + @media (min-width:450px){ + &{ + left: 20%; + } + } } .item-content { width: 90%; @@ -60,6 +65,12 @@ p{ color:rgb(58,58,58); } + @media (min-width:450px){ + p{ + position: relative; + top: .6rem; + } + } .checkbox input:before, .checkbox .checkbox-icon:before{ border-color:$soft-blue;