colour changes to wse

Dyalog · May 18, 2017 · ba4314b · ba4314b
1 parent e95fda3
commit ba4314b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 141 deletions.
diff --git 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'<div data-id="'+node.id+'">'+
-            (node.expandable?'<a class=bt_node_expand>'+'⊞⊟'[+!!node.expanded]+'</a>'
+            (node.expandable?'<a class=bt_node_expand>'+'+-'[+!!node.expanded]+'</a>'
                             :'<a class=bt_node_indent></a>')+
             '<span tabIndex=-1 data-id='+node.id+' class="bt_icon_'+node.icon+' bt_text '+(selected?'selected':'')+'">'+
               node.text+

diff --git 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;
+@LM_HEADER_COL:@WIN_BG_COL;
+@WSE_YELLOW:#ffd800;
+@WSE_GREEN:#00ff48;
+@WSE_ORANGE:#ff5a00;
+@WSE_PURPLE:#9c00ff;
diff --git 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
@@ -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;