diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 85357234a8..89a6f6e2ea 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1,6 +1,6 @@ @charset "UTF-8"; /* 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, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -21,38 +21,38 @@ time, mark, audio, video { font-size: 100%; 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 { 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 { 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 { border-collapse: collapse; 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 { text-align: left; font-weight: normal; 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 { 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 { content: ""; 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 { 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 { display: block; } @@ -476,48 +476,49 @@ span { line-height: 100%; } /* line 56, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text { - padding: 3px; } - /* line 60, ../sass/_fixed-position.scss */ + padding: 1px; } + /* line 61, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem { - overflow: false; + overflow: hidden; position: absolute; - top: 3px; - right: 3px; - bottom: 3px; - left: 3px; + 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 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 { right: auto; - left: 3px; } - /* line 69, ../sass/_fixed-position.scss */ + left: 1px; } + /* line 71, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { - right: 3px; + right: 1px; left: auto; 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 { - left: 3px; + left: 1px; 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 { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - padding: 0 3px; } -/* line 89, ../sass/_fixed-position.scss */ + padding: 0 4px; } +/* line 91, ../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 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 { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); 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: 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 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 { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); 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: 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 114, ../sass/_fixed-position.scss */ -.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover { - border: 1px dotted rgba(0, 153, 204, 0.5); } +/* line 117, ../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 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 */ .l-about.abs, .btn-menu span.l-about.l-click-area { @@ -742,13 +746,35 @@ span { line-height: 1.695rem; position: absolute; } -/* line 10, ../sass/_limits.scss */ -.s-limit-upr, +/*.s-limit-upr, .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; } - /* line 15, ../sass/_limits.scss */ - .s-limit-upr:before, - .s-limit-lwr:before { + /* line 39, ../sass/_limits.scss */ + [class*="s-limit"]:before { display: inline-block; font-family: symbolsfont; font-size: 0.85em; @@ -756,41 +782,43 @@ span { margin-right: 3px; vertical-align: middle; } -/* line 26, ../sass/_limits.scss */ -.s-limit-upr.s-limit-yellow { - 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 { +/* line 49, ../sass/_limits.scss */ +.s-limit-upr-red { background: #aa0000; } /* line 3, ../sass/_limits.scss */ - .s-limit-upr.s-limit-red:before { + .s-limit-upr-red:before { color: #ff4444; content: "ë"; } -/* line 31, ../sass/_limits.scss */ -.s-limit-lwr.s-limit-yellow { +/* line 50, ../sass/_limits.scss */ +.s-limit-upr-yellow { background: #9d7500; } /* 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; content: "ì"; } -/* line 32, ../sass/_limits.scss */ -.s-limit-lwr.s-limit-red { + +/* line 52, ../sass/_limits.scss */ +.s-limit-lwr-red { background: #aa0000; } /* line 3, ../sass/_limits.scss */ - .s-limit-lwr.s-limit-red:before { + .s-limit-lwr-red:before { color: #ff4444; content: "î"; } -/* line 6, ../sass/_data-status.scss */ +/* line 1, ../sass/_data-status.scss */ .s-stale { color: rgba(255, 255, 255, 0.5) !important; font-style: italic; } - /* line 8, ../sass/_data-status.scss */ + /* line 3, ../sass/_data-status.scss */ .s-stale .td { color: rgba(255, 255, 255, 0.5) !important; font-style: italic; } @@ -3151,39 +3179,41 @@ input[type="text"] { /* line 49, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover { background: rgba(255, 255, 255, 0.1); } - /* line 52, ../sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.stale { - color: #666666; } - /* line 56, ../sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.stale) .l-autoflow-item.r { - color: #cccccc; } - /* line 61, ../sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.alert .l-autoflow-item.r { - background: #cc0000; } - /* line 65, ../sass/_autoflow.scss */ + /* line 54, ../sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.l { + color: rgba(255, 255, 255, 0.3) !important; + font-style: italic; } + /* line 55, ../sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.r { + color: rgba(255, 255, 255, 0.5) !important; + font-style: italic; } + /* line 58, ../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 { 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 { 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 { float: none; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; 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 { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; float: right; margin-left: 5px; padding-left: 2px; padding-right: 2px; text-align: right; } - /* line 90, ../sass/_autoflow.scss */ + /* line 85, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col:first-child { border-left: none; padding-left: 0; } diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index 2647299a67..a20cc0b4c9 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -49,17 +49,14 @@ &:hover { background: rgba(#fff, 0.1); } - &.stale { - color: darken($colorBodyFg, 20%); + &.s-stale { + //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 { - color: lighten($colorBodyFg, 20%); - } - } - &.alert { - .l-autoflow-item.r { - background: $colorFormError; + color: lighten($colorBodyFg, 10%); } } &.first-in-group { @@ -68,7 +65,6 @@ .l-autoflow-item { display: block; &.l { - // @include test(orange); float: none; overflow: hidden; text-overflow: ellipsis; @@ -76,8 +72,7 @@ width: auto; } &.r { - // @include test(blue); - @include border-radius($controlCr); + @include border-radius($smallCr); float: right; margin-left: $interiorMargin; padding-left: $valPad; diff --git a/platform/commonUI/general/res/sass/_data-status.scss b/platform/commonUI/general/res/sass/_data-status.scss index 83308d5a32..24a15db794 100644 --- a/platform/commonUI/general/res/sass/_data-status.scss +++ b/platform/commonUI/general/res/sass/_data-status.scss @@ -1,8 +1,3 @@ -@mixin s-stale($a: 0.5) { - color: rgba($colorTelemFresh, $a) !important; - font-style: italic; -} - .s-stale { @include s-stale(); .td { diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss index 1ebd9d09cd..a9e88753a1 100644 --- a/platform/commonUI/general/res/sass/_fixed-position.scss +++ b/platform/commonUI/general/res/sass/_fixed-position.scss @@ -51,17 +51,19 @@ @include txtShdwSubtle(); border:1px solid transparent; font-size: 0.8rem; - $p: $interiorMarginSm; + $p: 1px; //$interiorMarginSm; line-height: 100%; &.l-static-text { +// overflow: auto; padding: $p; } &.l-telemetry { .l-elem { - @include absPosDefault($p, false); + //@include absPosDefault($p); + @include absPosDefault(0); @include box-sizing(border-box); + padding: 2px; width: 50%; - //padding: 0 $interiorMarginSm; &.l-title { right: auto; left: $p; @@ -78,7 +80,7 @@ } .l-value-bg { @include border-radius($smallCr); - padding: 0 $interiorMarginSm; + padding: 0 4px; } } } @@ -88,6 +90,7 @@ .l-fixed-position-item-handle { $brd: 1px solid $colorKey; + // @include border-radius($controlCr); background: rgba($colorKey, 0.5); cursor: crosshair; border: $brd; @@ -111,8 +114,11 @@ } .l-fixed-position-item { - &:not(.s-selected):hover { - border: 1px dotted rgba($colorKey, 0.5); + &:not(.s-selected) { + border: 1px dotted rgba($colorKey, 0.75); + &:hover { + border: 1px dotted rgba($colorKey, 1.0); + } } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_limits.scss b/platform/commonUI/general/res/sass/_limits.scss index 370969fc2b..4a9971edba 100644 --- a/platform/commonUI/general/res/sass/_limits.scss +++ b/platform/commonUI/general/res/sass/_limits.scss @@ -7,7 +7,7 @@ } } -.s-limit-upr, +/*.s-limit-upr, .s-limit-lwr { $a: 0.5; $l: 30%; @@ -30,4 +30,23 @@ .s-limit-lwr { &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); } &.s-limit-red { @include limit($colorLimitRed, "\0000ee"); } -} \ No newline at end of file +}*/ + +[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"); }; \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 69919194d9..edaabee384 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -234,8 +234,6 @@ background-color: rgba($c, $a); } - - @mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) { &:after { @include box-sizing(border-box); @@ -251,4 +249,9 @@ transform: scaleX(1) scaleY(1) scaleZ(1); transform-origin: 50% 50% 0; } +} + +@mixin s-stale($a: 0.5) { + color: rgba($colorTelemFresh, $a) !important; + font-style: italic; } \ No newline at end of file diff --git a/platform/features/layout/res/templates/elements/telemetry.html b/platform/features/layout/res/templates/elements/telemetry.html index 043086f476..486594c3d8 100644 --- a/platform/features/layout/res/templates/elements/telemetry.html +++ b/platform/features/layout/res/templates/elements/telemetry.html @@ -16,7 +16,7 @@ {{ngModel.value}} diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index e00c208bc9..e3c0c9bfd5 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -9,7 +9,7 @@ diff --git a/platform/features/scrolling/res/templates/scrolling.html b/platform/features/scrolling/res/templates/scrolling.html index e9d13466a5..354467bebd 100644 --- a/platform/features/scrolling/res/templates/scrolling.html +++ b/platform/features/scrolling/res/templates/scrolling.html @@ -27,7 +27,7 @@ {{cell}} diff --git a/platform/features/static-markup/res/markup.html b/platform/features/static-markup/res/markup.html index 821588cda2..afd63850cd 100644 --- a/platform/features/static-markup/res/markup.html +++ b/platform/features/static-markup/res/markup.html @@ -13,7 +13,7 @@