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

[Frontend] Merging warp1172 platform changes in

Browse Source 
WTD-1172
(cherry picked from commit 219ffb4d59d4cc4a0172ba351af0e2b5d672d4b2)

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	warp/telemetry/src/autoflow/AutoflowTableLinker.js

Manually deleted AutoflowTableLinker.js
This commit is contained in:
Charles Hacskaylo 2015-05-07 13:10:04 -07:00
parent 2d13745823
commit 58bd4240f1
10 changed files with 149 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
@charset "UTF-8"; @charset "UTF-8";
/* CONSTANTS */ /* CONSTANTS */
/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe, html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code, a, abbr, acronym, address, big, cite, code,
@ -21,38 +21,38 @@ time, mark, audio, video {
font-size: 100%; font-size: 100%;
vertical-align: baseline; } vertical-align: baseline; }
/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html { html {
line-height: 1; } line-height: 1; }
/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
ol, ul { ol, ul {
list-style: none; } list-style: none; }
/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; } border-spacing: 0; }
/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
caption, th, td { caption, th, td {
text-align: left; text-align: left;
font-weight: normal; font-weight: normal;
vertical-align: middle; } vertical-align: middle; }
/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q, blockquote { q, blockquote {
quotes: none; } quotes: none; }
/* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after { q:before, q:after, blockquote:before, blockquote:after {
content: ""; content: "";
content: none; } content: none; }
/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
a img { a img {
border: none; } border: none; }
/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
display: block; } display: block; }
@ -476,48 +476,49 @@ span {
line-height: 100%; } line-height: 100%; }
/* line 56, ../sass/_fixed-position.scss */ /* line 56, ../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: 3px; } padding: 1px; }
/* line 60, ../sass/_fixed-position.scss */ /* line 61, ../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: false; overflow: hidden;
position: absolute; position: absolute;
top: 3px; top: 0;
right: 3px; right: 0;
bottom: 3px; bottom: 0;
left: 3px; left: 0;
width: auto; width: auto;
height: 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;
width: 50%; } width: 50%; }
/* line 65, ../sass/_fixed-position.scss */ /* line 67, ../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; right: auto;
left: 3px; } left: 1px; }
/* line 69, ../sass/_fixed-position.scss */ /* line 71, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value {
right: 3px; right: 1px;
left: auto; left: auto;
text-align: right; } text-align: right; }
/* line 74, ../sass/_fixed-position.scss */ /* line 76, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only {
left: 3px; left: 1px;
width: auto; } width: auto; }
/* line 79, ../sass/_fixed-position.scss */ /* line 81, ../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 .l-value-bg {
-moz-border-radius: 2px; -moz-border-radius: 2px;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
padding: 0 3px; } padding: 0 4px; }
/* line 89, ../sass/_fixed-position.scss */ /* line 91, ../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 102, ../sass/_fixed-position.scss */ /* line 105, ../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%;
@ -525,7 +526,7 @@ span {
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 106, ../sass/_fixed-position.scss */ /* line 109, ../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%;
@ -533,9 +534,12 @@ span {
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 114, ../sass/_fixed-position.scss */ /* line 117, ../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) {
border: 1px dotted rgba(0, 153, 204, 0.5); } border: 1px dotted rgba(0, 153, 204, 0.75); }
/* line 119, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover {
border: 1px dotted #0099cc; }
/* line 5, ../sass/_about.scss */ /* line 5, ../sass/_about.scss */
.l-about.abs, .btn-menu span.l-about.l-click-area { .l-about.abs, .btn-menu span.l-about.l-click-area {
@ -742,13 +746,35 @@ span {
line-height: 1.695rem; line-height: 1.695rem;
position: absolute; } position: absolute; }
/* line 10, ../sass/_limits.scss */ /*.s-limit-upr,
.s-limit-upr,
.s-limit-lwr { .s-limit-lwr {
$a: 0.5;
$l: 30%;
white-space: nowrap;
&:before {
display: inline-block;
font-family: symbolsfont;
font-size: 0.85em;
font-style: normal !important;
margin-right: $interiorMarginSm;
vertical-align: middle;
}
}
.s-limit-upr {
&.s-limit-yellow { @include limit($colorLimitYellow, "\0000ed"); }
&.s-limit-red { @include limit($colorLimitRed, "\0000eb"); }
}
.s-limit-lwr {
&.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); }
&.s-limit-red { @include limit($colorLimitRed, "\0000ee"); }
}*/
/* line 35, ../sass/_limits.scss */
[class*="s-limit"] {
white-space: nowrap; } white-space: nowrap; }
/* line 15, ../sass/_limits.scss */ /* line 39, ../sass/_limits.scss */
.s-limit-upr:before, [class*="s-limit"]:before {
.s-limit-lwr:before {
display: inline-block; display: inline-block;
font-family: symbolsfont; font-family: symbolsfont;
font-size: 0.85em; font-size: 0.85em;
@ -756,41 +782,43 @@ span {
margin-right: 3px; margin-right: 3px;
vertical-align: middle; } vertical-align: middle; }
/* line 26, ../sass/_limits.scss */ /* line 49, ../sass/_limits.scss */
.s-limit-upr.s-limit-yellow { .s-limit-upr-red {
background: #9d7500; }
/* line 3, ../sass/_limits.scss */
.s-limit-upr.s-limit-yellow:before {
color: #ffcc37;
content: "í"; }
/* line 27, ../sass/_limits.scss */
.s-limit-upr.s-limit-red {
background: #aa0000; } background: #aa0000; }
/* line 3, ../sass/_limits.scss */ /* line 3, ../sass/_limits.scss */
.s-limit-upr.s-limit-red:before { .s-limit-upr-red:before {
color: #ff4444; color: #ff4444;
content: "ë"; } content: "ë"; }
/* line 31, ../sass/_limits.scss */ /* line 50, ../sass/_limits.scss */
.s-limit-lwr.s-limit-yellow { .s-limit-upr-yellow {
background: #9d7500; } background: #9d7500; }
/* line 3, ../sass/_limits.scss */ /* line 3, ../sass/_limits.scss */
.s-limit-lwr.s-limit-yellow:before { .s-limit-upr-yellow:before {
color: #ffcc37;
content: "í"; }
/* line 51, ../sass/_limits.scss */
.s-limit-lwr-yellow {
background: #9d7500; }
/* line 3, ../sass/_limits.scss */
.s-limit-lwr-yellow:before {
color: #ffcc37; color: #ffcc37;
content: "ì"; } content: "ì"; }
/* line 32, ../sass/_limits.scss */
.s-limit-lwr.s-limit-red { /* line 52, ../sass/_limits.scss */
.s-limit-lwr-red {
background: #aa0000; } background: #aa0000; }
/* line 3, ../sass/_limits.scss */ /* line 3, ../sass/_limits.scss */
.s-limit-lwr.s-limit-red:before { .s-limit-lwr-red:before {
color: #ff4444; color: #ff4444;
content: "î"; } content: "î"; }
/* line 6, ../sass/_data-status.scss */ /* line 1, ../sass/_data-status.scss */
.s-stale { .s-stale {
color: rgba(255, 255, 255, 0.5) !important; color: rgba(255, 255, 255, 0.5) !important;
font-style: italic; } font-style: italic; }
/* line 8, ../sass/_data-status.scss */ /* line 3, ../sass/_data-status.scss */
.s-stale .td { .s-stale .td {
color: rgba(255, 255, 255, 0.5) !important; color: rgba(255, 255, 255, 0.5) !important;
font-style: italic; } font-style: italic; }
@ -3151,39 +3179,41 @@ input[type="text"] {
/* line 49, ../sass/_autoflow.scss */ /* line 49, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover { .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover {
background: rgba(255, 255, 255, 0.1); } background: rgba(255, 255, 255, 0.1); }
/* line 52, ../sass/_autoflow.scss */ /* line 54, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.stale { .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.l {
color: #666666; } color: rgba(255, 255, 255, 0.3) !important;
/* line 56, ../sass/_autoflow.scss */ font-style: italic; }
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.stale) .l-autoflow-item.r { /* line 55, ../sass/_autoflow.scss */
color: #cccccc; } .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.r {
/* line 61, ../sass/_autoflow.scss */ color: rgba(255, 255, 255, 0.5) !important;
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.alert .l-autoflow-item.r { font-style: italic; }
background: #cc0000; } /* line 58, ../sass/_autoflow.scss */
/* line 65, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.s-stale) .l-autoflow-item.r {
color: #b3b3b3; }
/* line 62, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group {
border-top: 1px solid gray; } border-top: 1px solid gray; }
/* line 68, ../sass/_autoflow.scss */ /* line 65, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item {
display: block; } display: block; }
/* line 70, ../sass/_autoflow.scss */ /* line 67, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.l { .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.l {
float: none; float: none;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
width: auto; } width: auto; }
/* line 78, ../sass/_autoflow.scss */ /* line 74, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.r { .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.r {
-moz-border-radius: 3px; -moz-border-radius: 2px;
-webkit-border-radius: 3px; -webkit-border-radius: 2px;
border-radius: 3px; border-radius: 2px;
float: right; float: right;
margin-left: 5px; margin-left: 5px;
padding-left: 2px; padding-left: 2px;
padding-right: 2px; padding-right: 2px;
text-align: right; } text-align: right; }
/* line 90, ../sass/_autoflow.scss */ /* line 85, ../sass/_autoflow.scss */
.autoflow .l-autoflow-items .l-autoflow-col:first-child { .autoflow .l-autoflow-items .l-autoflow-col:first-child {
border-left: none; border-left: none;
padding-left: 0; } padding-left: 0; }

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

@ -49,17 +49,14 @@
&:hover { &:hover {
background: rgba(#fff, 0.1); background: rgba(#fff, 0.1);
} }
&.stale { &.s-stale {
color: darken($colorBodyFg, 20%); //color: darken($colorBodyFg, 20%);
.l-autoflow-item.l { @include s-stale(0.3); };
.l-autoflow-item.r { @include s-stale(); };
} }
&:not(.stale) { &:not(.s-stale) {
.l-autoflow-item.r { .l-autoflow-item.r {
color: lighten($colorBodyFg, 20%); color: lighten($colorBodyFg, 10%);
}
}
&.alert {
.l-autoflow-item.r {
background: $colorFormError;
} }
} }
&.first-in-group { &.first-in-group {
@ -68,7 +65,6 @@
.l-autoflow-item { .l-autoflow-item {
display: block; display: block;
&.l { &.l {
// @include test(orange);
float: none; float: none;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -76,8 +72,7 @@
width: auto; width: auto;
} }
&.r { &.r {
// @include test(blue); @include border-radius($smallCr);
@include border-radius($controlCr);
float: right; float: right;
margin-left: $interiorMargin; margin-left: $interiorMargin;
padding-left: $valPad; padding-left: $valPad;

5
platform/commonUI/general/res/sass/_data-status.scss
View File

@ -1,8 +1,3 @@
@mixin s-stale($a: 0.5) {
color: rgba($colorTelemFresh, $a) !important;
font-style: italic;
}
.s-stale { .s-stale {
@include s-stale(); @include s-stale();
.td { .td {

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

@ -51,17 +51,19 @@
@include txtShdwSubtle(); @include txtShdwSubtle();
border:1px solid transparent; border:1px solid transparent;
font-size: 0.8rem; font-size: 0.8rem;
$p: $interiorMarginSm; $p: 1px; //$interiorMarginSm;
line-height: 100%; line-height: 100%;
&.l-static-text { &.l-static-text {
// overflow: auto;
padding: $p; padding: $p;
} }
&.l-telemetry { &.l-telemetry {
.l-elem { .l-elem {
@include absPosDefault($p, false); //@include absPosDefault($p);
@include absPosDefault(0);
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 2px;
width: 50%; width: 50%;
//padding: 0 $interiorMarginSm;
&.l-title { &.l-title {
right: auto; right: auto;
left: $p; left: $p;
@ -78,7 +80,7 @@
} }
.l-value-bg { .l-value-bg {
@include border-radius($smallCr); @include border-radius($smallCr);
padding: 0 $interiorMarginSm; padding: 0 4px;
} }
} }
} }
@ -88,6 +90,7 @@
.l-fixed-position-item-handle { .l-fixed-position-item-handle {
$brd: 1px solid $colorKey; $brd: 1px solid $colorKey;
// @include border-radius($controlCr);
background: rgba($colorKey, 0.5); background: rgba($colorKey, 0.5);
cursor: crosshair; cursor: crosshair;
border: $brd; border: $brd;
@ -111,8 +114,11 @@
} }
.l-fixed-position-item { .l-fixed-position-item {
&:not(.s-selected):hover { &:not(.s-selected) {
border: 1px dotted rgba($colorKey, 0.5); border: 1px dotted rgba($colorKey, 0.75);
&:hover {
border: 1px dotted rgba($colorKey, 1.0);
}
} }
} }
} }

23
platform/commonUI/general/res/sass/_limits.scss
View File

@ -7,7 +7,7 @@
} }
} }
.s-limit-upr, /*.s-limit-upr,
.s-limit-lwr { .s-limit-lwr {
$a: 0.5; $a: 0.5;
$l: 30%; $l: 30%;
@ -30,4 +30,23 @@
.s-limit-lwr { .s-limit-lwr {
&.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); } &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); }
&.s-limit-red { @include limit($colorLimitRed, "\0000ee"); } &.s-limit-red { @include limit($colorLimitRed, "\0000ee"); }
} }*/
[class*="s-limit"] {
$a: 0.5;
$l: 30%;
white-space: nowrap;
&:before {
display: inline-block;
font-family: symbolsfont;
font-size: 0.85em;
font-style: normal !important;
margin-right: $interiorMarginSm;
vertical-align: middle;
}
}
.s-limit-upr-red { @include limit($colorLimitRed, "\0000eb"); };
.s-limit-upr-yellow { @include limit($colorLimitYellow, "\0000ed"); };
.s-limit-lwr-yellow { @include limit($colorLimitYellow, "\0000ec"); };
.s-limit-lwr-red { @include limit($colorLimitRed, "\0000ee"); };

7
platform/commonUI/general/res/sass/_mixins.scss
View File

@ -234,8 +234,6 @@
background-color: rgba($c, $a); background-color: rgba($c, $a);
} }
@mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) { @mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) {
&:after { &:after {
@include box-sizing(border-box); @include box-sizing(border-box);
@ -251,4 +249,9 @@
transform: scaleX(1) scaleY(1) scaleZ(1); transform: scaleX(1) scaleY(1) scaleZ(1);
transform-origin: 50% 50% 0; transform-origin: 50% 50% 0;
} }
}
@mixin s-stale($a: 0.5) {
color: rgba($colorTelemFresh, $a) !important;
font-style: italic;
} }

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

@ -16,7 +16,7 @@
<!-- ng-class is temporarily hard-coded in next element --> <!-- ng-class is temporarily hard-coded in next element -->
<span <span
class="l-value-bg s-value-bg" class="l-value-bg s-value-bg"
ng-class="{ 's-limit-lwr': ngModel.value < 0, 's-limit-red' : ngModel.value < 0 }" ng-class="{ 's-limit-upr-yellow': ngModel.value < 0 }"
> >
{{ngModel.value}} {{ngModel.value}}
</span> </span>

2
platform/features/plot/res/templates/plot.html
View File

@ -9,7 +9,7 @@
<span <span
class='plot-legend-item' class='plot-legend-item'
ng-repeat="telemetryObject in subplot.getTelemetryObjects()" ng-repeat="telemetryObject in subplot.getTelemetryObjects()"
ng-class="{ 's-limit-upr s-limit-red': $index < 1, 's-stale': $index%2==0 }" ng-class="{ 's-limit-upr-red': $index < 1, 's-stale': $index%2==0 }"
> >
<span class='plot-color-swatch' <span class='plot-color-swatch'
ng-style="{ 'background-color': plot.getColor($index) }"> ng-style="{ 'background-color': plot.getColor($index) }">

2
platform/features/scrolling/res/templates/scrolling.html
View File

@ -27,7 +27,7 @@
<!-- ng-class is temporarily hard-coded in next element --> <!-- ng-class is temporarily hard-coded in next element -->
<span <span
class="l-cell-contents" class="l-cell-contents"
ng-class="{ 's-limit-upr': cell > 0, 's-limit-yellow': cell > 0 }" ng-class="{ 's-limit-upr-yellow': cell > 0 }"
> >
{{cell}} {{cell}}
</span> </span>

2
platform/features/static-markup/res/markup.html
View File

@ -13,7 +13,7 @@
<div <div
ng-repeat="limit in limits" ng-repeat="limit in limits"
ng-show="1" ng-show="1"
class="t-limit l-limit s-limit-{{limit.type}} s-limit-{{limit.severity}}" class="t-limit l-limit s-limit-{{limit.type}}-{{limit.severity}}"
style="top: {{limit.top}}%; bottom: {{limit.bottom}}%" style="top: {{limit.top}}%; bottom: {{limit.bottom}}%"
></div> ></div>
</div> </div>