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

4 files changed, 10 insertions, 87 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;
-  }
-}