ONOS-4359: continued work on theming UI
- topo view: device icon and label re-theming (WIP)
Change-Id: I5ecbc1c5b8a8315bfadfaacf62cfdb0e6d1f5a9c
diff --git a/web/gui/src/main/webapp/app/view/topo/topo-theme.css b/web/gui/src/main/webapp/app/view/topo/topo-theme.css
index 052ef61..197b6d6 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo-theme.css
+++ b/web/gui/src/main/webapp/app/view/topo/topo-theme.css
@@ -20,23 +20,23 @@
/* --- Base SVG Layer --- */
-.light #ov-topo svg {
+#ov-topo svg {
background-color: #f4f4f4;
}
/* --- "No Devices" Layer --- */
-.light #ov-topo svg .noDevsBird {
+#ov-topo svg .noDevsBird {
fill: #db7773;
}
-.light #ov-topo svg #topo-noDevsLayer text {
+#ov-topo svg #topo-noDevsLayer text {
fill: #7e9aa8;
}
/* --- Topo Map --- */
-.light #ov-topo svg #topo-map {
+#ov-topo svg #topo-map {
stroke-width: 2px;
stroke: #f4f4f4;
fill: #e5e5e6;
@@ -44,19 +44,19 @@
/* --- general topo-panel styling --- */
-.light .topo-p svg .glyph {
+.topo-p svg .glyph {
fill: #222;
}
-.light .topo-p svg .glyph.overlay {
+.topo-p svg .glyph.overlay {
fill: #fff;
}
-.light .topo-p h2 {
+.topo-p h2 {
color: black;
}
-.light .topo-p h3 {
+.topo-p h3 {
color: black;
}
@@ -67,7 +67,7 @@
.topo-p td.value {
}
-.light .topo-p hr {
+.topo-p hr {
background-color: #ccc;
color: #ccc;
}
@@ -76,18 +76,14 @@
#topo-p-instance svg rect {
stroke-width: 0;
-}
-#topo-p-instance .online svg rect {
- opacity: 1;
-}
-.light #topo-p-instance svg rect {
- fill: #fbfbfb;
-}
-/* body of an instance */
-.light #topo-p-instance .online svg rect {
fill: #fbfbfb;
}
+/* body of an instance */
+#topo-p-instance .online svg rect {
+ opacity: 1;
+ fill: #fbfbfb;
+}
#topo-p-instance svg .glyph {
fill: #fff;
@@ -100,19 +96,15 @@
/* offline */
#topo-p-instance svg .badgeIcon {
opacity: 0.4;
-}
-.light #topo-p-instance svg .badgeIcon {
fill: #939598;
}
/* online */
#topo-p-instance .online svg .badgeIcon {
opacity: 1.0;
-}
-.light #topo-p-instance .online svg .badgeIcon {
fill: #939598;
}
-.light #topo-p-instance .online svg .badgeIcon.bird {
+#topo-p-instance .online svg .badgeIcon.bird {
fill: #ffffff;
}
@@ -126,14 +118,11 @@
#topo-p-instance svg text {
text-anchor: left;
opacity: 0.5;
-}
-#topo-p-instance .online svg text {
- opacity: 1.0;
-}
-.light #topo-p-instance svg text {
fill: #3c3a3a;
}
-.light #topo-p-instance .online svg text {
+
+#topo-p-instance .online svg text {
+ opacity: 1.0;
fill: #3c3a3a;
}
@@ -143,11 +132,11 @@
#topo-p-instance .onosInst.mastership.affinity {
opacity: 1.0;
}
-.light #topo-p-instance .onosInst.mastership.affinity svg rect {
+#topo-p-instance .onosInst.mastership.affinity svg rect {
filter: url(#blue-glow);
}
-.light.firefox #topo-p-instance .onosInst.mastership.affinity svg rect {
+.firefox #topo-p-instance .onosInst.mastership.affinity svg rect {
filter: url("data:image/svg+xml;utf8, <svg xmlns = \'http://www.w3.org/2000/svg\'><filter x=\"-50%\" y=\"-50%\" width=\"200%\" height=\"200%\" id=\"blue-glow\"><feColorMatrix type=\"matrix\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.7 0 0 0 1 0 \"></feColorMatrix><feGaussianBlur stdDeviation=\"3\" result=\"coloredBlur\"></feGaussianBlur><feMerge><feMergeNode in=\"coloredBlur\"></feMergeNode><feMergeNode in=\"SourceGraphic\"></feMergeNode></feMerge></filter></svg>#blue-glow");
}
@@ -161,84 +150,51 @@
opacity: 0.2 !important;
}
-.light #ov-topo svg .node.selected rect,
-.light #ov-topo svg .node.selected circle {
+#ov-topo svg .node.selected rect,
+#ov-topo svg .node.selected circle {
fill: #f90;
filter: url(#blue-glow);
}
-/*.dark #ov-topo svg .node.selected rect,*/
-/*.dark #ov-topo svg .node.selected circle {*/
- /*fill: #f90;*/
- /*filter: url(#yellow-glow);*/
-/*}*/
-.light.firefox #ov-topo svg .node.selected rect,
-.light.firefox #ov-topo svg .node.selected circle {
+.firefox #ov-topo svg .node.selected rect,
+.firefox #ov-topo svg .node.selected circle {
filter: url("data:image/svg+xml;utf8, <svg xmlns = \'http://www.w3.org/2000/svg\'><filter x=\"-50%\" y=\"-50%\" width=\"200%\" height=\"200%\" id=\"blue-glow\"><feColorMatrix type=\"matrix\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.7 0 0 0 1 0 \"></feColorMatrix><feGaussianBlur stdDeviation=\"3\" result=\"coloredBlur\"></feGaussianBlur><feMerge><feMergeNode in=\"coloredBlur\"></feMergeNode><feMergeNode in=\"SourceGraphic\"></feMergeNode></feMerge></filter></svg>#blue-glow");
}
-/*.dark.firefox #ov-topo svg .node.selected rect,*/
-/*.dark.firefox #ov-topo svg .node.selected circle {*/
- /*filter: url("data:image/svg+xml;utf8, <svg xmlns = \'http://www.w3.org/2000/svg\'><filter x=\"-50%\" y=\"-50%\" width=\"200%\" height=\"200%\" id=\"yellow-glow\"><feColorMatrix type=\"matrix\" values=\"0 0 0 0 1.0 0 0 0 0 1.0 0 0 0 0 0.3 0 0 0 1 0 \"></feColorMatrix><feGaussianBlur stdDeviation=\"3\" result=\"coloredBlur\"></feGaussianBlur><feMerge><feMergeNode in=\"coloredBlur\"></feMergeNode><feMergeNode in=\"SourceGraphic\"></feMergeNode></feMerge></filter></svg>#yellow-glow");*/
-/*}*/
/* Device Nodes */
+/* note: device without the 'online' class is offline */
#ov-topo svg .node.device rect {
- stroke-width: 1.5;
+ /* TODO: theme */
+ fill: #f0f0f0;
}
-
-#ov-topo svg .node.device.fixed rect {
- stroke-width: 1.5;
-}
-.light #ov-topo svg .node.device.fixed rect {
- stroke: #aaa;
-}
-
-/* note: device is offline without the 'online' class */
-.light #ov-topo svg .node.device {
- fill: #777;
-}
-
-.light #ov-topo svg .node.device rect {
- stroke: #666;
-}
-.light #ov-topo svg .node.device rect {
- stroke: #999;
-}
-
-.light #ov-topo svg .node.device.online {
- fill: #6e7fa3;
-}
-
-/* note: device is offline without the 'online' class */
#ov-topo svg .node.device text {
+ /*TODO: theme*/
fill: #bbb;
}
-
-#ov-topo svg .node.device.online text {
- fill: white;
-}
-
-#ov-topo svg .node.device .svgIcon rect {
- fill: #aaa;
-}
-#ov-topo svg .node.device .svgIcon use {
+#ov-topo svg .node.device use {
+ /*TODO: theme*/
fill: #777;
}
-#ov-topo svg .node.device.selected .svgIcon rect {
- fill: #f90;
+
+
+#ov-topo svg .node.device.online rect {
+ fill: #ffffff;
}
-#ov-topo svg .node.device.online .svgIcon rect {
- fill: #ccc;
+#ov-topo svg .node.device.online text {
+ fill: #3c3a3a;
}
-#ov-topo svg .node.device.online .svgIcon use {
- fill: #000;
+#ov-topo svg .node.device.online use {
+ /* NOTE: this gets overridden programatically */
+ fill: #454545;
}
-#ov-topo svg .node.device.online.selected .svgIcon rect {
+
+
+#ov-topo svg .node.device.selected rect {
fill: #f90;
}
/* Badges */
-/* (... works for both light and dark themes...) */
+/* (... works for bothand dark themes...) */
#ov-topo svg .node .badge circle {
stroke: #aaa;
}
@@ -279,17 +235,15 @@
#ov-topo svg .node.host text {
stroke: none;
font: 9pt sans-serif;
-}
-.light #ov-topo svg .node.host text {
fill: #846;
}
-.light svg .node.host circle {
- stroke: #000;
- fill: #edb;
+svg .node.host circle {
+ stroke: #a3a596;
+ fill: #e0dfd6;
}
-.light svg .node.host .svgIcon {
+svg .node.host .svgIcon {
fill: #444;
}
@@ -302,24 +256,12 @@
#ov-topo svg .link.selected,
#ov-topo svg .link.enhanced {
stroke-width: 4.5px;
-}
-.light #ov-topo svg .link.selected,
-.light #ov-topo svg .link.enhanced {
filter: url(#blue-glow);
}
-/*.dark #ov-topo svg .link.selected,*/
-/*.dark #ov-topo svg .link.enhanced {*/
- /*filter: url(#yellow-glow);*/
-/*}*/
-.light.firefox #ov-topo svg .link.selected,
-.light.firefox #ov-topo svg .link.enhanced {
+.firefox #ov-topo svg .link.selected,
+.firefox #ov-topo svg .link.enhanced {
filter: url("data:image/svg+xml;utf8, <svg xmlns = \'http://www.w3.org/2000/svg\'><filter x=\"-50%\" y=\"-50%\" width=\"200%\" height=\"200%\" id=\"blue-glow\"><feColorMatrix type=\"matrix\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.7 0 0 0 1 0 \"></feColorMatrix><feGaussianBlur stdDeviation=\"3\" result=\"coloredBlur\"></feGaussianBlur><feMerge><feMergeNode in=\"coloredBlur\"></feMergeNode><feMergeNode in=\"SourceGraphic\"></feMergeNode></feMerge></filter></svg>#blue-glow");
}
-/*.dark.firefox #ov-topo svg .link.selected,*/
-/*.dark.firefox #ov-topo svg .link.enhanced {*/
- /*filter: url("data:image/svg+xml;utf8, <svg xmlns = \'http://www.w3.org/2000/svg\'><filter x=\"-50%\" y=\"-50%\" width=\"200%\" height=\"200%\" id=\"yellow-glow\"><feColorMatrix type=\"matrix\" values=\"0 0 0 0 1.0 0 0 0 0 1.0 0 0 0 0 0.3 0 0 0 1 0 \"></feColorMatrix><feGaussianBlur stdDeviation=\"3\" result=\"coloredBlur\"></feGaussianBlur><feMerge><feMergeNode in=\"coloredBlur\"></feMergeNode><feMergeNode in=\"SourceGraphic\"></feMergeNode></feMerge></filter></svg>#yellow-glow");*/
-
-/*}*/
#ov-topo svg .link.inactive {
opacity: .5;
@@ -334,29 +276,27 @@
#ov-topo svg .link.secondary {
stroke-width: 3px;
-}
-.light #ov-topo svg .link.secondary {
stroke: rgba(0,153,51,0.5);
}
/* Port traffic color visualization for Kbps, Mbps, and Gbps */
-.light #ov-topo svg .link.secondary.port-traffic-Kbps {
+#ov-topo svg .link.secondary.port-traffic-Kbps {
stroke: rgb(0,153,51);
stroke-width: 5.0;
}
-.light #ov-topo svg .link.secondary.port-traffic-Mbps {
+#ov-topo svg .link.secondary.port-traffic-Mbps {
stroke: rgb(128,145,27);
stroke-width: 6.5;
}
-.light #ov-topo svg .link.secondary.port-traffic-Gbps {
+#ov-topo svg .link.secondary.port-traffic-Gbps {
stroke: rgb(255, 137, 3);
stroke-width: 8.0;
}
-.light #ov-topo svg .link.secondary.port-traffic-Gbps-choked {
+#ov-topo svg .link.secondary.port-traffic-Gbps-choked {
stroke: rgb(183, 30, 21);
stroke-width: 8.0;
}
@@ -380,34 +320,26 @@
#ov-topo svg .link.primary {
stroke-width: 4px;
-}
-.light #ov-topo svg .link.primary {
stroke: #ffA300;
}
#ov-topo svg .link.secondary.optical {
stroke-width: 4px;
-}
-.light #ov-topo svg .link.secondary.optical {
stroke: rgba(128,64,255,0.5);
}
#ov-topo svg .link.primary.optical {
stroke-width: 6px;
-}
-.light #ov-topo svg .link.primary.optical {
stroke: #74f;
}
/* Link Labels */
#ov-topo svg .linkLabel rect {
stroke: none;
-}
-.light #ov-topo svg .linkLabel rect {
fill: #eee;
}
-.light #ov-topo svg .linkLabel text {
+#ov-topo svg .linkLabel text {
fill: #444;
}
@@ -415,54 +347,52 @@
#ov-topo svg .portLabel rect {
stroke: none;
-}
-.light #ov-topo svg .portLabel rect {
fill: #eee;
}
-.light #ov-topo svg .portLabel text {
+#ov-topo svg .portLabel text {
fill: #444;
}
/* Number of Links Labels */
-.light #ov-topo text.numLinkText {
+#ov-topo text.numLinkText {
fill: #444;
}
/* ------------------------------------------------- */
/* Sprite Layer */
-.light #ov-topo svg #topo-sprites .gold1 use {
+#ov-topo svg #topo-sprites .gold1 use {
stroke: #fda;
fill: none;
}
-.light #ov-topo svg #topo-sprites .gold1 text {
+#ov-topo svg #topo-sprites .gold1 text {
fill: #eda;
}
-.light #ov-topo svg #topo-sprites .blue1 use {
+#ov-topo svg #topo-sprites .blue1 use {
stroke: #bbd;
fill: none;
}
-.light #ov-topo svg #topo-sprites .blue1 text {
+#ov-topo svg #topo-sprites .blue1 text {
fill: #cce;
}
-.light #ov-topo svg #topo-sprites .gray1 use {
+#ov-topo svg #topo-sprites .gray1 use {
stroke: #ccc;
fill: none;
}
-.light #ov-topo svg #topo-sprites .gray1 text {
+#ov-topo svg #topo-sprites .gray1 text {
fill: #ddd;
}
/* fills */
-.light #ov-topo svg #topo-sprites use.fill-gray2 {
+#ov-topo svg #topo-sprites use.fill-gray2 {
fill: #eee;
}
-.light #ov-topo svg #topo-sprites use.fill-blue2 {
+#ov-topo svg #topo-sprites use.fill-blue2 {
fill: #bce;
}