Merge branch 'master' into retry-tx-refractor

7 files changed, 145 insertions, 35 deletions

diff --git a/ui/app/css/itcss/components/hero-balance.scss b/ui/app/css/itcss/components/hero-balance.scss
index 4af0c2c55..a3f051361 100644
--- a/ui/app/css/itcss/components/hero-balance.scss
+++ b/ui/app/css/itcss/components/hero-balance.scss
@@ -5,9 +5,6 @@
     flex-direction: column;
     justify-content: flex-start;
     align-items: center;
-    margin: .3em .9em 0;
-    // height: 80vh;
-    // max-height: 225px;
     flex: 0 0 auto;
   }
 
diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss
index 0219f9fb2..f107b7aca 100644
--- a/ui/app/css/itcss/components/index.scss
+++ b/ui/app/css/itcss/components/index.scss
@@ -55,3 +55,6 @@
 @import './new-account.scss';
 
 @import './tooltip.scss';
+
+@import './welcome-screen.scss';
+
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss
index 53e3bff00..6c4106f8b 100644
--- a/ui/app/css/itcss/components/modal.scss
+++ b/ui/app/css/itcss/components/modal.scss
@@ -641,32 +641,40 @@
 
   &__buy-rows {
     width: 100%;
-    padding: 33px;
-    padding-top: 0px;
+    padding: 0 30px;
     display: flex;
     flex-flow: column nowrap;
     flex: 1;
-    overflow-y: auto;
 
     @media screen and (max-width: 575px) {
       height: 0;
     }
   }
 
