ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-25 21:59:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Victor Woeltjen 2015-06-25 10:06:18 -07:00
commit 70f5a001ee
4 changed files with 123 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -686,33 +686,33 @@ mct-container {
left: 0; left: 0;
width: auto; width: auto;
height: auto; } height: auto; }
/* line 29, ../sass/_fixed-position.scss */ /* line 33, ../sass/_fixed-position.scss */
.t-fixed-position.l-fixed-position .l-grid-holder { .t-fixed-position.l-fixed-position .l-grid-holder {
position: relative; position: relative;
height: 100%; height: 100%;
width: 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 { .t-fixed-position.l-fixed-position .l-grid-holder .l-grid {
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;
pointer-events: none; pointer-events: none;
z-index: 0; } z-index: 0; }
/* line 42, ../sass/_fixed-position.scss */ /* line 48, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item { .t-fixed-position .l-fixed-position-item {
position: absolute; position: absolute;
border: 1px solid transparent; } 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 { .t-fixed-position .l-fixed-position-item.s-selected {
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
-webkit-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; box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
border-color: #0099cc; border-color: #0099cc;
cursor: move; } cursor: move; }
/* line 51, ../sass/_fixed-position.scss */ /* line 57, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item.s-not-selected { .t-fixed-position .l-fixed-position-item.s-not-selected {
opacity: 0.8; } 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-box,
.t-fixed-position .l-fixed-position-item .l-fixed-position-image, .t-fixed-position .l-fixed-position-item .l-fixed-position-image,
.t-fixed-position .l-fixed-position-item .l-fixed-position-text { .t-fixed-position .l-fixed-position-item .l-fixed-position-text {
@ -721,62 +721,56 @@ mct-container {
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
width: 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 { .t-fixed-position .l-fixed-position-item .l-fixed-position-image {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; } 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 { .t-fixed-position .l-fixed-position-item .l-fixed-position-text {
text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
border: 1px solid transparent; border: 1px solid transparent;
font-size: 0.8rem; font-size: 0.8rem;
line-height: 100%; } 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 { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text {
padding: 1px; } 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 { .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; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
padding: 2px; display: block;
width: 50%; } padding: 2px; }
/* line 88, ../sass/_fixed-position.scss */ /* line 96, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title {
right: auto; float: none;
left: 1px; } overflow: hidden;
/* line 92, ../sass/_fixed-position.scss */ text-overflow: ellipsis;
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { white-space: nowrap;
right: 1px;
left: auto;
text-align: right; }
/* line 97, ../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; } width: auto; }
/* line 102, ../sass/_fixed-position.scss */ /* line 105, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value .l-value-bg { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value {
-moz-border-radius: 2px; -moz-border-radius: 2px;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
padding: 0 4px; } float: right;
/* line 112, ../sass/_fixed-position.scss */ margin-left: 5px;
padding-left: 5px;
padding-right: 5px;
text-align: right; }
/* 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 {
margin-left: 0;
width: 100%; }
/* line 126, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item-handle { .t-fixed-position .l-fixed-position-item-handle {
background: rgba(0, 153, 204, 0.5); background: rgba(0, 153, 204, 0.5);
cursor: crosshair; cursor: crosshair;
border: 1px solid #0099cc; border: 1px solid #0099cc;
position: absolute; } 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 { .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-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA=');
background-size: 100%; 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: -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-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; } 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 { .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-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA=');
background-size: 100%; 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: -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-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; } 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) { .edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected) {
border: 1px dotted rgba(0, 153, 204, 0.75); } 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 { .edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover {
border: 1px dotted #0099cc; } border: 1px dotted #0099cc; }
@ -4824,8 +4818,8 @@ input[type="text"] {
border-radius: 2px; border-radius: 2px;
float: right; float: right;
margin-left: 5px; margin-left: 5px;
padding-left: 2px; padding-left: 5px;
padding-right: 2px; padding-right: 5px;
text-align: right; } text-align: right; }
/* line 110, ../sass/_autoflow.scss */ /* line 110, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col:first-child { .autoflow .l-autoflow-items .l-autoflow-col:first-child {

2
platform/commonUI/general/res/sass/_autoflow.scss
View File

@ -24,7 +24,7 @@
$colMargin: $interiorMargin; $colMargin: $interiorMargin;
$colW: 225px; $colW: 225px;
$valW: 70px; $valW: 70px;
$valPad: 2px; $valPad: 5px;
$rowH: 15px; $rowH: 15px;
font-size: 0.75rem; font-size: 0.75rem;
.l-autoflow-header { .l-autoflow-header {

50
platform/commonUI/general/res/sass/_fixed-position.scss
View File

@ -23,16 +23,22 @@
&.l-fixed-position { &.l-fixed-position {
// @include test(red); // @include test(red);
position: absolute; position: absolute;
top: 0; right: 0; bottom: 0; left: 0; top: 0;
width: auto; height: auto; right: 0;
bottom: 0;
left: 0;
width: auto;
height: auto;
.l-grid-holder { .l-grid-holder {
position: relative; position: relative;
height: 100%; width: 100%; height: 100%;
width: 100%;
.l-grid { .l-grid {
// @include test(orange); // @include test(orange);
position: absolute; position: absolute;
height: 100%; width: 100%; height: 100%;
width: 100%;
pointer-events: none; pointer-events: none;
z-index: 0; z-index: 0;
} }
@ -56,7 +62,8 @@
.l-fixed-position-image, .l-fixed-position-image,
.l-fixed-position-text { .l-fixed-position-text {
@include box-sizing(border-box); @include box-sizing(border-box);
height: 100%; width: 100%; height: 100%;
width: 100%;
} }
.l-fixed-position-box { .l-fixed-position-box {
@ -81,27 +88,34 @@
&.l-telemetry { &.l-telemetry {
.l-elem { .l-elem {
//@include absPosDefault($p); //@include absPosDefault($p);
@include absPosDefault(0); //@include absPosDefault(0);
@include box-sizing(border-box); @include box-sizing(border-box);
display: block;
padding: 2px; padding: 2px;
width: 50%; //width: 50%;
&.l-title { &.l-title {
right: auto; //right: auto;
left: $p; //left: $p;
float: none;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: auto;
} }
&.l-value { &.l-value {
// @include test(blue); // @include test(blue);
right: $p; // right: $p;
left: auto; // left: auto;
@include border-radius($smallCr);
$valPad: 5px;
float: right;
margin-left: $interiorMargin;
padding-left: $valPad;
padding-right: $valPad;
text-align: right; text-align: right;
&.telem-only { &.telem-only {
// @include test(red); margin-left: 0;
left: $p; width: 100%;
width: auto;
}
.l-value-bg {
@include border-radius($smallCr);
padding: 0 4px;
} }
} }
} }

16
platform/features/layout/res/templates/elements/telemetry.html
View File

@ -23,16 +23,16 @@
class="l-fixed-position-text l-telemetry" class="l-fixed-position-text l-telemetry"
ng-style="{ background: ngModel.fill(), 'border-color': ngModel.stroke(), color: ngModel.color() }" 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" class="l-elem l-title"
ng-show="ngModel.element.titled" ng-show="ngModel.element.titled"
> >
{{ngModel.name}} {{ngModel.name}}
</div> </span>
<div
class="l-elem l-value"
ng-class="{ 'telem-only': !ngModel.element.titled }"
>
{{ngModel.value}}
</div>
</div> </div>