From c48f803bf62bd8092b5f528ba411a79211605a58 Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Mon, 14 Aug 2017 18:29:36 +0100 Subject: [PATCH] Unify dropdown menues = apply strickly from style-guide --- assets/css/browser-solidity.css | 10 ---------- src/app/dropdown.js | 18 ------------------ src/app/tabs/compile-tab.js | 4 ---- src/app/tabs/run-tab.js | 14 +------------- src/app/tabs/settings-tab.js | 2 -- src/style-guide.js | 8 +++++--- 6 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 src/app/dropdown.js diff --git a/assets/css/browser-solidity.css b/assets/css/browser-solidity.css index 2ed1ed39ee..519ab0bdf5 100644 --- a/assets/css/browser-solidity.css +++ b/assets/css/browser-solidity.css @@ -200,16 +200,6 @@ font-weight: bold; } -#righthand-panel #versionSelector { - text-decoration: none; - background-color: #C6CFF7; - cursor: pointer; - font-size: 12px; - color: black; - border-radius: 3px; - border: 0 none; -} - .contract.hidesub { padding-bottom: 0; margin: 0; diff --git a/src/app/dropdown.js b/src/app/dropdown.js deleted file mode 100644 index fecd376bfb..0000000000 --- a/src/app/dropdown.js +++ /dev/null @@ -1,18 +0,0 @@ -var yo = require('yo-yo') -var csjs = require('csjs-inject') - -// -------------- styling ---------------------- -var csjs = require('csjs-inject') -var styleGuide = require('./style-guide') -var styles = styleGuide() - -module.exports = dropdown - -// options = [] -function dropdown (options = []) { - var el = yo` - - ` -} diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index b76602c50a..ba85059c75 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -73,11 +73,7 @@ var css = csjs` align-items: center; } .contractNames extends ${styles.dropdown} { - width: 250px; margin-right: 5%; - height: 32px; - font-size: 12px; - font-weight: bold; } .contractButtons { display: flex; diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index b53391688a..baf32450b6 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -44,8 +44,6 @@ var css = csjs` float: left; } .select extends ${styles.dropdown} { - width: 75%; - float: left; text-align: center; } .copyaddress { @@ -58,11 +56,6 @@ var css = csjs` .copyaddress:hover { opacity: 1; } - .selectAddress extends ${styles.dropdown} { - width: 70%; - float: left; - text-align: center; - } .instanceContainer extends ${styles.displayBox} { display: flex; flex-direction: column; @@ -73,11 +66,6 @@ var css = csjs` margin-top: 2%; } .contractNames extends ${styles.dropdown} { - height: 32px; - font-size: 12px; - width: 100%; - font-weight: bold; - background-color: ${styles.colors.lightGrey} } .buttons { display: flex; @@ -371,7 +359,7 @@ function settings (appAPI, appEvents) {
Account
- +
diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js index eb3c62b5a2..ab88e1b3f0 100644 --- a/src/app/tabs/settings-tab.js +++ b/src/app/tabs/settings-tab.js @@ -19,8 +19,6 @@ var css = csjs` display: flex; } .select extends ${styles.dropdown} { - float: left; - max-width: 90%; } } ` diff --git a/src/style-guide.js b/src/style-guide.js index 31777b50d2..6aa28f5509 100644 --- a/src/style-guide.js +++ b/src/style-guide.js @@ -151,7 +151,8 @@ function styleGuide () { } .dropdown { - font-size : 10px; + font-size : 12px; + font-weight : bold; padding : 0 8px; text-decoration : none; background-color : ${colors.white}; @@ -159,9 +160,10 @@ function styleGuide () { border : 1px solid ${colors.lightGrey}; border-radius : 3px; height : 30px; + width : 250px; text-align : center; - overflow : hidden; - word-break : normal; + overflow : hidden; + word-break : normal; } `