+  &__logo {
+    height: 60px;
+    background-repeat: no-repeat;
+    background-size: contain;
+    background-position: center;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
   &__buy-row {
     border-bottom: 1px solid $alto;
     display: flex;
     justify-content: space-between;
     align-items: center;
-    flex: 1;
-    padding-bottom: 25px;
-    padding-top: 25px;
+    flex: 1 0 auto;
+    padding: 30px 0 20px;
+    min-height: 170px;
 
     @media screen and (max-width: 575px) {
-      min-height: 360px;
+      min-height: 270px;
       flex-flow: column;
-      justify-content: center;
-      padding-top: 45px;
+      justify-content: flex-start;
     }
 
     &__back {
@@ -692,30 +700,35 @@
       }
     }
 
-    &__logo {
+    &__logo-container {
       display: flex;
       justify-content: center;
-      flex: 0.3 1 auto;
+      flex: 0 0 auto;
+      padding: 0 20px;
 
-      @media screen and (min-width: 575px) {
-        min-width: 215px;
+      @media screen and (min-width: 576px) {
+        width: 12rem;
+      }
+
+      @media screen and (max-width: 575px) {
+        width: 100%;
+        max-height: 6rem;
+        padding-bottom: 20px;
       }
     }
 
     &__coinbase-logo {
       height: 40px;
-      width: 180px;
     }
 
     &__shapeshift-logo {
       height: 60px;
-      width: 174px;
     }
 
     &__eth-logo {
       border-radius: 50%;
-      width: 68px;
       height: 68px;
+      width: 68px;
       border: 3px solid $tundora;
       z-index: 25;
       padding: 4px;
@@ -728,10 +741,11 @@
 
     &__description {
       color: $cape-cod;
-      flex: 0.5 1 auto;
+      padding-bottom: 20px;
+      align-self: flex-start;
 
       @media screen and (min-width: 575px) {
-        min-width: 315px;
+        width: 15rem;
       }
 
       &__title {
diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss
index c6c254ede..c2cefe4ad 100644
--- a/ui/app/css/itcss/components/new-account.scss
+++ b/ui/app/css/itcss/components/new-account.scss
@@ -161,15 +161,14 @@
   display: flex;
   flex-flow: column;
   align-items: center;
+  padding: 30px 30px 0;
 
   &__input-label {
     color: $scorpion;
     font-family: Roboto;
     font-size: 16px;
     line-height: 21px;
-    margin-top: 29px;
     align-self: flex-start;
-    margin-left: 30px;
   }
 
   &__input {
@@ -190,7 +189,7 @@
     margin-top: 39px;
     display: flex;
     width: 100%;
-    justify-content: space-evenly;
+    justify-content: space-between;
   }
 
   &__button-cancel,
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss
index ecf5e1036..5cdda5e6c 100644
--- a/ui/app/css/itcss/components/newui-sections.scss
+++ b/ui/app/css/itcss/components/newui-sections.scss
@@ -51,6 +51,7 @@ $wallet-view-bg: $alabaster;
   cursor: pointer;
   display: flex;
   justify-content: center;
+  padding: 10px;
 }
 
 // wallet view and sidebar
@@ -291,7 +292,6 @@ $wallet-view-bg: $alabaster;
   padding-right: 6px;
 }
 
-
 // first time
 .first-view-main {
   display: flex;
@@ -313,4 +313,23 @@ $wallet-view-bg: $alabaster;
   @media screen and (min-width: 1281px) {
     width: 62vw;
   }
-}
\ No newline at end of file
+}
+
+.unlock-screen-container {
+  z-index: $main-container-z-index;
+  font-family: Roboto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex: 1 0 auto;
+  background: #f7f7f7;
+  width: 100%;
+}
+
+.unlock-screen {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  flex: 1 0 auto;
+}
diff --git a/ui/app/css/itcss/components/welcome-screen.scss b/ui/app/css/itcss/components/welcome-screen.scss
new file mode 100644
index 000000000..bfd174ad9
--- /dev/null
+++ b/ui/app/css/itcss/components/welcome-screen.scss
@@ -0,0 +1,59 @@
+.welcome-screen {
+    display: flex;
+    flex-flow: column;
+    justify-content: center;
+    align-items: center;
+    font-family: Roboto;
+    font-weight: 400;
+    width: 100%;
+    flex: 1 0 auto;
+    padding: 70px 0;
+    background: $white;
+
+    @media screen and (max-width: 575px) {
+      padding: 0;
+    }
+
+    &__info {
+        display: flex;
+        flex-flow: column;
+        width: 100%;
+        height: 100%;
+        align-items: center;
+
+        &__header {
+            font-size: 1.65em;
+            margin-bottom: 14px;
+
+            @media screen and (max-width: 575px) {
+              font-size: 1.5em;
+            }
+        }
+
+        &__copy {
+            font-size: 1em;
+            width: 400px;
+            max-width: 90vw;
+            text-align: center;
+
+            @media screen and (max-width: 575px) {
+              font-size: 0.9em;
+            }
+        }
+    }
+
+    &__button {
+      height: 54px;
+      width: 198px;
+      box-shadow: 0 2px 4px 0 rgba(0,0,0,0.14);
+      color: #FFFFFF;
+      font-size: 20px;
+      font-weight: 500;
+      line-height: 26px;
+      text-align: center;
+      text-transform: uppercase;
+      margin: 35px 0 14px;
+      transition: 200ms ease-in-out;
+      background-color: rgba(247, 134, 28, 0.9);
+    }
+}
diff --git a/ui/app/css/itcss/generic/index.scss b/ui/app/css/itcss/generic/index.scss
index 9b3d7475b..0077cb661 100644
--- a/ui/app/css/itcss/generic/index.scss
+++ b/ui/app/css/itcss/generic/index.scss
@@ -70,6 +70,10 @@ input.large-input {
   height: 36px;
 }
 
+.allcaps {
+  text-transform: uppercase;
+}
+
 .page-container {
   width: 400px;
   background-color: $white;
@@ -77,25 +81,30 @@ input.large-input {
   z-index: 25;
   display: flex;
   flex-flow: column;
+  border-radius: 7px;
+  height: 100%;
 
   &__header {
     display: flex;
     flex-flow: column;
     border-bottom: 1px solid $geyser;
-    padding: 1.15rem 0.95rem;
+    padding: 20px;
     flex: 0 0 auto;
-    background: $alabaster;
     position: relative;
   }
 
-  &__header-close::after {
-    content: '\00D7';
-    font-size: 40px;
+  &__header-close {
     color: $tundora;
     position: absolute;
-    top: 21.5px;
-    right: 28.5px;
+    top: 20px;
+    right: 20px;
     cursor: pointer;
+    overflow: hidden;
+
+    &::after {
+      content: '\00D7';
+      font-size: 40px;
+    }
   }
 
   &__footer {
@@ -114,7 +123,7 @@ input.large-input {
 
   &__footer-button {
     width: 165px;
-    height: 60px;
+    height: 55px;
     font-size: 1rem;
     text-transform: uppercase;
     margin-right: 1rem;
@@ -130,7 +139,7 @@ input.large-input {
     font-family: Roboto;
     font-size: 2rem;
     font-weight: 500;
-    line-height: initial;
+    line-height: 2rem;
   }
 
   &__subtitle {
@@ -174,6 +183,15 @@ input.large-input {
       }
     }
   }
+
+  &--full-width {
+    width: initial;
+  }
+
+  &__content {
+    height: 100%;
+    overflow-y: auto;
+  }
 }
 
 @media screen and (max-width: 250px) {
@@ -200,5 +218,6 @@ input.large-input {
     width: 100%;
     overflow-y: auto;
     background-color: $white;
+    border-radius: 0;
   }
 }