fix merge conflicts

6 files changed, 63 insertions, 18 deletions

diff --git a/ui/app/css/itcss/components/currency-display.scss b/ui/app/css/itcss/components/currency-display.scss
index 3560b0b0c..b1a74dce2 100644
--- a/ui/app/css/itcss/components/currency-display.scss
+++ b/ui/app/css/itcss/components/currency-display.scss
@@ -1,6 +1,5 @@
 .currency-display {
   height: 54px;
-  width: 100%ß;
   border: 1px solid $alto;
   border-radius: 4px;
   background-color: $white;
@@ -21,7 +20,7 @@
     line-height: 22px;
     border: none;
     outline: 0 !important;
-    max-width: 100%;
+    max-width: 22ch;
   }
 
   &__primary-currency {
@@ -47,14 +46,22 @@
   &__input-wrapper {
     position: relative;
     display: flex;
+    flex: 1;
+    max-width: 100%;
+
+    input[type="number"] {
+      -moz-appearance: textfield;
+    }
 
     input[type="number"]::-webkit-inner-spin-button {
       -webkit-appearance: none;
+      -moz-appearance: none;
       display: none;
     }
 
     input[type="number"]:hover::-webkit-inner-spin-button {
       -webkit-appearance: none;
+      -moz-appearance: none;
       display: none;
     }
   }
@@ -67,12 +74,14 @@
   .react-numeric-input {
     input[type="number"]::-webkit-inner-spin-button {
       -webkit-appearance: none;
+      -moz-appearance: none;
       display: none;
     }
 
     input[type="number"]:hover::-webkit-inner-spin-button {
       -webkit-appearance: none;
+      -moz-appearance: none;
       display: none;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ui/app/css/itcss/components/hero-balance.scss b/ui/app/css/itcss/components/hero-balance.scss
index 09d66aedd..eba93ecb4 100644
--- a/ui/app/css/itcss/components/hero-balance.scss
+++ b/ui/app/css/itcss/components/hero-balance.scss
@@ -27,25 +27,37 @@
     @media screen and (max-width: $break-small) {
       flex-direction: column;
       flex: 0 0 auto;
+      max-width: 100%;
     }
 
     @media screen and (min-width: $break-large) {
       flex-direction: row;
       flex-grow: 3;
+      min-width: 0;
     }
   }
 
   .balance-display {
     .token-amount {
       color: $black;
+      max-width: 100%;
+
+      .token-balance {
+        display: flex;
+      }
     }
 
     @media screen and (max-width: $break-small) {
+      max-width: 100%;
       text-align: center;
 
       .token-amount {
         font-size: 1.75rem;
         margin-top: 1rem;
+
+        .token-balance {
+          flex-direction: column;
+        }
       }
 
       .fiat-amount {
@@ -56,9 +68,10 @@
     }
 
     @media screen and (min-width: $break-large) {
-      margin-left: .8em;
+      margin: 0 .8em;
       justify-content: flex-start;
       align-items: flex-start;
+      min-width: 0;
 
       .token-amount {
         font-size: 1.5rem;
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss
index 74658f656..42ef7ae0a 100644
--- a/ui/app/css/itcss/components/modal.scss
+++ b/ui/app/css/itcss/components/modal.scss
@@ -642,10 +642,31 @@
     display: flex;
     flex-flow: column nowrap;
     flex: 1;
+    align-items: center;
 
     @media screen and (max-width: 575px) {
       height: 0;
     }
+
+    .shapeshift-form-wrapper {
+      display: flex;
+      flex-flow: column;
+      justify-content: center;
+      align-items: center;
+      flex: 1 0 auto;
+
+      .shapeshift-form, .modal-shapeshift-form {
+        border-radius: 8px;
+        background-color: rgba(0, 0, 0, .05);
+        padding: 17px 15px;
+        margin-bottom: 10px;
+
+        &__caret {
+          width: auto;
+          flex: 1;
+        }
+      }
+    }
   }
 
   &__logo {
@@ -773,17 +794,15 @@
     margin-top: 28px;
     flex: 1 0 auto;
 
-    .shapeshift-form {
-      width: auto;
+    .shapeshift-form, .modal-shapeshift-form {
+      border-radius: 8px;
+      background-color: rgba(0, 0, 0, .05);
+      padding: 17px 15px;
 
       &__caret {
         width: auto;
         flex: 1;
       }
-
-      @media screen and (max-width: 575px) {
-        width: auto;
-      }
     }
   }
 
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss
index bbe0ee661..667e45ba2 100644
--- a/ui/app/css/itcss/components/newui-sections.scss
+++ b/ui/app/css/itcss/components/newui-sections.scss
@@ -26,14 +26,16 @@ $wallet-view-bg: $alabaster;
 //Account and transaction details
 .account-and-transaction-details {
   display: flex;
-  flex: 1 0 auto;
+  flex: 1 1 auto;
+  min-width: 0;
 }
 
 // tx view
 
 .tx-view {
-  flex: 63.5 0 66.5%;
+  flex: 1 1 66.5%;
   background: $tx-view-bg;
+  min-width: 0;
 
   // No title on mobile
   @media screen and (max-width: 575px) {
@@ -286,7 +288,7 @@ $wallet-view-bg: $alabaster;
 }
 
 .token-balance__amount {
-  padding-right: 6px;
+  padding: 0 6px;
 }
 
 // first time
diff --git a/ui/app/css/itcss/components/request-signature.scss b/ui/app/css/itcss/components/request-signature.scss
index e6916c418..4707ff60e 100644
--- a/ui/app/css/itcss/components/request-signature.scss
+++ b/ui/app/css/itcss/components/request-signature.scss
@@ -183,6 +183,12 @@
     padding: 6px 18px 15px;
   }
 
+  &__help-link {
+    cursor: pointer;
+    text-decoration: underline;
+    color: $curious-blue;
+  }
+
   &__footer {
     width: 100%;
     display: flex;
diff --git a/ui/app/css/itcss/components/token-list.scss b/ui/app/css/itcss/components/token-list.scss
index 72fda372f..4b706abce 100644
--- a/ui/app/css/itcss/components/token-list.scss
+++ b/ui/app/css/itcss/components/token-list.scss
@@ -81,13 +81,9 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
 }
 
 .token-menu-dropdown {
-  height: 55px;
   width: 80%;
-  border-radius: 4px;
-  background-color: rgba(0, 0, 0, .82);
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .5);
   position: absolute;
-  top: 60px;
+  top: 52px;
   right: 25px;
   z-index: 2000;