Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support

7 files changed, 12 insertions, 277 deletions

diff --git a/ui/app/css/itcss/components/buttons.scss b/ui/app/css/itcss/components/buttons.scss
index f93daec04..34565767f 100644
--- a/ui/app/css/itcss/components/buttons.scss
+++ b/ui/app/css/itcss/components/buttons.scss
@@ -4,7 +4,8 @@
 
 .btn-default,
 .btn-primary,
-.btn-secondary {
+.btn-secondary,
+.btn-confirm {
   height: 44px;
   background: $white;
   display: flex;
@@ -13,13 +14,14 @@
   box-sizing: border-box;
   border-radius: 4px;
   font-size: 14px;
-  font-weight: 500;
+  font-weight: 400;
   transition: border-color .3s ease;
   padding: 0 16px;
   min-width: 140px;
   width: 100%;
   text-transform: uppercase;
   outline: none;
+  font-family: Roboto;
 
   &--disabled,
   &[disabled] {
@@ -71,6 +73,12 @@
   }
 }
 
+.btn-confirm {
+  color: $white;
+  border: 2px solid $curious-blue;
+  background-color: $curious-blue;
+}
+
 .btn--large {
   height: 54px;
 }
@@ -119,19 +127,6 @@
   }
 }
 
-.btn-confirm {
-  background-color: $caribbean-green; // TODO: reusable color in colors.css
-  text-align: center;
-  padding: .8rem 1rem;
-  color: $white;
-  border: 2px solid $caribbean-green;
-  border-radius: 4px;
-  font-size: .85rem;
-  font-weight: 400;
-  transition: border-color .3s ease;
-  width: 100%;
-}
-
 // No longer used in flat design, remove when modal buttons done
 // div.wallet-btn {
 //   border: 1px solid rgb(91, 93, 103);
diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss
index 1d87b8004..5be040906 100644
--- a/ui/app/css/itcss/components/index.scss
+++ b/ui/app/css/itcss/components/index.scss
@@ -58,6 +58,4 @@
 
 @import './welcome-screen.scss';
 
-@import './sender-to-recipient.scss';
-
 @import '../../../components/index';
diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss
index 6c8be0b6d..545a2a940 100644
--- a/ui/app/css/itcss/components/network.scss
+++ b/ui/app/css/itcss/components/network.scss
@@ -159,15 +159,3 @@
 .network-caret {
   margin: 0 8px 2px;
 }
