ONOS-4359: continued work on theming UI
- topo view: map and instance panel re-theming.
Change-Id: I8e5b0eda61b78b7d54593d84efccb16c54c1611e
(cherry picked from commit 2d147f6)
diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
index a808c3d..00a18a0 100644
--- a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
@@ -89,7 +89,8 @@
diamond: 'M.2,.5'
},
glyphIds = [
- 'unknown', 'node', 'switch', 'roadm', 'endstation', 'router',
+ 'unknown', 'uiAttached',
+ 'node', 'switch', 'roadm', 'endstation', 'router',
'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'refresh',
'garbage',
'flowTable', 'portTable', 'groupTable',
@@ -98,7 +99,7 @@
'prevIntent', 'intentTraffic', 'allTraffic', 'flows', 'eqMaster'
],
badgeIds = [
- 'uiAttached', 'checkMark', 'xMark', 'triangleUp', 'triangleDown',
+ 'checkMark', 'xMark', 'triangleUp', 'triangleDown',
'plus', 'minus', 'play', 'stop'
],
spriteIds = [
diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/svgUtil-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/svgUtil-spec.js
index 0a3433a..1e8970b 100644
--- a/web/gui/src/main/webapp/tests/app/fw/svg/svgUtil-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/svg/svgUtil-spec.js
@@ -153,39 +153,40 @@
])).toBeTruthy();
});
- it('should provide a certain shade of blue', function () {
- expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#3E5780');
+ it('should provide blue', function () {
+ expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2');
});
- it('should not matter what the ID really is for shade of blue', function () {
- expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#78533B');
+ it('should provide light blue', function () {
+ expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#66cef6');
});
- it('should provide different shade of blue for muted', function () {
- expect(sus.cat7().getColor('foo', true, 'light')).toEqual('#A8B8CC');
+ it('should provide paler shade of blue for muted', function () {
+ expect(sus.cat7().getColor('foo', true, 'light')).toEqual('#a8cceb');
});
-
- it('should provide an alternate (dark) shade of blue', function () {
- expect(sus.cat7().getColor('foo', false, 'dark')).toEqual('#304860');
+ // TODO: dark theme required
+ xit('should provide an alternate (dark) shade of blue', function () {
+ expect(sus.cat7().getColor('foo', false, 'dark')).toEqual('#5b99d2');
});
- it('should provide an alternate (dark) shade of blue for muted', function () {
- expect(sus.cat7().getColor('foo', true, 'dark')).toEqual('#304860');
+ // TODO: dark theme required
+ xit('should provide an alternate (dark) shade of blue for muted', function () {
+ expect(sus.cat7().getColor('foo', true, 'dark')).toEqual('#a8cceb');
});
it('should iterate across the colors', function () {
- expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#3E5780');
- expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#78533B');
- expect(sus.cat7().getColor('baz', false, 'light')).toEqual('#CB4D28');
- expect(sus.cat7().getColor('goo', false, 'light')).toEqual('#018D61');
- expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#8A2979');
- expect(sus.cat7().getColor('pip', false, 'light')).toEqual('#006D73');
- expect(sus.cat7().getColor('sdh', false, 'light')).toEqual('#56AF00');
+ expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2');
+ expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#66cef6');
+ expect(sus.cat7().getColor('baz', false, 'light')).toEqual('#d05a55');
+ expect(sus.cat7().getColor('goo', false, 'light')).toEqual('#db7773');
+ expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#716b6b');
+ expect(sus.cat7().getColor('pip', false, 'light')).toEqual('#aeada8');
+ expect(sus.cat7().getColor('sdh', false, 'light')).toEqual('#7e9aa8');
// and cycle back to the first color for item #8
- expect(sus.cat7().getColor('bri', false, 'light')).toEqual('#3E5780');
+ expect(sus.cat7().getColor('bri', false, 'light')).toEqual('#5b99d2');
// and return the same color for the same ID
- expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#8A2979');
+ expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#716b6b');
});
// === translate(), scale(), skewX(), rotate()