Merge branch 'open-master' into open1233

This commit is contained in:
Victor Woeltjen
2015-06-26 11:50:48 -07:00
67 changed files with 3456 additions and 274 deletions

View File

@@ -23,16 +23,17 @@
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 l-obj-val-format"
data-value="{{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>