Re-instating the DARK theme.
Change-Id: Ic499b4991e41747cc9472838397e5e57cd4ad089
diff --git a/web/gui/src/main/webapp/app/fw/widget/button-theme.css b/web/gui/src/main/webapp/app/fw/widget/button-theme.css
index 3f2279e..ff36e3f 100644
--- a/web/gui/src/main/webapp/app/fw/widget/button-theme.css
+++ b/web/gui/src/main/webapp/app/fw/widget/button-theme.css
@@ -77,10 +77,59 @@
}
-/* TODO: dark theme */
-/* Selected toggle / radio button */
+/* ========== DARK Theme ========== */
+/* Selected toggle / radio button */
.dark .toggleButton.selected svg.embeddedIcon .icon rect,
.dark .radioButton.selected svg.embeddedIcon .icon rect {
- fill: #e7e7e7;
+ fill: #353e45;
+}
+
+/* Selected:hover (normal) button */
+.dark .button:hover svg.embeddedIcon .icon rect {
+ stroke: white;
+ stroke-width: 1px;
+}
+
+/* Selected:hover toggle-button */
+.dark .toggleButton.selected:hover svg.embeddedIcon .icon rect {
+ fill: #444d54;
+ stroke: white;
+ stroke-width: 1px;
+}
+
+/* Selected toggle/radio button and normal button glyph color */
+.dark .button svg.embeddedIcon .glyph,
+.dark .toggleButton.selected svg.embeddedIcon .glyph,
+.dark .radioButton.selected svg.embeddedIcon .glyph {
+ fill: #5b99d2;
+}
+
+
+/* === UNSELECTED BUTTONS === */
+
+/* Unselected toggle / radio button */
+.dark .toggleButton svg.embeddedIcon .icon rect,
+.dark .radioButton svg.embeddedIcon .icon rect {
+ /* no fill */
+}
+
+/* Unselected:hover toggle / radio button */
+.dark .toggleButton:hover svg.embeddedIcon .icon rect,
+.dark .radioButton:hover:not(.selected) svg.embeddedIcon .icon rect {
+ fill: #353e45;
+ stroke: white;
+ stroke-width: 1px;
+}
+
+/* Unselected toggle / radio button */
+.dark .toggleButton svg.embeddedIcon .glyph,
+.dark .radioButton svg.embeddedIcon .glyph {
+ fill: #bbb;
+}
+
+/* Unselected:hover toggle / radio button */
+.dark .toggleButton:hover:not(.selected) svg.embeddedIcon .glyph,
+.dark .radioButton:hover:not(.selected) svg.embeddedIcon .glyph {
+ fill: #5b99d2;
}
diff --git a/web/gui/src/main/webapp/app/fw/widget/table-theme.css b/web/gui/src/main/webapp/app/fw/widget/table-theme.css
index 1849bdd..d8b22a2 100644
--- a/web/gui/src/main/webapp/app/fw/widget/table-theme.css
+++ b/web/gui/src/main/webapp/app/fw/widget/table-theme.css
@@ -20,19 +20,10 @@
background-color: #e5e5e6;
color: #3c3a3a;
}
-.dark div.summary-list .table-header td {
- /* TODO: dark theme */
- background-color: #e5e5e6;
- color: #3c3a3a;
-}
.light div.summary-list td {
color: #3c3a3a;
}
-.dark div.summary-list td {
- /* TODO: dark theme */
- color: #3c3a3a;
-}
.light div.summary-list tr:nth-child(even) {
background-color: #f4f4f4;
@@ -40,38 +31,18 @@
.light div.summary-list tr:nth-child(odd) {
background-color: #fbfbfb;
}
-.dark div.summary-list tr:nth-child(even) {
- /* TODO: dark theme */
- background-color: #f4f4f4;
-}
-.dark div.summary-list tr:nth-child(odd) {
- /* TODO: dark theme */
- background-color: #fbfbfb;
-}
.light div.summary-list tr.selected {
background-color: #dbeffc !important;
}
-.dark div.summary-list tr.selected {
- /* TODO: dark theme */
- background-color: #dbeffc;
-}
.light div.summary-list tr.data-change {
- /* todo - theme color */
background-color: #FDFFDC;
}
-.dark div.summary-list tr.data-change {
- /* TODO: dark theme */
- background-color: #FDFFDC;
-}
-
/* --- Control Buttons --- */
-/* TODO: dark theme */
-
/* INACTIVE */
.light .ctrl-btns div svg.embeddedIcon g.icon use {
fill: #e0dfd6;
@@ -108,3 +79,74 @@
.light .ctrl-btns div.refresh.active:hover svg.embeddedIcon g.icon use {
fill: #ce5b58;
}
+
+
+/* ========== DARK Theme ========== */
+
+.dark div.summary-list .table-header td {
+ background-color: #222222;
+ color: #cccccc;
+}
+
+.dark div.summary-list td {
+ /* note: don't put background-color here */
+ color: #cccccc;
+}
+.dark div.summary-list tr.no-data td {
+ background-color: #333333;
+}
+
+.dark div.summary-list tr:nth-child(even) {
+ background-color: #333333;
+}
+.dark div.summary-list tr:nth-child(odd) {
+ background-color: #3a3a3a;
+}
+
+.dark div.summary-list tr.selected {
+ background-color: #304860 !important;
+}
+
+
+.dark div.summary-list tr.data-change {
+ background-color: #423708;
+}
+
+/* --- Control Buttons --- */
+
+/* INACTIVE */
+.dark .ctrl-btns div svg.embeddedIcon g.icon use {
+ fill: #444444;
+}
+/* note: no change for inactive buttons when hovered */
+
+
+/* ACTIVE */
+.dark .ctrl-btns div.active svg.embeddedIcon g.icon use {
+ fill: #939598;
+}
+.dark .ctrl-btns div.active:hover svg.embeddedIcon g.icon use {
+ fill: #ce5b58;
+}
+
+/* CURRENT-VIEW */
+.dark .ctrl-btns div.current-view svg.embeddedIcon g.icon rect {
+ fill: #518ecc;
+}
+.dark .ctrl-btns div.current-view svg.embeddedIcon g.icon use {
+ fill: #dddddd;
+}
+
+/* REFRESH */
+.dark .ctrl-btns div.refresh svg.embeddedIcon g.icon use {
+ fill: #364144;
+}
+.dark .ctrl-btns div.refresh:hover svg.embeddedIcon g.icon use {
+ fill: #ce5b58;
+}
+.dark .ctrl-btns div.refresh.active svg.embeddedIcon g.icon use {
+ fill: #0074a6;
+}
+.dark .ctrl-btns div.refresh.active:hover svg.embeddedIcon g.icon use {
+ fill: #ce5b58;
+}
diff --git a/web/gui/src/main/webapp/app/fw/widget/toolbar-theme.css b/web/gui/src/main/webapp/app/fw/widget/toolbar-theme.css
index f3ac717..f04a923 100644
--- a/web/gui/src/main/webapp/app/fw/widget/toolbar-theme.css
+++ b/web/gui/src/main/webapp/app/fw/widget/toolbar-theme.css
@@ -18,26 +18,32 @@
ONOS GUI -- Toolbar Service (theme) -- CSS file
*/
-.light .tbar-arrow svg.embeddedIcon .icon .glyph {
- fill: #838383;
-}
-.dark .tbar-arrow svg.embeddedIcon .icon .glyph {
- fill: #B2B2B2;
-}
-
.tbar-arrow svg.embeddedIcon .icon rect {
stroke: none;
}
-.light .tbar-arrow svg.embeddedIcon .icon rect {
- fill: none;
+
+.light .tbar-arrow svg.embeddedIcon .icon .glyph {
+ fill: #838383;
}
-.dark .tbar-arrow svg.embeddedIcon .icon rect {
+
+.light .tbar-arrow svg.embeddedIcon .icon rect {
fill: none;
}
.light .separator {
border-color: #ddd;
}
+
+/* ========== DARK Theme ========== */
+
+.dark .tbar-arrow svg.embeddedIcon .icon .glyph {
+ fill: #B2B2B2;
+}
+
+.dark .tbar-arrow svg.embeddedIcon .icon rect {
+ fill: none;
+}
+
.dark .separator {
- border-color: #1A1A1A;
+ border-color: #454545;
}
diff --git a/web/gui/src/main/webapp/app/fw/widget/tooltip-theme.css b/web/gui/src/main/webapp/app/fw/widget/tooltip-theme.css
index 3055083..3f5450b 100644
--- a/web/gui/src/main/webapp/app/fw/widget/tooltip-theme.css
+++ b/web/gui/src/main/webapp/app/fw/widget/tooltip-theme.css
@@ -26,8 +26,7 @@
}
.dark #tooltip {
- /* TODO: dark theme */
- background-color: #dbeffc;
- color: #3c3a3a;
- border-color: #c7c7c0;
+ background-color: #3a3a60;
+ border-color: #6c6a6a;
+ color: #c7c7c0;
}