From b99bfd1cbd978b2a8ace471a5bc047d4c425258a Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 8 Sep 2016 10:17:34 -0400 Subject: [PATCH] polished responsiveness of welcome view --- public/views/onboarding/welcome.html | 11 +++-- .../views/onboarding/onboard-welcome.scss | 40 ++++++++++++++++++- src/sass/views/onboarding/onboarding.scss | 5 +++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html index f71e8a053..c34097a19 100644 --- a/public/views/onboarding/welcome.html +++ b/public/views/onboarding/welcome.html @@ -1,20 +1,23 @@ -
-
+
+
-
+

- Take control of your money - get started with bitcoin + Take control of your money,
get started with bitcoin.

+
+
+
diff --git a/src/sass/views/onboarding/onboard-welcome.scss b/src/sass/views/onboarding/onboard-welcome.scss index 84d206d20..414d80e78 100644 --- a/src/sass/views/onboarding/onboard-welcome.scss +++ b/src/sass/views/onboarding/onboard-welcome.scss @@ -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; + } } } diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index 0b50a6580..a324af26a 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -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 {