Merge pull request ethereum#2180 from ethereum/swapPanelHeight

fixed swapPanel height
djudjuu · Jul 16, 2019 · 4fd502d · 4fd502d
2 parents b4c2f9d + 8ad8793
commit 4fd502d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/app.js b/src/app.js
@@ -94,8 +94,6 @@ var css = csjs`
     top                : 0;
     left               : 50px;
     bottom             : 0;
-    overflow           : hidden;
-    overflow-y         : auto;
   }
   .highlightcode {
     position:absolute;

diff --git a/src/app/components/side-panel.js b/src/app/components/side-panel.js
@@ -6,7 +6,8 @@ const yo = require('yo-yo')
 const css = csjs`
   .panel {
     height: 100%;
-    overflow-y: hidden; 
+    display: flex;
+    flex-direction: column;
   }
   .swapitTitle {
     margin: 0;
@@ -21,7 +22,7 @@ const css = csjs`
   }
   .swapitHeader {
     height: 35px;
-    padding: 0 20px;
+    padding: 15px 20px;
     display: flex;
     align-items: center;
   }
@@ -30,8 +31,9 @@ const css = csjs`
     cursor: pointer;
   }
   .pluginsContainer {
-    height: calc(100% - 35px);
-    overflow: auto;
+    height: 100%;
+    flex: 1;
+    padding-bottom: 40px;
   }
   .titleInfo {
     padding-left: 10px;

diff --git a/src/app/panels/styles/terminal-styles.js b/src/app/panels/styles/terminal-styles.js
@@ -7,7 +7,6 @@ var css = csjs`
     flex-direction    : column;
     font-size         : 12px;
     min-height        : 3em;
-    overflow          : hidden;
   }
   .bar                {
     display           : flex;

diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js
@@ -8,11 +8,12 @@ var css = csjs`
   }
   .instanceContainerTitle {
     font-weight: bold;
-    margin-bottom: 5%;
+    margin-bottom: 25px;
     font-size: 12px;
     display: flex;
     justify-content: space-between;
     padding-left: 15px;
+    height: 0px;
   }
   .settings {
     margin-bottom: 2%;