Simon Hunt
Committed by Brian O'Connor

ONOS-4359: continued work on theming UI

- topo view: fixed internal spacing (padding) of summary and details panels.

Change-Id: Ie0c45b80a4362cc53329e7f3ab14ed7046a03513
(cherry picked from commit 9a1e18dd)
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 .light .button svg.embeddedIcon .icon rect, 23 .light .button svg.embeddedIcon .icon rect,
24 .light .toggleButton.selected svg.embeddedIcon .icon rect, 24 .light .toggleButton.selected svg.embeddedIcon .icon rect,
25 .light .radioButton.selected svg.embeddedIcon .icon rect { 25 .light .radioButton.selected svg.embeddedIcon .icon rect {
26 - fill: #838383; 26 + fill: #939598;
27 } 27 }
28 28
29 .light .button:hover svg.embeddedIcon .icon rect, 29 .light .button:hover svg.embeddedIcon .icon rect,
......
...@@ -44,33 +44,26 @@ ...@@ -44,33 +44,26 @@
44 44
45 /* --- general topo-panel styling --- */ 45 /* --- general topo-panel styling --- */
46 46
47 -.topo-p svg .glyph { 47 +.topo-p svg {
48 - fill: #222; 48 + background: #c0242b;
49 } 49 }
50 50
51 -.topo-p svg .glyph.overlay { 51 +.topo-p svg .glyph {
52 - fill: #fff; 52 + fill: #ffffff;
53 } 53 }
54 54
55 -.topo-p h2 { 55 +.topo-p hr {
56 - color: black; 56 + background-color: #cccccc;
57 } 57 }
58 58
59 -.topo-p h3 { 59 +#topo-p-detail svg {
60 - color: black; 60 + background: none;
61 } 61 }
62 62
63 -.topo-p td.label { 63 +#topo-p-detail .header svg .glyph {
64 - /* works for both light and dark themes ... */ 64 + fill: #c0242b;
65 - color: #777;
66 -}
67 -.topo-p td.value {
68 } 65 }
69 66
70 -.topo-p hr {
71 - background-color: #ccc;
72 - color: #ccc;
73 -}
74 67
75 /* --- Topo Instance Panel --- */ 68 /* --- Topo Instance Panel --- */
76 69
......
...@@ -41,31 +41,35 @@ ...@@ -41,31 +41,35 @@
41 /* --- Topo Summary Panel --- */ 41 /* --- Topo Summary Panel --- */
42 42
43 #topo-p-summary { 43 #topo-p-summary {
44 - /* Base css from panel.css */ 44 + padding: 16px;
45 } 45 }
46 46
47 47
48 /* --- Topo Detail Panel --- */ 48 /* --- Topo Detail Panel --- */
49 49
50 #topo-p-detail { 50 #topo-p-detail {
51 - /* Base css from panel.css */ 51 + padding: 16px;
52 - top: 338px; 52 + top: 370px;
53 } 53 }
54 html[data-platform='iPad'] #topo-p-detail { 54 html[data-platform='iPad'] #topo-p-detail {
55 - top: 354px; 55 + top: 386px;
56 } 56 }
57 57
58 #topo-p-detail .actionBtns .actionBtn { 58 #topo-p-detail .actionBtns .actionBtn {
59 display: inline-block; 59 display: inline-block;
60 } 60 }
61 #topo-p-detail .actionBtns .actionBtn svg { 61 #topo-p-detail .actionBtns .actionBtn svg {
62 - width: 30px; 62 + width: 28px;
63 - height: 30px; 63 + height: 28px;
64 } 64 }
65 65
66 66
67 /* --- general topo-panel styling --- */ 67 /* --- general topo-panel styling --- */
68 68
69 +.topo-p div.header {
70 + margin-bottom: 10px;
71 +}
72 +
69 .topo-p div.header div.icon { 73 .topo-p div.header div.icon {
70 vertical-align: middle; 74 vertical-align: middle;
71 display: inline-block; 75 display: inline-block;
...@@ -80,17 +84,17 @@ html[data-platform='iPad'] #topo-p-detail { ...@@ -80,17 +84,17 @@ html[data-platform='iPad'] #topo-p-detail {
80 84
81 .topo-p svg { 85 .topo-p svg {
82 display: inline-block; 86 display: inline-block;
83 - width: 42px; 87 + width: 26px;
84 - height: 42px; 88 + height: 26px;
85 } 89 }
86 90
87 91
88 .topo-p h2 { 92 .topo-p h2 {
89 - padding: 0 4px; 93 + padding: 0 0 0 10px;
90 margin: 0; 94 margin: 0;
95 + font-weight: lighter;
91 word-wrap: break-word; 96 word-wrap: break-word;
92 display: inline-block; 97 display: inline-block;
93 - width: 210px;
94 vertical-align: middle; 98 vertical-align: middle;
95 } 99 }
96 100
...@@ -104,23 +108,34 @@ html[data-platform='iPad'] #topo-p-detail { ...@@ -104,23 +108,34 @@ html[data-platform='iPad'] #topo-p-detail {
104 108
105 .topo-p p, 109 .topo-p p,
106 .topo-p table { 110 .topo-p table {
107 - padding: 4px; 111 + padding: 0;
108 margin: 0; 112 margin: 0;
113 + width: 100%;
109 } 114 }
110 115
111 .topo-p td { 116 .topo-p td {
112 word-wrap: break-word; 117 word-wrap: break-word;
113 } 118 }
114 .topo-p td.label { 119 .topo-p td.label {
115 - font-style: italic; 120 + font-weight: bold;
116 - padding-right: 12px; 121 + padding: 0 10px 0 0;
117 } 122 }
118 .topo-p td.value { 123 .topo-p td.value {
124 + padding: 0;
125 +}
126 +
127 +#topo-p-summary td.label {
128 + width: 50%;
129 +}
130 +
131 +#topo-p-detail div.actionBtns {
132 + padding-top: 6px;
119 } 133 }
120 134
121 .topo-p hr { 135 .topo-p hr {
122 height: 1px; 136 height: 1px;
123 border: 0; 137 border: 0;
138 + margin: 4px -3px;
124 } 139 }
125 140
126 141
......
...@@ -30,11 +30,12 @@ ...@@ -30,11 +30,12 @@
30 idSum = 'topo-p-summary', 30 idSum = 'topo-p-summary',
31 idDet = 'topo-p-detail', 31 idDet = 'topo-p-detail',
32 panelOpts = { 32 panelOpts = {
33 - width: 290 // summary and detail panel width 33 + width: 260 // summary and detail panel width
34 }, 34 },
35 - sumMax = 262, // summary panel max height 35 + sumMax = 226, // summary panel max height
36 padTop = 16, // summary panel padding below masthead 36 padTop = 16, // summary panel padding below masthead
37 - padFudge = padTop + 6, 37 + padding = 16, // panel internal padding
38 + padFudge = padTop + 2 * padding,
38 devPath = 'device'; 39 devPath = 'device';
39 40
40 // internal state 41 // internal state
...@@ -210,14 +211,9 @@ ...@@ -210,14 +211,9 @@
210 .append('svg'), 211 .append('svg'),
211 title = summary.appendHeader('h2'), 212 title = summary.appendHeader('h2'),
212 table = summary.appendBody('table'), 213 table = summary.appendBody('table'),
213 - tbody = table.append('tbody'), 214 + tbody = table.append('tbody');
214 - glyphId = data.type || 'node';
215 -
216 - gs.addGlyph(svg, glyphId, 40);
217 215
218 - if (glyphId === 'node') { 216 + gs.addGlyph(svg, 'bird', 24, 0, [1,1]);
219 - gs.addGlyph(svg, 'bird', 24, true, [8,12]);
220 - }
221 217
222 title.text(data.title); 218 title.text(data.title);
223 listProps(tbody, data); 219 listProps(tbody, data);
...@@ -244,7 +240,7 @@ ...@@ -244,7 +240,7 @@
244 tbody = table.append('tbody'), 240 tbody = table.append('tbody'),
245 navFn; 241 navFn;
246 242
247 - gs.addGlyph(svg, (data.type || 'unknown'), 40); 243 + gs.addGlyph(svg, (data.type || 'unknown'), 26);
248 title.text(data.title); 244 title.text(data.title);
249 245
250 // only add navigation when displaying a device 246 // only add navigation when displaying a device
......