Merge remote-tracking branch 'origin/open1223' into open-1338

Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
parent 84345caf7d 065a5a6fbf
commit 38ad8058e8
25 changed files with 547 additions and 215 deletions
--- a/platform/features/layout/res/templates/elements/telemetry.html
+++ b/platform/features/layout/res/templates/elements/telemetry.html
@@ -26,14 +26,14 @@
    <span
        class="l-elem l-value l-obj-val-format"
        data-value="{{ngModel.value}}"
-        ng-class="{ 'telem-only': !ngModel.element.titled }"
+        ng-class="ngModel.cssClass"
        >
        {{ngModel.value}}
    </span>
    <span
        class="l-elem l-title"
-         ng-show="ngModel.element.titled"
+        ng-show="ngModel.element.titled"
        >
        {{ngModel.name}}
    </span>
-</div>
+</div>