diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json index d3d85f075c..7982d57200 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json @@ -1,19 +1,32 @@ { "metadata": { - "name": "WTD Symbols v2.", - "lastOpened": 1441911912596, - "created": 1441911876817 + "name": "WTD Symbols v24", + "lastOpened": 1441992412958, + "created": 1441992410384 }, "iconSets": [ { "selection": [ + { + "order": 86, + "id": 85, + "prevSize": 32, + "code": 58888, + "codes": [ + 58888, + 58889, + 58890 + ], + "name": "icon-info-v15", + "tempChar": "" + }, { "order": 82, "id": 84, "prevSize": 32, "code": 58887, "name": "icon-x-in-circle", - "tempChar": "" + "tempChar": "" }, { "order": 77, @@ -21,7 +34,7 @@ "prevSize": 32, "code": 58881, "name": "icon-datatable", - "tempChar": "" + "tempChar": "" }, { "order": 78, @@ -29,7 +42,7 @@ "prevSize": 32, "code": 58882, "name": "icon-tabular-scrolling", - "tempChar": "" + "tempChar": "" }, { "order": 79, @@ -37,7 +50,7 @@ "prevSize": 32, "code": 58884, "name": "icon-tabular", - "tempChar": "" + "tempChar": "" }, { "order": 80, @@ -45,7 +58,7 @@ "prevSize": 32, "code": 58885, "name": "icon-calendar", - "tempChar": "" + "tempChar": "" }, { "order": 83, @@ -53,7 +66,7 @@ "prevSize": 32, "code": 58886, "name": "icon-paint-bucket", - "tempChar": "" + "tempChar": "" }, { "order": 1, @@ -61,7 +74,7 @@ "prevSize": 32, "code": 123, "name": "icon-pointer-left", - "tempChar": "" + "tempChar": "" }, { "order": 3, @@ -69,7 +82,7 @@ "prevSize": 32, "code": 125, "name": "icon-pointer-right", - "tempChar": "" + "tempChar": "" }, { "order": 4, @@ -77,7 +90,7 @@ "prevSize": 32, "code": 80, "name": "icon-person", - "tempChar": "" + "tempChar": "" }, { "order": 5, @@ -85,7 +98,7 @@ "prevSize": 32, "code": 232, "name": "icon-chain-links", - "tempChar": "" + "tempChar": "" }, { "order": 6, @@ -93,7 +106,7 @@ "prevSize": 32, "code": 115, "name": "icon-database-in-brackets", - "tempChar": "" + "tempChar": "" }, { "order": 7, @@ -101,7 +114,7 @@ "prevSize": 32, "code": 114, "name": "icon-refresh", - "tempChar": "" + "tempChar": "" }, { "order": 8, @@ -109,7 +122,7 @@ "prevSize": 32, "code": 108, "name": "icon-lock", - "tempChar": "" + "tempChar": "" }, { "order": 9, @@ -117,7 +130,7 @@ "prevSize": 32, "code": 51, "name": "icon-box-with-dashed-lines", - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -125,7 +138,7 @@ "prevSize": 32, "code": 58880, "name": "icon-box-with-arrow-cursor", - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -133,7 +146,7 @@ "prevSize": 32, "code": 65, "name": "icon-activity-mode", - "tempChar": "" + "tempChar": "" }, { "order": 12, @@ -141,7 +154,7 @@ "prevSize": 32, "code": 97, "name": "icon-activity", - "tempChar": "" + "tempChar": "" }, { "order": 13, @@ -149,7 +162,7 @@ "prevSize": 32, "code": 33, "name": "icon-alert-rect", - "tempChar": "" + "tempChar": "" }, { "order": 14, @@ -157,7 +170,7 @@ "prevSize": 32, "code": 58883, "name": "icon-alert-triangle", - "tempChar": "" + "tempChar": "" }, { "order": 15, @@ -165,7 +178,7 @@ "prevSize": 32, "code": 238, "name": "icon-arrow-double-down", - "tempChar": "" + "tempChar": "" }, { "order": 16, @@ -173,7 +186,7 @@ "prevSize": 32, "code": 235, "name": "icon-arrow-double-up", - "tempChar": "" + "tempChar": "" }, { "order": 2, @@ -181,7 +194,7 @@ "prevSize": 32, "code": 118, "name": "icon-arrow-down", - "tempChar": "" + "tempChar": "" }, { "order": 19, @@ -189,7 +202,7 @@ "prevSize": 32, "code": 60, "name": "icon-arrow-left", - "tempChar": "" + "tempChar": "" }, { "order": 20, @@ -197,7 +210,7 @@ "prevSize": 32, "code": 62, "name": "icon-arrow-right", - "tempChar": "" + "tempChar": "" }, { "order": 21, @@ -205,7 +218,7 @@ "prevSize": 32, "code": 236, "name": "icon-arrow-tall-down", - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -213,7 +226,7 @@ "prevSize": 32, "code": 237, "name": "icon-arrow-tall-up", - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -221,7 +234,7 @@ "prevSize": 32, "code": 94, "name": "icon-arrow-up", - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -229,7 +242,7 @@ "prevSize": 32, "code": 73, "name": "icon-arrows-out", - "tempChar": "" + "tempChar": "" }, { "order": 25, @@ -237,7 +250,7 @@ "prevSize": 32, "code": 58893, "name": "icon-arrows-right-left", - "tempChar": "" + "tempChar": "" }, { "order": 33, @@ -245,7 +258,7 @@ "prevSize": 32, "code": 53, "name": "icon-arrows-up-down", - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -253,7 +266,7 @@ "prevSize": 32, "code": 42, "name": "icon-asterisk", - "tempChar": "" + "tempChar": "" }, { "order": 27, @@ -261,7 +274,7 @@ "prevSize": 32, "code": 72, "name": "icon-autoflow-tabular", - "tempChar": "" + "tempChar": "" }, { "order": 28, @@ -269,7 +282,7 @@ "prevSize": 32, "code": 224, "name": "icon-box", - "tempChar": "" + "tempChar": "" }, { "order": 29, @@ -277,7 +290,7 @@ "prevSize": 32, "code": 50, "name": "icon-check", - "tempChar": "" + "tempChar": "" }, { "order": 30, @@ -285,7 +298,7 @@ "prevSize": 32, "code": 67, "name": "icon-clock", - "tempChar": "" + "tempChar": "" }, { "order": 31, @@ -293,7 +306,7 @@ "prevSize": 32, "code": 46, "name": "icon-connectivity", - "tempChar": "" + "tempChar": "" }, { "order": 32, @@ -301,7 +314,7 @@ "prevSize": 32, "code": 100, "name": "icon-database-query", - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -309,7 +322,7 @@ "prevSize": 32, "code": 68, "name": "icon-database", - "tempChar": "" + "tempChar": "" }, { "order": 35, @@ -317,7 +330,7 @@ "prevSize": 32, "code": 81, "name": "icon-dictionary", - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -325,7 +338,7 @@ "prevSize": 32, "code": 242, "name": "icon-duplicate", - "tempChar": "" + "tempChar": "" }, { "order": 37, @@ -333,7 +346,7 @@ "prevSize": 32, "code": 102, "name": "icon-folder-new", - "tempChar": "" + "tempChar": "" }, { "order": 38, @@ -341,7 +354,7 @@ "prevSize": 32, "code": 70, "name": "icon-folder", - "tempChar": "" + "tempChar": "" }, { "order": 39, @@ -349,7 +362,7 @@ "prevSize": 32, "code": 95, "name": "icon-fullscreen-collapse", - "tempChar": "" + "tempChar": "" }, { "order": 40, @@ -357,7 +370,7 @@ "prevSize": 32, "code": 122, "name": "icon-fullscreen-expand", - "tempChar": "" + "tempChar": "" }, { "order": 41, @@ -365,7 +378,7 @@ "prevSize": 32, "code": 71, "name": "icon-gear", - "tempChar": "" + "tempChar": "" }, { "order": 49, @@ -373,7 +386,7 @@ "prevSize": 32, "code": 227, "name": "icon-image", - "tempChar": "" + "tempChar": "" }, { "order": 42, @@ -381,7 +394,7 @@ "prevSize": 32, "code": 225, "name": "icon-layers", - "tempChar": "" + "tempChar": "" }, { "order": 43, @@ -389,7 +402,7 @@ "prevSize": 32, "code": 76, "name": "icon-layout", - "tempChar": "" + "tempChar": "" }, { "order": 44, @@ -397,7 +410,7 @@ "prevSize": 32, "code": 226, "name": "icon-line-horz", - "tempChar": "" + "tempChar": "" }, { "order": 75, @@ -405,7 +418,7 @@ "prevSize": 32, "code": 244, "name": "icon-link", - "tempChar": "" + "tempChar": "" }, { "order": 46, @@ -413,7 +426,7 @@ "prevSize": 32, "code": 88, "name": "icon-magnify-in", - "tempChar": "" + "tempChar": "" }, { "order": 47, @@ -421,7 +434,7 @@ "prevSize": 32, "code": 89, "name": "icon-magnify-out", - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -429,7 +442,7 @@ "prevSize": 32, "code": 77, "name": "icon-magnify", - "tempChar": "" + "tempChar": "" }, { "order": 34, @@ -437,7 +450,7 @@ "prevSize": 32, "code": 109, "name": "icon-menu", - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -445,7 +458,7 @@ "prevSize": 32, "code": 243, "name": "icon-move", - "tempChar": "" + "tempChar": "" }, { "order": 51, @@ -453,7 +466,7 @@ "prevSize": 32, "code": 121, "name": "icon-new-window", - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -461,7 +474,7 @@ "prevSize": 32, "code": 111, "name": "icon-object", - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -469,7 +482,7 @@ "prevSize": 32, "code": 63, "name": "icon-object-unknown", - "tempChar": "" + "tempChar": "" }, { "order": 53, @@ -477,7 +490,7 @@ "prevSize": 32, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -485,7 +498,7 @@ "prevSize": 32, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -493,7 +506,7 @@ "prevSize": 32, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -501,7 +514,7 @@ "prevSize": 32, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { "order": 65, @@ -509,7 +522,7 @@ "prevSize": 32, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -517,7 +530,7 @@ "prevSize": 32, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -525,7 +538,7 @@ "prevSize": 32, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -533,7 +546,7 @@ "prevSize": 32, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -541,7 +554,7 @@ "prevSize": 32, "code": 45, "name": "icon-minus", - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -549,7 +562,7 @@ "prevSize": 32, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -557,7 +570,7 @@ "prevSize": 32, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -565,7 +578,7 @@ "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -573,7 +586,7 @@ "prevSize": 32, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { "order": 18, @@ -581,7 +594,7 @@ "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -589,7 +602,7 @@ "prevSize": 32, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -597,7 +610,7 @@ "prevSize": 32, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -605,7 +618,7 @@ "prevSize": 32, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -613,7 +626,7 @@ "prevSize": 32, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -621,7 +634,7 @@ "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -629,7 +642,7 @@ "prevSize": 32, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -637,7 +650,7 @@ "prevSize": 32, "code": 58946, "name": "icon-x", - "tempChar": "" + "tempChar": "" } ], "id": 2, @@ -652,6 +665,27 @@ "height": 1024, "prevSize": 32, "icons": [ + { + "id": 85, + "paths": [ + "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM512 128c70.6 0 128 57.4 128 128s-57.4 128-128 128c-70.6 0-128-57.4-128-128s57.4-128 128-128zM704 832h-384v-128h64v-256h256v256h64v128z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-info-v1.5" + ], + "colorPermutations": { + "125525525516161751": [ + 0 + ] + } + }, { "id": 84, "paths": [ @@ -2052,6 +2086,12 @@ 161, 75, 1 + ], + [ + 255, + 255, + 255, + 1 ] ] ], @@ -14813,5 +14853,6 @@ "gridSize": 16, "showLiga": false }, - "uid": -1 + "uid": -1, + "time": 1441993324496 } \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 2a2e64b113..95887455fe 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg index 537244cfe9..596a5dd3e9 100755 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -84,6 +84,7 @@ + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index 58e64c5367..8f0f1d9610 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index 182bd9fd81..d5bc74071c 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff differ diff --git a/platform/commonUI/general/res/sass/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index ddade4e965..d0dbb2659a 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -52,7 +52,7 @@ a.disabled { } @include keyframes(pulse) { - 0% { opacity: 0.2; } + 0% { opacity: 0.5; } 100% { opacity: 1; } } diff --git a/platform/commonUI/general/res/sass/_limits.scss b/platform/commonUI/general/res/sass/_limits.scss index 4a9971edba..12411554cd 100644 --- a/platform/commonUI/general/res/sass/_limits.scss +++ b/platform/commonUI/general/res/sass/_limits.scss @@ -1,52 +1,26 @@ -@mixin limit($c, $glyph) { - background: $c; +@mixin limit($bg, $ic, $glyph) { + background: $bg !important; + //color: $fg !important; &:before { - //@include pulse(500ms); - color: lighten($c, 30%); + //@include pulse(1000ms); + color: $ic; content: $glyph; } } -/*.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"); } -}*/ - [class*="s-limit"] { - $a: 0.5; - $l: 30%; - white-space: nowrap; + //white-space: nowrap; &:before { display: inline-block; font-family: symbolsfont; - font-size: 0.85em; + font-size: 0.75em; 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 +.s-limit-upr-red { @include limit($colorLimitRedBg, $colorLimitRedIc, "\0000eb"); }; +.s-limit-upr-yellow { @include limit($colorLimitYellowBg, $colorLimitYellowIc, "\0000ed"); }; +.s-limit-lwr-yellow { @include limit($colorLimitYellowBg, $colorLimitYellowIc, "\0000ec"); }; +.s-limit-lwr-red { @include limit($colorLimitRedBg, $colorLimitRedIc, "\0000ee"); }; \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 3340d188bd..c81e24c4e4 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -63,16 +63,6 @@ $pad: $interiorMargin * $baseRatio; } - //&.paused { - // @include btnSubtle($colorPausedBg, lighten($colorPausedBg, 10%), $colorPausedFg, $colorPausedFg); - // .icon { - // @include pulse(500ms); - // &:before { - // content: "\0000EF"; - // } - // } - //} - &.pause-play { .icon:before { content: "\0000F1"; diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 0933362797..af967d6ef3 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -154,7 +154,7 @@ label.checkbox.custom { min-width: $d; &:before { @include border-radius($basicCr * .75); - //background: $bg; + background: $bg; //border-bottom: 1px solid lighten($bg, 10%); @include box-shadow(inset rgba(black, 0.4) 0 1px 2px); box-sizing: border-box; @@ -241,7 +241,7 @@ label.checkbox.custom { //} > .type-icon { - color: $colorObjHdrIcon; + color: $colorObjHdrIc; font-size: 120%; float: left; margin-right: $interiorMargin; @@ -264,6 +264,7 @@ label.checkbox.custom { .title-label { //@include test(green, 0.9); + color: $colorObjHdrTxt; @include ellipsize(); //color: pushBack($colorBodyFg, 40%); @include webkitProp(flex, '0 1 auto'); diff --git a/platform/commonUI/general/res/sass/forms/_validation.scss b/platform/commonUI/general/res/sass/forms/_validation.scss index 07f15cb660..e82a7fdd3a 100644 --- a/platform/commonUI/general/res/sass/forms/_validation.scss +++ b/platform/commonUI/general/res/sass/forms/_validation.scss @@ -21,22 +21,11 @@ *****************************************************************************/ .validates { > .label { - // @include test(green, 0.1); - padding-right: $reqSymbolW + $reqSymbolM; // Keep room for validation element + padding-right: $reqSymbolM; // Keep room for validation element &::after { - // @include test(yellow, 0.3); -/* display: block; - position: absolute; - top: 0; - right: $reqSymbolM; - bottom: 0; - left: auto; - height: auto; - width: $reqSymbolW;*/ + float: right; font-family: symbolsfont; font-size: $reqSymbolFontSize; - //text-align: right; - //vertical-align: middle; } } &.invalid, diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 5587d43da3..9e5fe1cf47 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -32,7 +32,7 @@ $iconMargin: 40px; $iconD: ($d - ($iconMargin * 2)) * 0.85; $transTime: 200ms; - @include btnSubtle($colorItemBg, pullForward($colorItemBg, 20%), $colorItemFg, $colorItemIc); + @include btnSubtle($colorItemBg, $colorItemBgHov, $colorItemFg, $colorItemIc); box-sizing: border-box; cursor: pointer; float: left; diff --git a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss index 2c455a9941..caa6df0967 100644 --- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss @@ -47,5 +47,10 @@ float: none; width: 100%; } + > .label { + &:after { + float: none; + } + } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 54694d90eb..2dce492563 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -89,5 +89,10 @@ bottom: $myM; left: $myM; overflow: auto; + .field.l-med { + input[type='text'] { + width: 100%; + } + } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 9845c4d4be..67acb46e28 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -23,8 +23,8 @@ $yBarW: 60px; $yLabelW: auto; $xBarH: 32px; $legendH: 20px; -$colorHash: rgba(white, 0.3); -$styleHash: dashed; +//$colorHash: rgba(white, 0.3); // MOVED INTO CONSTANTS +//$styleHash: dashed; // MOVED INTO CONSTANTS $swatchD: 8px; $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBarW); // Top, right, bottom, left @@ -83,7 +83,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa bottom: nth($plotDisplayArea, 3); left: nth($plotDisplayArea, 4); cursor: crosshair; - border: 1px solid $colorInteriorBorder; + border: 1px solid $colorPlotAreaBorder; } .gl-plot-label, @@ -133,7 +133,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .gl-plot-hash { position: absolute; - border: 0 $colorHash $styleHash; + border: 0 $colorPlotHash $stylePlotHash; &.hash-v { border-right-width: 1px; height: 100%; @@ -173,8 +173,8 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa height: auto; z-index: 0; - &.s-limit-yellow { @include limitBg($colorLimitYellow); } - &.s-limit-red { @include limitBg($colorLimitRed); } + &.s-limit-yellow { @include limitBg($colorLimitYellowBg); } + &.s-limit-red { @include limitBg($colorLimitRedBg); } } .l-oob-data { @@ -218,7 +218,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa } &[class*='s-limit'] { .title-label { - color: #fff; + //color: #fff; } } } @@ -241,7 +241,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .tick { position: absolute; - border: 0 $colorHash solid; + border: 0 $colorPlotHash solid; &.tick-x { border-right-width: 1px; height: 100%; // Assumption is that the tick will be in a holder that will set it's height; diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index d5217017ea..6b993f9075 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -47,10 +47,12 @@ } &.frame-template { .view-switcher { - font-size: 80%; height: $ohH; line-height: $ohH; z-index: 10; + > span { + font-size: 0.7rem; + } } // Hide the view switcher by default when it's in an element that's in a frame context // Frame template is used because we need to target the lowest nested frame diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index b304a8e8db..4661c47214 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -341,6 +341,7 @@ .left { //@include test(red); @include webkitProp(flex, '1 1 0'); + padding-right: $interiorMarginLg; } } diff --git a/platform/commonUI/inspect/res/templates/info-button.html b/platform/commonUI/inspect/res/templates/info-button.html index f41d48262b..fce10450ff 100644 --- a/platform/commonUI/inspect/res/templates/info-button.html +++ b/platform/commonUI/inspect/res/templates/info-button.html @@ -22,4 +22,3 @@ - diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index eed02ecff8..6eac93ae8b 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* 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, @@ -41,38 +41,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; } @@ -272,17 +272,17 @@ a.disabled { @-moz-keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } @-webkit-keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } @keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } /* line 69, ../../../../general/res/sass/_effects.scss */ @@ -661,72 +661,45 @@ mct-container { color: #ff3c00; content: "!"; } -/*.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; - } -} +/* line 13, ../../../../general/res/sass/_limits.scss */ +[class*="s-limit"]:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.75em; + font-style: normal !important; + margin-right: 3px; + 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, ../../../../general/res/sass/_limits.scss */ -[class*="s-limit"] { - white-space: nowrap; } - /* line 39, ../../../../general/res/sass/_limits.scss */ - [class*="s-limit"]:before { - display: inline-block; - font-family: symbolsfont; - font-size: 0.85em; - font-style: normal !important; - margin-right: 3px; - vertical-align: middle; } - -/* line 49, ../../../../general/res/sass/_limits.scss */ +/* line 23, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-red { - background: #aa0000; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 0, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-red:before { - color: #ff4444; + color: red; content: "ë"; } -/* line 50, ../../../../general/res/sass/_limits.scss */ +/* line 24, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-yellow { - background: #9d7500; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 170, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-yellow:before { - color: #ffcc37; + color: #ffaa00; content: "í"; } -/* line 51, ../../../../general/res/sass/_limits.scss */ +/* line 25, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-yellow { - background: #9d7500; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 170, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-yellow:before { - color: #ffcc37; + color: #ffaa00; content: "ì"; } -/* line 52, ../../../../general/res/sass/_limits.scss */ +/* line 26, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-red { - background: #aa0000; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 0, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-red:before { - color: #ff4444; + color: red; content: "î"; } /* line 1, ../../../../general/res/sass/_data-status.scss */ @@ -1407,10 +1380,10 @@ mct-container { /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon, .select:not(.major):not(.disabled):hover > .icon { color: #33ccff; } } - /* line 77, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before, .pause-play.select .icon:before { content: "\0000F1"; } - /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 70, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused, .pause-play.paused.s-menu, .pause-play.paused.select { background-color: #c56f01; -moz-border-radius: 3px; @@ -1449,7 +1422,7 @@ mct-container { /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon, .pause-play.paused.select:not(.disabled):hover > .icon { color: white; } } - /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 72, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon, .pause-play.paused.select .icon { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -1466,23 +1439,23 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 84, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu .icon :before, .pause-play.paused.select .icon :before { content: "\0000EF"; } - /* line 92, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before, .show-thumbs.select .icon:before { content: "\000039"; } -/* line 98, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 88, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu, .l-btn-set .select { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 110, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 100, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .first .s-btn, .l-btn-set .first .s-menu, .l-btn-set .first .select { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; @@ -1491,7 +1464,7 @@ mct-container { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 117, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 107, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .last .s-btn, .l-btn-set .last .s-menu, .l-btn-set .last .select { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; @@ -1500,7 +1473,7 @@ mct-container { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 124, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 114, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu):not(.select) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -1739,6 +1712,7 @@ label.checkbox.custom { -moz-border-radius: 1.5px; -webkit-border-radius: 1.5px; border-radius: 1.5px; + background: #4d4d4d; -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; @@ -1842,19 +1816,20 @@ label.checkbox.custom { margin-right: 5px; } /* line 265, ../../../../general/res/sass/controls/_controls.scss */ .object-header .title-label { + color: #999; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } - /* line 274, ../../../../general/res/sass/controls/_controls.scss */ + /* line 275, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 281, ../../../../general/res/sass/controls/_controls.scss */ + /* line 282, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -1869,12 +1844,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; opacity: 0; } - /* line 286, ../../../../general/res/sass/controls/_controls.scss */ + /* line 287, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { opacity: 1; } } /******************************************************** SLIDERS */ -/* line 299, ../../../../general/res/sass/controls/_controls.scss */ +/* line 300, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1893,7 +1868,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 310, ../../../../general/res/sass/controls/_controls.scss */ +/* line 311, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { background-color: #333; -moz-border-radius: 3px; @@ -1979,12 +1954,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #0099cc; } - /* line 321, ../../../../general/res/sass/controls/_controls.scss */ + /* line 322, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 328, ../../../../general/res/sass/controls/_controls.scss */ +/* line 329, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -1995,13 +1970,13 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 338, ../../../../general/res/sass/controls/_controls.scss */ + /* line 339, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 347, ../../../../general/res/sass/controls/_controls.scss */ + /* line 348, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2016,7 +1991,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 356, ../../../../general/res/sass/controls/_controls.scss */ + /* line 357, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2030,7 +2005,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 365, ../../../../general/res/sass/controls/_controls.scss */ + /* line 366, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2039,7 +2014,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); background-image: linear-gradient(#5e5e5e, #525252 20px); } - /* line 370, ../../../../general/res/sass/controls/_controls.scss */ + /* line 371, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } } /***************************************************************************** @@ -2878,37 +2853,30 @@ textarea { *****************************************************************************/ /* line 23, ../../../../general/res/sass/forms/_validation.scss */ .validates > .label { - padding-right: 25px; } - /* line 26, ../../../../general/res/sass/forms/_validation.scss */ + padding-right: 10px; } + /* line 25, ../../../../general/res/sass/forms/_validation.scss */ .validates > .label::after { - /* display: block; - position: absolute; - top: 0; - right: $reqSymbolM; - bottom: 0; - left: auto; - height: auto; - width: $reqSymbolW;*/ + float: right; font-family: symbolsfont; font-size: 0.7em; } -/* line 44, ../../../../general/res/sass/forms/_validation.scss */ +/* line 33, ../../../../general/res/sass/forms/_validation.scss */ .validates.invalid > .label::after, .validates.invalid.req > .label::after { color: #ff3300; content: "x"; } -/* line 51, ../../../../general/res/sass/forms/_validation.scss */ +/* line 40, ../../../../general/res/sass/forms/_validation.scss */ .validates.valid > .label::after, .validates.valid.req > .label::after { color: #33cc33; content: "2"; } -/* line 57, ../../../../general/res/sass/forms/_validation.scss */ +/* line 46, ../../../../general/res/sass/forms/_validation.scss */ .validates.req > .label::after { color: #ffc700; content: "*"; } -/* line 63, ../../../../general/res/sass/forms/_validation.scss */ +/* line 52, ../../../../general/res/sass/forms/_validation.scss */ .req { font-size: 0.7em; } -/* line 66, ../../../../general/res/sass/forms/_validation.scss */ +/* line 55, ../../../../general/res/sass/forms/_validation.scss */ span.req { color: #ffc700; } @@ -3354,9 +3322,10 @@ span.req { /* line 341, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; - -webkit-flex: 1 1 0; } + -webkit-flex: 1 1 0; + padding-right: 10px; } -/* line 347, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -4034,6 +4003,9 @@ span.req { bottom: 5px; left: 5px; overflow: auto; } + /* line 93, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .contents.l-dialog .field.l-med input[type='text'] { + width: 100%; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 4, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ @@ -4073,7 +4045,10 @@ span.req { .overlay > .holder > .contents .form.editor .contents .form-row > .controls { display: block; float: none; - width: 100%; } } + width: 100%; } + /* line 51, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .form.editor .contents .form-row > .label:after { + float: none; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -4373,18 +4348,20 @@ ul.tree { left: 5px; } /* line 49, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { - font-size: 80%; height: 16px; line-height: 16px; z-index: 10; } + /* line 53, ../../../../general/res/sass/user-environ/_frame.scss */ + .frame.frame-template .view-switcher > span { + font-size: 0.7rem; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 58, ../../../../general/res/sass/user-environ/_frame.scss */ + /* line 60, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { opacity: 0; } - /* line 61, ../../../../general/res/sass/user-environ/_frame.scss */ + /* line 63, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template:hover .view-switcher { opacity: 1; } } -/* line 69, ../../../../general/res/sass/user-environ/_frame.scss */ +/* line 71, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .view-switcher .title-label { display: none; } @@ -5056,7 +5033,7 @@ table { /* line 134, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; - border: 0 rgba(255, 255, 255, 0.3) dashed; } + border: 0 rgba(255, 255, 255, 0.2) dashed; } /* line 137, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; @@ -5088,10 +5065,10 @@ table { z-index: 0; } /* line 176, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-yellow { - background: rgba(157, 117, 0, 0.2); } + background: rgba(255, 170, 0, 0.2); } /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-red { - background: rgba(170, 0, 0, 0.2); } + background: rgba(255, 0, 0, 0.2); } /* line 180, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data { overflow: hidden; @@ -5153,12 +5130,6 @@ table { display: inline-block; height: 8px; width: 8px; } - /* line 220, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item[class*='s-limit'] .title-label, - .gl-plot-legend .legend-item[class*='s-limit'] .title-label, - .legend .plot-legend-item[class*='s-limit'] .title-label, - .legend .legend-item[class*='s-limit'] .title-label { - color: #fff; } /* line 228, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item { @@ -5176,7 +5147,7 @@ table { /* line 242, ../../../../general/res/sass/plots/_plots-main.scss */ .tick { position: absolute; - border: 0 rgba(255, 255, 255, 0.3) solid; } + border: 0 rgba(255, 255, 255, 0.2) solid; } /* line 245, ../../../../general/res/sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 04e4e9241c..c4357b8d06 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -18,7 +18,6 @@ $colorBtnFg: $colorBodyFg; $colorBtnMajorBg: $colorKey; $colorBtnMajorFg: $colorKeyFg; $colorBtnIcon: $colorKey; -$colorObjHdrIcon: pullForward($colorBodyFg, 20%); $colorInvokeMenu: #fff; $contrastInvokeMenuPercent: 20%; @@ -33,6 +32,8 @@ $colorGridLines: rgba(#fff, 0.05); $colorFormLines: rgba(#fff, 0.1); $colorFormSectionHeader: rgba(#000, 0.2); $colorInvokeMenu: #fff; +$colorObjHdrTxt: $colorBodyFg; +$colorObjHdrIc: pullForward($colorObjHdrTxt, 20%); // Menu colors $colorMenuBg: pullForward($colorBodyBg, 23%); @@ -56,12 +57,16 @@ $colorInputBg: rgba(#fff, 0.1); $colorInputFg: pullForward($colorBodyFg, 20%); $colorFormText: rgba(#fff, 0.5); $colorInputIcon: pushBack($colorBodyFg, 15%); + // Limits and staleness colors -$colorLimitYellow: #9d7500; -$colorLimitRed: #aa0000; $colorTelemFresh: pullForward($colorBodyFg, 20%); $colorTelemStale: pushBack($colorBodyFg, 20%); $styleTelemStale: italic; +$colorLimitYellowBg: rgba(#ffaa00, 0.3); +$colorLimitYellowIc: #ffaa00; +$colorLimitRedBg: rgba(red, 0.3); +$colorLimitRedIc: red; + // Bubble colors $colorInfoBubbleFg: #666; $colorInfoBubbleBg: #ddd; @@ -77,6 +82,7 @@ $colorOvrBtnFg: #fff; // Items $colorItemBg: lighten($colorBodyBg, 5%); +$colorItemBgHov: pullForward($colorItemBg, 15%); $colorItemFg: lighten($colorItemBg, 50%); $colorItemFgDetails: lighten($colorItemBg, 30%); $colorItemIc: $colorKey; //pullForward($colorItemFg, 20%); @@ -96,6 +102,9 @@ $colorTabHeaderBorder: $colorBodyBg; // Plot $colorPlotBg: none; $colorPlotFg: $colorBodyFg; +$colorPlotHash: rgba(white, 0.2); +$stylePlotHash: dashed; +$colorPlotAreaBorder: $colorInteriorBorder; // Tree $colorItemTreeIcon: $colorKey; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 4ead1a5902..673b25354b 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* 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, @@ -41,38 +41,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; } @@ -272,17 +272,17 @@ a.disabled { @-moz-keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } @-webkit-keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } @keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } /* line 69, ../../../../general/res/sass/_effects.scss */ @@ -661,72 +661,45 @@ mct-container { color: #ff3c00; content: "!"; } -/*.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; - } -} +/* line 13, ../../../../general/res/sass/_limits.scss */ +[class*="s-limit"]:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.75em; + font-style: normal !important; + margin-right: 3px; + 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, ../../../../general/res/sass/_limits.scss */ -[class*="s-limit"] { - white-space: nowrap; } - /* line 39, ../../../../general/res/sass/_limits.scss */ - [class*="s-limit"]:before { - display: inline-block; - font-family: symbolsfont; - font-size: 0.85em; - font-style: normal !important; - margin-right: 3px; - vertical-align: middle; } - -/* line 49, ../../../../general/res/sass/_limits.scss */ +/* line 23, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-red { - background: #aa0000; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 0, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-red:before { - color: #ff4444; + color: red; content: "ë"; } -/* line 50, ../../../../general/res/sass/_limits.scss */ +/* line 24, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-yellow { - background: #9d7500; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 170, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-upr-yellow:before { - color: #ffcc37; + color: #ffaa00; content: "í"; } -/* line 51, ../../../../general/res/sass/_limits.scss */ +/* line 25, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-yellow { - background: #9d7500; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 170, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-yellow:before { - color: #ffcc37; + color: #ffaa00; content: "ì"; } -/* line 52, ../../../../general/res/sass/_limits.scss */ +/* line 26, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-red { - background: #aa0000; } - /* line 3, ../../../../general/res/sass/_limits.scss */ + background: rgba(255, 0, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ .s-limit-lwr-red:before { - color: #ff4444; + color: red; content: "î"; } /* line 1, ../../../../general/res/sass/_data-status.scss */ @@ -934,7 +907,7 @@ mct-container { *****************************************************************************/ /* line 25, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout .splitter { - background-color: #b0b0b0; + background-color: #969696; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; @@ -1345,7 +1318,7 @@ mct-container { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } + text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu .icon, .major.select .icon { color: #fff; } @@ -1358,7 +1331,7 @@ mct-container { color: white; } } /* line 58, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn:not(.major), .s-menu:not(.major), .select:not(.major) { - background-color: #b0b0b0; + background-color: #969696; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; @@ -1375,7 +1348,7 @@ mct-container { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } + text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu:not(.major) .icon, .select:not(.major) .icon { color: #eee; } @@ -1386,10 +1359,10 @@ mct-container { /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon, .select:not(.major):not(.disabled):hover > .icon { color: white; } } - /* line 77, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before, .pause-play.select .icon:before { content: "\0000F1"; } - /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 70, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused, .pause-play.paused.s-menu, .pause-play.paused.select { background-color: #ff9900; -moz-border-radius: 4px; @@ -1408,7 +1381,7 @@ mct-container { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } + text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon, .pause-play.paused.select .icon { color: #fff; } @@ -1419,7 +1392,7 @@ mct-container { /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon, .pause-play.paused.select:not(.disabled):hover > .icon { color: white; } } - /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 72, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon, .pause-play.paused.select .icon { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -1436,23 +1409,23 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 84, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu .icon :before, .pause-play.paused.select .icon :before { content: "\0000EF"; } - /* line 92, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before, .show-thumbs.select .icon:before { content: "\000039"; } -/* line 98, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 88, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu, .l-btn-set .select { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 110, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 100, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .first .s-btn, .l-btn-set .first .s-menu, .l-btn-set .first .select { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; @@ -1461,7 +1434,7 @@ mct-container { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 117, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 107, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .last .s-btn, .l-btn-set .last .s-menu, .l-btn-set .last .select { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; @@ -1470,7 +1443,7 @@ mct-container { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 124, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 114, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu):not(.select) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -1709,6 +1682,7 @@ label.checkbox.custom { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; + background: #e3e3e3; -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; @@ -1796,7 +1770,7 @@ label.checkbox.custom { font-size: 1em; } /* line 243, ../../../../general/res/sass/controls/_controls.scss */ .object-header > .type-icon { - color: #666; + color: #b3b3b3; font-size: 120%; float: left; margin-right: 5px; } @@ -1812,19 +1786,20 @@ label.checkbox.custom { margin-right: 5px; } /* line 265, ../../../../general/res/sass/controls/_controls.scss */ .object-header .title-label { + color: #666; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } - /* line 274, ../../../../general/res/sass/controls/_controls.scss */ + /* line 275, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 281, ../../../../general/res/sass/controls/_controls.scss */ + /* line 282, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -1839,12 +1814,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; opacity: 0; } - /* line 286, ../../../../general/res/sass/controls/_controls.scss */ + /* line 287, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { opacity: 1; } } /******************************************************** SLIDERS */ -/* line 299, ../../../../general/res/sass/controls/_controls.scss */ +/* line 300, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1863,9 +1838,9 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 310, ../../../../general/res/sass/controls/_controls.scss */ +/* line 311, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { - background-color: #b0b0b0; + background-color: #969696; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; @@ -1882,7 +1857,7 @@ label.checkbox.custom { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + text-shadow: none; cursor: ew-resize; position: absolute; height: 100%; @@ -1933,12 +1908,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #fcfcfc; } - /* line 321, ../../../../general/res/sass/controls/_controls.scss */ + /* line 322, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 328, ../../../../general/res/sass/controls/_controls.scss */ +/* line 329, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -1949,13 +1924,13 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 338, ../../../../general/res/sass/controls/_controls.scss */ + /* line 339, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 347, ../../../../general/res/sass/controls/_controls.scss */ + /* line 348, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1970,7 +1945,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 356, ../../../../general/res/sass/controls/_controls.scss */ + /* line 357, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -1984,7 +1959,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 365, ../../../../general/res/sass/controls/_controls.scss */ + /* line 366, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -1993,7 +1968,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); background-image: linear-gradient(#00ace6, #0099cc 20px); } - /* line 370, ../../../../general/res/sass/controls/_controls.scss */ + /* line 371, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.1); } } /***************************************************************************** @@ -2637,7 +2612,7 @@ textarea { *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_selects.scss */ .select { - background-color: #b0b0b0; + background-color: #969696; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; @@ -2654,7 +2629,7 @@ textarea { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + text-shadow: none; margin: 0 0 2px 2px; overflow: hidden; position: relative; } @@ -2810,37 +2785,30 @@ textarea { *****************************************************************************/ /* line 23, ../../../../general/res/sass/forms/_validation.scss */ .validates > .label { - padding-right: 25px; } - /* line 26, ../../../../general/res/sass/forms/_validation.scss */ + padding-right: 10px; } + /* line 25, ../../../../general/res/sass/forms/_validation.scss */ .validates > .label::after { - /* display: block; - position: absolute; - top: 0; - right: $reqSymbolM; - bottom: 0; - left: auto; - height: auto; - width: $reqSymbolW;*/ + float: right; font-family: symbolsfont; font-size: 0.7em; } -/* line 44, ../../../../general/res/sass/forms/_validation.scss */ +/* line 33, ../../../../general/res/sass/forms/_validation.scss */ .validates.invalid > .label::after, .validates.invalid.req > .label::after { color: #ff2200; content: "x"; } -/* line 51, ../../../../general/res/sass/forms/_validation.scss */ +/* line 40, ../../../../general/res/sass/forms/_validation.scss */ .validates.valid > .label::after, .validates.valid.req > .label::after { color: #33cc33; content: "2"; } -/* line 57, ../../../../general/res/sass/forms/_validation.scss */ +/* line 46, ../../../../general/res/sass/forms/_validation.scss */ .validates.req > .label::after { color: #0099cc; content: "*"; } -/* line 63, ../../../../general/res/sass/forms/_validation.scss */ +/* line 52, ../../../../general/res/sass/forms/_validation.scss */ .req { font-size: 0.7em; } -/* line 66, ../../../../general/res/sass/forms/_validation.scss */ +/* line 55, ../../../../general/res/sass/forms/_validation.scss */ span.req { color: #0099cc; } @@ -3286,9 +3254,10 @@ span.req { /* line 341, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; - -webkit-flex: 1 1 0; } + -webkit-flex: 1 1 0; + padding-right: 10px; } -/* line 347, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -3930,7 +3899,7 @@ span.req { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } + text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon, .overlay .bottom-bar .select:not(.major) .icon { color: #fff; } @@ -3948,6 +3917,9 @@ span.req { bottom: 5px; left: 5px; overflow: auto; } + /* line 93, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .contents.l-dialog .field.l-med input[type='text'] { + width: 100%; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 4, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ @@ -3987,7 +3959,10 @@ span.req { .overlay > .holder > .contents .form.editor .contents .form-row > .controls { display: block; float: none; - width: 100%; } } + width: 100%; } + /* line 51, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .form.editor .contents .form-row > .label:after { + float: none; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -4286,18 +4261,20 @@ ul.tree { left: 5px; } /* line 49, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { - font-size: 80%; height: 16px; line-height: 16px; z-index: 10; } + /* line 53, ../../../../general/res/sass/user-environ/_frame.scss */ + .frame.frame-template .view-switcher > span { + font-size: 0.7rem; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 58, ../../../../general/res/sass/user-environ/_frame.scss */ + /* line 60, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { opacity: 0; } - /* line 61, ../../../../general/res/sass/user-environ/_frame.scss */ + /* line 63, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template:hover .view-switcher { opacity: 1; } } -/* line 69, ../../../../general/res/sass/user-environ/_frame.scss */ +/* line 71, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .view-switcher .title-label { display: none; } @@ -4970,7 +4947,7 @@ table { /* line 134, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; - border: 0 rgba(255, 255, 255, 0.3) dashed; } + border: 0 rgba(0, 0, 0, 0.2) dashed; } /* line 137, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; @@ -5002,10 +4979,10 @@ table { z-index: 0; } /* line 176, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-yellow { - background: rgba(157, 117, 0, 0.2); } + background: rgba(255, 170, 0, 0.2); } /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-red { - background: rgba(170, 0, 0, 0.2); } + background: rgba(255, 0, 0, 0.2); } /* line 180, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data { overflow: hidden; @@ -5067,12 +5044,6 @@ table { display: inline-block; height: 8px; width: 8px; } - /* line 220, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item[class*='s-limit'] .title-label, - .gl-plot-legend .legend-item[class*='s-limit'] .title-label, - .legend .plot-legend-item[class*='s-limit'] .title-label, - .legend .legend-item[class*='s-limit'] .title-label { - color: #fff; } /* line 228, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item { @@ -5090,7 +5061,7 @@ table { /* line 242, ../../../../general/res/sass/plots/_plots-main.scss */ .tick { position: absolute; - border: 0 rgba(255, 255, 255, 0.3) solid; } + border: 0 rgba(0, 0, 0, 0.2) solid; } /* line 245, ../../../../general/res/sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; @@ -5257,14 +5228,14 @@ table { top: 0; } /* line 29, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item { - background-color: #b0b0b0; + background-color: #ddd; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - color: #fff; + color: #666; display: inline-block; -moz-user-select: -moz-none; -ms-user-select: none; @@ -5274,7 +5245,7 @@ table { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + text-shadow: none; box-sizing: border-box; cursor: pointer; float: left; @@ -5285,14 +5256,14 @@ table { position: relative; } /* line 272, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { - color: #eee; } + color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { - background: #7d7d7d; } + background: #d0d0d0; } /* line 279, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { - color: white; } } + color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: deepskyblue; } @@ -5311,7 +5282,7 @@ table { /* line 61, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar { bottom: auto; - color: #d9d9d9; + color: #8c8c8c; height: 20px; line-height: 20px; text-align: right; @@ -5374,7 +5345,7 @@ table { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; opacity: 0; - color: #d9d9d9; + color: #8c8c8c; font-size: 3em; left: auto; width: 50px; @@ -5382,18 +5353,18 @@ table { text-align: right; } /* line 121, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item .title { - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + text-shadow: none; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: #fff; } + color: #666; } /* line 126, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item .details { - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + text-shadow: none; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: #d9d9d9; + color: #8c8c8c; font-size: 0.8em; } /* line 132, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item.selected { @@ -5414,7 +5385,7 @@ table { -o-transition: background, 0.25s; -webkit-transition: background, 0.25s; transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + text-shadow: none; color: #80dfff; } /* line 272, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 7bb33039b7..770fb94e2f 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -7,7 +7,7 @@ $colorKey: #0099cc; $colorKeySelectedBg: $colorKey; $colorKeyFg: #fff; $colorInteriorBorder: rgba($colorBodyFg, 0.2); -$contrastRatioPercent: 30%; +$contrastRatioPercent: 40%; $basicCr: 4px; $controlCr: $basicCr; $smallCr: 3px; @@ -18,7 +18,6 @@ $colorBtnFg: #fff; $colorBtnMajorBg: $colorKey; $colorBtnMajorFg: $colorKeyFg; $colorBtnIcon: #eee; -$colorObjHdrIcon: $colorBodyFg; $colorInvokeMenu: #000; $contrastInvokeMenuPercent: 40%; @@ -31,6 +30,8 @@ $colorPausedFg: #fff; $colorCreateBtn: $colorKey; $colorGridLines: rgba(#000, 0.05); $colorInvokeMenu: #fff; +$colorObjHdrTxt: $colorBodyFg; +$colorObjHdrIc: pushBack($colorObjHdrTxt, 30%); // Menu colors $colorMenuBg: pushBack($colorBodyBg, 10%); @@ -58,11 +59,13 @@ $colorFormText: pushBack($colorBodyFg, 10%); $colorInputIcon: pushBack($colorBodyFg, 25%); // Limits and staleness colors// -$colorLimitYellow: #9d7500; -$colorLimitRed: #aa0000; $colorTelemFresh: pullForward($colorBodyFg, 20%); $colorTelemStale: pushBack($colorBodyFg, 20%); $styleTelemStale: italic; +$colorLimitYellowBg: rgba(#ffaa00, 0.3); +$colorLimitYellowIc: #ffaa00; +$colorLimitRedBg: rgba(red, 0.3); +$colorLimitRedIc: red; // Bubble colors $colorInfoBubbleFg: #666; @@ -78,13 +81,14 @@ $colorOvrBtnBg: pullForward($colorOvrBg, 40%); $colorOvrBtnFg: #fff; // Items -$colorItemBg: $colorBtnBg; -$colorItemFg: $colorBtnFg; -$colorItemFgDetails: darken($colorItemFg, 15%); -$colorItemIc: $colorBtnIcon; +$colorItemBg: #ddd; +$colorItemBgHov: pullForward($colorItemBg, 5%); +$colorItemFg: $colorBodyFg; +$colorItemFgDetails: pushBack($colorItemFg, 15%); +$colorItemIc: $colorKey; $colorItemSubIcons: $colorItemFgDetails; $colorItemOpenIcon: $colorItemFgDetails; -$shdwItemText: rgba(black, 0.2) 0 1px 2px; +$shdwItemText: none; //rgba(black, 0.2) 0 1px 2px; $colorItemBgSelected: $colorKey; // Tabular @@ -98,6 +102,9 @@ $colorTabHeaderBorder: $colorBodyBg; // Plot $colorPlotBg: #eee; $colorPlotFg: $colorBodyFg; +$colorPlotHash: rgba(black, 0.2); +$stylePlotHash: dashed; +$colorPlotAreaBorder: $colorInteriorBorder; // Tree $colorItemTreeIcon: $colorKey; diff --git a/platform/features/layout/src/FixedController.js b/platform/features/layout/src/FixedController.js index 410c0d2f94..3cdd676022 100644 --- a/platform/features/layout/src/FixedController.js +++ b/platform/features/layout/src/FixedController.js @@ -229,6 +229,7 @@ define( // Position a panel after a drop event function handleDrop(e, id, position) { // Don't handle this event if it has already been handled + // color is set to "" to let the CSS theme determine the default color if (e.defaultPrevented) { return; } @@ -240,7 +241,7 @@ define( y: Math.floor(position.y / self.gridSize[1]), id: id, stroke: "transparent", - color: "#cccccc", + color: "", titled: true, width: DEFAULT_DIMENSIONS[0], height: DEFAULT_DIMENSIONS[1]