Merge remote-tracking branch 'nasa/open1341' into open1345

2015-06-25 10:06:18 -07:00
parent d3ff49b90b 9f137513d9
commit 70f5a001ee
4 changed files with 123 additions and 115 deletions
--- a/platform/features/layout/res/templates/elements/telemetry.html
+++ b/platform/features/layout/res/templates/elements/telemetry.html
@@ -23,16 +23,16 @@
 	class="l-fixed-position-text l-telemetry"
 	ng-style="{ background: ngModel.fill(), 'border-color': ngModel.stroke(), color: ngModel.color() }"
 	>
-    <div
+	<span
+		class="l-elem l-value obj-val-format ovf-{{ngModel.value}}"
+		ng-class="{ 'telem-only': !ngModel.element.titled }"
+		>
+	    {{ngModel.value}}
+	</span>
+    <span
 	    class="l-elem l-title"
         ng-show="ngModel.element.titled"
 	    >
        {{ngModel.name}}
-    </div>
-    <div
-	    class="l-elem l-value"
-	    ng-class="{ 'telem-only': !ngModel.element.titled }"
-	    >
-        {{ngModel.value}}
-    </div>
+    </span>
 </div>