Merge branch 'NewUI' into feat/mm-ui-5-merged

4 files changed, 40 insertions, 24 deletions

diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss
index fb135d190..75c3a68d8 100644
--- a/ui/app/css/itcss/components/network.scss
+++ b/ui/app/css/itcss/components/network.scss
@@ -2,7 +2,6 @@
   display: flex;
   align-items: center;
   font-size: 0.6em;
-
 }
 
 .network-name {
diff --git a/ui/app/css/itcss/components/sections.scss b/ui/app/css/itcss/components/sections.scss
index 4a256c65b..965abbe28 100644
--- a/ui/app/css/itcss/components/sections.scss
+++ b/ui/app/css/itcss/components/sections.scss
@@ -7,24 +7,6 @@ App Sections
 debug / dev
 */
 
-// #app-content {
-//   border: 2px solid green;
-// }
-
-// #design-container {
-//   position: absolute;
-//   left: 360px;
-//   top: -42px;
-//   width: calc(100vw - 360px);
-//   height: 100vh;
-//   overflow: scroll;
-// }
-
-// #design-container img {
-//   width: 2000px;
-//   margin-right: 600px;
-// }
-
 /* initialize */
 
 textarea.twelve-word-phrase {
@@ -507,4 +489,4 @@ div.message-container > div:first-child {
 
 .pop-hover:hover {
   transform: scale(1.1);
-}
\ No newline at end of file
+}
diff --git a/ui/app/css/itcss/tools/utilities.scss b/ui/app/css/itcss/tools/utilities.scss
index 5e26ede64..2b7ffcb04 100644
--- a/ui/app/css/itcss/tools/utilities.scss
+++ b/ui/app/css/itcss/tools/utilities.scss
@@ -261,10 +261,11 @@ hr.horizontal-line {
 
 .menu-icon {
   display: inline-block;
-  height: 9px;
-  min-width: 9px;
+  height: 12px;
+  min-width: 12px;
   margin: 13px;
 }
+
 .ether-icon {
   background: rgb(0, 163, 68);
   border-radius: 20px;
@@ -294,7 +295,6 @@ hr.horizontal-line {
   color: red;
 }
 
-
 /*
   Misc
  */
@@ -314,4 +314,4 @@ hr.horizontal-line {
   flex: 1 0 auto;
   display: flex;
   justify-content: flex-end;
-}
+}
\ No newline at end of file
diff --git a/ui/app/css/itcss/trumps/index.scss b/ui/app/css/itcss/trumps/index.scss
index 6b0c999be..a6a6e4335 100644
--- a/ui/app/css/itcss/trumps/index.scss
+++ b/ui/app/css/itcss/trumps/index.scss
@@ -51,3 +51,38 @@
 .app-primary.from-left .main-enter:not(.main-enter-active) {
   transform: translateX(-360px);
 }
+
+i.fa.fa-question-circle.fa-lg.menu-icon {
+  font-size: 18px;
+}
+
+/*
+  Hacky breakpoint fix for account + tab sections
+    Resolves issue from @frankiebee in
+    https://github.com/MetaMask/metamask-extension/pull/1835
+  Please remove this when integrating new designs
+ */
+
+// This is commented out, because it's not needed in NewUI.
+// We will have a new css architecture w/ different breakpoints.
+
+// @media screen and (min-width: 575px) and (max-width: 800px) {
+//   .account-data-subsection {
+//     flex: 0 0 auto !important; // reset flex
+//     margin-left: 10px !important; // create additional horizontal space
+//     margin-right: 10px !important;
+//     width: 40%;
+//   }
+
+//   .tabSection {
+//     flex: 0 0 auto !important;
+//     margin-left: 10px !important;
+//     margin-right: 10px !important;
+//     min-width: 285px;
+//     width: 49%;
+//   }
+
+//   .name-label {
+//     width: 80%;
+//   }
+// }