From 6f8077f587fe16ebdb8ce3ffe7a0df9f58c74ffb Mon Sep 17 00:00:00 2001
From: Thomas <tmashuang@gmail.com>
Date: Fri, 2 Mar 2018 18:23:27 -0800
Subject: Swap color scheme for import account label

---
 ui/app/css/itcss/components/account-menu.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ui/app/css/itcss')

diff --git a/ui/app/css/itcss/components/account-menu.scss b/ui/app/css/itcss/components/account-menu.scss
index 8ad7481c7..4752741aa 100644
--- a/ui/app/css/itcss/components/account-menu.scss
+++ b/ui/app/css/itcss/components/account-menu.scss
@@ -66,8 +66,9 @@
 
     .keyring-label {
       margin-top: 5px;
-      background-color: $black;
-      color: $dusty-gray;
+      background-color: $dusty-gray;
+      color: $black;
+      font-weight: normal;
     }
   }
 
-- 
cgit 


From ee254b4f6feeb040607472a0f4d69c7e4173c25e Mon Sep 17 00:00:00 2001
From: Thomas <tmashuang@gmail.com>
Date: Fri, 2 Mar 2018 18:24:09 -0800
Subject: Import Account disclaimer

---
 ui/app/css/itcss/components/new-account.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ui/app/css/itcss')

diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss
index 81f919df3..c6c254ede 100644
--- a/ui/app/css/itcss/components/new-account.scss
+++ b/ui/app/css/itcss/components/new-account.scss
@@ -54,6 +54,16 @@
 
 }
 
+.new-account-import-disclaimer {
+  width: 120%;
+  background-color: #F4F9FC;
+  display: inline-block;
+  align-items: center;
+  padding: 20px 30px 20px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+
 .new-account-import-form {
   display: flex;
   flex-flow: column;
-- 
cgit 


From 376ffb758fa6b6ea1fcfde1f2addf1c5a6070339 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Mon, 5 Mar 2018 14:23:00 -0330
Subject: Shapeshift form handles market info unavailable errors.

---
 ui/app/css/itcss/components/modal.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui/app/css/itcss')

diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss
index 919e1793b..53e3bff00 100644
--- a/ui/app/css/itcss/components/modal.scss
+++ b/ui/app/css/itcss/components/modal.scss
@@ -787,6 +787,10 @@
         width: auto;
         flex: 1;
       }
+
+      @media screen and (max-width: 575px) {
+        width: auto;
+      }
     }
   }
 
-- 
cgit 


From ca047b1ea0bd6778fc3b0c05b86ff23d0964f98d Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 7 Mar 2018 15:22:10 -0330
Subject: Update network colours for better accessibility. (#3469)

---
 ui/app/css/itcss/settings/variables.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui/app/css/itcss')

diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss
index 4c0972527..d96c1ae43 100644
--- a/ui/app/css/itcss/settings/variables.scss
+++ b/ui/app/css/itcss/settings/variables.scss
@@ -46,6 +46,10 @@ $manatee: #93949d;
 $spindle: #c7ddec;
 $mid-gray: #5b5d67;
 $cape-cod: #38393a;
+$java: #29b6af;
+$wild-strawberry: #ff4a8d;
+$cornflower-blue: #7057ff;
+$saffron: #f6c343;
 
 /*
   Z-Indicies
-- 
cgit