From dfe0c39260e331479c54d75f54e007670f5b04a3 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Wed, 7 Sep 2016 15:05:30 -0400
Subject: [PATCH 1/2] added height breakpoint for disclaimer view agree to
 terms modal to make relative, fixed alignment on tour view

---
 src/sass/views/onboarding/onboard-disclaimer.scss | 9 +++++++++
 src/sass/views/onboarding/onboard-tour.scss       | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/sass/views/onboarding/onboard-disclaimer.scss b/src/sass/views/onboarding/onboard-disclaimer.scss
index 092ba30d4..634413194 100644
--- a/src/sass/views/onboarding/onboard-disclaimer.scss
+++ b/src/sass/views/onboarding/onboard-disclaimer.scss
@@ -71,3 +71,12 @@
     }
   }
 }
+
+@media (max-height:460px){
+  #onboarding-disclaimer{
+    #agree-to-terms{
+      position: relative;
+      float:left;
+    }
+  }
+}
diff --git a/src/sass/views/onboarding/onboard-tour.scss b/src/sass/views/onboarding/onboard-tour.scss
index 906853e2e..358e9949c 100644
--- a/src/sass/views/onboarding/onboard-tour.scss
+++ b/src/sass/views/onboarding/onboard-tour.scss
@@ -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;
     }
   }

From b99bfd1cbd978b2a8ace471a5bc047d4c425258a Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Thu, 8 Sep 2016 10:17:34 -0400
Subject: [PATCH 2/2] 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 @@
 <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>
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 {