Committed by
Gerrit Code Review
ONOS-4359: continued work on theming UI (app control buttons).
Change-Id: I87c510caee499a2ecaa51241785e300cb06c1f61
Showing
9 changed files
with
71 additions
and
93 deletions
... | @@ -6,7 +6,7 @@ | ... | @@ -6,7 +6,7 @@ |
6 | 6 | ||
7 | <nav> | 7 | <nav> |
8 | <div class="dropdown-parent"> | 8 | <div class="dropdown-parent"> |
9 | - <a class="user-menu__name">{{user}} <i class="dropdown-icon"></i></a> | 9 | + <a class="clickable user-menu__name">{{user}} <i class="dropdown-icon"></i></a> |
10 | 10 | ||
11 | <div class="dropdown"> | 11 | <div class="dropdown"> |
12 | <a href="rs/logout">logout</a> | 12 | <a href="rs/logout">logout</a> | ... | ... |
... | @@ -256,25 +256,25 @@ | ... | @@ -256,25 +256,25 @@ |
256 | '76.3z M31.1,85.1v-4.9l32.8-26.4c0.3,0.3,0.8,0.5,1.3,0.5h10.5l' + | 256 | '76.3z M31.1,85.1v-4.9l32.8-26.4c0.3,0.3,0.8,0.5,1.3,0.5h10.5l' + |
257 | '7.7,21.9h-3c-1,0-1.9,0.8-1.9,1.9v6.9H31.1z', | 257 | '7.7,21.9h-3c-1,0-1.9,0.8-1.9,1.9v6.9H31.1z', |
258 | 258 | ||
259 | - refresh: 'M102.6,40.8L88.4,70.5L69.8,43.4L80,42.6c-0.7-2.3-1.7-' + | 259 | + refresh: |
260 | - '5.1-3.4-7.8C71.8,27,64,23.1,53.5,23.1c-19.5,0-24.8,11.2-24.8,' + | 260 | + 'M99.7,53.8l-10,13.3L85,73.5,78,64,70.4,53.7h9' + |
261 | - '11.3l-10.1-4.3c0.3-0.7,7.9-18,35-18c24.8,0,35,17.3,37.7,29.6L' + | 261 | + 'A28.5,28.5,0,1,0,68.3,77.6l10.6,6.9A40.7,40.7,0,1,1,91.6,53.8h8.2Z', |
262 | - '102.6,40.8z M81.5,74.5c-0.2,0.5-5.5,11.4-24.9,11.4c-10.5,0-18.3' + | 262 | + |
263 | - '-3.9-23.1-11.7c-1.7-2.8-2.8-5.6-3.4-7.8l10.2-0.8L21.7,38.5L7.5,' + | 263 | + garbage: 'M55.1,31.1c9.4,0,18.7.1,28.1-.1,3.2-.1,4.2,1,3.7,4.1' + |
264 | - '68.2l11.4-0.9c2.7,12.3,12.9,29.6,37.7,29.6c26.9,0,34.6-17.2,34.9' + | 264 | + 'q-4.1,28.6-8,57.3c-0.3,2.3-1.3,3.4-3.5,3.4h-41' + |
265 | - '-18L81.5,74.5z', | 265 | + 'c-2.2,0-2.9-1.2-3.2-3.2Q27,63.5,22.7,34.4c-0.4-2.8.6-3.4,3.1-3.4' + |
266 | - | 266 | + 'H55.1Z' + |
267 | - garbage: 'M94.6,20.2c0,2.7-2.1,4.8-4.8,4.8H19.2c-2.7,0-4.8-2.1-' + | 267 | + 'M44.3,81.9c0.4-1.1-2.5-27.4-3.8-40.5a3.2,3.2,0,0,0-3.7-3.2' + |
268 | - '4.8-4.8s2.1-4.8,4.8-4.8h27.6c-0.8-0.7-1.4-1.7-1.4-2.9c0-2.1,1.7-' + | 268 | + 'c-2.5.1-2.5,1.9-2.4,3.7,0.5,4.9,1,9.8,1.5,14.7,0.8,8.1,1.6,16.2,' + |
269 | - '3.9,3.9-3.9h10.4c2.1,0,3.9,1.7,3.9,3.9c0,1.2-0.5,2.2-1.4,2.9h' + | 269 | + '2.4,24.2,0.2,2.2,1.1,4.1,3.6,3.4A3.6,3.6,0,0,0,44.3,81.9Z' + |
270 | - '27.6C92.5,15.4,94.6,17.6,94.6,20.2z M91,33.4v64.8c0,2-1.7,3.6-' + | 270 | + 'm21.2,0a2.8,2.8,0,0,0,2.2,2.3' + |
271 | - '3.8,3.6h-65c-2.1,0-3.8-1.6-3.8-3.6V33.4c0-2,1.7-3.6,3.8-3.6h65C' + | 271 | + 'c2.3,0.8,3.7-.7,4-3.1,1.3-12.9,2.6-25.7,3.8-38.6,0.2-2,.3-4.1-2.6-4.4' + |
272 | - '89.3,29.8,91,31.4,91,33.4z M31.5,37.7c0-2.1-1.2-3.8-2.7-3.8h-0.7' + | 272 | + 's-3.3,1.7-3.5,3.7C68.1,54.8,65.5,81.1,65.5,81.9Z' + |
273 | - 'c-1.5,0-2.7,1.7-2.7,3.8v55.9c0,2.1,1.2,3.8,2.7,3.8h0.7c1.5,0,2.7' + | 273 | + 'M57.9,61.3q0-9.8,0-19.6c0-2.2-.8-3.6-3.2-3.5s-2.6,1.7-2.6,3.6' + |
274 | - '-1.7,2.7-3.8V37.7z M58.5,37.7c0-2.1-1.8-3.8-4-3.8h-1c-2.2,0-4,' + | 274 | + 'q0,19.4,0,38.8c0,1.9,0,3.8,2.8,3.9s3-1.8,3-3.9Q57.9,70.9,57.9,61.3Z' + |
275 | - '1.7-4,3.8v55.9c0,2.1,1.8,3.8,4,3.8h1c2.2,0,4-1.7,4-3.8V37.7z M' + | 275 | + 'M19,24.7c0.3-2,.5-5.7,1.5-8a5.1,5.1,0,0,1,3.6-2.3' + |
276 | - '83.5,37.7c0-2.1-1.2-3.8-2.7-3.8h-0.7c-1.5,0-2.7,1.7-2.7,3.8v55.9' + | 276 | + 'c5.5-.5,17.3-0.8,17.3-0.8l4.3-3.3H62.9l5.6,3.5S84.5,14.6,87,15' + |
277 | - 'c0,2.1,1.2,3.8,2.7,3.8h0.7c1.5,0,2.7-1.7,2.7-3.8V37.7z', | 277 | + 's2.5,0.7,3.2,1.9,0.9,7.4.9,7.4Z', |
278 | 278 | ||
279 | cog: "M100.2,46.4L87.1,44.8l-2.1-5L93.1,29a2.3,2.3,0,0,0-.2-3" + | 279 | cog: "M100.2,46.4L87.1,44.8l-2.1-5L93.1,29a2.3,2.3,0,0,0-.2-3" + |
280 | "l-8.7-8.8a2.4,2.4,0,0,0-3.1-.2l-11,7.9L66,23.1,63.1,9.5" + | 280 | "l-8.7-8.8a2.4,2.4,0,0,0-3.1-.2l-11,7.9L66,23.1,63.1,9.5" + |
... | @@ -527,10 +527,7 @@ | ... | @@ -527,10 +527,7 @@ |
527 | ".3-.3h4.4a.3,.3,0,0,1,.3,.3v2.4a.3,.3,0,0,1-.3,.3h-4.4" + | 527 | ".3-.3h4.4a.3,.3,0,0,1,.3,.3v2.4a.3,.3,0,0,1-.3,.3h-4.4" + |
528 | "a.3,.3,0,0,1-.3-.3zM2,6.55h6l1,1.45h-8z", | 528 | "a.3,.3,0,0,1-.3-.3zM2,6.55h6l1,1.45h-8z", |
529 | 529 | ||
530 | - checkMark: "M2.6,4.5c0,0,0.7-0.4,1.2,0.3l1.0," + | 530 | + checkMark: 'M8.6,3.4L4.4,7.7L1.4,4.7L2.5,3.6L4.4,5.5L7.5,2.3L8.6,3.4Z', |
531 | - "1.8c0,0,2.7-5.4,2.8-5.7c0,0,0.5-0.9,1.4-0.1c0," + | ||
532 | - "0,0.5,0.5,0,1.3S6.8,7.3,5.6,9.2c0,0-0.4," + | ||
533 | - "0.5-1.2,0.1S2.2,5.4,2.2,5.4S2.2,4.7,2.6,4.5z", | ||
534 | 531 | ||
535 | xMark: "M9.0,7.2C8.2,6.9,7.4,6.1,6.7,5.2c0.4-0.5," + | 532 | xMark: "M9.0,7.2C8.2,6.9,7.4,6.1,6.7,5.2c0.4-0.5," + |
536 | "0.7-0.8,0.8-1.0C7.8,3.5,9.4,1.6,8.1,1.1" + | 533 | "0.7-0.8,0.8-1.0C7.8,3.5,9.4,1.6,8.1,1.1" + | ... | ... |
... | @@ -16,6 +16,24 @@ | ... | @@ -16,6 +16,24 @@ |
16 | 16 | ||
17 | /* ------ for summary-list tables (theme) ------ */ | 17 | /* ------ for summary-list tables (theme) ------ */ |
18 | 18 | ||
19 | +.light div.summary-list .table-header td { | ||
20 | + background-color: #e5e5e6; | ||
21 | + color: #3c3a3a; | ||
22 | +} | ||
23 | +.dark div.summary-list .table-header td { | ||
24 | + /* TODO: dark theme */ | ||
25 | + background-color: #e5e5e6; | ||
26 | + color: #3c3a3a; | ||
27 | +} | ||
28 | + | ||
29 | +.light div.summary-list td { | ||
30 | + color: #3c3a3a; | ||
31 | +} | ||
32 | +.dark div.summary-list td { | ||
33 | + /* TODO: dark theme */ | ||
34 | + color: #3c3a3a; | ||
35 | +} | ||
36 | + | ||
19 | .light div.summary-list tr:nth-child(even) { | 37 | .light div.summary-list tr:nth-child(even) { |
20 | background-color: #f4f4f4; | 38 | background-color: #f4f4f4; |
21 | } | 39 | } |
... | @@ -40,86 +58,42 @@ | ... | @@ -40,86 +58,42 @@ |
40 | background-color: #dbeffc; | 58 | background-color: #dbeffc; |
41 | } | 59 | } |
42 | 60 | ||
43 | -/* highlighting */ | ||
44 | .light div.summary-list tr.data-change { | 61 | .light div.summary-list tr.data-change { |
62 | + /* todo - theme color */ | ||
45 | background-color: #FDFFDC; | 63 | background-color: #FDFFDC; |
46 | } | 64 | } |
47 | .dark div.summary-list tr.data-change { | 65 | .dark div.summary-list tr.data-change { |
48 | - background-color: #5A5600; | ||
49 | -} | ||
50 | - | ||
51 | -.light div.summary-list .table-header td { | ||
52 | - background-color: #e5e5e6; | ||
53 | - color: #3c3a3a; | ||
54 | -} | ||
55 | -.dark div.summary-list .table-header td { | ||
56 | - /* TODO: dark theme */ | ||
57 | - background-color: #e5e5e6; | ||
58 | - color: #3c3a3a; | ||
59 | -} | ||
60 | - | ||
61 | -.light div.summary-list td { | ||
62 | - color: #3c3a3a; | ||
63 | -} | ||
64 | -.dark div.summary-list td { | ||
65 | /* TODO: dark theme */ | 66 | /* TODO: dark theme */ |
66 | - color: #3c3a3a; | 67 | + background-color: #FDFFDC; |
67 | -} | ||
68 | - | ||
69 | -/* Inactive */ | ||
70 | -.light .ctrl-btns div g.icon rect, | ||
71 | -.light .ctrl-btns div:hover g.icon rect { | ||
72 | - fill: #eee; | ||
73 | -} | ||
74 | -.dark .ctrl-btns div g.icon rect, | ||
75 | -.dark .ctrl-btns div:hover g.icon rect { | ||
76 | - fill: #222; | ||
77 | } | 68 | } |
78 | 69 | ||
79 | -.light .ctrl-btns div g.icon use { | ||
80 | - fill: #ddd; | ||
81 | -} | ||
82 | -.dark .ctrl-btns div g.icon use { | ||
83 | - fill: #333; | ||
84 | -} | ||
85 | 70 | ||
86 | -/* Active hover */ | 71 | +/* --- Control Buttons --- */ |
87 | -.light .ctrl-btns div.active:hover g.icon rect { | ||
88 | - fill: #800; | ||
89 | -} | ||
90 | 72 | ||
91 | -.dark .ctrl-btns div.active:hover g.icon rect { | 73 | +/* TODO: dark theme */ |
92 | - fill: #CE5650; | ||
93 | -} | ||
94 | 74 | ||
95 | -/* Active */ | 75 | +.light .ctrl-btns div svg.embeddedIcon g.icon use { |
96 | -.light .ctrl-btns div.active g.icon use { | 76 | + fill: #e4eef2; |
97 | - fill: #fff; | ||
98 | -} | ||
99 | -.dark .ctrl-btns div.active g.icon use { | ||
100 | - fill: #eee; | ||
101 | } | 77 | } |
78 | +/* note: no change for inactive buttons when hovered */ | ||
102 | 79 | ||
103 | -.light .ctrl-btns div.active g.icon rect { | 80 | +.light .ctrl-btns div.active svg.embeddedIcon g.icon use { |
104 | - fill: #bbb; | 81 | + fill: #939598; |
105 | } | 82 | } |
106 | -.dark .ctrl-btns div.active g.icon rect { | 83 | +.light .ctrl-btns div.active:hover svg.embeddedIcon g.icon use { |
107 | - fill: #444; | 84 | + fill: #ce5b58; |
108 | } | 85 | } |
109 | 86 | ||
110 | /* Refresh button specific */ | 87 | /* Refresh button specific */ |
111 | -.light .ctrl-btns div.refresh.active g.icon rect { | 88 | +.light .ctrl-btns div.refresh svg.embeddedIcon g.icon use { |
112 | - fill: #964949; | 89 | + fill: #cdeff2; |
113 | } | 90 | } |
114 | - | 91 | +.light .ctrl-btns div.refresh:hover svg.embeddedIcon g.icon use { |
115 | -.dark .ctrl-btns div.refresh.active g.icon rect { | 92 | + fill: #ce5b58; |
116 | - fill: #9B4641; | ||
117 | } | 93 | } |
118 | -.light .ctrl-btns div.refresh:hover g.icon rect { | 94 | +.light .ctrl-btns div.refresh.active svg.embeddedIcon g.icon use { |
119 | - fill: #964949; | 95 | + fill: #009fdb; |
120 | } | 96 | } |
121 | - | 97 | +.light .ctrl-btns div.refresh.active:hover svg.embeddedIcon g.icon use { |
122 | -.dark .ctrl-btns div.refresh:hover g.icon rect { | 98 | + fill: #ce5b58; |
123 | - fill: #9B4641; | ||
124 | } | 99 | } |
125 | - | ... | ... |
... | @@ -57,6 +57,7 @@ div.summary-list td { | ... | @@ -57,6 +57,7 @@ div.summary-list td { |
57 | 57 | ||
58 | div.summary-list td.table-icon { | 58 | div.summary-list td.table-icon { |
59 | padding-left: 4px; | 59 | padding-left: 4px; |
60 | + text-align: center; | ||
60 | } | 61 | } |
61 | 62 | ||
62 | div.summary-list .table-header td { | 63 | div.summary-list .table-header td { |
... | @@ -93,7 +94,8 @@ div.ctrl-btns div { | ... | @@ -93,7 +94,8 @@ div.ctrl-btns div { |
93 | } | 94 | } |
94 | 95 | ||
95 | div.ctrl-btns div.separator { | 96 | div.ctrl-btns div.separator { |
96 | - cursor: auto; | 97 | + width: 0; |
97 | - width: 24px; | 98 | + height: 32px; |
98 | - border: none; | 99 | + padding: 0; |
100 | + border-right: 1px solid #c7c7c0; | ||
99 | } | 101 | } | ... | ... |
... | @@ -7,6 +7,7 @@ | ... | @@ -7,6 +7,7 @@ |
7 | icon icon-size="36" icon-id="refresh" | 7 | icon icon-size="36" icon-id="refresh" |
8 | tooltip tt-msg="autoRefreshTip" | 8 | tooltip tt-msg="autoRefreshTip" |
9 | ng-click="toggleRefresh()"></div> | 9 | ng-click="toggleRefresh()"></div> |
10 | + | ||
10 | <div class="separator"></div> | 11 | <div class="separator"></div> |
11 | 12 | ||
12 | <form id="inputFileForm"> | 13 | <form id="inputFileForm"> | ... | ... |
... | @@ -72,7 +72,7 @@ describe('factory: fw/svg/glyph.js', function() { | ... | @@ -72,7 +72,7 @@ describe('factory: fw/svg/glyph.js', function() { |
72 | 72 | ||
73 | // badges | 73 | // badges |
74 | uiAttached: 'M2,2.5a.5,.5', | 74 | uiAttached: 'M2,2.5a.5,.5', |
75 | - checkMark: 'M2.6,4.5c0', | 75 | + checkMark: 'M8.6,3.4L4', |
76 | xMark: 'M9.0,7.2C8.2', | 76 | xMark: 'M9.0,7.2C8.2', |
77 | triangleUp: 'M0.5,6.2c0', | 77 | triangleUp: 'M0.5,6.2c0', |
78 | triangleDown: 'M9.5,4.2c0', | 78 | triangleDown: 'M9.5,4.2c0', | ... | ... |
-
Please register or login to post a comment