diff --git a/platform/commonUI/browse/res/templates/create/locator.html b/platform/commonUI/browse/res/templates/create/locator.html index 790096af5b..4b40f37885 100644 --- a/platform/commonUI/browse/res/templates/create/locator.html +++ b/platform/commonUI/browse/res/templates/create/locator.html @@ -20,7 +20,7 @@ at runtime from the About dialog for additional information. -->
-
+
diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 37ccbebe6b..1c2d9eddc0 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -97,7 +97,6 @@ $formTBPad: $interiorMargin; $formLRPad: $interiorMargin; $menuLineH: 1.5rem; $menuLineHPx: 24px; -$scrollbarTrackSize: 10px; $btnStdH: 25px; $btnToolbarH: $btnStdH; diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 4bc28019fe..80023f55ac 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -44,8 +44,6 @@ /********************************* FORMS */ @import "forms/elems"; -@import "forms/textarea"; -@import "forms/text-input"; @import "forms/selects"; @import "forms/channel-selector"; @import "forms/datetime"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index c071f515b3..1987619527 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -146,13 +146,13 @@ } @mixin sliderTrack($bg: $scrollbarTrackColorBg) { - $b: 1px solid lighten($bg, 30%); + //$b: 1px solid lighten($bg, 30%); @include border-radius(2px); @include box-sizing(border-box); @include boxIncised(0.7); background-color: $bg; - border-bottom: $b; - border-right: $b; + //border-bottom: $b; + //border-right: $b; } @mixin controlGrippy($b, $direction: horizontal, $w: 1px, $style: dotted) { @@ -184,8 +184,8 @@ } } -@mixin boxIncised($sVal: 0.6) { - @include box-shadow(inset rgba(black, $sVal) 0 1px 5px); +@mixin boxIncised($sVal: 0.6, $inset: 5px) { + @include box-shadow(inset rgba(black, $sVal) 0 1px $inset); } @mixin boxOutline($c: lighten($colorBodyBg, 20%)) { @@ -257,6 +257,30 @@ } /*********************************************** FORM ELEMENTS */ + +@mixin input-base($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include appearance(none); + @include border-radius($controlCr); + @include box-sizing(border-box); + @include box-shadow(inset rgba(black, 0.4) 0 1px 2px); + background: $bg; + border: none; + color: $fg; + outline: none; + &.error { + background: rgba(red, 0.5); + } +} + +@mixin nice-input($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include input-base($bg, $fg); + padding: 0 $interiorMarginSm; +} + + + +/* + @mixin input-base($bg: $colorBodyBg, $fg: $colorBodyFg) { @include appearance(none); @include border-radius($controlCr); @@ -275,6 +299,8 @@ @include input-base($bg, $fg); padding: 0 $interiorMarginSm; } +*/ + @mixin nice-textarea($bg: $colorBodyBg, $fg: $colorBodyFg) { @include input-base($bg, $fg); diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 6079380d84..5d97d9b0e0 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -80,22 +80,24 @@ $pad: $interiorMargin * $baseRatio; &.sm { padding: 0 $pad / $baseRatio; } + &.vsm { padding: 0 ($pad / $baseRatio) / 2; } - &:not(.major) { - @include btnSubtle($colorBtnBg, $colorBtnFg, $colorBtnIcon); + &.major { + $bg: $colorBtnMajorBg; + $hc: lighten($bg, 10%); + @include btnSubtle($bg, $hc, $colorBtnMajorFg, $colorBtnMajorFg); } - &.major { - $bg: $colorKey; - $fg: lighten($bg, 70%); - @include btnSubtle($bg, $fg, $fg); + &:not(.major) { + // bg, bgHov, fg, ic + @include btnSubtle($colorBtnBg, $colorKey, $colorBtnFg, $colorBtnIcon); } &.paused { - @include btnSubtle($colorPausedBg, $colorPausedFg, $colorPausedFg); + @include btnSubtle($colorPausedBg, lighten($colorPausedBg, 10%), $colorPausedFg, $colorPausedFg); .icon:before { content: "\0000EF"; } diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index a5102c26ea..b2f98860e9 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -349,18 +349,20 @@ label.checkbox.custom { } ::-webkit-scrollbar-thumb { - $bg: lighten($colorBodyBg, 10%); - @include background-image(linear-gradient(lighten($bg, 10%), lighten($bg, 5%) 20px)); - @include border-radius(1px); + $bg: $scrollbarThumbColor; + $hc: $scrollbarThumbColorHov; + $gr: 5%; + @include background-image(linear-gradient(lighten($bg, $gr), $bg 20px)); + @include border-radius(2px); @include box-sizing(border-box); - @include boxShdwSubtle(); - border-top: 1px solid lighten($bg, 20%); + //@include boxShdwSubtle(); + //border-top: 1px solid lighten($bg, 20%); &:hover { - @include background-image(linear-gradient(lighten($bg, 20%), lighten($bg, 15%) 20px)); + @include background-image(linear-gradient(lighten($hc, $gr), $hc 20px)); } } ::-webkit-scrollbar-corner { - background: rgba(#000, 0.4); + background: $scrollbarTrackColorBg; } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 203761092f..f53cf93a84 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -66,15 +66,18 @@ /******************************************************** MENUS THEMSELVES */ .menu-element { - $bg: lighten($colorBodyBg, 5%); - $bgHover: lighten($bg, 20%); + $bg: $colorMenuBg; + $fg: $colorMenuFg; + $ic: $colorMenuIc; + $bgHover: $colorMenuHov; $iconColor: $colorKey; cursor: pointer; position: relative; .menu { @include border-radius($basicCr); - @include containerSubtle($bg); - @include txtShdwSubtle(0.2); + @include containerSubtle($bg, $fg); + @include boxShdw($shdwMenu); + @include txtShdw($shdwMenuText); display: block; // set to block via jQuery padding: $interiorMarginSm 0; position: absolute; @@ -84,7 +87,7 @@ li { @include box-sizing(border-box); border-top: 1px solid lighten($bg, 20%); - color: lighten($bg, 60%); + color: pullForward($bg, 60%); line-height: $menuLineH; padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW; position: relative; @@ -95,17 +98,10 @@ &:hover { background: $bgHover; color: $colorKeyFg; - //a { - // color: $colorKeyFg; - //} .icon { color: lighten($iconColor, 20%); } } - //a { - // color: lighten($bg, 60%); - // display: block; - //} .type-icon { left: $interiorMargin * 2; } @@ -115,12 +111,7 @@ .context-menu, .super-menu { - $bg: $colorMenuBg; - $fg: $colorMenuFg; - $ic: $colorMenuIc; - //font-size: 0.80rem; pointer-events: auto; - @include containerSubtle($bg); ul li { padding-left: 25px; a { @@ -170,8 +161,7 @@ $h: $w - 20; $plw: 50%; //$w * 0.5; $prw: 50%; //$w - $plw; - $fg: #fff; //lighten($colorBodyFg, 40%); - $bgHover: $colorKey; //$bg; + //$fg: #fff; //lighten($colorBodyFg, 40%); display: block; width: $w; height: $h; @@ -203,15 +193,13 @@ right: 0; padding: $interiorMargin * 5; width: $prw; - .icon { - color: $fg; - } } } .menu-item-description { .desc-area { &.icon { $h: 150px; + color: $colorCreateMenuLgIcon; position: relative; font-size: 8em; left: 0; @@ -221,13 +209,13 @@ text-align: center; } &.title { - color: $fg; + color: $colorCreateMenuText; font-size: 1.2em; margin-bottom: 0.5em; } &.description { //color: lighten($bg, 30%); - color: $fg; + color: $colorCreateMenuText; font-size: 0.8em; line-height: 1.5em; } diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index 0f430c2391..8ffdce8df8 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -21,7 +21,7 @@ *****************************************************************************/ .section-header { @include border-radius($basicCr); - background: rgba(#fff, 0.1); + background: $colorFormSectionHeader; $c: lighten($colorBodyFg, 20%); //border-bottom: 1px solid rgba(#fff, 0.3); color: $c; @@ -32,6 +32,7 @@ .form { // @include test(orange); + color: $colorFormText; .form-section { position: relative; margin-bottom: $interiorMarginLg * 2; @@ -69,7 +70,7 @@ } .value { - color: lighten($colorBodyFg, 20%); + color: $colorInputFg; //lighten($colorBodyFg, 20%); } .controls { @@ -111,18 +112,18 @@ .selector-list { // Used in create overlay to display tree view + @include nice-input($colorInputBg, $colorInputFg); $h: 150px; - @include border-radius($basicCr); - @include box-sizing(border-box); - background: rgba(black, 0.2); - padding: $interiorMargin; + //@include border-radius($basicCr); + //@include box-sizing(border-box); + //background: rgba(black, 0.2); + //padding: $interiorMargin; position: relative; height: $h; - overflow: auto; // max-width: 50%; - .wrapper { + >.wrapper { $p: $interiorMargin; - overflow-y: auto; + overflow: auto; position: absolute; top: $p; right: $p; @@ -159,4 +160,24 @@ label.form-control.checkbox { color: lighten($colorFormInvalid, 30%); padding: $interiorMargin; } +} + +input[type="text"] { + @include nice-input($colorInputBg, $colorInputFg); + &.filter { + &.ng-dirty { + // background: red; + } + } + &.numeric { + text-align: right; + } +} + +textarea { + @include nice-textarea($colorInputBg, $colorInputFg); + // font-size: 0.9em; + position: absolute; + height: 100%; + width: 100%; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss index f92c4eb9a1..3f283c04e7 100644 --- a/platform/commonUI/general/res/sass/forms/_selects.scss +++ b/platform/commonUI/general/res/sass/forms/_selects.scss @@ -19,10 +19,11 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -.form-control.select { - @include btnSubtle($colorBodyBg); - cursor: pointer; - display: inline-block; +.select { + @include btnSubtle(); + @extend .s-menu; + //cursor: pointer; + //display: inline-block; margin: 0 0 2px 2px; // Needed to avoid dropshadow from being clipped by parent containers overflow: hidden; position: relative; @@ -30,21 +31,21 @@ @include appearance(none); @include box-sizing(border-box); background: none; - color: $colorBodyFg; + color: $colorBtnFg; border: none !important; - cursor: pointer; - padding: 4px 25px 2px 5px; + //cursor: pointer; + padding: 4px 25px 2px 0px; width: 120%; option { margin: $interiorMargin 0; // Firefox } } &:after { - color: $colorKey; - content:"v"; - display: block; - font-family: 'symbolsfont'; - pointer-events: none; + //color: $colorKey; + //content:"v"; + //display: block; + //font-family: 'symbolsfont'; + //pointer-events: none; position: absolute; right: $interiorMargin; top: 0; } diff --git a/platform/commonUI/general/res/sass/forms/_text-input.scss b/platform/commonUI/general/res/sass/forms/_text-input.scss deleted file mode 100644 index f445b43aa0..0000000000 --- a/platform/commonUI/general/res/sass/forms/_text-input.scss +++ /dev/null @@ -1,32 +0,0 @@ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -input[type="text"] { - @include nice-input(); - &.filter { - &.ng-dirty { -// background: red; - } - } - &.numeric { - text-align: right; - } -} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/forms/_textarea.scss b/platform/commonUI/general/res/sass/forms/_textarea.scss deleted file mode 100644 index 145446e933..0000000000 --- a/platform/commonUI/general/res/sass/forms/_textarea.scss +++ /dev/null @@ -1,28 +0,0 @@ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -.edit-main textarea { - @include nice-textarea(); -// font-size: 0.9em; - position: absolute; - height: 100%; - width: 100%; -} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/mobile/_constants.scss b/platform/commonUI/general/res/sass/mobile/_constants.scss index f4fe4ceaad..bd9443cc50 100644 --- a/platform/commonUI/general/res/sass/mobile/_constants.scss +++ b/platform/commonUI/general/res/sass/mobile/_constants.scss @@ -20,9 +20,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -/************************** STYLE */ -$colorMobilePaneLeft: #222; - /************************** MOBILE REPRESENTATION ITEMS DIMENSIONS */ $mobileListIconSize: 30px; $mobileTitleDescH: 35px; diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 69ef092d7a..22175da777 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -31,7 +31,7 @@ } >.holder { $i: 15%; - @include containerSubtle(); + @include containerSubtle($colorOvrBg, $colorOvrFg); @include border-radius($basicCr * 3); color: $colorOvrFg; top: $i; right: $i; bottom: $i; left: $i; @@ -64,19 +64,21 @@ height: $ovrFooterH; text-align: right; .s-btn { - $l: 15%; - @include containerSubtle(lighten($colorBodyBg, $l), lighten($colorBodyFg, $l), true); + $bg: $colorOvrBtnBg; + &:not(.major) { + @include btnSubtle($bg, pullForward($bg, 10%), $colorOvrBtnFg, $colorOvrBtnFg); + } font-size: 95%; height: $ovrFooterH; line-height: $ovrFooterH; margin-left: $interiorMargin; padding: 0 $interiorMargin * 3; - &.major { - @extend .s-btn.major; - &:hover { - @extend .s-btn.major:hover; - } - } + //&.major { + // @extend .s-btn.major; + // &:hover { + // @extend .s-btn.major:hover; + // } + //} } } .contents.l-dialog { diff --git a/platform/commonUI/general/res/sass/user-environ/_top-bar.scss b/platform/commonUI/general/res/sass/user-environ/_top-bar.scss index 7bb5ecd852..33e5ddbcaf 100644 --- a/platform/commonUI/general/res/sass/user-environ/_top-bar.scss +++ b/platform/commonUI/general/res/sass/user-environ/_top-bar.scss @@ -28,9 +28,9 @@ line-height: $ueTopBarH; } - .title { +/* .title { color: #fff; - } + }*/ .buttons-main { font-size: 0.8em; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index f9cca25112..47ac9bdafb 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -98,6 +98,27 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, * at runtime from the About dialog for additional information. *****************************************************************************/ /*********************************************** FORM ELEMENTS */ +/* + +@mixin input-base($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include appearance(none); + @include border-radius($controlCr); + @include box-sizing(border-box); + @include box-shadow(inset rgba(black, 0.65) 0 1px 4px); + background: rgba(#fff, 0.1); + border: none; + color: lighten($fg, 20%); + outline: none; + &.error { + background: rgba(red, 0.5); + } +} + +@mixin nice-input($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include input-base($bg, $fg); + padding: 0 $interiorMarginSm; +} +*/ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -168,7 +189,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/************************** STYLE */ /************************** MOBILE REPRESENTATION ITEMS DIMENSIONS */ /************************** MOBILE TREE MENU DIMENSIONS */ /************************** WINDOW DIMENSIONS FOR RWD */ @@ -176,6 +196,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, /************************** MEDIA QUERIES: WINDOWS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */ /************************** DEVICE PARAMETERS FOR MENUS/REPRESENTATIONS */ /************************** COLORS AND SHADING */ +/********************************* MOBILE */ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -375,7 +396,7 @@ mct-container { display: block; } /* line 98, ../../../../general/res/sass/_global.scss */ -.abs, .s-menu span.l-click-area { +.abs, .s-menu span.l-click-area, .select span.l-click-area { position: absolute; top: 0; right: 0; @@ -424,7 +445,7 @@ mct-container { display: none !important; } /* line 147, ../../../../general/res/sass/_global.scss */ -.paused:not(.s-btn):not(.s-menu) { +.paused:not(.s-btn):not(.s-menu):not(.select) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -454,7 +475,7 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 26, ../../../../general/res/sass/_about.scss */ -.l-about.abs, .s-menu span.l-about.l-click-area { +.l-about.abs, .s-menu span.l-about.l-click-area, .select span.l-about.l-click-area { overflow: auto; } /* line 31, ../../../../general/res/sass/_about.scss */ .l-about .l-logo-holder { @@ -504,11 +525,11 @@ mct-container { .s-about .s-logo-openmctweb { background-image: url("../../../../general/res/images/logo-openmctweb-shdw.svg"); } /* line 81, ../../../../general/res/sass/_about.scss */ - .s-about .s-btn, .s-about .s-menu { + .s-about .s-btn, .s-about .s-menu, .s-about .select { line-height: 2em; } /* line 85, ../../../../general/res/sass/_about.scss */ .s-about .l-licenses-software .l-license-software { - border-top: 1px solid #4d4d4d; + border-top: 1px solid rgba(153, 153, 153, 0.1); padding: 0.5em 0; } /* line 88, ../../../../general/res/sass/_about.scss */ .s-about .l-licenses-software .l-license-software:first-child { @@ -545,7 +566,7 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 24, ../../../../general/res/sass/_text.scss */ -.abs.l-standalone, .s-menu span.l-standalone.l-click-area { +.abs.l-standalone, .s-menu span.l-standalone.l-click-area, .select span.l-standalone.l-click-area { padding: 5% 20%; } /* line 29, ../../../../general/res/sass/_text.scss */ @@ -562,7 +583,7 @@ mct-container { margin-bottom: 1em; } /* line 45, ../../../../general/res/sass/_text.scss */ .s-text h2 { - border-top: 1px solid #4d4d4d; + border-top: 1px solid rgba(153, 153, 153, 0.1); font-size: 1.5em; margin-top: 2em; padding-top: 1em; } @@ -629,7 +650,7 @@ mct-container { display: inline-block; } /* line 55, ../../../../general/res/sass/_icons.scss */ -.s-menu .invoke-menu, +.s-menu .invoke-menu, .select .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } @@ -1224,7 +1245,7 @@ mct-container { /* Classes to be used for lists of properties and values */ /* line 25, ../../../../general/res/sass/_properties.scss */ .properties .s-row { - border-top: 1px solid #4d4d4d; + border-top: 1px solid rgba(153, 153, 153, 0.1); font-size: 0.8em; } /* line 28, ../../../../general/res/sass/_properties.scss */ .properties .s-row:first-child { @@ -1324,7 +1345,7 @@ mct-container { }*/ /*********************************** STYLE STYLES */ /* line 61, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu { +.s-btn, .s-menu, .select { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1339,20 +1360,62 @@ mct-container { padding: 0 7.5px; font-size: 0.7rem; } /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .icon, .s-menu .icon { + .s-btn .icon, .s-menu .icon, .select .icon { font-size: 0.8rem; color: #0099cc; } /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .title-label, .s-menu .title-label { + .s-btn .title-label, .s-menu .title-label, .select .title-label { vertical-align: top; } /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.sm, .sm.s-menu { + .s-btn.sm, .sm.s-menu, .sm.select { padding: 0 5px; } - /* line 83, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.vsm, .vsm.s-menu { + /* line 84, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.vsm, .vsm.s-menu, .vsm.select { padding: 0 2.5px; } - /* line 87, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn:not(.major), .s-menu:not(.major) { + /* line 88, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.major, .major.s-menu, .major.select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00ace6), color-stop(100%, #0099cc)); + background-image: -moz-linear-gradient(#00ace6, #0099cc); + background-image: -webkit-linear-gradient(#00ace6, #0099cc); + background-image: linear-gradient(#00ace6, #0099cc); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + border: none; + color: #fff; + display: inline-block; + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + color: #fff; } + /* line 27, ../sass/_mixins.scss */ + .s-btn.major .icon, .major.s-menu .icon, .major.select .icon { + color: #fff; } + /* line 31, ../sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .major.select:not(.disabled):hover { + background-color: deepskyblue; } + /* line 33, ../sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover .icon, .major.s-menu:not(.disabled):hover .icon, .major.select:not(.disabled):hover .icon { + color: white; } + /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn:not(.major), .s-menu:not(.major), .select:not(.major) { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -1374,63 +1437,23 @@ mct-container { border: none; color: #999; display: inline-block; - text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } - /* line 20, ../sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #636363), color-stop(100%, #575757)); - background-image: -moz-linear-gradient(#636363, #575757); - background-image: -webkit-linear-gradient(#636363, #575757); - background-image: linear-gradient(#636363, #575757); - color: #ababab; } - /* line 32, ../sass/_mixins.scss */ - .s-btn:not(.major) .icon, .s-menu:not(.major) .icon { + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + color: #999; } + /* line 27, ../sass/_mixins.scss */ + .s-btn:not(.major) .icon, .s-menu:not(.major) .icon, .select:not(.major) .icon { color: #0099cc; } - /* line 38, ../sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):not(.paused):hover .icon, .s-menu:not(.major):not(.disabled):not(.paused):hover .icon { - color: #33ccff; } - /* line 91, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.major, .major.s-menu, .overlay .bottom-bar .s-btn.major, .overlay .bottom-bar .major.s-menu { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00ace6), color-stop(100%, #0099cc)); - background-image: -moz-linear-gradient(#00ace6, #0099cc); - background-image: -webkit-linear-gradient(#00ace6, #0099cc); - background-image: linear-gradient(#00ace6, #0099cc); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - border: none; - color: white; - display: inline-block; - text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } - /* line 20, ../sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .overlay .bottom-bar .s-btn.major:not(.disabled):hover, .overlay .bottom-bar .major.s-menu:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0ac2ff), color-stop(100%, #00b4f0)); - background-image: -moz-linear-gradient(#0ac2ff, #00b4f0); - background-image: -webkit-linear-gradient(#0ac2ff, #00b4f0); - background-image: linear-gradient(#0ac2ff, #00b4f0); - color: white; } - /* line 32, ../sass/_mixins.scss */ - .s-btn.major .icon, .major.s-menu .icon, .overlay .bottom-bar .s-btn.major .icon, .overlay .bottom-bar .major.s-menu .icon { - color: white; } - /* line 38, ../sass/_mixins.scss */ - .s-btn.major:not(.disabled):not(.paused):hover .icon, .major.s-menu:not(.disabled):not(.paused):hover .icon { - color: white; } - /* line 97, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.paused, .paused.s-menu { + /* line 31, ../sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover, .select:not(.major):not(.disabled):hover { + background-color: #0099cc; } + /* line 33, ../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 99, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.paused, .paused.s-menu, .paused.select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -1452,27 +1475,22 @@ mct-container { border: none; color: #fff; display: inline-block; - text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } - /* line 20, ../sass/_mixins.scss */ - .s-btn.paused:not(.disabled):hover, .paused.s-menu:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlOTEwNSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U5ODMwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fe9105), color-stop(100%, #e98301)); - background-image: -moz-linear-gradient(#fe9105, #e98301); - background-image: -webkit-linear-gradient(#fe9105, #e98301); - background-image: linear-gradient(#fe9105, #e98301); - color: white; } - /* line 32, ../sass/_mixins.scss */ - .s-btn.paused .icon, .paused.s-menu .icon { + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + color: #fff; } + /* line 27, ../sass/_mixins.scss */ + .s-btn.paused .icon, .paused.s-menu .icon, .paused.select .icon { color: #fff; } - /* line 38, ../sass/_mixins.scss */ - .s-btn.paused:not(.disabled):not(.paused):hover .icon, .paused.s-menu:not(.disabled):not(.paused):hover .icon { - color: white; } - /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.paused .icon:before, .paused.s-menu .icon:before { + /* line 31, ../sass/_mixins.scss */ + .s-btn.paused:not(.disabled):hover, .paused.s-menu:not(.disabled):hover, .paused.select:not(.disabled):hover { + background-color: #f88c01; } + /* line 33, ../sass/_mixins.scss */ + .s-btn.paused:not(.disabled):hover .icon, .paused.s-menu:not(.disabled):hover .icon, .paused.select:not(.disabled):hover .icon { + color: white; } + /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.paused .icon:before, .paused.s-menu .icon:before, .paused.select .icon:before { content: "\0000EF"; } - /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play, .pause-play.s-menu { + /* line 106, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play, .pause-play.s-menu, .pause-play.select { /* &.paused { .icon { @@ -1480,24 +1498,24 @@ mct-container { } } */ } - /* line 112, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before { + /* line 114, ../../../../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 118, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before { + /* line 120, ../../../../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 124, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 126, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 130, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .s-btn, .l-btn-set .s-menu { + /* line 132, ../../../../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 136, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .first .s-btn, .l-btn-set .first .s-menu { + /* line 138, ../../../../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; border-top-left-radius: 3px; @@ -1505,8 +1523,8 @@ mct-container { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .last .s-btn, .l-btn-set .last .s-menu { + /* line 145, ../../../../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; border-top-right-radius: 3px; @@ -1720,7 +1738,7 @@ a.s-btn span { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - border-left: 1px solid #4d4d4d; + border-left: 1px solid rgba(153, 153, 153, 0.1); display: inline-block; padding: 0 5px; position: relative; } @@ -1808,7 +1826,7 @@ label.checkbox.custom { margin-left: 0; } /* line 207, ../../../../general/res/sass/controls/_controls.scss */ -.s-menu label.checkbox.custom { +.s-menu label.checkbox.custom, .select label.checkbox.custom { margin-left: 5px; } /* line 212, ../../../../general/res/sass/controls/_controls.scss */ @@ -1906,8 +1924,6 @@ label.checkbox.custom { -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; background-color: rgba(0, 0, 0, 0.4); - border-bottom: 1px solid rgba(77, 77, 77, 0.4); - border-right: 1px solid rgba(77, 77, 77, 0.4); height: 50%; width: auto; position: absolute; @@ -1917,6 +1933,10 @@ label.checkbox.custom { left: 0; } /* line 308, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -1939,6 +1959,7 @@ label.checkbox.custom { color: #999; display: inline-block; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + color: #999; cursor: ew-resize; position: absolute; height: 100%; @@ -1947,21 +1968,9 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 20, ../sass/_mixins.scss */ - .slider .knob:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); - background-image: -moz-linear-gradient(#525252, #454545); - background-image: -webkit-linear-gradient(#525252, #454545); - background-image: linear-gradient(#525252, #454545); - color: #ababab; } - /* line 32, ../sass/_mixins.scss */ + /* line 27, ../sass/_mixins.scss */ .slider .knob .icon { color: #0099cc; } - /* line 38, ../sass/_mixins.scss */ - .slider .knob:not(.disabled):not(.paused):hover .icon { - color: #33ccff; } /* line 159, ../../../../general/res/sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; @@ -2035,39 +2044,33 @@ label.checkbox.custom { -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; background-color: rgba(0, 0, 0, 0.4); - border-bottom: 1px solid rgba(77, 77, 77, 0.4); - border-right: 1px solid rgba(77, 77, 77, 0.4); height: 10px; width: 10px; } /* line 351, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #666666), color-stop(100%, #595959)); - background-image: -moz-linear-gradient(#666666, #595959 20px); - background-image: -webkit-linear-gradient(#666666, #595959 20px); - background-image: linear-gradient(#666666, #595959 20px); - -moz-border-radius: 1px; - -webkit-border-radius: 1px; - border-radius: 1px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); + background-image: -moz-linear-gradient(#595959, #4d4d4d 20px); + background-image: -webkit-linear-gradient(#595959, #4d4d4d 20px); + background-image: linear-gradient(#595959, #4d4d4d 20px); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - border-top: 1px solid gray; } - /* line 358, ../../../../general/res/sass/controls/_controls.scss */ + box-sizing: border-box; } + /* line 360, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #808080), color-stop(100%, #737373)); - background-image: -moz-linear-gradient(#808080, #737373 20px); - background-image: -webkit-linear-gradient(#808080, #737373 20px); - background-image: linear-gradient(#808080, #737373 20px); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #5e5e5e), color-stop(100%, #525252)); + background-image: -moz-linear-gradient(#5e5e5e, #525252 20px); + background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); + background-image: linear-gradient(#5e5e5e, #525252 20px); } - /* line 363, ../../../../general/res/sass/controls/_controls.scss */ + /* line 365, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } } /***************************************************************************** @@ -2126,13 +2129,13 @@ label.checkbox.custom { *****************************************************************************/ /******************************************************** MENU BUTTONS */ /* line 31, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .icon { +.s-menu .icon, .select .icon { font-size: 120%; } /* line 35, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .title-label { +.s-menu .title-label, .select .title-label { margin-left: 3px; } /* line 39, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu:after { +.s-menu:after, .select:after { color: rgba(255, 255, 255, 0.2); content: '\76'; display: inline-block; @@ -2141,14 +2144,14 @@ label.checkbox.custom { text-shadow: none; vertical-align: top; } /* line 50, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu.create-btn .title-label { +.s-menu.create-btn .title-label, .create-btn.select .title-label { font-size: 1rem; } /* line 58, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .menu { +.s-menu .menu, .select .menu { left: 0; text-align: left; } /* line 61, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu .menu .ui-symbol.icon { + .s-menu .menu .ui-symbol.icon, .select .menu .ui-symbol.icon { width: 12px; } /******************************************************** MENUS THEMSELVES */ @@ -2156,71 +2159,11 @@ label.checkbox.custom { .menu-element { cursor: pointer; position: relative; } - /* line 74, ../../../../general/res/sass/controls/_menus.scss */ + /* line 76, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - border: none; - color: #999; - display: inline-block; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - display: block; - padding: 3px 0; - position: absolute; - z-index: 10; } - /* line 82, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .menu ul { - margin: 0; - padding: 0; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ - .menu-element .menu ul li { - list-style-type: none; - margin: 0; - padding: 0; } - /* line 84, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .menu ul li { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - border-top: 1px solid #737373; - color: #d9d9d9; - line-height: 1.5rem; - padding: 3px 10px 3px 30px; - position: relative; - white-space: nowrap; } - /* line 92, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .menu ul li:first-child { - border: none; } - /* line 95, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .menu ul li:hover { - background: #737373; - color: #fff; } - /* line 101, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .menu ul li:hover .icon { - color: #33ccff; } - /* line 109, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .menu ul li .type-icon { - left: 10px; } - /* line 116, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .context-menu, .menu-element .checkbox-menu, - .menu-element .super-menu { - pointer-events: auto; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzdhN2E3YSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzZlNmU2ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7a7a7a), color-stop(100%, #6e6e6e)); @@ -2237,55 +2180,97 @@ label.checkbox.custom { -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; border: none; - color: #999; - display: inline-block; } - /* line 124, ../../../../general/res/sass/controls/_menus.scss */ + color: white; + display: inline-block; + text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; + display: block; + padding: 3px 0; + position: absolute; + z-index: 10; } + /* line 85, ../../../../general/res/sass/controls/_menus.scss */ + .menu-element .menu ul { + margin: 0; + padding: 0; } + /* line 319, ../../../../general/res/sass/_mixins.scss */ + .menu-element .menu ul li { + list-style-type: none; + margin: 0; + padding: 0; } + /* line 87, ../../../../general/res/sass/controls/_menus.scss */ + .menu-element .menu ul li { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-top: 1px solid #a1a1a1; + color: white; + line-height: 1.5rem; + padding: 3px 10px 3px 30px; + position: relative; + white-space: nowrap; } + /* line 95, ../../../../general/res/sass/controls/_menus.scss */ + .menu-element .menu ul li:first-child { + border: none; } + /* line 98, ../../../../general/res/sass/controls/_menus.scss */ + .menu-element .menu ul li:hover { + background: #878787; + color: #fff; } + /* line 101, ../../../../general/res/sass/controls/_menus.scss */ + .menu-element .menu ul li:hover .icon { + color: #33ccff; } + /* line 105, ../../../../general/res/sass/controls/_menus.scss */ + .menu-element .menu ul li .type-icon { + left: 10px; } + /* line 112, ../../../../general/res/sass/controls/_menus.scss */ + .menu-element .context-menu, .menu-element .checkbox-menu, + .menu-element .super-menu { + pointer-events: auto; } + /* line 115, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li, .menu-element .checkbox-menu ul li, .menu-element .super-menu ul li { padding-left: 25px; } - /* line 126, ../../../../general/res/sass/controls/_menus.scss */ + /* line 117, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li a, .menu-element .checkbox-menu ul li a, .menu-element .super-menu ul li a { color: white; } - /* line 129, ../../../../general/res/sass/controls/_menus.scss */ + /* line 120, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li .icon, .menu-element .checkbox-menu ul li .icon, .menu-element .super-menu ul li .icon { color: #24c8ff; } - /* line 132, ../../../../general/res/sass/controls/_menus.scss */ + /* line 123, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li .type-icon, .menu-element .checkbox-menu ul li .type-icon, .menu-element .super-menu ul li .type-icon { left: 5px; } - /* line 135, ../../../../general/res/sass/controls/_menus.scss */ + /* line 126, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li:hover .icon, .menu-element .checkbox-menu ul li:hover .icon, .menu-element .super-menu ul li:hover .icon { color: #3dcfff; } - /* line 144, ../../../../general/res/sass/controls/_menus.scss */ + /* line 135, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li { padding-left: 50px; } - /* line 146, ../../../../general/res/sass/controls/_menus.scss */ + /* line 137, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox { position: absolute; left: 5px; top: 0.53333rem; } - /* line 151, ../../../../general/res/sass/controls/_menus.scss */ + /* line 142, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox em { height: 0.7rem; width: 0.7rem; } - /* line 154, ../../../../general/res/sass/controls/_menus.scss */ + /* line 145, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox em:before { font-size: 7px !important; height: 0.7rem; width: 0.7rem; line-height: 0.7rem; } - /* line 162, ../../../../general/res/sass/controls/_menus.scss */ + /* line 153, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .type-icon { left: 25px; } - /* line 168, ../../../../general/res/sass/controls/_menus.scss */ + /* line 159, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu { display: block; width: 500px; height: 480px; } - /* line 178, ../../../../general/res/sass/controls/_menus.scss */ + /* line 168, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: hidden; position: absolute; @@ -2295,12 +2280,12 @@ label.checkbox.custom { left: 5px; width: auto; height: auto; } - /* line 181, ../../../../general/res/sass/controls/_menus.scss */ + /* line 171, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 183, ../../../../general/res/sass/controls/_menus.scss */ + /* line 173, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid rgba(255, 255, 255, 0.2); left: 0; @@ -2309,24 +2294,22 @@ label.checkbox.custom { width: 50%; overflow-x: hidden; overflow-y: auto; } - /* line 193, ../../../../general/res/sass/controls/_menus.scss */ + /* line 183, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; padding-left: 30px; border-top: none; } - /* line 200, ../../../../general/res/sass/controls/_menus.scss */ + /* line 190, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: auto; right: 0; padding: 25px; width: 50%; } - /* line 206, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .super-menu .pane.right .icon { - color: #fff; } - /* line 213, ../../../../general/res/sass/controls/_menus.scss */ + /* line 200, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.icon { + color: white; position: relative; font-size: 8em; left: 0; @@ -2334,40 +2317,40 @@ label.checkbox.custom { line-height: 150px; margin-bottom: 25px; text-align: center; } - /* line 223, ../../../../general/res/sass/controls/_menus.scss */ + /* line 211, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.title { - color: #fff; + color: white; font-size: 1.2em; margin-bottom: 0.5em; } - /* line 228, ../../../../general/res/sass/controls/_menus.scss */ + /* line 216, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.description { - color: #fff; + color: white; font-size: 0.8em; line-height: 1.5em; } - /* line 237, ../../../../general/res/sass/controls/_menus.scss */ + /* line 225, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu, .menu-element .checkbox-menu { font-size: 0.80rem; } -/* line 242, ../../../../general/res/sass/controls/_menus.scss */ +/* line 230, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 70; } - /* line 248, ../../../../general/res/sass/controls/_menus.scss */ + /* line 236, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 255, ../../../../general/res/sass/controls/_menus.scss */ + /* line 243, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder.go-left .context-menu, .context-menu-holder.go-left .menu-element .checkbox-menu, .menu-element .context-menu-holder.go-left .checkbox-menu { right: 0; } - /* line 258, ../../../../general/res/sass/controls/_menus.scss */ + /* line 246, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder.go-up .context-menu, .context-menu-holder.go-up .menu-element .checkbox-menu, .menu-element .context-menu-holder.go-up .checkbox-menu { bottom: 0; } -/* line 263, ../../../../general/res/sass/controls/_menus.scss */ +/* line 251, ../../../../general/res/sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; @@ -2424,10 +2407,10 @@ label.checkbox.custom { height: 10px; } /* line 52, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { - border-top: 1px solid #4d4d4d; } + border-top: 1px solid rgba(153, 153, 153, 0.1); } /* line 54, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { - background-color: #4d4d4d; + background-color: rgba(153, 153, 153, 0.1); border: none; width: 1px; margin-left: -1px; } @@ -2436,7 +2419,7 @@ label.checkbox.custom { margin-left: 0; } /* line 62, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { - color: gray; + color: rgba(204, 204, 204, 0.1); font-size: 0.7em; position: absolute; margin-left: -25px; @@ -2532,193 +2515,139 @@ label.checkbox.custom { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - background: rgba(255, 255, 255, 0.1); + background: rgba(0, 0, 0, 0.2); color: #cccccc; font-size: 0.8em; padding: 5px 5px; text-transform: uppercase; } -/* line 35, ../../../../general/res/sass/forms/_elems.scss */ -.form .form-section { - position: relative; - margin-bottom: 20px; } -/* line 40, ../../../../general/res/sass/forms/_elems.scss */ -.form .form-row { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - *zoom: 1; - border-top: 1px solid rgba(255, 255, 255, 0.1); - margin-top: 5px; - padding: 5px 0; - position: relative; } - /* line 48, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row.first { - border-top: none; } - /* line 52, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row > .label, - .form .form-row > .controls { +/* line 33, ../../../../general/res/sass/forms/_elems.scss */ +.form { + color: rgba(255, 255, 255, 0.5); } + /* line 36, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-section { + position: relative; + margin-bottom: 20px; } + /* line 41, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; *zoom: 1; - font-size: 0.8rem; - line-height: 22px; - min-height: 22px; } - /* line 61, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row > .label { - float: left; - min-width: 120px; - position: relative; - white-space: nowrap; - width: 30%; } - /* line 71, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .value { - color: #cccccc; } - /* line 75, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls { - float: left; - position: relative; - width: 69.9%; } - /* line 82, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-composite-control.l-checkbox { - display: inline-block; - line-height: 14px; - margin-right: 5px; } - /* line 91, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-med input[type="text"] { - width: 200px; } - /* line 95, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-small input[type="text"] { - width: 50px; } - /* line 99, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-numeric input[type="text"] { - text-align: right; } - /* line 103, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .select { - margin-right: 5px; } - /* line 108, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .field-hints { - color: #666666; } - /* line 112, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .selector-list { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - background: rgba(0, 0, 0, 0.2); - padding: 5px; - position: relative; - height: 150px; - overflow: auto; } - /* line 123, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .selector-list .wrapper { - overflow-y: auto; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; } + border-top: 1px solid rgba(255, 255, 255, 0.1); + margin-top: 5px; + padding: 5px 0; + position: relative; } + /* line 49, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row.first { + border-top: none; } + /* line 53, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row > .label, + .form .form-row > .controls { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + *zoom: 1; + font-size: 0.8rem; + line-height: 22px; + min-height: 22px; } + /* line 62, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row > .label { + float: left; + min-width: 120px; + position: relative; + white-space: nowrap; + width: 30%; } + /* line 72, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .value { + color: #cccccc; } + /* line 76, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls { + float: left; + position: relative; + width: 69.9%; } + /* line 83, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-composite-control.l-checkbox { + display: inline-block; + line-height: 14px; + margin-right: 5px; } + /* line 92, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-med input[type="text"] { + width: 200px; } + /* line 96, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-small input[type="text"] { + width: 50px; } + /* line 100, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-numeric input[type="text"] { + text-align: right; } + /* line 104, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .select { + margin-right: 5px; } + /* line 109, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .field-hints { + color: #666666; } + /* line 113, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .selector-list { + -moz-appearance: none; + -webkit-appearance: none; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -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; + background: rgba(255, 255, 255, 0.1); + border: none; + color: #cccccc; + outline: none; + padding: 0 3px; + position: relative; + height: 150px; } + /* line 270, ../../../../general/res/sass/_mixins.scss */ + .form .form-row .selector-list.error { + background: rgba(255, 0, 0, 0.5); } + /* line 124, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .selector-list > .wrapper { + overflow: auto; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; } -/* line 137, ../../../../general/res/sass/forms/_elems.scss */ +/* line 138, ../../../../general/res/sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 143, ../../../../general/res/sass/forms/_elems.scss */ +/* line 144, ../../../../general/res/sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 148, ../../../../general/res/sass/forms/_elems.scss */ +/* line 149, ../../../../general/res/sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 155, ../../../../general/res/sass/forms/_elems.scss */ + /* line 156, ../../../../general/res/sass/forms/_elems.scss */ .l-result div.s-hint { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - background: rgba(255, 153, 0, 0.8); + background: rgba(255, 51, 0, 0.8); display: block; - color: #ffd699; + color: #ffad99; padding: 5px; } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/forms/_textarea.scss */ -.edit-main textarea { - -moz-appearance: none; - -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - background: rgba(255, 255, 255, 0.1); - border: none; - color: #cccccc; - outline: none; - padding: 5px; - position: absolute; - height: 100%; - width: 100%; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ - .edit-main textarea.error { - background: rgba(255, 0, 0, 0.5); } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/forms/_text-input.scss */ +/* line 165, ../../../../general/res/sass/forms/_elems.scss */ input[type="text"] { -moz-appearance: none; -webkit-appearance: none; @@ -2728,21 +2657,46 @@ input[type="text"] { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + -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; background: rgba(255, 255, 255, 0.1); border: none; color: #cccccc; outline: none; padding: 0 3px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 270, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } - /* line 29, ../../../../general/res/sass/forms/_text-input.scss */ + /* line 172, ../../../../general/res/sass/forms/_elems.scss */ input[type="text"].numeric { text-align: right; } +/* line 177, ../../../../general/res/sass/forms/_elems.scss */ +textarea { + -moz-appearance: none; + -webkit-appearance: none; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -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; + background: rgba(255, 255, 255, 0.1); + border: none; + color: #cccccc; + outline: none; + padding: 5px; + position: absolute; + height: 100%; + width: 100%; } + /* line 270, ../../../../general/res/sass/_mixins.scss */ + textarea.error { + background: rgba(255, 0, 0, 0.5); } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2765,7 +2719,11 @@ input[type="text"] { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_selects.scss */ -.form-control.select { +.select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -2788,28 +2746,15 @@ input[type="text"] { color: #999; display: inline-block; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; - cursor: pointer; - display: inline-block; + color: #999; margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 20, ../sass/_mixins.scss */ - .form-control.select:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); - background-image: -moz-linear-gradient(#525252, #454545); - background-image: -webkit-linear-gradient(#525252, #454545); - background-image: linear-gradient(#525252, #454545); - color: #ababab; } - /* line 32, ../sass/_mixins.scss */ - .form-control.select .icon { + /* line 27, ../sass/_mixins.scss */ + .select .icon { color: #0099cc; } - /* line 38, ../sass/_mixins.scss */ - .form-control.select:not(.disabled):not(.paused):hover .icon { - color: #33ccff; } - /* line 29, ../../../../general/res/sass/forms/_selects.scss */ - .form-control.select select { + /* line 30, ../../../../general/res/sass/forms/_selects.scss */ + .select select { -moz-appearance: none; -webkit-appearance: none; -moz-box-sizing: border-box; @@ -2818,19 +2763,13 @@ input[type="text"] { background: none; color: #999; border: none !important; - cursor: pointer; - padding: 4px 25px 2px 5px; + padding: 4px 25px 2px 0px; width: 120%; } - /* line 38, ../../../../general/res/sass/forms/_selects.scss */ - .form-control.select select option { + /* line 39, ../../../../general/res/sass/forms/_selects.scss */ + .select select option { margin: 5px 0; } - /* line 42, ../../../../general/res/sass/forms/_selects.scss */ - .form-control.select:after { - color: #0099cc; - content: "v"; - display: block; - font-family: 'symbolsfont'; - pointer-events: none; + /* line 43, ../../../../general/res/sass/forms/_selects.scss */ + .select:after { position: absolute; right: 5px; top: 0; } @@ -2870,12 +2809,12 @@ input[type="text"] { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - background: rgba(255, 255, 255, 0.1); + -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; + background: #333; border: none; - color: #cccccc; + color: #999; outline: none; padding: 0 3px; background: #3b3b3b; @@ -2884,7 +2823,7 @@ input[type="text"] { max-height: 400px; overflow: auto; padding: 5px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 270, ../../../../general/res/sass/_mixins.scss */ .channel-selector .treeview.error { background: rgba(255, 0, 0, 0.5); } /* line 36, ../../../../general/res/sass/forms/_channel-selector.scss */ @@ -2978,7 +2917,7 @@ input[type="text"] { font-size: 0.7em; } /* line 44, ../../../../general/res/sass/forms/_validation.scss */ .validates.invalid > .label::after, .validates.invalid.req > .label::after { - color: #ff9900; + color: #ff3300; content: "x"; } /* line 51, ../../../../general/res/sass/forms/_validation.scss */ .validates.valid > .label::after, .validates.valid.req > .label::after { @@ -3031,17 +2970,17 @@ span.req { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - background: rgba(255, 255, 255, 0.1); + -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; + background: #333; border: none; - color: #cccccc; + color: #999; outline: none; padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 270, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3181,33 +3120,38 @@ span.req { .bar .icon.major { margin-right: 5px; } /* line 70, ../../../../general/res/sass/user-environ/_layout.scss */ -.bar.abs, .s-menu span.bar.l-click-area { +.bar.abs, .s-menu span.bar.l-click-area, .select span.bar.l-click-area { text-wrap: none; white-space: nowrap; } /* line 73, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.left, .s-menu span.bar.left.l-click-area, + .bar.abs.left, .s-menu span.bar.left.l-click-area, .select span.bar.left.l-click-area, .bar.abs .left, - .s-menu span.bar.l-click-area .left { + .s-menu span.bar.l-click-area .left, + .select span.bar.l-click-area .left { width: 45%; right: auto; } /* line 78, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.right, .s-menu span.bar.right.l-click-area, + .bar.abs.right, .s-menu span.bar.right.l-click-area, .select span.bar.right.l-click-area, .bar.abs .right, - .s-menu span.bar.l-click-area .right { + .s-menu span.bar.l-click-area .right, + .select span.bar.l-click-area .right { width: 45%; left: auto; text-align: right; } /* line 83, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.right .icon.major, .s-menu span.bar.right.l-click-area .icon.major, + .bar.abs.right .icon.major, .s-menu span.bar.right.l-click-area .icon.major, .select span.bar.right.l-click-area .icon.major, .bar.abs .right .icon.major, - .s-menu span.bar.l-click-area .right .icon.major { + .s-menu span.bar.l-click-area .right .icon.major, + .select span.bar.l-click-area .right .icon.major { margin-left: 15px; } /* line 89, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs .l-flex .left, .s-menu span.bar.l-click-area .l-flex .left, + .bar.abs .l-flex .left, .s-menu span.bar.l-click-area .l-flex .left, .select span.bar.l-click-area .l-flex .left, .bar.abs .l-flex .right, - .s-menu span.bar.l-click-area .l-flex .right, .bar.abs.l-flex .left, .s-menu span.bar.l-flex.l-click-area .left, + .s-menu span.bar.l-click-area .l-flex .right, + .select span.bar.l-click-area .l-flex .right, .bar.abs.l-flex .left, .s-menu span.bar.l-flex.l-click-area .left, .select span.bar.l-flex.l-click-area .left, .bar.abs.l-flex .right, - .s-menu span.bar.l-flex.l-click-area .right { + .s-menu span.bar.l-flex.l-click-area .right, + .select span.bar.l-flex.l-click-area .right { width: auto; } /* line 98, ../../../../general/res/sass/user-environ/_layout.scss */ @@ -3345,10 +3289,12 @@ span.req { overflow: auto; top: 64px; } /* line 251, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .s-menu span.left.l-click-area, .s-menu .pane.items .object-browse-bar span.left.l-click-area, + .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .s-menu span.left.l-click-area, .s-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .select span.left.l-click-area, .select .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .s-menu span.right.l-click-area, - .s-menu .pane.items .object-browse-bar span.right.l-click-area { + .s-menu .pane.items .object-browse-bar span.right.l-click-area, + .pane.items .object-browse-bar .select span.right.l-click-area, + .select .pane.items .object-browse-bar span.right.l-click-area { top: auto; } /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-holder { @@ -3378,13 +3324,17 @@ span.req { right: 3px; } /* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ -.object-browse-bar .s-btn, .object-browse-bar .s-menu, +.object-browse-bar .s-btn, .object-browse-bar .s-menu, .object-browse-bar .select, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu, +.top-bar .buttons-main .select, .top-bar .s-menu, +.top-bar .select, .tool-bar .s-btn, .tool-bar .s-menu, -.tool-bar .s-menu { +.tool-bar .select, +.tool-bar .s-menu, +.tool-bar .select { height: 25px; line-height: 25px; vertical-align: top; } @@ -3466,7 +3416,7 @@ span.req { /* line 31, ../../../../general/res/sass/mobile/_layout.scss */ .pane.left.treeview { - background-color: #222; } + background-color: #262626; } /* line 35, ../../../../general/res/sass/mobile/_layout.scss */ .pane.right-repr { @@ -3779,13 +3729,13 @@ span.req { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 23, ../../../../general/res/sass/search/_search.scss */ -.abs.search-holder, .s-menu span.search-holder.l-click-area { +.abs.search-holder, .s-menu span.search-holder.l-click-area, .select span.search-holder.l-click-area { height: 25px; bottom: 0; top: 23px; z-index: 5; } /* line 27, ../../../../general/res/sass/search/_search.scss */ - .abs.search-holder.active, .s-menu span.search-holder.active.l-click-area { + .abs.search-holder.active, .s-menu span.search-holder.active.l-click-area, .select span.search-holder.active.l-click-area { height: auto; bottom: 0; } @@ -3993,12 +3943,12 @@ span.req { z-index: 100; } /* line 32, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay > .holder { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzMzMzMzMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #404040), color-stop(100%, #333333)); - background-image: -moz-linear-gradient(#404040, #333333); - background-image: -webkit-linear-gradient(#404040, #333333); - background-image: linear-gradient(#404040, #333333); + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); + background-image: -moz-linear-gradient(#595959, #4d4d4d); + background-image: -webkit-linear-gradient(#595959, #4d4d4d); + background-image: linear-gradient(#595959, #4d4d4d); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -4009,12 +3959,12 @@ span.req { -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; border: none; - color: #999; + color: #e6e6e6; display: inline-block; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; - color: #999; + color: #e6e6e6; top: 15%; right: 15%; bottom: 15%; @@ -4052,40 +4002,51 @@ span.req { height: 30px; text-align: right; } /* line 66, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959)); - background-image: -moz-linear-gradient(#666666, #595959); - background-image: -webkit-linear-gradient(#666666, #595959); - background-image: linear-gradient(#666666, #595959); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - border: none; - color: #bfbfbf; - display: inline-block; + .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu, .overlay .bottom-bar .select { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 20, ../sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc4Nzg3OCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + /* line 68, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major), .overlay .bottom-bar .select:not(.major) { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzhjOGM4YyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #787878), color-stop(100%, #6b6b6b)); - background-image: -moz-linear-gradient(#787878, #6b6b6b); - background-image: -webkit-linear-gradient(#787878, #6b6b6b); - background-image: linear-gradient(#787878, #6b6b6b); - color: #d1d1d1; } -/* line 82, ../../../../general/res/sass/overlay/_overlay.scss */ + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8c8c8c), color-stop(100%, #808080)); + background-image: -moz-linear-gradient(#8c8c8c, #808080); + background-image: -webkit-linear-gradient(#8c8c8c, #808080); + background-image: linear-gradient(#8c8c8c, #808080); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + border: none; + color: #fff; + display: inline-block; + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + color: #fff; } + /* line 27, ../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; } + /* line 31, ../sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover, .overlay .bottom-bar .select:not(.major):not(.disabled):hover { + background-color: #999999; } + /* line 33, ../sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover .icon, .overlay .bottom-bar .select:not(.major):not(.disabled):hover .icon { + color: white; } +/* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; @@ -4161,7 +4122,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 319, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -4412,17 +4373,17 @@ ul.tree { /* line 25, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.child-frame.panel { background: #333; - border: 1px solid #4d4d4d; } + border: 1px solid rgba(153, 153, 153, 0.1); } /* line 28, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.child-frame.panel:hover { - border-color: #666666; } + border-color: rgba(179, 179, 179, 0.1); } /* line 32, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame > .object-header.abs, .s-menu .frame > span.object-header.l-click-area { +.frame > .object-header.abs, .s-menu .frame > span.object-header.l-click-area, .select .frame > span.object-header.l-click-area { font-size: 0.75em; height: 16px; line-height: 16px; } /* line 38, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame > .object-holder.abs, .s-menu .frame > span.object-holder.l-click-area { +.frame > .object-holder.abs, .s-menu .frame > span.object-holder.l-click-area, .select .frame > span.object-holder.l-click-area { top: 21px; } /* line 41, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .contents { @@ -4468,29 +4429,31 @@ ul.tree { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 23, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.top-bar.browse, .top-bar.edit { - border-bottom: 1px solid #4d4d4d; - top: 10px; - right: 10px; - bottom: auto; - left: 10px; - height: 30px; - line-height: 24px; } -/* line 31, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.top-bar .title { - color: #fff; } -/* line 35, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.top-bar .buttons-main { - font-size: 0.8em; - left: auto; - text-align: right; } +/* line 22, ../../../../general/res/sass/user-environ/_top-bar.scss */ +.top-bar { + /* .title { + color: #fff; + }*/ } + /* line 23, ../../../../general/res/sass/user-environ/_top-bar.scss */ + .top-bar.browse, .top-bar.edit { + border-bottom: 1px solid rgba(153, 153, 153, 0.1); + top: 10px; + right: 10px; + bottom: auto; + left: 10px; + height: 30px; + line-height: 24px; } + /* line 35, ../../../../general/res/sass/user-environ/_top-bar.scss */ + .top-bar .buttons-main { + font-size: 0.8em; + left: auto; + text-align: right; } /* line 48, ../../../../general/res/sass/user-environ/_top-bar.scss */ .edit-mode .top-bar .buttons-main { white-space: nowrap; } /* line 52, ../../../../general/res/sass/user-environ/_top-bar.scss */ - .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .s-menu span.buttons-main.l-click-area, .s-menu .edit-mode .top-bar span.buttons-main.l-click-area { + .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .s-menu span.buttons-main.l-click-area, .s-menu .edit-mode .top-bar span.buttons-main.l-click-area, .edit-mode .top-bar .select span.buttons-main.l-click-area, .select .edit-mode .top-bar span.buttons-main.l-click-area { bottom: auto; left: auto; } @@ -4597,7 +4560,7 @@ ul.tree { *****************************************************************************/ /* line 22, ../../../../general/res/sass/user-environ/_tool-bar.scss */ .tool-bar { - border-bottom: 1px solid #4d4d4d; } + border-bottom: 1px solid rgba(153, 153, 153, 0.1); } /* line 24, ../../../../general/res/sass/user-environ/_tool-bar.scss */ .tool-bar .l-control-group { height: 25px; } @@ -5068,7 +5031,7 @@ table { bottom: 37px; left: 60px; cursor: crosshair; - border: 1px solid #4d4d4d; } + border: 1px solid rgba(153, 153, 153, 0.1); } /* line 86, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label, .gl-plot .l-plot-label { @@ -5397,6 +5360,10 @@ table { top: 0; } /* line 29, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -5416,9 +5383,10 @@ table { -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; border: none; - color: #bfbfbf; + color: #0099cc; display: inline-block; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + color: #0099cc; box-sizing: border-box; cursor: pointer; float: left; @@ -5427,21 +5395,15 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 20, ../sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5e5e5e), color-stop(100%, #525252)); - background-image: -moz-linear-gradient(#5e5e5e, #525252); - background-image: -webkit-linear-gradient(#5e5e5e, #525252); - background-image: linear-gradient(#5e5e5e, #525252); - color: #d1d1d1; } - /* line 32, ../sass/_mixins.scss */ + /* line 27, ../sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } - /* line 38, ../sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):not(.paused):hover .icon { - color: #33ccff; } + /* line 31, ../sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover { + background-color: #bfbfbf; } + /* line 33, ../sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover .icon { + color: #33ccff; } /* line 47, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: deepskyblue; } @@ -5546,6 +5508,10 @@ table { font-size: 0.8em; } /* line 138, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item.selected { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -5568,22 +5534,11 @@ table { color: #999; display: inline-block; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + color: #999; color: #80dfff; } - /* line 20, ../sass/_mixins.scss */ - .items-holder .item.grid-item.selected:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0ac2ff), color-stop(100%, #00b4f0)); - background-image: -moz-linear-gradient(#0ac2ff, #00b4f0); - background-image: -webkit-linear-gradient(#0ac2ff, #00b4f0); - background-image: linear-gradient(#0ac2ff, #00b4f0); - color: #ababab; } - /* line 32, ../sass/_mixins.scss */ + /* line 27, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #0099cc; } - /* line 38, ../sass/_mixins.scss */ - .items-holder .item.grid-item.selected:not(.disabled):not(.paused):hover .icon { - color: #33ccff; } /* line 143, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { color: #80dfff; } @@ -5725,7 +5680,7 @@ table { .autoflow { font-size: 0.75rem; } /* line 32, ../../../../general/res/sass/_autoflow.scss */ - .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu { + .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu, .autoflow:hover .l-autoflow-header .change-column-width.select { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; -webkit-transition-property: visibility, opacity, background-color, border-color; @@ -5749,7 +5704,7 @@ table { .autoflow .l-autoflow-header span { vertical-align: middle; } /* line 48, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu { + .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu, .autoflow .l-autoflow-header .change-column-width.select { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; -webkit-transition-property: visibility, opacity, background-color, border-color; @@ -5780,7 +5735,7 @@ table { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - border-left: 1px solid #4d4d4d; + border-left: 1px solid rgba(153, 153, 153, 0.1); display: inline-block; padding-left: 5px; padding-right: 5px; @@ -5817,7 +5772,7 @@ table { color: #b3b3b3; } /* line 101, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { - border-top: 1px solid gray; } + border-top: 1px solid rgba(204, 204, 204, 0.1); } /* line 104, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { display: block; } diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index f3e83d7c4c..b009666884 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -1,14 +1,17 @@ /************************** COLORS AND SHADING */ $colorBodyBg: #333; +$colorGenBg: #222; $colorBodyFg: #999; $colorFooterBg: #000; $colorKey: #0099cc; $colorKeySelectedBg: #005177; $colorKeyFg: #fff; - +$colorInteriorBorder: rgba($colorBodyFg, 0.1); $contrastRatioPercent: 7%; -$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); +$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); // $colorBtnFg: $colorBodyFg; +$colorBtnMajorBg: $colorKey; +$colorBtnMajorFg: $colorKeyFg; $colorBtnIcon: $colorKey; $colorInvokeMenu: #fff; $contrastInvokeMenuPercent: 20%; @@ -24,17 +27,23 @@ $colorFormLines: rgba(#fff, 0.1); $colorFormSectionHeader: rgba(#000, 0.2); $colorInvokeMenu: #fff; // Menu colors -$colorMenuBg: lighten($colorBodyBg, 23%); -$colorMenuFg: lighten($colorMenuBg, 70%); -$colorMenuIc: lighten($colorKey, 17%); -$colorInteriorBorder: lighten($colorBodyBg, 10%); -$colorObjFrameBg: darken($colorBodyBg, 5%); +$colorMenuBg: pullForward($colorBodyBg, 23%); +$colorMenuFg: pullForward($colorMenuBg, 70%); +$colorMenuIc: pullForward($colorKey, 17%); +$colorMenuHov: pullForward($colorMenuBg, 10%);// +$shdwMenu: none; +$shdwMenuText: rgba(black, 0.1) 0 1px 2px; +$colorCreateMenuLgIcon: $colorMenuFg; +$colorCreateMenuText: $colorMenuFg;// // Form colors $colorCheck: $colorKey; -$colorFormRequired: #ffc700; +$colorFormRequired: $colorAlt1; $colorFormValid: #33cc33; $colorFormError: #cc0000; -$colorFormInvalid: #ff9900; +$colorFormInvalid: #ff3300; +$colorInputBg: rgba(#fff, 0.1); +$colorInputFg: pullForward($colorBodyFg, 20%); +$colorFormText: rgba(#fff, 0.5); // Limits and staleness colors $colorLimitYellow: #9d7500; $colorLimitRed: #aa0000; @@ -49,8 +58,9 @@ $colorThumbsBubbleBg: lighten($colorBodyBg, 10%); // Overlay $colorOvrBlocker: rgba(black, 0.7); $colorOvrBg: pullForward($colorBodyBg, 10%); -$colorOvrFg: $colorBodyFg; - +$colorOvrFg: pullForward($colorBodyFg, 30%); +$colorOvrBtnBg: pullForward($colorOvrBg, 20%); +$colorOvrBtnFg: #fff; // Items $colorItemBg: lighten($colorBodyBg, 5%); $colorItemFg: lighten($colorItemBg, 50%); @@ -60,7 +70,6 @@ $colorItemSubIcons: $colorItemFgDetails; $colorItemOpenIcon: $colorItemFgDetails; $shdwItemText: rgba(black, 0.1) 0 1px 2px; $colorItemBgSelected: $colorKey; - // Tabular $tabularColorBorder: rgba(white, 0.1); $tabularColorBodyBg: darken($colorBodyBg, 10%); @@ -79,9 +88,15 @@ $colorItemTreeSelectedVC: $colorItemTreeVC; $colorItemTreeVCHover: $colorAlt1; $shdwItemTreeIcon: 0.6; // Scrollbar +$scrollbarTrackSize: 10px; $scrollbarTrackColorBg: rgba(#000, 0.4); +$scrollbarThumbColor: lighten($colorBodyBg, 10%); +$scrollbarThumbColorHov: lighten($scrollbarThumbColor, 2%); // Splitter $splitterShdw: rgba(black, 0.4) 0 0 3px; $colorSplitterInterior: $colorBodyBg; $colorSplitterHover: none; -$colorGrippyInteriorHover: $colorKey; \ No newline at end of file +$colorGrippyInteriorHover: $colorKey; + +/********************************* MOBILE */ +$colorMobilePaneLeft: darken($colorBodyBg, 5%); \ No newline at end of file diff --git a/platform/commonUI/themes/espresso/res/sass/_mixins.scss b/platform/commonUI/themes/espresso/res/sass/_mixins.scss index 1d4c34473e..53baf97e3c 100644 --- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss +++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss @@ -15,33 +15,27 @@ border: none; //border-top: 1px solid lighten($gradC1, 2%); color: $fg; - display: inline-block; - @if $hover == true { - &:not(.disabled):hover { - @include background-image(linear-gradient(pullForward($gradC1, $hovRatio), pullForward($gradC2, $hovRatio))); - color: pullForward($fgBase, $hovRatio); - } - } + display: inline-block;// } -@mixin btnSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $ic: $colorKey) { - // $ic: Icon color +@mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { + @include user-select(none); @include border-radius($controlCr); - @include containerSubtle($bg, $fg, true); + @include containerSubtle($bg, $fg); @include text-shadow(rgba(black, 0.3) 0 1px 1px); + color: $fg; .icon { color: $ic; } - &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: lighten($ic, $ltGamma); - } + @if $bgHov != none { + &:not(.disabled):hover { + background-color: $bgHov; + .icon { + color: lighten($ic, $ltGamma); } } } -} +}// @function pullForward($c: $colorBodyBg, $p: 20%) { // For dark interfaces, lighter things come forward - opposite for light interfaces diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index df52a77fff..2dedabb03a 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -98,6 +98,27 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, * at runtime from the About dialog for additional information. *****************************************************************************/ /*********************************************** FORM ELEMENTS */ +/* + +@mixin input-base($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include appearance(none); + @include border-radius($controlCr); + @include box-sizing(border-box); + @include box-shadow(inset rgba(black, 0.65) 0 1px 4px); + background: rgba(#fff, 0.1); + border: none; + color: lighten($fg, 20%); + outline: none; + &.error { + background: rgba(red, 0.5); + } +} + +@mixin nice-input($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include input-base($bg, $fg); + padding: 0 $interiorMarginSm; +} +*/ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -168,7 +189,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/************************** STYLE */ /************************** MOBILE REPRESENTATION ITEMS DIMENSIONS */ /************************** MOBILE TREE MENU DIMENSIONS */ /************************** WINDOW DIMENSIONS FOR RWD */ @@ -176,6 +196,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, /************************** MEDIA QUERIES: WINDOWS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */ /************************** DEVICE PARAMETERS FOR MENUS/REPRESENTATIONS */ /************************** COLORS AND SHADING */ +/********************************* MOBILE */ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -333,7 +354,7 @@ a { body, html { -webkit-font-smoothing: subpixel-antialiased; -moz-osx-font-smoothing: grayscale; - background-color: #fff; + background-color: #efefef; color: #666; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 100%; @@ -375,7 +396,7 @@ mct-container { display: block; } /* line 98, ../../../../general/res/sass/_global.scss */ -.abs, .s-menu span.l-click-area { +.abs, .s-menu span.l-click-area, .select span.l-click-area { position: absolute; top: 0; right: 0; @@ -424,7 +445,7 @@ mct-container { display: none !important; } /* line 147, ../../../../general/res/sass/_global.scss */ -.paused:not(.s-btn):not(.s-menu) { +.paused:not(.s-btn):not(.s-menu):not(.select) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -454,7 +475,7 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 26, ../../../../general/res/sass/_about.scss */ -.l-about.abs, .s-menu span.l-about.l-click-area { +.l-about.abs, .s-menu span.l-about.l-click-area, .select span.l-about.l-click-area { overflow: auto; } /* line 31, ../../../../general/res/sass/_about.scss */ .l-about .l-logo-holder { @@ -504,11 +525,11 @@ mct-container { .s-about .s-logo-openmctweb { background-image: url("../../../../general/res/images/logo-openmctweb-shdw.svg"); } /* line 81, ../../../../general/res/sass/_about.scss */ - .s-about .s-btn, .s-about .s-menu { + .s-about .s-btn, .s-about .s-menu, .s-about .select { line-height: 2em; } /* line 85, ../../../../general/res/sass/_about.scss */ .s-about .l-licenses-software .l-license-software { - border-top: 1px solid white; + border-top: 1px solid rgba(102, 102, 102, 0.2); padding: 0.5em 0; } /* line 88, ../../../../general/res/sass/_about.scss */ .s-about .l-licenses-software .l-license-software:first-child { @@ -545,7 +566,7 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 24, ../../../../general/res/sass/_text.scss */ -.abs.l-standalone, .s-menu span.l-standalone.l-click-area { +.abs.l-standalone, .s-menu span.l-standalone.l-click-area, .select span.l-standalone.l-click-area { padding: 5% 20%; } /* line 29, ../../../../general/res/sass/_text.scss */ @@ -562,7 +583,7 @@ mct-container { margin-bottom: 1em; } /* line 45, ../../../../general/res/sass/_text.scss */ .s-text h2 { - border-top: 1px solid white; + border-top: 1px solid rgba(102, 102, 102, 0.2); font-size: 1.5em; margin-top: 2em; padding-top: 1em; } @@ -629,7 +650,7 @@ mct-container { display: inline-block; } /* line 55, ../../../../general/res/sass/_icons.scss */ -.s-menu .invoke-menu, +.s-menu .invoke-menu, .select .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } @@ -865,9 +886,9 @@ mct-container { /* line 150, ../../../../general/res/sass/helpers/_bubbles.scss */ .s-infobubble { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; @@ -924,7 +945,7 @@ mct-container { *****************************************************************************/ /* line 26, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout .splitter { - background-color: #b3b3b3; + background-color: #a3a3a3; overflow: hidden; position: absolute; z-index: 1; } @@ -971,7 +992,7 @@ mct-container { pointer-events: none; position: absolute; z-index: 2; - border-top: 1px dotted #d9d9d9; + border-top: 1px dotted #c9c9c9; top: 2px; left: 5px; right: 5px; } @@ -989,7 +1010,7 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - border-color: #fff; } + border-color: #efefef; } /* line 61, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane { top: 0; @@ -1025,7 +1046,7 @@ mct-container { pointer-events: none; position: absolute; z-index: 2; - border-left: 1px dotted #d9d9d9; + border-left: 1px dotted #c9c9c9; left: 2px; bottom: 5px; top: 5px; } @@ -1043,7 +1064,7 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - border-color: #fff; } + border-color: #efefef; } /* line 80, ../../../../general/res/sass/helpers/_splitter.scss */ .browse-area .splitter { @@ -1188,9 +1209,9 @@ mct-container { /* Styles for messages */ /* line 4, ../../../../general/res/sass/_messages.scss */ .message.block { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; padding: 10px; } /* line 8, ../../../../general/res/sass/_messages.scss */ .message.error { @@ -1221,7 +1242,7 @@ mct-container { /* Classes to be used for lists of properties and values */ /* line 25, ../../../../general/res/sass/_properties.scss */ .properties .s-row { - border-top: 1px solid white; + border-top: 1px solid rgba(102, 102, 102, 0.2); font-size: 0.8em; } /* line 28, ../../../../general/res/sass/_properties.scss */ .properties .s-row:first-child { @@ -1242,9 +1263,9 @@ mct-container { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 1.5px; - -webkit-border-radius: 1.5px; - border-radius: 1.5px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; -webkit-transition: background-color 0.25s; @@ -1321,7 +1342,7 @@ mct-container { }*/ /*********************************** STYLE STYLES */ /* line 61, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu { +.s-btn, .s-menu, .select { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1336,110 +1357,95 @@ mct-container { padding: 0 7.5px; font-size: 0.7rem; } /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .icon, .s-menu .icon { + .s-btn .icon, .s-menu .icon, .select .icon { font-size: 0.8rem; color: #0099cc; } /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .title-label, .s-menu .title-label { + .s-btn .title-label, .s-menu .title-label, .select .title-label { vertical-align: top; } /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.sm, .sm.s-menu { + .s-btn.sm, .sm.s-menu, .sm.select { padding: 0 5px; } - /* line 83, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.vsm, .vsm.s-menu { + /* line 84, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.vsm, .vsm.s-menu, .vsm.select { padding: 0 2.5px; } - /* line 87, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn:not(.major), .s-menu:not(.major) { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-color: #b3b3b3; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: inline-block; - color: #fff; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ } - /* line 14, ../sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ - .s-btn:not(.major) .icon, .s-menu:not(.major) .icon { - color: #fff; } - /* line 91, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.major, .major.s-menu, .overlay .bottom-bar .s-btn.major, .overlay .bottom-bar .major.s-menu { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + /* line 88, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.major, .major.s-menu, .major.select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; background-color: #0099cc; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; display: inline-block; - color: white; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ } - /* line 14, ../sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .overlay .bottom-bar .s-btn.major:not(.disabled):hover, .overlay .bottom-bar .major.s-menu:not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ - .s-btn.major .icon, .major.s-menu .icon, .overlay .bottom-bar .s-btn.major .icon, .overlay .bottom-bar .major.s-menu .icon { - color: white; } - /* line 97, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.paused, .paused.s-menu { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-color: #c56f01; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: inline-block; - color: #fff; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ } - /* line 14, ../sass/_mixins.scss */ - .s-btn.paused:not(.disabled):hover, .paused.s-menu:not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ - .s-btn.paused .icon, .paused.s-menu .icon { + color: #fff; } + /* line 17, ../sass/_mixins.scss */ + .s-btn.major .icon, .major.s-menu .icon, .major.select .icon { color: #fff; } - /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.paused .icon:before, .paused.s-menu .icon:before { + /* line 21, ../sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .major.select:not(.disabled):hover { + background-color: deepskyblue; } + /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn:not(.major), .s-menu:not(.major), .select:not(.major) { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #a3a3a3; + -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; + display: inline-block; + color: #fff; } + /* line 17, ../sass/_mixins.scss */ + .s-btn:not(.major) .icon, .s-menu:not(.major) .icon, .select:not(.major) .icon { + color: #fff; } + /* line 21, ../sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover, .select:not(.major):not(.disabled):hover { + background-color: #0099cc; } + /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.paused, .paused.s-menu, .paused.select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #c56f01; + -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; + display: inline-block; + color: #fff; } + /* line 17, ../sass/_mixins.scss */ + .s-btn.paused .icon, .paused.s-menu .icon, .paused.select .icon { + color: #fff; } + /* line 21, ../sass/_mixins.scss */ + .s-btn.paused:not(.disabled):hover, .paused.s-menu:not(.disabled):hover, .paused.select:not(.disabled):hover { + background-color: #f88c01; } + /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.paused .icon:before, .paused.s-menu .icon:before, .paused.select .icon:before { content: "\0000EF"; } - /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play, .pause-play.s-menu { + /* line 106, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play, .pause-play.s-menu, .pause-play.select { /* &.paused { .icon { @@ -1447,39 +1453,39 @@ mct-container { } } */ } - /* line 112, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before { + /* line 114, ../../../../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 118, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before { + /* line 120, ../../../../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 124, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 126, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 130, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .s-btn, .l-btn-set .s-menu { + /* line 132, ../../../../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 136, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .first .s-btn, .l-btn-set .first .s-menu { - -moz-border-radius-topleft: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; + /* line 138, ../../../../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; + border-top-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; margin-left: 0; } - /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .last .s-btn, .l-btn-set .last .s-menu { - -moz-border-radius-topright: 3px; - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -moz-border-radius-bottomright: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; } + /* line 145, ../../../../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; + border-top-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; } /*********************************** LAYOUT STYLES */ /* @@ -1629,9 +1635,9 @@ a.s-btn span { margin-top: 0; } /* line 57, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head { - -moz-border-radius: 1.5px; - -webkit-border-radius: 1.5px; - border-radius: 1.5px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1687,7 +1693,7 @@ a.s-btn span { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - border-left: 1px solid white; + border-left: 1px solid rgba(102, 102, 102, 0.2); display: inline-block; padding: 0 5px; position: relative; } @@ -1724,9 +1730,9 @@ label.checkbox.custom { min-width: 14px; } /* line 155, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom em:before { - -moz-border-radius: 1.5px; - -webkit-border-radius: 1.5px; - border-radius: 1.5px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; background: white; border-bottom: 1px solid white; box-sizing: border-box; @@ -1775,7 +1781,7 @@ label.checkbox.custom { margin-left: 0; } /* line 207, ../../../../general/res/sass/controls/_controls.scss */ -.s-menu label.checkbox.custom { +.s-menu label.checkbox.custom, .select label.checkbox.custom { margin-left: 5px; } /* line 212, ../../../../general/res/sass/controls/_controls.scss */ @@ -1872,9 +1878,7 @@ label.checkbox.custom { -moz-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; - background-color: rgba(0, 0, 0, 0.4); - border-bottom: 1px solid rgba(77, 77, 77, 0.4); - border-right: 1px solid rgba(77, 77, 77, 0.4); + background-color: rgba(0, 0, 0, 0.5); height: 50%; width: auto; position: absolute; @@ -1884,27 +1888,22 @@ label.checkbox.custom { left: 0; } /* line 308, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-color: #fff; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #a3a3a3; + -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; display: inline-block; color: #fff; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ cursor: ew-resize; position: absolute; height: 100%; @@ -1913,10 +1912,7 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 14, ../sass/_mixins.scss */ - .slider .knob:not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ + /* line 17, ../sass/_mixins.scss */ .slider .knob .icon { color: #fff; } /* line 159, ../../../../general/res/sass/_mixins.scss */ @@ -1957,7 +1953,7 @@ label.checkbox.custom { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - border-color: #fff; } + border-color: #efefef; } /* line 319, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:before { top: 1px; @@ -1991,42 +1987,36 @@ label.checkbox.custom { -moz-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; - background-color: rgba(0, 0, 0, 0.4); - border-bottom: 1px solid rgba(77, 77, 77, 0.4); - border-right: 1px solid rgba(77, 77, 77, 0.4); + background-color: rgba(0, 0, 0, 0.5); height: 10px; width: 10px; } /* line 351, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2JjYmNiYyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FmYWZhZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #ffffff), color-stop(100%, #ffffff)); - background-image: -moz-linear-gradient(#ffffff, #ffffff 20px); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 20px); - background-image: linear-gradient(#ffffff, #ffffff 20px); - -moz-border-radius: 1px; - -webkit-border-radius: 1px; - border-radius: 1px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #bcbcbc), color-stop(100%, #afafaf)); + background-image: -moz-linear-gradient(#bcbcbc, #afafaf 20px); + background-image: -webkit-linear-gradient(#bcbcbc, #afafaf 20px); + background-image: linear-gradient(#bcbcbc, #afafaf 20px); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - border-top: 1px solid white; } - /* line 358, ../../../../general/res/sass/controls/_controls.scss */ + box-sizing: border-box; } + /* line 360, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #ffffff), color-stop(100%, #ffffff)); - background-image: -moz-linear-gradient(#ffffff, #ffffff 20px); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 20px); - background-image: linear-gradient(#ffffff, #ffffff 20px); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #00ace6), color-stop(100%, #0099cc)); + background-image: -moz-linear-gradient(#00ace6, #0099cc 20px); + background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); + background-image: linear-gradient(#00ace6, #0099cc 20px); } - /* line 363, ../../../../general/res/sass/controls/_controls.scss */ + /* line 365, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { - background: rgba(0, 0, 0, 0.4); } } + background: rgba(0, 0, 0, 0.5); } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2083,13 +2073,13 @@ label.checkbox.custom { *****************************************************************************/ /******************************************************** MENU BUTTONS */ /* line 31, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .icon { +.s-menu .icon, .select .icon { font-size: 120%; } /* line 35, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .title-label { +.s-menu .title-label, .select .title-label { margin-left: 3px; } /* line 39, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu:after { +.s-menu:after, .select:after { color: rgba(255, 255, 255, 0.5); content: '\76'; display: inline-block; @@ -2098,14 +2088,14 @@ label.checkbox.custom { text-shadow: none; vertical-align: top; } /* line 50, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu.create-btn .title-label { +.s-menu.create-btn .title-label, .create-btn.select .title-label { font-size: 1rem; } /* line 58, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .menu { +.s-menu .menu, .select .menu { left: 0; text-align: left; } /* line 61, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu .menu .ui-symbol.icon { + .s-menu .menu .ui-symbol.icon, .select .menu .ui-symbol.icon { width: 12px; } /******************************************************** MENUS THEMSELVES */ @@ -2113,116 +2103,110 @@ label.checkbox.custom { .menu-element { cursor: pointer; position: relative; } - /* line 74, ../../../../general/res/sass/controls/_menus.scss */ + /* line 76, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; background-color: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; display: inline-block; - text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -moz-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; + box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; display: block; padding: 3px 0; position: absolute; z-index: 10; } - /* line 82, ../../../../general/res/sass/controls/_menus.scss */ + /* line 85, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul { margin: 0; padding: 0; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 319, ../../../../general/res/sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; padding: 0; } - /* line 84, ../../../../general/res/sass/controls/_menus.scss */ + /* line 87, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; border-top: 1px solid white; - color: white; + color: #666666; line-height: 1.5rem; padding: 3px 10px 3px 30px; position: relative; white-space: nowrap; } - /* line 92, ../../../../general/res/sass/controls/_menus.scss */ + /* line 95, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:first-child { border: none; } - /* line 95, ../../../../general/res/sass/controls/_menus.scss */ + /* line 98, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:hover { - background: white; + background: #e6e6e6; color: #fff; } /* line 101, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:hover .icon { color: #33ccff; } - /* line 109, ../../../../general/res/sass/controls/_menus.scss */ + /* line 105, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon { left: 10px; } - /* line 116, ../../../../general/res/sass/controls/_menus.scss */ + /* line 112, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu, .menu-element .checkbox-menu, .menu-element .super-menu { - pointer-events: auto; - background-color: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: inline-block; } - /* line 124, ../../../../general/res/sass/controls/_menus.scss */ + pointer-events: auto; } + /* line 115, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li, .menu-element .checkbox-menu ul li, .menu-element .super-menu ul li { padding-left: 25px; } - /* line 126, ../../../../general/res/sass/controls/_menus.scss */ + /* line 117, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li a, .menu-element .checkbox-menu ul li a, .menu-element .super-menu ul li a { - color: white; } - /* line 129, ../../../../general/res/sass/controls/_menus.scss */ + color: #4d4d4d; } + /* line 120, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li .icon, .menu-element .checkbox-menu ul li .icon, .menu-element .super-menu ul li .icon { - color: #24c8ff; } - /* line 132, ../../../../general/res/sass/controls/_menus.scss */ + color: #0099cc; } + /* line 123, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li .type-icon, .menu-element .checkbox-menu ul li .type-icon, .menu-element .super-menu ul li .type-icon { left: 5px; } - /* line 135, ../../../../general/res/sass/controls/_menus.scss */ + /* line 126, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu ul li:hover .icon, .menu-element .checkbox-menu ul li:hover .icon, .menu-element .super-menu ul li:hover .icon { - color: #3dcfff; } - /* line 144, ../../../../general/res/sass/controls/_menus.scss */ + color: #00ace6; } + /* line 135, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li { padding-left: 50px; } - /* line 146, ../../../../general/res/sass/controls/_menus.scss */ + /* line 137, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox { position: absolute; left: 5px; top: 0.53333rem; } - /* line 151, ../../../../general/res/sass/controls/_menus.scss */ + /* line 142, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox em { height: 0.7rem; width: 0.7rem; } - /* line 154, ../../../../general/res/sass/controls/_menus.scss */ + /* line 145, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox em:before { font-size: 7px !important; height: 0.7rem; width: 0.7rem; line-height: 0.7rem; } - /* line 162, ../../../../general/res/sass/controls/_menus.scss */ + /* line 153, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .type-icon { left: 25px; } - /* line 168, ../../../../general/res/sass/controls/_menus.scss */ + /* line 159, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu { display: block; width: 500px; height: 480px; } - /* line 178, ../../../../general/res/sass/controls/_menus.scss */ + /* line 168, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: hidden; position: absolute; @@ -2232,12 +2216,12 @@ label.checkbox.custom { left: 5px; width: auto; height: auto; } - /* line 181, ../../../../general/res/sass/controls/_menus.scss */ + /* line 171, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 183, ../../../../general/res/sass/controls/_menus.scss */ + /* line 173, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid rgba(255, 255, 255, 0.2); left: 0; @@ -2246,24 +2230,22 @@ label.checkbox.custom { width: 50%; overflow-x: hidden; overflow-y: auto; } - /* line 193, ../../../../general/res/sass/controls/_menus.scss */ + /* line 183, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; padding-left: 30px; border-top: none; } - /* line 200, ../../../../general/res/sass/controls/_menus.scss */ + /* line 190, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: auto; right: 0; padding: 25px; width: 50%; } - /* line 206, ../../../../general/res/sass/controls/_menus.scss */ - .menu-element .super-menu .pane.right .icon { - color: #fff; } - /* line 213, ../../../../general/res/sass/controls/_menus.scss */ + /* line 200, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.icon { + color: #0099cc; position: relative; font-size: 8em; left: 0; @@ -2271,40 +2253,40 @@ label.checkbox.custom { line-height: 150px; margin-bottom: 25px; text-align: center; } - /* line 223, ../../../../general/res/sass/controls/_menus.scss */ + /* line 211, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.title { - color: #fff; + color: #666; font-size: 1.2em; margin-bottom: 0.5em; } - /* line 228, ../../../../general/res/sass/controls/_menus.scss */ + /* line 216, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.description { - color: #fff; + color: #666; font-size: 0.8em; line-height: 1.5em; } - /* line 237, ../../../../general/res/sass/controls/_menus.scss */ + /* line 225, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu, .menu-element .checkbox-menu { font-size: 0.80rem; } -/* line 242, ../../../../general/res/sass/controls/_menus.scss */ +/* line 230, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 70; } - /* line 248, ../../../../general/res/sass/controls/_menus.scss */ + /* line 236, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 255, ../../../../general/res/sass/controls/_menus.scss */ + /* line 243, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder.go-left .context-menu, .context-menu-holder.go-left .menu-element .checkbox-menu, .menu-element .context-menu-holder.go-left .checkbox-menu { right: 0; } - /* line 258, ../../../../general/res/sass/controls/_menus.scss */ + /* line 246, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder.go-up .context-menu, .context-menu-holder.go-up .menu-element .checkbox-menu, .menu-element .context-menu-holder.go-up .checkbox-menu { bottom: 0; } -/* line 263, ../../../../general/res/sass/controls/_menus.scss */ +/* line 251, ../../../../general/res/sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; @@ -2361,10 +2343,10 @@ label.checkbox.custom { height: 10px; } /* line 52, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { - border-top: 1px solid white; } + border-top: 1px solid rgba(102, 102, 102, 0.2); } /* line 54, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { - background-color: white; + background-color: rgba(102, 102, 102, 0.2); border: none; width: 1px; margin-left: -1px; } @@ -2373,7 +2355,7 @@ label.checkbox.custom { margin-left: 0; } /* line 62, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { - color: white; + color: rgba(153, 153, 153, 0.2); font-size: 0.7em; position: absolute; margin-left: -25px; @@ -2466,220 +2448,191 @@ label.checkbox.custom { *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_elems.scss */ .section-header { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - background: rgba(255, 255, 255, 0.1); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background: rgba(0, 0, 0, 0.1); color: #999999; font-size: 0.8em; padding: 5px 5px; text-transform: uppercase; } -/* line 35, ../../../../general/res/sass/forms/_elems.scss */ -.form .form-section { - position: relative; - margin-bottom: 20px; } -/* line 40, ../../../../general/res/sass/forms/_elems.scss */ -.form .form-row { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - *zoom: 1; - border-top: 1px solid rgba(255, 255, 255, 0.1); - margin-top: 5px; - padding: 5px 0; - position: relative; } - /* line 48, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row.first { - border-top: none; } - /* line 52, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row > .label, - .form .form-row > .controls { +/* line 33, ../../../../general/res/sass/forms/_elems.scss */ +.form { + color: gray; } + /* line 36, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-section { + position: relative; + margin-bottom: 20px; } + /* line 41, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; *zoom: 1; - font-size: 0.8rem; - line-height: 22px; - min-height: 22px; } - /* line 61, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row > .label { - float: left; - min-width: 120px; - position: relative; - white-space: nowrap; - width: 30%; } - /* line 71, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .value { - color: #999999; } - /* line 75, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls { - float: left; - position: relative; - width: 69.9%; } - /* line 82, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-composite-control.l-checkbox { - display: inline-block; - line-height: 14px; - margin-right: 5px; } - /* line 91, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-med input[type="text"] { - width: 200px; } - /* line 95, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-small input[type="text"] { - width: 50px; } - /* line 99, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-numeric input[type="text"] { - text-align: right; } - /* line 103, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .select { - margin-right: 5px; } - /* line 108, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .field-hints { - color: #333333; } - /* line 112, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .selector-list { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - background: rgba(0, 0, 0, 0.2); - padding: 5px; - position: relative; - height: 150px; - overflow: auto; } - /* line 123, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .selector-list .wrapper { - overflow-y: auto; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; } + border-top: 1px solid rgba(255, 255, 255, 0.1); + margin-top: 5px; + padding: 5px 0; + position: relative; } + /* line 49, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row.first { + border-top: none; } + /* line 53, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row > .label, + .form .form-row > .controls { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + *zoom: 1; + font-size: 0.8rem; + line-height: 22px; + min-height: 22px; } + /* line 62, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row > .label { + float: left; + min-width: 120px; + position: relative; + white-space: nowrap; + width: 30%; } + /* line 72, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .value { + color: #666; } + /* line 76, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls { + float: left; + position: relative; + width: 69.9%; } + /* line 83, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-composite-control.l-checkbox { + display: inline-block; + line-height: 14px; + margin-right: 5px; } + /* line 92, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-med input[type="text"] { + width: 200px; } + /* line 96, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-small input[type="text"] { + width: 50px; } + /* line 100, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-numeric input[type="text"] { + text-align: right; } + /* line 104, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .select { + margin-right: 5px; } + /* line 109, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .field-hints { + color: #333333; } + /* line 113, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .selector-list { + -moz-appearance: none; + -webkit-appearance: none; + -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; + -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; + background: #fff; + border: none; + color: #666; + outline: none; + padding: 0 3px; + position: relative; + height: 150px; } + /* line 270, ../../../../general/res/sass/_mixins.scss */ + .form .form-row .selector-list.error { + background: rgba(255, 0, 0, 0.5); } + /* line 124, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .selector-list > .wrapper { + overflow: auto; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; } -/* line 137, ../../../../general/res/sass/forms/_elems.scss */ +/* line 138, ../../../../general/res/sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 143, ../../../../general/res/sass/forms/_elems.scss */ +/* line 144, ../../../../general/res/sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 148, ../../../../general/res/sass/forms/_elems.scss */ +/* line 149, ../../../../general/res/sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 155, ../../../../general/res/sass/forms/_elems.scss */ + /* line 156, ../../../../general/res/sass/forms/_elems.scss */ .l-result div.s-hint { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - background: rgba(255, 153, 0, 0.8); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background: rgba(255, 34, 0, 0.8); display: block; - color: #ffd699; + color: #ffa799; padding: 5px; } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/forms/_textarea.scss */ -.edit-main textarea { +/* line 165, ../../../../general/res/sass/forms/_elems.scss */ +input[type="text"] { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - background: rgba(255, 255, 255, 0.1); + -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; + background: #fff; border: none; - color: #999999; + color: #666; + outline: none; + padding: 0 3px; } + /* line 270, ../../../../general/res/sass/_mixins.scss */ + input[type="text"].error { + background: rgba(255, 0, 0, 0.5); } + /* line 172, ../../../../general/res/sass/forms/_elems.scss */ + input[type="text"].numeric { + text-align: right; } + +/* line 177, ../../../../general/res/sass/forms/_elems.scss */ +textarea { + -moz-appearance: none; + -webkit-appearance: none; + -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; + -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; + background: #fff; + border: none; + color: #666; outline: none; padding: 5px; position: absolute; height: 100%; width: 100%; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ - .edit-main textarea.error { + /* line 270, ../../../../general/res/sass/_mixins.scss */ + textarea.error { background: rgba(255, 0, 0, 0.5); } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/forms/_text-input.scss */ -input[type="text"] { - -moz-appearance: none; - -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - background: rgba(255, 255, 255, 0.1); - border: none; - color: #999999; - outline: none; - padding: 0 3px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ - input[type="text"].error { - background: rgba(255, 0, 0, 0.5); } - /* line 29, ../../../../general/res/sass/forms/_text-input.scss */ - input[type="text"].numeric { - text-align: right; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2702,62 +2655,46 @@ input[type="text"] { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_selects.scss */ -.form-control.select { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-color: #fff; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; +.select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #a3a3a3; + -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; display: inline-block; color: #fff; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ - cursor: pointer; - display: inline-block; margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 14, ../sass/_mixins.scss */ - .form-control.select:not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ - .form-control.select .icon { + /* line 17, ../sass/_mixins.scss */ + .select .icon { color: #fff; } - /* line 29, ../../../../general/res/sass/forms/_selects.scss */ - .form-control.select select { + /* line 30, ../../../../general/res/sass/forms/_selects.scss */ + .select select { -moz-appearance: none; -webkit-appearance: none; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; background: none; - color: #666; + color: #fff; border: none !important; - cursor: pointer; - padding: 4px 25px 2px 5px; + padding: 4px 25px 2px 0px; width: 120%; } - /* line 38, ../../../../general/res/sass/forms/_selects.scss */ - .form-control.select select option { + /* line 39, ../../../../general/res/sass/forms/_selects.scss */ + .select select option { margin: 5px 0; } - /* line 42, ../../../../general/res/sass/forms/_selects.scss */ - .form-control.select:after { - color: #0099cc; - content: "v"; - display: block; - font-family: 'symbolsfont'; - pointer-events: none; + /* line 43, ../../../../general/res/sass/forms/_selects.scss */ + .select:after { position: absolute; right: 5px; top: 0; } @@ -2791,27 +2728,27 @@ input[type="text"] { .channel-selector .treeview { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - background: rgba(255, 255, 255, 0.1); + -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; + background: #efefef; border: none; - color: #999999; + color: #666; outline: none; padding: 0 3px; - background: white; + background: #f7f7f7; border-bottom: 1px solid white; min-height: 300px; max-height: 400px; overflow: auto; padding: 5px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 270, ../../../../general/res/sass/_mixins.scss */ .channel-selector .treeview.error { background: rgba(255, 0, 0, 0.5); } /* line 36, ../../../../general/res/sass/forms/_channel-selector.scss */ @@ -2905,7 +2842,7 @@ input[type="text"] { font-size: 0.7em; } /* line 44, ../../../../general/res/sass/forms/_validation.scss */ .validates.invalid > .label::after, .validates.invalid.req > .label::after { - color: #ff9900; + color: #ff2200; content: "x"; } /* line 51, ../../../../general/res/sass/forms/_validation.scss */ .validates.valid > .label::after, .validates.valid.req > .label::after { @@ -2913,7 +2850,7 @@ input[type="text"] { content: "2"; } /* line 57, ../../../../general/res/sass/forms/_validation.scss */ .validates.req > .label::after { - color: #ffc700; + color: #0099cc; content: "*"; } /* line 63, ../../../../general/res/sass/forms/_validation.scss */ @@ -2922,7 +2859,7 @@ input[type="text"] { /* line 66, ../../../../general/res/sass/forms/_validation.scss */ span.req { - color: #ffc700; } + color: #0099cc; } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government @@ -2952,23 +2889,23 @@ span.req { .t-filter input.t-filter-input { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; - -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; - background: rgba(255, 255, 255, 0.1); + -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; + background: #efefef; border: none; - color: #999999; + color: #666; outline: none; padding: 0 3px; - background: white; + background: #f7f7f7; border-bottom: 1px solid white; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 270, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -2986,9 +2923,9 @@ span.req { /* line 42, ../../../../general/res/sass/forms/_filter.scss */ .filter .icon.ui-symbol, .t-filter .icon.ui-symbol { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; display: inline-block; font-size: 1.3em; height: 22px; @@ -3002,9 +2939,9 @@ span.req { /* line 54, ../../../../general/res/sass/forms/_filter.scss */ .filter .s-a-clear.ui-symbol, .t-filter .s-a-clear.ui-symbol { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -3086,9 +3023,9 @@ span.req { /* line 46, ../../../../general/res/sass/user-environ/_layout.scss */ .editor { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; } + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } /* line 50, ../../../../general/res/sass/user-environ/_layout.scss */ .contents { @@ -3108,33 +3045,38 @@ span.req { .bar .icon.major { margin-right: 5px; } /* line 70, ../../../../general/res/sass/user-environ/_layout.scss */ -.bar.abs, .s-menu span.bar.l-click-area { +.bar.abs, .s-menu span.bar.l-click-area, .select span.bar.l-click-area { text-wrap: none; white-space: nowrap; } /* line 73, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.left, .s-menu span.bar.left.l-click-area, + .bar.abs.left, .s-menu span.bar.left.l-click-area, .select span.bar.left.l-click-area, .bar.abs .left, - .s-menu span.bar.l-click-area .left { + .s-menu span.bar.l-click-area .left, + .select span.bar.l-click-area .left { width: 45%; right: auto; } /* line 78, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.right, .s-menu span.bar.right.l-click-area, + .bar.abs.right, .s-menu span.bar.right.l-click-area, .select span.bar.right.l-click-area, .bar.abs .right, - .s-menu span.bar.l-click-area .right { + .s-menu span.bar.l-click-area .right, + .select span.bar.l-click-area .right { width: 45%; left: auto; text-align: right; } /* line 83, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.right .icon.major, .s-menu span.bar.right.l-click-area .icon.major, + .bar.abs.right .icon.major, .s-menu span.bar.right.l-click-area .icon.major, .select span.bar.right.l-click-area .icon.major, .bar.abs .right .icon.major, - .s-menu span.bar.l-click-area .right .icon.major { + .s-menu span.bar.l-click-area .right .icon.major, + .select span.bar.l-click-area .right .icon.major { margin-left: 15px; } /* line 89, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs .l-flex .left, .s-menu span.bar.l-click-area .l-flex .left, + .bar.abs .l-flex .left, .s-menu span.bar.l-click-area .l-flex .left, .select span.bar.l-click-area .l-flex .left, .bar.abs .l-flex .right, - .s-menu span.bar.l-click-area .l-flex .right, .bar.abs.l-flex .left, .s-menu span.bar.l-flex.l-click-area .left, + .s-menu span.bar.l-click-area .l-flex .right, + .select span.bar.l-click-area .l-flex .right, .bar.abs.l-flex .left, .s-menu span.bar.l-flex.l-click-area .left, .select span.bar.l-flex.l-click-area .left, .bar.abs.l-flex .right, - .s-menu span.bar.l-flex.l-click-area .right { + .s-menu span.bar.l-flex.l-click-area .right, + .select span.bar.l-flex.l-click-area .right { width: auto; } /* line 98, ../../../../general/res/sass/user-environ/_layout.scss */ @@ -3272,10 +3214,12 @@ span.req { overflow: auto; top: 64px; } /* line 251, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .s-menu span.left.l-click-area, .s-menu .pane.items .object-browse-bar span.left.l-click-area, + .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .s-menu span.left.l-click-area, .s-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .select span.left.l-click-area, .select .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .s-menu span.right.l-click-area, - .s-menu .pane.items .object-browse-bar span.right.l-click-area { + .s-menu .pane.items .object-browse-bar span.right.l-click-area, + .pane.items .object-browse-bar .select span.right.l-click-area, + .select .pane.items .object-browse-bar span.right.l-click-area { top: auto; } /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-holder { @@ -3305,13 +3249,17 @@ span.req { right: 3px; } /* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ -.object-browse-bar .s-btn, .object-browse-bar .s-menu, +.object-browse-bar .s-btn, .object-browse-bar .s-menu, .object-browse-bar .select, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu, +.top-bar .buttons-main .select, .top-bar .s-menu, +.top-bar .select, .tool-bar .s-btn, .tool-bar .s-menu, -.tool-bar .s-menu { +.tool-bar .select, +.tool-bar .s-menu, +.tool-bar .select { height: 25px; line-height: 25px; vertical-align: top; } @@ -3393,7 +3341,7 @@ span.req { /* line 31, ../../../../general/res/sass/mobile/_layout.scss */ .pane.left.treeview { - background-color: #222; } + background-color: #eaeaea; } /* line 35, ../../../../general/res/sass/mobile/_layout.scss */ .pane.right-repr { @@ -3706,13 +3654,13 @@ span.req { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 23, ../../../../general/res/sass/search/_search.scss */ -.abs.search-holder, .s-menu span.search-holder.l-click-area { +.abs.search-holder, .s-menu span.search-holder.l-click-area, .select span.search-holder.l-click-area { height: 25px; bottom: 0; top: 23px; z-index: 5; } /* line 27, ../../../../general/res/sass/search/_search.scss */ - .abs.search-holder.active, .s-menu span.search-holder.active.l-click-area { + .abs.search-holder.active, .s-menu span.search-holder.active.l-click-area, .select span.search-holder.active.l-click-area { height: auto; bottom: 0; } @@ -3812,9 +3760,9 @@ span.req { visibility: visible; } /* line 178, ../../../../general/res/sass/search/_search.scss */ .search .active-filter-display { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -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; @@ -3920,17 +3868,17 @@ span.req { z-index: 100; } /* line 32, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay > .holder { - background-color: #fff; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-color: #efefef; + -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; display: inline-block; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 12px; + -webkit-border-radius: 12px; + border-radius: 12px; color: #666; top: 15%; right: 15%; @@ -3969,24 +3917,37 @@ span.req { height: 30px; text-align: right; } /* line 66, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { - background-color: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: inline-block; + .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu, .overlay .bottom-bar .select { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 14, ../sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.disabled):hover { - background-color: #0099cc; } -/* line 82, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 68, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major), .overlay .bottom-bar .select:not(.major) { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #898989; + -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; + display: inline-block; + color: #fff; } + /* line 17, ../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; } + /* line 21, ../sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover, .overlay .bottom-bar .select:not(.major):not(.disabled):hover { + background-color: #6f6f6f; } +/* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; @@ -4062,7 +4023,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 319, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -4081,9 +4042,9 @@ ul.tree { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; -webkit-transition: background-color 0.25s; @@ -4196,15 +4157,15 @@ ul.tree { .tree-item.selected, .search-result-item.selected { background: #1ac6ff; - color: #fff; } + color: #efefef; } /* line 131, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .view-control, .search-result-item.selected .view-control { - color: #fff; } + color: #efefef; } /* line 134, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .label .type-icon, .search-result-item.selected .label .type-icon { - color: #fff; } + color: #efefef; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 142, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover, @@ -4311,18 +4272,18 @@ ul.tree { *****************************************************************************/ /* line 25, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.child-frame.panel { - background: #fff; - border: 1px solid white; } + background: #efefef; + border: 1px solid rgba(102, 102, 102, 0.2); } /* line 28, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.child-frame.panel:hover { - border-color: white; } + border-color: rgba(128, 128, 128, 0.2); } /* line 32, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame > .object-header.abs, .s-menu .frame > span.object-header.l-click-area { +.frame > .object-header.abs, .s-menu .frame > span.object-header.l-click-area, .select .frame > span.object-header.l-click-area { font-size: 0.75em; height: 16px; line-height: 16px; } /* line 38, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame > .object-holder.abs, .s-menu .frame > span.object-holder.l-click-area { +.frame > .object-holder.abs, .s-menu .frame > span.object-holder.l-click-area, .select .frame > span.object-holder.l-click-area { top: 21px; } /* line 41, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .contents { @@ -4368,29 +4329,31 @@ ul.tree { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 23, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.top-bar.browse, .top-bar.edit { - border-bottom: 1px solid white; - top: 10px; - right: 10px; - bottom: auto; - left: 10px; - height: 30px; - line-height: 24px; } -/* line 31, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.top-bar .title { - color: #fff; } -/* line 35, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.top-bar .buttons-main { - font-size: 0.8em; - left: auto; - text-align: right; } +/* line 22, ../../../../general/res/sass/user-environ/_top-bar.scss */ +.top-bar { + /* .title { + color: #fff; + }*/ } + /* line 23, ../../../../general/res/sass/user-environ/_top-bar.scss */ + .top-bar.browse, .top-bar.edit { + border-bottom: 1px solid rgba(102, 102, 102, 0.2); + top: 10px; + right: 10px; + bottom: auto; + left: 10px; + height: 30px; + line-height: 24px; } + /* line 35, ../../../../general/res/sass/user-environ/_top-bar.scss */ + .top-bar .buttons-main { + font-size: 0.8em; + left: auto; + text-align: right; } /* line 48, ../../../../general/res/sass/user-environ/_top-bar.scss */ .edit-mode .top-bar .buttons-main { white-space: nowrap; } /* line 52, ../../../../general/res/sass/user-environ/_top-bar.scss */ - .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .s-menu span.buttons-main.l-click-area, .s-menu .edit-mode .top-bar span.buttons-main.l-click-area { + .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .s-menu span.buttons-main.l-click-area, .s-menu .edit-mode .top-bar span.buttons-main.l-click-area, .edit-mode .top-bar .select span.buttons-main.l-click-area, .select .edit-mode .top-bar span.buttons-main.l-click-area { bottom: auto; left: auto; } @@ -4497,7 +4460,7 @@ ul.tree { *****************************************************************************/ /* line 22, ../../../../general/res/sass/user-environ/_tool-bar.scss */ .tool-bar { - border-bottom: 1px solid white; } + border-bottom: 1px solid rgba(102, 102, 102, 0.2); } /* line 24, ../../../../general/res/sass/user-environ/_tool-bar.scss */ .tool-bar .l-control-group { height: 25px; } @@ -4706,7 +4669,7 @@ table { .tabular thead, .tabular .thead, table thead, table .thead { - border-bottom: 1px solid #fff; } + border-bottom: 1px solid #efefef; } /* line 47, ../../../../general/res/sass/lists/_tabular.scss */ .tabular tbody, .tabular .tbody, table tbody, @@ -4755,7 +4718,7 @@ table { table .tr th, table .tr .th { background-color: white; - border-left: 1px solid #fff; + border-left: 1px solid #efefef; color: white; padding: 5px 5px; white-space: nowrap; @@ -4945,9 +4908,9 @@ table { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; background: black; color: #b3b3b3; padding: 2px 5px; @@ -4968,7 +4931,7 @@ table { bottom: 37px; left: 60px; cursor: crosshair; - border: 1px solid white; } + border: 1px solid rgba(102, 102, 102, 0.2); } /* line 86, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label, .gl-plot .l-plot-label { @@ -5123,7 +5086,7 @@ table { padding: 0px 5px; } /* line 227, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch { - border: 1px solid #fff; + border: 1px solid #efefef; height: 9px; width: 9px; } @@ -5297,27 +5260,22 @@ table { top: 0; } /* line 29, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-color: #b3b3b3; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #a3a3a3; + -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; display: inline-block; color: #fff; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ box-sizing: border-box; cursor: pointer; float: left; @@ -5326,12 +5284,12 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 14, ../sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ + /* line 17, ../sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #fff; } + /* line 21, ../sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover { + background-color: #fff; } /* line 47, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: deepskyblue; } @@ -5435,32 +5393,24 @@ table { font-size: 0.8em; } /* line 138, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item.selected { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; background-color: #0099cc; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; display: inline-block; color: #fff; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ color: #80dfff; } - /* line 14, ../sass/_mixins.scss */ - .items-holder .item.grid-item.selected:not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ + /* line 17, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #fff; } /* line 143, ../../../../general/res/sass/items/_item.scss */ @@ -5604,7 +5554,7 @@ table { .autoflow { font-size: 0.75rem; } /* line 32, ../../../../general/res/sass/_autoflow.scss */ - .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu { + .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu, .autoflow:hover .l-autoflow-header .change-column-width.select { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; -webkit-transition-property: visibility, opacity, background-color, border-color; @@ -5628,7 +5578,7 @@ table { .autoflow .l-autoflow-header span { vertical-align: middle; } /* line 48, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu { + .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu, .autoflow .l-autoflow-header .change-column-width.select { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; -webkit-transition-property: visibility, opacity, background-color, border-color; @@ -5659,7 +5609,7 @@ table { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - border-left: 1px solid white; + border-left: 1px solid rgba(102, 102, 102, 0.2); display: inline-block; padding-left: 5px; padding-right: 5px; @@ -5696,7 +5646,7 @@ table { color: gray; } /* line 101, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { - border-top: 1px solid white; } + border-top: 1px solid rgba(153, 153, 153, 0.2); } /* line 104, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { display: block; } @@ -5931,35 +5881,6 @@ table { font-size: 0.65em; vertical-align: top; } -/* line 2, ../sass/_controls.scss */ -.s-btn.major, .major.s-menu, .overlay .bottom-bar .s-btn.major, .overlay .bottom-bar .major.s-menu { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-color: #0099cc; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: inline-block; - color: white; - /* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ } - /* line 14, ../sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .overlay .bottom-bar .s-btn.major:not(.disabled):hover, .overlay .bottom-bar .major.s-menu:not(.disabled):hover { - background-color: #0099cc; } - /* line 26, ../sass/_mixins.scss */ - .s-btn.major .icon, .major.s-menu .icon, .overlay .bottom-bar .s-btn.major .icon, .overlay .bottom-bar .major.s-menu .icon { - color: white; } - /* line 6, ../sass/_controls.scss */ - .s-btn.major .title-label, .major.s-menu .title-label, .overlay .bottom-bar .s-btn.major .title-label, .overlay .bottom-bar .major.s-menu .title-label { - text-transform: uppercase; } +/* line 3, ../sass/_controls.scss */ +.s-btn.major .title-label, .major.s-menu .title-label, .major.select .title-label { + text-transform: uppercase; } diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index e8c2dc4663..b779ea10fc 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -1,41 +1,53 @@ +$basicCr: 4px; +$controlCr: $basicCr; /************************** COLORS AND SHADING */ -$colorBodyBg: #fff; +$colorBodyBg: #efefef; +$colorGenBg: #fff; // NEW $colorBodyFg: #666; $colorFooterBg: #000; $colorKey: #0099cc; $colorKeySelectedBg: $colorKey; $colorKeyFg: #fff; +$colorInteriorBorder: rgba($colorBodyFg, 0.2); $contrastRatioPercent: 30%; // Buttons $colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); -$colorBtnFg: $colorBodyBg; //pullForward($colorBodyFg, $contrastRatioPercent); +$colorBtnFg: #fff; +$colorBtnMajorBg: $colorKey; +$colorBtnMajorFg: $colorKeyFg; $colorBtnIcon: $colorBtnFg; $colorInvokeMenu: #000; $contrastInvokeMenuPercent: 50%; -$colorAlt1: #ffc700; +$colorAlt1: #ff6600; $colorAlert: #ff3c00; $colorIconLink: #49dedb; $colorPausedBg: #c56f01; $colorPausedFg: #fff; $colorCreateBtn: $colorKey; $colorGridLines: rgba(#fff, 0.05); -$colorFormLines: rgba(#fff, 0.1); -$colorFormSectionHeader: rgba(#000, 0.2); $colorInvokeMenu: #fff; // Menu colors -$colorMenuBg: lighten($colorBodyBg, 23%); -$colorMenuFg: lighten($colorMenuBg, 70%); -$colorMenuIc: lighten($colorKey, 17%); -$colorInteriorBorder: lighten($colorBodyBg, 10%); -$colorObjFrameBg: darken($colorBodyBg, 5%); +$colorMenuBg: pushBack($colorBodyBg, 10%); +$colorMenuFg: pullForward($colorMenuBg, 70%); +$colorMenuIc: $colorKey; +$colorMenuHov: pullForward($colorMenuBg, 10%); +$colorCreateMenuLgIcon: $colorKey; +$colorCreateMenuText: $colorBodyFg; +$shdwMenu: rgba(black, 0.5) 0 1px 5px; +$shdwMenuText: none; // Form colors $colorCheck: $colorKey; -$colorFormRequired: #ffc700; +$colorFormRequired: $colorKey; $colorFormValid: #33cc33; $colorFormError: #cc0000; -$colorFormInvalid: #ff9900; +$colorFormInvalid: #ff2200; +$colorFormLines: rgba(#fff, 0.1); // MOVED +$colorFormSectionHeader: rgba(#000, 0.1); +$colorInputBg: $colorGenBg; +$colorInputFg: $colorBodyFg; +$colorFormText: pushBack($colorBodyFg, 10%); // Limits and staleness colors $colorLimitYellow: #9d7500; $colorLimitRed: #aa0000; @@ -48,9 +60,11 @@ $colorInfoBubbleBg: #ddd; $colorThumbsBubbleFg: lighten($colorBodyFg, 10%); $colorThumbsBubbleBg: lighten($colorBodyBg, 10%); // Overlay -$colorOvrBlocker: rgba(black, 0.7); -$colorOvrBg: pullForward($colorBodyBg, 10%); +$colorOvrBlocker: rgba(black, 0.7);// +$colorOvrBg: $colorBodyBg; $colorOvrFg: $colorBodyFg; +$colorOvrBtnBg: pullForward($colorOvrBg, 40%); +$colorOvrBtnFg: #fff; // Items $colorItemBg: $colorBtnBg; //pullForward($colorBodyBg, 15%); $colorItemFg: $colorBtnFg; //lighten($colorItemBg, 20%); @@ -78,9 +92,15 @@ $colorItemTreeVC: $colorBodyFg; $colorItemTreeSelectedVC: $colorBodyBg; $shdwItemTreeIcon: none; // Scrollbar -$scrollbarTrackColorBg: rgba(#000, 0.4); +$scrollbarTrackSize: 10px; +$scrollbarTrackColorBg: rgba(#000, 0.5); +$scrollbarThumbColor: darken($colorBodyBg, 25%);// +$scrollbarThumbColorHov: $colorKey; // Splitter $splitterShdw: none; $colorSplitterInterior: $colorBodyBg; $colorSplitterHover: $colorKey; -$colorGrippyInteriorHover: $colorBodyBg; \ No newline at end of file +$colorGrippyInteriorHover: $colorBodyBg; + +/********************************* MOBILE */ +$colorMobilePaneLeft: darken($colorBodyBg, 2%); \ No newline at end of file diff --git a/platform/commonUI/themes/snow/res/sass/_controls.scss b/platform/commonUI/themes/snow/res/sass/_controls.scss index e06fbf1046..4ff28bbfaa 100644 --- a/platform/commonUI/themes/snow/res/sass/_controls.scss +++ b/platform/commonUI/themes/snow/res/sass/_controls.scss @@ -1,8 +1,5 @@ .s-btn { &.major { - $bg: $colorKey; - $fg: lighten($bg, 70%); - @include btnSubtle($bg, $fg, $fg, 0); .title-label { text-transform: uppercase; } diff --git a/platform/commonUI/themes/snow/res/sass/_mixins.scss b/platform/commonUI/themes/snow/res/sass/_mixins.scss index 5da0a0d4f9..be6918437d 100644 --- a/platform/commonUI/themes/snow/res/sass/_mixins.scss +++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss @@ -1,4 +1,4 @@ -@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false, $contrastRatioPercent: 20%) { +@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg) { $hovRatio: 5%; $bgBase: $bg; //pullForward($bg, $contrastRatioPercent); $fgBase: $fg; //pushBack($bg, $contrastRatioPercent); @@ -6,35 +6,22 @@ background-color: $bgBase; @include border-radius($controlCr); @include box-sizing(border-box); - //@include boxShdwSubtle(); - //border: none; - //border-top: 1px solid lighten($gradC1, 2%); display: inline-block; - @if $hover == true { - &:not(.disabled):hover { - background-color: $colorKey; //pullForward($bgBase, $hovRatio); - //color: pushBack($fgBase, $hovRatio); - } - } } -@mixin btnSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $ic: $colorBtnIcon, $contrastRatioPercent: 20%) { - // $ic: Icon color +@mixin btnSubtle($bg: $colorBtnBg, $bgHov: none, $fg: $colorBtnFg, $ic: $colorBtnIcon) { + @include user-select(none); @include border-radius($controlCr); - @include containerSubtle($bg, $fg, true, 30%); + @include containerSubtle($bg, $fg); color: $ic; .icon { color: $ic; } -/* &:not(.disabled) { - &:not(.paused) { - &:hover { - .icon { - color: pullForward($ic, $ltGamma); - } - } - } - }*/ + @if $bgHov != none { + &:not(.disabled):hover { + background-color: $bgHov; + } + } } @function pullForward($c: $colorBodyBg, $p: 20%) {