-
-.network-display {
-  &__container {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-
-    @media screen and (min-width: 576px) {
-      display: none;
-    }
-  }
-}
diff --git a/ui/app/css/itcss/components/sender-to-recipient.scss b/ui/app/css/itcss/components/sender-to-recipient.scss
deleted file mode 100644
index f16013cdf..000000000
--- a/ui/app/css/itcss/components/sender-to-recipient.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-.sender-to-recipient {
-  &__container {
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    border-bottom: 1px solid $geyser;
-    position: relative;
-  }
-
-  &__sender,
-  &__recipient {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    flex: 1;
-    padding: 10px 20px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  &__sender {
-    padding-right: 30px;
-  }
-
-  &__recipient {
-    border-left: 1px solid $geyser;
-    padding-left: 30px;
-  }
-
-  &__arrow-container {
-    position: absolute;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  &__arrow-circle {
-    background: $white;
-    padding: 5px;
-    border: 1px solid $geyser;
-    border-radius: 20px;
-    height: 30px;
-    width: 30px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  &__name {
-    padding-left: 5px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
diff --git a/ui/app/css/itcss/generic/index.scss b/ui/app/css/itcss/generic/index.scss
index 3525d2003..d1c65afed 100644
--- a/ui/app/css/itcss/generic/index.scss
+++ b/ui/app/css/itcss/generic/index.scss
@@ -73,195 +73,6 @@ input.large-input {
   text-transform: uppercase;
 }
 
-.page-container {
-  width: 408px;
-  background-color: $white;
-  box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08);
-  z-index: 25;
-  display: flex;
-  flex-flow: column;
-  border-radius: 8px;
-
-  &__header {
-    display: flex;
-    flex-flow: column;
-    border-bottom: 1px solid $geyser;
-    padding: 16px;
-    flex: 0 0 auto;
-    position: relative;
-
-    &--no-padding-bottom {
-      padding-bottom: 0;
-    }
-  }
-
-  &__header-close {
-    color: $tundora;
-    position: absolute;
-    top: 16px;
-    right: 16px;
-    cursor: pointer;
-    overflow: hidden;
-
-    &::after {
-      content: '\00D7';
-      font-size: 40px;
-      line-height: 20px;
-    }
-  }
-
-  &__header-row {
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-  }
-
-  &__footer {
-    display: flex;
-    flex-flow: row;
-    justify-content: center;
-    border-top: 1px solid $geyser;
-    padding: 16px;
-    flex: 0 0 auto;
-
-    .btn-clear,
-    .btn-cancel,
-    .btn-confirm {
-      font-size: 1rem;
-    }
-  }
-
-  &__footer-button {
-    height: 55px;
-    font-size: 1rem;
-    text-transform: uppercase;
-    margin-right: 16px;
-    border-radius: 2px;
-
-    &:last-of-type {
-      margin-right: 0;
-    }
-  }
-
-  &__back-button {
-    color: #2f9ae0;
-    font-size: 1rem;
-    cursor: pointer;
-    font-weight: 400;
-  }
-
-  &__title {
-    color: $black;
-    font-size: 2rem;
-    font-weight: 500;
-    line-height: 2rem;
-  }
-
-  &__subtitle {
-    padding-top: .5rem;
-    line-height: initial;
-    font-size: .9rem;
-    color: $gray;
-  }
-
-  &__tabs {
-    display: flex;
-    margin-top: 16px;
-  }
-
-  &__tab {
-    min-width: 5rem;
-    padding: 8px;
-    color: $dusty-gray;
-    font-family: Roboto;
-    font-size: 1rem;
-    text-align: center;
-    cursor: pointer;
-    border-bottom: none;
-    margin-right: 16px;
-
-    &:last-of-type {
-      margin-right: 0;
-    }
-
-    &--selected {
-      color: $curious-blue;
-      border-bottom: 3px solid $curious-blue;
-    }
-  }
-
-  &--full-width {
-    width: 100% !important;
-  }
-
-  &--full-height {
-    height: 100% !important;
-    max-height: initial !important;
-    min-height: initial !important;
-  }
-
-  &__content {
-    overflow-y: auto;
-    flex: 1;
-  }
-
-  &__warning-container {
-    background: $linen;
-    padding: 20px;
-    display: flex;
-    align-items: start;
-  }
-
-  &__warning-message {
-    padding-left: 15px;
-  }
-
-  &__warning-title {
-    font-weight: 500;
-  }
-
-  &__warning-icon {
-    padding-top: 5px;
-  }
-}
-
-@media screen and (max-width: 250px) {
-  .page-container {
-    &__footer {
-      flex-flow: column-reverse;
-    }
-
-    &__footer-button {
-      width: 100%;
-      margin-bottom: 1rem;
-      margin-right: 0;
-
-      &:first-of-type {
-        margin-bottom: 0;
-      }
-    }
-  }
-}
-
-@media screen and (max-width: 575px) {
-  .page-container {
-    height: 100%;
-    width: 100%;
-    overflow-y: auto;
-    background-color: $white;
-    border-radius: 0;
-    flex: 1;
-  }
-}
-
-@media screen and (min-width: 576px) {
-  .page-container {
-    max-height: 82vh;
-    min-height: 570px;
-    flex: 0 0 auto;
-  }
-}
-
 .input-label {
   padding-bottom: 10px;
   font-weight: 400;
diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss
index 814d7a382..f90c8edc3 100644
--- a/ui/app/css/itcss/settings/variables.scss
+++ b/ui/app/css/itcss/settings/variables.scss
@@ -55,6 +55,7 @@ $dodger-blue: #3099f2;
 $zumthor: #edf7ff;
 $ecstasy: #f7861c;
 $linen: #fdf4f4;
+$oslo-gray: #8C8E94;
 
 /*
   Z-Indicies
diff --git a/ui/app/css/itcss/tools/utilities.scss b/ui/app/css/itcss/tools/utilities.scss
index ee867640d..209614c6b 100644
--- a/ui/app/css/itcss/tools/utilities.scss
+++ b/ui/app/css/itcss/tools/utilities.scss
@@ -165,7 +165,7 @@
 }
 
 .bold {
-  font-weight: 700;
+  font-weight: 500;
 }
 
 .text-transform-uppercase {