diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index 6e0b480af4..7f90da763e 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -657,26 +657,26 @@ mct-container {
overflow-y: auto; }
/*****************************************************************************
- * 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.
+*****************************************************************************/
/* line 23, ../sass/_fixed-position.scss */
.t-fixed-position.l-fixed-position {
position: absolute;
@@ -686,33 +686,33 @@ mct-container {
left: 0;
width: auto;
height: auto; }
- /* line 29, ../sass/_fixed-position.scss */
+ /* line 33, ../sass/_fixed-position.scss */
.t-fixed-position.l-fixed-position .l-grid-holder {
position: relative;
height: 100%;
width: 100%; }
- /* line 32, ../sass/_fixed-position.scss */
+ /* line 37, ../sass/_fixed-position.scss */
.t-fixed-position.l-fixed-position .l-grid-holder .l-grid {
position: absolute;
height: 100%;
width: 100%;
pointer-events: none;
z-index: 0; }
-/* line 42, ../sass/_fixed-position.scss */
+/* line 48, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item {
position: absolute;
border: 1px solid transparent; }
- /* line 46, ../sass/_fixed-position.scss */
+ /* line 52, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item.s-selected {
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
border-color: #0099cc;
cursor: move; }
- /* line 51, ../sass/_fixed-position.scss */
+ /* line 57, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item.s-not-selected {
opacity: 0.8; }
- /* line 55, ../sass/_fixed-position.scss */
+ /* line 61, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-box,
.t-fixed-position .l-fixed-position-item .l-fixed-position-image,
.t-fixed-position .l-fixed-position-item .l-fixed-position-text {
@@ -721,62 +721,56 @@ mct-container {
box-sizing: border-box;
height: 100%;
width: 100%; }
- /* line 65, ../sass/_fixed-position.scss */
+ /* line 72, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-image {
background-size: cover;
background-repeat: no-repeat;
background-position: center; }
- /* line 71, ../sass/_fixed-position.scss */
+ /* line 78, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text {
text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
border: 1px solid transparent;
font-size: 0.8rem;
line-height: 100%; }
- /* line 77, ../sass/_fixed-position.scss */
+ /* line 84, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text {
padding: 1px; }
- /* line 82, ../sass/_fixed-position.scss */
+ /* line 89, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem {
- overflow: hidden;
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- width: auto;
- height: auto;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
- padding: 2px;
- width: 50%; }
- /* line 88, ../sass/_fixed-position.scss */
+ display: block;
+ padding: 2px; }
+ /* line 96, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title {
- right: auto;
- left: 1px; }
- /* line 92, ../sass/_fixed-position.scss */
+ float: none;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: auto; }
+ /* line 105, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value {
- right: 1px;
- left: auto;
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ border-radius: 2px;
+ float: right;
+ margin-left: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
text-align: right; }
- /* line 97, ../sass/_fixed-position.scss */
+ /* line 116, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only {
- left: 1px;
- width: auto; }
- /* line 102, ../sass/_fixed-position.scss */
- .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value .l-value-bg {
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
- padding: 0 4px; }
-/* line 112, ../sass/_fixed-position.scss */
+ margin-left: 0;
+ width: 100%; }
+/* line 126, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item-handle {
background: rgba(0, 153, 204, 0.5);
cursor: crosshair;
border: 1px solid #0099cc;
position: absolute; }
-/* line 126, ../sass/_fixed-position.scss */
+/* line 140, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-x {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA=');
background-size: 100%;
@@ -784,7 +778,7 @@ mct-container {
background-image: -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%);
background-image: linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%);
background-repeat: repeat-x; }
-/* line 130, ../sass/_fixed-position.scss */
+/* line 144, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-y {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA=');
background-size: 100%;
@@ -792,10 +786,10 @@ mct-container {
background-image: -webkit-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%);
background-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%);
background-repeat: repeat-y; }
-/* line 138, ../sass/_fixed-position.scss */
+/* line 152, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected) {
border: 1px dotted rgba(0, 153, 204, 0.75); }
- /* line 140, ../sass/_fixed-position.scss */
+ /* line 154, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover {
border: 1px dotted #0099cc; }
@@ -4824,8 +4818,8 @@ input[type="text"] {
border-radius: 2px;
float: right;
margin-left: 5px;
- padding-left: 2px;
- padding-right: 2px;
+ padding-left: 5px;
+ padding-right: 5px;
text-align: right; }
/* line 110, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col:first-child {
diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss
index c7b6a85c5a..0d04d619e8 100644
--- a/platform/commonUI/general/res/sass/_autoflow.scss
+++ b/platform/commonUI/general/res/sass/_autoflow.scss
@@ -24,7 +24,7 @@
$colMargin: $interiorMargin;
$colW: 225px;
$valW: 70px;
- $valPad: 2px;
+ $valPad: 5px;
$rowH: 15px;
font-size: 0.75rem;
.l-autoflow-header {
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