From 9fdb9f0170c72913a0e77165929b01108ca8c180 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 16 Sep 2015 16:59:27 -0700 Subject: [PATCH] [Frontend/PLATFORM] Cherry picking from platform changes in vista65 open #95 vista #65 Style mods for selects; (cherry picked from commit 8b2c4c6) --- .../commonUI/general/res/sass/_mixins.scss | 30 +- .../general/res/sass/controls/_menus.scss | 8 +- .../general/res/sass/forms/_selects.scss | 13 +- .../espresso/res/css/theme-espresso.css | 300 ++++++++---------- .../themes/espresso/res/sass/_constants.scss | 4 + .../themes/snow/res/css/theme-snow.css | 292 ++++++++--------- .../themes/snow/res/sass/_constants.scss | 2 + 7 files changed, 295 insertions(+), 354 deletions(-) diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 528f965cff..0a79735a60 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -303,31 +303,15 @@ padding: 0 $interiorMarginSm; } - - -/* - -@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 contextArrow() { + @include text-shadow(none); + content: '\76'; + display: inline-block; + font-family: 'symbolsfont'; + margin-left: $interiorMarginSm; + vertical-align: top; } -@mixin nice-input($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include input-base($bg, $fg); - padding: 0 $interiorMarginSm; -} -*/ - - @mixin nice-textarea($bg: $colorBodyBg, $fg: $colorBodyFg) { @include input-base($bg, $fg); padding: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 32fc9af7ee..d9aecfd1c8 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -38,14 +38,10 @@ &:after { // Adds the downward facing 'context available / invoke menu' arrow element + @include contextArrow(); color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent)); - content: '\76'; - display: inline-block; - font-family: 'symbolsfont'; - margin-left: $interiorMarginSm; - @include text-shadow(none); - vertical-align: top; } + &.create-btn { .title-label { font-size: 1rem; diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss index 3f283c04e7..2eda20dd6c 100644 --- a/platform/commonUI/general/res/sass/forms/_selects.scss +++ b/platform/commonUI/general/res/sass/forms/_selects.scss @@ -20,20 +20,18 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .select { - @include btnSubtle(); - @extend .s-menu; - //cursor: pointer; - //display: inline-block; + @include btnSubtle($colorSelectBg); margin: 0 0 2px 2px; // Needed to avoid dropshadow from being clipped by parent containers + padding: 0 $interiorMargin; overflow: hidden; position: relative; select { @include appearance(none); @include box-sizing(border-box); background: none; - color: $colorBtnFg; + color: $colorSelectFg; + cursor: pointer; border: none !important; - //cursor: pointer; padding: 4px 25px 2px 0px; width: 120%; option { @@ -41,7 +39,8 @@ } } &:after { - //color: $colorKey; + @include contextArrow(); + color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent)); //content:"v"; //display: block; //font-family: 'symbolsfont'; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 6eac93ae8b..71750ffb34 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -98,27 +98,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, * at runtime from the About dialog for additional information. *****************************************************************************/ /*********************************************** CONTROLS, 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 @@ -394,7 +373,7 @@ mct-container { display: block; } /* line 97, ../../../../general/res/sass/_global.scss */ -.abs, .s-menu span.l-click-area, .select span.l-click-area { +.abs, .s-menu span.l-click-area { position: absolute; top: 0; right: 0; @@ -464,7 +443,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, .select span.l-about.l-click-area { +.l-about.abs, .s-menu span.l-about.l-click-area { overflow: auto; } /* line 31, ../../../../general/res/sass/_about.scss */ .l-about .l-logo-holder { @@ -514,7 +493,7 @@ 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 .select { + .s-about .s-btn, .s-about .s-menu { line-height: 2em; } /* line 85, ../../../../general/res/sass/_about.scss */ .s-about .l-licenses-software .l-license-software { @@ -555,7 +534,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, .select span.l-standalone.l-click-area { +.abs.l-standalone, .s-menu span.l-standalone.l-click-area { padding: 5% 20%; } /* line 29, ../../../../general/res/sass/_text.scss */ @@ -639,7 +618,7 @@ mct-container { display: inline-block; } /* line 55, ../../../../general/res/sass/_icons.scss */ -.s-menu .invoke-menu, .select .invoke-menu, +.s-menu .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } @@ -1275,7 +1254,7 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 25, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu, .select { +.s-btn, .s-menu { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1290,20 +1269,23 @@ mct-container { padding: 0 7.5px; font-size: 0.7rem; } /* line 35, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .icon, .s-menu .icon, .select .icon { + .s-btn .icon, .s-menu .icon { font-size: 0.8rem; color: #0099cc; } /* line 40, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .title-label, .s-menu .title-label, .select .title-label { + .s-btn .title-label, .s-menu .title-label { vertical-align: top; } /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.sm, .sm.s-menu, .sm.select { - padding: 0 5px; } + .s-btn.lg, .lg.s-menu { + font-size: 1rem; } /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.vsm, .vsm.s-menu, .vsm.select { - padding: 0 2.5px; } + .s-btn.sm, .sm.s-menu { + padding: 0 5px; } /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.major, .major.s-menu, .major.select { + .s-btn.vsm, .vsm.s-menu { + padding: 0 2.5px; } + /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.major, .major.s-menu { background-color: #0099cc; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1332,17 +1314,17 @@ mct-container { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major .icon, .major.s-menu .icon, .major.select .icon { + .s-btn.major .icon, .major.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .major.select:not(.disabled):hover { + .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover > .icon, .major.s-menu:not(.disabled):hover > .icon, .major.select:not(.disabled):hover > .icon { + .s-btn.major:not(.disabled):hover > .icon, .major.s-menu:not(.disabled):hover > .icon { color: white; } } - /* line 58, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn:not(.major), .s-menu:not(.major), .select:not(.major) { + /* line 62, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn:not(.major), .s-menu:not(.major) { background-color: #454545; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1371,20 +1353,20 @@ mct-container { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major) .icon, .s-menu:not(.major) .icon, .select:not(.major) .icon { + .s-btn:not(.major) .icon, .s-menu:not(.major) .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover, .select:not(.major):not(.disabled):hover { + .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon, .select:not(.major):not(.disabled):hover > .icon { + .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon { color: #33ccff; } } - /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before, .pause-play.select .icon:before { + /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before { content: "\0000F1"; } - /* line 70, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused, .pause-play.paused.s-menu, .pause-play.paused.select { + /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused, .pause-play.paused.s-menu { background-color: #c56f01; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1413,17 +1395,17 @@ mct-container { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon, .pause-play.paused.select .icon { + .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu:not(.disabled):hover, .pause-play.paused.select:not(.disabled):hover { + .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu:not(.disabled):hover { background: linear-gradient(#fe9815, #f88c01); } /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon, .pause-play.paused.select:not(.disabled):hover > .icon { + .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon { color: white; } } - /* line 72, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon, .pause-play.paused.select .icon { + /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon { -moz-animation-name: pulse; -webkit-animation-name: pulse; animation-name: pulse; @@ -1439,24 +1421,24 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu .icon :before, .pause-play.paused.select .icon :before { + /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu .icon :before { content: "\0000EF"; } - /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before, .show-thumbs.select .icon:before { + /* line 86, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before { content: "\000039"; } -/* line 88, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 92, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .s-btn, .l-btn-set .s-menu, .l-btn-set .select { + /* line 98, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .s-btn, .l-btn-set .s-menu { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 100, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .first .s-btn, .l-btn-set .first .s-menu, .l-btn-set .first .select { + /* line 104, ../../../../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; @@ -1464,8 +1446,8 @@ mct-container { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 107, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .last .s-btn, .l-btn-set .last .s-menu, .l-btn-set .last .select { + /* line 111, ../../../../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; @@ -1473,8 +1455,8 @@ mct-container { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 114, ../../../../general/res/sass/controls/_buttons.scss */ -.paused:not(.s-btn):not(.s-menu):not(.select) { +/* line 118, ../../../../general/res/sass/controls/_buttons.scss */ +.paused:not(.s-btn):not(.s-menu) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -1762,7 +1744,7 @@ label.checkbox.custom { margin-left: 0; } /* line 208, ../../../../general/res/sass/controls/_controls.scss */ -.s-menu label.checkbox.custom, .select label.checkbox.custom { +.s-menu label.checkbox.custom { margin-left: 5px; } /* line 213, ../../../../general/res/sass/controls/_controls.scss */ @@ -2073,37 +2055,37 @@ label.checkbox.custom { *****************************************************************************/ /******************************************************** MENU BUTTONS */ /* line 31, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .icon, .select .icon { +.s-menu .icon { font-size: 120%; } /* line 35, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .title-label, .select .title-label { +.s-menu .title-label { margin-left: 3px; } /* line 39, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu:after, .select:after { - color: rgba(255, 255, 255, 0.2); +.s-menu:after { + text-shadow: none; content: '\76'; display: inline-block; font-family: 'symbolsfont'; margin-left: 3px; - text-shadow: none; - vertical-align: top; } -/* line 50, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu.create-btn .title-label, .create-btn.select .title-label { + vertical-align: top; + color: rgba(255, 255, 255, 0.2); } +/* line 46, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu.create-btn .title-label { font-size: 1rem; } -/* line 58, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .menu, .select .menu { +/* line 54, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu .menu { left: 0; text-align: left; } - /* line 61, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu .menu .ui-symbol.icon, .select .menu .ui-symbol.icon { + /* line 57, ../../../../general/res/sass/controls/_menus.scss */ + .s-menu .menu .ui-symbol.icon { width: 12px; } /******************************************************** MENUS THEMSELVES */ -/* line 68, ../../../../general/res/sass/controls/_menus.scss */ +/* line 64, ../../../../general/res/sass/controls/_menus.scss */ .menu-element { cursor: pointer; position: relative; } - /* line 74, ../../../../general/res/sass/controls/_menus.scss */ + /* line 70, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2131,16 +2113,16 @@ label.checkbox.custom { padding: 3px 0; position: absolute; z-index: 10; } - /* line 83, ../../../../general/res/sass/controls/_menus.scss */ + /* line 79, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul { margin: 0; padding: 0; } - /* line 345, ../../../../general/res/sass/_mixins.scss */ + /* line 329, ../../../../general/res/sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; padding: 0; } - /* line 85, ../../../../general/res/sass/controls/_menus.scss */ + /* line 81, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -2151,70 +2133,70 @@ label.checkbox.custom { padding: 3px 10px 3px 30px; position: relative; white-space: nowrap; } - /* line 93, ../../../../general/res/sass/controls/_menus.scss */ + /* line 89, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:first-child { border: none; } - /* line 96, ../../../../general/res/sass/controls/_menus.scss */ + /* line 92, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:hover { background: #878787; color: #fff; } - /* line 99, ../../../../general/res/sass/controls/_menus.scss */ + /* line 95, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:hover .icon { color: #fff; } - /* line 103, ../../../../general/res/sass/controls/_menus.scss */ + /* line 99, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon { left: 10px; } - /* line 110, ../../../../general/res/sass/controls/_menus.scss */ + /* line 106, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu, .menu-element .context-menu, .menu-element .checkbox-menu, .menu-element .super-menu { pointer-events: auto; } - /* line 116, ../../../../general/res/sass/controls/_menus.scss */ + /* line 112, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li a, .menu-element .context-menu ul li a, .menu-element .checkbox-menu ul li a, .menu-element .super-menu ul li a { color: white; } - /* line 119, ../../../../general/res/sass/controls/_menus.scss */ + /* line 115, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li .icon, .menu-element .context-menu ul li .icon, .menu-element .checkbox-menu ul li .icon, .menu-element .super-menu ul li .icon { color: #24c8ff; } - /* line 122, ../../../../general/res/sass/controls/_menus.scss */ + /* line 118, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon, .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 134, ../../../../general/res/sass/controls/_menus.scss */ + /* line 130, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li { padding-left: 50px; } - /* line 136, ../../../../general/res/sass/controls/_menus.scss */ + /* line 132, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox { position: absolute; left: 5px; top: 0.53333rem; } - /* line 141, ../../../../general/res/sass/controls/_menus.scss */ + /* line 137, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox em { height: 0.7rem; width: 0.7rem; } - /* line 144, ../../../../general/res/sass/controls/_menus.scss */ + /* line 140, ../../../../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 152, ../../../../general/res/sass/controls/_menus.scss */ + /* line 148, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .type-icon { left: 25px; } - /* line 158, ../../../../general/res/sass/controls/_menus.scss */ + /* line 154, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu { display: block; width: 500px; height: 480px; } - /* line 166, ../../../../general/res/sass/controls/_menus.scss */ + /* line 162, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: hidden; position: absolute; @@ -2224,12 +2206,12 @@ label.checkbox.custom { left: 5px; width: auto; height: auto; } - /* line 169, ../../../../general/res/sass/controls/_menus.scss */ + /* line 165, ../../../../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 171, ../../../../general/res/sass/controls/_menus.scss */ + /* line 167, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid #878787; left: 0; @@ -2238,20 +2220,20 @@ label.checkbox.custom { width: 50%; overflow-x: hidden; overflow-y: auto; } - /* line 181, ../../../../general/res/sass/controls/_menus.scss */ + /* line 177, ../../../../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 188, ../../../../general/res/sass/controls/_menus.scss */ + /* line 184, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: auto; right: 0; padding: 25px; width: 50%; } - /* line 198, ../../../../general/res/sass/controls/_menus.scss */ + /* line 194, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.icon { color: white; position: relative; @@ -2261,40 +2243,40 @@ label.checkbox.custom { line-height: 150px; margin-bottom: 25px; text-align: center; } - /* line 209, ../../../../general/res/sass/controls/_menus.scss */ + /* line 205, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.title { color: white; font-size: 1.2em; margin-bottom: 0.5em; } - /* line 214, ../../../../general/res/sass/controls/_menus.scss */ + /* line 210, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.description { color: white; font-size: 0.8em; line-height: 1.5em; } - /* line 223, ../../../../general/res/sass/controls/_menus.scss */ + /* line 219, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu, .menu-element .checkbox-menu { font-size: 0.80rem; } -/* line 228, ../../../../general/res/sass/controls/_menus.scss */ +/* line 224, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 70; } - /* line 234, ../../../../general/res/sass/controls/_menus.scss */ + /* line 230, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 241, ../../../../general/res/sass/controls/_menus.scss */ + /* line 237, ../../../../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 244, ../../../../general/res/sass/controls/_menus.scss */ + /* line 240, ../../../../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 249, ../../../../general/res/sass/controls/_menus.scss */ +/* line 245, ../../../../general/res/sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; @@ -2664,7 +2646,7 @@ textarea { *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_selects.scss */ .select { - background-color: #333; + background-color: #454545; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -2673,12 +2655,12 @@ textarea { box-sizing: border-box; color: #999; display: inline-block; - 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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+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%, #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); -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; @@ -2692,6 +2674,7 @@ textarea { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; margin: 0 0 2px 2px; + padding: 0 5px; overflow: hidden; position: relative; } /* line 272, ../../../../general/res/sass/_mixins.scss */ @@ -2700,11 +2683,11 @@ textarea { @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover { - background: linear-gradient(#595959, #4d4d4d); } + background: linear-gradient(#6b6b6b, #5e5e5e); } /* line 279, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover > .icon { color: #33ccff; } } - /* line 30, ../../../../general/res/sass/forms/_selects.scss */ + /* line 28, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; -webkit-appearance: none; @@ -2713,14 +2696,22 @@ textarea { box-sizing: border-box; background: none; color: #999; + cursor: pointer; border: none !important; padding: 4px 25px 2px 0px; width: 120%; } - /* line 39, ../../../../general/res/sass/forms/_selects.scss */ + /* line 37, ../../../../general/res/sass/forms/_selects.scss */ .select select option { margin: 5px 0; } - /* line 43, ../../../../general/res/sass/forms/_selects.scss */ + /* line 41, ../../../../general/res/sass/forms/_selects.scss */ .select:after { + text-shadow: none; + content: '\76'; + display: inline-block; + font-family: 'symbolsfont'; + margin-left: 3px; + vertical-align: top; + color: rgba(153, 153, 153, 0.2); position: absolute; right: 5px; top: 0; } @@ -2781,11 +2772,9 @@ textarea { .channel-selector .btns-add-remove { margin-top: 150px; } /* line 39, ../../../../general/res/sass/forms/_channel-selector.scss */ - .channel-selector .btns-add-remove .btn { + .channel-selector .btns-add-remove .s-btn, .channel-selector .btns-add-remove .s-menu { display: block; - font-size: 1.5em; margin-bottom: 5px; - padding: 10px; text-align: center; } /***************************************************************************** @@ -3064,38 +3053,33 @@ 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, .select span.bar.l-click-area { +.bar.abs, .s-menu 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, .select span.bar.left.l-click-area, + .bar.abs.left, .s-menu span.bar.left.l-click-area, .bar.abs .left, - .s-menu span.bar.l-click-area .left, - .select span.bar.l-click-area .left { + .s-menu 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, .select span.bar.right.l-click-area, + .bar.abs.right, .s-menu span.bar.right.l-click-area, .bar.abs .right, - .s-menu span.bar.l-click-area .right, - .select span.bar.l-click-area .right { + .s-menu 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, .select span.bar.right.l-click-area .icon.major, + .bar.abs.right .icon.major, .s-menu span.bar.right.l-click-area .icon.major, .bar.abs .right .icon.major, - .s-menu span.bar.l-click-area .right .icon.major, - .select span.bar.l-click-area .right .icon.major { + .s-menu 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, .select span.bar.l-click-area .l-flex .left, + .bar.abs .l-flex .left, .s-menu span.bar.l-click-area .l-flex .left, .bar.abs .l-flex .right, - .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, + .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, .bar.abs.l-flex .right, - .s-menu span.bar.l-flex.l-click-area .right, - .select span.bar.l-flex.l-click-area .right { + .s-menu span.bar.l-flex.l-click-area .right { width: auto; } /* line 98, ../../../../general/res/sass/user-environ/_layout.scss */ @@ -3233,12 +3217,10 @@ 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 .select span.left.l-click-area, .select .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 .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, - .pane.items .object-browse-bar .select span.right.l-click-area, - .select .pane.items .object-browse-bar span.right.l-click-area { + .s-menu .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 { @@ -3268,17 +3250,13 @@ 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 .select, +.object-browse-bar .s-btn, .object-browse-bar .s-menu, .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 .select, -.tool-bar .s-menu, -.tool-bar .select { +.tool-bar .s-menu { height: 25px; line-height: 25px; vertical-align: top; } @@ -3674,13 +3652,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, .select span.search-holder.l-click-area { +.abs.search-holder, .s-menu 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, .select span.search-holder.active.l-click-area { + .abs.search-holder.active, .s-menu span.search-holder.active.l-click-area { height: auto; bottom: 0; } @@ -3951,14 +3929,14 @@ span.req { height: 30px; text-align: right; } /* line 67, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu, .overlay .bottom-bar .select { + .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } /* line 69, ../../../../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) { + .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: gray; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3987,14 +3965,14 @@ span.req { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon, .overlay .bottom-bar .select:not(.major) .icon { + .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .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 { + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { background: linear-gradient(#a6a6a6, #999999); } /* line 279, ../../../../general/res/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 { + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { @@ -4078,7 +4056,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 345, ../../../../general/res/sass/_mixins.scss */ + /* line 329, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -4333,12 +4311,12 @@ ul.tree { .frame.child-frame.panel:hover { 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, .select .frame > span.object-header.l-click-area { +.frame > .object-header.abs, .s-menu .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, .select .frame > span.object-holder.l-click-area { +.frame > .object-holder.abs, .s-menu .frame > span.object-holder.l-click-area { top: 21px; } /* line 41, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .contents { @@ -4410,7 +4388,7 @@ ul.tree { .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 .select span.buttons-main.l-click-area, .select .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 { bottom: auto; left: auto; } @@ -5642,7 +5620,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 .change-column-width.select { + .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu { -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; @@ -5666,7 +5644,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 .change-column-width.select { + .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu { -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; diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index c4357b8d06..502a672ed6 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -58,6 +58,10 @@ $colorInputFg: pullForward($colorBodyFg, 20%); $colorFormText: rgba(#fff, 0.5); $colorInputIcon: pushBack($colorBodyFg, 15%); +// Selects +$colorSelectBg: $colorBtnBg; +$colorSelectFg: $colorBtnFg; + // Limits and staleness colors $colorTelemFresh: pullForward($colorBodyFg, 20%); $colorTelemStale: pushBack($colorBodyFg, 20%); diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 673b25354b..625440be25 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -98,27 +98,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, * at runtime from the About dialog for additional information. *****************************************************************************/ /*********************************************** CONTROLS, 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 @@ -394,7 +373,7 @@ mct-container { display: block; } /* line 97, ../../../../general/res/sass/_global.scss */ -.abs, .s-menu span.l-click-area, .select span.l-click-area { +.abs, .s-menu span.l-click-area { position: absolute; top: 0; right: 0; @@ -464,7 +443,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, .select span.l-about.l-click-area { +.l-about.abs, .s-menu span.l-about.l-click-area { overflow: auto; } /* line 31, ../../../../general/res/sass/_about.scss */ .l-about .l-logo-holder { @@ -514,7 +493,7 @@ 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 .select { + .s-about .s-btn, .s-about .s-menu { line-height: 2em; } /* line 85, ../../../../general/res/sass/_about.scss */ .s-about .l-licenses-software .l-license-software { @@ -555,7 +534,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, .select span.l-standalone.l-click-area { +.abs.l-standalone, .s-menu span.l-standalone.l-click-area { padding: 5% 20%; } /* line 29, ../../../../general/res/sass/_text.scss */ @@ -639,7 +618,7 @@ mct-container { display: inline-block; } /* line 55, ../../../../general/res/sass/_icons.scss */ -.s-menu .invoke-menu, .select .invoke-menu, +.s-menu .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } @@ -1272,7 +1251,7 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 25, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu, .select { +.s-btn, .s-menu { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1287,20 +1266,23 @@ mct-container { padding: 0 7.5px; font-size: 0.7rem; } /* line 35, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .icon, .s-menu .icon, .select .icon { + .s-btn .icon, .s-menu .icon { font-size: 0.8rem; color: #0099cc; } /* line 40, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .title-label, .s-menu .title-label, .select .title-label { + .s-btn .title-label, .s-menu .title-label { vertical-align: top; } /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.sm, .sm.s-menu, .sm.select { - padding: 0 5px; } + .s-btn.lg, .lg.s-menu { + font-size: 1rem; } /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.vsm, .vsm.s-menu, .vsm.select { - padding: 0 2.5px; } + .s-btn.sm, .sm.s-menu { + padding: 0 5px; } /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.major, .major.s-menu, .major.select { + .s-btn.vsm, .vsm.s-menu { + padding: 0 2.5px; } + /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.major, .major.s-menu { background-color: #0099cc; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1320,17 +1302,17 @@ mct-container { transition: background, 0.25s; text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major .icon, .major.s-menu .icon, .major.select .icon { + .s-btn.major .icon, .major.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .major.select:not(.disabled):hover { + .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover { background: deepskyblue; } /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover > .icon, .major.s-menu:not(.disabled):hover > .icon, .major.select:not(.disabled):hover > .icon { + .s-btn.major:not(.disabled):hover > .icon, .major.s-menu:not(.disabled):hover > .icon { color: white; } } - /* line 58, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn:not(.major), .s-menu:not(.major), .select:not(.major) { + /* line 62, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn:not(.major), .s-menu:not(.major) { background-color: #969696; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1350,20 +1332,20 @@ mct-container { transition: background, 0.25s; text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major) .icon, .s-menu:not(.major) .icon, .select:not(.major) .icon { + .s-btn:not(.major) .icon, .s-menu:not(.major) .icon { color: #eee; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover, .select:not(.major):not(.disabled):hover { + .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover { background: #0099cc; } /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon, .select:not(.major):not(.disabled):hover > .icon { + .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } - /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before, .pause-play.select .icon:before { + /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play .icon:before, .pause-play.s-menu .icon:before { content: "\0000F1"; } - /* line 70, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused, .pause-play.paused.s-menu, .pause-play.paused.select { + /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused, .pause-play.paused.s-menu { background-color: #ff9900; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1383,17 +1365,17 @@ mct-container { transition: background, 0.25s; text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon, .pause-play.paused.select .icon { + .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu:not(.disabled):hover, .pause-play.paused.select:not(.disabled):hover { + .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu:not(.disabled):hover { background: #ffad33; } /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon, .pause-play.paused.select:not(.disabled):hover > .icon { + .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon { color: white; } } - /* line 72, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon, .pause-play.paused.select .icon { + /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon { -moz-animation-name: pulse; -webkit-animation-name: pulse; animation-name: pulse; @@ -1409,24 +1391,24 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu .icon :before, .pause-play.paused.select .icon :before { + /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu .icon :before { content: "\0000EF"; } - /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before, .show-thumbs.select .icon:before { + /* line 86, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu .icon:before { content: "\000039"; } -/* line 88, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 92, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .s-btn, .l-btn-set .s-menu, .l-btn-set .select { + /* line 98, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .s-btn, .l-btn-set .s-menu { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 100, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .first .s-btn, .l-btn-set .first .s-menu, .l-btn-set .first .select { + /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .first .s-btn, .l-btn-set .first .s-menu { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; @@ -1434,8 +1416,8 @@ mct-container { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 107, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .last .s-btn, .l-btn-set .last .s-menu, .l-btn-set .last .select { + /* line 111, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .last .s-btn, .l-btn-set .last .s-menu { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; @@ -1443,8 +1425,8 @@ mct-container { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 114, ../../../../general/res/sass/controls/_buttons.scss */ -.paused:not(.s-btn):not(.s-menu):not(.select) { +/* line 118, ../../../../general/res/sass/controls/_buttons.scss */ +.paused:not(.s-btn):not(.s-menu) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -1732,7 +1714,7 @@ label.checkbox.custom { margin-left: 0; } /* line 208, ../../../../general/res/sass/controls/_controls.scss */ -.s-menu label.checkbox.custom, .select label.checkbox.custom { +.s-menu label.checkbox.custom { margin-left: 5px; } /* line 213, ../../../../general/res/sass/controls/_controls.scss */ @@ -2027,37 +2009,37 @@ label.checkbox.custom { *****************************************************************************/ /******************************************************** MENU BUTTONS */ /* line 31, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .icon, .select .icon { +.s-menu .icon { font-size: 120%; } /* line 35, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .title-label, .select .title-label { +.s-menu .title-label { margin-left: 3px; } /* line 39, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu:after, .select:after { - color: rgba(255, 255, 255, 0.4); +.s-menu:after { + text-shadow: none; content: '\76'; display: inline-block; font-family: 'symbolsfont'; margin-left: 3px; - text-shadow: none; - vertical-align: top; } -/* line 50, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu.create-btn .title-label, .create-btn.select .title-label { + vertical-align: top; + color: rgba(255, 255, 255, 0.4); } +/* line 46, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu.create-btn .title-label { font-size: 1rem; } -/* line 58, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu .menu, .select .menu { +/* line 54, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu .menu { left: 0; text-align: left; } - /* line 61, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu .menu .ui-symbol.icon, .select .menu .ui-symbol.icon { + /* line 57, ../../../../general/res/sass/controls/_menus.scss */ + .s-menu .menu .ui-symbol.icon { width: 12px; } /******************************************************** MENUS THEMSELVES */ -/* line 68, ../../../../general/res/sass/controls/_menus.scss */ +/* line 64, ../../../../general/res/sass/controls/_menus.scss */ .menu-element { cursor: pointer; position: relative; } - /* line 74, ../../../../general/res/sass/controls/_menus.scss */ + /* line 70, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -2079,16 +2061,16 @@ label.checkbox.custom { padding: 3px 0; position: absolute; z-index: 10; } - /* line 83, ../../../../general/res/sass/controls/_menus.scss */ + /* line 79, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul { margin: 0; padding: 0; } - /* line 345, ../../../../general/res/sass/_mixins.scss */ + /* line 329, ../../../../general/res/sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; padding: 0; } - /* line 85, ../../../../general/res/sass/controls/_menus.scss */ + /* line 81, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -2099,70 +2081,70 @@ label.checkbox.custom { padding: 3px 10px 3px 30px; position: relative; white-space: nowrap; } - /* line 93, ../../../../general/res/sass/controls/_menus.scss */ + /* line 89, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:first-child { border: none; } - /* line 96, ../../../../general/res/sass/controls/_menus.scss */ + /* line 92, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:hover { background: #e6e6e6; color: #4d4d4d; } - /* line 99, ../../../../general/res/sass/controls/_menus.scss */ + /* line 95, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li:hover .icon { color: #0099cc; } - /* line 103, ../../../../general/res/sass/controls/_menus.scss */ + /* line 99, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon { left: 10px; } - /* line 110, ../../../../general/res/sass/controls/_menus.scss */ + /* line 106, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu, .menu-element .context-menu, .menu-element .checkbox-menu, .menu-element .super-menu { pointer-events: auto; } - /* line 116, ../../../../general/res/sass/controls/_menus.scss */ + /* line 112, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li a, .menu-element .context-menu ul li a, .menu-element .checkbox-menu ul li a, .menu-element .super-menu ul li a { color: #4d4d4d; } - /* line 119, ../../../../general/res/sass/controls/_menus.scss */ + /* line 115, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li .icon, .menu-element .context-menu ul li .icon, .menu-element .checkbox-menu ul li .icon, .menu-element .super-menu ul li .icon { color: #0099cc; } - /* line 122, ../../../../general/res/sass/controls/_menus.scss */ + /* line 118, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon, .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 134, ../../../../general/res/sass/controls/_menus.scss */ + /* line 130, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li { padding-left: 50px; } - /* line 136, ../../../../general/res/sass/controls/_menus.scss */ + /* line 132, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox { position: absolute; left: 5px; top: 0.53333rem; } - /* line 141, ../../../../general/res/sass/controls/_menus.scss */ + /* line 137, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .checkbox em { height: 0.7rem; width: 0.7rem; } - /* line 144, ../../../../general/res/sass/controls/_menus.scss */ + /* line 140, ../../../../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 152, ../../../../general/res/sass/controls/_menus.scss */ + /* line 148, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .checkbox-menu ul li .type-icon { left: 25px; } - /* line 158, ../../../../general/res/sass/controls/_menus.scss */ + /* line 154, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu { display: block; width: 500px; height: 480px; } - /* line 166, ../../../../general/res/sass/controls/_menus.scss */ + /* line 162, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: hidden; position: absolute; @@ -2172,12 +2154,12 @@ label.checkbox.custom { left: 5px; width: auto; height: auto; } - /* line 169, ../../../../general/res/sass/controls/_menus.scss */ + /* line 165, ../../../../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 171, ../../../../general/res/sass/controls/_menus.scss */ + /* line 167, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid #e6e6e6; left: 0; @@ -2186,20 +2168,20 @@ label.checkbox.custom { width: 50%; overflow-x: hidden; overflow-y: auto; } - /* line 181, ../../../../general/res/sass/controls/_menus.scss */ + /* line 177, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; padding-left: 30px; border-top: none; } - /* line 188, ../../../../general/res/sass/controls/_menus.scss */ + /* line 184, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: auto; right: 0; padding: 25px; width: 50%; } - /* line 198, ../../../../general/res/sass/controls/_menus.scss */ + /* line 194, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.icon { color: #0099cc; position: relative; @@ -2209,40 +2191,40 @@ label.checkbox.custom { line-height: 150px; margin-bottom: 25px; text-align: center; } - /* line 209, ../../../../general/res/sass/controls/_menus.scss */ + /* line 205, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.title { color: #666; font-size: 1.2em; margin-bottom: 0.5em; } - /* line 214, ../../../../general/res/sass/controls/_menus.scss */ + /* line 210, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.description { color: #666; font-size: 0.8em; line-height: 1.5em; } - /* line 223, ../../../../general/res/sass/controls/_menus.scss */ + /* line 219, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .context-menu, .menu-element .checkbox-menu { font-size: 0.80rem; } -/* line 228, ../../../../general/res/sass/controls/_menus.scss */ +/* line 224, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 70; } - /* line 234, ../../../../general/res/sass/controls/_menus.scss */ + /* line 230, ../../../../general/res/sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 241, ../../../../general/res/sass/controls/_menus.scss */ + /* line 237, ../../../../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 244, ../../../../general/res/sass/controls/_menus.scss */ + /* line 240, ../../../../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 249, ../../../../general/res/sass/controls/_menus.scss */ +/* line 245, ../../../../general/res/sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; @@ -2612,7 +2594,7 @@ textarea { *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_selects.scss */ .select { - background-color: #969696; + background-color: #d9d9d9; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; @@ -2631,12 +2613,13 @@ textarea { transition: background, 0.25s; text-shadow: none; margin: 0 0 2px 2px; + padding: 0 5px; overflow: hidden; position: relative; } /* line 272, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #eee; } - /* line 30, ../../../../general/res/sass/forms/_selects.scss */ + /* line 28, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; -webkit-appearance: none; @@ -2644,15 +2627,23 @@ textarea { -webkit-box-sizing: border-box; box-sizing: border-box; background: none; - color: #fff; + color: #666; + cursor: pointer; border: none !important; padding: 4px 25px 2px 0px; width: 120%; } - /* line 39, ../../../../general/res/sass/forms/_selects.scss */ + /* line 37, ../../../../general/res/sass/forms/_selects.scss */ .select select option { margin: 5px 0; } - /* line 43, ../../../../general/res/sass/forms/_selects.scss */ + /* line 41, ../../../../general/res/sass/forms/_selects.scss */ .select:after { + text-shadow: none; + content: '\76'; + display: inline-block; + font-family: 'symbolsfont'; + margin-left: 3px; + vertical-align: top; + color: rgba(102, 102, 102, 0.4); position: absolute; right: 5px; top: 0; } @@ -2713,11 +2704,9 @@ textarea { .channel-selector .btns-add-remove { margin-top: 150px; } /* line 39, ../../../../general/res/sass/forms/_channel-selector.scss */ - .channel-selector .btns-add-remove .btn { + .channel-selector .btns-add-remove .s-btn, .channel-selector .btns-add-remove .s-menu { display: block; - font-size: 1.5em; margin-bottom: 5px; - padding: 10px; text-align: center; } /***************************************************************************** @@ -2996,38 +2985,33 @@ 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, .select span.bar.l-click-area { +.bar.abs, .s-menu 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, .select span.bar.left.l-click-area, + .bar.abs.left, .s-menu span.bar.left.l-click-area, .bar.abs .left, - .s-menu span.bar.l-click-area .left, - .select span.bar.l-click-area .left { + .s-menu 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, .select span.bar.right.l-click-area, + .bar.abs.right, .s-menu span.bar.right.l-click-area, .bar.abs .right, - .s-menu span.bar.l-click-area .right, - .select span.bar.l-click-area .right { + .s-menu 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, .select span.bar.right.l-click-area .icon.major, + .bar.abs.right .icon.major, .s-menu span.bar.right.l-click-area .icon.major, .bar.abs .right .icon.major, - .s-menu span.bar.l-click-area .right .icon.major, - .select span.bar.l-click-area .right .icon.major { + .s-menu 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, .select span.bar.l-click-area .l-flex .left, + .bar.abs .l-flex .left, .s-menu span.bar.l-click-area .l-flex .left, .bar.abs .l-flex .right, - .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, + .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, .bar.abs.l-flex .right, - .s-menu span.bar.l-flex.l-click-area .right, - .select span.bar.l-flex.l-click-area .right { + .s-menu span.bar.l-flex.l-click-area .right { width: auto; } /* line 98, ../../../../general/res/sass/user-environ/_layout.scss */ @@ -3165,12 +3149,10 @@ 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 .select span.left.l-click-area, .select .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 .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, - .pane.items .object-browse-bar .select span.right.l-click-area, - .select .pane.items .object-browse-bar span.right.l-click-area { + .s-menu .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 { @@ -3200,17 +3182,13 @@ 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 .select, +.object-browse-bar .s-btn, .object-browse-bar .s-menu, .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 .select, -.tool-bar .s-menu, -.tool-bar .select { +.tool-bar .s-menu { height: 25px; line-height: 25px; vertical-align: top; } @@ -3606,13 +3584,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, .select span.search-holder.l-click-area { +.abs.search-holder, .s-menu 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, .select span.search-holder.active.l-click-area { + .abs.search-holder.active, .s-menu span.search-holder.active.l-click-area { height: auto; bottom: 0; } @@ -3874,14 +3852,14 @@ span.req { height: 30px; text-align: right; } /* line 67, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu, .overlay .bottom-bar .select { + .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } /* line 69, ../../../../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) { + .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: #969696; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -3901,14 +3879,14 @@ span.req { transition: background, 0.25s; text-shadow: none; } /* line 272, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon, .overlay .bottom-bar .select:not(.major) .icon { + .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 277, ../../../../general/res/sass/_mixins.scss */ - .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 { + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { background: #7d7d7d; } /* line 279, ../../../../general/res/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 { + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { @@ -3992,7 +3970,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 345, ../../../../general/res/sass/_mixins.scss */ + /* line 329, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -4246,12 +4224,12 @@ ul.tree { .frame.child-frame.panel:hover { 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, .select .frame > span.object-header.l-click-area { +.frame > .object-header.abs, .s-menu .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, .select .frame > span.object-holder.l-click-area { +.frame > .object-holder.abs, .s-menu .frame > span.object-holder.l-click-area { top: 21px; } /* line 41, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .contents { @@ -4323,7 +4301,7 @@ ul.tree { .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 .select span.buttons-main.l-click-area, .select .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 { bottom: auto; left: auto; } @@ -5531,7 +5509,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 .change-column-width.select { + .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu { -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; @@ -5555,7 +5533,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 .change-column-width.select { + .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu { -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; @@ -5859,5 +5837,5 @@ table { vertical-align: top; } /* line 3, ../sass/_controls.scss */ -.s-btn.major .title-label, .major.s-menu .title-label, .major.select .title-label { +.s-btn.major .title-label, .major.s-menu .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 770fb94e2f..f1f250baac 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -57,6 +57,8 @@ $colorInputBg: $colorGenBg; $colorInputFg: $colorBodyFg; $colorFormText: pushBack($colorBodyFg, 10%); $colorInputIcon: pushBack($colorBodyFg, 25%); +$colorSelectBg: pushBack($colorBodyFg, 45%); +$colorSelectFg: $colorBodyFg; // Limits and staleness colors// $colorTelemFresh: pullForward($colorBodyFg, 20%);