From ba4314bf77178d5b35926d14116d9275a92d532d Mon Sep 17 00:00:00 2001 From: flouc001 Date: Thu, 18 May 2017 16:05:22 +0100 Subject: [PATCH] colour changes to wse --- src/bonsai.js | 4 +- style/less/colours.less | 6 +- style/less/workspace_explorer.less | 97 ++++-------------------------- style/new-style.css | 73 ++++++---------------- 4 files changed, 39 insertions(+), 141 deletions(-) diff --git a/src/bonsai.js b/src/bonsai.js index 46d49ad7..c65c3784 100644 --- a/src/bonsai.js +++ b/src/bonsai.js @@ -12,7 +12,7 @@ function Bonsai(e,o){ //e:dom element, o:options={children:function(id,callback) } var toggleNode=function(tgt){ var a=tgt, node=bt.nodes[a.parentNode.dataset.id];if(!node||!node.expandable)return - node.expanded=1-!!node.expanded; a.textContent='⊞⊟'[+!!node.expanded] + node.expanded=1-!!node.expanded; a.textContent='+-'[+!!node.expanded] node.expanded&&o.children(node.id,function(children){ node.children=children children.forEach(function(c){bt.nodes[c.id]=c}) @@ -65,7 +65,7 @@ Bonsai.prototype={ render:function(node,selected){ var bt=this return'
'+ - (node.expandable?''+'⊞⊟'[+!!node.expanded]+'' + (node.expandable?''+'+-'[+!!node.expanded]+'' :'')+ ''+ node.text+ diff --git a/style/less/colours.less b/style/less/colours.less index 56c8c6c8..92adb3ee 100644 --- a/style/less/colours.less +++ b/style/less/colours.less @@ -39,4 +39,8 @@ @DLG_BG_COL:@WIN_BG_COL; @DLG_SHADOW_COL:fade(@WIN_BORDER_COL,50%); @DLG_BORDER_COL:@WIN_BORDER_COL; -@LM_HEADER_COL:@WIN_BG_COL; \ No newline at end of file +@LM_HEADER_COL:@WIN_BG_COL; +@WSE_YELLOW:#ffd800; +@WSE_GREEN:#00ff48; +@WSE_ORANGE:#ff5a00; +@WSE_PURPLE:#9c00ff; \ No newline at end of file diff --git a/style/less/workspace_explorer.less b/style/less/workspace_explorer.less index cd1828e1..5b7bd1a7 100644 --- a/style/less/workspace_explorer.less +++ b/style/less/workspace_explorer.less @@ -49,6 +49,7 @@ color: @color_1; text-align: center; margin-right: .2em; + color:#1c1e28 !important; } } .bt_text.selected { @@ -74,112 +75,40 @@ text-align: center; margin-right: .2em; } - .bt_icon_2_1 { + .bt_icon_2_1,.bt_icon_2_2,.bt_icon_2_3,.bt_icon_2_6 { &::before { content: "v"; - background: #f88; + background:@WSE_ORANGE; } } - .bt_icon_2_2 { - &::before { - content: "v"; - background: #f88; - } - } - .bt_icon_2_3 { - &::before { - content: "v"; - background: #f88; - } - } - .bt_icon_2_6 { - &::before { - content: "v"; - background: #f88; - } - } - .bt_icon_3_1 { - &::before { - content: "f"; - background: #8cc; - } - } - .bt_icon_3_2 { - &::before { - content: "f"; - background: #8cc; - } - } - .bt_icon_3_3 { - &::before { - content: "f"; - background: #8cc; - } - } - .bt_icon_3_6 { + .bt_icon_3_1,.bt_icon_3_2,.bt_icon_3_3,.bt_icon_3_6 { &::before { content: "f"; - background: #8cc; + background:@WSE_GREEN; } } - .bt_icon_4_1 { + .bt_icon_4_1,.bt_icon_4_2,.bt_icon_4_3 { &::before { content: "o"; - background: #88f; + background:@WSE_PURPLE; } } - .bt_icon_4_2 { - &::before { - content: "o"; - background: #88f; - } - } - .bt_icon_4_3 { - &::before { - content: "o"; - background: #88f; - } - } - .bt_icon_9_1 { - &::before { - content: "n"; - background: #fc8; - } - } - .bt_icon_1 { + .bt_icon_9_1,.bt_icon_1,.bt_icon_9_2{ &::before { content: "n"; - background: #fc8; - } - } - .bt_icon_9_2 { - &::before { - content: "n"; - background: #fc8; - } - } - .bt_icon_9_4 { - &::before { - content: "c"; - background: #fc8; - } - } - .bt_icon_9_5 { - &::before { - content: "i"; - background: #fc8; + background:@WSE_YELLOW; } } - .bt_icon_9_6 { + .bt_icon_9_4,.bt_icon_9_6 { &::before { content: "c"; - background: #fc8; + background:@WSE_YELLOW; } } - .bt_icon_9_7 { + .bt_icon_9_5,.bt_icon_9_7 { &::before { content: "i"; - background: #fc8; + background:@WSE_YELLOW; } } } diff --git a/style/new-style.css b/style/new-style.css index 27d06a61..4e42d502 100644 --- a/style/new-style.css +++ b/style/new-style.css @@ -1569,6 +1569,7 @@ input.lyt_g3:hover { color: #fff; text-align: center; margin-right: .2em; + color: #1c1e28 !important; } #wse .bt_text.selected { background-color: rgba(128, 128, 128, 0.5); @@ -1593,77 +1594,41 @@ input.lyt_g3:hover { text-align: center; margin-right: .2em; } -#wse .bt_icon_2_1::before { - content: "v"; - background: #f88; -} -#wse .bt_icon_2_2::before { - content: "v"; - background: #f88; -} -#wse .bt_icon_2_3::before { - content: "v"; - background: #f88; -} +#wse .bt_icon_2_1::before, +#wse .bt_icon_2_2::before, +#wse .bt_icon_2_3::before, #wse .bt_icon_2_6::before { content: "v"; - background: #f88; -} -#wse .bt_icon_3_1::before { - content: "f"; - background: #8cc; -} -#wse .bt_icon_3_2::before { - content: "f"; - background: #8cc; -} -#wse .bt_icon_3_3::before { - content: "f"; - background: #8cc; + background: #ff5a00; } +#wse .bt_icon_3_1::before, +#wse .bt_icon_3_2::before, +#wse .bt_icon_3_3::before, #wse .bt_icon_3_6::before { content: "f"; - background: #8cc; -} -#wse .bt_icon_4_1::before { - content: "o"; - background: #88f; -} -#wse .bt_icon_4_2::before { - content: "o"; - background: #88f; + background: #00ff48; } +#wse .bt_icon_4_1::before, +#wse .bt_icon_4_2::before, #wse .bt_icon_4_3::before { content: "o"; - background: #88f; -} -#wse .bt_icon_9_1::before { - content: "n"; - background: #fc8; -} -#wse .bt_icon_1::before { - content: "n"; - background: #fc8; + background: #9c00ff; } +#wse .bt_icon_9_1::before, +#wse .bt_icon_1::before, #wse .bt_icon_9_2::before { content: "n"; - background: #fc8; -} -#wse .bt_icon_9_4::before { - content: "c"; - background: #fc8; -} -#wse .bt_icon_9_5::before { - content: "i"; - background: #fc8; + background: #ffd800; } +#wse .bt_icon_9_4::before, #wse .bt_icon_9_6::before { content: "c"; - background: #fc8; + background: #ffd800; } +#wse .bt_icon_9_5::before, #wse .bt_icon_9_7::before { content: "i"; - background: #fc8; + background: #ffd800; } .bt_collapsed > div { display: none;