From 52a7bd103359a9e332c7d67be01a3a14c5eb048c Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 24 Jun 2015 18:48:23 -0700 Subject: [PATCH] [Dev/Frontend] Cherry-picking platform changes from warp1341 WTD-1341 --- .../general/res/sass/_fixed-position.scss | 102 ++++++++++-------- .../res/templates/elements/telemetry.html | 16 +-- 2 files changed, 66 insertions(+), 52 deletions(-) diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss index 22694aea72..f9e8a82994 100644 --- a/platform/commonUI/general/res/sass/_fixed-position.scss +++ b/platform/commonUI/general/res/sass/_fixed-position.scss @@ -1,38 +1,44 @@ /***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ +* Open MCT Web, Copyright (c) 2014-2015, United States Government +* as represented by the Administrator of the National Aeronautics and Space +* Administration. All rights reserved. +* +* Open MCT Web is licensed under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0. +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +* License for the specific language governing permissions and limitations +* under the License. +* +* Open MCT Web includes source code licensed under additional open source +* licenses. See the Open Source Licenses file (LICENSES.md) included with +* this source code distribution or the Licensing information page available +* at runtime from the About dialog for additional information. +*****************************************************************************/ .t-fixed-position { &.l-fixed-position { -// @include test(red); + // @include test(red); position: absolute; - top: 0; right: 0; bottom: 0; left: 0; - width: auto; height: auto; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; .l-grid-holder { position: relative; - height: 100%; width: 100%; + height: 100%; + width: 100%; .l-grid { -// @include test(orange); + // @include test(orange); position: absolute; - height: 100%; width: 100%; + height: 100%; + width: 100%; pointer-events: none; z-index: 0; } @@ -56,12 +62,13 @@ .l-fixed-position-image, .l-fixed-position-text { @include box-sizing(border-box); - height: 100%; width: 100%; + height: 100%; + width: 100%; } .l-fixed-position-box { } - + .l-fixed-position-image { background-size: cover; background-repeat: no-repeat; @@ -70,38 +77,45 @@ .l-fixed-position-text { @include txtShdwSubtle(); - border:1px solid transparent; + border: 1px solid transparent; font-size: 0.8rem; $p: 1px; //$interiorMarginSm; line-height: 100%; &.l-static-text { -// overflow: auto; + // overflow: auto; padding: $p; } &.l-telemetry { .l-elem { //@include absPosDefault($p); - @include absPosDefault(0); + //@include absPosDefault(0); @include box-sizing(border-box); + display: block; padding: 2px; - width: 50%; + //width: 50%; &.l-title { - right: auto; - left: $p; + //right: auto; + //left: $p; + float: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: auto; } &.l-value { -// @include test(blue); - right: $p; - left: auto; + // @include test(blue); + // right: $p; + // left: auto; + @include border-radius($smallCr); + $valPad: 5px; + float: right; + margin-left: $interiorMargin; + padding-left: $valPad; + padding-right: $valPad; text-align: right; &.telem-only { -// @include test(red); - left: $p; - width: auto; - } - .l-value-bg { - @include border-radius($smallCr); - padding: 0 4px; + margin-left: 0; + width: 100%; } } } diff --git a/platform/features/layout/res/templates/elements/telemetry.html b/platform/features/layout/res/templates/elements/telemetry.html index 601f17679b..46d45dbf46 100644 --- 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() }" > -
+ {{ngModel.value}} + + {{ngModel.name}} -
-
- {{ngModel.value}} -
+ \ No newline at end of file