Minor GUI tweaks:
* Fix header margin for all table views to align with the table
* Fix margins in GUI map selector
* Removed node drop-shadow in the GUI topology by reducing blur to 0
* Adjusted device label sizing to favour more white-space than to clip and squeeze text
Change-Id: I9ef3eee30714a5aaa9337582d6b1a2e2fb2b302c
diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.html b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.html
index c4f5621..3114a51 100644
--- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.html
+++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.html
@@ -23,8 +23,8 @@
original target object
-->
<svg:filter id="drop-shadow" x="-25%" y="-25%" width="200%" height="200%">
- <svg:feGaussianBlur in="SourceAlpha" stdDeviation="4" result="blur" />
- <svg:feOffset in="blur" dx="4" dy="4" result="offsetBlur"/>
+ <svg:feGaussianBlur in="SourceAlpha" stdDeviation="0" result="blur" />
+ <svg:feOffset in="blur" dx="0" dy="0" result="offsetBlur"/>
<svg:feMerge >
<svg:feMergeNode in="offsetBlur" />
<svg:feMergeNode in="SourceGraphic" />
@@ -87,10 +87,10 @@
in gently
line 5) The text will be one of 3 values - blank, the id or the name
-->
+ <!-- [attr.textLength]= "labelTextLen()"-->
+ <!-- lengthAdjust= "spacing"-->
<svg:text
text-anchor="start" y="0.3em" x="22"
- [attr.textLength]= "labelTextLen()"
- lengthAdjust= "spacing"
[@deviceLabelToggleTxt]="labelToggle">
{{ labelToggle == 0 ? '': labelToggle == 1 ? device.id:device.props.name }}
</svg:text>
diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts
index 47791dd..a41804c 100644
--- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts
+++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts
@@ -139,10 +139,10 @@
*/
labelTextLen() {
if (this.labelToggle === 1) {
- return this.device.id.length * 8;
+ return this.device.id.length * 12;
} else if (this.labelToggle === 2 && this.device &&
this.device.props.name && this.device.props.name.trim().length > 0) {
- return this.device.props.name.length * 8;
+ return this.device.props.name.length * 12;
} else {
return 0;
}
diff --git a/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.css b/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.css
index 59c0d78..3462a46 100644
--- a/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.css
+++ b/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.css
@@ -18,13 +18,17 @@
* ONOS GUI -- Topology Map Selector -- CSS file
*/
.dialog h2 {
- margin: 0;
+ margin: 8px;
word-wrap: break-word;
display: inline-block;
width: 210px;
vertical-align: middle;
}
+.dialog select {
+ margin: 8px;
+}
+
.dialog .dialog-button {
display: inline-block;
cursor: pointer;