From 0ddaa52a8ac05619fc33e1b31dc0f7a7b0b796ad Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 16 Feb 2016 18:38:06 -0800 Subject: [PATCH 01/20] [Frontend] Refactor CSS to not use 'desktop' media query open #639 Refactored all usage of @include desktop to use CSS selector body.desktop instead; Still to-do: deal with desktopandtablet usage with hover bubbles and mixins btnBase; --- .../general/res/sass/controls/_buttons.scss | 220 +++-- .../general/res/sass/controls/_controls.scss | 16 +- .../general/res/sass/controls/_messages.scss | 26 +- .../general/res/sass/mobile/_layout.scss | 2 +- .../general/res/sass/mobile/_mixins.scss | 4 + .../commonUI/general/res/sass/tree/_tree.scss | 37 +- .../general/res/sass/user-environ/_frame.scss | 22 +- .../res/sass/user-environ/_layout.scss | 87 +- .../espresso/res/css/theme-espresso.css | 824 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 796 +++++++++-------- 10 files changed, 1001 insertions(+), 1033 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index c999828ee9..de48f9ee02 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -111,156 +111,138 @@ $pad: $interiorMargin * $baseRatio; // Color and styling additionally in _controls.scss } -.mini-tab { +body.desktop.mini-tab { // Meant to be used as pane hide/show control elements in concert with mct-splitter - //@extend .ui-symbol; - @include desktop { - //@include test(green); - $iconH: $uePaneMiniTabH; - $iconW: $uePaneMiniTabW; - $iconInnerLR: 0; - $arwD: 9px; - $arwOffsetX: 0px; - $arwAnimOffsetX: 2px + $iconInnerLR; - $cBg: pullForward($colorBodyBg, 15%); - $cFg: $cBg; + $iconH: $uePaneMiniTabH; + $iconW: $uePaneMiniTabW; + $iconInnerLR: 0; + $arwD: 9px; + $arwOffsetX: 0px; + $arwAnimOffsetX: 2px + $iconInnerLR; + $cBg: pullForward($colorBodyBg, 15%); + $cFg: $cBg; + @include border-radius($basicCr); + @include box-sizing(border-box); + @include trans-prop-nice((color, background-color), 100ms); + color: $cFg; + cursor: pointer; + font-family: symbolsfont; + font-size: $arwD; + display: block; + position: absolute; + line-height: $iconH; + height: $iconH; width: $iconW; + text-align: center; - @include border-radius($basicCr); - //@include boxShdw($shdwBtns); - @include box-sizing(border-box); - @include trans-prop-nice((color, background-color), 100ms); - color: $cFg; - cursor: pointer; - font-family: symbolsfont; - font-size: $arwD; - display: block; - position: absolute; - line-height: $iconH; - height: $iconH; width: $iconW; - text-align: center; + &:hover { + color: $colorKey; + } + &.collapsed { + // State when the pane this element controls has been collapsed + @include btnSubtle($colorBtnBg, $colorKey, $colorBtnFg, $colorBtnIcon); + &:before { opacity: 0; } + &:after { opacity: 1; } &:hover { - //background-color: $cBg; - color: $colorKey; //pullForward($cFg, $ltGamma); + &:before { opacity: 1; } + &:after { opacity: 0; } } - &.collapsed { - // State when the pane this element controls has been collapsed - @include btnSubtle($colorBtnBg, $colorKey, $colorBtnFg, $colorBtnIcon); - &:before { opacity: 0; } - &:after { opacity: 1; } - &:hover { - &:before { opacity: 1; } - &:after { opacity: 0; } - } + } - } + &:before, + &:after { + @include trans-prop-nice((left, right, opacity), 250ms); + display: block; + height: 100%; + position: absolute; + } - &:before, - &:after { - //@include test(); - @include trans-prop-nice((left, right, opacity), 250ms); - display: block; - height: 100%; - position: absolute; - } + &:before { + // Always the arrow icon + width: $arwD; + } + &:after { + // Always icon; content is set in _layout.scss + width: 100%; + text-align: center; + opacity: 0; + } + &.anchor-left { + // |< + text-align: right; &:before { - // Always the arrow icon - //@include test(green); - //font-size: $arwD; - width: $arwD; + content:'\3c'; // Collapse left icon e613 + right: $iconInnerLR; } - &:after { - // Always icon; content is set in _layout.scss - width: 100%; - text-align: center; - opacity: 0; - } - - &.anchor-left { - // |< - text-align: right; - &:before { - content:'\3c'; // Collapse left icon e613 - right: $iconInnerLR; - } - //&:hover:before { right: $arwAnimOffsetX; } - &.collapsed { - @include border-left-radius(0); - text-align: left; - &:before { - content:'\3e'; - left: $iconInnerLR; - } - &:hover:before { left: $arwAnimOffsetX; } - } - } - &.anchor-right { - // >| + &.collapsed { + @include border-left-radius(0); text-align: left; &:before { - content:'\3e'; // Collapse right icon e614 + content:'\3e'; left: $iconInnerLR; } - //&:hover:before { left: $arwAnimOffsetX; } - &.collapsed { - @include border-right-radius(0); - &:before { - text-align: right; - content:'\3c'; - right: $iconInnerLR; - } - &:hover:before { right: $arwAnimOffsetX; } + &:hover:before { left: $arwAnimOffsetX; } + } + } + &.anchor-right { + // >| + text-align: left; + &:before { + content:'\3e'; // Collapse right icon e614 + left: $iconInnerLR; + } + &.collapsed { + @include border-right-radius(0); + &:before { + text-align: right; + content:'\3c'; + right: $iconInnerLR; } + &:hover:before { right: $arwAnimOffsetX; } } } } -.mini-tab-icon { +body.desktop.mini-tab-icon { // Meant to be used as pane hide/show control elements in concert with mct-splitter - //@extend .ui-symbol; - @include desktop { - $d: $uePaneMiniTabW; - //@include trans-prop-nice(transform, 150ms); - color: pullForward($colorBodyBg, 15%); - cursor: pointer; - display: block; - font-family: symbolsfont; - font-size: $d; + $d: $uePaneMiniTabW; + color: pullForward($colorBodyBg, 15%); + cursor: pointer; + display: block; + font-family: symbolsfont; + font-size: $d; + position: absolute; + height: $d; width: $d; + line-height: $d; + overflow: hidden; + word-break: break-all; + + &.collapsed { + $d: $uePaneMiniTabCollapsedW; + width: $d; font-size: $d; + } + + &:before, + &:after { position: absolute; - height: $d; width: $d; - line-height: $d; - overflow: hidden; - word-break: break-all; + display: inherit; + } - &.collapsed { - $d: $uePaneMiniTabCollapsedW; - width: $d; font-size: $d; - } + &:before { + content: '\78'; // X icon + } - &:before, - &:after { - position: absolute; - display: inherit; - } - - &:before { - content: '\78'; // X icon - } - - &:hover { - color: $colorKey; - //@include transform(scale(1.2)); - } + &:hover { + color: $colorKey; } } .l-btn-set { // Buttons that have a very tight conceptual grouping - no internal space between them. // Structure: .btn-set > mct-representation class=first|last > .s-btn - //@include test(red); font-size: 0; // Remove space between s-btn elements due to white space in markup .s-btn { diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index d97a153cff..80ec355cad 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -235,16 +235,16 @@ label.checkbox.custom { font-size: 0.7em; @include webkitProp(flex, '0 0 1'); } +} - @include desktop { +body.desktop .object-header { + .context-available { + @include trans-prop-nice(opacity, 0.25s); + opacity: 0; + } + &:hover { .context-available { - @include trans-prop-nice(opacity, 0.25s); - opacity: 0; - } - &:hover { - .context-available { - opacity: 1; - } + opacity: 1; } } } diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 8bb8337d9c..64085ee237 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -275,17 +275,17 @@ // Message as singleton .t-message-single { @include messageBlock(80px); +} - @include desktop { - .l-message, - .bottom-bar { - @include absPosDefault(); - } +body.desktop .t-message-single { + .l-message, + .bottom-bar { + @include absPosDefault(); + } - .bottom-bar { - top: auto; - height: $ovrFooterH; - } + .bottom-bar { + top: auto; + height: $ovrFooterH; } } @@ -295,7 +295,6 @@ .message-contents { .l-message { - //border-bottom: 1px solid pullForward($colorOvrBg, 20%); @include border-radius($controlCr); background: rgba($colorOvrFg, 0.1); margin-bottom: $interiorMargin; @@ -303,7 +302,6 @@ .message-contents, .bottom-bar { - //@include test(green); position: relative; } @@ -320,8 +318,8 @@ } } } +} - @include desktop { - .message-contents .l-message { margin-right: $interiorMarginLg; } - } +body.desktop .t-message-list { + .message-contents .l-message { margin-right: $interiorMarginLg; } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index 8d0cc15770..3531ccb112 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -156,7 +156,7 @@ } } -@include desktop { +body.desktop { .desktop-hide { display: none; } diff --git a/platform/commonUI/general/res/sass/mobile/_mixins.scss b/platform/commonUI/general/res/sass/mobile/_mixins.scss index 8c35d6a211..a0895222a2 100644 --- a/platform/commonUI/general/res/sass/mobile/_mixins.scss +++ b/platform/commonUI/general/res/sass/mobile/_mixins.scss @@ -78,6 +78,8 @@ // Desktop monitors in any orientation @mixin desktopandtablet { + // Keeping only for legacy - should not be used moving forward + // Use body.desktop, body.tablet instead. @media #{$tabletPortrait}, #{$tabletLandscape}, #{$desktop} { @@ -87,6 +89,8 @@ // Desktop monitors in any orientation @mixin desktop { + // Keeping only for legacy - should not be used moving forward + // Use body.desktop instead. @media #{$desktop} { @content } diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 405a10de7a..5ae3849822 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -63,11 +63,6 @@ ul.tree { @include transform(rotate(90deg)); } } - @include desktop { - &:hover { - color: $colorItemTreeVCHover !important; - } - } } .t-object-label { @@ -94,18 +89,6 @@ ul.tree { } } - &:not(.selected) { - @include desktop { - &:hover { - background: $colorItemTreeHoverBg; - color: $colorItemTreeHoverFg; - .t-item-icon { - color: $colorItemTreeIconHover; - } - } - } - } - &:not(.loading) { cursor: pointer; } @@ -123,6 +106,26 @@ ul.tree { } } +body.desktop { + .tree-item, + .search-result-item { + .view-control { + &:hover { + color: $colorItemTreeVCHover !important; + } + } + &:not(.selected) { + &:hover { + background: $colorItemTreeHoverBg; + color: $colorItemTreeHoverFg; + .t-item-icon { + color: $colorItemTreeIconHover; + } + } + } + } +} + mct-representation { &.s-status-pending { .t-object-label { diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index a88ecb7ee1..64c4dbd69b 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -66,17 +66,6 @@ .view-switcher { z-index: 10; } - // Hide the view switcher by default when it's in an element that's in a frame context - // Frame template is used because we need to target the lowest nested frame - @include desktop { - .view-switcher { - opacity: 0; - } - &:hover .view-switcher { - // Show the view switcher on frame hover - opacity: 1; - } - } } .view-switcher { // Hide the name when the view switcher is in a frame context @@ -85,3 +74,14 @@ } } } + body.desktop .frame.frame-template { + // Hide the view switcher by default when it's in an element that's in a frame context + // Frame template is used because we need to target the lowest nested frame + .view-switcher { + opacity: 0; + } + &:hover .view-switcher { + // Show the view switcher on frame hover + opacity: 1; + } + } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 54da48268c..935dd15682 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -137,48 +137,6 @@ .mini-tab-icon.toggle-pane { z-index: 5; - @include desktop { - $d: $uePaneMiniTabH; - $paneExpandedOffset: $splitterD + $uePaneMiniTabW; - top: $bodyMargin; - height: $d; - line-height: $d; - &:after { - // Always the icon that shows when the pane is collapsed - opacity: 0; - } - &.collapsed { - &:before { - opacity: 0; - } - &:after { - opacity: 1; - } - } - &.toggle-tree.anchor-left { - left: 0; - @include transform(translateX(-1 * $paneExpandedOffset)); - &:after { - content: '\6d'; // Menu 'hamburger' icon - } - &.collapsed { - left: 0; - @include transform(translateX((-1 * $ueCollapsedPaneEdgeM) + $interiorMargin)); - } - &:not(.collapsed):before { - @include trans-prop-nice(opacity, 200ms, 200ms); - } - } - &.toggle-inspect.anchor-right { - right: $bodyMargin; - &:after { - content: '\e615'; // Eye icon - } - &.collapsed { - right: $interiorMargin; - } - } - } } &.items { .object-browse-bar { @@ -190,6 +148,49 @@ } } +body.desktop .pane .mini-tab-icon.toggle-pane { + $d: $uePaneMiniTabH; + $paneExpandedOffset: $splitterD + $uePaneMiniTabW; + top: $bodyMargin; + height: $d; + line-height: $d; + &:after { + // Always the icon that shows when the pane is collapsed + opacity: 0; + } + &.collapsed { + &:before { + opacity: 0; + } + &:after { + opacity: 1; + } + } + &.toggle-tree.anchor-left { + left: 0; + @include transform(translateX(-1 * $paneExpandedOffset)); + &:after { + content: '\6d'; // Menu 'hamburger' icon + } + &.collapsed { + left: 0; + @include transform(translateX((-1 * $ueCollapsedPaneEdgeM) + $interiorMargin)); + } + &:not(.collapsed):before { + @include trans-prop-nice(opacity, 200ms, 200ms); + } + } + &.toggle-inspect.anchor-right { + right: $bodyMargin; + &:after { + content: '\e615'; // Eye icon + } + &.collapsed { + right: $interiorMargin; + } + } +} + .split-layout { // Specific elements margins .holder.holder-treeview-elements { @@ -339,7 +340,7 @@ } } -@include desktop { +body.desktop { .holder-all { min-width: $ueDesktopMinW; } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 8b5f4ff272..8c049cc185 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1871,23 +1871,109 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 114, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab { +/* line 114, ../../../../general/res/sass/controls/_buttons.scss */ +body.desktop.mini-tab { + -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-transition-property: color, background-color; + -o-transition-property: color, background-color; + -webkit-transition-property: color, background-color; + transition-property: color, background-color; + -moz-transition-duration: 100ms; + -o-transition-duration: 100ms; + -webkit-transition-duration: 100ms; + transition-duration: 100ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + color: #595959; + cursor: pointer; + font-family: symbolsfont; + font-size: 9px; + display: block; + position: absolute; + line-height: 24px; + height: 24px; + width: 9px; + text-align: center; } + /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:hover { + color: #0099cc; } + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed { + 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-transition-property: color, background-color; - -o-transition-property: color, background-color; - -webkit-transition-property: color, background-color; - transition-property: color, background-color; - -moz-transition-duration: 100ms; - -o-transition-duration: 100ms; - -webkit-transition-duration: 100ms; - transition-duration: 100ms; + color: #999; + display: inline-block; + 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; + -moz-transition: background, 0.25s; + -o-transition: background, 0.25s; + -webkit-transition: background, 0.25s; + transition: background, 0.25s; + text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } + /* line 303, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed .icon, body.desktop.mini-tab.collapsed .t-item-icon { + color: #0099cc; } + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 308, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); + background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); + background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); + background-image: linear-gradient(#6b6b6b, #5e5e5e); } + /* line 310, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { + color: #33ccff; } } + /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:before { + opacity: 0; } + /* line 146, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:after { + opacity: 1; } + /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:hover:before { + opacity: 1; } + /* line 149, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:hover:after { + opacity: 0; } + /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:before, body.desktop.mini-tab:after { + -moz-transition-property: left, right, opacity; + -o-transition-property: left, right, opacity; + -webkit-transition-property: left, right, opacity; + transition-property: left, right, opacity; + -moz-transition-duration: 250ms; + -o-transition-duration: 250ms; + -webkit-transition-duration: 250ms; + transition-duration: 250ms; -moz-transition-timing-function: ease-in-out; -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; @@ -1896,191 +1982,102 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; - color: #595959; - cursor: pointer; - font-family: symbolsfont; - font-size: 9px; display: block; - position: absolute; - line-height: 24px; - height: 24px; - width: 9px; - text-align: center; } - /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover { - color: #0099cc; } - /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed { - 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; - color: #999; - display: inline-block; - 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; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; - text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ - .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { - color: #0099cc; } } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .mini-tab.collapsed:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); - background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); - background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); - background-image: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:before { - opacity: 0; } - /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:after { - opacity: 1; } - /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:hover:before { - opacity: 1; } - /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:hover:after { - opacity: 0; } - /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before, .mini-tab:after { - -moz-transition-property: left, right, opacity; - -o-transition-property: left, right, opacity; - -webkit-transition-property: left, right, opacity; - transition-property: left, right, opacity; - -moz-transition-duration: 250ms; - -o-transition-duration: 250ms; - -webkit-transition-duration: 250ms; - transition-duration: 250ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - display: block; - height: 100%; - position: absolute; } - /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before { - width: 9px; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:after { - width: 100%; - text-align: center; - opacity: 0; } - /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left { - text-align: right; } - /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:before { - content: '\3c'; - right: 0; } - /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed { - -moz-border-radius-topleft: 0; - -webkit-border-top-left-radius: 0; - border-top-left-radius: 0; - -moz-border-radius-bottomleft: 0; - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - text-align: left; } - /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed:before { - content: '\3e'; - left: 0; } - /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed:hover:before { - left: 2px; } - /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right { + height: 100%; + position: absolute; } + /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:before { + width: 9px; } + /* line 166, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:after { + width: 100%; + text-align: center; + opacity: 0; } + /* line 173, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left { + text-align: right; } + /* line 176, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left:before { + content: '\3c'; + right: 0; } + /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left.collapsed { + -moz-border-radius-topleft: 0; + -webkit-border-top-left-radius: 0; + border-top-left-radius: 0; + -moz-border-radius-bottomleft: 0; + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; text-align: left; } - /* line 203, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:before { + /* line 183, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed { - -moz-border-radius-topright: 0; - -webkit-border-top-right-radius: 0; - border-top-right-radius: 0; - -moz-border-radius-bottomright: 0; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; } - /* line 210, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed:before { - text-align: right; - content: '\3c'; - right: 0; } - /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed:hover:before { - right: 2px; } } + /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left.collapsed:hover:before { + left: 2px; } + /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right { + text-align: left; } + /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right:before { + content: '\3e'; + left: 0; } + /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right.collapsed { + -moz-border-radius-topright: 0; + -webkit-border-top-right-radius: 0; + border-top-right-radius: 0; + -moz-border-radius-bottomright: 0; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; } + /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right.collapsed:before { + text-align: right; + content: '\3c'; + right: 0; } + /* line 204, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right.collapsed:hover:before { + right: 2px; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 221, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon { - color: #595959; - cursor: pointer; - display: block; - font-family: symbolsfont; - font-size: 9px; +/* line 209, ../../../../general/res/sass/controls/_buttons.scss */ +body.desktop.mini-tab-icon { + color: #595959; + cursor: pointer; + display: block; + font-family: symbolsfont; + font-size: 9px; + position: absolute; + height: 9px; + width: 9px; + line-height: 9px; + overflow: hidden; + word-break: break-all; } + /* line 223, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon.collapsed { + width: 11px; + font-size: 11px; } + /* line 228, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon:before, body.desktop.mini-tab-icon:after { position: absolute; - height: 9px; - width: 9px; - line-height: 9px; - overflow: hidden; - word-break: break-all; } - /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon.collapsed { - width: 11px; - font-size: 11px; } - /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon:before, .mini-tab-icon:after { - position: absolute; - display: inherit; } - /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon:before { - content: '\78'; } - /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon:hover { - color: #0099cc; } } + display: inherit; } + /* line 234, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon:before { + content: '\78'; } + /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon:hover { + color: #0099cc; } -/* line 260, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 243, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 248, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu-btn { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 272, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 254, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; @@ -2089,7 +2086,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 279, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 261, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; @@ -2098,7 +2095,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 286, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 268, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -2431,29 +2428,29 @@ label.checkbox.custom { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 240, ../../../../general/res/sass/controls/_controls.scss */ - .object-header .context-available { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 0.25s; - -o-transition-duration: 0.25s; - -webkit-transition-duration: 0.25s; - transition-duration: 0.25s; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 0; } - /* line 245, ../../../../general/res/sass/controls/_controls.scss */ - .object-header:hover .context-available { - opacity: 1; } } + +/* line 241, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop .object-header .context-available { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 0.25s; + -o-transition-duration: 0.25s; + -webkit-transition-duration: 0.25s; + transition-duration: 0.25s; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0; } +/* line 246, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop .object-header:hover .context-available { + opacity: 1; } /******************************************************** PROGRESS BAR */ @-moz-keyframes progress { @@ -3544,22 +3541,22 @@ label.checkbox.custom { /* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 280, ../../../../general/res/sass/controls/_messages.scss */ - .t-message-single .l-message, - .t-message-single .bottom-bar { - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; } - /* line 285, ../../../../general/res/sass/controls/_messages.scss */ - .t-message-single .bottom-bar { - top: auto; - height: 24px; } } + +/* line 281, ../../../../general/res/sass/controls/_messages.scss */ +body.desktop .t-message-single .l-message, +body.desktop .t-message-single .bottom-bar { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; } +/* line 286, ../../../../general/res/sass/controls/_messages.scss */ +body.desktop .t-message-single .bottom-bar { + top: auto; + height: 24px; } /* line 216, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type { @@ -3597,28 +3594,28 @@ label.checkbox.custom { background: rgba(230, 230, 230, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 304, ../../../../general/res/sass/controls/_messages.scss */ + /* line 303, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents, .t-message-list .message-contents .l-message .bottom-bar { position: relative; } - /* line 310, ../../../../general/res/sass/controls/_messages.scss */ + /* line 308, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 313, ../../../../general/res/sass/controls/_messages.scss */ + /* line 311, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #b3b3b3; } - /* line 314, ../../../../general/res/sass/controls/_messages.scss */ + /* line 312, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 317, ../../../../general/res/sass/controls/_messages.scss */ + /* line 315, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 325, ../../../../general/res/sass/controls/_messages.scss */ - .t-message-list .message-contents .l-message { - margin-right: 10px; } } + +/* line 324, ../../../../general/res/sass/controls/_messages.scss */ +body.desktop .t-message-list .message-contents .l-message { + margin-right: 10px; } /* line 9, ../../../../general/res/sass/controls/_time-controller.scss */ mct-include.l-time-controller { @@ -4835,66 +4832,7 @@ span.req { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { z-index: 5; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane { - top: 10px; - height: 24px; - line-height: 24px; } - /* line 146, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane:after { - opacity: 0; } - /* line 151, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.collapsed:before { - opacity: 0; } - /* line 154, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.collapsed:after { - opacity: 1; } - /* line 158, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left { - left: 0; - -moz-transform: translateX(-34px); - -ms-transform: translateX(-34px); - -webkit-transform: translateX(-34px); - transform: translateX(-34px); } - /* line 161, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:after { - content: '\6d'; } - /* line 164, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left.collapsed { - left: 0; - -moz-transform: translateX(-17px); - -ms-transform: translateX(-17px); - -webkit-transform: translateX(-17px); - transform: translateX(-17px); } - /* line 168, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:not(.collapsed):before { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 200ms; - -o-transition-duration: 200ms; - -webkit-transition-duration: 200ms; - transition-duration: 200ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 200ms; - -o-transition-delay: 200ms; - -webkit-transition-delay: 200ms; - transition-delay: 200ms; } - /* line 172, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right { - right: 10px; } - /* line 174, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right:after { - content: '\e615'; } - /* line 177, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right.collapsed { - right: 5px; } } - /* line 185, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 143, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .left.l-inspect, .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .left.pager, .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .left.pager, .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .left.val, .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .left.val, .pane.items .object-browse-bar .s-menu-btn span.left.l-click-area, .s-menu-btn .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .left.l-object-wrapper, .pane.items .object-browse-bar .l-object-wrapper .left.object-holder-main, .l-object-wrapper .pane.items .object-browse-bar .left.object-holder-main, @@ -4911,42 +4849,101 @@ span.req { .l-object-wrapper .pane.items .object-browse-bar .right.object-holder-main { top: auto; } -/* line 195, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 151, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane .mini-tab-icon.toggle-pane { + top: 10px; + height: 24px; + line-height: 24px; } + /* line 157, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane:after { + opacity: 0; } + /* line 162, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.collapsed:before { + opacity: 0; } + /* line 165, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.collapsed:after { + opacity: 1; } + /* line 169, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left { + left: 0; + -moz-transform: translateX(-34px); + -ms-transform: translateX(-34px); + -webkit-transform: translateX(-34px); + transform: translateX(-34px); } + /* line 172, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:after { + content: '\6d'; } + /* line 175, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left.collapsed { + left: 0; + -moz-transform: translateX(-17px); + -ms-transform: translateX(-17px); + -webkit-transform: translateX(-17px); + transform: translateX(-17px); } + /* line 179, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:not(.collapsed):before { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 200ms; + -o-transition-duration: 200ms; + -webkit-transition-duration: 200ms; + transition-duration: 200ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 200ms; + -o-transition-delay: 200ms; + -webkit-transition-delay: 200ms; + transition-delay: 200ms; } + /* line 183, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right { + right: 10px; } + /* line 185, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right:after { + content: '\e615'; } + /* line 188, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right.collapsed { + right: 5px; } + +/* line 196, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-treeview-elements { top: 10px; right: 0; bottom: 10px; left: 10px; } - /* line 201, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 202, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing { display: none; } - /* line 203, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 204, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing + .search-holder .search-bar { margin-right: 20px; } -/* line 212, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 213, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector { top: 0; right: 0; bottom: 0; left: 0; } - /* line 217, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 218, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-object { top: 10px; bottom: 10px; } - /* line 221, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 222, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-inspector { top: 10px; bottom: 10px; left: 10px; right: 10px; } - /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 228, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-elements { top: 0; bottom: 10px; left: 10px; right: 10px; } -/* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 237, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: auto; position: absolute; @@ -4958,17 +4955,17 @@ span.req { height: auto; top: 34px; } -/* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 248, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper .l-edit-controls { border-bottom: 1px solid rgba(153, 153, 153, 0.1); line-height: 25px; height: 0px; opacity: 0; } - /* line 253, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 254, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper .l-edit-controls .tool-bar { right: 5px; } -/* line 259, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 260, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper-inner { -moz-transition-property: height, width, top, right, bottom, left, opacity; -o-transition-property: height, width, top, right, bottom, left, opacity; @@ -4983,7 +4980,7 @@ span.req { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; } -/* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .s-btn, .object-browse-bar .s-menu-btn, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu-btn, @@ -4995,13 +4992,13 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 279, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } /***************************************************** OBJECT BROWSE BAR */ -/* line 284, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -5009,21 +5006,21 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 290, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 291, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 10px; } - /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 293, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back:not(.s-status-editing) { margin-right: 10px; } -/* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .tree-holder, .pane-tree-hidden .splitter-treeview, .pane-tree-hidden .holder-treeview-elements { opacity: 0; pointer-events: none; } -/* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .tree-holder, .pane-tree-showing .splitter-treeview { -moz-transition-property: opacity; @@ -5043,7 +5040,7 @@ span.req { -webkit-transition-delay: 250ms; transition-delay: 250ms; opacity: 1; } -/* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .holder-treeview-elements { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -5062,7 +5059,7 @@ span.req { -webkit-transition-delay: 200ms; transition-delay: 200ms; } -/* line 324, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-showing .l-object-and-inspector .l-inspect, .pane-inspect-showing .l-object-and-inspector .splitter-inspect { -moz-transition-property: opacity; @@ -5083,64 +5080,58 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 334, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .l-inspect, .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; pointer-events: none; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 343, ../../../../general/res/sass/user-environ/_layout.scss */ - .holder-all { - min-width: 600px; } +/* line 344, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .holder-all { + min-width: 600px; } +/* line 349, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .split-layout .split-pane-component.pane.treeview.left { + min-width: 150px; + max-width: 35%; + width: 25%; } +/* line 354, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .split-layout .split-pane-component.pane.t-inspect.right { + min-width: 200px; + max-width: 35%; + width: 20%; + z-index: 3; } +/* line 362, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane.treeview.left .tree-holder { + padding-right: 5px; } +/* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane-tree-hidden .pane.right.primary-pane { + left: 22px !important; } +/* line 369, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane-inspect-hidden .l-object-and-inspector .pane.left { + right: 22px !important; } +/* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane:not(.resizing) { + -moz-transition-property: width, left, right; + -o-transition-property: width, left, right; + -webkit-transition-property: width, left, right; + transition-property: width, left, right; + -moz-transition-duration: 250ms; + -o-transition-duration: 250ms; + -webkit-transition-duration: 250ms; + transition-duration: 250ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; } +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane.primary-pane .object-browse-bar { + min-width: 200px; } - /* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .split-pane-component.pane.treeview.left { - min-width: 150px; - max-width: 35%; - width: 25%; } - /* line 353, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .split-pane-component.pane.t-inspect.right { - min-width: 200px; - max-width: 35%; - width: 20%; - z-index: 3; } - - /* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.treeview.left .tree-holder { - padding-right: 5px; } - - /* line 365, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-tree-hidden .pane.right.primary-pane { - left: 22px !important; } - - /* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-inspect-hidden .l-object-and-inspector .pane.left { - right: 22px !important; } - - /* line 370, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane:not(.resizing) { - -moz-transition-property: width, left, right; - -o-transition-property: width, left, right; - -webkit-transition-property: width, left, right; - transition-property: width, left, right; - -moz-transition-duration: 250ms; - -o-transition-duration: 250ms; - -webkit-transition-duration: 250ms; - transition-duration: 250ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; } - - /* line 373, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.primary-pane .object-browse-bar { - min-width: 200px; } } -/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 380, ../../../../general/res/sass/user-environ/_layout.scss */ .s-status-editing .l-object-wrapper { -moz-animation-name: pulseBorder; -webkit-animation-name: pulseBorder; @@ -5182,7 +5173,7 @@ span.req { border-color: rgba(88, 122, 181, 0.3); } 100% { border-color: #587ab5; } } - /* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 387, ../../../../general/res/sass/user-environ/_layout.scss */ .s-status-editing .l-object-wrapper .l-object-wrapper-inner { overflow: hidden; position: absolute; @@ -5192,7 +5183,7 @@ span.req { left: 3px; width: auto; height: auto; } - /* line 389, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 390, ../../../../general/res/sass/user-environ/_layout.scss */ .s-status-editing .l-object-wrapper .l-edit-controls { height: 30px; margin-bottom: 5px; @@ -5409,10 +5400,10 @@ span.req { /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ - .desktop-hide { - display: none; } } +/* line 160, ../../../../general/res/sass/mobile/_layout.scss */ +body.desktop .desktop-hide { + display: none; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -6167,81 +6158,80 @@ ul.tree { -ms-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg); } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 67, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .view-control:hover, - .search-result-item .view-control:hover { - color: #ffc700 !important; } } - /* line 73, ../../../../general/res/sass/tree/_tree.scss */ + /* line 68, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .t-object-label, .search-result-item .t-object-label { line-height: 1.5rem; } - /* line 75, ../../../../general/res/sass/tree/_tree.scss */ + /* line 70, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .t-object-label .t-item-icon, .search-result-item .t-object-label .t-item-icon { text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px; font-size: 1.4em; color: #0099cc; width: 18px; } - /* line 81, ../../../../general/res/sass/tree/_tree.scss */ + /* line 76, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .t-object-label .t-title-label, .search-result-item .t-object-label .t-title-label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 86, ../../../../general/res/sass/tree/_tree.scss */ + /* line 81, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected, .search-result-item.selected { background: #006080; color: #cccccc; } - /* line 89, ../../../../general/res/sass/tree/_tree.scss */ + /* line 84, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .view-control, .search-result-item.selected .view-control { color: rgba(255, 255, 255, 0.3); } - /* line 92, ../../../../general/res/sass/tree/_tree.scss */ + /* line 87, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { color: #cccccc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 99, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item:not(.selected):hover, - .search-result-item:not(.selected):hover { - background: rgba(153, 153, 153, 0.1); - color: #cccccc; } - /* line 102, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item:not(.selected):hover .t-item-icon, - .search-result-item:not(.selected):hover .t-item-icon { - color: #33ccff; } } - /* line 109, ../../../../general/res/sass/tree/_tree.scss */ + /* line 92, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.loading), .search-result-item:not(.loading) { cursor: pointer; } - /* line 113, ../../../../general/res/sass/tree/_tree.scss */ + /* line 96, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .context-trigger, .search-result-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 118, ../../../../general/res/sass/tree/_tree.scss */ + /* line 101, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .context-trigger .invoke-menu, .search-result-item .context-trigger .invoke-menu { font-size: 0.75em; height: 0.9rem; line-height: 0.9rem; } -/* line 130, ../../../../general/res/sass/tree/_tree.scss */ +/* line 113, ../../../../general/res/sass/tree/_tree.scss */ +body.desktop .tree-item .view-control:hover, +body.desktop .search-result-item .view-control:hover { + color: #ffc700 !important; } +/* line 118, ../../../../general/res/sass/tree/_tree.scss */ +body.desktop .tree-item:not(.selected):hover, +body.desktop .search-result-item:not(.selected):hover { + background: rgba(153, 153, 153, 0.1); + color: #cccccc; } + /* line 121, ../../../../general/res/sass/tree/_tree.scss */ + body.desktop .tree-item:not(.selected):hover .t-item-icon, + body.desktop .search-result-item:not(.selected):hover .t-item-icon { + color: #33ccff; } + +/* line 133, ../../../../general/res/sass/tree/_tree.scss */ mct-representation.s-status-pending .t-object-label .t-item-icon:before { border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; } -/* line 142, ../../../../general/res/sass/tree/_tree.scss */ +/* line 145, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item, .tree .s-status-editing .search-result-item, .search-results .s-status-editing .tree-item, .search-results .s-status-editing .search-result-item { background: #344154; pointer-events: none; } - /* line 146, ../../../../general/res/sass/tree/_tree.scss */ + /* line 149, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item:before, .tree .s-status-editing .search-result-item:before, .search-results .s-status-editing .tree-item:before, @@ -6279,7 +6269,7 @@ mct-representation.s-status-pending .t-object-label .t-item-icon:before { opacity: 0.25; } 100% { opacity: 1; } } - /* line 155, ../../../../general/res/sass/tree/_tree.scss */ + /* line 158, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item .t-object-label .t-item-icon, .tree .s-status-editing .tree-item .t-object-label .t-title-label, .tree .s-status-editing .search-result-item .t-object-label .t-item-icon, @@ -6290,13 +6280,13 @@ mct-representation.s-status-pending .t-object-label .t-item-icon:before { .search-results .s-status-editing .search-result-item .t-object-label .t-title-label { color: #587ab5; text-shadow: none; } - /* line 160, ../../../../general/res/sass/tree/_tree.scss */ + /* line 163, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item .t-object-label .t-title-label, .tree .s-status-editing .search-result-item .t-object-label .t-title-label, .search-results .s-status-editing .tree-item .t-object-label .t-title-label, .search-results .s-status-editing .search-result-item .t-object-label .t-title-label { font-style: italic; } - /* line 164, ../../../../general/res/sass/tree/_tree.scss */ + /* line 167, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item .view-control, .tree .s-status-editing .tree-item + .tree-item-subtree, .tree .s-status-editing .search-result-item .view-control, .tree .s-status-editing .search-result-item + .tree-item-subtree, @@ -6514,17 +6504,17 @@ mct-representation.s-status-pending .t-object-label .t-title-label { /* line 66, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { z-index: 10; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 72, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.frame-template .view-switcher { - opacity: 0; } - /* line 75, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.frame-template:hover .view-switcher { - opacity: 1; } } -/* line 83, ../../../../general/res/sass/user-environ/_frame.scss */ +/* line 72, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .view-switcher .title-label { display: none; } +/* line 80, ../../../../general/res/sass/user-environ/_frame.scss */ +body.desktop .frame.frame-template .view-switcher { + opacity: 0; } +/* line 83, ../../../../general/res/sass/user-environ/_frame.scss */ +body.desktop .frame.frame-template:hover .view-switcher { + opacity: 1; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 9562a1271c..82edec1ea5 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1810,23 +1810,95 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 114, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab { +/* line 114, ../../../../general/res/sass/controls/_buttons.scss */ +body.desktop.mini-tab { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-transition-property: color, background-color; + -o-transition-property: color, background-color; + -webkit-transition-property: color, background-color; + transition-property: color, background-color; + -moz-transition-duration: 100ms; + -o-transition-duration: 100ms; + -webkit-transition-duration: 100ms; + transition-duration: 100ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + color: #d6d6d6; + cursor: pointer; + font-family: symbolsfont; + font-size: 9px; + display: block; + position: absolute; + line-height: 24px; + height: 24px; + width: 9px; + text-align: center; } + /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:hover { + color: #0099cc; } + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed { + background-color: #969696; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-transition-property: color, background-color; - -o-transition-property: color, background-color; - -webkit-transition-property: color, background-color; - transition-property: color, background-color; - -moz-transition-duration: 100ms; - -o-transition-duration: 100ms; - -webkit-transition-duration: 100ms; - transition-duration: 100ms; + color: #fff; + display: inline-block; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + -moz-transition: background, 0.25s; + -o-transition: background, 0.25s; + -webkit-transition: background, 0.25s; + transition: background, 0.25s; + text-shadow: none; } + /* line 303, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed .icon, body.desktop.mini-tab.collapsed .t-item-icon { + color: #eee; } + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 308, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover { + background-image: #0099cc; } + /* line 310, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { + color: white; } } + /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:before { + opacity: 0; } + /* line 146, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:after { + opacity: 1; } + /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:hover:before { + opacity: 1; } + /* line 149, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.collapsed:hover:after { + opacity: 0; } + /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:before, body.desktop.mini-tab:after { + -moz-transition-property: left, right, opacity; + -o-transition-property: left, right, opacity; + -webkit-transition-property: left, right, opacity; + transition-property: left, right, opacity; + -moz-transition-duration: 250ms; + -o-transition-duration: 250ms; + -webkit-transition-duration: 250ms; + transition-duration: 250ms; -moz-transition-timing-function: ease-in-out; -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; @@ -1835,177 +1907,102 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; - color: #d6d6d6; - cursor: pointer; - font-family: symbolsfont; - font-size: 9px; display: block; - position: absolute; - line-height: 24px; - height: 24px; - width: 9px; - text-align: center; } - /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover { - color: #0099cc; } - /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed { - background-color: #969696; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #fff; - display: inline-block; - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; - text-shadow: none; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ - .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { - color: #eee; } } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .mini-tab.collapsed:not(.disabled):hover { - background-image: #0099cc; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { - color: white; } } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:before { - opacity: 0; } - /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:after { - opacity: 1; } - /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:hover:before { - opacity: 1; } - /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.collapsed:hover:after { - opacity: 0; } - /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before, .mini-tab:after { - -moz-transition-property: left, right, opacity; - -o-transition-property: left, right, opacity; - -webkit-transition-property: left, right, opacity; - transition-property: left, right, opacity; - -moz-transition-duration: 250ms; - -o-transition-duration: 250ms; - -webkit-transition-duration: 250ms; - transition-duration: 250ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - display: block; - height: 100%; - position: absolute; } - /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before { - width: 9px; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:after { - width: 100%; - text-align: center; - opacity: 0; } - /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left { - text-align: right; } - /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:before { - content: '\3c'; - right: 0; } - /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed { - -moz-border-radius-topleft: 0; - -webkit-border-top-left-radius: 0; - border-top-left-radius: 0; - -moz-border-radius-bottomleft: 0; - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - text-align: left; } - /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed:before { - content: '\3e'; - left: 0; } - /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed:hover:before { - left: 2px; } - /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right { + height: 100%; + position: absolute; } + /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:before { + width: 9px; } + /* line 166, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab:after { + width: 100%; + text-align: center; + opacity: 0; } + /* line 173, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left { + text-align: right; } + /* line 176, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left:before { + content: '\3c'; + right: 0; } + /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left.collapsed { + -moz-border-radius-topleft: 0; + -webkit-border-top-left-radius: 0; + border-top-left-radius: 0; + -moz-border-radius-bottomleft: 0; + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; text-align: left; } - /* line 203, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:before { + /* line 183, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed { - -moz-border-radius-topright: 0; - -webkit-border-top-right-radius: 0; - border-top-right-radius: 0; - -moz-border-radius-bottomright: 0; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; } - /* line 210, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed:before { - text-align: right; - content: '\3c'; - right: 0; } - /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed:hover:before { - right: 2px; } } + /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-left.collapsed:hover:before { + left: 2px; } + /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right { + text-align: left; } + /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right:before { + content: '\3e'; + left: 0; } + /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right.collapsed { + -moz-border-radius-topright: 0; + -webkit-border-top-right-radius: 0; + border-top-right-radius: 0; + -moz-border-radius-bottomright: 0; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; } + /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right.collapsed:before { + text-align: right; + content: '\3c'; + right: 0; } + /* line 204, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab.anchor-right.collapsed:hover:before { + right: 2px; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 221, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon { - color: #d6d6d6; - cursor: pointer; - display: block; - font-family: symbolsfont; - font-size: 9px; +/* line 209, ../../../../general/res/sass/controls/_buttons.scss */ +body.desktop.mini-tab-icon { + color: #d6d6d6; + cursor: pointer; + display: block; + font-family: symbolsfont; + font-size: 9px; + position: absolute; + height: 9px; + width: 9px; + line-height: 9px; + overflow: hidden; + word-break: break-all; } + /* line 223, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon.collapsed { + width: 11px; + font-size: 11px; } + /* line 228, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon:before, body.desktop.mini-tab-icon:after { position: absolute; - height: 9px; - width: 9px; - line-height: 9px; - overflow: hidden; - word-break: break-all; } - /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon.collapsed { - width: 11px; - font-size: 11px; } - /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon:before, .mini-tab-icon:after { - position: absolute; - display: inherit; } - /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon:before { - content: '\78'; } - /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab-icon:hover { - color: #0099cc; } } + display: inherit; } + /* line 234, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon:before { + content: '\78'; } + /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ + body.desktop.mini-tab-icon:hover { + color: #0099cc; } -/* line 260, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 243, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 248, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu-btn { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 272, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 254, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; @@ -2014,7 +2011,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 279, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 261, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; @@ -2023,7 +2020,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 286, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 268, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -2356,29 +2353,29 @@ label.checkbox.custom { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 240, ../../../../general/res/sass/controls/_controls.scss */ - .object-header .context-available { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 0.25s; - -o-transition-duration: 0.25s; - -webkit-transition-duration: 0.25s; - transition-duration: 0.25s; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 0; } - /* line 245, ../../../../general/res/sass/controls/_controls.scss */ - .object-header:hover .context-available { - opacity: 1; } } + +/* line 241, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop .object-header .context-available { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 0.25s; + -o-transition-duration: 0.25s; + -webkit-transition-duration: 0.25s; + transition-duration: 0.25s; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0; } +/* line 246, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop .object-header:hover .context-available { + opacity: 1; } /******************************************************** PROGRESS BAR */ @-moz-keyframes progress { @@ -3463,22 +3460,22 @@ label.checkbox.custom { /* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 280, ../../../../general/res/sass/controls/_messages.scss */ - .t-message-single .l-message, - .t-message-single .bottom-bar { - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; } - /* line 285, ../../../../general/res/sass/controls/_messages.scss */ - .t-message-single .bottom-bar { - top: auto; - height: 24px; } } + +/* line 281, ../../../../general/res/sass/controls/_messages.scss */ +body.desktop .t-message-single .l-message, +body.desktop .t-message-single .bottom-bar { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; } +/* line 286, ../../../../general/res/sass/controls/_messages.scss */ +body.desktop .t-message-single .bottom-bar { + top: auto; + height: 24px; } /* line 216, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type { @@ -3516,28 +3513,28 @@ label.checkbox.custom { background: rgba(102, 102, 102, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 304, ../../../../general/res/sass/controls/_messages.scss */ + /* line 303, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents, .t-message-list .message-contents .l-message .bottom-bar { position: relative; } - /* line 310, ../../../../general/res/sass/controls/_messages.scss */ + /* line 308, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 313, ../../../../general/res/sass/controls/_messages.scss */ + /* line 311, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #999999; } - /* line 314, ../../../../general/res/sass/controls/_messages.scss */ + /* line 312, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 317, ../../../../general/res/sass/controls/_messages.scss */ + /* line 315, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 325, ../../../../general/res/sass/controls/_messages.scss */ - .t-message-list .message-contents .l-message { - margin-right: 10px; } } + +/* line 324, ../../../../general/res/sass/controls/_messages.scss */ +body.desktop .t-message-list .message-contents .l-message { + margin-right: 10px; } /* line 9, ../../../../general/res/sass/controls/_time-controller.scss */ mct-include.l-time-controller { @@ -4732,66 +4729,7 @@ span.req { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { z-index: 5; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane { - top: 10px; - height: 24px; - line-height: 24px; } - /* line 146, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane:after { - opacity: 0; } - /* line 151, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.collapsed:before { - opacity: 0; } - /* line 154, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.collapsed:after { - opacity: 1; } - /* line 158, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left { - left: 0; - -moz-transform: translateX(-33px); - -ms-transform: translateX(-33px); - -webkit-transform: translateX(-33px); - transform: translateX(-33px); } - /* line 161, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:after { - content: '\6d'; } - /* line 164, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left.collapsed { - left: 0; - -moz-transform: translateX(-17px); - -ms-transform: translateX(-17px); - -webkit-transform: translateX(-17px); - transform: translateX(-17px); } - /* line 168, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:not(.collapsed):before { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 200ms; - -o-transition-duration: 200ms; - -webkit-transition-duration: 200ms; - transition-duration: 200ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 200ms; - -o-transition-delay: 200ms; - -webkit-transition-delay: 200ms; - transition-delay: 200ms; } - /* line 172, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right { - right: 10px; } - /* line 174, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right:after { - content: '\e615'; } - /* line 177, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right.collapsed { - right: 5px; } } - /* line 185, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 143, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .left.l-inspect, .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .left.pager, .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .left.pager, .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .left.val, .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .left.val, .pane.items .object-browse-bar .s-menu-btn span.left.l-click-area, .s-menu-btn .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .left.l-object-wrapper, .pane.items .object-browse-bar .l-object-wrapper .left.object-holder-main, .l-object-wrapper .pane.items .object-browse-bar .left.object-holder-main, @@ -4808,42 +4746,101 @@ span.req { .l-object-wrapper .pane.items .object-browse-bar .right.object-holder-main { top: auto; } -/* line 195, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 151, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane .mini-tab-icon.toggle-pane { + top: 10px; + height: 24px; + line-height: 24px; } + /* line 157, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane:after { + opacity: 0; } + /* line 162, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.collapsed:before { + opacity: 0; } + /* line 165, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.collapsed:after { + opacity: 1; } + /* line 169, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left { + left: 0; + -moz-transform: translateX(-33px); + -ms-transform: translateX(-33px); + -webkit-transform: translateX(-33px); + transform: translateX(-33px); } + /* line 172, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:after { + content: '\6d'; } + /* line 175, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left.collapsed { + left: 0; + -moz-transform: translateX(-17px); + -ms-transform: translateX(-17px); + -webkit-transform: translateX(-17px); + transform: translateX(-17px); } + /* line 179, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:not(.collapsed):before { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 200ms; + -o-transition-duration: 200ms; + -webkit-transition-duration: 200ms; + transition-duration: 200ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 200ms; + -o-transition-delay: 200ms; + -webkit-transition-delay: 200ms; + transition-delay: 200ms; } + /* line 183, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right { + right: 10px; } + /* line 185, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right:after { + content: '\e615'; } + /* line 188, ../../../../general/res/sass/user-environ/_layout.scss */ + body.desktop .pane .mini-tab-icon.toggle-pane.toggle-inspect.anchor-right.collapsed { + right: 5px; } + +/* line 196, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-treeview-elements { top: 10px; right: 0; bottom: 10px; left: 10px; } - /* line 201, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 202, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing { display: none; } - /* line 203, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 204, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing + .search-holder .search-bar { margin-right: 20px; } -/* line 212, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 213, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector { top: 0; right: 0; bottom: 0; left: 0; } - /* line 217, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 218, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-object { top: 10px; bottom: 10px; } - /* line 221, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 222, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-inspector { top: 10px; bottom: 10px; left: 10px; right: 10px; } - /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 228, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-elements { top: 0; bottom: 10px; left: 10px; right: 10px; } -/* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 237, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: auto; position: absolute; @@ -4855,17 +4852,17 @@ span.req { height: auto; top: 34px; } -/* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 248, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper .l-edit-controls { border-bottom: 1px solid rgba(102, 102, 102, 0.2); line-height: 25px; height: 0px; opacity: 0; } - /* line 253, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 254, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper .l-edit-controls .tool-bar { right: 5px; } -/* line 259, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 260, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper-inner { -moz-transition-property: height, width, top, right, bottom, left, opacity; -o-transition-property: height, width, top, right, bottom, left, opacity; @@ -4880,7 +4877,7 @@ span.req { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; } -/* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .s-btn, .object-browse-bar .s-menu-btn, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu-btn, @@ -4892,13 +4889,13 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 279, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } /***************************************************** OBJECT BROWSE BAR */ -/* line 284, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -4906,21 +4903,21 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 290, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 291, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 10px; } - /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 293, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back:not(.s-status-editing) { margin-right: 10px; } -/* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .tree-holder, .pane-tree-hidden .splitter-treeview, .pane-tree-hidden .holder-treeview-elements { opacity: 0; pointer-events: none; } -/* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .tree-holder, .pane-tree-showing .splitter-treeview { -moz-transition-property: opacity; @@ -4940,7 +4937,7 @@ span.req { -webkit-transition-delay: 250ms; transition-delay: 250ms; opacity: 1; } -/* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .holder-treeview-elements { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -4959,7 +4956,7 @@ span.req { -webkit-transition-delay: 200ms; transition-delay: 200ms; } -/* line 324, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-showing .l-object-and-inspector .l-inspect, .pane-inspect-showing .l-object-and-inspector .splitter-inspect { -moz-transition-property: opacity; @@ -4980,64 +4977,58 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 334, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .l-inspect, .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; pointer-events: none; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 343, ../../../../general/res/sass/user-environ/_layout.scss */ - .holder-all { - min-width: 600px; } +/* line 344, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .holder-all { + min-width: 600px; } +/* line 349, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .split-layout .split-pane-component.pane.treeview.left { + min-width: 150px; + max-width: 35%; + width: 25%; } +/* line 354, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .split-layout .split-pane-component.pane.t-inspect.right { + min-width: 200px; + max-width: 35%; + width: 20%; + z-index: 3; } +/* line 362, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane.treeview.left .tree-holder { + padding-right: 5px; } +/* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane-tree-hidden .pane.right.primary-pane { + left: 22px !important; } +/* line 369, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane-inspect-hidden .l-object-and-inspector .pane.left { + right: 22px !important; } +/* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane:not(.resizing) { + -moz-transition-property: width, left, right; + -o-transition-property: width, left, right; + -webkit-transition-property: width, left, right; + transition-property: width, left, right; + -moz-transition-duration: 250ms; + -o-transition-duration: 250ms; + -webkit-transition-duration: 250ms; + transition-duration: 250ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; } +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ +body.desktop .pane.primary-pane .object-browse-bar { + min-width: 200px; } - /* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .split-pane-component.pane.treeview.left { - min-width: 150px; - max-width: 35%; - width: 25%; } - /* line 353, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .split-pane-component.pane.t-inspect.right { - min-width: 200px; - max-width: 35%; - width: 20%; - z-index: 3; } - - /* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.treeview.left .tree-holder { - padding-right: 5px; } - - /* line 365, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-tree-hidden .pane.right.primary-pane { - left: 22px !important; } - - /* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-inspect-hidden .l-object-and-inspector .pane.left { - right: 22px !important; } - - /* line 370, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane:not(.resizing) { - -moz-transition-property: width, left, right; - -o-transition-property: width, left, right; - -webkit-transition-property: width, left, right; - transition-property: width, left, right; - -moz-transition-duration: 250ms; - -o-transition-duration: 250ms; - -webkit-transition-duration: 250ms; - transition-duration: 250ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; } - - /* line 373, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.primary-pane .object-browse-bar { - min-width: 200px; } } -/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 380, ../../../../general/res/sass/user-environ/_layout.scss */ .s-status-editing .l-object-wrapper { -moz-animation-name: pulseBorder; -webkit-animation-name: pulseBorder; @@ -5079,7 +5070,7 @@ span.req { border-color: rgba(75, 177, 199, 0.3); } 100% { border-color: #4bb1c7; } } - /* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 387, ../../../../general/res/sass/user-environ/_layout.scss */ .s-status-editing .l-object-wrapper .l-object-wrapper-inner { overflow: hidden; position: absolute; @@ -5089,7 +5080,7 @@ span.req { left: 3px; width: auto; height: auto; } - /* line 389, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 390, ../../../../general/res/sass/user-environ/_layout.scss */ .s-status-editing .l-object-wrapper .l-edit-controls { height: 30px; margin-bottom: 5px; @@ -5306,10 +5297,10 @@ span.req { /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ - .desktop-hide { - display: none; } } +/* line 160, ../../../../general/res/sass/mobile/_layout.scss */ +body.desktop .desktop-hide { + display: none; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -6041,80 +6032,79 @@ ul.tree { -ms-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg); } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 67, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .view-control:hover, - .search-result-item .view-control:hover { - color: #0099cc !important; } } - /* line 73, ../../../../general/res/sass/tree/_tree.scss */ + /* line 68, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .t-object-label, .search-result-item .t-object-label { line-height: 1.5rem; } - /* line 75, ../../../../general/res/sass/tree/_tree.scss */ + /* line 70, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .t-object-label .t-item-icon, .search-result-item .t-object-label .t-item-icon { font-size: 1.4em; color: #0099cc; width: 18px; } - /* line 81, ../../../../general/res/sass/tree/_tree.scss */ + /* line 76, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .t-object-label .t-title-label, .search-result-item .t-object-label .t-title-label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 86, ../../../../general/res/sass/tree/_tree.scss */ + /* line 81, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected, .search-result-item.selected { background: #1ac6ff; color: #fcfcfc; } - /* line 89, ../../../../general/res/sass/tree/_tree.scss */ + /* line 84, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .view-control, .search-result-item.selected .view-control { color: #fcfcfc; } - /* line 92, ../../../../general/res/sass/tree/_tree.scss */ + /* line 87, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { color: #fcfcfc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 99, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item:not(.selected):hover, - .search-result-item:not(.selected):hover { - background: rgba(102, 102, 102, 0.1); - color: #333333; } - /* line 102, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item:not(.selected):hover .t-item-icon, - .search-result-item:not(.selected):hover .t-item-icon { - color: #0099cc; } } - /* line 109, ../../../../general/res/sass/tree/_tree.scss */ + /* line 92, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.loading), .search-result-item:not(.loading) { cursor: pointer; } - /* line 113, ../../../../general/res/sass/tree/_tree.scss */ + /* line 96, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .context-trigger, .search-result-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 118, ../../../../general/res/sass/tree/_tree.scss */ + /* line 101, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .context-trigger .invoke-menu, .search-result-item .context-trigger .invoke-menu { font-size: 0.75em; height: 0.9rem; line-height: 0.9rem; } -/* line 130, ../../../../general/res/sass/tree/_tree.scss */ +/* line 113, ../../../../general/res/sass/tree/_tree.scss */ +body.desktop .tree-item .view-control:hover, +body.desktop .search-result-item .view-control:hover { + color: #0099cc !important; } +/* line 118, ../../../../general/res/sass/tree/_tree.scss */ +body.desktop .tree-item:not(.selected):hover, +body.desktop .search-result-item:not(.selected):hover { + background: rgba(102, 102, 102, 0.1); + color: #333333; } + /* line 121, ../../../../general/res/sass/tree/_tree.scss */ + body.desktop .tree-item:not(.selected):hover .t-item-icon, + body.desktop .search-result-item:not(.selected):hover .t-item-icon { + color: #0099cc; } + +/* line 133, ../../../../general/res/sass/tree/_tree.scss */ mct-representation.s-status-pending .t-object-label .t-item-icon:before { border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; } -/* line 142, ../../../../general/res/sass/tree/_tree.scss */ +/* line 145, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item, .tree .s-status-editing .search-result-item, .search-results .s-status-editing .tree-item, .search-results .s-status-editing .search-result-item { background: #caf1ff; pointer-events: none; } - /* line 146, ../../../../general/res/sass/tree/_tree.scss */ + /* line 149, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item:before, .tree .s-status-editing .search-result-item:before, .search-results .s-status-editing .tree-item:before, @@ -6152,7 +6142,7 @@ mct-representation.s-status-pending .t-object-label .t-item-icon:before { opacity: 0.25; } 100% { opacity: 1; } } - /* line 155, ../../../../general/res/sass/tree/_tree.scss */ + /* line 158, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item .t-object-label .t-item-icon, .tree .s-status-editing .tree-item .t-object-label .t-title-label, .tree .s-status-editing .search-result-item .t-object-label .t-item-icon, @@ -6163,13 +6153,13 @@ mct-representation.s-status-pending .t-object-label .t-item-icon:before { .search-results .s-status-editing .search-result-item .t-object-label .t-title-label { color: #4bb1c7; text-shadow: none; } - /* line 160, ../../../../general/res/sass/tree/_tree.scss */ + /* line 163, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item .t-object-label .t-title-label, .tree .s-status-editing .search-result-item .t-object-label .t-title-label, .search-results .s-status-editing .tree-item .t-object-label .t-title-label, .search-results .s-status-editing .search-result-item .t-object-label .t-title-label { font-style: italic; } - /* line 164, ../../../../general/res/sass/tree/_tree.scss */ + /* line 167, ../../../../general/res/sass/tree/_tree.scss */ .tree .s-status-editing .tree-item .view-control, .tree .s-status-editing .tree-item + .tree-item-subtree, .tree .s-status-editing .search-result-item .view-control, .tree .s-status-editing .search-result-item + .tree-item-subtree, @@ -6387,17 +6377,17 @@ mct-representation.s-status-pending .t-object-label .t-title-label { /* line 66, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { z-index: 10; } -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 72, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.frame-template .view-switcher { - opacity: 0; } - /* line 75, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.frame-template:hover .view-switcher { - opacity: 1; } } -/* line 83, ../../../../general/res/sass/user-environ/_frame.scss */ +/* line 72, ../../../../general/res/sass/user-environ/_frame.scss */ .frame .view-switcher .title-label { display: none; } +/* line 80, ../../../../general/res/sass/user-environ/_frame.scss */ +body.desktop .frame.frame-template .view-switcher { + opacity: 0; } +/* line 83, ../../../../general/res/sass/user-environ/_frame.scss */ +body.desktop .frame.frame-template:hover .view-switcher { + opacity: 1; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space From 242e02e9af7d84209e8e28854319ddb8ea9f2d4d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 17 Feb 2016 10:17:36 -0800 Subject: [PATCH 02/20] Added compass_scripts directory open #639 Added dir to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4f100b8dcf..1d9d293f62 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.sass-cache *COMPILE.css +compass_scripts # Intellij project configuration files *.idea From a4f24adb8a84981454695135255da7055c867b00 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 17 Feb 2016 10:26:42 -0800 Subject: [PATCH 03/20] [Frontend] Refactoring to use Victorizr instead of media queries open #639 Replaced MQ around _controls webkit-scrollbar CSS; --- .../general/res/sass/controls/_controls.scss | 2 +- .../espresso/res/css/theme-espresso.css | 96 +++++++++---------- 2 files changed, 48 insertions(+), 50 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 80ec355cad..897789da1a 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -481,7 +481,7 @@ body.desktop .object-header { /******************************************************** BROWSER ELEMENTS */ -@include desktop { +body.desktop { ::-webkit-scrollbar { @include border-radius(2px); @include box-sizing(border-box); diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 8c049cc185..57dba55814 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -2771,48 +2771,46 @@ body.desktop .object-header:hover .context-available { color: inherit; } /******************************************************** BROWSER ELEMENTS */ -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 485, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; - box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; - background-color: rgba(0, 0, 0, 0.4); - height: 10px; - width: 10px; } - - /* line 494, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar-thumb { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); +/* line 485, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop ::-webkit-scrollbar { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; + box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; + background-color: rgba(0, 0, 0, 0.4); + height: 10px; + width: 10px; } +/* line 494, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop ::-webkit-scrollbar-thumb { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); + background-image: -moz-linear-gradient(#595959, #4d4d4d 20px); + background-image: -webkit-linear-gradient(#595959, #4d4d4d 20px); + background-image: linear-gradient(#595959, #4d4d4d 20px); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } + /* line 501, ../../../../general/res/sass/controls/_controls.scss */ + body.desktop ::-webkit-scrollbar-thumb:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#595959, #4d4d4d 20px); - background-image: -webkit-linear-gradient(#595959, #4d4d4d 20px); - background-image: linear-gradient(#595959, #4d4d4d 20px); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; } - /* line 501, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar-thumb:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #5e5e5e), color-stop(100%, #525252)); - background-image: -moz-linear-gradient(#5e5e5e, #525252 20px); - background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); - background-image: linear-gradient(#5e5e5e, #525252 20px); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #5e5e5e), color-stop(100%, #525252)); + background-image: -moz-linear-gradient(#5e5e5e, #525252 20px); + background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); + background-image: linear-gradient(#5e5e5e, #525252 20px); } +/* line 506, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop ::-webkit-scrollbar-corner { + background: rgba(0, 0, 0, 0.4); } - /* line 506, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar-corner { - background: rgba(0, 0, 0, 0.4); } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space From 66905cbcbb62d5f3215e08f8878991f98e7d1d33 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 17 Feb 2016 16:12:18 -0800 Subject: [PATCH 04/20] [Frontend] Refactoring to use Victorizr instead of media queries open #639 open #683 open #169 open #494 Replaced MQ around mobile/_tree.scss ul.tree; Removed MQ desktop around hover in mixin btnBase; Reversed orientation of mobile tree arrows for #494; --- .../commonUI/general/res/sass/_mixins.scss | 18 +- .../general/res/sass/mobile/_item.scss | 33 +- .../general/res/sass/mobile/_tree.scss | 6 +- .../espresso/res/css/theme-espresso.css | 433 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 423 +++++++++-------- 5 files changed, 463 insertions(+), 450 deletions(-) diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index c3763e217b..e665348715 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -303,16 +303,14 @@ .icon { color: $ic; } - @include desktop { - @if $bgHov != none { - &:not(.disabled):hover { - @include background-image($bgHov); - >.icon { - color: lighten($ic, $ltGamma); - } - } - } - } + @if $bgHov != none { + &:not(.disabled):hover { + @include background-image($bgHov); + >.icon { + color: lighten($ic, $ltGamma); + } + } + } } @mixin input-base($bg: $colorInputBg, $fg: $colorInputFg, $shdw: rgba(black, 0.6) 0 1px 3px) { diff --git a/platform/commonUI/general/res/sass/mobile/_item.scss b/platform/commonUI/general/res/sass/mobile/_item.scss index e60e96c5a7..16e35d4577 100644 --- a/platform/commonUI/general/res/sass/mobile/_item.scss +++ b/platform/commonUI/general/res/sass/mobile/_item.scss @@ -24,11 +24,21 @@ // representation. Instead of a grid, // a list is used. + +// Refactored to use Victorizr .items-holder { .item { &.grid-item { $titleH: 30px; - @include phoneandtablet { + } + } +} + +body.phone, +body.tablet { + .items-holder { + .item { + &.grid-item { width: 100%; >.contents { top: 0px; right: $interiorMarginLg; bottom: 0px; left: $interiorMarginLg; @@ -36,7 +46,6 @@ .bar { &.top-bar { // Becomes the right side of the item - //@include test(blue); bottom: 0 !important; left: auto !important; right: 20px !important; width: 40px !important; height: auto !important; text-align: right; @@ -46,7 +55,7 @@ left: $mobileListIconSize + $interiorMarginLg; right: 60px; } - + } .item-main { .item-type, @@ -63,8 +72,14 @@ } } } + } + } +} - @include phone { +body.phone { + .items-holder { + .item { + &.grid-item { $dHei: $phoneItemH; height: $dHei; .bar { @@ -85,8 +100,14 @@ } } } - - @include tablet { + } + } +} + +body.tablet { + .items-holder { + .item { + &.grid-item { $dHei: $tabletItemH; height: $dHei; .bar { diff --git a/platform/commonUI/general/res/sass/mobile/_tree.scss b/platform/commonUI/general/res/sass/mobile/_tree.scss index 22ed795ce8..5a0b6fd36d 100644 --- a/platform/commonUI/general/res/sass/mobile/_tree.scss +++ b/platform/commonUI/general/res/sass/mobile/_tree.scss @@ -20,7 +20,7 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -@include phoneandtablet { +body.touch { ul.tree { // Sets the margin on the left, which causes the // running indentation after each folder is made @@ -42,10 +42,10 @@ &:before { content: "\7d"; left: 50%; - @include transform(translateX(-50%) rotate(90deg)); + @include transform(translateX(-50%) rotate(270deg)); } &.expanded:before { - @include transform(translateX(-50%) rotate(270deg)); + @include transform(translateX(-50%) rotate(90deg)); } } } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 57dba55814..8ca579bea4 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -1717,18 +1717,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 303, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1ac6ff), color-stop(100%, #00bfff)); - background-image: -moz-linear-gradient(#1ac6ff, #00bfff); - background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); - background-image: linear-gradient(#1ac6ff, #00bfff); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon, .s-btn.major:not(.disabled):hover > .t-item-icon, .major.s-menu-btn:not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1ac6ff), color-stop(100%, #00bfff)); + background-image: -moz-linear-gradient(#1ac6ff, #00bfff); + background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); + background-image: linear-gradient(#1ac6ff, #00bfff); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon, .s-btn.major:not(.disabled):hover > .t-item-icon, .major.s-menu-btn:not(.disabled):hover > .t-item-icon { + color: white; } /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn:not(.major), .s-menu-btn:not(.major) { background-color: #454545; @@ -1761,18 +1760,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 303, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); - background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); - background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); - background-image: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon, .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { - color: #33ccff; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); + background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); + background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); + background-image: linear-gradient(#6b6b6b, #5e5e5e); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon, .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { + color: #33ccff; } /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.t-save:before, .t-save.s-menu-btn:before { content: '\e612'; @@ -1820,18 +1818,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 303, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Y4OGMwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fe9815), color-stop(100%, #f88c01)); - background-image: -moz-linear-gradient(#fe9815, #f88c01); - background-image: -webkit-linear-gradient(#fe9815, #f88c01); - background-image: linear-gradient(#fe9815, #f88c01); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon, .s-btn.pause-play.paused:not(.disabled):hover > .t-item-icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Y4OGMwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fe9815), color-stop(100%, #f88c01)); + background-image: -moz-linear-gradient(#fe9815, #f88c01); + background-image: -webkit-linear-gradient(#fe9815, #f88c01); + background-image: linear-gradient(#fe9815, #f88c01); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon, .s-btn.pause-play.paused:not(.disabled):hover > .t-item-icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .t-item-icon { + color: white; } /* line 93, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { -moz-animation-name: pulse; @@ -1940,18 +1937,17 @@ body.desktop.mini-tab { /* line 303, ../../../../general/res/sass/_mixins.scss */ body.desktop.mini-tab.collapsed .icon, body.desktop.mini-tab.collapsed .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); - background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); - background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); - background-image: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); + background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); + background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); + background-image: linear-gradient(#6b6b6b, #5e5e5e); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { + color: #33ccff; } /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ body.desktop.mini-tab.collapsed:before { opacity: 0; } @@ -2950,7 +2946,7 @@ body.desktop ::-webkit-scrollbar-corner { .menu ul { margin: 0; padding: 0; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 358, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -4014,7 +4010,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 119, ../../../../general/res/sass/forms/_elems.scss */ @@ -4072,7 +4068,7 @@ input[type="search"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error, input[type="search"].error { background: rgba(255, 0, 0, 0.5); } @@ -4102,7 +4098,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -4164,18 +4160,17 @@ textarea { /* line 303, ../../../../general/res/sass/_mixins.scss */ .select .icon, .select .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .select:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); - background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); - background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); - background-image: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .select:not(.disabled):hover > .icon, .select:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .select:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); + background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); + background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); + background-image: linear-gradient(#6b6b6b, #5e5e5e); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .select:not(.disabled):hover > .icon, .select:not(.disabled):hover > .t-item-icon { + color: #33ccff; } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; @@ -4255,7 +4250,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../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 */ @@ -4642,7 +4637,7 @@ span.req { border: none; color: #cccccc; outline: none; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ .s-filter input[type="search"].error { background: rgba(255, 0, 0, 0.5); } /* line 135, ../../../../general/res/sass/forms/_filter.scss */ @@ -5914,18 +5909,17 @@ body.desktop .desktop-hide { /* line 303, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2E2YTZhNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzk5OTk5OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a6a6a6), color-stop(100%, #999999)); - background-image: -moz-linear-gradient(#a6a6a6, #999999); - background-image: -webkit-linear-gradient(#a6a6a6, #999999); - background-image: linear-gradient(#a6a6a6, #999999); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2E2YTZhNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzk5OTk5OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a6a6a6), color-stop(100%, #999999)); + background-image: -moz-linear-gradient(#a6a6a6, #999999); + background-image: -webkit-linear-gradient(#a6a6a6, #999999); + background-image: linear-gradient(#a6a6a6, #999999); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { + color: white; } /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:first-child, .overlay .bottom-bar .s-menu-btn:first-child { margin-left: 0; } @@ -6083,7 +6077,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 358, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -6397,48 +6391,47 @@ mct-representation.s-status-pending .t-object-label .t-title-label { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 27, ../../../../general/res/sass/mobile/_tree.scss */ - ul.tree ul.tree { - margin-left: 15px; } +/* line 27, ../../../../general/res/sass/mobile/_tree.scss */ +body.touch ul.tree ul.tree { + margin-left: 15px; } +/* line 31, ../../../../general/res/sass/mobile/_tree.scss */ +body.touch .tree-item, +body.touch .search-result-item { + height: 35px !important; + line-height: 35px !important; + margin-bottom: 0px !important; } + /* line 36, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .view-control, + body.touch .search-result-item .view-control { + font-size: 1.2em; + margin-right: 0; + order: 2; + width: 35px; } + /* line 42, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .view-control.has-children:before, + body.touch .search-result-item .view-control.has-children:before { + content: "\7d"; + left: 50%; + -moz-transform: translateX(-50%) rotate(270deg); + -ms-transform: translateX(-50%) rotate(270deg); + -webkit-transform: translateX(-50%) rotate(270deg); + transform: translateX(-50%) rotate(270deg); } + /* line 47, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .view-control.has-children.expanded:before, + body.touch .search-result-item .view-control.has-children.expanded:before { + -moz-transform: translateX(-50%) rotate(90deg); + -ms-transform: translateX(-50%) rotate(90deg); + -webkit-transform: translateX(-50%) rotate(90deg); + transform: translateX(-50%) rotate(90deg); } + /* line 52, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .t-object-label, + body.touch .search-result-item .t-object-label { + line-height: inherit; } + /* line 54, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before, + body.touch .search-result-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before { + bottom: 20%; } - /* line 31, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item, - .search-result-item { - height: 35px !important; - line-height: 35px !important; - margin-bottom: 0px !important; } - /* line 36, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .view-control, - .search-result-item .view-control { - font-size: 1.2em; - margin-right: 0; - order: 2; - width: 35px; } - /* line 42, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .view-control.has-children:before, - .search-result-item .view-control.has-children:before { - content: "\7d"; - left: 50%; - -moz-transform: translateX(-50%) rotate(90deg); - -ms-transform: translateX(-50%) rotate(90deg); - -webkit-transform: translateX(-50%) rotate(90deg); - transform: translateX(-50%) rotate(90deg); } - /* line 47, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .view-control.has-children.expanded:before, - .search-result-item .view-control.has-children.expanded:before { - -moz-transform: translateX(-50%) rotate(270deg); - -ms-transform: translateX(-50%) rotate(270deg); - -webkit-transform: translateX(-50%) rotate(270deg); - transform: translateX(-50%) rotate(270deg); } - /* line 52, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .t-object-label, - .search-result-item .t-object-label { - line-height: inherit; } - /* line 54, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before, - .search-result-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before { - bottom: 20%; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -7439,18 +7432,17 @@ table { /* line 303, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959)); - background-image: -moz-linear-gradient(#666666, #595959); - background-image: -webkit-linear-gradient(#666666, #595959); - background-image: linear-gradient(#666666, #595959); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover > .icon, .items-holder .item.grid-item:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959)); + background-image: -moz-linear-gradient(#666666, #595959); + background-image: -webkit-linear-gradient(#666666, #595959); + background-image: linear-gradient(#666666, #595959); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover > .icon, .items-holder .item.grid-item:not(.disabled):hover > .t-item-icon { + color: #33ccff; } /* line 44, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: deepskyblue; } @@ -7582,18 +7574,17 @@ table { /* line 303, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon, .items-holder .item.grid-item.selected .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item.selected:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1ac6ff), color-stop(100%, #00bfff)); - background-image: -moz-linear-gradient(#1ac6ff, #00bfff); - background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); - background-image: linear-gradient(#1ac6ff, #00bfff); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item.selected:not(.disabled):hover > .icon, .items-holder .item.grid-item.selected:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item.selected:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1ac6ff), color-stop(100%, #00bfff)); + background-image: -moz-linear-gradient(#1ac6ff, #00bfff); + background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); + background-image: linear-gradient(#1ac6ff, #00bfff); } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item.selected:not(.disabled):hover > .icon, .items-holder .item.grid-item.selected:not(.disabled):hover > .t-item-icon { + color: #33ccff; } /* line 126, ../../../../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), .items-holder .item.grid-item.selected .top-bar .t-item-icon:not(.alert) { color: #80dfff; } @@ -7628,80 +7619,86 @@ table { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - width: 100%; } - /* line 33, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item > .contents { - top: 0px; - right: 10px; - bottom: 0px; - left: 10px; } - /* line 37, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - bottom: 0 !important; - left: auto !important; - right: 20px !important; - width: 40px !important; - height: auto !important; - text-align: right; } - /* line 44, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - left: 40px; - right: 60px; } - /* line 52, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type, - .items-holder .item.grid-item .item-main .t-item-icon { - font-size: 30px; - left: 15px; - line-height: normal; } - /* line 58, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - display: block; - opacity: 1; - font-size: 1em; - width: auto; } } -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { - /* line 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - height: 50px; } - /* line 71, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - line-height: 50px !important; } - /* line 75, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - top: 7px; - bottom: auto; - height: 35px; } - /* line 80, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - top: 10px; - bottom: auto; - height: 30px; } - /* line 83, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - line-height: 50px; } } -@media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - height: 66px; } - /* line 93, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - line-height: 66px !important; } - /* line 97, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - top: 15px; - bottom: auto; - height: 35px; } - /* line 102, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - top: 18px; - bottom: auto; - height: 30px; } - /* line 105, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - line-height: 66px; } } +/* line 41, ../../../../general/res/sass/mobile/_item.scss */ +body.phone .items-holder .item.grid-item, +body.tablet .items-holder .item.grid-item { + width: 100%; } + /* line 43, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item > .contents, + body.tablet .items-holder .item.grid-item > .contents { + top: 0px; + right: 10px; + bottom: 0px; + left: 10px; } + /* line 47, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.top-bar, + body.tablet .items-holder .item.grid-item .bar.top-bar { + bottom: 0 !important; + left: auto !important; + right: 20px !important; + width: 40px !important; + height: auto !important; + text-align: right; } + /* line 53, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.bottom-bar, + body.tablet .items-holder .item.grid-item .bar.bottom-bar { + left: 40px; + right: 60px; } + /* line 61, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-type, + body.phone .items-holder .item.grid-item .item-main .t-item-icon, + body.tablet .items-holder .item.grid-item .item-main .item-type, + body.tablet .items-holder .item.grid-item .item-main .t-item-icon { + font-size: 30px; + left: 15px; + line-height: normal; } + /* line 67, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-open, + body.tablet .items-holder .item.grid-item .item-main .item-open { + display: block; + opacity: 1; + font-size: 1em; + width: auto; } + +/* line 82, ../../../../general/res/sass/mobile/_item.scss */ +body.phone .items-holder .item.grid-item { + height: 50px; } + /* line 86, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.top-bar { + line-height: 50px !important; } + /* line 90, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.bottom-bar { + top: 7px; + bottom: auto; + height: 35px; } + /* line 95, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-type { + top: 10px; + bottom: auto; + height: 30px; } + /* line 98, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-open { + line-height: 50px; } + +/* line 110, ../../../../general/res/sass/mobile/_item.scss */ +body.tablet .items-holder .item.grid-item { + height: 66px; } + /* line 114, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .bar.top-bar { + line-height: 66px !important; } + /* line 118, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .bar.bottom-bar { + top: 15px; + bottom: auto; + height: 35px; } + /* line 123, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .item-main .item-type { + top: 18px; + bottom: auto; + height: 30px; } + /* line 126, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .item-main .item-open { + line-height: 66px; } /********************************* TO BE MOVED */ /***************************************************************************** diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 82edec1ea5..22dcb7b786 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1689,13 +1689,12 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 303, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { - background-image: deepskyblue; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon, .s-btn.major:not(.disabled):hover > .t-item-icon, .major.s-menu-btn:not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { + background-image: deepskyblue; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon, .s-btn.major:not(.disabled):hover > .t-item-icon, .major.s-menu-btn:not(.disabled):hover > .t-item-icon { + color: white; } /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn:not(.major), .s-menu-btn:not(.major) { background-color: #969696; @@ -1719,13 +1718,12 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 303, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #eee; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { - background-image: #0099cc; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon, .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { + background-image: #0099cc; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon, .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { + color: white; } /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.t-save:before, .t-save.s-menu-btn:before { content: '\e612'; @@ -1764,13 +1762,12 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 303, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { - background-image: #ffad33; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon, .s-btn.pause-play.paused:not(.disabled):hover > .t-item-icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { + background-image: #ffad33; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon, .s-btn.pause-play.paused:not(.disabled):hover > .t-item-icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .t-item-icon { + color: white; } /* line 93, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { -moz-animation-name: pulse; @@ -1870,13 +1867,12 @@ body.desktop.mini-tab { /* line 303, ../../../../general/res/sass/_mixins.scss */ body.desktop.mini-tab.collapsed .icon, body.desktop.mini-tab.collapsed .t-item-icon { color: #eee; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover { - background-image: #0099cc; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover { + background-image: #0099cc; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { + color: white; } /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ body.desktop.mini-tab.collapsed:before { opacity: 0; } @@ -2696,48 +2692,46 @@ body.desktop .object-header:hover .context-available { color: inherit; } /******************************************************** BROWSER ELEMENTS */ -@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 485, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: inset rgba(0, 0, 0, 0.2) 0 1px 2px; - background-color: rgba(0, 0, 0, 0.1); - height: 10px; - width: 10px; } - - /* line 494, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar-thumb { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); +/* line 485, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop ::-webkit-scrollbar { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: inset rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: inset rgba(0, 0, 0, 0.2) 0 1px 2px; + background-color: rgba(0, 0, 0, 0.1); + height: 10px; + width: 10px; } +/* line 494, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop ::-webkit-scrollbar-thumb { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #898989), color-stop(100%, #7d7d7d)); + background-image: -moz-linear-gradient(#898989, #7d7d7d 20px); + background-image: -webkit-linear-gradient(#898989, #7d7d7d 20px); + background-image: linear-gradient(#898989, #7d7d7d 20px); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } + /* line 501, ../../../../general/res/sass/controls/_controls.scss */ + body.desktop ::-webkit-scrollbar-thumb:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #898989), color-stop(100%, #7d7d7d)); - background-image: -moz-linear-gradient(#898989, #7d7d7d 20px); - background-image: -webkit-linear-gradient(#898989, #7d7d7d 20px); - background-image: linear-gradient(#898989, #7d7d7d 20px); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; } - /* line 501, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar-thumb:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #00ace6), color-stop(100%, #0099cc)); - background-image: -moz-linear-gradient(#00ace6, #0099cc 20px); - background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); - background-image: linear-gradient(#00ace6, #0099cc 20px); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #00ace6), color-stop(100%, #0099cc)); + background-image: -moz-linear-gradient(#00ace6, #0099cc 20px); + background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); + background-image: linear-gradient(#00ace6, #0099cc 20px); } +/* line 506, ../../../../general/res/sass/controls/_controls.scss */ +body.desktop ::-webkit-scrollbar-corner { + background: rgba(0, 0, 0, 0.1); } - /* line 506, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar-corner { - background: rgba(0, 0, 0, 0.1); } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2871,7 +2865,7 @@ body.desktop .object-header:hover .context-available { .menu ul { margin: 0; padding: 0; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 358, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -3935,7 +3929,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 119, ../../../../general/res/sass/forms/_elems.scss */ @@ -3993,7 +3987,7 @@ input[type="search"] { color: #666; outline: none; padding: 0 3px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error, input[type="search"].error { background: rgba(255, 0, 0, 0.5); } @@ -4023,7 +4017,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -4154,7 +4148,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../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 */ @@ -4541,7 +4535,7 @@ span.req { border: none; color: #666; outline: none; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 325, ../../../../general/res/sass/_mixins.scss */ .s-filter input[type="search"].error { background: rgba(255, 0, 0, 0.5); } /* line 135, ../../../../general/res/sass/forms/_filter.scss */ @@ -5795,13 +5789,12 @@ body.desktop .desktop-hide { /* line 303, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover { - background-image: #7d7d7d; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { - color: white; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover { + background-image: #7d7d7d; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { + color: white; } /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:first-child, .overlay .bottom-bar .s-menu-btn:first-child { margin-left: 0; } @@ -5959,7 +5952,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 358, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -6272,48 +6265,47 @@ mct-representation.s-status-pending .t-object-label .t-title-label { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 27, ../../../../general/res/sass/mobile/_tree.scss */ - ul.tree ul.tree { - margin-left: 15px; } +/* line 27, ../../../../general/res/sass/mobile/_tree.scss */ +body.touch ul.tree ul.tree { + margin-left: 15px; } +/* line 31, ../../../../general/res/sass/mobile/_tree.scss */ +body.touch .tree-item, +body.touch .search-result-item { + height: 35px !important; + line-height: 35px !important; + margin-bottom: 0px !important; } + /* line 36, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .view-control, + body.touch .search-result-item .view-control { + font-size: 1.2em; + margin-right: 0; + order: 2; + width: 35px; } + /* line 42, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .view-control.has-children:before, + body.touch .search-result-item .view-control.has-children:before { + content: "\7d"; + left: 50%; + -moz-transform: translateX(-50%) rotate(270deg); + -ms-transform: translateX(-50%) rotate(270deg); + -webkit-transform: translateX(-50%) rotate(270deg); + transform: translateX(-50%) rotate(270deg); } + /* line 47, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .view-control.has-children.expanded:before, + body.touch .search-result-item .view-control.has-children.expanded:before { + -moz-transform: translateX(-50%) rotate(90deg); + -ms-transform: translateX(-50%) rotate(90deg); + -webkit-transform: translateX(-50%) rotate(90deg); + transform: translateX(-50%) rotate(90deg); } + /* line 52, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .t-object-label, + body.touch .search-result-item .t-object-label { + line-height: inherit; } + /* line 54, ../../../../general/res/sass/mobile/_tree.scss */ + body.touch .tree-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before, + body.touch .search-result-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before { + bottom: 20%; } - /* line 31, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item, - .search-result-item { - height: 35px !important; - line-height: 35px !important; - margin-bottom: 0px !important; } - /* line 36, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .view-control, - .search-result-item .view-control { - font-size: 1.2em; - margin-right: 0; - order: 2; - width: 35px; } - /* line 42, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .view-control.has-children:before, - .search-result-item .view-control.has-children:before { - content: "\7d"; - left: 50%; - -moz-transform: translateX(-50%) rotate(90deg); - -ms-transform: translateX(-50%) rotate(90deg); - -webkit-transform: translateX(-50%) rotate(90deg); - transform: translateX(-50%) rotate(90deg); } - /* line 47, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .view-control.has-children.expanded:before, - .search-result-item .view-control.has-children.expanded:before { - -moz-transform: translateX(-50%) rotate(270deg); - -ms-transform: translateX(-50%) rotate(270deg); - -webkit-transform: translateX(-50%) rotate(270deg); - transform: translateX(-50%) rotate(270deg); } - /* line 52, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .t-object-label, - .search-result-item .t-object-label { - line-height: inherit; } - /* line 54, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before, - .search-result-item .t-object-label .t-item-icon.l-icon-link .t-item-icon-glyph:before { - bottom: 20%; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -7305,13 +7297,12 @@ table { /* line 303, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover { - background-image: #d0d0d0; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover > .icon, .items-holder .item.grid-item:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } + /* line 307, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover { + background-image: #d0d0d0; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover > .icon, .items-holder .item.grid-item:not(.disabled):hover > .t-item-icon { + color: #33ccff; } /* line 44, ../../../../general/res/sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: deepskyblue; } @@ -7468,80 +7459,86 @@ table { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - width: 100%; } - /* line 33, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item > .contents { - top: 0px; - right: 10px; - bottom: 0px; - left: 10px; } - /* line 37, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - bottom: 0 !important; - left: auto !important; - right: 20px !important; - width: 40px !important; - height: auto !important; - text-align: right; } - /* line 44, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - left: 40px; - right: 60px; } - /* line 52, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type, - .items-holder .item.grid-item .item-main .t-item-icon { - font-size: 30px; - left: 15px; - line-height: normal; } - /* line 58, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - display: block; - opacity: 1; - font-size: 1em; - width: auto; } } -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { - /* line 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - height: 50px; } - /* line 71, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - line-height: 50px !important; } - /* line 75, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - top: 7px; - bottom: auto; - height: 35px; } - /* line 80, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - top: 10px; - bottom: auto; - height: 30px; } - /* line 83, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - line-height: 50px; } } -@media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - height: 66px; } - /* line 93, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - line-height: 66px !important; } - /* line 97, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - top: 15px; - bottom: auto; - height: 35px; } - /* line 102, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - top: 18px; - bottom: auto; - height: 30px; } - /* line 105, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - line-height: 66px; } } +/* line 41, ../../../../general/res/sass/mobile/_item.scss */ +body.phone .items-holder .item.grid-item, +body.tablet .items-holder .item.grid-item { + width: 100%; } + /* line 43, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item > .contents, + body.tablet .items-holder .item.grid-item > .contents { + top: 0px; + right: 10px; + bottom: 0px; + left: 10px; } + /* line 47, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.top-bar, + body.tablet .items-holder .item.grid-item .bar.top-bar { + bottom: 0 !important; + left: auto !important; + right: 20px !important; + width: 40px !important; + height: auto !important; + text-align: right; } + /* line 53, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.bottom-bar, + body.tablet .items-holder .item.grid-item .bar.bottom-bar { + left: 40px; + right: 60px; } + /* line 61, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-type, + body.phone .items-holder .item.grid-item .item-main .t-item-icon, + body.tablet .items-holder .item.grid-item .item-main .item-type, + body.tablet .items-holder .item.grid-item .item-main .t-item-icon { + font-size: 30px; + left: 15px; + line-height: normal; } + /* line 67, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-open, + body.tablet .items-holder .item.grid-item .item-main .item-open { + display: block; + opacity: 1; + font-size: 1em; + width: auto; } + +/* line 82, ../../../../general/res/sass/mobile/_item.scss */ +body.phone .items-holder .item.grid-item { + height: 50px; } + /* line 86, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.top-bar { + line-height: 50px !important; } + /* line 90, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .bar.bottom-bar { + top: 7px; + bottom: auto; + height: 35px; } + /* line 95, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-type { + top: 10px; + bottom: auto; + height: 30px; } + /* line 98, ../../../../general/res/sass/mobile/_item.scss */ + body.phone .items-holder .item.grid-item .item-main .item-open { + line-height: 50px; } + +/* line 110, ../../../../general/res/sass/mobile/_item.scss */ +body.tablet .items-holder .item.grid-item { + height: 66px; } + /* line 114, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .bar.top-bar { + line-height: 66px !important; } + /* line 118, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .bar.bottom-bar { + top: 15px; + bottom: auto; + height: 35px; } + /* line 123, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .item-main .item-type { + top: 18px; + bottom: auto; + height: 30px; } + /* line 126, ../../../../general/res/sass/mobile/_item.scss */ + body.tablet .items-holder .item.grid-item .item-main .item-open { + line-height: 66px; } /********************************* TO BE MOVED */ /***************************************************************************** From f6cb76354ec5448a5fa69b70c52fbb8d9657659d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 17 Feb 2016 16:34:33 -0800 Subject: [PATCH 05/20] [Frontend] Refactoring to use Victorizr instead of media queries open #639 open #683 open #169 MQs refactored in mobile/_layout.scss; --- .../general/res/sass/mobile/_layout.scss | 11 +- .../espresso/res/css/theme-espresso.css | 342 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 342 +++++++++--------- 3 files changed, 324 insertions(+), 371 deletions(-) diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index 3531ccb112..01790dbfee 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -20,14 +20,7 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -@include phoneandtablet { - // Wrapper of the entire 2 panes, only enacted on - // phone and tablet. Also for the panes - .browse-wrapper, - .pane { - top: 0 !important; right: 0; bottom: 0; left: 0; - } - +body.mobile { .pane.left.treeview { background-color: $colorMobilePaneLeft; } @@ -141,7 +134,7 @@ } } -@include phonePortrait { +body.phone.portrait { .pane-tree-showing { .pane.left.treeview { width: $proporMenuOnly !important; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 8ca579bea4..fb7a8ea70d 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -5203,196 +5203,176 @@ body.desktop .pane.primary-pane .object-browse-bar { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 26, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-wrapper, - .pane { - top: 0 !important; - right: 0; - bottom: 0; - left: 0; } - - /* line 31, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.left.treeview { - background-color: #262626; } - - /* line 35, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right.items { +/* line 31, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane.left.treeview { + background-color: #262626; } +/* line 35, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane.right.items { + -moz-transition-duration: 0.35s; + -o-transition-duration: 0.35s; + -webkit-transition-duration: 0.35s; + transition-duration: 0.35s; + transition-timing-function: ease; + backface-visibility: hidden; + margin-left: 0 !important; } + /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .pane.right.items .holder-object-and-inspector { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; -webkit-transition-duration: 0.35s; transition-duration: 0.35s; transition-timing-function: ease; backface-visibility: hidden; - margin-left: 0 !important; } - /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right.items .holder-object-and-inspector { - -moz-transition-duration: 0.35s; - -o-transition-duration: 0.35s; - -webkit-transition-duration: 0.35s; - transition-duration: 0.35s; - transition-timing-function: ease; - backface-visibility: hidden; - left: 10px; - right: 10px; - opacity: 1; } + left: 10px; + right: 10px; + opacity: 1; } +/* line 47, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .create-btn-holder { + display: none; } +/* line 53, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .holder.holder-treeview-elements { + right: 10px !important; } +/* line 63, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-hidden .pane.left.treeview { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 150ms; + -o-transition-duration: 150ms; + -webkit-transition-duration: 150ms; + transition-duration: 150ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0 !important; } +/* line 67, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-hidden .pane.right.items { + left: 0 !important; } +/* line 80, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-showing .pane.left.treeview { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 250ms; + -o-transition-duration: 250ms; + -webkit-transition-duration: 250ms; + transition-duration: 250ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 250ms; + -o-transition-delay: 250ms; + -webkit-transition-delay: 250ms; + transition-delay: 250ms; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSI5OCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); + background-image: -webkit-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); + background-image: linear-gradient(90deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); + right: auto !important; + width: 40% !important; } +/* line 87, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-showing .pane.right.items { + left: 40% !important; } +/* line 92, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .toggle-tree { + color: #0099cc !important; + font-size: 110%; + position: absolute; + top: 12px; + left: 10px; } + /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .toggle-tree:after { + content: 'm' !important; + font-family: symbolsfont; } +/* line 104, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .object-browse-bar { + margin-left: 45px; } + /* line 106, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .object-browse-bar .context-available { + opacity: 1 !important; } + /* line 109, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .object-browse-bar .view-switcher { + margin-right: 0 !important; } + /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .object-browse-bar .view-switcher .title-label { + display: none; } +/* line 118, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .tree-holder { + overflow-x: hidden !important; } +/* line 122, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-disable-select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; } +/* line 127, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-hide, +body.mobile .mobile-hide-important { + display: none !important; } +/* line 132, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-back-hide { + pointer-events: none; + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 0.4s; + -o-transition-duration: 0.4s; + -webkit-transition-duration: 0.4s; + transition-duration: 0.4s; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0; } +/* line 137, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-back-unhide { + pointer-events: all; + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 0.4s; + -o-transition-duration: 0.4s; + -webkit-transition-duration: 0.4s; + transition-duration: 0.4s; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 1; } - /* line 47, ../../../../general/res/sass/mobile/_layout.scss */ - .create-btn-holder { - display: none; } - - /* line 53, ../../../../general/res/sass/mobile/_layout.scss */ - .holder.holder-treeview-elements { - right: 10px !important; } - - /* line 63, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-hidden .pane.left.treeview { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 150ms; - -o-transition-duration: 150ms; - -webkit-transition-duration: 150ms; - transition-duration: 150ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 0 !important; } - /* line 67, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-hidden .pane.right.items { - left: 0 !important; } - - /* line 80, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.left.treeview { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 250ms; - -o-transition-duration: 250ms; - -webkit-transition-duration: 250ms; - transition-duration: 250ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 250ms; - -o-transition-delay: 250ms; - -webkit-transition-delay: 250ms; - transition-delay: 250ms; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSI5OCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -moz-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); - background-image: -webkit-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); - background-image: linear-gradient(90deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); - right: auto !important; - width: 40% !important; } - /* line 87, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items { - left: 40% !important; } - - /* line 92, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree { - color: #0099cc !important; - font-size: 110%; - position: absolute; - top: 12px; - left: 10px; } - /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree:after { - content: 'm' !important; - font-family: symbolsfont; } - - /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar { - margin-left: 45px; } - /* line 106, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .context-available { - opacity: 1 !important; } - /* line 109, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .view-switcher { - margin-right: 0 !important; } - /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .view-switcher .title-label { - display: none; } - - /* line 118, ../../../../general/res/sass/mobile/_layout.scss */ - .tree-holder { - overflow-x: hidden !important; } - - /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-disable-select { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - - /* line 127, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-hide, - .mobile-hide-important { - display: none !important; } - - /* line 132, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-back-hide { - pointer-events: none; - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 0.4s; - -o-transition-duration: 0.4s; - -webkit-transition-duration: 0.4s; - transition-duration: 0.4s; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; +/* line 146, ../../../../general/res/sass/mobile/_layout.scss */ +body.phone.portrait .pane-tree-showing .pane.left.treeview { + width: 90% !important; } +/* line 149, ../../../../general/res/sass/mobile/_layout.scss */ +body.phone.portrait .pane-tree-showing .pane.right.items { + left: 0 !important; + -moz-transform: translateX(90%); + -ms-transform: translateX(90%); + -webkit-transform: translateX(90%); + transform: translateX(90%); } + /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ + body.phone.portrait .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } - /* line 137, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-back-unhide { - pointer-events: all; - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 0.4s; - -o-transition-duration: 0.4s; - -webkit-transition-duration: 0.4s; - transition-duration: 0.4s; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 1; } } -@media only screen and (orientation: portrait) and (max-device-width: 767px) { - /* line 146, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.left.treeview { - width: 90% !important; } - /* line 149, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items { - left: 0 !important; - -moz-transform: translateX(90%); - -ms-transform: translateX(90%); - -webkit-transform: translateX(90%); - transform: translateX(90%); } - /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items .holder-object-and-inspector { - opacity: 0; } } /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ body.desktop .desktop-hide { display: none; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 22dcb7b786..112952b231 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -5101,196 +5101,176 @@ body.desktop .pane.primary-pane .object-browse-bar { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { - /* line 26, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-wrapper, - .pane { - top: 0 !important; - right: 0; - bottom: 0; - left: 0; } - - /* line 31, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.left.treeview { - background-color: #f7f7f7; } - - /* line 35, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right.items { +/* line 31, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane.left.treeview { + background-color: #f7f7f7; } +/* line 35, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane.right.items { + -moz-transition-duration: 0.35s; + -o-transition-duration: 0.35s; + -webkit-transition-duration: 0.35s; + transition-duration: 0.35s; + transition-timing-function: ease; + backface-visibility: hidden; + margin-left: 0 !important; } + /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .pane.right.items .holder-object-and-inspector { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; -webkit-transition-duration: 0.35s; transition-duration: 0.35s; transition-timing-function: ease; backface-visibility: hidden; - margin-left: 0 !important; } - /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right.items .holder-object-and-inspector { - -moz-transition-duration: 0.35s; - -o-transition-duration: 0.35s; - -webkit-transition-duration: 0.35s; - transition-duration: 0.35s; - transition-timing-function: ease; - backface-visibility: hidden; - left: 10px; - right: 10px; - opacity: 1; } + left: 10px; + right: 10px; + opacity: 1; } +/* line 47, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .create-btn-holder { + display: none; } +/* line 53, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .holder.holder-treeview-elements { + right: 10px !important; } +/* line 63, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-hidden .pane.left.treeview { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 150ms; + -o-transition-duration: 150ms; + -webkit-transition-duration: 150ms; + transition-duration: 150ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0 !important; } +/* line 67, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-hidden .pane.right.items { + left: 0 !important; } +/* line 80, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-showing .pane.left.treeview { + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 250ms; + -o-transition-duration: 250ms; + -webkit-transition-duration: 250ms; + transition-duration: 250ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 250ms; + -o-transition-delay: 250ms; + -webkit-transition-delay: 250ms; + transition-delay: 250ms; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSI5OCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); + background-image: -webkit-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); + background-image: linear-gradient(90deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); + right: auto !important; + width: 40% !important; } +/* line 87, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .pane-tree-showing .pane.right.items { + left: 40% !important; } +/* line 92, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .toggle-tree { + color: #0099cc !important; + font-size: 110%; + position: absolute; + top: 12px; + left: 10px; } + /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .toggle-tree:after { + content: 'm' !important; + font-family: symbolsfont; } +/* line 104, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .object-browse-bar { + margin-left: 45px; } + /* line 106, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .object-browse-bar .context-available { + opacity: 1 !important; } + /* line 109, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .object-browse-bar .view-switcher { + margin-right: 0 !important; } + /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ + body.mobile .object-browse-bar .view-switcher .title-label { + display: none; } +/* line 118, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .tree-holder { + overflow-x: hidden !important; } +/* line 122, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-disable-select { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; } +/* line 127, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-hide, +body.mobile .mobile-hide-important { + display: none !important; } +/* line 132, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-back-hide { + pointer-events: none; + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 0.4s; + -o-transition-duration: 0.4s; + -webkit-transition-duration: 0.4s; + transition-duration: 0.4s; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0; } +/* line 137, ../../../../general/res/sass/mobile/_layout.scss */ +body.mobile .mobile-back-unhide { + pointer-events: all; + -moz-transition-property: opacity; + -o-transition-property: opacity; + -webkit-transition-property: opacity; + transition-property: opacity; + -moz-transition-duration: 0.4s; + -o-transition-duration: 0.4s; + -webkit-transition-duration: 0.4s; + transition-duration: 0.4s; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 1; } - /* line 47, ../../../../general/res/sass/mobile/_layout.scss */ - .create-btn-holder { - display: none; } - - /* line 53, ../../../../general/res/sass/mobile/_layout.scss */ - .holder.holder-treeview-elements { - right: 10px !important; } - - /* line 63, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-hidden .pane.left.treeview { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 150ms; - -o-transition-duration: 150ms; - -webkit-transition-duration: 150ms; - transition-duration: 150ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 0 !important; } - /* line 67, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-hidden .pane.right.items { - left: 0 !important; } - - /* line 80, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.left.treeview { - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 250ms; - -o-transition-duration: 250ms; - -webkit-transition-duration: 250ms; - transition-duration: 250ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 250ms; - -o-transition-delay: 250ms; - -webkit-transition-delay: 250ms; - transition-delay: 250ms; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSI5OCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -moz-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); - background-image: -webkit-linear-gradient(0deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); - background-image: linear-gradient(90deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); - right: auto !important; - width: 40% !important; } - /* line 87, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items { - left: 40% !important; } - - /* line 92, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree { - color: #0099cc !important; - font-size: 110%; - position: absolute; - top: 12px; - left: 10px; } - /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree:after { - content: 'm' !important; - font-family: symbolsfont; } - - /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar { - margin-left: 45px; } - /* line 106, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .context-available { - opacity: 1 !important; } - /* line 109, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .view-switcher { - margin-right: 0 !important; } - /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .view-switcher .title-label { - display: none; } - - /* line 118, ../../../../general/res/sass/mobile/_layout.scss */ - .tree-holder { - overflow-x: hidden !important; } - - /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-disable-select { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - - /* line 127, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-hide, - .mobile-hide-important { - display: none !important; } - - /* line 132, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-back-hide { - pointer-events: none; - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 0.4s; - -o-transition-duration: 0.4s; - -webkit-transition-duration: 0.4s; - transition-duration: 0.4s; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; +/* line 146, ../../../../general/res/sass/mobile/_layout.scss */ +body.phone.portrait .pane-tree-showing .pane.left.treeview { + width: 90% !important; } +/* line 149, ../../../../general/res/sass/mobile/_layout.scss */ +body.phone.portrait .pane-tree-showing .pane.right.items { + left: 0 !important; + -moz-transform: translateX(90%); + -ms-transform: translateX(90%); + -webkit-transform: translateX(90%); + transform: translateX(90%); } + /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ + body.phone.portrait .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } - /* line 137, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-back-unhide { - pointer-events: all; - -moz-transition-property: opacity; - -o-transition-property: opacity; - -webkit-transition-property: opacity; - transition-property: opacity; - -moz-transition-duration: 0.4s; - -o-transition-duration: 0.4s; - -webkit-transition-duration: 0.4s; - transition-duration: 0.4s; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - -moz-transition-delay: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 1; } } -@media only screen and (orientation: portrait) and (max-device-width: 767px) { - /* line 146, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.left.treeview { - width: 90% !important; } - /* line 149, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items { - left: 0 !important; - -moz-transform: translateX(90%); - -ms-transform: translateX(90%); - -webkit-transform: translateX(90%); - transform: translateX(90%); } - /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items .holder-object-and-inspector { - opacity: 0; } } /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ body.desktop .desktop-hide { display: none; } From fb20af24bc557447ddf89ee403cca5c85019a7e9 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 18 Feb 2016 11:20:50 -0800 Subject: [PATCH 06/20] [Frontend] Refactoring to use Victorizr instead of media queries open #639 open #683 open #169 open #335 Fixed wrong application of body.desktop.mini-tab...; Increased size of pane collapse/expand icons; Removed max-width applied to search input holder; --- .../commonUI/general/res/sass/_constants.scss | 2 +- .../general/res/sass/controls/_buttons.scss | 4 +- .../general/res/sass/search/_search.scss | 1 - .../espresso/res/css/theme-espresso.css | 179 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 179 +++++++++--------- 5 files changed, 181 insertions(+), 184 deletions(-) diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index b90cdfe6a9..ab6b729533 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -44,7 +44,7 @@ $ueAppLogoW: 105px; $ueEditToolBarH: 25px; $ueCollapsedPaneEdgeM: 22px; $uePaneMiniTabH: $ueTopBarH; -$uePaneMiniTabW: 9px; +$uePaneMiniTabW: 10px; $uePaneMiniTabCollapsedW: 11px; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index de48f9ee02..ebf3f14a70 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -111,7 +111,7 @@ $pad: $interiorMargin * $baseRatio; // Color and styling additionally in _controls.scss } -body.desktop.mini-tab { +body.desktop .mini-tab { // Meant to be used as pane hide/show control elements in concert with mct-splitter $iconH: $uePaneMiniTabH; $iconW: $uePaneMiniTabW; @@ -206,7 +206,7 @@ body.desktop.mini-tab { } } -body.desktop.mini-tab-icon { +body.desktop .mini-tab-icon { // Meant to be used as pane hide/show control elements in concert with mct-splitter $d: $uePaneMiniTabW; color: pullForward($colorBodyBg, 15%); diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index 37043ae939..d5d5727fe0 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -42,7 +42,6 @@ $iconEdgeM: 4px; $iconD: $treeSearchInputBarH - ($iconEdgeM*2); font-size: 0.8em; - max-width: 250px; position: relative; .search-input { diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index fb7a8ea70d..27dccb41ca 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1869,7 +1869,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { content: "\000039"; } /* line 114, ../../../../general/res/sass/controls/_buttons.scss */ -body.desktop.mini-tab { +body.desktop .mini-tab { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -1900,13 +1900,13 @@ body.desktop.mini-tab { position: absolute; line-height: 24px; height: 24px; - width: 9px; + width: 10px; text-align: center; } /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:hover { + body.desktop .mini-tab:hover { color: #0099cc; } /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed { + body.desktop .mini-tab.collapsed { background-color: #454545; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1935,10 +1935,10 @@ body.desktop.mini-tab { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } /* line 303, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed .icon, body.desktop.mini-tab.collapsed .t-item-icon { + body.desktop .mini-tab.collapsed .icon, body.desktop .mini-tab.collapsed .t-item-icon { color: #0099cc; } /* line 307, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover { + body.desktop .mini-tab.collapsed:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); @@ -1946,22 +1946,22 @@ body.desktop.mini-tab { background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); background-image: linear-gradient(#6b6b6b, #5e5e5e); } /* line 309, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { + body.desktop .mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: #33ccff; } /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:before { + body.desktop .mini-tab.collapsed:before { opacity: 0; } /* line 146, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:after { + body.desktop .mini-tab.collapsed:after { opacity: 1; } /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:hover:before { + body.desktop .mini-tab.collapsed:hover:before { opacity: 1; } /* line 149, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:hover:after { + body.desktop .mini-tab.collapsed:hover:after { opacity: 0; } /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:before, body.desktop.mini-tab:after { + body.desktop .mini-tab:before, body.desktop .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; -webkit-transition-property: left, right, opacity; @@ -1982,22 +1982,22 @@ body.desktop.mini-tab { height: 100%; position: absolute; } /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:before { + body.desktop .mini-tab:before { width: 9px; } /* line 166, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:after { + body.desktop .mini-tab:after { width: 100%; text-align: center; opacity: 0; } /* line 173, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left { + body.desktop .mini-tab.anchor-left { text-align: right; } /* line 176, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left:before { + body.desktop .mini-tab.anchor-left:before { content: '\3c'; right: 0; } /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left.collapsed { + body.desktop .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; border-top-left-radius: 0; @@ -2006,21 +2006,21 @@ body.desktop.mini-tab { border-bottom-left-radius: 0; text-align: left; } /* line 183, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left.collapsed:before { + body.desktop .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left.collapsed:hover:before { + body.desktop .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right { + body.desktop .mini-tab.anchor-right { text-align: left; } /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right:before { + body.desktop .mini-tab.anchor-right:before { content: '\3e'; left: 0; } /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right.collapsed { + body.desktop .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; border-top-right-radius: 0; @@ -2028,40 +2028,40 @@ body.desktop.mini-tab { -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right.collapsed:before { + body.desktop .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } /* line 204, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right.collapsed:hover:before { + body.desktop .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } /* line 209, ../../../../general/res/sass/controls/_buttons.scss */ -body.desktop.mini-tab-icon { +body.desktop .mini-tab-icon { color: #595959; cursor: pointer; display: block; font-family: symbolsfont; - font-size: 9px; + font-size: 10px; position: absolute; - height: 9px; - width: 9px; - line-height: 9px; + height: 10px; + width: 10px; + line-height: 10px; overflow: hidden; word-break: break-all; } /* line 223, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon.collapsed { + body.desktop .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } /* line 228, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon:before, body.desktop.mini-tab-icon:after { + body.desktop .mini-tab-icon:before, body.desktop .mini-tab-icon:after { position: absolute; display: inherit; } /* line 234, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon:before { + body.desktop .mini-tab-icon:before { content: '\78'; } /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon:hover { + body.desktop .mini-tab-icon:hover { color: #0099cc; } /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ @@ -4859,10 +4859,10 @@ body.desktop .pane .mini-tab-icon.toggle-pane { /* line 169, ../../../../general/res/sass/user-environ/_layout.scss */ body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left { left: 0; - -moz-transform: translateX(-34px); - -ms-transform: translateX(-34px); - -webkit-transform: translateX(-34px); - transform: translateX(-34px); } + -moz-transform: translateX(-35px); + -ms-transform: translateX(-35px); + -webkit-transform: translateX(-35px); + transform: translateX(-35px); } /* line 172, ../../../../general/res/sass/user-environ/_layout.scss */ body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:after { content: '\6d'; } @@ -5203,10 +5203,10 @@ body.desktop .pane.primary-pane .object-browse-bar { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 31, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 24, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane.left.treeview { background-color: #262626; } -/* line 35, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 28, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane.right.items { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; @@ -5215,7 +5215,7 @@ body.mobile .pane.right.items { transition-timing-function: ease; backface-visibility: hidden; margin-left: 0 !important; } - /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 32, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane.right.items .holder-object-and-inspector { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; @@ -5226,13 +5226,13 @@ body.mobile .pane.right.items { left: 10px; right: 10px; opacity: 1; } -/* line 47, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 40, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .create-btn-holder { display: none; } -/* line 53, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 46, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .holder.holder-treeview-elements { right: 10px !important; } -/* line 63, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 56, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-hidden .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -5251,10 +5251,10 @@ body.mobile .pane-tree-hidden .pane.left.treeview { -webkit-transition-delay: 0; transition-delay: 0; opacity: 0 !important; } -/* line 67, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 60, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-hidden .pane.right.items { left: 0 !important; } -/* line 80, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 73, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-showing .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -5279,46 +5279,46 @@ body.mobile .pane-tree-showing .pane.left.treeview { background-image: linear-gradient(90deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); right: auto !important; width: 40% !important; } -/* line 87, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 80, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-showing .pane.right.items { left: 40% !important; } -/* line 92, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 85, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .toggle-tree { color: #0099cc !important; font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 91, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .toggle-tree:after { content: 'm' !important; font-family: symbolsfont; } -/* line 104, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 97, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar { margin-left: 45px; } - /* line 106, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 99, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar .context-available { opacity: 1 !important; } - /* line 109, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 102, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar .view-switcher .title-label { display: none; } -/* line 118, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 111, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .tree-holder { overflow-x: hidden !important; } -/* line 122, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 115, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-disable-select { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } -/* line 127, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 120, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-hide, body.mobile .mobile-hide-important { display: none !important; } -/* line 132, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 125, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -5338,7 +5338,7 @@ body.mobile .mobile-back-hide { -webkit-transition-delay: 0; transition-delay: 0; opacity: 0; } -/* line 137, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 130, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -5359,21 +5359,21 @@ body.mobile .mobile-back-unhide { transition-delay: 0; opacity: 1; } -/* line 146, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 139, ../../../../general/res/sass/mobile/_layout.scss */ body.phone.portrait .pane-tree-showing .pane.left.treeview { width: 90% !important; } -/* line 149, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 142, ../../../../general/res/sass/mobile/_layout.scss */ body.phone.portrait .pane-tree-showing .pane.right.items { left: 0 !important; -moz-transform: translateX(90%); -ms-transform: translateX(90%); -webkit-transform: translateX(90%); transform: translateX(90%); } - /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 145, ../../../../general/res/sass/mobile/_layout.scss */ body.phone.portrait .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } -/* line 160, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 153, ../../../../general/res/sass/mobile/_layout.scss */ body.desktop .desktop-hide { display: none; } @@ -5564,13 +5564,12 @@ body.desktop .desktop-hide { /* line 40, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar { font-size: 0.8em; - max-width: 250px; position: relative; } - /* line 48, ../../../../general/res/sass/search/_search.scss */ + /* line 47, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-input { height: 25px; line-height: 25px; } - /* line 53, ../../../../general/res/sass/search/_search.scss */ + /* line 52, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar:before, .holder-search .search-bar .clear-icon, .holder-search .search-bar .menu-icon { @@ -5584,16 +5583,16 @@ body.desktop .desktop-hide { position: absolute; text-align: center; top: 4px; } - /* line 66, ../../../../general/res/sass/search/_search.scss */ + /* line 65, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-input { position: relative; width: 100%; padding-left: 22px !important; padding-right: 44px !important; } - /* line 73, ../../../../general/res/sass/search/_search.scss */ + /* line 72, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-input input { width: inherit; } - /* line 78, ../../../../general/res/sass/search/_search.scss */ + /* line 77, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar:before { content: '\4d'; font-family: symbolsfont; @@ -5616,40 +5615,40 @@ body.desktop .desktop-hide { transition-delay: 0; pointer-events: none; z-index: 1; } - /* line 89, ../../../../general/res/sass/search/_search.scss */ + /* line 88, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar:hover:before { color: #8c8c8c; } - /* line 93, ../../../../general/res/sass/search/_search.scss */ + /* line 92, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .clear-icon { right: 22px; visibility: hidden; opacity: 0; } - /* line 99, ../../../../general/res/sass/search/_search.scss */ + /* line 98, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .clear-icon.show { visibility: visible; opacity: 1; } - /* line 104, ../../../../general/res/sass/search/_search.scss */ + /* line 103, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .clear-icon:hover { color: #8c8c8c; } - /* line 109, ../../../../general/res/sass/search/_search.scss */ + /* line 108, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .menu-icon { font-size: 0.8em; padding-right: 4px; right: 4px; text-align: right; } - /* line 111, ../../../../general/res/sass/search/_search.scss */ + /* line 110, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .menu-icon:before { content: '\76'; } - /* line 117, ../../../../general/res/sass/search/_search.scss */ + /* line 116, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .menu-icon:hover { color: #8c8c8c; } - /* line 122, ../../../../general/res/sass/search/_search.scss */ + /* line 121, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-menu-holder { float: right; left: -20px; z-index: 70; transition: visibility .05s, opacity .05s; } -/* line 130, ../../../../general/res/sass/search/_search.scss */ +/* line 129, ../../../../general/res/sass/search/_search.scss */ .holder-search .active-filter-display { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -5657,7 +5656,7 @@ body.desktop .desktop-hide { line-height: 130%; padding-left: 1.575em; font-size: 0.7em; } - /* line 138, ../../../../general/res/sass/search/_search.scss */ + /* line 137, ../../../../general/res/sass/search/_search.scss */ .holder-search .active-filter-display .clear-filters-icon { color: #737373; opacity: 1; @@ -5665,7 +5664,7 @@ body.desktop .desktop-hide { position: absolute; left: 1px; cursor: pointer; } -/* line 148, ../../../../general/res/sass/search/_search.scss */ +/* line 147, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results { -moz-transition-property: opacity, visibility; -o-transition-property: opacity, visibility; @@ -5684,16 +5683,16 @@ body.desktop .desktop-hide { -webkit-transition-delay: 0; transition-delay: 0; padding-right: 5px; } - /* line 151, ../../../../general/res/sass/search/_search.scss */ + /* line 150, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results .hint { margin-bottom: 10px; font-size: 0.65em; opacity: 0.6; } - /* line 156, ../../../../general/res/sass/search/_search.scss */ + /* line 155, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results.active { visibility: visible; opacity: 1; } - /* line 160, ../../../../general/res/sass/search/_search.scss */ + /* line 159, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results .load-more-button { -moz-transform: translateX(-50%); -ms-transform: translateX(-50%); diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 112952b231..292d294305 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1808,7 +1808,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { content: "\000039"; } /* line 114, ../../../../general/res/sass/controls/_buttons.scss */ -body.desktop.mini-tab { +body.desktop .mini-tab { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; @@ -1839,13 +1839,13 @@ body.desktop.mini-tab { position: absolute; line-height: 24px; height: 24px; - width: 9px; + width: 10px; text-align: center; } /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:hover { + body.desktop .mini-tab:hover { color: #0099cc; } /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed { + body.desktop .mini-tab.collapsed { background-color: #969696; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1865,28 +1865,28 @@ body.desktop.mini-tab { transition: background, 0.25s; text-shadow: none; } /* line 303, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed .icon, body.desktop.mini-tab.collapsed .t-item-icon { + body.desktop .mini-tab.collapsed .icon, body.desktop .mini-tab.collapsed .t-item-icon { color: #eee; } /* line 307, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover { + body.desktop .mini-tab.collapsed:not(.disabled):hover { background-image: #0099cc; } /* line 309, ../../../../general/res/sass/_mixins.scss */ - body.desktop.mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop.mini-tab.collapsed:not(.disabled):hover > .t-item-icon { + body.desktop .mini-tab.collapsed:not(.disabled):hover > .icon, body.desktop .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: white; } /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:before { + body.desktop .mini-tab.collapsed:before { opacity: 0; } /* line 146, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:after { + body.desktop .mini-tab.collapsed:after { opacity: 1; } /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:hover:before { + body.desktop .mini-tab.collapsed:hover:before { opacity: 1; } /* line 149, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.collapsed:hover:after { + body.desktop .mini-tab.collapsed:hover:after { opacity: 0; } /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:before, body.desktop.mini-tab:after { + body.desktop .mini-tab:before, body.desktop .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; -webkit-transition-property: left, right, opacity; @@ -1907,22 +1907,22 @@ body.desktop.mini-tab { height: 100%; position: absolute; } /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:before { + body.desktop .mini-tab:before { width: 9px; } /* line 166, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab:after { + body.desktop .mini-tab:after { width: 100%; text-align: center; opacity: 0; } /* line 173, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left { + body.desktop .mini-tab.anchor-left { text-align: right; } /* line 176, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left:before { + body.desktop .mini-tab.anchor-left:before { content: '\3c'; right: 0; } /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left.collapsed { + body.desktop .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; border-top-left-radius: 0; @@ -1931,21 +1931,21 @@ body.desktop.mini-tab { border-bottom-left-radius: 0; text-align: left; } /* line 183, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left.collapsed:before { + body.desktop .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-left.collapsed:hover:before { + body.desktop .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right { + body.desktop .mini-tab.anchor-right { text-align: left; } /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right:before { + body.desktop .mini-tab.anchor-right:before { content: '\3e'; left: 0; } /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right.collapsed { + body.desktop .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; border-top-right-radius: 0; @@ -1953,40 +1953,40 @@ body.desktop.mini-tab { -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right.collapsed:before { + body.desktop .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } /* line 204, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab.anchor-right.collapsed:hover:before { + body.desktop .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } /* line 209, ../../../../general/res/sass/controls/_buttons.scss */ -body.desktop.mini-tab-icon { +body.desktop .mini-tab-icon { color: #d6d6d6; cursor: pointer; display: block; font-family: symbolsfont; - font-size: 9px; + font-size: 10px; position: absolute; - height: 9px; - width: 9px; - line-height: 9px; + height: 10px; + width: 10px; + line-height: 10px; overflow: hidden; word-break: break-all; } /* line 223, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon.collapsed { + body.desktop .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } /* line 228, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon:before, body.desktop.mini-tab-icon:after { + body.desktop .mini-tab-icon:before, body.desktop .mini-tab-icon:after { position: absolute; display: inherit; } /* line 234, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon:before { + body.desktop .mini-tab-icon:before { content: '\78'; } /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ - body.desktop.mini-tab-icon:hover { + body.desktop .mini-tab-icon:hover { color: #0099cc; } /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ @@ -4757,10 +4757,10 @@ body.desktop .pane .mini-tab-icon.toggle-pane { /* line 169, ../../../../general/res/sass/user-environ/_layout.scss */ body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left { left: 0; - -moz-transform: translateX(-33px); - -ms-transform: translateX(-33px); - -webkit-transform: translateX(-33px); - transform: translateX(-33px); } + -moz-transform: translateX(-34px); + -ms-transform: translateX(-34px); + -webkit-transform: translateX(-34px); + transform: translateX(-34px); } /* line 172, ../../../../general/res/sass/user-environ/_layout.scss */ body.desktop .pane .mini-tab-icon.toggle-pane.toggle-tree.anchor-left:after { content: '\6d'; } @@ -5101,10 +5101,10 @@ body.desktop .pane.primary-pane .object-browse-bar { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 31, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 24, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane.left.treeview { background-color: #f7f7f7; } -/* line 35, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 28, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane.right.items { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; @@ -5113,7 +5113,7 @@ body.mobile .pane.right.items { transition-timing-function: ease; backface-visibility: hidden; margin-left: 0 !important; } - /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 32, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane.right.items .holder-object-and-inspector { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; @@ -5124,13 +5124,13 @@ body.mobile .pane.right.items { left: 10px; right: 10px; opacity: 1; } -/* line 47, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 40, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .create-btn-holder { display: none; } -/* line 53, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 46, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .holder.holder-treeview-elements { right: 10px !important; } -/* line 63, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 56, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-hidden .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -5149,10 +5149,10 @@ body.mobile .pane-tree-hidden .pane.left.treeview { -webkit-transition-delay: 0; transition-delay: 0; opacity: 0 !important; } -/* line 67, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 60, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-hidden .pane.right.items { left: 0 !important; } -/* line 80, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 73, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-showing .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -5177,46 +5177,46 @@ body.mobile .pane-tree-showing .pane.left.treeview { background-image: linear-gradient(90deg, rgba(0, 0, 0, 0) 98%, rgba(0, 0, 0, 0.3) 100%); right: auto !important; width: 40% !important; } -/* line 87, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 80, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .pane-tree-showing .pane.right.items { left: 40% !important; } -/* line 92, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 85, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .toggle-tree { color: #0099cc !important; font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 91, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .toggle-tree:after { content: 'm' !important; font-family: symbolsfont; } -/* line 104, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 97, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar { margin-left: 45px; } - /* line 106, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 99, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar .context-available { opacity: 1 !important; } - /* line 109, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 102, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .object-browse-bar .view-switcher .title-label { display: none; } -/* line 118, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 111, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .tree-holder { overflow-x: hidden !important; } -/* line 122, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 115, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-disable-select { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } -/* line 127, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 120, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-hide, body.mobile .mobile-hide-important { display: none !important; } -/* line 132, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 125, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -5236,7 +5236,7 @@ body.mobile .mobile-back-hide { -webkit-transition-delay: 0; transition-delay: 0; opacity: 0; } -/* line 137, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 130, ../../../../general/res/sass/mobile/_layout.scss */ body.mobile .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -5257,21 +5257,21 @@ body.mobile .mobile-back-unhide { transition-delay: 0; opacity: 1; } -/* line 146, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 139, ../../../../general/res/sass/mobile/_layout.scss */ body.phone.portrait .pane-tree-showing .pane.left.treeview { width: 90% !important; } -/* line 149, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 142, ../../../../general/res/sass/mobile/_layout.scss */ body.phone.portrait .pane-tree-showing .pane.right.items { left: 0 !important; -moz-transform: translateX(90%); -ms-transform: translateX(90%); -webkit-transform: translateX(90%); transform: translateX(90%); } - /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 145, ../../../../general/res/sass/mobile/_layout.scss */ body.phone.portrait .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } -/* line 160, ../../../../general/res/sass/mobile/_layout.scss */ +/* line 153, ../../../../general/res/sass/mobile/_layout.scss */ body.desktop .desktop-hide { display: none; } @@ -5462,13 +5462,12 @@ body.desktop .desktop-hide { /* line 40, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar { font-size: 0.8em; - max-width: 250px; position: relative; } - /* line 48, ../../../../general/res/sass/search/_search.scss */ + /* line 47, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-input { height: 25px; line-height: 25px; } - /* line 53, ../../../../general/res/sass/search/_search.scss */ + /* line 52, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar:before, .holder-search .search-bar .clear-icon, .holder-search .search-bar .menu-icon { @@ -5482,16 +5481,16 @@ body.desktop .desktop-hide { position: absolute; text-align: center; top: 4px; } - /* line 66, ../../../../general/res/sass/search/_search.scss */ + /* line 65, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-input { position: relative; width: 100%; padding-left: 22px !important; padding-right: 44px !important; } - /* line 73, ../../../../general/res/sass/search/_search.scss */ + /* line 72, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-input input { width: inherit; } - /* line 78, ../../../../general/res/sass/search/_search.scss */ + /* line 77, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar:before { content: '\4d'; font-family: symbolsfont; @@ -5514,40 +5513,40 @@ body.desktop .desktop-hide { transition-delay: 0; pointer-events: none; z-index: 1; } - /* line 89, ../../../../general/res/sass/search/_search.scss */ + /* line 88, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar:hover:before { color: #8c8c8c; } - /* line 93, ../../../../general/res/sass/search/_search.scss */ + /* line 92, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .clear-icon { right: 22px; visibility: hidden; opacity: 0; } - /* line 99, ../../../../general/res/sass/search/_search.scss */ + /* line 98, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .clear-icon.show { visibility: visible; opacity: 1; } - /* line 104, ../../../../general/res/sass/search/_search.scss */ + /* line 103, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .clear-icon:hover { color: #8c8c8c; } - /* line 109, ../../../../general/res/sass/search/_search.scss */ + /* line 108, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .menu-icon { font-size: 0.8em; padding-right: 4px; right: 4px; text-align: right; } - /* line 111, ../../../../general/res/sass/search/_search.scss */ + /* line 110, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .menu-icon:before { content: '\76'; } - /* line 117, ../../../../general/res/sass/search/_search.scss */ + /* line 116, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .menu-icon:hover { color: #8c8c8c; } - /* line 122, ../../../../general/res/sass/search/_search.scss */ + /* line 121, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-bar .search-menu-holder { float: right; left: -20px; z-index: 70; transition: visibility .05s, opacity .05s; } -/* line 130, ../../../../general/res/sass/search/_search.scss */ +/* line 129, ../../../../general/res/sass/search/_search.scss */ .holder-search .active-filter-display { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -5555,7 +5554,7 @@ body.desktop .desktop-hide { line-height: 130%; padding-left: 1.575em; font-size: 0.7em; } - /* line 138, ../../../../general/res/sass/search/_search.scss */ + /* line 137, ../../../../general/res/sass/search/_search.scss */ .holder-search .active-filter-display .clear-filters-icon { color: #a6a6a6; opacity: 1; @@ -5563,7 +5562,7 @@ body.desktop .desktop-hide { position: absolute; left: 1px; cursor: pointer; } -/* line 148, ../../../../general/res/sass/search/_search.scss */ +/* line 147, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results { -moz-transition-property: opacity, visibility; -o-transition-property: opacity, visibility; @@ -5582,16 +5581,16 @@ body.desktop .desktop-hide { -webkit-transition-delay: 0; transition-delay: 0; padding-right: 5px; } - /* line 151, ../../../../general/res/sass/search/_search.scss */ + /* line 150, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results .hint { margin-bottom: 10px; font-size: 0.65em; opacity: 0.6; } - /* line 156, ../../../../general/res/sass/search/_search.scss */ + /* line 155, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results.active { visibility: visible; opacity: 1; } - /* line 160, ../../../../general/res/sass/search/_search.scss */ + /* line 159, ../../../../general/res/sass/search/_search.scss */ .holder-search .search-results .load-more-button { -moz-transform: translateX(-50%); -ms-transform: translateX(-50%); From 95f1768fb7df26d405efa112c74c40eb16b30256 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 18 Feb 2016 13:10:54 -0800 Subject: [PATCH 07/20] [Frontend] Refactoring to use Victorizr instead of media queries open #639 open #683 open #169 Tweak to espresso tree view control color and hover color for espresso theme; reordered elements in _constants; --- .../commonUI/themes/espresso/res/css/theme-espresso.css | 6 +++--- platform/commonUI/themes/espresso/res/sass/_constants.scss | 4 ++-- platform/commonUI/themes/snow/res/sass/_constants.scss | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 27dccb41ca..3d9efa37f2 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -6091,7 +6091,7 @@ ul.tree { /* line 48, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control, .search-result-item .view-control { - color: rgba(255, 255, 255, 0.3); + color: #999; font-size: 0.75em; margin-right: 5px; height: 100%; @@ -6154,7 +6154,7 @@ ul.tree { /* line 84, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .view-control, .search-result-item.selected .view-control { - color: rgba(255, 255, 255, 0.3); } + color: #999; } /* line 87, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { @@ -6179,7 +6179,7 @@ ul.tree { /* line 113, ../../../../general/res/sass/tree/_tree.scss */ body.desktop .tree-item .view-control:hover, body.desktop .search-result-item .view-control:hover { - color: #ffc700 !important; } + color: #cccccc !important; } /* line 118, ../../../../general/res/sass/tree/_tree.scss */ body.desktop .tree-item:not(.selected):hover, body.desktop .search-result-item:not(.selected):hover { diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 5f9cb56fc0..6beba10d21 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -153,13 +153,13 @@ $colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); $colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%); -$colorItemTreeVCHover: $colorAlt1; $colorItemTreeFg: $colorBodyFg; $colorItemTreeSelectedBg: pushBack($colorKey, 15%); $colorItemTreeSelectedFg: pullForward($colorBodyFg, 20%); $colorItemTreeEditingBg: #344154; $colorItemTreeEditingFg: $colorEditAreaFg; -$colorItemTreeVC: rgba(#fff, 0.3); +$colorItemTreeVC: $colorBodyFg; //rgba(#fff, 0.3); +$colorItemTreeVCHover: pullForward($colorItemTreeVC, 20%); $colorItemTreeSelectedVC: $colorItemTreeVC; $shdwItemTreeIcon: 0.6; diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 2e5b020f9f..25eff7a9e0 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -153,13 +153,13 @@ $colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); $colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: $colorItemTreeIcon; //pushBack($colorItemTreeIcon, 20%); -$colorItemTreeVCHover: $colorKey; $colorItemTreeFg: $colorBodyFg; $colorItemTreeSelectedBg: pushBack($colorKey, 15%); $colorItemTreeSelectedFg: $colorBodyBg; $colorItemTreeEditingBg: #caf1ff; //#c6e3ff; $colorItemTreeEditingFg: $colorEditAreaFg; $colorItemTreeVC: $colorBodyFg; +$colorItemTreeVCHover: $colorKey; $colorItemTreeSelectedVC: $colorBodyBg; $shdwItemTreeIcon: none; From 626cc502fb76c588e8e880e135d8d4ce1d0f2819 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 18 Feb 2016 13:24:06 -0800 Subject: [PATCH 08/20] [Frontend] Removed -moz-osx-font-smoothing property open #687 --- .../commonUI/general/res/sass/_global.scss | 1 - .../espresso/res/css/theme-espresso.css | 41 +++++++++---------- .../themes/snow/res/css/theme-snow.css | 41 +++++++++---------- 3 files changed, 40 insertions(+), 43 deletions(-) diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 545a98610b..e67dbed477 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -46,7 +46,6 @@ a { body, html { -webkit-font-smoothing: subpixel-antialiased; - -moz-osx-font-smoothing: grayscale; background-color: $colorBodyBg; color: $colorBodyFg; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 3d9efa37f2..b2f8f29519 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -324,7 +324,6 @@ a { /* line 47, ../../../../general/res/sass/_global.scss */ body, html { -webkit-font-smoothing: subpixel-antialiased; - -moz-osx-font-smoothing: grayscale; background-color: #333; color: #999; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -334,24 +333,24 @@ body, html { width: 100%; overflow: hidden; } -/* line 60, ../../../../general/res/sass/_global.scss */ +/* line 59, ../../../../general/res/sass/_global.scss */ em { font-style: normal; } -/* line 64, ../../../../general/res/sass/_global.scss */ +/* line 63, ../../../../general/res/sass/_global.scss */ input, textarea { font-family: Helvetica, Arial, sans-serif; } -/* line 68, ../../../../general/res/sass/_global.scss */ +/* line 67, ../../../../general/res/sass/_global.scss */ input[type="text"] { vertical-align: baseline; padding: 3px 5px !important; } -/* line 73, ../../../../general/res/sass/_global.scss */ +/* line 72, ../../../../general/res/sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 77, ../../../../general/res/sass/_global.scss */ +/* line 76, ../../../../general/res/sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -359,15 +358,15 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 85, ../../../../general/res/sass/_global.scss */ +/* line 84, ../../../../general/res/sass/_global.scss */ p { margin-bottom: 10px; } -/* line 89, ../../../../general/res/sass/_global.scss */ +/* line 88, ../../../../general/res/sass/_global.scss */ mct-container { display: block; } -/* line 93, ../../../../general/res/sass/_global.scss */ +/* line 92, ../../../../general/res/sass/_global.scss */ .abs, .l-inspect, .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .val, .s-menu-btn span.l-click-area, .l-object-wrapper, .l-object-wrapper .object-holder-main { position: absolute; @@ -378,57 +377,57 @@ mct-container { height: auto; width: auto; } -/* line 103, ../../../../general/res/sass/_global.scss */ +/* line 102, ../../../../general/res/sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 110, ../../../../general/res/sass/_global.scss */ +/* line 109, ../../../../general/res/sass/_global.scss */ .codehilite { background-color: rgba(153, 153, 153, 0.1); padding: 1em; } -/* line 116, ../../../../general/res/sass/_global.scss */ +/* line 115, ../../../../general/res/sass/_global.scss */ .align-right { text-align: right; } -/* line 120, ../../../../general/res/sass/_global.scss */ +/* line 119, ../../../../general/res/sass/_global.scss */ .centered { text-align: center; } -/* line 124, ../../../../general/res/sass/_global.scss */ +/* line 123, ../../../../general/res/sass/_global.scss */ .ellipsis { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } -/* line 128, ../../../../general/res/sass/_global.scss */ +/* line 127, ../../../../general/res/sass/_global.scss */ .scrolling, .scroll { overflow: auto; } -/* line 133, ../../../../general/res/sass/_global.scss */ +/* line 132, ../../../../general/res/sass/_global.scss */ .vscroll { overflow-y: auto; } -/* line 137, ../../../../general/res/sass/_global.scss */ +/* line 136, ../../../../general/res/sass/_global.scss */ .no-margin { margin: 0; } -/* line 141, ../../../../general/res/sass/_global.scss */ +/* line 140, ../../../../general/res/sass/_global.scss */ .ds { -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; } -/* line 145, ../../../../general/res/sass/_global.scss */ +/* line 144, ../../../../general/res/sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 150, ../../../../general/res/sass/_global.scss */ +/* line 149, ../../../../general/res/sass/_global.scss */ .off { visibility: hidden; opacity: 0; @@ -438,7 +437,7 @@ mct-container { border: 0; margin: 0 !important; } -/* line 160, ../../../../general/res/sass/_global.scss */ +/* line 159, ../../../../general/res/sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 292d294305..100860106c 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -324,7 +324,6 @@ a { /* line 47, ../../../../general/res/sass/_global.scss */ body, html { -webkit-font-smoothing: subpixel-antialiased; - -moz-osx-font-smoothing: grayscale; background-color: #fcfcfc; color: #666; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -334,24 +333,24 @@ body, html { width: 100%; overflow: hidden; } -/* line 60, ../../../../general/res/sass/_global.scss */ +/* line 59, ../../../../general/res/sass/_global.scss */ em { font-style: normal; } -/* line 64, ../../../../general/res/sass/_global.scss */ +/* line 63, ../../../../general/res/sass/_global.scss */ input, textarea { font-family: Helvetica, Arial, sans-serif; } -/* line 68, ../../../../general/res/sass/_global.scss */ +/* line 67, ../../../../general/res/sass/_global.scss */ input[type="text"] { vertical-align: baseline; padding: 3px 5px !important; } -/* line 73, ../../../../general/res/sass/_global.scss */ +/* line 72, ../../../../general/res/sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 77, ../../../../general/res/sass/_global.scss */ +/* line 76, ../../../../general/res/sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -359,15 +358,15 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 85, ../../../../general/res/sass/_global.scss */ +/* line 84, ../../../../general/res/sass/_global.scss */ p { margin-bottom: 10px; } -/* line 89, ../../../../general/res/sass/_global.scss */ +/* line 88, ../../../../general/res/sass/_global.scss */ mct-container { display: block; } -/* line 93, ../../../../general/res/sass/_global.scss */ +/* line 92, ../../../../general/res/sass/_global.scss */ .abs, .l-inspect, .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .val, .s-menu-btn span.l-click-area, .l-object-wrapper, .l-object-wrapper .object-holder-main { position: absolute; @@ -378,57 +377,57 @@ mct-container { height: auto; width: auto; } -/* line 103, ../../../../general/res/sass/_global.scss */ +/* line 102, ../../../../general/res/sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 110, ../../../../general/res/sass/_global.scss */ +/* line 109, ../../../../general/res/sass/_global.scss */ .codehilite { background-color: rgba(102, 102, 102, 0.1); padding: 1em; } -/* line 116, ../../../../general/res/sass/_global.scss */ +/* line 115, ../../../../general/res/sass/_global.scss */ .align-right { text-align: right; } -/* line 120, ../../../../general/res/sass/_global.scss */ +/* line 119, ../../../../general/res/sass/_global.scss */ .centered { text-align: center; } -/* line 124, ../../../../general/res/sass/_global.scss */ +/* line 123, ../../../../general/res/sass/_global.scss */ .ellipsis { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } -/* line 128, ../../../../general/res/sass/_global.scss */ +/* line 127, ../../../../general/res/sass/_global.scss */ .scrolling, .scroll { overflow: auto; } -/* line 133, ../../../../general/res/sass/_global.scss */ +/* line 132, ../../../../general/res/sass/_global.scss */ .vscroll { overflow-y: auto; } -/* line 137, ../../../../general/res/sass/_global.scss */ +/* line 136, ../../../../general/res/sass/_global.scss */ .no-margin { margin: 0; } -/* line 141, ../../../../general/res/sass/_global.scss */ +/* line 140, ../../../../general/res/sass/_global.scss */ .ds { -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; } -/* line 145, ../../../../general/res/sass/_global.scss */ +/* line 144, ../../../../general/res/sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 150, ../../../../general/res/sass/_global.scss */ +/* line 149, ../../../../general/res/sass/_global.scss */ .off { visibility: hidden; opacity: 0; @@ -438,7 +437,7 @@ mct-container { border: 0; margin: 0 !important; } -/* line 160, ../../../../general/res/sass/_global.scss */ +/* line 159, ../../../../general/res/sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } From b0b2db24e04b89b5479b951b6935fd08c93f6d6d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 18 Feb 2016 18:03:43 -0800 Subject: [PATCH 09/20] [Frontend] Mods to .status.block open #442 Added clickable class; tweaks to indicator.html to introduce s-btn element look; --- .../general/res/sass/controls/_messages.scss | 11 +- .../general/res/templates/indicator.html | 7 +- .../espresso/res/css/theme-espresso.css | 210 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 210 +++++++++--------- 4 files changed, 231 insertions(+), 207 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 8bb8337d9c..285d17f4cc 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -40,7 +40,6 @@ $transDelay: 1.5s; $transSpeed: .25s; color: $colorStatusDefault; - cursor: default; display: inline-block; margin-right: $interiorMargin; .status-indicator, @@ -50,6 +49,9 @@ vertical-align: top; } + &.clickable { cursor: pointer; } + &:not(.clickable) { cursor: default; } + &.no-icon { .status-indicator { display: none; @@ -104,6 +106,12 @@ font-weight: bold; opacity: 1; } + .s-btn { + //background: orange; + padding: 0 $interiorMarginSm; + height: auto; + line-height: inherit; + } } /* Styles for messages and message banners */ @@ -295,7 +303,6 @@ .message-contents { .l-message { - //border-bottom: 1px solid pullForward($colorOvrBg, 20%); @include border-radius($controlCr); background: rgba($colorOvrFg, 0.1); margin-bottom: $interiorMargin; diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html index fb4a2f89c9..401c9990b9 100644 --- a/platform/commonUI/general/res/templates/indicator.html +++ b/platform/commonUI/general/res/templates/indicator.html @@ -30,11 +30,8 @@ {{ngModel.getText()}} + G - - G - + \ No newline at end of file diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 8b5f4ff272..7c4d057d1b 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1906,10 +1906,10 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { height: 24px; width: 9px; text-align: center; } - /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #0099cc; } - /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 147, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed { background-color: #454545; -moz-border-radius: 3px; @@ -1954,19 +1954,19 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: #33ccff; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 150, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } - /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:after { opacity: 1; } - /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 153, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:before { opacity: 1; } - /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:after { opacity: 0; } - /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 159, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; @@ -1987,22 +1987,22 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { display: block; height: 100%; position: absolute; } - /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 168, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { width: 9px; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; text-align: center; opacity: 0; } - /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 181, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left { text-align: right; } - /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 184, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; right: 0; } - /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 189, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; @@ -2011,21 +2011,21 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; text-align: left; } - /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 192, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } - /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right { text-align: left; } - /* line 203, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 0; } - /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 207, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; @@ -2033,17 +2033,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } - /* line 210, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 209, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } - /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 214, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 221, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 220, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #595959; cursor: pointer; @@ -2056,31 +2056,31 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { line-height: 9px; overflow: hidden; word-break: break-all; } - /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 237, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } - /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 242, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before, .mini-tab-icon:after { position: absolute; display: inherit; } - /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 248, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before { content: '\78'; } - /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 252, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:hover { color: #0099cc; } } -/* line 260, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 259, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 265, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu-btn { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 272, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 271, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; @@ -2089,7 +2089,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 279, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 278, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; @@ -2098,7 +2098,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 286, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 285, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -3163,28 +3163,33 @@ label.checkbox.custom { /* line 39, ../../../../general/res/sass/controls/_messages.scss */ .status.block { color: #ccc; - cursor: default; display: inline-block; margin-right: 5px; } - /* line 46, ../../../../general/res/sass/controls/_messages.scss */ + /* line 45, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator, .status.block .label, .status.block .count { display: inline-block; vertical-align: top; } - /* line 54, ../../../../general/res/sass/controls/_messages.scss */ + /* line 52, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.clickable { + cursor: pointer; } + /* line 53, ../../../../general/res/sass/controls/_messages.scss */ + .status.block:not(.clickable) { + cursor: default; } + /* line 56, ../../../../general/res/sass/controls/_messages.scss */ .status.block.no-icon .status-indicator { display: none; } - /* line 59, ../../../../general/res/sass/controls/_messages.scss */ + /* line 61, ../../../../general/res/sass/controls/_messages.scss */ .status.block.float-right { float: right; } - /* line 63, ../../../../general/res/sass/controls/_messages.scss */ + /* line 65, ../../../../general/res/sass/controls/_messages.scss */ .status.block.subtle { opacity: 0.5; } - /* line 66, ../../../../general/res/sass/controls/_messages.scss */ + /* line 68, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator { margin-right: 3px; } - /* line 71, ../../../../general/res/sass/controls/_messages.scss */ + /* line 73, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse) .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3204,7 +3209,7 @@ label.checkbox.custom { transition-delay: 1.5s; overflow: hidden; max-width: 0px; } - /* line 78, ../../../../general/res/sass/controls/_messages.scss */ + /* line 80, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3224,7 +3229,7 @@ label.checkbox.custom { transition-delay: 0s; max-width: 450px; width: auto; } - /* line 83, ../../../../general/res/sass/controls/_messages.scss */ + /* line 85, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .count { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3243,16 +3248,16 @@ label.checkbox.custom { -webkit-transition-delay: 0s; transition-delay: 0s; opacity: 0; } - /* line 90, ../../../../general/res/sass/controls/_messages.scss */ + /* line 92, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator, .status.block.info .status-indicator { color: #62ba72; } - /* line 94, ../../../../general/res/sass/controls/_messages.scss */ + /* line 96, ../../../../general/res/sass/controls/_messages.scss */ .status.block.alert .status-indicator, .status.block.warning .status-indicator, .status.block.caution .status-indicator { color: #ffa66d; } - /* line 99, ../../../../general/res/sass/controls/_messages.scss */ + /* line 101, ../../../../general/res/sass/controls/_messages.scss */ .status.block.error .status-indicator { color: #d4585c; } - /* line 102, ../../../../general/res/sass/controls/_messages.scss */ + /* line 104, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3272,20 +3277,25 @@ label.checkbox.custom { transition-delay: 1.5s; font-weight: bold; opacity: 1; } + /* line 109, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .s-btn, .status.block .s-menu-btn { + padding: 0 3px; + height: auto; + line-height: inherit; } /* Styles for messages and message banners */ -/* line 111, ../../../../general/res/sass/controls/_messages.scss */ +/* line 119, ../../../../general/res/sass/controls/_messages.scss */ .message.block { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; padding: 10px; } -/* line 115, ../../../../general/res/sass/controls/_messages.scss */ +/* line 123, ../../../../general/res/sass/controls/_messages.scss */ .message.error { background-color: rgba(255, 60, 0, 0.3); color: #ff8a66; } -/* line 121, ../../../../general/res/sass/controls/_messages.scss */ +/* line 129, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -3314,7 +3324,7 @@ label.checkbox.custom { -webkit-transform: translateX(-50%); transform: translateX(-50%); z-index: 10; } - /* line 137, ../../../../general/res/sass/controls/_messages.scss */ + /* line 145, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.minimized { -moz-transition-property: left, opacity; -o-transition-property: left, opacity; @@ -3330,11 +3340,11 @@ label.checkbox.custom { transition-timing-function: ease-in-out; left: 0; opacity: 0; } - /* line 145, ../../../../general/res/sass/controls/_messages.scss */ + /* line 153, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new { left: 50%; opacity: 1; } - /* line 148, ../../../../general/res/sass/controls/_messages.scss */ + /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new:not(.info) { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -3366,33 +3376,33 @@ label.checkbox.custom { opacity: 0.5; } 100% { opacity: 1; } } - /* line 153, ../../../../general/res/sass/controls/_messages.scss */ + /* line 161, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 157, ../../../../general/res/sass/controls/_messages.scss */ + /* line 165, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 160, ../../../../general/res/sass/controls/_messages.scss */ + /* line 168, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 164, ../../../../general/res/sass/controls/_messages.scss */ + /* line 172, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 170, ../../../../general/res/sass/controls/_messages.scss */ + /* line 178, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } - /* line 176, ../../../../general/res/sass/controls/_messages.scss */ + /* line 184, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .progress-info { display: none; } -/* line 186, ../../../../general/res/sass/controls/_messages.scss */ +/* line 194, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3409,10 +3419,10 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 190, ../../../../general/res/sass/controls/_messages.scss */ + /* line 198, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 191, ../../../../general/res/sass/controls/_messages.scss */ + /* line 199, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3433,13 +3443,13 @@ label.checkbox.custom { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; } - /* line 195, ../../../../general/res/sass/controls/_messages.scss */ + /* line 203, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 197, ../../../../general/res/sass/controls/_messages.scss */ + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 201, ../../../../general/res/sass/controls/_messages.scss */ + /* line 209, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok, .s-message-banner.info { background-color: #285b31; color: #ccc; } @@ -3452,7 +3462,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover, .s-message-banner.info .s-action:hover { background-color: #285b31; } - /* line 205, ../../../../general/res/sass/controls/_messages.scss */ + /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution, .s-message-banner.warning, .s-message-banner.alert { background-color: #d35200; color: #ccc; } @@ -3465,7 +3475,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover, .s-message-banner.warning .s-action:hover, .s-message-banner.alert .s-action:hover { background-color: #d35200; } - /* line 210, ../../../../general/res/sass/controls/_messages.scss */ + /* line 218, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.error { background-color: #751e21; color: #ccc; } @@ -3492,7 +3502,7 @@ label.checkbox.custom { ... same as above bottom-bar */ -/* line 252, ../../../../general/res/sass/controls/_messages.scss */ +/* line 260, ../../../../general/res/sass/controls/_messages.scss */ .l-message { display: -webkit-flex; display: flex; @@ -3500,52 +3510,52 @@ label.checkbox.custom { flex-direction: row; -webkit-align-items: stretch; align-items: stretch; } - /* line 256, ../../../../general/res/sass/controls/_messages.scss */ + /* line 264, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 261, ../../../../general/res/sass/controls/_messages.scss */ + /* line 269, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents { -webkit-flex: 1 1 auto; flex: 1 1 auto; margin-left: 25px; position: relative; } - /* line 267, ../../../../general/res/sass/controls/_messages.scss */ + /* line 275, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } -/* line 216, ../../../../general/res/sass/controls/_messages.scss */ +/* line 224, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type { text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; color: #ccc; font-size: 80px; padding: 1px; width: 82px; } - /* line 218, ../../../../general/res/sass/controls/_messages.scss */ + /* line 226, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } -/* line 225, ../../../../general/res/sass/controls/_messages.scss */ +/* line 233, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { color: #62ba72; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 229, ../../../../general/res/sass/controls/_messages.scss */ +/* line 237, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { color: #ffa66d; } - /* line 230, ../../../../general/res/sass/controls/_messages.scss */ + /* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 241, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { color: #d4585c; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 242, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 280, ../../../../general/res/sass/controls/_messages.scss */ + /* line 288, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { overflow: hidden; @@ -3556,40 +3566,40 @@ label.checkbox.custom { left: 0px; width: auto; height: auto; } - /* line 285, ../../../../general/res/sass/controls/_messages.scss */ + /* line 293, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .bottom-bar { top: auto; height: 24px; } } -/* line 216, ../../../../general/res/sass/controls/_messages.scss */ +/* line 224, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type { text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; color: #ccc; font-size: 32px; padding: 1px; width: 34px; } - /* line 218, ../../../../general/res/sass/controls/_messages.scss */ + /* line 226, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } -/* line 225, ../../../../general/res/sass/controls/_messages.scss */ +/* line 233, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { color: #62ba72; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 229, ../../../../general/res/sass/controls/_messages.scss */ +/* line 237, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { color: #ffa66d; } - /* line 230, ../../../../general/res/sass/controls/_messages.scss */ + /* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 241, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { color: #d4585c; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 242, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 297, ../../../../general/res/sass/controls/_messages.scss */ +/* line 305, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3597,26 +3607,26 @@ label.checkbox.custom { background: rgba(230, 230, 230, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 304, ../../../../general/res/sass/controls/_messages.scss */ + /* line 311, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents, .t-message-list .message-contents .l-message .bottom-bar { position: relative; } - /* line 310, ../../../../general/res/sass/controls/_messages.scss */ + /* line 317, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 313, ../../../../general/res/sass/controls/_messages.scss */ + /* line 320, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #b3b3b3; } - /* line 314, ../../../../general/res/sass/controls/_messages.scss */ + /* line 321, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 317, ../../../../general/res/sass/controls/_messages.scss */ + /* line 324, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 325, ../../../../general/res/sass/controls/_messages.scss */ + /* line 332, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 9562a1271c..009976a684 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1845,10 +1845,10 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { height: 24px; width: 9px; text-align: center; } - /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #0099cc; } - /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 147, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed { background-color: #969696; -moz-border-radius: 4px; @@ -1879,19 +1879,19 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: white; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 150, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } - /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:after { opacity: 1; } - /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 153, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:before { opacity: 1; } - /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:after { opacity: 0; } - /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 159, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; @@ -1912,22 +1912,22 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { display: block; height: 100%; position: absolute; } - /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 168, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { width: 9px; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; text-align: center; opacity: 0; } - /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 181, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left { text-align: right; } - /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 184, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; right: 0; } - /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 189, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; @@ -1936,21 +1936,21 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; text-align: left; } - /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 192, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } - /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right { text-align: left; } - /* line 203, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 0; } - /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 207, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; @@ -1958,17 +1958,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } - /* line 210, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 209, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } - /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 214, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 221, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 220, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #d6d6d6; cursor: pointer; @@ -1981,31 +1981,31 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { line-height: 9px; overflow: hidden; word-break: break-all; } - /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 237, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } - /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 242, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before, .mini-tab-icon:after { position: absolute; display: inherit; } - /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 248, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before { content: '\78'; } - /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 252, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:hover { color: #0099cc; } } -/* line 260, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 259, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 265, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu-btn { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 272, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 271, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; @@ -2014,7 +2014,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 279, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 278, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; @@ -2023,7 +2023,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 286, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 285, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -3082,28 +3082,33 @@ label.checkbox.custom { /* line 39, ../../../../general/res/sass/controls/_messages.scss */ .status.block { color: #ccc; - cursor: default; display: inline-block; margin-right: 5px; } - /* line 46, ../../../../general/res/sass/controls/_messages.scss */ + /* line 45, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator, .status.block .label, .status.block .count { display: inline-block; vertical-align: top; } - /* line 54, ../../../../general/res/sass/controls/_messages.scss */ + /* line 52, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.clickable { + cursor: pointer; } + /* line 53, ../../../../general/res/sass/controls/_messages.scss */ + .status.block:not(.clickable) { + cursor: default; } + /* line 56, ../../../../general/res/sass/controls/_messages.scss */ .status.block.no-icon .status-indicator { display: none; } - /* line 59, ../../../../general/res/sass/controls/_messages.scss */ + /* line 61, ../../../../general/res/sass/controls/_messages.scss */ .status.block.float-right { float: right; } - /* line 63, ../../../../general/res/sass/controls/_messages.scss */ + /* line 65, ../../../../general/res/sass/controls/_messages.scss */ .status.block.subtle { opacity: 0.5; } - /* line 66, ../../../../general/res/sass/controls/_messages.scss */ + /* line 68, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator { margin-right: 3px; } - /* line 71, ../../../../general/res/sass/controls/_messages.scss */ + /* line 73, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse) .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3123,7 +3128,7 @@ label.checkbox.custom { transition-delay: 1.5s; overflow: hidden; max-width: 0px; } - /* line 78, ../../../../general/res/sass/controls/_messages.scss */ + /* line 80, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3143,7 +3148,7 @@ label.checkbox.custom { transition-delay: 0s; max-width: 450px; width: auto; } - /* line 83, ../../../../general/res/sass/controls/_messages.scss */ + /* line 85, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .count { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3162,16 +3167,16 @@ label.checkbox.custom { -webkit-transition-delay: 0s; transition-delay: 0s; opacity: 0; } - /* line 90, ../../../../general/res/sass/controls/_messages.scss */ + /* line 92, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator, .status.block.info .status-indicator { color: #60ba7b; } - /* line 94, ../../../../general/res/sass/controls/_messages.scss */ + /* line 96, ../../../../general/res/sass/controls/_messages.scss */ .status.block.alert .status-indicator, .status.block.warning .status-indicator, .status.block.caution .status-indicator { color: #ffb66c; } - /* line 99, ../../../../general/res/sass/controls/_messages.scss */ + /* line 101, ../../../../general/res/sass/controls/_messages.scss */ .status.block.error .status-indicator { color: #c96b68; } - /* line 102, ../../../../general/res/sass/controls/_messages.scss */ + /* line 104, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3191,20 +3196,25 @@ label.checkbox.custom { transition-delay: 1.5s; font-weight: bold; opacity: 1; } + /* line 109, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .s-btn, .status.block .s-menu-btn { + padding: 0 3px; + height: auto; + line-height: inherit; } /* Styles for messages and message banners */ -/* line 111, ../../../../general/res/sass/controls/_messages.scss */ +/* line 119, ../../../../general/res/sass/controls/_messages.scss */ .message.block { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; padding: 10px; } -/* line 115, ../../../../general/res/sass/controls/_messages.scss */ +/* line 123, ../../../../general/res/sass/controls/_messages.scss */ .message.error { background-color: rgba(255, 60, 0, 0.3); color: #ff8a66; } -/* line 121, ../../../../general/res/sass/controls/_messages.scss */ +/* line 129, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -3233,7 +3243,7 @@ label.checkbox.custom { -webkit-transform: translateX(-50%); transform: translateX(-50%); z-index: 10; } - /* line 137, ../../../../general/res/sass/controls/_messages.scss */ + /* line 145, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.minimized { -moz-transition-property: left, opacity; -o-transition-property: left, opacity; @@ -3249,11 +3259,11 @@ label.checkbox.custom { transition-timing-function: ease-in-out; left: 0; opacity: 0; } - /* line 145, ../../../../general/res/sass/controls/_messages.scss */ + /* line 153, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new { left: 50%; opacity: 1; } - /* line 148, ../../../../general/res/sass/controls/_messages.scss */ + /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new:not(.info) { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -3285,33 +3295,33 @@ label.checkbox.custom { opacity: 0.5; } 100% { opacity: 1; } } - /* line 153, ../../../../general/res/sass/controls/_messages.scss */ + /* line 161, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 157, ../../../../general/res/sass/controls/_messages.scss */ + /* line 165, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 160, ../../../../general/res/sass/controls/_messages.scss */ + /* line 168, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 164, ../../../../general/res/sass/controls/_messages.scss */ + /* line 172, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 170, ../../../../general/res/sass/controls/_messages.scss */ + /* line 178, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } - /* line 176, ../../../../general/res/sass/controls/_messages.scss */ + /* line 184, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .progress-info { display: none; } -/* line 186, ../../../../general/res/sass/controls/_messages.scss */ +/* line 194, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -3328,10 +3338,10 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 190, ../../../../general/res/sass/controls/_messages.scss */ + /* line 198, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 191, ../../../../general/res/sass/controls/_messages.scss */ + /* line 199, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -3352,13 +3362,13 @@ label.checkbox.custom { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; } - /* line 195, ../../../../general/res/sass/controls/_messages.scss */ + /* line 203, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 197, ../../../../general/res/sass/controls/_messages.scss */ + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 201, ../../../../general/res/sass/controls/_messages.scss */ + /* line 209, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok, .s-message-banner.info { background-color: #275a36; color: #fff; } @@ -3371,7 +3381,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover, .s-message-banner.info .s-action:hover { background-color: #275a36; } - /* line 205, ../../../../general/res/sass/controls/_messages.scss */ + /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution, .s-message-banner.warning, .s-message-banner.alert { background-color: #d26a00; color: #fff; } @@ -3384,7 +3394,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover, .s-message-banner.warning .s-action:hover, .s-message-banner.alert .s-action:hover { background-color: #d26a00; } - /* line 210, ../../../../general/res/sass/controls/_messages.scss */ + /* line 218, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.error { background-color: #702a28; color: #fff; } @@ -3411,7 +3421,7 @@ label.checkbox.custom { ... same as above bottom-bar */ -/* line 252, ../../../../general/res/sass/controls/_messages.scss */ +/* line 260, ../../../../general/res/sass/controls/_messages.scss */ .l-message { display: -webkit-flex; display: flex; @@ -3419,52 +3429,52 @@ label.checkbox.custom { flex-direction: row; -webkit-align-items: stretch; align-items: stretch; } - /* line 256, ../../../../general/res/sass/controls/_messages.scss */ + /* line 264, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 261, ../../../../general/res/sass/controls/_messages.scss */ + /* line 269, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents { -webkit-flex: 1 1 auto; flex: 1 1 auto; margin-left: 25px; position: relative; } - /* line 267, ../../../../general/res/sass/controls/_messages.scss */ + /* line 275, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } -/* line 216, ../../../../general/res/sass/controls/_messages.scss */ +/* line 224, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type { text-shadow: rgba(255, 255, 255, 0.8) 0 0px 5px; color: #ccc; font-size: 80px; padding: 1px; width: 82px; } - /* line 218, ../../../../general/res/sass/controls/_messages.scss */ + /* line 226, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } -/* line 225, ../../../../general/res/sass/controls/_messages.scss */ +/* line 233, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { color: #60ba7b; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 229, ../../../../general/res/sass/controls/_messages.scss */ +/* line 237, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { color: #ffb66c; } - /* line 230, ../../../../general/res/sass/controls/_messages.scss */ + /* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 241, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { color: #c96b68; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 242, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 280, ../../../../general/res/sass/controls/_messages.scss */ + /* line 288, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { overflow: hidden; @@ -3475,40 +3485,40 @@ label.checkbox.custom { left: 0px; width: auto; height: auto; } - /* line 285, ../../../../general/res/sass/controls/_messages.scss */ + /* line 293, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .bottom-bar { top: auto; height: 24px; } } -/* line 216, ../../../../general/res/sass/controls/_messages.scss */ +/* line 224, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type { text-shadow: rgba(255, 255, 255, 0.8) 0 0px 5px; color: #ccc; font-size: 32px; padding: 1px; width: 34px; } - /* line 218, ../../../../general/res/sass/controls/_messages.scss */ + /* line 226, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } -/* line 225, ../../../../general/res/sass/controls/_messages.scss */ +/* line 233, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { color: #60ba7b; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 229, ../../../../general/res/sass/controls/_messages.scss */ +/* line 237, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { color: #ffb66c; } - /* line 230, ../../../../general/res/sass/controls/_messages.scss */ + /* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 241, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { color: #c96b68; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 242, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 297, ../../../../general/res/sass/controls/_messages.scss */ +/* line 305, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -3516,26 +3526,26 @@ label.checkbox.custom { background: rgba(102, 102, 102, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 304, ../../../../general/res/sass/controls/_messages.scss */ + /* line 311, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents, .t-message-list .message-contents .l-message .bottom-bar { position: relative; } - /* line 310, ../../../../general/res/sass/controls/_messages.scss */ + /* line 317, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 313, ../../../../general/res/sass/controls/_messages.scss */ + /* line 320, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #999999; } - /* line 314, ../../../../general/res/sass/controls/_messages.scss */ + /* line 321, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 317, ../../../../general/res/sass/controls/_messages.scss */ + /* line 324, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 325, ../../../../general/res/sass/controls/_messages.scss */ + /* line 332, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } From ebf501ce713f4bf2107c41437aeadd7183b8c3a0 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 19 Feb 2016 17:59:32 -0800 Subject: [PATCH 10/20] [Frontend] Markup and CSS related to indicators; hover styles open #442 https://github.jpl.nasa.gov/MissionControl/vista/issues/293 s-btn hover styling cleaned up; Spacing, styles, etc. for indicators refined; Constants, colors added to, cleaned up and normalized; Animation code in _effects refactored; --- .../commonUI/general/res/sass/_effects.scss | 46 +- .../commonUI/general/res/sass/_mixins.scss | 19 +- .../general/res/sass/controls/_buttons.scss | 10 +- .../general/res/sass/controls/_messages.scss | 11 +- .../espresso/res/css/theme-espresso.css | 396 ++++++++---------- .../themes/espresso/res/sass/_constants.scss | 15 +- .../themes/espresso/res/sass/_mixins.scss | 4 +- .../themes/snow/res/css/theme-snow.css | 342 ++++++++------- .../themes/snow/res/sass/_constants.scss | 15 +- .../themes/snow/res/sass/_mixins.scss | 4 +- 10 files changed, 402 insertions(+), 460 deletions(-) diff --git a/platform/commonUI/general/res/sass/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index ed740b9bcb..0b3ac3a8d6 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -39,39 +39,35 @@ a.disabled { @include test(); } -@mixin customKeyframes($animName: pulse, $op0: 0.5) { - @include keyframes($animName) { - 0% { opacity: $op0; } - 100% { opacity: 1; } - } - @include animation-name(pulse, 0.2); -} - -@mixin pulse($dur: 500ms, $iteration: infinite, $opacity0: 0.5, $opacity100: 1) { - @include keyframes(pulse) { +@mixin pulse($animName: pulse, $dur: 500ms, $iteration: infinite, $opacity0: 0.5, $opacity100: 1) { + @include keyframes($animName) { 0% { opacity: $opacity0; } 100% { opacity: $opacity100; } } - @include animation-name(pulse); + @include animation-name($animName); @include animation-duration($dur); @include animation-direction(alternate); @include animation-iteration-count($iteration); @include animation-timing-function(ease-in-out); } -@mixin pulseBorder($c: red, $dur: 500ms, $iteration: infinite, $delay: 0s, $opacity0: 0, $opacity100: 1) { - @include keyframes(pulseBorder) { - 0% { border-color: rgba($c, $opacity0); } - 100% { border-color: rgba($c, $opacity100); } - } - @include animation-name(pulseBorder); - @include animation-duration($dur); - @include animation-direction(alternate); - @include animation-iteration-count($iteration); - @include animation-timing-function(ease); - @include animation-delay($delay); +.pulse { + @include pulse($animName: pulse, $dur: 750ms); } -.pulse { - @include pulse(750ms); -} \ No newline at end of file +.pulse-subtle { + @include pulse($animName: pulse-subtle, $dur: 500ms, $opacity0: 0.7); +} + +@mixin pulseBorder($c: red, $dur: 500ms, $iteration: infinite, $delay: 0s, $opacity0: 0, $opacity100: 1) { + @include keyframes(pulseBorder) { + 0% { border-color: rgba($c, $opacity0); } + 100% { border-color: rgba($c, $opacity100); } + } + @include animation-name(pulseBorder); + @include animation-duration($dur); + @include animation-direction(alternate); + @include animation-iteration-count($iteration); + @include animation-timing-function(ease); + @include animation-delay($delay); +} diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index c3763e217b..c1fd977a19 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -297,21 +297,20 @@ display: inline-block; } -@mixin btnBase($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { +@mixin btnBase($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { @include user-select(none); - @include transition(background, .25s); .icon { color: $ic; } @include desktop { - @if $bgHov != none { - &:not(.disabled):hover { - @include background-image($bgHov); - >.icon { - color: lighten($ic, $ltGamma); - } - } - } + @if $bgHovColor != none { + &:not(.disabled):hover { + background: $bgHovColor; // was just background, and background-image before that + >.icon { + color: lighten($ic, $ltGamma); + } + } + } } } diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index c999828ee9..6c217d0ef0 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -66,7 +66,7 @@ $pad: $interiorMargin * $baseRatio; &:not(.major) { // bg, bgHov, fg, ic - @include btnSubtle($colorBtnBg, $colorKey, $colorBtnFg, $colorBtnIcon); + @include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon); } &.pause-play { @@ -91,7 +91,7 @@ $pad: $interiorMargin * $baseRatio; &.paused { @include btnSubtle($colorPausedBg, pushBack($colorPausedBg, 10%), $colorPausedFg, $colorPausedFg); .icon { - @include pulse(1000ms); + @include pulse($dur: 1000ms); :before { content: "\0000EF"; } @@ -269,14 +269,16 @@ $pad: $interiorMargin * $baseRatio; } .first { - .s-btn { + .s-btn, + &.s-btn { @include border-left-radius($controlCr); margin-left: 0; } } .last { - .s-btn { + .s-btn, + &.s-btn { @include border-right-radius($controlCr); } } diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 285d17f4cc..bdd9b7270a 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -62,9 +62,6 @@ float: right; } - &.subtle { - opacity: 0.5; - } .status-indicator { margin-right: $interiorMarginSm; } @@ -79,7 +76,7 @@ &:hover { .label { @include trans-prop-nice(max-width, $transSpeed, 0s); - max-width: 450px; + max-width: 600px; width: auto; } .count { @@ -107,8 +104,8 @@ opacity: 1; } .s-btn { - //background: orange; - padding: 0 $interiorMarginSm; + background: $colorStatusBtnBg; + padding: 0 $interiorMargin; height: auto; line-height: inherit; } @@ -154,7 +151,7 @@ left: 50%; opacity: 1; &:not(.info) { - @include pulse(100ms, 10); + @include pulse($dur: 100ms, $iteration: 10); } } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 7c4d057d1b..ddd4e1f0ff 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -248,7 +248,7 @@ a.disabled { .test { background-color: rgba(255, 204, 0, 0.2) !important; } -/* line 75, ../../../../general/res/sass/_effects.scss */ +/* line 54, ../../../../general/res/sass/_effects.scss */ .pulse { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -280,6 +280,38 @@ a.disabled { opacity: 0.5; } 100% { opacity: 1; } } +/* line 58, ../../../../general/res/sass/_effects.scss */ +.pulse-subtle { + -moz-animation-name: pulse-subtle; + -webkit-animation-name: pulse-subtle; + animation-name: pulse-subtle; + -moz-animation-duration: 500ms; + -webkit-animation-duration: 500ms; + animation-duration: 500ms; + -moz-animation-direction: alternate; + -webkit-animation-direction: alternate; + animation-direction: alternate; + -moz-animation-iteration-count: infinite; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + -moz-animation-timing-function: ease-in-out; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; } +@-moz-keyframes pulse-subtle { + 0% { + opacity: 0.7; } + 100% { + opacity: 1; } } +@-webkit-keyframes pulse-subtle { + 0% { + opacity: 0.7; } + 100% { + opacity: 1; } } +@keyframes pulse-subtle { + 0% { + opacity: 0.7; } + 100% { + opacity: 1; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1539,8 +1571,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { width: 0.7rem; } /* line 114, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover { - background: rgba(153, 153, 153, 0.1); - color: #cccccc; } + background: #4d4d4d; + color: #b3b3b3; } /* line 117, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover .icon, .l-inspect .inspector-location .location-item:hover .t-item-icon { color: #33ccff; } @@ -1709,24 +1741,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1ac6ff), color-stop(100%, #00bfff)); - background-image: -moz-linear-gradient(#1ac6ff, #00bfff); - background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); - background-image: linear-gradient(#1ac6ff, #00bfff); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: deepskyblue; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon, .s-btn.major:not(.disabled):hover > .t-item-icon, .major.s-menu-btn:not(.disabled):hover > .t-item-icon { color: white; } } /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1753,24 +1776,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #0099cc; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); - background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); - background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); - background-image: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #5e5e5e; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon, .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { color: #33ccff; } } /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1812,24 +1826,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Y4OGMwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fe9815), color-stop(100%, #f88c01)); - background-image: -moz-linear-gradient(#fe9815, #f88c01); - background-image: -webkit-linear-gradient(#fe9815, #f88c01); - background-image: linear-gradient(#fe9815, #f88c01); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #925201; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon, .s-btn.pause-play.paused:not(.disabled):hover > .t-item-icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .t-item-icon { color: white; } } /* line 93, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1906,10 +1911,10 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { height: 24px; width: 9px; text-align: center; } - /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #0099cc; } - /* line 147, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed { background-color: #454545; -moz-border-radius: 3px; @@ -1933,40 +1938,31 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { color: #0099cc; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); - background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); - background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); - background-image: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #0099cc; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: #33ccff; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 150, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:after { opacity: 1; } - /* line 153, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:before { opacity: 1; } - /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:after { opacity: 0; } - /* line 159, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; @@ -1987,22 +1983,22 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { display: block; height: 100%; position: absolute; } - /* line 168, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { width: 9px; } - /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; text-align: center; opacity: 0; } - /* line 181, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left { text-align: right; } - /* line 184, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; right: 0; } - /* line 189, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; @@ -2011,21 +2007,21 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; text-align: left; } - /* line 192, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 196, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } - /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right { text-align: left; } - /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 203, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 0; } - /* line 207, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; @@ -2033,17 +2029,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } - /* line 209, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 210, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } - /* line 214, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 220, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 221, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #595959; cursor: pointer; @@ -2056,32 +2052,32 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { line-height: 9px; overflow: hidden; word-break: break-all; } - /* line 237, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } - /* line 242, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before, .mini-tab-icon:after { position: absolute; display: inherit; } - /* line 248, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before { content: '\78'; } - /* line 252, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:hover { color: #0099cc; } } -/* line 259, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 260, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 265, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu-btn { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 271, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn { + /* line 272, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn, .l-btn-set .first.s-btn, .l-btn-set .first.s-menu-btn { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; @@ -2089,8 +2085,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 278, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn { + /* line 280, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn, .l-btn-set .last.s-btn, .l-btn-set .last.s-menu-btn { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; @@ -2098,7 +2094,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 285, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 288, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -2955,7 +2951,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 359, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -3184,12 +3180,9 @@ label.checkbox.custom { .status.block.float-right { float: right; } /* line 65, ../../../../general/res/sass/controls/_messages.scss */ - .status.block.subtle { - opacity: 0.5; } - /* line 68, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator { margin-right: 3px; } - /* line 73, ../../../../general/res/sass/controls/_messages.scss */ + /* line 70, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse) .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3209,7 +3202,7 @@ label.checkbox.custom { transition-delay: 1.5s; overflow: hidden; max-width: 0px; } - /* line 80, ../../../../general/res/sass/controls/_messages.scss */ + /* line 77, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3227,9 +3220,9 @@ label.checkbox.custom { -o-transition-delay: 0s; -webkit-transition-delay: 0s; transition-delay: 0s; - max-width: 450px; + max-width: 600px; width: auto; } - /* line 85, ../../../../general/res/sass/controls/_messages.scss */ + /* line 82, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .count { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3248,16 +3241,16 @@ label.checkbox.custom { -webkit-transition-delay: 0s; transition-delay: 0s; opacity: 0; } - /* line 92, ../../../../general/res/sass/controls/_messages.scss */ + /* line 89, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator, .status.block.info .status-indicator { color: #62ba72; } - /* line 96, ../../../../general/res/sass/controls/_messages.scss */ + /* line 93, ../../../../general/res/sass/controls/_messages.scss */ .status.block.alert .status-indicator, .status.block.warning .status-indicator, .status.block.caution .status-indicator { color: #ffa66d; } - /* line 101, ../../../../general/res/sass/controls/_messages.scss */ + /* line 98, ../../../../general/res/sass/controls/_messages.scss */ .status.block.error .status-indicator { color: #d4585c; } - /* line 104, ../../../../general/res/sass/controls/_messages.scss */ + /* line 101, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3277,25 +3270,26 @@ label.checkbox.custom { transition-delay: 1.5s; font-weight: bold; opacity: 1; } - /* line 109, ../../../../general/res/sass/controls/_messages.scss */ + /* line 106, ../../../../general/res/sass/controls/_messages.scss */ .status.block .s-btn, .status.block .s-menu-btn { - padding: 0 3px; + background: #454545; + padding: 0 5px; height: auto; line-height: inherit; } /* Styles for messages and message banners */ -/* line 119, ../../../../general/res/sass/controls/_messages.scss */ +/* line 116, ../../../../general/res/sass/controls/_messages.scss */ .message.block { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; padding: 10px; } -/* line 123, ../../../../general/res/sass/controls/_messages.scss */ +/* line 120, ../../../../general/res/sass/controls/_messages.scss */ .message.error { background-color: rgba(255, 60, 0, 0.3); color: #ff8a66; } -/* line 129, ../../../../general/res/sass/controls/_messages.scss */ +/* line 126, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -3324,7 +3318,7 @@ label.checkbox.custom { -webkit-transform: translateX(-50%); transform: translateX(-50%); z-index: 10; } - /* line 145, ../../../../general/res/sass/controls/_messages.scss */ + /* line 142, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.minimized { -moz-transition-property: left, opacity; -o-transition-property: left, opacity; @@ -3340,11 +3334,11 @@ label.checkbox.custom { transition-timing-function: ease-in-out; left: 0; opacity: 0; } - /* line 153, ../../../../general/res/sass/controls/_messages.scss */ + /* line 150, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new { left: 50%; opacity: 1; } - /* line 156, ../../../../general/res/sass/controls/_messages.scss */ + /* line 153, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new:not(.info) { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -3376,33 +3370,33 @@ label.checkbox.custom { opacity: 0.5; } 100% { opacity: 1; } } - /* line 161, ../../../../general/res/sass/controls/_messages.scss */ + /* line 158, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 165, ../../../../general/res/sass/controls/_messages.scss */ + /* line 162, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 168, ../../../../general/res/sass/controls/_messages.scss */ + /* line 165, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 172, ../../../../general/res/sass/controls/_messages.scss */ + /* line 169, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 178, ../../../../general/res/sass/controls/_messages.scss */ + /* line 175, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } - /* line 184, ../../../../general/res/sass/controls/_messages.scss */ + /* line 181, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .progress-info { display: none; } -/* line 194, ../../../../general/res/sass/controls/_messages.scss */ +/* line 191, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3419,10 +3413,10 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 198, ../../../../general/res/sass/controls/_messages.scss */ + /* line 195, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 199, ../../../../general/res/sass/controls/_messages.scss */ + /* line 196, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3443,13 +3437,13 @@ label.checkbox.custom { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; } - /* line 203, ../../../../general/res/sass/controls/_messages.scss */ + /* line 200, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 205, ../../../../general/res/sass/controls/_messages.scss */ + /* line 202, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 209, ../../../../general/res/sass/controls/_messages.scss */ + /* line 206, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok, .s-message-banner.info { background-color: #285b31; color: #ccc; } @@ -3462,7 +3456,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover, .s-message-banner.info .s-action:hover { background-color: #285b31; } - /* line 213, ../../../../general/res/sass/controls/_messages.scss */ + /* line 210, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution, .s-message-banner.warning, .s-message-banner.alert { background-color: #d35200; color: #ccc; } @@ -3475,7 +3469,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover, .s-message-banner.warning .s-action:hover, .s-message-banner.alert .s-action:hover { background-color: #d35200; } - /* line 218, ../../../../general/res/sass/controls/_messages.scss */ + /* line 215, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.error { background-color: #751e21; color: #ccc; } @@ -3502,7 +3496,7 @@ label.checkbox.custom { ... same as above bottom-bar */ -/* line 260, ../../../../general/res/sass/controls/_messages.scss */ +/* line 257, ../../../../general/res/sass/controls/_messages.scss */ .l-message { display: -webkit-flex; display: flex; @@ -3510,52 +3504,52 @@ label.checkbox.custom { flex-direction: row; -webkit-align-items: stretch; align-items: stretch; } - /* line 264, ../../../../general/res/sass/controls/_messages.scss */ + /* line 261, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 269, ../../../../general/res/sass/controls/_messages.scss */ + /* line 266, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents { -webkit-flex: 1 1 auto; flex: 1 1 auto; margin-left: 25px; position: relative; } - /* line 275, ../../../../general/res/sass/controls/_messages.scss */ + /* line 272, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } -/* line 224, ../../../../general/res/sass/controls/_messages.scss */ +/* line 221, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type { text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; color: #ccc; font-size: 80px; padding: 1px; width: 82px; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 223, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 230, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { color: #62ba72; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 231, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 237, ../../../../general/res/sass/controls/_messages.scss */ +/* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { color: #ffa66d; } - /* line 238, ../../../../general/res/sass/controls/_messages.scss */ + /* line 235, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 241, ../../../../general/res/sass/controls/_messages.scss */ +/* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { color: #d4585c; } - /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + /* line 239, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 288, ../../../../general/res/sass/controls/_messages.scss */ + /* line 285, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { overflow: hidden; @@ -3566,40 +3560,40 @@ label.checkbox.custom { left: 0px; width: auto; height: auto; } - /* line 293, ../../../../general/res/sass/controls/_messages.scss */ + /* line 290, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .bottom-bar { top: auto; height: 24px; } } -/* line 224, ../../../../general/res/sass/controls/_messages.scss */ +/* line 221, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type { text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; color: #ccc; font-size: 32px; padding: 1px; width: 34px; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 223, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 230, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { color: #62ba72; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 231, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 237, ../../../../general/res/sass/controls/_messages.scss */ +/* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { color: #ffa66d; } - /* line 238, ../../../../general/res/sass/controls/_messages.scss */ + /* line 235, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 241, ../../../../general/res/sass/controls/_messages.scss */ +/* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { color: #d4585c; } - /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + /* line 239, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 305, ../../../../general/res/sass/controls/_messages.scss */ +/* line 302, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3607,26 +3601,26 @@ label.checkbox.custom { background: rgba(230, 230, 230, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 311, ../../../../general/res/sass/controls/_messages.scss */ + /* line 308, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents, .t-message-list .message-contents .l-message .bottom-bar { position: relative; } - /* line 317, ../../../../general/res/sass/controls/_messages.scss */ + /* line 314, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 320, ../../../../general/res/sass/controls/_messages.scss */ + /* line 317, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #b3b3b3; } - /* line 321, ../../../../general/res/sass/controls/_messages.scss */ + /* line 318, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 324, ../../../../general/res/sass/controls/_messages.scss */ + /* line 321, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 332, ../../../../general/res/sass/controls/_messages.scss */ + /* line 329, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } @@ -4029,7 +4023,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 119, ../../../../general/res/sass/forms/_elems.scss */ @@ -4087,7 +4081,7 @@ input[type="search"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error, input[type="search"].error { background: rgba(255, 0, 0, 0.5); } @@ -4117,7 +4111,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -4166,31 +4160,15 @@ textarea { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; margin: 0 0 2px 0; padding: 0 5px; overflow: hidden; position: relative; line-height: 22px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .select .icon, .select .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .select:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzZiNmI2YiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6b6b6b), color-stop(100%, #5e5e5e)); - background-image: -moz-linear-gradient(#6b6b6b, #5e5e5e); - background-image: -webkit-linear-gradient(#6b6b6b, #5e5e5e); - background-image: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .select:not(.disabled):hover > .icon, .select:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; @@ -4270,7 +4248,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../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 */ @@ -4657,7 +4635,7 @@ span.req { border: none; color: #cccccc; outline: none; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ .s-filter input[type="search"].error { background: rgba(255, 0, 0, 0.5); } /* line 135, ../../../../general/res/sass/forms/_filter.scss */ @@ -5927,24 +5905,15 @@ span.req { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2E2YTZhNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzk5OTk5OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a6a6a6), color-stop(100%, #999999)); - background-image: -moz-linear-gradient(#a6a6a6, #999999); - background-image: -webkit-linear-gradient(#a6a6a6, #999999); - background-image: linear-gradient(#a6a6a6, #999999); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #999999; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { color: white; } } /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -6104,7 +6073,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 359, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -6216,8 +6185,8 @@ ul.tree { /* line 99, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover, .search-result-item:not(.selected):hover { - background: rgba(153, 153, 153, 0.1); - color: #cccccc; } + background: #4d4d4d; + color: #b3b3b3; } /* line 102, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover .t-item-icon, .search-result-item:not(.selected):hover .t-item-icon { @@ -7445,10 +7414,6 @@ table { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; box-sizing: border-box; cursor: pointer; @@ -7458,19 +7423,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959)); - background-image: -moz-linear-gradient(#666666, #595959); - background-image: -webkit-linear-gradient(#666666, #595959); - background-image: linear-gradient(#666666, #595959); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #595959; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon, .items-holder .item.grid-item:not(.disabled):hover > .t-item-icon { color: #33ccff; } } /* line 44, ../../../../general/res/sass/items/_item.scss */ @@ -7595,27 +7555,11 @@ table { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #80dfff; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon, .items-holder .item.grid-item.selected .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item.selected:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1ac6ff), color-stop(100%, #00bfff)); - background-image: -moz-linear-gradient(#1ac6ff, #00bfff); - background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); - background-image: linear-gradient(#1ac6ff, #00bfff); } - /* line 310, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item.selected:not(.disabled):hover > .icon, .items-holder .item.grid-item.selected:not(.disabled):hover > .t-item-icon { - color: #33ccff; } } /* line 126, ../../../../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), .items-holder .item.grid-item.selected .top-bar .t-item-icon:not(.alert) { color: #80dfff; } diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 5f9cb56fc0..4511a83338 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -12,12 +12,14 @@ $colorInteriorBorder: rgba($colorBodyFg, 0.1); $colorA: #ccc; $colorAHov: #fff; $contrastRatioPercent: 7%; +$hoverRatioPercent: 10%; $basicCr: 3px; $controlCr: 3px; $smallCr: 2px; // Buttons and Controls -$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); // +$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); +$colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent); $colorBtnFg: $colorBodyFg; $colorBtnMajorBg: $colorKey; $colorBtnMajorFg: $colorKeyFg; @@ -54,7 +56,7 @@ $colorTick: rgba(white, 0.2); $colorMenuBg: pullForward($colorBodyBg, 23%); $colorMenuFg: pullForward($colorMenuBg, 70%); $colorMenuIc: pullForward($colorKey, 17%); -$colorMenuHovBg: pullForward($colorMenuBg, 10%); +$colorMenuHovBg: pullForward($colorMenuBg, $hoverRatioPercent); $colorMenuHovFg: #fff; $colorMenuHovIc: $colorMenuHovFg; $shdwMenu: none; @@ -89,6 +91,7 @@ $colorStatusDefault: #ccc; $colorStatusInfo: #62ba72; $colorStatusAlert: #ffa66d; $colorStatusError: #d4585c; +$colorStatusBtnBg: $colorBtnBg; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: $colorKey; $progressBarHOverlay: 15px; @@ -123,7 +126,7 @@ $colorOvrBtnFg: #fff; // Items $colorItemBg: lighten($colorBodyBg, 5%); -$colorItemBgHov: pullForward($colorItemBg, 15%); +$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent); $colorItemFg: lighten($colorItemBg, 50%); $colorItemFgDetails: lighten($colorItemBg, 30%); $colorItemIc: $colorKey; @@ -149,8 +152,8 @@ $colorPlotAreaBorder: $colorInteriorBorder; $colorPlotLabelFg: pushBack($colorPlotFg, 20%); // Tree -$colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); -$colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); +$colorItemTreeHoverBg: pullForward($colorBodyBg, $hoverRatioPercent); +$colorItemTreeHoverFg: pullForward($colorBodyFg, $hoverRatioPercent); $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%); $colorItemTreeVCHover: $colorAlt1; @@ -165,10 +168,10 @@ $shdwItemTreeIcon: 0.6; // Scrollbar $scrollbarTrackSize: 10px; +$scrollbarTrackShdw: rgba(#000, 0.7) 0 1px 5px; $scrollbarTrackColorBg: rgba(#000, 0.4); $scrollbarThumbColor: lighten($colorBodyBg, 10%); $scrollbarThumbColorHov: lighten($scrollbarThumbColor, 2%); -$scrollbarTrackShdw: rgba(#000, 0.7) 0 1px 5px; // Splitter $splitterD: 25px; // splitterD and HandleD should both be odd, or even diff --git a/platform/commonUI/themes/espresso/res/sass/_mixins.scss b/platform/commonUI/themes/espresso/res/sass/_mixins.scss index b196557ba3..a247ec4cd1 100644 --- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss +++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss @@ -4,9 +4,9 @@ @include boxShdw($shdwBtns); } -@mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { +@mixin btnSubtle($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { @include containerSubtle($bg, $fg); - @include btnBase($bg, linear-gradient(lighten($bg, 15%), lighten($bg, 10%)), $fg, $ic); + @include btnBase($bg, $bgHovColor, $fg, $ic); @include text-shadow($shdwItemText); } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 009976a684..0976ec451c 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -248,7 +248,7 @@ a.disabled { .test { background-color: rgba(255, 204, 0, 0.2) !important; } -/* line 75, ../../../../general/res/sass/_effects.scss */ +/* line 54, ../../../../general/res/sass/_effects.scss */ .pulse { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -280,6 +280,38 @@ a.disabled { opacity: 0.5; } 100% { opacity: 1; } } +/* line 58, ../../../../general/res/sass/_effects.scss */ +.pulse-subtle { + -moz-animation-name: pulse-subtle; + -webkit-animation-name: pulse-subtle; + animation-name: pulse-subtle; + -moz-animation-duration: 500ms; + -webkit-animation-duration: 500ms; + animation-duration: 500ms; + -moz-animation-direction: alternate; + -webkit-animation-direction: alternate; + animation-direction: alternate; + -moz-animation-iteration-count: infinite; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + -moz-animation-timing-function: ease-in-out; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; } +@-moz-keyframes pulse-subtle { + 0% { + opacity: 0.7; } + 100% { + opacity: 1; } } +@-webkit-keyframes pulse-subtle { + 0% { + opacity: 0.7; } + 100% { + opacity: 1; } } +@keyframes pulse-subtle { + 0% { + opacity: 0.7; } + 100% { + opacity: 1; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1520,8 +1552,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { width: 0.7rem; } /* line 114, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover { - background: rgba(102, 102, 102, 0.1); - color: #333333; } + background: #e3e3e3; + color: #4d4d4d; } /* line 117, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover .icon, .l-inspect .inspector-location .location-item:hover .t-item-icon { color: #0099cc; } @@ -1681,19 +1713,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { - background-image: deepskyblue; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: deepskyblue; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon, .s-btn.major:not(.disabled):hover > .t-item-icon, .major.s-menu-btn:not(.disabled):hover > .t-item-icon { color: white; } } /* line 67, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1711,19 +1739,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #eee; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { - background-image: #0099cc; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #7d7d7d; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon, .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { color: white; } } /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1756,19 +1780,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { - background-image: #ffad33; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #ffad33; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon, .s-btn.pause-play.paused:not(.disabled):hover > .t-item-icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .t-item-icon { color: white; } } /* line 93, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1845,10 +1865,10 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { height: 24px; width: 9px; text-align: center; } - /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 143, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #0099cc; } - /* line 147, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed { background-color: #969696; -moz-border-radius: 4px; @@ -1863,35 +1883,31 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { color: #eee; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover { - background-image: #0099cc; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #0099cc; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: white; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 150, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:after { opacity: 1; } - /* line 153, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:before { opacity: 1; } - /* line 154, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:after { opacity: 0; } - /* line 159, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; @@ -1912,22 +1928,22 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { display: block; height: 100%; position: absolute; } - /* line 168, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { width: 9px; } - /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; text-align: center; opacity: 0; } - /* line 181, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left { text-align: right; } - /* line 184, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; right: 0; } - /* line 189, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; @@ -1936,21 +1952,21 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; text-align: left; } - /* line 192, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 196, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } - /* line 199, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right { text-align: left; } - /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 203, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 0; } - /* line 207, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; @@ -1958,17 +1974,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } - /* line 209, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 210, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } - /* line 214, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 220, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 221, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #d6d6d6; cursor: pointer; @@ -1981,32 +1997,32 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { line-height: 9px; overflow: hidden; word-break: break-all; } - /* line 237, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 238, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } - /* line 242, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before, .mini-tab-icon:after { position: absolute; display: inherit; } - /* line 248, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before { content: '\78'; } - /* line 252, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:hover { color: #0099cc; } } -/* line 259, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 260, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 265, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set .s-btn, .l-btn-set .s-menu-btn { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; margin-left: 1px; } - /* line 271, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn { + /* line 272, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .first .s-btn, .l-btn-set .first .s-menu-btn, .l-btn-set .first.s-btn, .l-btn-set .first.s-menu-btn { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; @@ -2014,8 +2030,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 278, ../../../../general/res/sass/controls/_buttons.scss */ - .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn { + /* line 280, ../../../../general/res/sass/controls/_buttons.scss */ + .l-btn-set .last .s-btn, .l-btn-set .last .s-menu-btn, .l-btn-set .last.s-btn, .l-btn-set .last.s-menu-btn { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; @@ -2023,7 +2039,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 285, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 288, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -2874,7 +2890,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 359, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -3103,12 +3119,9 @@ label.checkbox.custom { .status.block.float-right { float: right; } /* line 65, ../../../../general/res/sass/controls/_messages.scss */ - .status.block.subtle { - opacity: 0.5; } - /* line 68, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator { margin-right: 3px; } - /* line 73, ../../../../general/res/sass/controls/_messages.scss */ + /* line 70, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse) .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3128,7 +3141,7 @@ label.checkbox.custom { transition-delay: 1.5s; overflow: hidden; max-width: 0px; } - /* line 80, ../../../../general/res/sass/controls/_messages.scss */ + /* line 77, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3146,9 +3159,9 @@ label.checkbox.custom { -o-transition-delay: 0s; -webkit-transition-delay: 0s; transition-delay: 0s; - max-width: 450px; + max-width: 600px; width: auto; } - /* line 85, ../../../../general/res/sass/controls/_messages.scss */ + /* line 82, ../../../../general/res/sass/controls/_messages.scss */ .status.block:not(.no-collapse):hover .count { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -3167,16 +3180,16 @@ label.checkbox.custom { -webkit-transition-delay: 0s; transition-delay: 0s; opacity: 0; } - /* line 92, ../../../../general/res/sass/controls/_messages.scss */ + /* line 89, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator, .status.block.info .status-indicator { color: #60ba7b; } - /* line 96, ../../../../general/res/sass/controls/_messages.scss */ + /* line 93, ../../../../general/res/sass/controls/_messages.scss */ .status.block.alert .status-indicator, .status.block.warning .status-indicator, .status.block.caution .status-indicator { color: #ffb66c; } - /* line 101, ../../../../general/res/sass/controls/_messages.scss */ + /* line 98, ../../../../general/res/sass/controls/_messages.scss */ .status.block.error .status-indicator { color: #c96b68; } - /* line 104, ../../../../general/res/sass/controls/_messages.scss */ + /* line 101, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3196,25 +3209,26 @@ label.checkbox.custom { transition-delay: 1.5s; font-weight: bold; opacity: 1; } - /* line 109, ../../../../general/res/sass/controls/_messages.scss */ + /* line 106, ../../../../general/res/sass/controls/_messages.scss */ .status.block .s-btn, .status.block .s-menu-btn { - padding: 0 3px; + background: #666; + padding: 0 5px; height: auto; line-height: inherit; } /* Styles for messages and message banners */ -/* line 119, ../../../../general/res/sass/controls/_messages.scss */ +/* line 116, ../../../../general/res/sass/controls/_messages.scss */ .message.block { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; padding: 10px; } -/* line 123, ../../../../general/res/sass/controls/_messages.scss */ +/* line 120, ../../../../general/res/sass/controls/_messages.scss */ .message.error { background-color: rgba(255, 60, 0, 0.3); color: #ff8a66; } -/* line 129, ../../../../general/res/sass/controls/_messages.scss */ +/* line 126, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -3243,7 +3257,7 @@ label.checkbox.custom { -webkit-transform: translateX(-50%); transform: translateX(-50%); z-index: 10; } - /* line 145, ../../../../general/res/sass/controls/_messages.scss */ + /* line 142, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.minimized { -moz-transition-property: left, opacity; -o-transition-property: left, opacity; @@ -3259,11 +3273,11 @@ label.checkbox.custom { transition-timing-function: ease-in-out; left: 0; opacity: 0; } - /* line 153, ../../../../general/res/sass/controls/_messages.scss */ + /* line 150, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new { left: 50%; opacity: 1; } - /* line 156, ../../../../general/res/sass/controls/_messages.scss */ + /* line 153, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner.new:not(.info) { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -3295,33 +3309,33 @@ label.checkbox.custom { opacity: 0.5; } 100% { opacity: 1; } } - /* line 161, ../../../../general/res/sass/controls/_messages.scss */ + /* line 158, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 165, ../../../../general/res/sass/controls/_messages.scss */ + /* line 162, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 168, ../../../../general/res/sass/controls/_messages.scss */ + /* line 165, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 172, ../../../../general/res/sass/controls/_messages.scss */ + /* line 169, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 178, ../../../../general/res/sass/controls/_messages.scss */ + /* line 175, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } - /* line 184, ../../../../general/res/sass/controls/_messages.scss */ + /* line 181, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .progress-info { display: none; } -/* line 194, ../../../../general/res/sass/controls/_messages.scss */ +/* line 191, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -3338,10 +3352,10 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 198, ../../../../general/res/sass/controls/_messages.scss */ + /* line 195, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 199, ../../../../general/res/sass/controls/_messages.scss */ + /* line 196, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -3362,13 +3376,13 @@ label.checkbox.custom { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; } - /* line 203, ../../../../general/res/sass/controls/_messages.scss */ + /* line 200, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 205, ../../../../general/res/sass/controls/_messages.scss */ + /* line 202, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 209, ../../../../general/res/sass/controls/_messages.scss */ + /* line 206, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok, .s-message-banner.info { background-color: #275a36; color: #fff; } @@ -3381,7 +3395,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover, .s-message-banner.info .s-action:hover { background-color: #275a36; } - /* line 213, ../../../../general/res/sass/controls/_messages.scss */ + /* line 210, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution, .s-message-banner.warning, .s-message-banner.alert { background-color: #d26a00; color: #fff; } @@ -3394,7 +3408,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover, .s-message-banner.warning .s-action:hover, .s-message-banner.alert .s-action:hover { background-color: #d26a00; } - /* line 218, ../../../../general/res/sass/controls/_messages.scss */ + /* line 215, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.error { background-color: #702a28; color: #fff; } @@ -3421,7 +3435,7 @@ label.checkbox.custom { ... same as above bottom-bar */ -/* line 260, ../../../../general/res/sass/controls/_messages.scss */ +/* line 257, ../../../../general/res/sass/controls/_messages.scss */ .l-message { display: -webkit-flex; display: flex; @@ -3429,52 +3443,52 @@ label.checkbox.custom { flex-direction: row; -webkit-align-items: stretch; align-items: stretch; } - /* line 264, ../../../../general/res/sass/controls/_messages.scss */ + /* line 261, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 269, ../../../../general/res/sass/controls/_messages.scss */ + /* line 266, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents { -webkit-flex: 1 1 auto; flex: 1 1 auto; margin-left: 25px; position: relative; } - /* line 275, ../../../../general/res/sass/controls/_messages.scss */ + /* line 272, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } -/* line 224, ../../../../general/res/sass/controls/_messages.scss */ +/* line 221, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type { text-shadow: rgba(255, 255, 255, 0.8) 0 0px 5px; color: #ccc; font-size: 80px; padding: 1px; width: 82px; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 223, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 230, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { color: #60ba7b; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 231, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 237, ../../../../general/res/sass/controls/_messages.scss */ +/* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { color: #ffb66c; } - /* line 238, ../../../../general/res/sass/controls/_messages.scss */ + /* line 235, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 241, ../../../../general/res/sass/controls/_messages.scss */ +/* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { color: #c96b68; } - /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + /* line 239, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 288, ../../../../general/res/sass/controls/_messages.scss */ + /* line 285, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { overflow: hidden; @@ -3485,40 +3499,40 @@ label.checkbox.custom { left: 0px; width: auto; height: auto; } - /* line 293, ../../../../general/res/sass/controls/_messages.scss */ + /* line 290, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .bottom-bar { top: auto; height: 24px; } } -/* line 224, ../../../../general/res/sass/controls/_messages.scss */ +/* line 221, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type { text-shadow: rgba(255, 255, 255, 0.8) 0 0px 5px; color: #ccc; font-size: 32px; padding: 1px; width: 34px; } - /* line 226, ../../../../general/res/sass/controls/_messages.scss */ + /* line 223, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } -/* line 233, ../../../../general/res/sass/controls/_messages.scss */ +/* line 230, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { color: #60ba7b; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 231, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 237, ../../../../general/res/sass/controls/_messages.scss */ +/* line 234, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { color: #ffb66c; } - /* line 238, ../../../../general/res/sass/controls/_messages.scss */ + /* line 235, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 241, ../../../../general/res/sass/controls/_messages.scss */ +/* line 238, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { color: #c96b68; } - /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + /* line 239, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 305, ../../../../general/res/sass/controls/_messages.scss */ +/* line 302, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -3526,26 +3540,26 @@ label.checkbox.custom { background: rgba(102, 102, 102, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 311, ../../../../general/res/sass/controls/_messages.scss */ + /* line 308, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents, .t-message-list .message-contents .l-message .bottom-bar { position: relative; } - /* line 317, ../../../../general/res/sass/controls/_messages.scss */ + /* line 314, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 320, ../../../../general/res/sass/controls/_messages.scss */ + /* line 317, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #999999; } - /* line 321, ../../../../general/res/sass/controls/_messages.scss */ + /* line 318, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 324, ../../../../general/res/sass/controls/_messages.scss */ + /* line 321, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 332, ../../../../general/res/sass/controls/_messages.scss */ + /* line 329, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } @@ -3948,7 +3962,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 119, ../../../../general/res/sass/forms/_elems.scss */ @@ -4006,7 +4020,7 @@ input[type="search"] { color: #666; outline: none; padding: 0 3px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error, input[type="search"].error { background: rgba(255, 0, 0, 0.5); } @@ -4036,7 +4050,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -4076,16 +4090,12 @@ textarea { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; padding: 0 5px; overflow: hidden; position: relative; line-height: 22px; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .select .icon, .select .t-item-icon { color: #eee; } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ @@ -4167,7 +4177,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../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 */ @@ -4554,7 +4564,7 @@ span.req { border: none; color: #666; outline: none; } - /* line 327, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ .s-filter input[type="search"].error { background: rgba(255, 0, 0, 0.5); } /* line 135, ../../../../general/res/sass/forms/_filter.scss */ @@ -5806,19 +5816,15 @@ span.req { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover { - background-image: #7d7d7d; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #7d7d7d; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major):not(.disabled):hover > .t-item-icon { color: white; } } /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -5978,7 +5984,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 360, ../../../../general/res/sass/_mixins.scss */ + /* line 359, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -6089,8 +6095,8 @@ ul.tree { /* line 99, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover, .search-result-item:not(.selected):hover { - background: rgba(102, 102, 102, 0.1); - color: #333333; } + background: #e3e3e3; + color: #4d4d4d; } /* line 102, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover .t-item-icon, .search-result-item:not(.selected):hover .t-item-icon { @@ -7309,10 +7315,6 @@ table { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; box-sizing: border-box; cursor: pointer; @@ -7322,14 +7324,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 308, ../../../../general/res/sass/_mixins.scss */ + /* line 307, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { - background-image: #d0d0d0; } - /* line 310, ../../../../general/res/sass/_mixins.scss */ + background: #c4c4c4; } + /* line 309, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon, .items-holder .item.grid-item:not(.disabled):hover > .t-item-icon { color: #33ccff; } } /* line 44, ../../../../general/res/sass/items/_item.scss */ @@ -7445,13 +7447,9 @@ table { -ms-user-select: none; -webkit-user-select: none; user-select: none; - -moz-transition: background, 0.25s; - -o-transition: background, 0.25s; - -webkit-transition: background, 0.25s; - transition: background, 0.25s; text-shadow: none; color: #80dfff; } - /* line 303, ../../../../general/res/sass/_mixins.scss */ + /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon, .items-holder .item.grid-item.selected .t-item-icon { color: #eee; } /* line 126, ../../../../general/res/sass/items/_item.scss */ diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 2e5b020f9f..b849d6c9e0 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -12,12 +12,14 @@ $colorInteriorBorder: rgba($colorBodyFg, 0.2); $colorA: #999; $colorAHov: $colorKey; $contrastRatioPercent: 40%; +$hoverRatioPercent: 10%; $basicCr: 4px; $controlCr: $basicCr; $smallCr: 3px; // Buttons and Controls $colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); +$colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent); $colorBtnFg: #fff; $colorBtnMajorBg: $colorKey; $colorBtnMajorFg: $colorKeyFg; @@ -54,7 +56,7 @@ $colorTick: rgba(black, 0.2); $colorMenuBg: pushBack($colorBodyBg, 10%); $colorMenuFg: pullForward($colorMenuBg, 70%); $colorMenuIc: $colorKey; -$colorMenuHovBg: pullForward($colorMenuBg, 10%); +$colorMenuHovBg: pullForward($colorMenuBg, $hoverRatioPercent); $colorMenuHovFg: $colorMenuFg; $colorMenuHovIc: $colorMenuIc; $shdwMenu: rgba(black, 0.5) 0 1px 5px; @@ -89,6 +91,7 @@ $colorStatusDefault: #ccc; $colorStatusInfo: #60ba7b; $colorStatusAlert: #ffb66c; $colorStatusError: #c96b68; +$colorStatusBtnBg: #666; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: #0a0; $progressBarHOverlay: 15px; @@ -123,7 +126,7 @@ $colorOvrBtnFg: #fff; // Items $colorItemBg: #ddd; -$colorItemBgHov: pullForward($colorItemBg, 5%); +$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent); $colorItemFg: $colorBodyFg; $colorItemFgDetails: pushBack($colorItemFg, 15%); $colorItemIc: $colorKey; @@ -149,15 +152,15 @@ $colorPlotAreaBorder: $colorInteriorBorder; $colorPlotLabelFg: pushBack($colorPlotFg, 20%); // Tree -$colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); -$colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); +$colorItemTreeHoverBg: pullForward($colorBodyBg, $hoverRatioPercent); +$colorItemTreeHoverFg: pullForward($colorBodyFg, $hoverRatioPercent); $colorItemTreeIcon: $colorKey; -$colorItemTreeIconHover: $colorItemTreeIcon; //pushBack($colorItemTreeIcon, 20%); +$colorItemTreeIconHover: $colorItemTreeIcon; $colorItemTreeVCHover: $colorKey; $colorItemTreeFg: $colorBodyFg; $colorItemTreeSelectedBg: pushBack($colorKey, 15%); $colorItemTreeSelectedFg: $colorBodyBg; -$colorItemTreeEditingBg: #caf1ff; //#c6e3ff; +$colorItemTreeEditingBg: #caf1ff; $colorItemTreeEditingFg: $colorEditAreaFg; $colorItemTreeVC: $colorBodyFg; $colorItemTreeSelectedVC: $colorBodyBg; diff --git a/platform/commonUI/themes/snow/res/sass/_mixins.scss b/platform/commonUI/themes/snow/res/sass/_mixins.scss index 05a5c4fb64..b175d6870e 100644 --- a/platform/commonUI/themes/snow/res/sass/_mixins.scss +++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss @@ -3,9 +3,9 @@ @include boxShdw($shdwBtns); } -@mixin btnSubtle($bg: $colorBtnBg, $bgHov: none, $fg: $colorBtnFg, $ic: $colorBtnIcon) { +@mixin btnSubtle($bg: $colorBtnBg, $bgHovColor: none, $fg: $colorBtnFg, $ic: $colorBtnIcon) { @include containerSubtle($bg, $fg); - @include btnBase($bg, $bgHov, $fg, $ic); + @include btnBase($bg, $bgHovColor, $fg, $ic); @include text-shadow($shdwItemText); } From 729d91e7f36f67b7a3c8eda4bb973b068e5df0ae Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 22 Feb 2016 12:51:32 -0800 Subject: [PATCH 11/20] [Frontend] CSS sanding and shimming open #442 Fixed white space problem with .status-block-holder applied to mct-include; Added new status 'available' class and updated theme constants files; --- .../commonUI/general/res/sass/controls/_messages.scss | 9 +++++++++ platform/commonUI/general/res/templates/bottombar.html | 3 ++- .../commonUI/themes/espresso/res/sass/_constants.scss | 1 + platform/commonUI/themes/snow/res/sass/_constants.scss | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index bdd9b7270a..187bdcdcfe 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -36,6 +36,12 @@ } } +mct-include.status-block-holder { + // mct-include that wraps status.block + // Must use display: inline-block to fix white space problems + display: inline-block; +} + .status.block { $transDelay: 1.5s; $transSpeed: .25s; @@ -98,6 +104,9 @@ &.error .status-indicator { color: $colorStatusError; } + &.available .status-indicator { + color: $colorStatusAvailable; + } .count { @include trans-prop-nice(opacity, $transSpeed, $transDelay); font-weight: bold; diff --git a/platform/commonUI/general/res/templates/bottombar.html b/platform/commonUI/general/res/templates/bottombar.html index f0d3799542..1883d31dd5 100644 --- a/platform/commonUI/general/res/templates/bottombar.html +++ b/platform/commonUI/general/res/templates/bottombar.html @@ -23,7 +23,8 @@
+ key="indicator.template" + class="status-block-holder">
diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 4511a83338..6b6ded1a7f 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -91,6 +91,7 @@ $colorStatusDefault: #ccc; $colorStatusInfo: #62ba72; $colorStatusAlert: #ffa66d; $colorStatusError: #d4585c; +$colorStatusAvailable: $colorKey; $colorStatusBtnBg: $colorBtnBg; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: $colorKey; diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index b849d6c9e0..c82bfca233 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -91,6 +91,7 @@ $colorStatusDefault: #ccc; $colorStatusInfo: #60ba7b; $colorStatusAlert: #ffb66c; $colorStatusError: #c96b68; +$colorStatusAvailable: $colorKey; $colorStatusBtnBg: #666; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: #0a0; From db1a7e37e8b4748b91a2599cc79cb808100ddc50 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 15:29:00 -0800 Subject: [PATCH 12/20] [Build] Gracefully handle scss errors Log errors in SCSS processing but don't crash watch process. Fixes https://github.com/nasa/openmctweb/issues/696 --- gulpfile.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 76a798a6eb..ca42fc8b00 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -90,17 +90,15 @@ function customCompass() { css: baseDir + 'css/', comments: true, bundle_exec: true - }, - compassObj; + }; - compassObj = compass(options); - compassObj.on('data', function (file) { - this.push(file); - }.bind(this)); - compassObj.on('end', function () { - done(); - }); - compassObj.end(chunk); + compass(options) + .on('data', function (file) { + this.push(file); + }.bind(this)) + .on('error', done) + .on('end', done) + .end(chunk); }; return compassWrapper; } From 0a7183568715e47f5d459f323867c6de07b87e49 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 18:02:16 -0800 Subject: [PATCH 13/20] [Build] Switch compass to bourbon Change mixin library to bourbon. Significantly reduces sass build time. https://github.com/nasa/openmctweb/issues/698 --- Gemfile | 6 - Gemfile.lock | 32 ------ example/mobile/res/config.rb | 26 ----- example/mobile/res/css/mobile-example.css | 103 ------------------ gulpfile.js | 58 +++------- package.json | 7 +- .../general/res/sass/_archetypes.scss | 8 +- .../commonUI/general/res/sass/_autoflow.scss | 6 +- .../commonUI/general/res/sass/_badges.scss | 6 +- .../commonUI/general/res/sass/_effects.scss | 2 +- .../general/res/sass/_fixed-position.scss | 8 +- .../commonUI/general/res/sass/_global.scss | 2 +- .../commonUI/general/res/sass/_icons.scss | 2 +- .../commonUI/general/res/sass/_inspector.scss | 6 +- .../commonUI/general/res/sass/_mixins.scss | 36 +++--- .../res/sass/controls/_breadcrumb.scss | 6 +- .../general/res/sass/controls/_buttons.scss | 8 +- .../res/sass/controls/_color-palette.scss | 4 +- .../general/res/sass/controls/_controls.scss | 30 ++--- .../general/res/sass/controls/_menus.scss | 8 +- .../general/res/sass/controls/_messages.scss | 14 +-- .../res/sass/controls/_time-controller.scss | 12 +- .../general/res/sass/edit/_editor.scss | 10 +- .../general/res/sass/features/_imagery.scss | 4 +- .../general/res/sass/forms/_elems.scss | 8 +- .../general/res/sass/forms/_filter.scss | 12 +- .../general/res/sass/forms/_selects.scss | 2 +- .../general/res/sass/helpers/_bubbles.scss | 6 +- .../general/res/sass/helpers/_splitter.scss | 2 +- .../res/sass/helpers/_wait-spinner.scss | 4 +- .../general/res/sass/lists/_tabular.scss | 6 +- .../res/sass/mobile/overlay/_overlay.scss | 2 +- .../general/res/sass/overlay/_overlay.scss | 2 +- .../general/res/sass/plots/_plots-main.scss | 12 +- .../general/res/sass/search/_search.scss | 4 +- .../commonUI/general/res/sass/tree/_tree.scss | 8 +- .../res/sass/user-environ/_layout.scss | 12 +- .../res/sass/user-environ/_tool-bar.scss | 2 +- .../themes/espresso/res/sass/_mixins.scss | 2 +- .../espresso/res/sass/theme-espresso.scss | 10 +- .../themes/snow/res/sass/_mixins.scss | 2 +- .../themes/snow/res/sass/theme-snow.scss | 8 +- .../timeline/res/sass/_activities.scss | 2 +- .../timeline/res/sass/_timeline-thematic.scss | 6 +- .../timeline/res/sass/_timelines.scss | 10 +- .../timeline/res/sass/timeline-espresso.scss | 6 +- .../timeline/res/sass/timeline-snow.scss | 6 +- .../features/timeline/res/sass/timeline.scss | 8 +- 48 files changed, 176 insertions(+), 370 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock delete mode 100755 example/mobile/res/config.rb delete mode 100644 example/mobile/res/css/mobile-example.css diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 34f38cf803..0000000000 --- a/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -group :development do - gem "compass", ">= 1.0.3" - gem "sass", "~> 3.4.18" -end diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 137bf783a0..0000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,32 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - chunky_png (1.3.5) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - ffi (1.9.10) - multi_json (1.11.2) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - sass (3.4.21) - -PLATFORMS - ruby - -DEPENDENCIES - compass (>= 1.0.3) - sass (~> 3.4.18) - -BUNDLED WITH - 1.10.6 diff --git a/example/mobile/res/config.rb b/example/mobile/res/config.rb deleted file mode 100755 index 58843cd76e..0000000000 --- a/example/mobile/res/config.rb +++ /dev/null @@ -1,26 +0,0 @@ -# Require any additional compass plugins here. -# require "compass-growl" - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "css" -sass_dir = "sass" -images_dir = "images" -javascripts_dir = "js" - -# You can select your preferred output style here (can be overridden via the command line): -# :expanded, :compressed, :nested -output_style = :nested - -# To enable relative paths to assets via compass helper functions. Uncomment: -relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass vfn_platform/static/sass scss && rm -rf sass && mv scss sass diff --git a/example/mobile/res/css/mobile-example.css b/example/mobile/res/css/mobile-example.css deleted file mode 100644 index 06d2102e32..0000000000 --- a/example/mobile/res/css/mobile-example.css +++ /dev/null @@ -1,103 +0,0 @@ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/************************** FEATURES */ -/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ -/************************** RATIOS */ -/************************** LAYOUT */ -/************************** CONTROLS */ -/************************** PATHS */ -/************************** TIMINGS */ -/************************** LIMITS */ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/************************** MOBILE REPRESENTATION ITEMS DIMENSIONS */ -/************************** MOBILE TREE MENU DIMENSIONS */ -/************************** WINDOW DIMENSIONS FOR RWD */ -/************************** MEDIA QUERIES: WINDOW CHECKS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */ -/************************** MEDIA QUERIES: WINDOWS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */ -/************************** DEVICE PARAMETERS FOR MENUS/REPRESENTATIONS */ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* REQUIRES mobile/_constants */ -@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 28, ../sass/mobile-example.scss */ - .create-btn-holder { - display: block !important; } } diff --git a/gulpfile.js b/gulpfile.js index ca42fc8b00..152df8447b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -24,7 +24,9 @@ var gulp = require('gulp'), requirejsOptimize = require('gulp-requirejs-optimize'), sourcemaps = require('gulp-sourcemaps'), - compass = require('gulp-compass'), + rename = require('gulp-rename'), + sass = require('gulp-sass'), + neat = require('node-neat'), jshint = require('gulp-jshint'), jscs = require('gulp-jscs'), replace = require('gulp-replace-task'), @@ -38,7 +40,7 @@ var gulp = require('gulp'), main: 'main.js', dist: 'dist', assets: 'dist/assets', - scss: 'platform/**/*.scss', + scss: ['./platform/**/*.scss', './example/**/*.scss'], scripts: [ 'main.js', 'platform/**/*.js', 'src/**/*.js' ], static: [ 'index.html', @@ -57,10 +59,8 @@ var gulp = require('gulp'), configFile: path.resolve(__dirname, 'karma.conf.js'), singleRun: true }, - compass: { - sass: __dirname, - css: paths.assets, - sourcemap: true + sass: { + includePaths: neat.includePaths }, replace: { variables: { @@ -70,40 +70,7 @@ var gulp = require('gulp'), branch: fs.existsSync('.git') ? git.branch() : 'Unknown' } } - }, - stream = require('stream'); - -/** -* Returns a transform stream that allows us to customize the destination -* paths for individual sass files. Wraps compass. -*/ -function customCompass() { - var compassWrapper = new stream.Transform({objectMode: true}); - compassWrapper._transform = function (chunk, encoding, done) { - if (/\/_[^\/]*.scss$/.test(chunk.path)) { - return done(); - } - var baseDir = 'platform/' + chunk.relative.replace(/sass\/.*$/, ''), - options = { - project: __dirname, - sass: baseDir + 'sass/', - css: baseDir + 'css/', - comments: true, - bundle_exec: true - }; - - compass(options) - .on('data', function (file) { - this.push(file); - }.bind(this)) - .on('error', done) - .on('end', done) - .end(chunk); }; - return compassWrapper; -} - - gulp.task('scripts', function () { return gulp.src(paths.main) @@ -111,18 +78,21 @@ gulp.task('scripts', function () { .pipe(requirejsOptimize(options.requirejsOptimize)) .pipe(sourcemaps.write('.')) .pipe(replace(options.replace)) - .pipe(gulp.dest(paths.dist)); + .pipe(gulp.dest(paths)); }); gulp.task('test', function (done) { new karma.Server(options.karma, done).start(); }); -gulp.task('compass'); - gulp.task('stylesheets', function () { - return gulp.src(paths.scss) - .pipe(customCompass()); + return gulp.src(paths.scss, {base: '.'}) + .pipe(sass(options.sass)) + .pipe(rename(function (file) { + file.dirname = file.dirname.replace('/sass', '/css'); + return file; + })) + .pipe(gulp.dest(__dirname)); }); gulp.task('lint', function () { diff --git a/package.json b/package.json index 6ffffae72d..6a386f0ada 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,12 @@ "git-rev-sync": "^1.4.0", "glob": ">= 3.0.0", "gulp": "^3.9.0", - "gulp-compass": "^2.1.0", "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0", + "gulp-rename": "^1.2.2", "gulp-replace-task": "^0.11.0", "gulp-requirejs-optimize": "^0.3.1", + "gulp-sass": "^2.2.0", "gulp-sourcemaps": "^1.6.0", "jasmine-core": "^2.3.0", "jsdoc": "^3.3.2", @@ -33,6 +34,8 @@ "marked": "^0.3.5", "mkdirp": "^0.5.1", "moment": "^2.11.1", + "node-bourbon": "^4.2.3", + "node-neat": "^1.7.2", "phantomjs": "^1.9.19", "requirejs": "^2.1.17", "split": "^1.0.0" @@ -45,7 +48,7 @@ "jsdoc": "jsdoc -c jsdoc.json -r -d target/docs/api", "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'", "docs": "npm run jsdoc ; npm run otherdoc", - "prepublish": "./node_modules/bower/bin/bower install && bundle install && ./node_modules/gulp/bin/gulp.js install" + "prepublish": "./node_modules/bower/bin/bower install && ./node_modules/gulp/bin/gulp.js install" }, "repository": { "type": "git", diff --git a/platform/commonUI/general/res/sass/_archetypes.scss b/platform/commonUI/general/res/sass/_archetypes.scss index 20b338c3db..84045c2520 100644 --- a/platform/commonUI/general/res/sass/_archetypes.scss +++ b/platform/commonUI/general/res/sass/_archetypes.scss @@ -34,7 +34,7 @@ .cols { @include clearfix; .col { - @include box-sizing(border-box); + box-sizing: border-box; @include clearfix; float: left; margin-left: $ueColMargin; @@ -94,7 +94,7 @@ /********************************************* FLEX STYLES */ .l-flex-row, .l-flex-col { - @include display-flex; + @include display(flex); @include flex-wrap(nowrap); .flex-elem { min-height: 0; // Needed to allow element to shrink within parent @@ -111,7 +111,7 @@ } .flex-container { // Apply to wrapping elements, mct-includes, etc. - @include display-flex; + @include display(flex); @include flex-wrap(nowrap); @include flex(1 1 auto); min-height:0; @@ -144,4 +144,4 @@ .flex-justify-end { @include justify-content(flex-end); -} \ No newline at end of file +} diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index 8a7564e7f5..9b500fb88f 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -64,7 +64,7 @@ white-space: nowrap; .l-autoflow-col { // @include test(); - @include box-sizing(border-box); + box-sizing: border-box; border-left: 1px solid $colorInteriorBorder; display: inline-block; // height: 100%; @@ -74,7 +74,7 @@ width: $colW; .l-autoflow-row { // @include test(red); - @include box-sizing(border-box); + box-sizing: border-box; border-bottom: 1px solid rgba(#fff,0.05); display: block; height: $rowH; @@ -110,7 +110,7 @@ width: auto; } &.r { - @include border-radius($smallCr); + border-radius: $smallCr; float: right; margin-left: $interiorMargin; padding-left: $valPad; diff --git a/platform/commonUI/general/res/sass/_badges.scss b/platform/commonUI/general/res/sass/_badges.scss index 921c4f272e..fc4d3e9b03 100644 --- a/platform/commonUI/general/res/sass/_badges.scss +++ b/platform/commonUI/general/res/sass/_badges.scss @@ -27,7 +27,7 @@ } .top-bar .badge { - @include border-radius($controlCr * 1.5); + border-radius: $controlCr * 1.5; $h: $btnStdH; //$ueTopBarBtnH; // - 5px; font-size: 1.4em; height: $h; @@ -39,7 +39,7 @@ //.top-bar .btn-browse .badge { // Moved to _controls.scss .btn.browse-btn -// @include border-radius($controlCr * 1.5); +// border-radius: $controlCr * 1.5; // $d: 20px; // display: block; // font-size: 1em; @@ -53,7 +53,7 @@ .super-menu .badge { @include background-image(linear-gradient(lighten($colorCreateBtn, 10%), $colorCreateBtn)); - @include border-radius($controlCr); + border-radius: $controlCr; @include boxShdwSubtle(); // display: inline-block; // margin-right: 10px !important; diff --git a/platform/commonUI/general/res/sass/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index 0b3ac3a8d6..c1701f7387 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -21,7 +21,7 @@ *****************************************************************************/ .disabled, a.disabled { - @include opacity($controlDisabledOpacity); + opacity: $controlDisabledOpacity; pointer-events: none !important; cursor: default !important; } diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss index edc6332231..9dc0fc2804 100644 --- a/platform/commonUI/general/res/sass/_fixed-position.scss +++ b/platform/commonUI/general/res/sass/_fixed-position.scss @@ -61,7 +61,7 @@ .l-fixed-position-box, .l-fixed-position-image, .l-fixed-position-text { - @include box-sizing(border-box); + box-sizing: border-box; height: 100%; width: 100%; } @@ -89,7 +89,7 @@ .l-elem { //@include absPosDefault($p); //@include absPosDefault(0); - @include box-sizing(border-box); + box-sizing: border-box; display: block; padding: 2px; //width: 50%; @@ -106,7 +106,7 @@ // @include test(blue); // right: $p; // left: auto; - @include border-radius($smallCr); + border-radius: $smallCr; $valPad: 5px; float: right; margin-left: $interiorMargin; @@ -125,7 +125,7 @@ .l-fixed-position-item-handle { $brd: 1px solid $colorKey; - // @include border-radius($controlCr); + // border-radius: $controlCr; background: rgba($colorKey, 0.5); cursor: crosshair; border: $brd; diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 545a98610b..4541a76bd3 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -139,7 +139,7 @@ mct-container { } .ds { - @include box-shadow(rgba(#000, 0.7) 0 4px 10px 2px); + box-shadow: rgba(#000, 0.7) 0 4px 10px 2px; } .hide, diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 685926560c..f27e9c15bd 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -93,7 +93,7 @@ height: auto; width: auto; position: absolute; left: 0; top: 0; right: 0; bottom: 10%; - @include transform-origin(bottom, left); + @include transform-origin(bottom left); @include transform(scale(0.3)); z-index: 2; } diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index f1420da094..59adb08358 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -58,7 +58,7 @@ } ul { - @include box-sizing(border-box); + box-sizing: border-box; padding-right: $interiorMargin; } @@ -73,7 +73,7 @@ } em { - @include border-radius($basicCr); + border-radius: $basicCr; background-color: $colorInspectorSectionHeaderBg; color: $colorInspectorSectionHeaderFg; margin-bottom: $interiorMargin; @@ -99,7 +99,7 @@ .inspector-location { .location-item { $h: 1.2em; - @include box-sizing(border-box); + box-sizing: border-box; cursor: pointer; display: inline-block; line-height: $h; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index c1fd977a19..10ce97b6e2 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -175,8 +175,8 @@ @mixin sliderTrack($bg: $scrollbarTrackColorBg) { //$b: 1px solid lighten($bg, 30%); - @include border-radius(2px); - @include box-sizing(border-box); + border-radius: 2px; + box-sizing: border-box; @include boxIncised(0.7); background-color: $bg; //border-bottom: $b; @@ -210,7 +210,7 @@ } @mixin boxIncised($sVal: 0.6, $inset: 5px) { - @include box-shadow(inset rgba(black, $sVal) 0 1px $inset); + box-shadow: inset rgba(black, $sVal) 0 1px $inset; } @mixin boxOutline($c: lighten($colorBodyBg, 20%)) { @@ -219,24 +219,24 @@ @mixin boxShdw($sVal: rgba(black, 0.4) 0 0 3px) { @if $sVal != 'none' { - @include box-shadow($sVal); + box-shadow: $sVal; } } @mixin boxShdwSubtle($sVal: 0.2) { @if $sVal != 'none' { - @include box-shadow(rgba(black, $sVal) 0 1px 2px); + box-shadow: rgba(black, $sVal) 0 1px 2px; } } @mixin boxShdwLarge($sVal: 0.7) { @if $sVal != 'none' { - @include box-shadow(rgba(black, $sVal) 0 3px 10px); + box-shadow: rgba(black, $sVal) 0 3px 10px; } } @mixin outerGlow($color: #fff, $sVal: 0.3) { - @include box-shadow(rgba($color, $sVal) 0 0 30px); + box-shadow: rgba($color, $sVal) 0 0 30px; } @mixin linearGlow($deg: 0, $c: red, $a: 0.4) { @@ -249,18 +249,18 @@ @mixin txtShdw($sVal) { //@if $sVal != 'none' { - @include text-shadow($sVal); + text-shadow: $sVal; //} } @mixin txtShdwSubtle($sVal: 0.1) { @if $sVal != 'none' { - @include text-shadow(rgba(black, $sVal) 0 1px 2px); + text-shadow: rgba(black, $sVal) 0 1px 2px; } } @mixin txtShdwLarge($sVal: 0.7) { - @include text-shadow(rgba(black, $sVal) 0 3px 7px); + text-shadow: rgba(black, $sVal) 0 3px 7px; } @function pullForward($c, $p: 20%) { @@ -291,8 +291,8 @@ @mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) { background-color: $bg; - @include border-radius($controlCr); - @include box-sizing(border-box); + border-radius: $controlCr; + box-sizing: border-box; color: $fg; display: inline-block; } @@ -316,9 +316,9 @@ @mixin input-base($bg: $colorInputBg, $fg: $colorInputFg, $shdw: rgba(black, 0.6) 0 1px 3px) { @include appearance(none); - @include border-radius($controlCr); - @include box-sizing(border-box); - @include box-shadow(inset $shdw); + border-radius: $controlCr; + box-sizing: border-box; + box-shadow: inset $shdw; background: $bg; border: none; color: $fg; @@ -334,7 +334,7 @@ } @mixin contextArrow() { - @include text-shadow(none); + text-shadow: none; content: '\76'; display: inline-block; font-family: 'symbolsfont'; @@ -407,13 +407,13 @@ } @mixin tmpBorder($c: #ffcc00, $a: 0.75) { - @include box-sizing(border-box); + box-sizing: border-box; border: 1px dotted rgba($c, $a); } @mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) { &:after { - @include box-sizing(border-box); + box-sizing: border-box; @include bgDiagonalStripes($c, $a); color: rgba(white, 0.3); font-style: italic; diff --git a/platform/commonUI/general/res/sass/controls/_breadcrumb.scss b/platform/commonUI/general/res/sass/controls/_breadcrumb.scss index 35f0a21005..a5df3daecc 100644 --- a/platform/commonUI/general/res/sass/controls/_breadcrumb.scss +++ b/platform/commonUI/general/res/sass/controls/_breadcrumb.scss @@ -8,9 +8,9 @@ .l-breadcrumb-item { //@include test(); a { - @include box-sizing(border-box); - @include border-radius($basicCr*.75); - @include single-transition(background-color, 0.25s); + box-sizing: border-box; + border-radius: $basicCr*.75; + @include transition(background-color, 0.25s); color: darken($colorBodyFg, 15%); display: inline-block; //margin-right: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 6c217d0ef0..d3a6d2c653 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -32,7 +32,7 @@ $pad: $interiorMargin * $baseRatio; } .s-btn { - @include box-sizing(border-box); + box-sizing: border-box; padding: 0 $pad; font-size: 0.7rem; vertical-align: top; @@ -126,9 +126,9 @@ $pad: $interiorMargin * $baseRatio; $cFg: $cBg; - @include border-radius($basicCr); + border-radius: $basicCr; //@include boxShdw($shdwBtns); - @include box-sizing(border-box); + box-sizing: border-box; @include trans-prop-nice((color, background-color), 100ms); color: $cFg; cursor: pointer; @@ -264,7 +264,7 @@ $pad: $interiorMargin * $baseRatio; font-size: 0; // Remove space between s-btn elements due to white space in markup .s-btn { - @include border-radius(0); + border-radius: 0; margin-left: 1px; } diff --git a/platform/commonUI/general/res/sass/controls/_color-palette.scss b/platform/commonUI/general/res/sass/controls/_color-palette.scss index 3ce512356a..e149fa97df 100644 --- a/platform/commonUI/general/res/sass/controls/_color-palette.scss +++ b/platform/commonUI/general/res/sass/controls/_color-palette.scss @@ -25,7 +25,7 @@ $m: 1; $colorSelectedColor: #fff; - @include box-sizing(border-box); + box-sizing: border-box; padding: $interiorMargin !important; .l-palette-row { @@ -34,7 +34,7 @@ width: ($d * $colorsPerRow) + ($m * $colorsPerRow); .l-palette-item { - @include box-sizing(border-box); + box-sizing: border-box; @include txtShdwSubtle(0.8); @include trans-prop-nice-fade(0.25s); border: 1px solid transparent; diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index d97a153cff..29ee34a2f6 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -28,8 +28,8 @@ } .accordion-head { $op: 0.2; - @include border-radius($basicCr * 0.75); - @include box-sizing("border-box"); + border-radius: $basicCr * 0.75; + box-sizing: "border-box"; background: rgba($colorBodyFg, $op); cursor: pointer; font-size: 0.75em; @@ -84,7 +84,7 @@ .l-control-group { // Buttons that have a conceptual grouping - internal space between, and a divider between groups. // @include test(); - @include box-sizing(border-box); + box-sizing: border-box; border-left: 1px solid $colorInteriorBorder; display: inline-block; padding: 0 $interiorMargin; @@ -125,9 +125,9 @@ label.checkbox.custom { height: $d; min-width: $d; &:before { - @include border-radius($basicCr * .75); + border-radius: $basicCr * .75; background: $bg; - @include box-shadow(inset rgba(black, 0.4) 0 1px 2px); + box-shadow: inset rgba(black, 0.4) 0 1px 2px; box-sizing: border-box; content: " "; font-family: 'symbolsfont'; @@ -182,7 +182,7 @@ label.checkbox.custom { .item .checkbox { &.checked label { - @include box-shadow(none); + box-shadow: none; border-bottom: none; } } @@ -293,13 +293,13 @@ label.checkbox.custom { } .s-progress-bar { - @include border-radius($basicCr); + border-radius: $basicCr; @include boxIncised(0.3, 4px); background: $colorProgressBarOuter; .progress-amt { - @include border-radius($basicCr); + border-radius: $basicCr; @include boxShdw(); - @include border-radius($basicCr - 1); + border-radius: $basicCr - 1; @include trans-prop-nice(width); &:before { background-color: $colorProgressBarAmt; @@ -433,7 +433,7 @@ label.checkbox.custom { .l-calendar { $colorMuted: pushBack($colorMenuFg, 30%); ul.l-cal-row { - @include display-flex; + @include display(flex); @include flex-flow(row nowrap); margin-top: 1px; &:first-child { @@ -483,9 +483,9 @@ label.checkbox.custom { @include desktop { ::-webkit-scrollbar { - @include border-radius(2px); - @include box-sizing(border-box); - @include box-shadow(inset $scrollbarTrackShdw); + border-radius: 2px; + box-sizing: border-box; + box-shadow: inset $scrollbarTrackShdw; background-color: $scrollbarTrackColorBg; height: $scrollbarTrackSize; width: $scrollbarTrackSize; @@ -496,8 +496,8 @@ label.checkbox.custom { $hc: $scrollbarThumbColorHov; $gr: 5%; @include background-image(linear-gradient(lighten($bg, $gr), $bg 20px)); - @include border-radius(2px); - @include box-sizing(border-box); + border-radius: 2px; + box-sizing: border-box; &:hover { @include background-image(linear-gradient(lighten($hc, $gr), $hc 20px)); } diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 473e9f1d45..12fea8c41f 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -72,7 +72,7 @@ } .s-menu { - @include border-radius($basicCr); + border-radius: $basicCr; @include containerSubtle($colorMenuBg, $colorMenuFg); @include boxShdw($shdwMenu); @include txtShdw($shdwMenuText); @@ -87,7 +87,7 @@ ul { @include menuUlReset(); li { - @include box-sizing(border-box); + box-sizing: border-box; border-top: 1px solid pullForward($colorMenuBg, 10%); color: pullForward($colorMenuBg, 60%); line-height: $menuLineH; @@ -171,7 +171,7 @@ @include absPosDefault($interiorMargin); } .pane { - @include box-sizing(border-box); + box-sizing: border-box; &.left { //@include test(); border-right: 1px solid pullForward($colorMenuBg, 10%); @@ -183,7 +183,7 @@ overflow-y: auto; ul { li { - @include border-radius($controlCr); + border-radius: $controlCr; padding-left: 30px; border-top: none; } diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 187bdcdcfe..1fb1b16969 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -123,7 +123,7 @@ mct-include.status-block-holder { /* Styles for messages and message banners */ .message { &.block { - @include border-radius($basicCr); + border-radius: $basicCr; padding: $interiorMarginLg; } &.error { @@ -135,9 +135,9 @@ mct-include.status-block-holder { .l-message-banner { $m: $interiorMarginSm; $lh: $ueFooterH - ($m*2) - 1; - @include box-sizing(border-box); + box-sizing: border-box; @include ellipsize(); - @include display-flex; + @include display(flex); @include flex-direction(row); @include align-items(center); position: absolute; @@ -198,12 +198,12 @@ mct-include.status-block-holder { } .s-message-banner { - @include border-radius($controlCr); + border-radius: $controlCr; @include statusBannerColors($colorStatusDefault, $colorStatusFg); cursor: pointer; a { color: inherit; } .s-action { - @include border-radius($basicCr); + border-radius: $basicCr; @include trans-prop-nice(background-color); } .close { @@ -264,7 +264,7 @@ mct-include.status-block-holder { */ .l-message { - @include display-flex; + @include display(flex); @include flex-direction(row); @include align-items(stretch); .type-icon.message-type { @@ -309,7 +309,7 @@ mct-include.status-block-holder { .message-contents { .l-message { - @include border-radius($controlCr); + border-radius: $controlCr; background: rgba($colorOvrFg, 0.1); margin-bottom: $interiorMargin; padding: $interiorMarginLg; diff --git a/platform/commonUI/general/res/sass/controls/_time-controller.scss b/platform/commonUI/general/res/sass/controls/_time-controller.scss index f615104666..49d996102d 100644 --- a/platform/commonUI/general/res/sass/controls/_time-controller.scss +++ b/platform/commonUI/general/res/sass/controls/_time-controller.scss @@ -37,7 +37,7 @@ mct-include.l-time-controller { { //@include test(); @include absPosDefault(0, visible); - @include box-sizing(border-box); + box-sizing: border-box; top: auto; } .l-time-range-slider, @@ -73,7 +73,7 @@ mct-include.l-time-controller { //@include test(green); height: $r2H; bottom: $r3H + ($interiorMarginSm * 1); .range-holder { - @include box-shadow(none); + box-shadow: none; background: none; border: none; .range { @@ -101,7 +101,7 @@ mct-include.l-time-controller { } &:after { // Circle element - @include border-radius($myW); + border-radius: $myW; @include transform(translateY(-50%)); top: 50%; right: 0; bottom: auto; left: 0; width: auto; @@ -167,7 +167,7 @@ mct-include.l-time-controller { color: $sliderColorKnobHov; } &.knob-l { - //@include border-bottom-left-radius($knobCr); // MOVED TO _CONTROLS.SCSS + //border-bottom-left-radius: $knobCr; // MOVED TO _CONTROLS.SCSS margin-left: $knobM; .range-value { text-align: right; @@ -175,7 +175,7 @@ mct-include.l-time-controller { } } &.knob-r { - //@include border-bottom-right-radius($knobCr); + //border-bottom-right-radius: $knobCr; margin-right: $knobM; .range-value { left: $rangeValOffset; @@ -193,7 +193,7 @@ mct-include.l-time-controller { .s-time-range-val { //@include test(); - @include border-radius($controlCr); + border-radius: $controlCr; background-color: $colorInputBg; padding: 1px 1px 0 $interiorMargin; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 4a8edf8120..06db8f6455 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -38,22 +38,22 @@ z-index: 11; } &.edit-resize-nw { - @include border-bottom-right-radius($cr); + border-bottom-right-radius: $cr; cursor: nw-resize; top: 0; left: 0; } &.edit-resize-ne { - @include border-bottom-left-radius($cr); + border-bottom-left-radius: $cr; cursor: ne-resize; top: 0; right: 0; } &.edit-resize-se { - @include border-top-left-radius($cr); + border-top-left-radius: $cr; cursor: se-resize; bottom: 0; right: 0; } &.edit-resize-sw { - @include border-top-right-radius($cr); + border-top-right-radius: $cr; cursor: sw-resize; bottom: 0; left: 0; } @@ -109,4 +109,4 @@ } } } -} \ No newline at end of file +} diff --git a/platform/commonUI/general/res/sass/features/_imagery.scss b/platform/commonUI/general/res/sass/features/_imagery.scss index fa74ed1caf..c1024d2912 100644 --- a/platform/commonUI/general/res/sass/features/_imagery.scss +++ b/platform/commonUI/general/res/sass/features/_imagery.scss @@ -104,8 +104,8 @@ } .l-image-thumb-item { - @include single-transition(background-color, 0.25s); - @include box-sizing(border-box); + @include transition(background-color, 0.25s); + box-sizing: border-box; padding: 1px; position: relative; .l-thumb, diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index 2e7f87ef9a..b9a95cba40 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -20,7 +20,7 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .section-header { - @include border-radius($basicCr); + border-radius: $basicCr; background: $colorFormSectionHeader; $c: lighten($colorBodyFg, 20%); //border-bottom: 1px solid rgba(#fff, 0.3); @@ -39,7 +39,7 @@ .form-row { $m: $interiorMargin; - @include box-sizing(border-box); + box-sizing: border-box; @include clearfix; border-top: 1px solid $colorFormLines; margin-top: $m; @@ -51,7 +51,7 @@ >.label, >.controls { - @include box-sizing(border-box); + box-sizing: border-box; @include clearfix; font-size: 0.8rem; line-height: $formInputH; @@ -149,7 +149,7 @@ label.form-control.checkbox { vertical-align: top; div.s-hint { - @include border-radius($basicCr); + border-radius: $basicCr; background: rgba($colorFormInvalid, 0.8); display: block; color: lighten($colorFormInvalid, 30%); diff --git a/platform/commonUI/general/res/sass/forms/_filter.scss b/platform/commonUI/general/res/sass/forms/_filter.scss index 64f697e439..2ca7dcfdb5 100644 --- a/platform/commonUI/general/res/sass/forms/_filter.scss +++ b/platform/commonUI/general/res/sass/forms/_filter.scss @@ -27,7 +27,7 @@ } } .icon.ui-symbol { - @include border-radius($controlCr); + border-radius: $controlCr; display: inline-block; font-size: 1.3em; height: $formInputH; @@ -43,9 +43,9 @@ $d: $formInputH - $mgn * 2; $cb: #fff; $cf: #333; - @include border-radius($controlCr); - @include box-sizing(border-box); - @include opacity(0.2); + border-radius: $controlCr; + box-sizing: border-box; + opacity: 0.2; background: $cb; color: $cf; display: block; @@ -59,7 +59,7 @@ text-align: center; z-index: 5; &:hover { - @include opacity(0.6); + opacity: 0.6; background-color: $colorKey; } } @@ -95,7 +95,7 @@ .clear-icon, .menu-icon, &:before { - @include box-sizing(border-box); + box-sizing: border-box; display: inline-block; line-height: inherit; position: absolute; diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss index 0b7abb3304..73fe1a547e 100644 --- a/platform/commonUI/general/res/sass/forms/_selects.scss +++ b/platform/commonUI/general/res/sass/forms/_selects.scss @@ -30,7 +30,7 @@ line-height: $formInputH; select { @include appearance(none); - @include box-sizing(border-box); + box-sizing: border-box; background: none; color: $colorSelectFg; cursor: pointer; diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index 166f92a883..6901a3e380 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -30,7 +30,7 @@ .l-infobubble-wrapper { $arwSize: 5px; - @include box-shadow(rgba(black, 0.4) 0 1px 5px); + box-shadow: rgba(black, 0.4) 0 1px 5px; position: relative; z-index: 50; .l-infobubble { @@ -149,8 +149,8 @@ .s-infobubble { $emFg: darken($colorInfoBubbleFg, 20%); - @include border-radius($basicCr); - @include box-shadow(rgba(black, 0.4) 0 1px 5px); + border-radius: $basicCr; + box-shadow: rgba(black, 0.4) 0 1px 5px; background: $colorInfoBubbleBg; color: $colorInfoBubbleFg; font-size: 0.8rem; diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss index 27e3e25fc0..3db0fcbe4a 100644 --- a/platform/commonUI/general/res/sass/helpers/_splitter.scss +++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss @@ -39,7 +39,7 @@ display: block; @if $splitterEndCr != 'none' { - @include border-radius($splitterEndCr); + border-radius: $splitterEndCr; } } &:active { diff --git a/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss b/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss index 015bf05187..310f72d1b4 100644 --- a/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss +++ b/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss @@ -34,8 +34,8 @@ @include animation-duration(0.5s); @include animation-iteration-count(infinite); @include animation-timing-function(linear); - @include border-radius(100%); - @include box-sizing(border-box); + border-radius: 100%; + box-sizing: border-box; border-color: rgba($c, 0.25); border-top-color: rgba($c, 1.0); border-style: solid; diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index 559f7324a4..e08f7f191e 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -26,7 +26,7 @@ .tabular, table { - @include box-sizing(border-box); + box-sizing: border-box; border-spacing: 0; border-collapse: collapse; display: table; @@ -107,7 +107,7 @@ table { &.s-cell-type-value { text-align: right; .l-cell-contents { - @include border-radius($smallCr); + border-radius: $smallCr; padding-left: $itemPadLR; padding-right: $itemPadLR; } @@ -126,7 +126,7 @@ table { top: $tabularHeaderH * 2; } input[type="text"] { - @include box-sizing(border-box); + box-sizing: border-box; width: 100%; //50px; } } diff --git a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss index 9fd6721130..a5459aa1d9 100644 --- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss @@ -27,7 +27,7 @@ .overlay > .holder { //@include test(orange); // This works! $m: 0; - @include border-radius($m); + border-radius: $m; top: $m; right: $m; bottom: $m; diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 602af62887..c4700795e5 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -37,7 +37,7 @@ > .holder { //$i: 15%; @include containerSubtle($colorOvrBg, $colorOvrFg); - @include border-radius($basicCr * 3); + border-radius: $basicCr * 3; color: $colorOvrFg; top: 50%; right: auto; diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 8f4327bb77..22e8312087 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -69,8 +69,8 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa } .gl-plot-coords { - @include box-sizing(border-box); - @include border-radius($controlCr); + box-sizing: border-box; + border-radius: $controlCr; background: black; color: lighten($colorBodyFg, 30%); padding: 2px 5px; @@ -117,7 +117,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa &.l-plot-y-label { $x: -50%; $r: -90deg; - @include transform-origin(50%, 0); + @include transform-origin(50% 0); @include transform(translateX($x) rotate($r)); display: inline-block; margin-left: $interiorMargin; // Kick off the left edge @@ -234,7 +234,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa } .plot-color-swatch, .color-swatch { - @include border-radius(2px); + border-radius: 2px; display: inline-block; height: $swatchD; width: $swatchD; @@ -244,7 +244,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .gl-plot-legend { .plot-legend-item { - @include border-radius($smallCr); + border-radius: $smallCr; line-height: 1.5em; padding: 0px $itemPadLR; .plot-color-swatch { @@ -310,4 +310,4 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa &.tick-label-y { right: 0; left: 0; } -} \ No newline at end of file +} diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index 37043ae939..48156a0c98 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -53,7 +53,7 @@ &:before, .clear-icon, .menu-icon { - @include box-sizing(border-box); + box-sizing: border-box; color: $colorInputIcon; height: $iconD; width: $iconD; @@ -130,7 +130,7 @@ .active-filter-display { $s: 0.7em; $p: $interiorMargin; - @include box-sizing(border-box); + box-sizing: border-box; line-height: 130%; padding-left: $s * 2.25; font-size: $s; diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 405a10de7a..81793a1342 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -35,9 +35,9 @@ ul.tree { .tree-item, .search-result-item { @extend .l-flex-row; - @include box-sizing(border-box); - @include border-radius($basicCr); - @include single-transition(background-color, 0.25s); + box-sizing: border-box; + border-radius: $basicCr; + @include transition(background-color, 0.25s); font-size: 0.8rem; height: $menuLineH; line-height: $menuLineH; @@ -155,7 +155,7 @@ mct-representation { .t-item-icon, .t-title-label { color: $colorItemTreeEditingFg; - @include text-shadow(none); + text-shadow: none; } .t-title-label { font-style: italic; diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 54da48268c..73602e368e 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -27,7 +27,7 @@ } .editor { - @include border-radius($basicCr * 1.5); + border-radius: $basicCr * 1.5; } .contents { @@ -86,7 +86,7 @@ color: lighten($colorBodyBg, 30%); font-size: .7rem; .status-holder { - @include box-sizing(border-box); + box-sizing: border-box; @include absPosDefault($interiorMargin); @include ellipsize(); right: 120px; @@ -94,7 +94,7 @@ z-index: 1; } .app-logo { - @include box-sizing(border-box); + box-sizing: border-box; @include absPosDefault($interiorMargin); cursor: pointer; left: auto; @@ -121,7 +121,7 @@ } .pane { - @include box-sizing(border-box); + box-sizing: border-box; position: absolute; .pane-header { @@ -282,7 +282,7 @@ /***************************************************** OBJECT BROWSE BAR */ .object-browse-bar { - @include box-sizing(border-box); + box-sizing: border-box; height: $ueTopBarH; line-height: $ueTopBarH; white-space: nowrap; @@ -378,7 +378,7 @@ .s-status-editing { .l-object-wrapper { @include pulseBorder($colorEditAreaFg, $dur: 1s, $opacity0: 0.3); - @include border-radius($controlCr); + border-radius: $controlCr; background-color: $colorEditAreaBg; border-color: $colorEditAreaFg; border-width: 2px; diff --git a/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss b/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss index 55ded31b5b..b0daeb867f 100644 --- a/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss +++ b/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss @@ -27,7 +27,7 @@ height: $btnToolbarH; } input[type="text"] { - @include box-sizing(border-box); + box-sizing: border-box; font-size: .9em; height: $btnToolbarH; margin-bottom: 1px; diff --git a/platform/commonUI/themes/espresso/res/sass/_mixins.scss b/platform/commonUI/themes/espresso/res/sass/_mixins.scss index a247ec4cd1..cfbe58dd66 100644 --- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss +++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss @@ -7,7 +7,7 @@ @mixin btnSubtle($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { @include containerSubtle($bg, $fg); @include btnBase($bg, $bgHovColor, $fg, $ic); - @include text-shadow($shdwItemText); + text-shadow: $shdwItemText; } @function pullForward($c: $colorBodyBg, $p: 20%) { diff --git a/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss b/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss index 74d213adf9..a200a94e67 100644 --- a/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss +++ b/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss @@ -20,10 +20,10 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -@import "compass"; -@import "compass/reset"; -@import "compass/css3"; -@import "compass/utilities"; +@import "bourbon"; +//@import "compass/reset"; +//@import "compass/css3"; +//@import "compass/utilities"; @import "../../../../general/res/sass/_mixins"; @import "../../../../general/res/sass/mobile/mixins"; @@ -33,4 +33,4 @@ @import "../../../../general/res/sass/mobile/constants"; @import "constants"; -@import "../../../../general/res/sass/main"; \ No newline at end of file +@import "../../../../general/res/sass/main"; diff --git a/platform/commonUI/themes/snow/res/sass/_mixins.scss b/platform/commonUI/themes/snow/res/sass/_mixins.scss index b175d6870e..34f6462d41 100644 --- a/platform/commonUI/themes/snow/res/sass/_mixins.scss +++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss @@ -6,7 +6,7 @@ @mixin btnSubtle($bg: $colorBtnBg, $bgHovColor: none, $fg: $colorBtnFg, $ic: $colorBtnIcon) { @include containerSubtle($bg, $fg); @include btnBase($bg, $bgHovColor, $fg, $ic); - @include text-shadow($shdwItemText); + text-shadow: $shdwItemText; } @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 2fa943f1fe..9c4359002f 100644 --- a/platform/commonUI/themes/snow/res/sass/theme-snow.scss +++ b/platform/commonUI/themes/snow/res/sass/theme-snow.scss @@ -20,10 +20,10 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -@import "compass"; -@import "compass/reset"; -@import "compass/css3"; -@import "compass/utilities"; +@import "bourbon"; +//@import "compass/reset"; +//@import "compass/css3"; +//@import "compass/utilities"; @import "../../../../general/res/sass/_mixins"; @import "../../../../general/res/sass/mobile/mixins"; diff --git a/platform/features/timeline/res/sass/_activities.scss b/platform/features/timeline/res/sass/_activities.scss index 2f88334e0e..268c602ae8 100644 --- a/platform/features/timeline/res/sass/_activities.scss +++ b/platform/features/timeline/res/sass/_activities.scss @@ -23,7 +23,7 @@ } } &.s-title { - @include text-shadow(rgba(black, 0.1) 0 1px 2px); + text-shadow: rgba(black, 0.1) 0 1px 2px; } &.duration { left: auto; diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss index 7e123edbb0..be25f24c1d 100644 --- a/platform/features/timeline/res/sass/_timeline-thematic.scss +++ b/platform/features/timeline/res/sass/_timeline-thematic.scss @@ -36,8 +36,8 @@ .bar { color: $colorGanttBarFg; @include activityBg($colorGanttBarBg); - @include border-radius($br); - @include box-shadow($shdwGanttBar); + border-radius: $br; + box-shadow: $shdwGanttBar; &.expanded { @include border-top-radius($br); @include border-bottom-radius(0); @@ -145,7 +145,7 @@ .s-status-editing .s-swimlane { cursor: pointer; .t-object-label { - @include border-radius($controlCr); + border-radius: $controlCr; cursor: move; padding: 2px 5px; &:hover { diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index 8ab100f122..dceaa49f9b 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -62,7 +62,7 @@ } } &.l-timeline-resource-legend { - @include box-sizing(border-box); + box-sizing: border-box; padding: $interiorMargin 0; white-space: nowrap; @@ -214,7 +214,7 @@ .l-hover-btns-holder { @include absPosDefault(); - @include box-sizing(border-box); + box-sizing: border-box; @include trans-prop-nice-fade(500ms); opacity: 0; height: $timelineTopPaneHeaderH; @@ -230,7 +230,7 @@ text-wrap: none; white-space: nowrap; .l-col { - @include box-sizing(border-box); + box-sizing: border-box; @include ellipsize(); display: inline-block; height: 100%; @@ -257,8 +257,8 @@ &.l-title { width: $timelineColTitleW; .rep-object-label[draggable="true"] { - @include border-radius($basicCr); - @include single-transition(background-color, 0.25s); + border-radius: $basicCr; + @include transition(background-color, 0.25s); cursor: pointer; display: inline-block; padding: 0 $interiorMarginSm; diff --git a/platform/features/timeline/res/sass/timeline-espresso.scss b/platform/features/timeline/res/sass/timeline-espresso.scss index 354d565e0f..5381f40264 100644 --- a/platform/features/timeline/res/sass/timeline-espresso.scss +++ b/platform/features/timeline/res/sass/timeline-espresso.scss @@ -19,9 +19,9 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@import "compass"; -@import "compass/css3"; -@import "compass/utilities"; +@import "bourbon"; +//@import "compass/css3"; +//@import "compass/utilities"; @import "../../../../commonUI/general/res/sass/constants"; @import "../../../../commonUI/general/res/sass/mixins"; diff --git a/platform/features/timeline/res/sass/timeline-snow.scss b/platform/features/timeline/res/sass/timeline-snow.scss index c1eb4cbd3c..0be42a0a3a 100644 --- a/platform/features/timeline/res/sass/timeline-snow.scss +++ b/platform/features/timeline/res/sass/timeline-snow.scss @@ -19,9 +19,9 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@import "compass"; -@import "compass/css3"; -@import "compass/utilities"; +@import "bourbon"; +//@import "compass/css3"; +//@import "compass/utilities"; @import "../../../../commonUI/general/res/sass/constants"; @import "../../../../commonUI/general/res/sass/mixins"; diff --git a/platform/features/timeline/res/sass/timeline.scss b/platform/features/timeline/res/sass/timeline.scss index 0fea5f0295..f6d07e2900 100644 --- a/platform/features/timeline/res/sass/timeline.scss +++ b/platform/features/timeline/res/sass/timeline.scss @@ -19,9 +19,9 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@import "compass"; -@import "compass/css3"; -@import "compass/utilities"; +@import "bourbon"; +//@import "compass/css3"; +//@import "compass/utilities"; @import "../../../../commonUI/general/res/sass/constants"; @import "../../../../commonUI/general/res/sass/mixins"; @@ -29,4 +29,4 @@ @import "../../../../commonUI/themes/espresso/res/sass/mixins"; @import "constants"; @import "activities"; -@import "timelines"; \ No newline at end of file +@import "timelines"; From 4d800d26e2516200fe23fc4206b44b39a9c401b1 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 18:18:06 -0800 Subject: [PATCH 14/20] [CSS] Add reset to replace compass/reset Add reset.css which replaces compass/reset. https://github.com/nasa/openmctweb/issues/698 --- platform/commonUI/general/bundle.js | 4 ++ platform/commonUI/general/res/css/reset.css | 48 +++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 platform/commonUI/general/res/css/reset.css diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js index aeb05762b1..6077785cf1 100644 --- a/platform/commonUI/general/bundle.js +++ b/platform/commonUI/general/bundle.js @@ -129,6 +129,10 @@ define([ { "stylesheetUrl": "css/normalize.min.css", "priority": "mandatory" + }, + { + "stylesheetUrl": "css/reset.css", + "priority": "mandatory" } ], "templates": [ diff --git a/platform/commonUI/general/res/css/reset.css b/platform/commonUI/general/res/css/reset.css new file mode 100644 index 0000000000..ed11813c4e --- /dev/null +++ b/platform/commonUI/general/res/css/reset.css @@ -0,0 +1,48 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} From 9b3c8dce2568a3c7ac78efde09e85258d4b3521c Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 18:21:35 -0800 Subject: [PATCH 15/20] [SCSS] Remove old references to compass Remove any old references to compass. https://github.com/nasa/openmctweb/issues/698 --- .../commonUI/themes/espresso/res/sass/theme-espresso.scss | 3 --- platform/commonUI/themes/snow/res/sass/theme-snow.scss | 3 --- platform/features/timeline/res/sass-compile.sh | 4 ---- platform/features/timeline/res/sass/timeline-espresso.scss | 2 -- platform/features/timeline/res/sass/timeline-snow.scss | 2 -- platform/features/timeline/res/sass/timeline.scss | 2 -- 6 files changed, 16 deletions(-) delete mode 100644 platform/features/timeline/res/sass-compile.sh diff --git a/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss b/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss index a200a94e67..a87bf7e51d 100644 --- a/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss +++ b/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss @@ -21,9 +21,6 @@ *****************************************************************************/ @import "bourbon"; -//@import "compass/reset"; -//@import "compass/css3"; -//@import "compass/utilities"; @import "../../../../general/res/sass/_mixins"; @import "../../../../general/res/sass/mobile/mixins"; diff --git a/platform/commonUI/themes/snow/res/sass/theme-snow.scss b/platform/commonUI/themes/snow/res/sass/theme-snow.scss index 9c4359002f..0e55a860c7 100644 --- a/platform/commonUI/themes/snow/res/sass/theme-snow.scss +++ b/platform/commonUI/themes/snow/res/sass/theme-snow.scss @@ -21,9 +21,6 @@ *****************************************************************************/ @import "bourbon"; -//@import "compass/reset"; -//@import "compass/css3"; -//@import "compass/utilities"; @import "../../../../general/res/sass/_mixins"; @import "../../../../general/res/sass/mobile/mixins"; diff --git a/platform/features/timeline/res/sass-compile.sh b/platform/features/timeline/res/sass-compile.sh deleted file mode 100644 index ee7f1cdf77..0000000000 --- a/platform/features/timeline/res/sass-compile.sh +++ /dev/null @@ -1,4 +0,0 @@ -date - -echo "*** Compiling sass" -compass compile --force \ No newline at end of file diff --git a/platform/features/timeline/res/sass/timeline-espresso.scss b/platform/features/timeline/res/sass/timeline-espresso.scss index 5381f40264..67307102bb 100644 --- a/platform/features/timeline/res/sass/timeline-espresso.scss +++ b/platform/features/timeline/res/sass/timeline-espresso.scss @@ -20,8 +20,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ @import "bourbon"; -//@import "compass/css3"; -//@import "compass/utilities"; @import "../../../../commonUI/general/res/sass/constants"; @import "../../../../commonUI/general/res/sass/mixins"; diff --git a/platform/features/timeline/res/sass/timeline-snow.scss b/platform/features/timeline/res/sass/timeline-snow.scss index 0be42a0a3a..39f57fd2bb 100644 --- a/platform/features/timeline/res/sass/timeline-snow.scss +++ b/platform/features/timeline/res/sass/timeline-snow.scss @@ -20,8 +20,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ @import "bourbon"; -//@import "compass/css3"; -//@import "compass/utilities"; @import "../../../../commonUI/general/res/sass/constants"; @import "../../../../commonUI/general/res/sass/mixins"; diff --git a/platform/features/timeline/res/sass/timeline.scss b/platform/features/timeline/res/sass/timeline.scss index f6d07e2900..3f6bf65e4e 100644 --- a/platform/features/timeline/res/sass/timeline.scss +++ b/platform/features/timeline/res/sass/timeline.scss @@ -20,8 +20,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ @import "bourbon"; -//@import "compass/css3"; -//@import "compass/utilities"; @import "../../../../commonUI/general/res/sass/constants"; @import "../../../../commonUI/general/res/sass/mixins"; From bd7ad85bd767607ed14d46dcb0acc987c0043e94 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 18:28:45 -0800 Subject: [PATCH 16/20] [Build] Remove unused dependency https://github.com/nasa/openmctweb/issues/698 --- gulpfile.js | 4 ++-- package.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 152df8447b..53ce244f2c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -26,7 +26,7 @@ var gulp = require('gulp'), sourcemaps = require('gulp-sourcemaps'), rename = require('gulp-rename'), sass = require('gulp-sass'), - neat = require('node-neat'), + bourbon = require('node-bourbon'), jshint = require('gulp-jshint'), jscs = require('gulp-jscs'), replace = require('gulp-replace-task'), @@ -60,7 +60,7 @@ var gulp = require('gulp'), singleRun: true }, sass: { - includePaths: neat.includePaths + includePaths: bourbon.includePaths }, replace: { variables: { diff --git a/package.json b/package.json index 6a386f0ada..b787b499c6 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "mkdirp": "^0.5.1", "moment": "^2.11.1", "node-bourbon": "^4.2.3", - "node-neat": "^1.7.2", "phantomjs": "^1.9.19", "requirejs": "^2.1.17", "split": "^1.0.0" From 88945c48d4de861476605e585138a1ec5048ee0d Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 18:29:26 -0800 Subject: [PATCH 17/20] [Build] Gracefully handle sass error https://github.com/nasa/openmctweb/issues/698 --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 53ce244f2c..317cbcf120 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -87,7 +87,7 @@ gulp.task('test', function (done) { gulp.task('stylesheets', function () { return gulp.src(paths.scss, {base: '.'}) - .pipe(sass(options.sass)) + .pipe(sass(options.sass).on('error', sass.logError)) .pipe(rename(function (file) { file.dirname = file.dirname.replace('/sass', '/css'); return file; From a05d6d8ee80ed64ef7056624fadaa4adbfe73c8d Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 18:30:07 -0800 Subject: [PATCH 18/20] [Build] Rebuild scss when starting server Rebuild scss when starting the development server. https://github.com/nasa/openmctweb/issues/698 --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 317cbcf120..742b06977f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -129,7 +129,7 @@ gulp.task('serve', function () { var app = require('./app.js'); }); -gulp.task('develop', ['serve', 'watch']); +gulp.task('develop', ['serve', 'stylesheets', 'watch']); gulp.task('install', [ 'static', 'scripts' ]); From eaab70741ac795f3cecc4cb33dc4fe716131bdec Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 18:57:05 -0800 Subject: [PATCH 19/20] [Build] Generate CSS sourcemaps Generate CSS sourcemaps to aide in debugging. https://github.com/nasa/openmctweb/issues/698 --- .gitignore | 1 + gulpfile.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 5bbb396349..aacf7f9728 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.sass-cache *COMPILE.css *.css +*.css.map # Intellij project configuration files *.idea diff --git a/gulpfile.js b/gulpfile.js index 742b06977f..06d9222a42 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -87,11 +87,13 @@ gulp.task('test', function (done) { gulp.task('stylesheets', function () { return gulp.src(paths.scss, {base: '.'}) + .pipe(sourcemaps.init()) .pipe(sass(options.sass).on('error', sass.logError)) .pipe(rename(function (file) { file.dirname = file.dirname.replace('/sass', '/css'); return file; })) + .pipe(sourcemaps.write('.')) .pipe(gulp.dest(__dirname)); }); From 51fbbfe6015dd92110caabff1b3891cc02904f99 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 22 Feb 2016 19:07:36 -0800 Subject: [PATCH 20/20] [Gulp] Revert accidental change --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 06d9222a42..fa832d1aa6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -78,7 +78,7 @@ gulp.task('scripts', function () { .pipe(requirejsOptimize(options.requirejsOptimize)) .pipe(sourcemaps.write('.')) .pipe(replace(options.replace)) - .pipe(gulp.dest(paths)); + .pipe(gulp.dest(paths.dist)); }); gulp.task('test', function (done) {