diff --git a/bundles.json b/bundles.json index 2860dbde5e..3de757f1c6 100644 --- a/bundles.json +++ b/bundles.json @@ -8,7 +8,7 @@ "platform/commonUI/dialog", "platform/commonUI/general", "platform/commonUI/inspect", - "platform/commonUI/themes/espresso", + "platform/commonUI/themes/snow", "platform/containment", "platform/execution", "platform/telemetry", diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 1987619527..805882e572 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -145,6 +145,31 @@ background-repeat: $repeatDir; } +@mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) { + background-color: $bg; + @include border-radius($controlCr); + @include box-sizing(border-box); + color: $fg; + display: inline-block; +} + +@mixin btnBase($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { + @include user-select(none); + .icon { + color: $ic; + } + @include desktop { + @if $bgHov != none { + &:not(.disabled):hover { + background: $bgHov; + .icon { + color: lighten($ic, $ltGamma); + } + } + } + } +} + @mixin sliderTrack($bg: $scrollbarTrackColorBg) { //$b: 1px solid lighten($bg, 30%); @include border-radius(2px); diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index b2f98860e9..f12eaaf70d 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -263,7 +263,7 @@ label.checkbox.custom { .title-label { //@include test(green, 0.9); @include ellipsize(); - color: lighten($colorBodyFg, 40%); + //color: pushBack($colorBodyFg, 40%); @include webkitProp(flex, '0 1 auto'); padding-right: 0.35em; // For context arrow. Done with em's so pad is relative to the scale of the text. //position: relative; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 47ac9bdafb..36fa9a253f 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -975,7 +975,7 @@ mct-container { right: 0; width: auto; height: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 185, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -999,7 +999,7 @@ mct-container { top: 2px; left: 5px; right: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 207, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1029,7 +1029,7 @@ mct-container { bottom: 0; cursor: col-resize; width: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 185, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1053,7 +1053,7 @@ mct-container { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 207, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1374,118 +1374,109 @@ mct-container { padding: 0 2.5px; } /* 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; + 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; + color: #fff; + display: inline-block; 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-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; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } + /* line 159, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major .icon, .major.s-menu .icon, .major.select .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 164, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .major.select:not(.disabled):hover { + background: linear-gradient(#1ac6ff, #00bfff); } + /* line 166, ../../../../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 { + color: white; } } + /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn:not(.major), .s-menu:not(.major), .select:not(.major) { + background-color: #454545; -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; + color: #999; 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; 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); + -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; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } + /* line 159, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major) .icon, .s-menu:not(.major) .icon, .select: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 164, ../../../../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 { + background: linear-gradient(#6b6b6b, #5e5e5e); } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover .icon, .s-menu:not(.major):not(.disabled):hover .icon, .select:not(.major):not(.disabled):hover .icon { + color: #33ccff; } } + /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.paused, .paused.s-menu, .paused.select { + 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; - -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; + color: #fff; display: inline-block; - 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 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; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RlN2QwMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2M1NmYwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #de7d01), color-stop(100%, #c56f01)); background-image: -moz-linear-gradient(#de7d01, #c56f01); background-image: -webkit-linear-gradient(#de7d01, #c56f01); background-image: linear-gradient(#de7d01, #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; -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 */ + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } + /* line 159, ../../../../general/res/sass/_mixins.scss */ .s-btn.paused .icon, .paused.s-menu .icon, .paused.select .icon { color: #fff; } - /* 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; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../general/res/sass/_mixins.scss */ + .s-btn.paused:not(.disabled):hover, .paused.s-menu:not(.disabled):hover, .paused.select:not(.disabled):hover { + background: linear-gradient(#fe9815, #f88c01); } + /* line 166, ../../../../general/res/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"; } @@ -1882,7 +1873,6 @@ label.checkbox.custom { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: white; flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } @@ -1933,33 +1923,29 @@ 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; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzMzMzMzMyIvPjwvbGluZWFyR3JhZGllbnQ+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-color: #333; -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; + color: #999; + display: inline-block; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzMzMzMzMyIvPjwvbGluZWFyR3JhZGllbnQ+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); -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; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; - color: #999; cursor: ew-resize; position: absolute; height: 100%; @@ -1968,10 +1954,17 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 27, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/sass/_mixins.scss */ .slider .knob .icon { color: #0099cc; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../general/res/sass/_mixins.scss */ + .slider .knob:not(.disabled):hover { + background: linear-gradient(#595959, #4d4d4d); } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .slider .knob:not(.disabled):hover .icon { + color: #33ccff; } } + /* line 185, ../../../../general/res/sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1995,7 +1988,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 207, ../../../../general/res/sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2164,24 +2157,24 @@ label.checkbox.custom { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - 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)); - background-image: -moz-linear-gradient(#7a7a7a, #6e6e6e); - background-image: -webkit-linear-gradient(#7a7a7a, #6e6e6e); - background-image: linear-gradient(#7a7a7a, #6e6e6e); + background-color: #6e6e6e; -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; + color: white; + display: inline-block; + 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)); + background-image: -moz-linear-gradient(#7a7a7a, #6e6e6e); + background-image: -webkit-linear-gradient(#7a7a7a, #6e6e6e); + background-image: linear-gradient(#7a7a7a, #6e6e6e); -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.1) 0 1px 2px; display: block; padding: 3px 0; @@ -2191,7 +2184,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 319, ../../../../general/res/sass/_mixins.scss */ + /* line 345, ../../../../general/res/sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2608,7 +2601,7 @@ label.checkbox.custom { padding: 0 3px; position: relative; height: 150px; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../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 */ @@ -2665,7 +2658,7 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2693,7 +2686,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -2720,39 +2713,42 @@ textarea { *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_selects.scss */ .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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzMzMzMzMyIvPjwvbGluZWFyR3JhZGllbnQ+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-color: #333; -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; + color: #999; + display: inline-block; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzMzMzMzMyIvPjwvbGluZWFyR3JhZGllbnQ+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); -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; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; - color: #999; margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 27, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/sass/_mixins.scss */ .select .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 164, ../../../../general/res/sass/_mixins.scss */ + .select:not(.disabled):hover { + background: linear-gradient(#595959, #4d4d4d); } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .select:not(.disabled):hover .icon { + color: #33ccff; } } /* line 30, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; @@ -2823,7 +2819,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../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 */ @@ -2980,7 +2976,7 @@ span.req { padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3943,24 +3939,24 @@ 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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - 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); + background-color: #4d4d4d; -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; + color: #e6e6e6; + display: inline-block; + 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%, #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-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: #e6e6e6; - display: inline-block; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; @@ -4010,42 +4006,39 @@ span.req { padding: 0 15px; } /* 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%, #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); + background-color: gray; -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; + color: #fff; + display: inline-block; + 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%, #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-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 */ + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } + /* line 159, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon, .overlay .bottom-bar .select:not(.major) .icon { color: #fff; } - /* 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; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../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 { + background: linear-gradient(#a6a6a6, #999999); } + /* line 166, ../../../../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 { + color: white; } } /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; @@ -4122,7 +4115,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 319, ../../../../general/res/sass/_mixins.scss */ + /* line 345, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5360,33 +5353,29 @@ 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; - 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); + background-color: #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; + color: #0099cc; + display: inline-block; + 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-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: #0099cc; - display: inline-block; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; - color: #0099cc; box-sizing: border-box; cursor: pointer; float: left; @@ -5395,15 +5384,16 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 27, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } - /* 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; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover { + background: linear-gradient(#666666, #595959); } + /* line 166, ../../../../general/res/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; } @@ -5508,37 +5498,40 @@ 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; - 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); + 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; + color: #999; + display: inline-block; + 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-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; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; - color: #999; color: #80dfff; } - /* line 27, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .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 164, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item.selected:not(.disabled):hover { + background: linear-gradient(#1ac6ff, #00bfff); } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item.selected:not(.disabled):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; } diff --git a/platform/commonUI/themes/espresso/res/sass/_mixins.scss b/platform/commonUI/themes/espresso/res/sass/_mixins.scss index 53baf97e3c..cf19f56e2a 100644 --- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss +++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss @@ -1,41 +1,14 @@ @mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { - $ltnRatio: 7%; - $gradRatio: 5%; - $hovRatio: 7%; - $bgBase: $bg; //pullForward($bg, $ltnRatio); - $fgBase: $fg; // pullForward($fg, $ltnRatio); - $gradC1: lighten($bgBase, $gradRatio); // Container should be lighter higher up - $gradC2: $bgBase; - $cInvokeBase: #fff; - - @include background-image(linear-gradient($gradC1, $gradC2)); - @include border-radius($controlCr); - @include box-sizing(border-box); + @include containerBase($bg, $fg); + @include background-image(linear-gradient(lighten($bg, 5%), $bg)); @include boxShdwSubtle(); - border: none; - //border-top: 1px solid lighten($gradC1, 2%); - color: $fg; - display: inline-block;// } @mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { - @include user-select(none); - @include border-radius($controlCr); @include containerSubtle($bg, $fg); + @include btnBase($bg, linear-gradient(lighten($bg, 15%), lighten($bg, 10%)), $fg, $ic); @include text-shadow(rgba(black, 0.3) 0 1px 1px); - color: $fg; - .icon { - color: $ic; - } - @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 2dedabb03a..dbf1629d51 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -972,7 +972,7 @@ mct-container { right: 0; width: auto; height: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 185, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -996,7 +996,7 @@ mct-container { top: 2px; left: 5px; right: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 207, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1026,7 +1026,7 @@ mct-container { bottom: 0; cursor: col-resize; width: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 185, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1050,7 +1050,7 @@ mct-container { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 207, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1371,13 +1371,6 @@ mct-container { padding: 0 2.5px; } /* 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: 4px; -webkit-border-radius: 4px; @@ -1385,23 +1378,24 @@ mct-container { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + color: #fff; display: inline-block; - color: #fff; } - /* line 17, ../sass/_mixins.scss */ - .s-btn.major .icon, .major.s-menu .icon, .major.select .icon { - color: #fff; } - /* 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; + user-select: none; } + /* line 159, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major .icon, .major.s-menu .icon, .major.select .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 164, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover, .major.select:not(.disabled):hover { + background: #0099cc; } + /* line 166, ../../../../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 { + color: white; } } + /* line 94, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn:not(.major), .s-menu:not(.major), .select:not(.major) { background-color: #a3a3a3; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1409,23 +1403,24 @@ mct-container { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + color: #fff; 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; + user-select: none; } + /* line 159, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major) .icon, .s-menu:not(.major) .icon, .select: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 164, ../../../../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 { + background: #0099cc; } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover .icon, .s-menu:not(.major):not(.disabled):hover .icon, .select:not(.major):not(.disabled):hover .icon { + color: white; } } + /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.paused, .paused.s-menu, .paused.select { background-color: #c56f01; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1433,14 +1428,22 @@ mct-container { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + color: #fff; display: inline-block; - color: #fff; } - /* line 17, ../sass/_mixins.scss */ + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; } + /* line 159, ../../../../general/res/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; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../general/res/sass/_mixins.scss */ + .s-btn.paused:not(.disabled):hover, .paused.s-menu:not(.disabled):hover, .paused.select:not(.disabled):hover { + background: #0099cc; } + /* line 166, ../../../../general/res/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"; } @@ -1837,7 +1840,6 @@ label.checkbox.custom { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: #cccccc; flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } @@ -1888,13 +1890,6 @@ 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: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; background-color: #a3a3a3; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1902,8 +1897,12 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - display: inline-block; color: #fff; + display: inline-block; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; cursor: ew-resize; position: absolute; height: 100%; @@ -1912,10 +1911,17 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 17, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/sass/_mixins.scss */ .slider .knob .icon { color: #fff; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../general/res/sass/_mixins.scss */ + .slider .knob:not(.disabled):hover { + background: #0099cc; } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .slider .knob:not(.disabled):hover .icon { + color: white; } } + /* line 185, ../../../../general/res/sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1939,7 +1945,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 207, ../../../../general/res/sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2115,6 +2121,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + color: #4d4d4d; display: inline-block; -moz-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; @@ -2127,7 +2134,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 319, ../../../../general/res/sass/_mixins.scss */ + /* line 345, ../../../../general/res/sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2544,7 +2551,7 @@ label.checkbox.custom { padding: 0 3px; position: relative; height: 150px; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../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 */ @@ -2601,7 +2608,7 @@ input[type="text"] { color: #666; outline: none; padding: 0 3px; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2629,7 +2636,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -2656,13 +2663,6 @@ textarea { *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_selects.scss */ .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; @@ -2670,14 +2670,25 @@ textarea { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - display: inline-block; color: #fff; + display: inline-block; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 17, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/sass/_mixins.scss */ .select .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 164, ../../../../general/res/sass/_mixins.scss */ + .select:not(.disabled):hover { + background: #0099cc; } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .select:not(.disabled):hover .icon { + color: white; } } /* line 30, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; @@ -2748,7 +2759,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../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 +2916,7 @@ span.req { padding: 0 3px; background: #f7f7f7; border-bottom: 1px solid white; } - /* line 270, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3875,6 +3886,7 @@ span.req { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + color: #666; display: inline-block; -moz-border-radius: 12px; -webkit-border-radius: 12px; @@ -3925,13 +3937,6 @@ span.req { padding: 0 15px; } /* 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; @@ -3939,14 +3944,22 @@ span.req { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + color: #fff; display: inline-block; - color: #fff; } - /* line 17, ../sass/_mixins.scss */ + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; } + /* line 159, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon, .overlay .bottom-bar .select:not(.major) .icon { color: #fff; } - /* 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; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../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 { + background: #0099cc; } + /* line 166, ../../../../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 { + color: white; } } /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; @@ -4023,7 +4036,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 319, ../../../../general/res/sass/_mixins.scss */ + /* line 345, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5260,13 +5273,6 @@ 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: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; background-color: #a3a3a3; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -5274,8 +5280,12 @@ table { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - display: inline-block; color: #fff; + display: inline-block; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; box-sizing: border-box; cursor: pointer; float: left; @@ -5284,12 +5294,16 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 17, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/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; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 164, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover { + background: #0099cc; } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover .icon { + color: white; } } /* line 47, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: deepskyblue; } @@ -5393,13 +5407,6 @@ 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: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; background-color: #0099cc; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -5407,12 +5414,23 @@ table { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - display: inline-block; color: #fff; + display: inline-block; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; color: #80dfff; } - /* line 17, ../sass/_mixins.scss */ + /* line 159, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .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 164, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item.selected:not(.disabled):hover { + background: #0099cc; } + /* line 166, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item.selected:not(.disabled):hover .icon { + color: white; } } /* 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; } diff --git a/platform/commonUI/themes/snow/res/sass/_mixins.scss b/platform/commonUI/themes/snow/res/sass/_mixins.scss index be6918437d..ddf80cb80c 100644 --- a/platform/commonUI/themes/snow/res/sass/_mixins.scss +++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss @@ -1,27 +1,10 @@ @mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg) { - $hovRatio: 5%; - $bgBase: $bg; //pullForward($bg, $contrastRatioPercent); - $fgBase: $fg; //pushBack($bg, $contrastRatioPercent); - - background-color: $bgBase; - @include border-radius($controlCr); - @include box-sizing(border-box); - display: inline-block; + @include containerBase($bg, $fg); } @mixin btnSubtle($bg: $colorBtnBg, $bgHov: none, $fg: $colorBtnFg, $ic: $colorBtnIcon) { - @include user-select(none); - @include border-radius($controlCr); - @include containerSubtle($bg, $fg); - color: $ic; - .icon { - color: $ic; - } - @if $bgHov != none { - &:not(.disabled):hover { - background-color: $bgHov; - } - } + @include containerSubtle($bg, $fg); + @include btnBase($bg, $colorKey, $fg, $ic); } @function pullForward($c: $colorBodyBg, $p: 20%) { diff --git a/platform/commonUI/themes/snow/res/sass/theme-snow.scss b/platform/commonUI/themes/snow/res/sass/theme-snow.scss index 703db6bed9..2fa943f1fe 100644 --- a/platform/commonUI/themes/snow/res/sass/theme-snow.scss +++ b/platform/commonUI/themes/snow/res/sass/theme-snow.scss @@ -33,7 +33,7 @@ @import "../../../../general/res/sass/mobile/constants"; @import "constants"; -@import "../../../../general/res/sass/main"; +@import "../../../../general/res/sass/main"; // @import "controls";