ONOS-4359: continued work on theming UI
- cleaning up device table view, and device details panel.
- updated xMark glyph, added xClose glyph.
Change-Id: I1f5e4496dbfaa58315ddf0a8c2e0f6e4ff163239
(cherry picked from commit a7f62e1)
diff --git a/web/gui/src/main/webapp/app/fw/svg/glyphData.js b/web/gui/src/main/webapp/app/fw/svg/glyphData.js
index 999073a..c1d0609 100644
--- a/web/gui/src/main/webapp/app/fw/svg/glyphData.js
+++ b/web/gui/src/main/webapp/app/fw/svg/glyphData.js
@@ -529,14 +529,8 @@
checkMark: 'M8.6,3.4L4.4,7.7L1.4,4.7L2.5,3.6L4.4,5.5L7.5,2.3L8.6,3.4Z',
- xMark: "M9.0,7.2C8.2,6.9,7.4,6.1,6.7,5.2c0.4-0.5," +
- "0.7-0.8,0.8-1.0C7.8,3.5,9.4,1.6,8.1,1.1" +
- "C6.8,0.6,6.6,1.7,6.6,1.7C6.4,2.1,6.0,2.7,5.4," +
- "3.4C4.9,2.5,4.5,1.9,4.5,1.9" +
- "S3.8,0.2,2.9,0.7C1.9,1.1,2.3,2.3,2.3,2.3c0.3,1.1,0.8,2.1,1.4,2.9" +
- "C2.5,6.4,1.3,7.4,1.3,7.4S0.8,7.8,0.8,8.1C0.9,8.3,0.9,9.6,2.4,9.1" +
- "C3.1,8.8,4.1,7.9,5.1,7.0c1.3,1.3,2.5,1.9,2.5,1.9s0.5,0.5,1.4-0.2" +
- "C9.8,7.9,9.0,7.2,9.0,7.2z",
+ xMark: "M7.8,6.7L6.7,7.8,5,6.1,3.3,7.8,2.2,6.7,3.9,5,2.2,3.3,3.3," +
+ "2.2,5,3.9,6.7,2.2,7.8,3.3,6.1,5Z",
triangleUp: "M0.5,6.2c0,0,3.8-3.8,4.2-4.2C5,1.7,5.3,2,5.3,2l4.3," +
"4.3c0,0,0.4,0.4-0.1,0.4c-1.7,0-8.2,0-8.8,0C0,6.6,0.5,6.2,0.5,6.2z",
@@ -551,7 +545,10 @@
play: "M2.5,2l5.5,3l-5.5,3z",
- stop: "M2.5,2.5h5v5h-5z"
+ stop: "M2.5,2.5h5v5h-5z",
+
+ xClose: "M8.6,6.8L6.8,8.6,5,6.8,3.2,8.6,1.4,6.8,3.2,5,1.4,3.2," +
+ "3.2,1.4,5,3.2,6.8,1.4,8.6,3.2,6.8,5Z"
},
spriteData = {
diff --git a/web/gui/src/main/webapp/app/fw/svg/icon-theme.css b/web/gui/src/main/webapp/app/fw/svg/icon-theme.css
index eee3713..bb63531 100644
--- a/web/gui/src/main/webapp/app/fw/svg/icon-theme.css
+++ b/web/gui/src/main/webapp/app/fw/svg/icon-theme.css
@@ -18,22 +18,25 @@
ONOS GUI -- Icon Service (theme) -- CSS file
*/
-.light svg.embeddedIcon g.icon .glyph {
- fill: white;
+.light div.close-btn svg.embeddedIcon g.icon .glyph {
+ fill: #9fa296;
}
-.dark svg.embeddedIcon g.icon .glyph {
- fill: white;
+.dark div.close-btn svg.embeddedIcon g.icon .glyph {
+ /* TODO: dark theme */
+ fill: #9fa296;
}
/* Sortable table headers */
.light div.tableColSort svg.embeddedIcon .icon .glyph {
- fill: black;
+ fill: #353333;
}
.dark div.tableColSort svg.embeddedIcon .icon .glyph {
- fill: #ccc;
+ /* TODO: dark theme */
+ fill: #353333;
}
+/* active / inactive (check/xmark) icons */
.light svg.embeddedIcon .icon.active .glyph {
fill: #04bf34;
}
@@ -43,25 +46,19 @@
}
.light svg.embeddedIcon .icon.inactive .glyph {
- /* TODO: */
- fill: darkred;
+ fill: #c0242b;
}
.dark svg.embeddedIcon .icon.inactive .glyph {
/* TODO: dark theme */
- fill: darkred;
+ fill: #c0242b;
}
-.light table svg.embeddedIcon {
- fill: #ccc;
-}
-.dark table svg.embeddedIcon {
- fill: #222;
-}
-.light table svg.embeddedIcon .glyph {
- fill: #333;
+.light table svg.embeddedIcon .icon .glyph {
+ fill: #3c3a3a;
}
.dark table svg.embeddedIcon .glyph {
- fill: #ccc;
+ /* TODO: dark theme */
+ fill: #3c3a3a;
}
diff --git a/web/gui/src/main/webapp/app/fw/svg/icon.js b/web/gui/src/main/webapp/app/fw/svg/icon.js
index f3ff556..6a541ce 100644
--- a/web/gui/src/main/webapp/app/fw/svg/icon.js
+++ b/web/gui/src/main/webapp/app/fw/svg/icon.js
@@ -36,6 +36,8 @@
minus: 'minus',
play: 'play',
stop: 'stop',
+
+ close: 'xClose',
topo: 'topo',
@@ -60,15 +62,18 @@
hostIcon_router: 'router',
hostIcon_bgpSpeaker: 'bgpSpeaker',
+ // navigation menu icons...
nav_apps: 'bird',
nav_settings: 'chain',
nav_cluster: 'node',
+ nav_processors: 'allTraffic',
+
nav_topo: 'topo',
nav_devs: 'switch',
nav_links: 'ports',
nav_hosts: 'endstation',
nav_intents: 'relatedIntents',
- nav_processors: 'allTraffic'
+ nav_tunnels: 'ports' // TODO: use tunnel glyph, when available
};
function ensureIconLibDefs() {