Committed by
Brian O'Connor
ONOS-4359: continued work on theming UI
- topo view: fixed node and link selection highlighting. Change-Id: I48d4ac06989dd98b0b2182fbd45b76eb2ca737b7 (cherry picked from commit 728dce0b)
Showing
2 changed files
with
20 additions
and
25 deletions
... | @@ -150,16 +150,6 @@ | ... | @@ -150,16 +150,6 @@ |
150 | opacity: 0.2 !important; | 150 | opacity: 0.2 !important; |
151 | } | 151 | } |
152 | 152 | ||
153 | -#ov-topo svg .node.selected rect, | ||
154 | -#ov-topo svg .node.selected circle { | ||
155 | - fill: #f90; | ||
156 | - filter: url(#blue-glow); | ||
157 | -} | ||
158 | -.firefox #ov-topo svg .node.selected rect, | ||
159 | -.firefox #ov-topo svg .node.selected circle { | ||
160 | - 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 | -} | ||
162 | - | ||
163 | /* Device Nodes */ | 153 | /* Device Nodes */ |
164 | 154 | ||
165 | /* note: device without the 'online' class is offline */ | 155 | /* note: device without the 'online' class is offline */ |
... | @@ -190,7 +180,8 @@ | ... | @@ -190,7 +180,8 @@ |
190 | 180 | ||
191 | 181 | ||
192 | #ov-topo svg .node.device.selected rect { | 182 | #ov-topo svg .node.device.selected rect { |
193 | - fill: #f90; | 183 | + stroke-width: 2.0; |
184 | + stroke: #009fdb; | ||
194 | } | 185 | } |
195 | 186 | ||
196 | /* Badges */ | 187 | /* Badges */ |
... | @@ -238,13 +229,17 @@ | ... | @@ -238,13 +229,17 @@ |
238 | fill: #846; | 229 | fill: #846; |
239 | } | 230 | } |
240 | 231 | ||
241 | -svg .node.host circle { | 232 | +#ov-topo svg .node.host circle { |
242 | stroke: #a3a596; | 233 | stroke: #a3a596; |
243 | fill: #e0dfd6; | 234 | fill: #e0dfd6; |
244 | } | 235 | } |
236 | +#ov-topo svg .node.host.selected circle { | ||
237 | + stroke-width: 2.0; | ||
238 | + stroke: #009fdb; | ||
239 | +} | ||
245 | 240 | ||
246 | -svg .node.host .svgIcon { | 241 | +#ov-topo svg .node.host use { |
247 | - fill: #444; | 242 | + fill: #3c3a3a; |
248 | } | 243 | } |
249 | 244 | ||
250 | /* --- Topo Links --- */ | 245 | /* --- Topo Links --- */ |
... | @@ -255,12 +250,8 @@ svg .node.host .svgIcon { | ... | @@ -255,12 +250,8 @@ svg .node.host .svgIcon { |
255 | 250 | ||
256 | #ov-topo svg .link.selected, | 251 | #ov-topo svg .link.selected, |
257 | #ov-topo svg .link.enhanced { | 252 | #ov-topo svg .link.enhanced { |
258 | - stroke-width: 4.5px; | 253 | + stroke-width: 3.5; |
259 | - filter: url(#blue-glow); | 254 | + stroke: #009fdb; |
260 | -} | ||
261 | -.firefox #ov-topo svg .link.selected, | ||
262 | -.firefox #ov-topo svg .link.enhanced { | ||
263 | - 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"); | ||
264 | } | 255 | } |
265 | 256 | ||
266 | #ov-topo svg .link.inactive { | 257 | #ov-topo svg .link.inactive { |
... | @@ -306,7 +297,9 @@ svg .node.host .svgIcon { | ... | @@ -306,7 +297,9 @@ svg .node.host .svgIcon { |
306 | #ov-topo svg .link.animated { | 297 | #ov-topo svg .link.animated { |
307 | stroke-dasharray: 8 5; | 298 | stroke-dasharray: 8 5; |
308 | animation: ants 5s infinite linear; | 299 | animation: ants 5s infinite linear; |
309 | - /* below line will be added via Javascript based on path */ | 300 | + /* below line could be added via Javascript, based on path, if we cared |
301 | + * enough about the direction of ant-flow | ||
302 | + */ | ||
310 | /*animation-direction: reverse;*/ | 303 | /*animation-direction: reverse;*/ |
311 | } | 304 | } |
312 | @keyframes ants { | 305 | @keyframes ants { |
... | @@ -336,7 +329,7 @@ svg .node.host .svgIcon { | ... | @@ -336,7 +329,7 @@ svg .node.host .svgIcon { |
336 | /* Link Labels */ | 329 | /* Link Labels */ |
337 | #ov-topo svg .linkLabel rect { | 330 | #ov-topo svg .linkLabel rect { |
338 | stroke: none; | 331 | stroke: none; |
339 | - fill: #eee; | 332 | + fill: #ffffff; |
340 | } | 333 | } |
341 | 334 | ||
342 | #ov-topo svg .linkLabel text { | 335 | #ov-topo svg .linkLabel text { |
... | @@ -346,8 +339,8 @@ svg .node.host .svgIcon { | ... | @@ -346,8 +339,8 @@ svg .node.host .svgIcon { |
346 | /* Port Labels */ | 339 | /* Port Labels */ |
347 | 340 | ||
348 | #ov-topo svg .portLabel rect { | 341 | #ov-topo svg .portLabel rect { |
349 | - stroke: none; | 342 | + stroke: #a3a596; |
350 | - fill: #eee; | 343 | + fill: #ffffff; |
351 | } | 344 | } |
352 | 345 | ||
353 | #ov-topo svg .portLabel text { | 346 | #ov-topo svg .portLabel text { | ... | ... |
... | @@ -127,7 +127,9 @@ | ... | @@ -127,7 +127,9 @@ |
127 | selectOrder.push(obj.id); | 127 | selectOrder.push(obj.id); |
128 | 128 | ||
129 | n.classed('selected', true); | 129 | n.classed('selected', true); |
130 | - api.updateDeviceColors(obj); | 130 | + if (n.classed('device')) { |
131 | + api.updateDeviceColors(obj); | ||
132 | + } | ||
131 | updateDetail(); | 133 | updateDetail(); |
132 | } | 134 | } |
133 | 135 | ... | ... |
-
Please register or login to post a comment