diff --git a/src/ui/BasicPanel.js b/src/ui/BasicPanel.js index aa4eae240d..afa9ee88c1 100644 --- a/src/ui/BasicPanel.js +++ b/src/ui/BasicPanel.js @@ -3,6 +3,16 @@ var style = require('./styles/basicStyles') var yo = require('yo-yo') var ui = require('../helpers/ui') +var csjs = require('csjs-inject') +var styleGuide = require('./styles/style-guide') +var styles = styleGuide() + +var css = csjs` + .container { + width: 70%; + } +` + function BasicPanel (_name, _width, _height) { this.data this.name = _name @@ -24,7 +34,8 @@ BasicPanel.prototype.show = function () { } BasicPanel.prototype.render = function () { - var view = yo`
+ var view = yo` +
${this.name}
diff --git a/src/ui/DropdownPanel.js b/src/ui/DropdownPanel.js index 0a3a6ac7f7..29546fcbec 100644 --- a/src/ui/DropdownPanel.js +++ b/src/ui/DropdownPanel.js @@ -6,6 +6,35 @@ var basicStyles = require('./styles/basicStyles') var TreeView = require('./TreeView') var EventManager = require('../lib/eventManager') +var csjs = require('csjs-inject') +var styleGuide = require('./styles/style-guide') +var styles = styleGuide() + +var css = csjs` + .title { + margin-top: 10px; + ${styles.dropdown} + display: flex; + align-items: center; + } + .name { + color: ${styles.colors.black}; + font-weight: bold; + } + .icon { + color: ${styles.colors.black}; + margin-right: 5%; + } + .eyeButton { + ${styles.button} + margin: 3px; + float: right; + } + .eyeButton:hover { + color: ${styles.colors.orange}; + } +` + function DropdownPanel (_name, _opts) { this.event = new EventManager() if (!_opts) { @@ -79,12 +108,12 @@ DropdownPanel.prototype.render = function (overridestyle) { to {transform:rotate(359deg);} } -
-
-
${this.name}
+
+
+
${this.name}
-
+
${this.basicPanel.render()}
`