From 7014808c1374e68999e82aa5708f3ffcd50ef751 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 2 Oct 2015 15:41:02 -0700 Subject: [PATCH 001/201] [Frontend] Style and display changes to status block open #159 open #170 Moved classes from _bottom-bar.scss into _layout.scss and new file _messages.scss; Removed _bottom-bar.scss; Revised display behavior of .status.block to show label on hover; --- platform/commonUI/general/res/sass/_main.scss | 2 +- .../_messages.scss} | 58 ++-- .../res/sass/user-environ/_layout.scss | 20 +- .../general/res/templates/indicator.html | 4 +- .../espresso/res/css/theme-espresso.css | 289 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 289 +++++++++--------- 6 files changed, 338 insertions(+), 324 deletions(-) rename platform/commonUI/general/res/sass/{user-environ/_bottom-bar.scss => controls/_messages.scss} (53%) diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 80023f55ac..8241078c50 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -39,6 +39,7 @@ @import "controls/controls"; @import "controls/lists"; @import "controls/menus"; +@import "controls/messages"; @import "controls/time-controller"; @import "mobile/controls/menus"; @@ -62,7 +63,6 @@ @import "mobile/tree"; @import "user-environ/frame"; @import "user-environ/top-bar"; -@import "user-environ/bottom-bar"; @import "user-environ/tool-bar"; /********************************* VIEWS */ diff --git a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss b/platform/commonUI/general/res/sass/controls/_messages.scss similarity index 53% rename from platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss rename to platform/commonUI/general/res/sass/controls/_messages.scss index dd705b0000..ec83528fba 100644 --- a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -19,46 +19,17 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -.ue-bottom-bar { - background: $colorFooterBg; - color: lighten($colorBodyBg, 30%); - font-size: .7rem; - //line-height: $ueFooterH - 4px; - //line-height: $ueFooterH; // New status bar design - .status-holder { - //@include border-radius($basicCr * 1.75); // New status bar design - @include box-sizing(border-box); - //background: $colorFooterBg; - //border-bottom: 1px solid lighten($colorBodyBg, 10%); // New status bar design - @include absPosDefault($interiorMargin); - @include ellipsize(); - line-height: $ueFooterH - ($interiorMargin * 2); - right: 120px; - text-transform: uppercase; - } - .app-logo { - @include box-sizing(border-box); - @include absPosDefault($interiorMargin); - left: auto; - cursor: pointer; - //font-size: 0.8em; - //line-height: $ueFooterH - 10px; - //padding-top: 1px; - //text-transform: uppercase; - &.logo-openmctweb { - background: url($dirImgs + 'logo-openmctweb.svg') no-repeat center center; - } - } -} .status.block { - //display: inline-block; - display: inline; // New status bar design. Inline to support ellipsis overflow - margin-right: $interiorMarginLg; + //@include test(); + cursor: help; + display: inline-block; + margin-right: $interiorMargin; + .status-indicator, + .label { + vertical-align: top; + } .status-indicator { - //@include border-radius($controlCr * 0.9); - //@include box-shadow(inset rgba(black, 0.5) 0 0 3px); - //@include text-shadow(rgba(black, 0.3) 0 0 2px); display: inline-block; margin-right: $interiorMarginSm; color: $colorKey; @@ -69,4 +40,17 @@ color: #ffaa00; } } + .label { + // Max-width silliness is necessary for width transition + @include trans-prop-nice(max-width, .25s); + display: inline-block; + overflow: hidden; + max-width: 0px; + } + &:hover { + .label { + max-width: 150px; + width: auto; + } + } } \ 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 4661c47214..6a11e22eb0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -125,19 +125,35 @@ } } + // from _bottom-bar.scss .ue-bottom-bar { - //@include absPosDefault($bodyMargin); @include absPosDefault(0);// New status bar design top: auto; height: $ueFooterH; + line-height: $ueFooterH - ($interiorMargin * 2); + background: $colorFooterBg; + color: lighten($colorBodyBg, 30%); + font-size: .7rem; + .status-holder { - //right: $ueAppLogoW + $bodyMargin; New status bar design + @include box-sizing(border-box); + @include absPosDefault($interiorMargin); + @include ellipsize(); + //line-height: $ueFooterH - ($interiorMargin * 2); + right: 120px; + text-transform: uppercase; z-index: 1; } .app-logo { + @include box-sizing(border-box); + @include absPosDefault($interiorMargin); + cursor: pointer; left: auto; width: $ueAppLogoW; z-index: 2; + &.logo-openmctweb { + background: url($dirImgs + 'logo-openmctweb.svg') no-repeat center center; + } } } } diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html index 34ea2fe9c8..963d35ec14 100644 --- a/platform/commonUI/general/res/templates/indicator.html +++ b/platform/commonUI/general/res/templates/indicator.html @@ -20,7 +20,7 @@ at runtime from the About dialog for additional information. -->
@@ -28,7 +28,7 @@ ng-class='ngModel.getGlyphClass()'> {{ngModel.getGlyph()}} - {{ngModel.getText()}} diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 6eb39c0b0a..16cf89a2ea 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; } @@ -2283,6 +2283,69 @@ label.checkbox.custom { right: 0; width: auto; } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/controls/_messages.scss */ +.status.block { + cursor: help; + display: inline-block; + margin-right: 5px; } + /* line 29, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator, + .status.block .label { + vertical-align: top; } + /* line 34, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator { + display: inline-block; + margin-right: 3px; + color: #0099cc; } + /* line 38, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator.ok { + color: #009900; } + /* line 41, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator.caution { + color: #ffaa00; } + /* line 45, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .label { + -moz-transition-property: max-width; + -o-transition-property: max-width; + -webkit-transition-property: max-width; + transition-property: max-width; + -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; + display: inline-block; + overflow: hidden; + max-width: 0px; } + /* line 54, ../../../../general/res/sass/controls/_messages.scss */ + .status.block:hover .label { + max-width: 150px; + width: auto; } + /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { position: relative; @@ -3106,7 +3169,7 @@ span.req { /* line 123, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .edit-area .work-area { top: 40px; } -/* line 128, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 129, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar { overflow: hidden; position: absolute; @@ -3117,21 +3180,56 @@ span.req { width: auto; height: auto; top: auto; - height: 25px; } - /* line 133, ../../../../general/res/sass/user-environ/_layout.scss */ + height: 25px; + line-height: 15px; + background: #000; + color: gray; + font-size: .7rem; } + /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar .status-holder { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + right: 120px; + text-transform: uppercase; z-index: 1; } - /* line 137, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 147, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar .app-logo { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + cursor: pointer; left: auto; width: 105px; z-index: 2; } + /* line 154, ../../../../general/res/sass/user-environ/_layout.scss */ + .user-environ .ue-bottom-bar .app-logo.logo-openmctweb { + background: url("../../../../general/res/images/logo-openmctweb.svg") no-repeat center center; } -/* line 145, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 161, ../../../../general/res/sass/user-environ/_layout.scss */ .cols { overflow: hidden; *zoom: 1; } - /* line 147, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 163, ../../../../general/res/sass/user-environ/_layout.scss */ .cols .col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -3142,114 +3240,114 @@ span.req { margin-left: 1.5%; padding-left: 5px; position: relative; } - /* line 155, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 171, ../../../../general/res/sass/user-environ/_layout.scss */ .cols .col:first-child { margin-left: 0; padding-left: 0; } - /* line 162, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 178, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-2 .col-1 { min-width: 250px; width: 48.5%; } - /* line 168, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 184, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-2-ff .col-100px { width: 100px; } - /* line 175, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 191, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-6 .col-1 { min-width: 83.33333px; width: 15.16667%; } - /* line 181, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 197, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-16 .col-1 { min-width: 31.25px; width: 4.75%; } - /* line 184, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-16 .col-2 { min-width: 62.5px; width: 11%; } - /* line 187, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 203, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-16 .col-7 { min-width: 218.75px; width: 42.25%; } - /* line 193, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 209, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-32 .col-2 { min-width: 31.25px; width: 4.75%; } - /* line 196, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 212, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-32 .col-15 { min-width: 234.375px; width: 45.375%; } - /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 216, ../../../../general/res/sass/user-environ/_layout.scss */ .cols .l-row { overflow: hidden; *zoom: 1; padding: 5px 0; } -/* line 208, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 224, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-mode .split-layout .split-pane-component.pane.left { min-width: 150px; max-width: 800px; width: 25%; } -/* line 218, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 234, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right { width: 15%; } - /* line 220, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { min-height: 50px; height: 30%; } -/* line 230, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 246, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 233, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 249, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 241, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 244, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 260, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 251, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 267, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .s-menu span.left.l-click-area, .s-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .s-menu span.right.l-click-area, .s-menu .pane.items .object-browse-bar span.right.l-click-area { top: auto; } - /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-holder { top: 34px; } - /* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 282, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 290, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 277, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 293, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 284, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 300, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 291, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 307, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 293, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .s-btn, .object-browse-bar .s-menu, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu, @@ -3261,12 +3359,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 331, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3282,39 +3380,28 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 344, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 346, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/*.object-holder { - .s-btn { - //background: red !important; - $h: 16px; - height: $h; - line-height: $h; - > span { - font-size: 0.7rem; - } - } -}*/ -/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 354, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 353, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 357, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 360, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -4411,86 +4498,6 @@ ul.tree { bottom: auto; left: auto; } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ -.ue-bottom-bar { - background: #000; - color: gray; - font-size: .7rem; } - /* line 28, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .status-holder { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - width: auto; - height: auto; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - line-height: 15px; - right: 120px; - text-transform: uppercase; } - /* line 39, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .app-logo { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - width: auto; - height: auto; - left: auto; - cursor: pointer; } - /* line 48, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .app-logo.logo-openmctweb { - background: url("../../../../general/res/images/logo-openmctweb.svg") no-repeat center center; } - -/* line 54, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ -.status.block { - display: inline; - margin-right: 10px; } - /* line 58, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator { - display: inline-block; - margin-right: 3px; - color: #0099cc; } - /* line 65, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator.ok { - color: #009900; } - /* line 68, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator.caution { - color: #ffaa00; } - /***************************************************************************** * 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 3a819210eb..d9463b49ca 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; } @@ -2231,6 +2231,69 @@ label.checkbox.custom { right: 0; width: auto; } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/controls/_messages.scss */ +.status.block { + cursor: help; + display: inline-block; + margin-right: 5px; } + /* line 29, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator, + .status.block .label { + vertical-align: top; } + /* line 34, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator { + display: inline-block; + margin-right: 3px; + color: #0099cc; } + /* line 38, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator.ok { + color: #009900; } + /* line 41, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator.caution { + color: #ffaa00; } + /* line 45, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .label { + -moz-transition-property: max-width; + -o-transition-property: max-width; + -webkit-transition-property: max-width; + transition-property: max-width; + -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; + display: inline-block; + overflow: hidden; + max-width: 0px; } + /* line 54, ../../../../general/res/sass/controls/_messages.scss */ + .status.block:hover .label { + max-width: 150px; + width: auto; } + /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { position: relative; @@ -3038,7 +3101,7 @@ span.req { /* line 123, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .edit-area .work-area { top: 40px; } -/* line 128, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 129, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar { overflow: hidden; position: absolute; @@ -3049,21 +3112,56 @@ span.req { width: auto; height: auto; top: auto; - height: 25px; } - /* line 133, ../../../../general/res/sass/user-environ/_layout.scss */ + height: 25px; + line-height: 15px; + background: #000; + color: white; + font-size: .7rem; } + /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar .status-holder { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + right: 120px; + text-transform: uppercase; z-index: 1; } - /* line 137, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 147, ../../../../general/res/sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar .app-logo { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + cursor: pointer; left: auto; width: 105px; z-index: 2; } + /* line 154, ../../../../general/res/sass/user-environ/_layout.scss */ + .user-environ .ue-bottom-bar .app-logo.logo-openmctweb { + background: url("../../../../general/res/images/logo-openmctweb.svg") no-repeat center center; } -/* line 145, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 161, ../../../../general/res/sass/user-environ/_layout.scss */ .cols { overflow: hidden; *zoom: 1; } - /* line 147, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 163, ../../../../general/res/sass/user-environ/_layout.scss */ .cols .col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -3074,114 +3172,114 @@ span.req { margin-left: 1.5%; padding-left: 5px; position: relative; } - /* line 155, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 171, ../../../../general/res/sass/user-environ/_layout.scss */ .cols .col:first-child { margin-left: 0; padding-left: 0; } - /* line 162, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 178, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-2 .col-1 { min-width: 250px; width: 48.5%; } - /* line 168, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 184, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-2-ff .col-100px { width: 100px; } - /* line 175, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 191, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-6 .col-1 { min-width: 83.33333px; width: 15.16667%; } - /* line 181, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 197, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-16 .col-1 { min-width: 31.25px; width: 4.75%; } - /* line 184, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-16 .col-2 { min-width: 62.5px; width: 11%; } - /* line 187, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 203, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-16 .col-7 { min-width: 218.75px; width: 42.25%; } - /* line 193, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 209, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-32 .col-2 { min-width: 31.25px; width: 4.75%; } - /* line 196, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 212, ../../../../general/res/sass/user-environ/_layout.scss */ .cols.cols-32 .col-15 { min-width: 234.375px; width: 45.375%; } - /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 216, ../../../../general/res/sass/user-environ/_layout.scss */ .cols .l-row { overflow: hidden; *zoom: 1; padding: 5px 0; } -/* line 208, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 224, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-mode .split-layout .split-pane-component.pane.left { min-width: 150px; max-width: 800px; width: 25%; } -/* line 218, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 234, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right { width: 15%; } - /* line 220, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { min-height: 50px; height: 30%; } -/* line 230, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 246, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 233, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 249, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 241, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 244, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 260, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 251, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 267, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .s-menu span.left.l-click-area, .s-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .s-menu span.right.l-click-area, .s-menu .pane.items .object-browse-bar span.right.l-click-area { top: auto; } - /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-holder { top: 34px; } - /* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 282, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 290, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 277, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 293, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 284, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 300, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 291, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 307, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 293, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .s-btn, .object-browse-bar .s-menu, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu, @@ -3193,12 +3291,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 331, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3214,39 +3312,28 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 344, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 346, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/*.object-holder { - .s-btn { - //background: red !important; - $h: 16px; - height: $h; - line-height: $h; - > span { - font-size: 0.7rem; - } - } -}*/ -/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 354, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 353, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 357, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 360, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -4324,86 +4411,6 @@ ul.tree { bottom: auto; left: auto; } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ -.ue-bottom-bar { - background: #000; - color: white; - font-size: .7rem; } - /* line 28, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .status-holder { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - width: auto; - height: auto; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - line-height: 15px; - right: 120px; - text-transform: uppercase; } - /* line 39, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .app-logo { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - width: auto; - height: auto; - left: auto; - cursor: pointer; } - /* line 48, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .app-logo.logo-openmctweb { - background: url("../../../../general/res/images/logo-openmctweb.svg") no-repeat center center; } - -/* line 54, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ -.status.block { - display: inline; - margin-right: 10px; } - /* line 58, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator { - display: inline-block; - margin-right: 3px; - color: #0099cc; } - /* line 65, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator.ok { - color: #009900; } - /* line 68, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator.caution { - color: #ffaa00; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space From 926aed72c309dad09dccd31ea1c6c189fc8b1787 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 2 Oct 2015 17:42:31 -0700 Subject: [PATCH 002/201] [Frontend] Style and display changes to status block open #159 open #170 Refined structure in status block markup and css; Added status-related color constants to theme scss files; --- .../general/res/sass/controls/_messages.scss | 32 ++++++----- .../general/res/templates/indicator.html | 26 ++++----- .../espresso/res/css/theme-espresso.css | 53 +++++++++++++------ .../themes/espresso/res/sass/_constants.scss | 6 +++ .../themes/snow/res/css/theme-snow.css | 53 +++++++++++++------ .../themes/snow/res/sass/_constants.scss | 6 +++ 6 files changed, 117 insertions(+), 59 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index ec83528fba..a6aa243535 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -21,36 +21,44 @@ *****************************************************************************/ .status.block { - //@include test(); - cursor: help; + color: $colorStatusDefault; + cursor: default; display: inline-block; margin-right: $interiorMargin; .status-indicator, - .label { + .label, + .count { + //@include test(#00ff00); + display: inline-block; vertical-align: top; } .status-indicator { - display: inline-block; margin-right: $interiorMarginSm; - color: $colorKey; - &.ok { - color: #009900; - } - &.caution { - color: #ffaa00; - } + } + &.ok .status-indicator { + color: $colorStatusOk; + } + &.caution .status-indicator { + color: $colorStatusCaution; } .label { // Max-width silliness is necessary for width transition @include trans-prop-nice(max-width, .25s); - display: inline-block; overflow: hidden; max-width: 0px; } + .count { + @include trans-prop-nice(opacity, .25s); + font-weight: bold; + opacity: 1; + } &:hover { .label { max-width: 150px; width: auto; } + .count { + opacity: 0; + } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html index 963d35ec14..40733d875a 100644 --- a/platform/commonUI/general/res/templates/indicator.html +++ b/platform/commonUI/general/res/templates/indicator.html @@ -19,20 +19,20 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> +
- - {{ngModel.getGlyph()}} - - - {{ngModel.getText()}} - - + + {{ngModel.getGlyph()}} + + {{ngModel.getText()}} + + + G diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 16cf89a2ea..316c6a5877 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -2306,25 +2306,26 @@ label.checkbox.custom { *****************************************************************************/ /* line 23, ../../../../general/res/sass/controls/_messages.scss */ .status.block { - cursor: help; + color: #ccc; + cursor: default; display: inline-block; margin-right: 5px; } - /* line 29, ../../../../general/res/sass/controls/_messages.scss */ + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator, - .status.block .label { - vertical-align: top; } - /* line 34, ../../../../general/res/sass/controls/_messages.scss */ - .status.block .status-indicator { + .status.block .label, + .status.block .count { display: inline-block; - margin-right: 3px; - color: #0099cc; } - /* line 38, ../../../../general/res/sass/controls/_messages.scss */ - .status.block .status-indicator.ok { - color: #009900; } - /* line 41, ../../../../general/res/sass/controls/_messages.scss */ - .status.block .status-indicator.caution { - color: #ffaa00; } - /* line 45, ../../../../general/res/sass/controls/_messages.scss */ + vertical-align: top; } + /* line 35, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator { + margin-right: 3px; } + /* line 38, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.ok .status-indicator { + color: #6cb773; } + /* line 41, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.caution .status-indicator { + color: #ffa864; } + /* line 44, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -2338,13 +2339,31 @@ label.checkbox.custom { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - display: inline-block; overflow: hidden; max-width: 0px; } - /* line 54, ../../../../general/res/sass/controls/_messages.scss */ + /* line 50, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .count { + -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; + font-weight: bold; + opacity: 1; } + /* line 56, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { max-width: 150px; width: auto; } + /* line 60, ../../../../general/res/sass/controls/_messages.scss */ + .status.block:hover .count { + opacity: 0; } /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index cbc9a67e0a..b80dbb21dd 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -58,6 +58,12 @@ $colorInputFg: pullForward($colorBodyFg, 20%); $colorFormText: rgba(#fff, 0.5); $colorInputIcon: pushBack($colorBodyFg, 15%); +// Status colors, mainly used for messaging and item ancillary symbols +$colorStatusDefault: #ccc; +$colorStatusOk: #6cb773; +$colorStatusCaution: #ffa864; +$colorStatusAlert: $colorAlert; + // Selects $colorSelectBg: $colorBtnBg; $colorSelectFg: $colorBtnFg; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index d9463b49ca..0107eef7e9 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -2254,25 +2254,26 @@ label.checkbox.custom { *****************************************************************************/ /* line 23, ../../../../general/res/sass/controls/_messages.scss */ .status.block { - cursor: help; + color: #ccc; + cursor: default; display: inline-block; margin-right: 5px; } - /* line 29, ../../../../general/res/sass/controls/_messages.scss */ + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator, - .status.block .label { - vertical-align: top; } - /* line 34, ../../../../general/res/sass/controls/_messages.scss */ - .status.block .status-indicator { + .status.block .label, + .status.block .count { display: inline-block; - margin-right: 3px; - color: #0099cc; } - /* line 38, ../../../../general/res/sass/controls/_messages.scss */ - .status.block .status-indicator.ok { - color: #009900; } - /* line 41, ../../../../general/res/sass/controls/_messages.scss */ - .status.block .status-indicator.caution { - color: #ffaa00; } - /* line 45, ../../../../general/res/sass/controls/_messages.scss */ + vertical-align: top; } + /* line 35, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .status-indicator { + margin-right: 3px; } + /* line 38, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.ok .status-indicator { + color: #090; } + /* line 41, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.caution .status-indicator { + color: #fa0; } + /* line 44, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -2286,13 +2287,31 @@ label.checkbox.custom { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - display: inline-block; overflow: hidden; max-width: 0px; } - /* line 54, ../../../../general/res/sass/controls/_messages.scss */ + /* line 50, ../../../../general/res/sass/controls/_messages.scss */ + .status.block .count { + -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; + font-weight: bold; + opacity: 1; } + /* line 56, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { max-width: 150px; width: auto; } + /* line 60, ../../../../general/res/sass/controls/_messages.scss */ + .status.block:hover .count { + opacity: 0; } /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 61d76cebb8..94113c25a8 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -60,6 +60,12 @@ $colorInputIcon: pushBack($colorBodyFg, 25%); $colorSelectBg: #ddd; $colorSelectFg: $colorBodyFg; +// Status colors, mainly used for messaging and item ancillary symbols +$colorStatusDefault: #ccc; +$colorStatusOk: #090; +$colorStatusCaution: #fa0; +$colorStatusAlert: $colorAlert; + // Limits and staleness colors// $colorTelemFresh: pullForward($colorBodyFg, 20%); $colorTelemStale: pushBack($colorBodyFg, 20%); From d606ee421fec04346263e1e8175d2a70e5686c97 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 2 Oct 2015 18:37:01 -0700 Subject: [PATCH 003/201] [Frontend] New template for message-banner open #159 open #170 Added markup and beginning of styling; Temporarily added mct-include elem to bottombar.html; --- platform/commonUI/general/bundle.json | 4 +++ .../commonUI/general/res/sass/_messages.scss | 23 ++++++++++++- .../general/res/templates/bottombar.html | 1 + .../general/res/templates/message-banner.html | 9 +++++ .../espresso/res/css/theme-espresso.css | 33 ++++++++++++++++++- .../themes/snow/res/css/theme-snow.css | 33 ++++++++++++++++++- 6 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 platform/commonUI/general/res/templates/message-banner.html diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index b55ce03b32..d71bb3a393 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -39,6 +39,10 @@ "key": "indicator", "templateUrl": "templates/indicator.html" }, + { + "key": "message-banner", + "templateUrl": "templates/message-banner.html" + }, { "key": "time-controller", "templateUrl": "templates/controls/time-controller.html" diff --git a/platform/commonUI/general/res/sass/_messages.scss b/platform/commonUI/general/res/sass/_messages.scss index db4de4c946..80c9b21d97 100644 --- a/platform/commonUI/general/res/sass/_messages.scss +++ b/platform/commonUI/general/res/sass/_messages.scss @@ -1,4 +1,4 @@ -/* Styles for messages */ +/* Styles for messages and message banners */ .message { &.block { @@ -9,4 +9,25 @@ background-color: rgba($colorAlert,0.3); color: lighten($colorAlert, 20%); } +} + +.l-message-banner { + @include ellipsize(); + display: block; + position: absolute; + top: $interiorMargin; right: auto; bottom: $interiorMargin; left: 50%; + height: auto; width: auto; + //line-height: $ueFooterH; + max-width: 300px; + padding: 0 $interiorMarginLg; + @include transform(translateX(-50%)); + .s-btn { + height: auto !important; + } +} + +.s-message-banner { + @include border-radius($basicCr); + background-color: #999; + color: black; } \ No newline at end of file diff --git a/platform/commonUI/general/res/templates/bottombar.html b/platform/commonUI/general/res/templates/bottombar.html index 4da2686fa1..f0d3799542 100644 --- a/platform/commonUI/general/res/templates/bottombar.html +++ b/platform/commonUI/general/res/templates/bottombar.html @@ -26,5 +26,6 @@ key="indicator.template">
+
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html new file mode 100644 index 0000000000..c5386311c6 --- /dev/null +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -0,0 +1,9 @@ +
+ + Objects not saved + + x + +
\ 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 316c6a5877..3fc212468c 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -1153,7 +1153,7 @@ mct-container { top: 0; left: 0; } -/* Styles for messages */ +/* Styles for messages and message banners */ /* line 4, ../../../../general/res/sass/_messages.scss */ .message.block { -moz-border-radius: 2px; @@ -1165,6 +1165,37 @@ mct-container { background-color: rgba(255, 60, 0, 0.3); color: #ff8a66; } +/* line 14, ../../../../general/res/sass/_messages.scss */ +.l-message-banner { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: block; + position: absolute; + top: 5px; + right: auto; + bottom: 5px; + left: 50%; + height: auto; + width: auto; + max-width: 300px; + padding: 0 10px; + -moz-transform: translateX(-50%); + -ms-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); } + /* line 24, ../../../../general/res/sass/_messages.scss */ + .l-message-banner .s-btn, .l-message-banner .s-menu { + height: auto !important; } + +/* line 29, ../../../../general/res/sass/_messages.scss */ +.s-message-banner { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + background-color: #999; + color: black; } + /***************************************************************************** * 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 0107eef7e9..be2972e22e 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -1150,7 +1150,7 @@ mct-container { top: 0; left: 0; } -/* Styles for messages */ +/* Styles for messages and message banners */ /* line 4, ../../../../general/res/sass/_messages.scss */ .message.block { -moz-border-radius: 4px; @@ -1162,6 +1162,37 @@ mct-container { background-color: rgba(255, 60, 0, 0.3); color: #ff8a66; } +/* line 14, ../../../../general/res/sass/_messages.scss */ +.l-message-banner { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: block; + position: absolute; + top: 5px; + right: auto; + bottom: 5px; + left: 50%; + height: auto; + width: auto; + max-width: 300px; + padding: 0 10px; + -moz-transform: translateX(-50%); + -ms-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); } + /* line 24, ../../../../general/res/sass/_messages.scss */ + .l-message-banner .s-btn, .l-message-banner .s-menu { + height: auto !important; } + +/* line 29, ../../../../general/res/sass/_messages.scss */ +.s-message-banner { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #999; + color: black; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space From 471a25a625563c1325695679761f61b5a86fe242 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 6 Oct 2015 14:34:53 -0700 Subject: [PATCH 004/201] [Frontend] Progress bar/ message banner markup and styling open #170 Major work on progress bar; --- platform/commonUI/general/res/sass/_main.scss | 1 - .../commonUI/general/res/sass/_messages.scss | 33 -- .../commonUI/general/res/sass/_mixins.scss | 19 +- .../general/res/sass/controls/_controls.scss | 107 +++- .../general/res/sass/controls/_messages.scss | 100 ++++ .../general/res/templates/indicator.html | 1 + .../general/res/templates/message-banner.html | 14 +- .../espresso/res/css/theme-espresso.css | 534 ++++++++++++------ .../themes/espresso/res/sass/_constants.scss | 14 +- .../themes/snow/res/css/theme-snow.css | 524 +++++++++++------ .../themes/snow/res/sass/_constants.scss | 14 +- 11 files changed, 941 insertions(+), 420 deletions(-) delete mode 100644 platform/commonUI/general/res/sass/_messages.scss diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 8241078c50..05d814f3be 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -29,7 +29,6 @@ @import "helpers/bubbles"; @import "helpers/splitter"; @import "helpers/wait-spinner"; -@import "messages"; @import "properties"; /********************************* CONTROLS */ diff --git a/platform/commonUI/general/res/sass/_messages.scss b/platform/commonUI/general/res/sass/_messages.scss deleted file mode 100644 index 80c9b21d97..0000000000 --- a/platform/commonUI/general/res/sass/_messages.scss +++ /dev/null @@ -1,33 +0,0 @@ -/* Styles for messages and message banners */ - -.message { - &.block { - @include border-radius($basicCr); - padding: $interiorMarginLg; - } - &.error { - background-color: rgba($colorAlert,0.3); - color: lighten($colorAlert, 20%); - } -} - -.l-message-banner { - @include ellipsize(); - display: block; - position: absolute; - top: $interiorMargin; right: auto; bottom: $interiorMargin; left: 50%; - height: auto; width: auto; - //line-height: $ueFooterH; - max-width: 300px; - padding: 0 $interiorMarginLg; - @include transform(translateX(-50%)); - .s-btn { - height: auto !important; - } -} - -.s-message-banner { - @include border-radius($basicCr); - background-color: #999; - color: black; -} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index d0b08491b7..14c56edfb7 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -94,7 +94,6 @@ } @mixin triangle($dir: "left", $size: 5px, $ratio: 1, $color: red) { - //$size: $size*2; width: 0; height: 0; $slopedB: $size/$ratio solid transparent; @@ -129,6 +128,24 @@ background-size: $d $d; } +@mixin bgVertStripes($c: yellow, $a: 0.1, $d: 40px) { + @include background-image(linear-gradient(-90deg, + rgba($c, $a) 0%, rgba($c, $a) 50%, + transparent 50%, transparent 100% + )); + background-repeat: repeat; + background-size: $d $d; +} + +@mixin bgVertFuzzyStripes($c: yellow, $a: 0.1, $d: 40px) { + @include background-image(linear-gradient(-90deg, + rgba($c, $a) 0%, transparent 50%, + transparent 50%, rgba($c, $a) 100% + )); + background-repeat: repeat; + background-size: $d $d; +} + @mixin bgTicks($c: $colorBodyFg, $repeatDir: 'x') { $deg: 90deg; @if ($repeatDir != 'x') { diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index af967d6ef3..edb8994566 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -19,34 +19,6 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*.control { - // UNUSED? - &.view-control { - .icon { - display: inline-block; - margin: -1px 5px 1px 2px; - vertical-align: middle; - &.triangle-down { - margin: 2px 2px -2px 0px; - } - } - - .label { - display: inline-block; - font-size: 11px; - vertical-align: middle; - } - - .toggle { - @include border-radius(3px); - display: inline-block; - padding: 1px 6px 4px 4px; - &:hover { - background: rgba(white, 0.1); - } - } - } -}*/ .accordion { $accordionHeadH: 18px; @@ -291,6 +263,85 @@ label.checkbox.custom { } } +/******************************************************** PROGRESS BAR */ +@include keyframes(progress) { + 100% { background-position: $progressBarStripeW center; } +} + +@mixin bgProgressAnim($c: yellow, $a: 0.1, $d: 20px) { + @include background-image(linear-gradient(-90deg, + rgba($c, $a) 0%, transparent 50%, + transparent 50%, rgba($c, $a) 100% + )); + background-position: 0 center; + background-repeat: repeat-x; + background-size: $d 40%; +} + +.l-progress-bar { + // Assume will be determinate by default + display: inline-block; + overflow: hidden; + position: relative; + + .progress-amt-holder { + @include absPosDefault(1px); + } + .progress-amt, + .progress-amt:before, + .progress-amt:after { + @include absPosDefault(); + display: block; + content: ''; + } + + .progress-amt { + right: auto; // Allow inline width to control } + } + + &.indeterminate { + .progress-amt { + width: 100% !important; + } + } +} + +.s-progress-bar { + @include border-radius($basicCr); + @include boxIncised(0.3, 4px); + background: $colorProgressBarOuter; + //border:1px solid $colorProgressBarOuter; + .progress-amt { + @include border-radius($basicCr); + @include boxShdw(); + @include border-radius($basicCr - 1); + @include trans-prop-nice(width); + &:before { + background-color: $colorProgressBarAmt; + } + &:after { + // Sheen + @include background-image(linear-gradient( + transparent 5%, rgba(#fff,0.25) 30%, transparent 100% + )); + } + } + + &:not(.indeterminate) { + .progress-amt:before { + // Slower, more subtle anim for determinate progress + @include animation(progress .3s linear infinite); + @include bgProgressAnim(#fff, 0.2, $progressBarStripeW); + } + } + + &.indeterminate .progress-amt:before { + // Faster, more visible anim for indeterminate progress + @include animation(progress .6s linear infinite); + @include bgProgressAnim(#fff, 0.4, $progressBarStripeW); + } +} + /******************************************************** SLIDERS */ .slider { diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index a6aa243535..b8c98ec2d7 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -20,6 +20,22 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ +@mixin statusBannerColors($bg, $fg: $colorStatusFg) { + $bgPb: 30%; + $bgPbD: 10%; + background-color: darken($bg, $bgPb); + color: $fg; + &:hover { + background-color: darken($bg, $bgPb - $bgPbD); + } + .s-action { + background-color: darken($bg, $bgPb + $bgPbD); + &:hover { + background-color: darken($bg, $bgPb); + } + } +} + .status.block { color: $colorStatusDefault; cursor: default; @@ -61,4 +77,88 @@ opacity: 0; } } +} + +/* Styles for messages and message banners */ +.message { + &.block { + @include border-radius($basicCr); + padding: $interiorMarginLg; + } + &.error { + background-color: rgba($colorAlert,0.3); + color: lighten($colorAlert, 20%); + } +} + +.l-message-banner { + $m: $interiorMarginSm; + $lh: $ueFooterH - ($m*2) - 1; + @include box-sizing(border-box); + @include ellipsize(); + @include display-flex; + @include flex-direction(row); + @include align-items(center); + position: absolute; + top: $m; right: auto; bottom: $m; left: 50%; + height: auto; width: auto; + line-height: $lh; + max-width: 300px; + padding: 0 $interiorMargin 0 $interiorMarginLg; + @include transform(translateX(-50%)); + + a, span { + @include flex(0 1 auto); + margin-left: $interiorMargin; + &:first-child { + margin-left: 0; + } + } + a { + display: inline-block; + } + .l-action { + line-height: $lh - 3; + padding: 0 $interiorMargin; + } + .close { + //@include test(red, 0.7); + cursor: pointer; + font-size: 7px; + width: 8px; + } + .l-progress-bar { + $h: $lh - 10; + height: $h; + line-height: $h; + width: 100px; + } + z-index: 2; +} + +.s-message-banner, +.s-message-banner .s-action { + @include trans-prop-nice(background-color, .25s); +} + +.s-message-banner { + @include border-radius($controlCr); + @include statusBannerColors($colorStatusDefault, $colorStatusFg); + cursor: pointer; + a { color: inherit; } + .s-action { + @include border-radius($basicCr); + } + .close { + opacity: 0.5; + &:hover { + opacity: 1; + } + } + &.ok { + @include statusBannerColors($colorStatusOk); + } + &.caution { + @include statusBannerColors($colorStatusCaution); + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html index 40733d875a..ce2adb421c 100644 --- a/platform/commonUI/general/res/templates/indicator.html +++ b/platform/commonUI/general/res/templates/indicator.html @@ -20,6 +20,7 @@ at runtime from the About dialog for additional information. --> +
Objects not saved - - x - + + + + Try Again + + x +
\ 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 3fc212468c..cb5a9be609 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; } @@ -919,7 +919,7 @@ mct-container { right: 0; width: auto; height: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 176, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -943,7 +943,7 @@ mct-container { top: 2px; left: 5px; right: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 198, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -973,7 +973,7 @@ mct-container { bottom: 0; cursor: col-resize; width: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 176, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -997,7 +997,7 @@ mct-container { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 198, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1153,49 +1153,6 @@ mct-container { top: 0; left: 0; } -/* Styles for messages and message banners */ -/* line 4, ../../../../general/res/sass/_messages.scss */ -.message.block { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - padding: 10px; } -/* line 8, ../../../../general/res/sass/_messages.scss */ -.message.error { - background-color: rgba(255, 60, 0, 0.3); - color: #ff8a66; } - -/* line 14, ../../../../general/res/sass/_messages.scss */ -.l-message-banner { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - display: block; - position: absolute; - top: 5px; - right: auto; - bottom: 5px; - left: 50%; - height: auto; - width: auto; - max-width: 300px; - padding: 0 10px; - -moz-transform: translateX(-50%); - -ms-transform: translateX(-50%); - -webkit-transform: translateX(-50%); - transform: translateX(-50%); } - /* line 24, ../../../../general/res/sass/_messages.scss */ - .l-message-banner .s-btn, .l-message-banner .s-menu { - height: auto !important; } - -/* line 29, ../../../../general/res/sass/_messages.scss */ -.s-message-banner { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - background-color: #999; - color: black; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1344,14 +1301,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu:not(.disabled):hover > .icon { color: white; } } /* line 62, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1383,14 +1340,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu:not(.major) .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon { color: #33ccff; } } /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1425,14 +1382,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu:not(.disabled):hover { background: linear-gradient(#fe9815, #f88c01); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon { color: white; } } /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1591,41 +1548,13 @@ mct-container { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*.control { - // UNUSED? - &.view-control { - .icon { - display: inline-block; - margin: -1px 5px 1px 2px; - vertical-align: middle; - &.triangle-down { - margin: 2px 2px -2px 0px; - } - } - - .label { - display: inline-block; - font-size: 11px; - vertical-align: middle; - } - - .toggle { - @include border-radius(3px); - display: inline-block; - padding: 1px 6px 4px 4px; - &:hover { - background: rgba(white, 0.1); - } - } - } -}*/ -/* line 51, ../../../../general/res/sass/controls/_controls.scss */ +/* line 23, ../../../../general/res/sass/controls/_controls.scss */ .accordion { margin-top: 5px; } - /* line 54, ../../../../general/res/sass/controls/_controls.scss */ + /* line 26, ../../../../general/res/sass/controls/_controls.scss */ .accordion:first-child { margin-top: 0; } - /* line 57, ../../../../general/res/sass/controls/_controls.scss */ + /* line 29, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head { -moz-border-radius: 1.5px; -webkit-border-radius: 1.5px; @@ -1647,10 +1576,10 @@ mct-container { width: auto; height: 18px; text-transform: uppercase; } - /* line 75, ../../../../general/res/sass/controls/_controls.scss */ + /* line 47, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head:hover { background: rgba(153, 153, 153, 0.4); } - /* line 78, ../../../../general/res/sass/controls/_controls.scss */ + /* line 50, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head:after { content: "^"; display: block; @@ -1660,10 +1589,10 @@ mct-container { right: 5px; text-transform: none; top: 0; } - /* line 88, ../../../../general/res/sass/controls/_controls.scss */ + /* line 60, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head:not(.expanded):after { content: "v"; } - /* line 92, ../../../../general/res/sass/controls/_controls.scss */ + /* line 64, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-contents { position: absolute; top: 23px; @@ -1673,14 +1602,14 @@ mct-container { overflow-y: auto; overflow-x: hidden; } -/* line 103, ../../../../general/res/sass/controls/_controls.scss */ +/* line 75, ../../../../general/res/sass/controls/_controls.scss */ .l-composite-control { vertical-align: middle; } - /* line 106, ../../../../general/res/sass/controls/_controls.scss */ + /* line 78, ../../../../general/res/sass/controls/_controls.scss */ .l-composite-control.l-checkbox .composite-control-label { line-height: 18px; } -/* line 112, ../../../../general/res/sass/controls/_controls.scss */ +/* line 84, ../../../../general/res/sass/controls/_controls.scss */ .l-control-group { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -1689,23 +1618,23 @@ mct-container { display: inline-block; padding: 0 5px; position: relative; } - /* line 120, ../../../../general/res/sass/controls/_controls.scss */ + /* line 92, ../../../../general/res/sass/controls/_controls.scss */ .l-control-group:first-child { border-left: none; padding-left: 0; } -/* line 126, ../../../../general/res/sass/controls/_controls.scss */ +/* line 98, ../../../../general/res/sass/controls/_controls.scss */ .l-local-controls { position: absolute; top: 5px; right: 5px; z-index: 5; } -/* line 136, ../../../../general/res/sass/controls/_controls.scss */ +/* line 108, ../../../../general/res/sass/controls/_controls.scss */ .s-local-controls { font-size: 0.7rem; } -/* line 140, ../../../../general/res/sass/controls/_controls.scss */ +/* line 112, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom { cursor: pointer; display: inline-block; @@ -1714,13 +1643,13 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: middle; } - /* line 150, ../../../../general/res/sass/controls/_controls.scss */ + /* line 122, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom em { color: #999; display: inline-block; height: 14px; min-width: 14px; } - /* line 155, ../../../../general/res/sass/controls/_controls.scss */ + /* line 127, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom em:before { -moz-border-radius: 1.5px; -webkit-border-radius: 1.5px; @@ -1741,58 +1670,58 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 174, ../../../../general/res/sass/controls/_controls.scss */ + /* line 146, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom.no-text { overflow: hidden; margin-right: 0; padding-left: 0; height: 14px; width: 14px; } - /* line 180, ../../../../general/res/sass/controls/_controls.scss */ + /* line 152, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 184, ../../../../general/res/sass/controls/_controls.scss */ + /* line 156, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 186, ../../../../general/res/sass/controls/_controls.scss */ + /* line 158, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 194, ../../../../general/res/sass/controls/_controls.scss */ +/* line 166, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 196, ../../../../general/res/sass/controls/_controls.scss */ + /* line 168, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 200, ../../../../general/res/sass/controls/_controls.scss */ + /* line 172, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 203, ../../../../general/res/sass/controls/_controls.scss */ + /* line 175, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 208, ../../../../general/res/sass/controls/_controls.scss */ +/* line 180, ../../../../general/res/sass/controls/_controls.scss */ .s-menu label.checkbox.custom { margin-left: 5px; } -/* line 213, ../../../../general/res/sass/controls/_controls.scss */ +/* line 185, ../../../../general/res/sass/controls/_controls.scss */ .item .checkbox.checked label { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; border-bottom: none; } -/* line 219, ../../../../general/res/sass/controls/_controls.scss */ +/* line 191, ../../../../general/res/sass/controls/_controls.scss */ .context-available { color: #0099cc; } - /* line 222, ../../../../general/res/sass/controls/_controls.scss */ + /* line 194, ../../../../general/res/sass/controls/_controls.scss */ .context-available:hover { color: deepskyblue; } -/* line 227, ../../../../general/res/sass/controls/_controls.scss */ +/* line 199, ../../../../general/res/sass/controls/_controls.scss */ .view-switcher { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; @@ -1808,26 +1737,26 @@ label.checkbox.custom { transition-timing-function: ease-in-out; } /******************************************************** OBJECT-HEADER */ -/* line 232, ../../../../general/res/sass/controls/_controls.scss */ +/* line 204, ../../../../general/res/sass/controls/_controls.scss */ .object-header { font-size: 1em; } - /* line 243, ../../../../general/res/sass/controls/_controls.scss */ + /* line 215, ../../../../general/res/sass/controls/_controls.scss */ .object-header > .type-icon { color: #cccccc; font-size: 120%; float: left; margin-right: 5px; } - /* line 250, ../../../../general/res/sass/controls/_controls.scss */ + /* line 222, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper { justify-content: flex-start; -webkit-justify-content: flex-start; } - /* line 253, ../../../../general/res/sass/controls/_controls.scss */ + /* line 225, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper mct-representation { min-width: 0.7em; } - /* line 261, ../../../../general/res/sass/controls/_controls.scss */ + /* line 233, ../../../../general/res/sass/controls/_controls.scss */ .object-header .action { margin-right: 5px; } - /* line 265, ../../../../general/res/sass/controls/_controls.scss */ + /* line 237, ../../../../general/res/sass/controls/_controls.scss */ .object-header .title-label { color: #999; overflow: hidden; @@ -1836,13 +1765,13 @@ label.checkbox.custom { flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } - /* line 275, ../../../../general/res/sass/controls/_controls.scss */ + /* line 247, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 282, ../../../../general/res/sass/controls/_controls.scss */ + /* line 254, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -1857,12 +1786,128 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; opacity: 0; } - /* line 287, ../../../../general/res/sass/controls/_controls.scss */ + /* line 259, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { opacity: 1; } } +/******************************************************** PROGRESS BAR */ +@-moz-keyframes progress { + 100% { + background-position: 20px center; } } +@-webkit-keyframes progress { + 100% { + background-position: 20px center; } } +@keyframes progress { + 100% { + background-position: 20px center; } } +/* line 281, ../../../../general/res/sass/controls/_controls.scss */ +.l-progress-bar { + display: inline-block; + overflow: hidden; + position: relative; } + /* line 287, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar .progress-amt-holder { + overflow: hidden; + position: absolute; + top: 1px; + right: 1px; + bottom: 1px; + left: 1px; + width: auto; + height: auto; } + /* line 290, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar .progress-amt, + .l-progress-bar .progress-amt:before, + .l-progress-bar .progress-amt:after { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + display: block; + content: ''; } + /* line 298, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar .progress-amt { + right: auto; } + /* line 303, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar.indeterminate .progress-amt { + width: 100% !important; } + +/* line 309, ../../../../general/res/sass/controls/_controls.scss */ +.s-progress-bar { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; + background: rgba(0, 0, 0, 0.1); } + /* line 314, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar .progress-amt { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; + box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; + -moz-border-radius: 1px; + -webkit-border-radius: 1px; + border-radius: 1px; + -moz-transition-property: width; + -o-transition-property: width; + -webkit-transition-property: width; + transition-property: width; + -moz-transition-duration: 500ms; + -o-transition-duration: 500ms; + -webkit-transition-duration: 500ms; + transition-duration: 500ms; + -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; } + /* line 319, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar .progress-amt:before { + background-color: #0099cc; } + /* line 322, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar .progress-amt:after { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSI1JSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjMwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjI1Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(5%, rgba(0, 0, 0, 0)), color-stop(30%, rgba(255, 255, 255, 0.25)), color-stop(100%, rgba(0, 0, 0, 0))); + background-image: -moz-linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); } + /* line 331, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar:not(.indeterminate) .progress-amt:before { + -moz-animation: progress 0.3s linear infinite; + -webkit-animation: progress 0.3s linear infinite; + animation: progress 0.3s linear infinite; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjIiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-position: 0 center; + background-repeat: repeat-x; + background-size: 20px 40%; } + /* line 338, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar.indeterminate .progress-amt:before { + -moz-animation: progress 0.6s linear infinite; + -webkit-animation: progress 0.6s linear infinite; + animation: progress 0.6s linear infinite; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC40Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); + background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); + background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); + background-position: 0 center; + background-repeat: repeat-x; + background-size: 20px 40%; } + /******************************************************** SLIDERS */ -/* line 300, ../../../../general/res/sass/controls/_controls.scss */ +/* line 351, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1881,7 +1926,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 311, ../../../../general/res/sass/controls/_controls.scss */ +/* line 362, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { background-color: #333; -moz-border-radius: 3px; @@ -1918,17 +1963,17 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .slider .knob .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background: linear-gradient(#595959, #4d4d4d); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .slider .knob:not(.disabled):hover > .icon { color: #33ccff; } } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 176, ../../../../general/res/sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1952,7 +1997,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 198, ../../../../general/res/sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1967,12 +2012,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #0099cc; } - /* line 322, ../../../../general/res/sass/controls/_controls.scss */ + /* line 373, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 329, ../../../../general/res/sass/controls/_controls.scss */ +/* line 380, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -1983,13 +2028,13 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 339, ../../../../general/res/sass/controls/_controls.scss */ + /* line 390, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 348, ../../../../general/res/sass/controls/_controls.scss */ + /* line 399, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2004,7 +2049,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 357, ../../../../general/res/sass/controls/_controls.scss */ + /* line 408, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2018,7 +2063,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 366, ../../../../general/res/sass/controls/_controls.scss */ + /* line 417, ../../../../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%; @@ -2027,7 +2072,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); background-image: linear-gradient(#5e5e5e, #525252 20px); } - /* line 371, ../../../../general/res/sass/controls/_controls.scss */ + /* line 422, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } } /***************************************************************************** @@ -2148,7 +2193,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 346, ../../../../general/res/sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2335,28 +2380,28 @@ label.checkbox.custom { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 23, ../../../../general/res/sass/controls/_messages.scss */ +/* line 39, ../../../../general/res/sass/controls/_messages.scss */ .status.block { color: #ccc; cursor: default; display: inline-block; margin-right: 5px; } - /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + /* line 44, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator, .status.block .label, .status.block .count { display: inline-block; vertical-align: top; } - /* line 35, ../../../../general/res/sass/controls/_messages.scss */ + /* line 51, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator { margin-right: 3px; } - /* line 38, ../../../../general/res/sass/controls/_messages.scss */ + /* line 54, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator { - color: #6cb773; } - /* line 41, ../../../../general/res/sass/controls/_messages.scss */ + color: #60e68e; } + /* line 57, ../../../../general/res/sass/controls/_messages.scss */ .status.block.caution .status-indicator { color: #ffa864; } - /* line 44, ../../../../general/res/sass/controls/_messages.scss */ + /* line 60, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -2372,7 +2417,7 @@ label.checkbox.custom { transition-timing-function: ease-in-out; overflow: hidden; max-width: 0px; } - /* line 50, ../../../../general/res/sass/controls/_messages.scss */ + /* line 66, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2388,14 +2433,155 @@ label.checkbox.custom { transition-timing-function: ease-in-out; font-weight: bold; opacity: 1; } - /* line 56, ../../../../general/res/sass/controls/_messages.scss */ + /* line 72, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { max-width: 150px; width: auto; } - /* line 60, ../../../../general/res/sass/controls/_messages.scss */ + /* line 76, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .count { opacity: 0; } +/* Styles for messages and message banners */ +/* line 84, ../../../../general/res/sass/controls/_messages.scss */ +.message.block { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + padding: 10px; } +/* line 88, ../../../../general/res/sass/controls/_messages.scss */ +.message.error { + background-color: rgba(255, 60, 0, 0.3); + color: #ff8a66; } + +/* line 94, ../../../../general/res/sass/controls/_messages.scss */ +.l-message-banner { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: -webkit-flex; + display: flex; + -webkit-flex-direction: row; + flex-direction: row; + -webkit-align-items: center; + align-items: center; + position: absolute; + top: 3px; + right: auto; + bottom: 3px; + left: 50%; + height: auto; + width: auto; + line-height: 18px; + max-width: 300px; + padding: 0 5px 0 10px; + -moz-transform: translateX(-50%); + -ms-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + z-index: 2; } + /* line 110, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner a, .l-message-banner span { + -webkit-flex: 0 1 auto; + flex: 0 1 auto; + margin-left: 5px; } + /* line 113, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner a:first-child, .l-message-banner span:first-child { + margin-left: 0; } + /* line 117, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner a { + display: inline-block; } + /* line 120, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .l-action { + line-height: 15px; + padding: 0 5px; } + /* line 124, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .close { + cursor: pointer; + font-size: 7px; + width: 8px; } + /* line 130, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .l-progress-bar { + height: 8px; + line-height: 8px; + width: 100px; } + +/* line 139, ../../../../general/res/sass/controls/_messages.scss */ +.s-message-banner, +.s-message-banner .s-action { + -moz-transition-property: background-color; + -o-transition-property: background-color; + -webkit-transition-property: background-color; + transition-property: background-color; + -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; } + +/* line 144, ../../../../general/res/sass/controls/_messages.scss */ +.s-message-banner { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background-color: gray; + color: #ccc; + cursor: pointer; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner:hover { + background-color: #999999; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .s-action { + background-color: #666666; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .s-action:hover { + background-color: gray; } + /* line 148, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner a { + color: inherit; } + /* line 149, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .s-action { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; } + /* line 152, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .close { + opacity: 0.5; } + /* line 154, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .close:hover { + opacity: 1; } + /* line 158, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok { + background-color: #189543; + color: #ccc; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok:hover { + background-color: #1ec256; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok .s-action { + background-color: #11692f; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok .s-action:hover { + background-color: #189543; } + /* line 161, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution { + background-color: #ca5900; + color: #ccc; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution:hover { + background-color: #fd6f00; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution .s-action { + background-color: #974200; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution .s-action:hover { + background-color: #ca5900; } + /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { position: relative; @@ -2647,7 +2833,7 @@ label.checkbox.custom { padding: 0 3px; position: relative; height: 150px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2704,7 +2890,7 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2732,7 +2918,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -2790,14 +2976,14 @@ textarea { padding: 0 5px; overflow: hidden; position: relative; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover > .icon { color: #33ccff; } } /* line 28, ../../../../general/res/sass/forms/_selects.scss */ @@ -2878,7 +3064,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../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 */ @@ -3026,7 +3212,7 @@ span.req { padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -4112,14 +4298,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { background: linear-gradient(#a6a6a6, #999999); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4204,7 +4390,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 346, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5404,14 +5590,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: linear-gradient(#666666, #595959); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5546,14 +5732,14 @@ table { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; color: #80dfff; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover > .icon { color: #33ccff; } } /* line 137, ../../../../general/res/sass/items/_item.scss */ diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index b80dbb21dd..e76c2ca68c 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -29,8 +29,6 @@ $colorPausedBg: #c56f01; $colorPausedFg: #fff; $colorCreateBtn: $colorKey; $colorGridLines: rgba(#fff, 0.05); -$colorFormLines: rgba(#fff, 0.1); -$colorFormSectionHeader: rgba(#000, 0.2); $colorInvokeMenu: #fff; $colorObjHdrTxt: $colorBodyFg; $colorObjHdrIc: pullForward($colorObjHdrTxt, 20%); @@ -42,10 +40,10 @@ $colorMenuIc: pullForward($colorKey, 17%); $colorMenuHovBg: pullForward($colorMenuBg, 10%); $colorMenuHovFg: #fff; $colorMenuHovIc: $colorMenuHovFg; -$shdwMenu: none; -$shdwMenuText: rgba(black, 0.1) 0 1px 2px; $colorCreateMenuLgIcon: $colorMenuFg; $colorCreateMenuText: $colorMenuFg; +$shdwMenu: none; +$shdwMenuText: rgba(black, 0.1) 0 1px 2px; // Form colors $colorCheck: $colorKey; @@ -53,16 +51,22 @@ $colorFormRequired: $colorAlt1; $colorFormValid: #33cc33; $colorFormError: #cc0000; $colorFormInvalid: #ff3300; +$colorFormLines: rgba(#fff, 0.1); +$colorFormSectionHeader: rgba(#000, 0.2); $colorInputBg: rgba(#fff, 0.1); $colorInputFg: pullForward($colorBodyFg, 20%); $colorFormText: rgba(#fff, 0.5); $colorInputIcon: pushBack($colorBodyFg, 15%); // Status colors, mainly used for messaging and item ancillary symbols +$colorStatusFg: #ccc; $colorStatusDefault: #ccc; -$colorStatusOk: #6cb773; +$colorStatusOk: #60e68e; $colorStatusCaution: #ffa864; $colorStatusAlert: $colorAlert; +$colorProgressBarOuter: rgba(#000, 0.1); +$colorProgressBarAmt: $colorKey; +$progressBarStripeW: 20px; // Selects $colorSelectBg: $colorBtnBg; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index be2972e22e..3aca678c0a 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; } @@ -916,7 +916,7 @@ mct-container { right: 0; width: auto; height: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 176, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -940,7 +940,7 @@ mct-container { top: 2px; left: 5px; right: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 198, ../../../../general/res/sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -970,7 +970,7 @@ mct-container { bottom: 0; cursor: col-resize; width: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 176, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -994,7 +994,7 @@ mct-container { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 198, ../../../../general/res/sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1150,49 +1150,6 @@ mct-container { top: 0; left: 0; } -/* Styles for messages and message banners */ -/* line 4, ../../../../general/res/sass/_messages.scss */ -.message.block { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - padding: 10px; } -/* line 8, ../../../../general/res/sass/_messages.scss */ -.message.error { - background-color: rgba(255, 60, 0, 0.3); - color: #ff8a66; } - -/* line 14, ../../../../general/res/sass/_messages.scss */ -.l-message-banner { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - display: block; - position: absolute; - top: 5px; - right: auto; - bottom: 5px; - left: 50%; - height: auto; - width: auto; - max-width: 300px; - padding: 0 10px; - -moz-transform: translateX(-50%); - -ms-transform: translateX(-50%); - -webkit-transform: translateX(-50%); - transform: translateX(-50%); } - /* line 24, ../../../../general/res/sass/_messages.scss */ - .l-message-banner .s-btn, .l-message-banner .s-menu { - height: auto !important; } - -/* line 29, ../../../../general/res/sass/_messages.scss */ -.s-message-banner { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - background-color: #999; - color: black; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1332,14 +1289,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu:not(.disabled):hover { background: deepskyblue; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu:not(.disabled):hover > .icon { color: white; } } /* line 62, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1362,14 +1319,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu:not(.major) .icon { color: #eee; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu:not(.major):not(.disabled):hover { background: #0099cc; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1395,14 +1352,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu:not(.disabled):hover { background: #ffad33; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu:not(.disabled):hover > .icon { color: white; } } /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1561,41 +1518,13 @@ mct-container { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*.control { - // UNUSED? - &.view-control { - .icon { - display: inline-block; - margin: -1px 5px 1px 2px; - vertical-align: middle; - &.triangle-down { - margin: 2px 2px -2px 0px; - } - } - - .label { - display: inline-block; - font-size: 11px; - vertical-align: middle; - } - - .toggle { - @include border-radius(3px); - display: inline-block; - padding: 1px 6px 4px 4px; - &:hover { - background: rgba(white, 0.1); - } - } - } -}*/ -/* line 51, ../../../../general/res/sass/controls/_controls.scss */ +/* line 23, ../../../../general/res/sass/controls/_controls.scss */ .accordion { margin-top: 5px; } - /* line 54, ../../../../general/res/sass/controls/_controls.scss */ + /* line 26, ../../../../general/res/sass/controls/_controls.scss */ .accordion:first-child { margin-top: 0; } - /* line 57, ../../../../general/res/sass/controls/_controls.scss */ + /* line 29, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1617,10 +1546,10 @@ mct-container { width: auto; height: 18px; text-transform: uppercase; } - /* line 75, ../../../../general/res/sass/controls/_controls.scss */ + /* line 47, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head:hover { background: rgba(102, 102, 102, 0.4); } - /* line 78, ../../../../general/res/sass/controls/_controls.scss */ + /* line 50, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head:after { content: "^"; display: block; @@ -1630,10 +1559,10 @@ mct-container { right: 5px; text-transform: none; top: 0; } - /* line 88, ../../../../general/res/sass/controls/_controls.scss */ + /* line 60, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head:not(.expanded):after { content: "v"; } - /* line 92, ../../../../general/res/sass/controls/_controls.scss */ + /* line 64, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-contents { position: absolute; top: 23px; @@ -1643,14 +1572,14 @@ mct-container { overflow-y: auto; overflow-x: hidden; } -/* line 103, ../../../../general/res/sass/controls/_controls.scss */ +/* line 75, ../../../../general/res/sass/controls/_controls.scss */ .l-composite-control { vertical-align: middle; } - /* line 106, ../../../../general/res/sass/controls/_controls.scss */ + /* line 78, ../../../../general/res/sass/controls/_controls.scss */ .l-composite-control.l-checkbox .composite-control-label { line-height: 18px; } -/* line 112, ../../../../general/res/sass/controls/_controls.scss */ +/* line 84, ../../../../general/res/sass/controls/_controls.scss */ .l-control-group { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -1659,23 +1588,23 @@ mct-container { display: inline-block; padding: 0 5px; position: relative; } - /* line 120, ../../../../general/res/sass/controls/_controls.scss */ + /* line 92, ../../../../general/res/sass/controls/_controls.scss */ .l-control-group:first-child { border-left: none; padding-left: 0; } -/* line 126, ../../../../general/res/sass/controls/_controls.scss */ +/* line 98, ../../../../general/res/sass/controls/_controls.scss */ .l-local-controls { position: absolute; top: 5px; right: 5px; z-index: 5; } -/* line 136, ../../../../general/res/sass/controls/_controls.scss */ +/* line 108, ../../../../general/res/sass/controls/_controls.scss */ .s-local-controls { font-size: 0.7rem; } -/* line 140, ../../../../general/res/sass/controls/_controls.scss */ +/* line 112, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom { cursor: pointer; display: inline-block; @@ -1684,13 +1613,13 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: middle; } - /* line 150, ../../../../general/res/sass/controls/_controls.scss */ + /* line 122, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom em { color: #666; display: inline-block; height: 14px; min-width: 14px; } - /* line 155, ../../../../general/res/sass/controls/_controls.scss */ + /* line 127, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom em:before { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1711,58 +1640,58 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 174, ../../../../general/res/sass/controls/_controls.scss */ + /* line 146, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom.no-text { overflow: hidden; margin-right: 0; padding-left: 0; height: 14px; width: 14px; } - /* line 180, ../../../../general/res/sass/controls/_controls.scss */ + /* line 152, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 184, ../../../../general/res/sass/controls/_controls.scss */ + /* line 156, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 186, ../../../../general/res/sass/controls/_controls.scss */ + /* line 158, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 194, ../../../../general/res/sass/controls/_controls.scss */ +/* line 166, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 196, ../../../../general/res/sass/controls/_controls.scss */ + /* line 168, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 200, ../../../../general/res/sass/controls/_controls.scss */ + /* line 172, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 203, ../../../../general/res/sass/controls/_controls.scss */ + /* line 175, ../../../../general/res/sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 208, ../../../../general/res/sass/controls/_controls.scss */ +/* line 180, ../../../../general/res/sass/controls/_controls.scss */ .s-menu label.checkbox.custom { margin-left: 5px; } -/* line 213, ../../../../general/res/sass/controls/_controls.scss */ +/* line 185, ../../../../general/res/sass/controls/_controls.scss */ .item .checkbox.checked label { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; border-bottom: none; } -/* line 219, ../../../../general/res/sass/controls/_controls.scss */ +/* line 191, ../../../../general/res/sass/controls/_controls.scss */ .context-available { color: #0099cc; } - /* line 222, ../../../../general/res/sass/controls/_controls.scss */ + /* line 194, ../../../../general/res/sass/controls/_controls.scss */ .context-available:hover { color: deepskyblue; } -/* line 227, ../../../../general/res/sass/controls/_controls.scss */ +/* line 199, ../../../../general/res/sass/controls/_controls.scss */ .view-switcher { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; @@ -1778,26 +1707,26 @@ label.checkbox.custom { transition-timing-function: ease-in-out; } /******************************************************** OBJECT-HEADER */ -/* line 232, ../../../../general/res/sass/controls/_controls.scss */ +/* line 204, ../../../../general/res/sass/controls/_controls.scss */ .object-header { font-size: 1em; } - /* line 243, ../../../../general/res/sass/controls/_controls.scss */ + /* line 215, ../../../../general/res/sass/controls/_controls.scss */ .object-header > .type-icon { color: #b3b3b3; font-size: 120%; float: left; margin-right: 5px; } - /* line 250, ../../../../general/res/sass/controls/_controls.scss */ + /* line 222, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper { justify-content: flex-start; -webkit-justify-content: flex-start; } - /* line 253, ../../../../general/res/sass/controls/_controls.scss */ + /* line 225, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper mct-representation { min-width: 0.7em; } - /* line 261, ../../../../general/res/sass/controls/_controls.scss */ + /* line 233, ../../../../general/res/sass/controls/_controls.scss */ .object-header .action { margin-right: 5px; } - /* line 265, ../../../../general/res/sass/controls/_controls.scss */ + /* line 237, ../../../../general/res/sass/controls/_controls.scss */ .object-header .title-label { color: #666; overflow: hidden; @@ -1806,13 +1735,13 @@ label.checkbox.custom { flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } - /* line 275, ../../../../general/res/sass/controls/_controls.scss */ + /* line 247, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 282, ../../../../general/res/sass/controls/_controls.scss */ + /* line 254, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -1827,12 +1756,128 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; opacity: 0; } - /* line 287, ../../../../general/res/sass/controls/_controls.scss */ + /* line 259, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { opacity: 1; } } +/******************************************************** PROGRESS BAR */ +@-moz-keyframes progress { + 100% { + background-position: 20px center; } } +@-webkit-keyframes progress { + 100% { + background-position: 20px center; } } +@keyframes progress { + 100% { + background-position: 20px center; } } +/* line 281, ../../../../general/res/sass/controls/_controls.scss */ +.l-progress-bar { + display: inline-block; + overflow: hidden; + position: relative; } + /* line 287, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar .progress-amt-holder { + overflow: hidden; + position: absolute; + top: 1px; + right: 1px; + bottom: 1px; + left: 1px; + width: auto; + height: auto; } + /* line 290, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar .progress-amt, + .l-progress-bar .progress-amt:before, + .l-progress-bar .progress-amt:after { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + display: block; + content: ''; } + /* line 298, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar .progress-amt { + right: auto; } + /* line 303, ../../../../general/res/sass/controls/_controls.scss */ + .l-progress-bar.indeterminate .progress-amt { + width: 100% !important; } + +/* line 309, ../../../../general/res/sass/controls/_controls.scss */ +.s-progress-bar { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; + background: rgba(0, 0, 0, 0.1); } + /* line 314, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar .progress-amt { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; + box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-transition-property: width; + -o-transition-property: width; + -webkit-transition-property: width; + transition-property: width; + -moz-transition-duration: 500ms; + -o-transition-duration: 500ms; + -webkit-transition-duration: 500ms; + transition-duration: 500ms; + -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; } + /* line 319, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar .progress-amt:before { + background-color: #0a0; } + /* line 322, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar .progress-amt:after { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSI1JSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjMwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjI1Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(5%, rgba(0, 0, 0, 0)), color-stop(30%, rgba(255, 255, 255, 0.25)), color-stop(100%, rgba(0, 0, 0, 0))); + background-image: -moz-linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); } + /* line 331, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar:not(.indeterminate) .progress-amt:before { + -moz-animation: progress 0.3s linear infinite; + -webkit-animation: progress 0.3s linear infinite; + animation: progress 0.3s linear infinite; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjIiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-position: 0 center; + background-repeat: repeat-x; + background-size: 20px 40%; } + /* line 338, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar.indeterminate .progress-amt:before { + -moz-animation: progress 0.6s linear infinite; + -webkit-animation: progress 0.6s linear infinite; + animation: progress 0.6s linear infinite; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC40Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); + background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); + background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); + background-position: 0 center; + background-repeat: repeat-x; + background-size: 20px 40%; } + /******************************************************** SLIDERS */ -/* line 300, ../../../../general/res/sass/controls/_controls.scss */ +/* line 351, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1851,7 +1896,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 311, ../../../../general/res/sass/controls/_controls.scss */ +/* line 362, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { background-color: #969696; -moz-border-radius: 4px; @@ -1879,10 +1924,10 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .slider .knob .icon { color: #eee; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ + /* line 176, ../../../../general/res/sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1906,7 +1951,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ + /* line 198, ../../../../general/res/sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1921,12 +1966,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #fcfcfc; } - /* line 322, ../../../../general/res/sass/controls/_controls.scss */ + /* line 373, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 329, ../../../../general/res/sass/controls/_controls.scss */ +/* line 380, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -1937,13 +1982,13 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 339, ../../../../general/res/sass/controls/_controls.scss */ + /* line 390, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 348, ../../../../general/res/sass/controls/_controls.scss */ + /* line 399, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1958,7 +2003,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 357, ../../../../general/res/sass/controls/_controls.scss */ + /* line 408, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -1972,7 +2017,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 366, ../../../../general/res/sass/controls/_controls.scss */ + /* line 417, ../../../../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%; @@ -1981,7 +2026,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); background-image: linear-gradient(#00ace6, #0099cc 20px); } - /* line 371, ../../../../general/res/sass/controls/_controls.scss */ + /* line 422, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.1); } } /***************************************************************************** @@ -2096,7 +2141,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 346, ../../../../general/res/sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2283,28 +2328,28 @@ label.checkbox.custom { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 23, ../../../../general/res/sass/controls/_messages.scss */ +/* line 39, ../../../../general/res/sass/controls/_messages.scss */ .status.block { color: #ccc; cursor: default; display: inline-block; margin-right: 5px; } - /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + /* line 44, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator, .status.block .label, .status.block .count { display: inline-block; vertical-align: top; } - /* line 35, ../../../../general/res/sass/controls/_messages.scss */ + /* line 51, ../../../../general/res/sass/controls/_messages.scss */ .status.block .status-indicator { margin-right: 3px; } - /* line 38, ../../../../general/res/sass/controls/_messages.scss */ + /* line 54, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator { - color: #090; } - /* line 41, ../../../../general/res/sass/controls/_messages.scss */ + color: #60e68e; } + /* line 57, ../../../../general/res/sass/controls/_messages.scss */ .status.block.caution .status-indicator { - color: #fa0; } - /* line 44, ../../../../general/res/sass/controls/_messages.scss */ + color: #ffa864; } + /* line 60, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -2320,7 +2365,7 @@ label.checkbox.custom { transition-timing-function: ease-in-out; overflow: hidden; max-width: 0px; } - /* line 50, ../../../../general/res/sass/controls/_messages.scss */ + /* line 66, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2336,14 +2381,155 @@ label.checkbox.custom { transition-timing-function: ease-in-out; font-weight: bold; opacity: 1; } - /* line 56, ../../../../general/res/sass/controls/_messages.scss */ + /* line 72, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { max-width: 150px; width: auto; } - /* line 60, ../../../../general/res/sass/controls/_messages.scss */ + /* line 76, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .count { opacity: 0; } +/* Styles for messages and message banners */ +/* line 84, ../../../../general/res/sass/controls/_messages.scss */ +.message.block { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + padding: 10px; } +/* line 88, ../../../../general/res/sass/controls/_messages.scss */ +.message.error { + background-color: rgba(255, 60, 0, 0.3); + color: #ff8a66; } + +/* line 94, ../../../../general/res/sass/controls/_messages.scss */ +.l-message-banner { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: -webkit-flex; + display: flex; + -webkit-flex-direction: row; + flex-direction: row; + -webkit-align-items: center; + align-items: center; + position: absolute; + top: 3px; + right: auto; + bottom: 3px; + left: 50%; + height: auto; + width: auto; + line-height: 18px; + max-width: 300px; + padding: 0 5px 0 10px; + -moz-transform: translateX(-50%); + -ms-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + z-index: 2; } + /* line 110, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner a, .l-message-banner span { + -webkit-flex: 0 1 auto; + flex: 0 1 auto; + margin-left: 5px; } + /* line 113, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner a:first-child, .l-message-banner span:first-child { + margin-left: 0; } + /* line 117, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner a { + display: inline-block; } + /* line 120, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .l-action { + line-height: 15px; + padding: 0 5px; } + /* line 124, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .close { + cursor: pointer; + font-size: 7px; + width: 8px; } + /* line 130, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .l-progress-bar { + height: 8px; + line-height: 8px; + width: 100px; } + +/* line 139, ../../../../general/res/sass/controls/_messages.scss */ +.s-message-banner, +.s-message-banner .s-action { + -moz-transition-property: background-color; + -o-transition-property: background-color; + -webkit-transition-property: background-color; + transition-property: background-color; + -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; } + +/* line 144, ../../../../general/res/sass/controls/_messages.scss */ +.s-message-banner { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: gray; + color: #fff; + cursor: pointer; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner:hover { + background-color: #999999; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .s-action { + background-color: #666666; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .s-action:hover { + background-color: gray; } + /* line 148, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner a { + color: inherit; } + /* line 149, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .s-action { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } + /* line 152, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .close { + opacity: 0.5; } + /* line 154, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner .close:hover { + opacity: 1; } + /* line 158, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok { + background-color: #189543; + color: #fff; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok:hover { + background-color: #1ec256; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok .s-action { + background-color: #11692f; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok .s-action:hover { + background-color: #189543; } + /* line 161, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution { + background-color: #ca5900; + color: #fff; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution:hover { + background-color: #fd6f00; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution .s-action { + background-color: #974200; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution .s-action:hover { + background-color: #ca5900; } + /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { position: relative; @@ -2595,7 +2781,7 @@ label.checkbox.custom { padding: 0 3px; position: relative; height: 150px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2652,7 +2838,7 @@ input[type="text"] { color: #666; outline: none; padding: 0 3px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2680,7 +2866,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -2729,7 +2915,7 @@ textarea { padding: 0 5px; overflow: hidden; position: relative; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #eee; } /* line 28, ../../../../general/res/sass/forms/_selects.scss */ @@ -2810,7 +2996,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../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 */ @@ -2958,7 +3144,7 @@ span.req { padding: 0 3px; background: white; border-bottom: 1px solid white; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 313, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -4026,14 +4212,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { background: #7d7d7d; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4118,7 +4304,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 346, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5308,14 +5494,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 294, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: #d0d0d0; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 296, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5441,7 +5627,7 @@ table { transition: background, 0.25s; text-shadow: none; color: #80dfff; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 289, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #eee; } /* line 137, ../../../../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 94113c25a8..02897ef236 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -57,14 +57,20 @@ $colorInputBg: $colorGenBg; $colorInputFg: $colorBodyFg; $colorFormText: pushBack($colorBodyFg, 10%); $colorInputIcon: pushBack($colorBodyFg, 25%); -$colorSelectBg: #ddd; -$colorSelectFg: $colorBodyFg; // Status colors, mainly used for messaging and item ancillary symbols +$colorStatusFg: #fff; $colorStatusDefault: #ccc; -$colorStatusOk: #090; -$colorStatusCaution: #fa0; +$colorStatusOk: #60e68e; +$colorStatusCaution: #ffa864; $colorStatusAlert: $colorAlert; +$colorProgressBarOuter: rgba(#000, 0.1); +$colorProgressBarAmt: #0a0; +$progressBarStripeW: 20px; + +// Selects +$colorSelectBg: #ddd; +$colorSelectFg: $colorBodyFg; // Limits and staleness colors// $colorTelemFresh: pullForward($colorBodyFg, 20%); From 2aeebff652b2098193d348ae8162260f9a67e955 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 6 Oct 2015 14:41:58 -0700 Subject: [PATCH 005/201] Merging in Andrew's work so far on progress and blocking dialogs open #163 open #170 Squashed commit of the following: commit ec7edb58ca75b409d330b5434999c67a0ec14e33 Author: Henry Date: Mon Oct 5 10:39:06 2015 -0700 Rename dialogSeverity to messageServity for reuse with notifications commit d20abe01dda50f7508444ed65b207cb6210e5fff Author: Henry Date: Fri Oct 2 16:40:29 2015 -0700 Fixed docs commit 227da1849826af54c66932dba55f692e085194b5 Author: Henry Date: Fri Oct 2 16:27:41 2015 -0700 Added semicolon commit 22d424f96e74e44230f100cde2108aff4ef10944 Author: Henry Date: Fri Oct 2 16:26:29 2015 -0700 Fixed code errors commit 2c77c3647c326f91fdbe2d63a8e3f1c3040d7397 Author: Henry Date: Fri Oct 2 16:24:01 2015 -0700 Initial commit of blocking dialog service with test code to demonstrate usage --- bundles.json | 4 +- platform/commonUI/dialog/bundle.json | 14 +++ .../res/templates/blocking-message.html | 30 +++++ platform/commonUI/dialog/src/DialogService.js | 112 ++++++++++++++++-- testing/dialogTest/bundle.json | 28 +++++ testing/dialogTest/res/dialog-launch.html | 1 + .../dialogTest/src/DialogLaunchController.js | 94 +++++++++++++++ .../dialogTest/src/DialogLaunchIndicator.js | 50 ++++++++ 8 files changed, 321 insertions(+), 12 deletions(-) create mode 100644 platform/commonUI/dialog/res/templates/blocking-message.html create mode 100644 testing/dialogTest/bundle.json create mode 100644 testing/dialogTest/res/dialog-launch.html create mode 100644 testing/dialogTest/src/DialogLaunchController.js create mode 100644 testing/dialogTest/src/DialogLaunchIndicator.js diff --git a/bundles.json b/bundles.json index a0f7edd7a8..498718fa58 100644 --- a/bundles.json +++ b/bundles.json @@ -29,5 +29,7 @@ "example/imagery", "example/eventGenerator", - "example/generator" + "example/generator", + + "testing/dialogTest" ] diff --git a/platform/commonUI/dialog/bundle.json b/platform/commonUI/dialog/bundle.json index 9a2d541419..eab8fb000a 100644 --- a/platform/commonUI/dialog/bundle.json +++ b/platform/commonUI/dialog/bundle.json @@ -1,5 +1,15 @@ { "extensions": { + "constants": [ + { + "key": "messageSeverity", + "value": { + "ERROR": "error", + "INFO": "info", + "SUCCESS": "success" + } + } + ], "services": [ { "key": "dialogService", @@ -24,6 +34,10 @@ { "key": "form-dialog", "templateUrl": "templates/dialog.html" + }, + { + "key": "blocking-message", + "templateUrl": "templates/blocking-message.html" } ], "containers": [ diff --git a/platform/commonUI/dialog/res/templates/blocking-message.html b/platform/commonUI/dialog/res/templates/blocking-message.html new file mode 100644 index 0000000000..81a183eb13 --- /dev/null +++ b/platform/commonUI/dialog/res/templates/blocking-message.html @@ -0,0 +1,30 @@ + + +
+
{{ngModel.dialog.title}}
+
+
+
+
{{ngModel.dialog.hint}}
+
+
{{ngModel.dialog.progress}} %
+
{{ngModel.dialog.progressText}}
+
+
+
+ +
+ \ No newline at end of file diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index 25e8943c06..94c8e24844 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -84,17 +84,7 @@ define( model.confirm = confirm; model.cancel = cancel; - if (this.dialogVisible) { - // Only one dialog should be shown at a time. - // The application design should be such that - // we never even try to do this. - this.$log.warn([ - "Dialog already showing; ", - "unable to show ", - model.name - ].join("")); - deferred.reject(); - } else { + if (this.canShowDialog(model)) { // Add the overlay using the OverlayService, which // will handle actual insertion into the DOM this.overlay = this.overlayService.createOverlay( @@ -105,6 +95,8 @@ define( // Track that a dialog is already visible, to // avoid spawning multiple dialogs at once. this.dialogVisible = true; + } else { + deferred.reject(); } return deferred.promise; @@ -157,6 +149,104 @@ define( ); }; + /** + * Tests if a dialog can be displayed. A modal dialog may only be + * displayed if one is not already visible. + * Will log a warning message if it can't display a dialog. + * @returns {boolean} true if dialog is currently visible, false + * otherwise + */ + DialogService.prototype.canShowDialog = function(dialogModel){ + if (this.dialogVisible){ + // Only one dialog should be shown at a time. + // The application design should be such that + // we never even try to do this. + this.$log.warn([ + "Dialog already showing; ", + "unable to show ", + dialogModel.title + ].join("")); + + return false; + } else { + return true; + } + }; + + /** + * dialogModel: { + * severity: string "error" | "info", + * title: string, + * hint: string, + * progress: int, + * progressText: string, + * unknownProgress: boolean, + * actions: [{ + * label: String, + * action: function + * }] + */ + + /** + * A user action that can be performed from a blocking dialog. These + * actions will be rendered as buttons within a blocking dialog. + * + * @typedef DialogAction + * @property {string} label a label to be displayed as the button + * text for this action + * @property {function} action a function to be called when the + * button is clicked + */ + + /** + * A description of the model options that may be passed to the + * showBlockingMessage method + * + * @typedef DialogModel + * @property {string} severity the severity level of this message. + * These are defined in a bundle constant with key 'dialogSeverity' + * @property {string} title the title to use for the dialog + * @property {string} hint the 'hint' message to show below the title + * @property {number} progress a percentage value (1-100) + * indicating the completion of the blocking task + * @property {string} progressText the message to show below a + * progress bar to indicate progress. For example, this might be + * used to indicate time remaining, or items still to process. + * @property {boolean} unknownProgress some tasks may be + * impossible to provide an estimate for. Providing a true value for + * this attribute will indicate to the user that the progress and + * duration cannot be estimated. + * @property {DialogAction[]} actions a list of actions that will + * be added to the dialog as buttons. These buttons are + */ + + /** + * Displays a blocking (modal) dialog. This dialog can be used for + * displaying messages that require the user's + * immediate attention. The message may include an indication of + * progress, as well as a series of actions that + * the user can take if necessary + * @param {DialogModel} dialogModel defines options for the dialog + * @returns {boolean} + */ + DialogService.prototype.showBlockingMessage = function(dialogModel) { + if (this.canShowDialog(dialogModel)) { + // Add the overlay using the OverlayService, which + // will handle actual insertion into the DOM + this.overlay = this.overlayService.createOverlay( + "blocking-message", + {dialog: dialogModel} + ); + this.dialogVisible = true; + return true; + } else { + //Could not show a dialog, so return indication of this to + //client code. + return false; + } + + }; + return DialogService; } diff --git a/testing/dialogTest/bundle.json b/testing/dialogTest/bundle.json new file mode 100644 index 0000000000..36ec16e048 --- /dev/null +++ b/testing/dialogTest/bundle.json @@ -0,0 +1,28 @@ +{ + "extensions": { + "templates": [ + { + "key": "dialogLaunchTemplate", + "templateUrl": "dialog-launch.html" + } + ], + "controllers": [ + { + "key": "DialogLaunchController", + "implementation": "DialogLaunchController.js", + "depends": [ + "$scope", + "dialogService", + "$timeout", + "$log", + "messageSeverity" + ] + } + ], + "indicators": [ + { + "implementation": "DialogLaunchIndicator.js" + } + ] + } +} diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html new file mode 100644 index 0000000000..b9d0d525ea --- /dev/null +++ b/testing/dialogTest/res/dialog-launch.html @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js new file mode 100644 index 0000000000..bc088274e9 --- /dev/null +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -0,0 +1,94 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define( + [], + function () { + "use strict"; + + function DialogLaunchController($scope, dialogService, $timeout, $log, messageSeverity) { + $scope.launchProgress = function () { + var model = { + title: "Progress dialog example", + progress: 0, + hint: "Calculating...", + unknownDuration: false, + severity: messageSeverity.INFO, + actions: [ + { + label: "Cancel Operation", + action: function () { + $log.debug("Operation cancelled"); + dialogService.dismiss(); + } + }, + { + label: "Do something else...", + action: function () { + $log.debug("Something else pressed"); + } + } + ] + }; + + function incrementProgress() { + model.progress = Math.min(100, Math.floor(model.progress + Math.random() * 30)); + model.progressText = ["Estimated time remaining: about ", 60 - Math.floor((model.progress / 100) * 60), " seconds"].join(" "); + if (model.progress < 100) { + $timeout(incrementProgress, 1000); + } + } + + if (dialogService.showBlockingMessage(model)) { + //Do processing here + model.hint = "Processing 100 objects..."; + $timeout(incrementProgress, 1000); + } else { + $log.error("Could not display modal dialog"); + } + }; + + $scope.launchError = function () { + var model = { + title: "Error Message Title", + hint: "Something happened. It was not so good.", + severity: messageSeverity.ERROR, + actions: [ + { + label: "OK", + action: function () { + $log.debug("OK Pressed"); + dialogService.dismiss(); + } + } + ] + }; + + if (!dialogService.showBlockingMessage(model)) { + $log.error("Could not display modal dialog"); + } + }; + } + return DialogLaunchController; + } +); diff --git a/testing/dialogTest/src/DialogLaunchIndicator.js b/testing/dialogTest/src/DialogLaunchIndicator.js new file mode 100644 index 0000000000..47c516fc70 --- /dev/null +++ b/testing/dialogTest/src/DialogLaunchIndicator.js @@ -0,0 +1,50 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,window*/ + +define( + [], + function () { + "use strict"; + + function DialogLaunchIndicator() { + + } + + DialogLaunchIndicator.template = 'dialogLaunchTemplate'; + + DialogLaunchIndicator.prototype.getGlyph = function () { + return "i"; + }; + DialogLaunchIndicator.prototype.getGlyphClass = function () { + return 'caution'; + }; + DialogLaunchIndicator.prototype.getText = function () { + return "Launch test dialog"; + }; + DialogLaunchIndicator.prototype.getDescription = function () { + return "Launch test dialog"; + }; + + return DialogLaunchIndicator; + } +); From bf0014f1b90a2cf37b6a8305ce405a1b342c9f25 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 6 Oct 2015 14:45:10 -0700 Subject: [PATCH 006/201] Temporary commit --- platform/commonUI/dialog/bundle.json | 14 ++ platform/commonUI/general/bundle.json | 5 + .../general/res/templates/message-banner.html | 4 +- .../src/controllers/BannerController.js | 31 ++++ platform/commonUI/notification/bundle.json | 18 +++ .../notification/src/NotificationService.js | 142 ++++++++++++++++++ 6 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 platform/commonUI/general/src/controllers/BannerController.js create mode 100644 platform/commonUI/notification/bundle.json create mode 100644 platform/commonUI/notification/src/NotificationService.js diff --git a/platform/commonUI/dialog/bundle.json b/platform/commonUI/dialog/bundle.json index 9a2d541419..eab8fb000a 100644 --- a/platform/commonUI/dialog/bundle.json +++ b/platform/commonUI/dialog/bundle.json @@ -1,5 +1,15 @@ { "extensions": { + "constants": [ + { + "key": "messageSeverity", + "value": { + "ERROR": "error", + "INFO": "info", + "SUCCESS": "success" + } + } + ], "services": [ { "key": "dialogService", @@ -24,6 +34,10 @@ { "key": "form-dialog", "templateUrl": "templates/dialog.html" + }, + { + "key": "blocking-message", + "templateUrl": "templates/blocking-message.html" } ], "containers": [ diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index d71bb3a393..3a52c92d03 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -96,6 +96,11 @@ "key": "SelectorController", "implementation": "controllers/SelectorController.js", "depends": [ "objectService", "$scope" ] + }, + { + "key": "BannerController", + "implementation": "controllers/BannerController.js", + "depends": ["$scope", "notificationService"] } ], "directives": [ diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index c5386311c6..8d3a95e0cc 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -1,9 +1,9 @@
Objects not saved - + x
\ No newline at end of file diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js new file mode 100644 index 0000000000..1c6193e061 --- /dev/null +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -0,0 +1,31 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define( + [], + function () { + "use strict"; + function BannerController($scope, notificationService){ + $scope.activeNotification = notificationService.active.Notification; + } + }); \ No newline at end of file diff --git a/platform/commonUI/notification/bundle.json b/platform/commonUI/notification/bundle.json new file mode 100644 index 0000000000..56087d9094 --- /dev/null +++ b/platform/commonUI/notification/bundle.json @@ -0,0 +1,18 @@ +{ + "extensions": { + "constants": [ + { + "key": "DEFAULT_AUTO_DISMISS", + "value": 2000 + } + ], + "services": [ + { + "key": "notificationService", + "implementation": "NotificationService.js", + "depends": [ "$log", "$timeout", "messageSeverity", + "DEFAULT_AUTO_DISMISS" ] + } + ] + } +} \ No newline at end of file diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js new file mode 100644 index 0000000000..07aea14da4 --- /dev/null +++ b/platform/commonUI/notification/src/NotificationService.js @@ -0,0 +1,142 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +/** + * This bundle implements the notification service, which can be used to + * show banner notifications to the user. + * @namespace platform/commonUI/dialog + */ +define( + [], + function () { + "use strict"; + /** + * The notification service is responsible for informing the user of + * events via the use of banner notifications. + * @memberof platform/commonUI/notification + * @constructor + */ + function NotificationService($log, $timeout, messageSeverity, DEFAULT_AUTO_DISMISS) { + //maintain an array of notifications. + //expose a method for adding notifications. + //expose a method for dismissing notifications. + //expose a method for minimizing notifications. + //expose a method for getting the 'current' notification. How + //this is determined could be a little nuanced. + //Allow for auto-dismissal of success messages + // + // + // + // Questions: + // 1) What happens when a newer, but lower priority + // message arrives (eg. success). Just show it? It will + // auto-dismissed, and the existing error message will be + // exposed. + // + + this.notifications = []; + this.$log = $log; + this.$timeout = $timeout; + this.messageSeverity = messageSeverity; + this.DEFAULT_AUTO_DISMISS = DEFAULT_AUTO_DISMISS; + + /** + * Exposes the current "active" notification. This is a + * notification that is of current highest importance that has + * not been dismissed. The deinition of what is of highest + * importance might be a little nuanced and require tweaking. + * For example, if an important error message is visible and a + * success message is triggered, it may be desirable to + * temporarily show the success message and then auto-dismiss it. + * @type {{notification: undefined}} + */ + this.active = { + notification: undefined + }; + } + /** + var model = { + title: string, + progress: number, + severity: MessageSeverity, + unknownProgress: boolean, + minimized: boolean, + autoDismiss: boolean | number, + actions: { + label: string, + action: function + } + } + */ + + /** + * Possibly refactor this out to a provider? + * @constructor + */ + function Notification (model) { + this.model = model; + } + + Notification.prototype.minimize = function () { + if (typeof setValue !== undefined){ + model.minimized = setValue; + } else { + return model.minimized; + } + }; + + /** + * model = { + * + * } + * @param model + */ + NotificationService.prototype.notify = function (model) { + var notification = new Notification(model); + this.notifications.push(notification); + this.setActiveNotification(notification); + }; + + + + NotificationService.prototype.setActiveNotification = function () { + //If there is a message active, time it out, and then chain a + // new message to appear. + if (this.active.timeout){ + this.active.timeout = this.active.timeout.then(function (){ + this.active.timeout = $timeout(function(){ + this.dismiss(this.active.notification); + }); + }); + } + }; + + NotificationService.prototype.dismiss = function (notification) { + var index = this.notifications.indexOf(notification); + if (index >= 0) { + this.notifications = this.notifications.splice(index, 1); + delete this.active.notification; + } + } + return NotificationService; + }); \ No newline at end of file From 30fd8c451e20826629600f0bf8b0b2e6a446e28e Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 6 Oct 2015 16:10:27 -0700 Subject: [PATCH 007/201] [Frontend] Progress bar as include; progress dialog open #163 open #170 Progress bar now mct-include; Progress dialog sanded; Dialog launcher modded; --- .../res/templates/blocking-message.html | 38 +++++++++---------- platform/commonUI/general/bundle.json | 4 ++ .../general/res/sass/controls/_messages.scss | 4 +- .../general/res/sass/overlay/_overlay.scss | 10 +++++ .../general/res/templates/indicator.html | 2 +- .../general/res/templates/message-banner.html | 8 ++-- .../espresso/res/css/theme-espresso.css | 27 +++++++------ .../themes/espresso/res/sass/_constants.scss | 1 + .../themes/snow/res/css/theme-snow.css | 27 +++++++------ .../themes/snow/res/sass/_constants.scss | 1 + testing/dialogTest/res/dialog-launch.html | 6 ++- .../dialogTest/src/DialogLaunchController.js | 7 +++- 12 files changed, 81 insertions(+), 54 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/blocking-message.html b/platform/commonUI/dialog/res/templates/blocking-message.html index 81a183eb13..bf2ff3d674 100644 --- a/platform/commonUI/dialog/res/templates/blocking-message.html +++ b/platform/commonUI/dialog/res/templates/blocking-message.html @@ -1,30 +1,26 @@ - - -
+ +
{{ngModel.dialog.title}}
+
Do not navigate away from this page or close this browser tab while this operation is in progress.
-
-
+
+
{{ngModel.dialog.hint}}
-
-
{{ngModel.dialog.progress}} %
+ + + +
{{ngModel.dialog.progressText}}
+
- + + {{dialogAction.label}} +
\ No newline at end of file diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index d71bb3a393..b1e95a36df 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -43,6 +43,10 @@ "key": "message-banner", "templateUrl": "templates/message-banner.html" }, + { + "key": "progress-bar", + "templateUrl": "templates/progress-bar.html" + }, { "key": "time-controller", "templateUrl": "templates/controls/time-controller.html" diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index b8c98ec2d7..4037f31323 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -104,14 +104,14 @@ height: auto; width: auto; line-height: $lh; max-width: 300px; - padding: 0 $interiorMargin 0 $interiorMarginLg; + padding: 0 $interiorMargin 0 $interiorMargin; @include transform(translateX(-50%)); a, span { @include flex(0 1 auto); margin-left: $interiorMargin; &:first-child { - margin-left: 0; + //margin-left: 0; } } a { diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 2dce492563..a391609821 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -45,6 +45,7 @@ .title { @include ellipsize(); font-size: 1.2em; + line-height: 120%; margin-bottom: $interiorMargin; } @@ -57,6 +58,15 @@ bottom: $ovrFooterH + $interiorMargin * 2; left: 0; right: 0; } + + .l-progress-bar { + $h: $progressBarHOverlay; + display: block; + height: $h; + line-height: $h; + margin: .5em 0; + width: 100%; + } .bottom-bar { top: auto; right: 0; bottom: 0; left: 0; diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html index ce2adb421c..20bf22668b 100644 --- a/platform/commonUI/general/res/templates/indicator.html +++ b/platform/commonUI/general/res/templates/indicator.html @@ -31,7 +31,7 @@ {{ngModel.getText()}} - + 5 Objects not saved - - - + Try Again x diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index cb5a9be609..c1d844a3bc 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -2476,7 +2476,7 @@ label.checkbox.custom { width: auto; line-height: 18px; max-width: 300px; - padding: 0 5px 0 10px; + padding: 0 5px 0 5px; -moz-transform: translateX(-50%); -ms-transform: translateX(-50%); -webkit-transform: translateX(-50%); @@ -2487,9 +2487,6 @@ label.checkbox.custom { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 113, ../../../../general/res/sass/controls/_messages.scss */ - .l-message-banner a:first-child, .l-message-banner span:first-child { - margin-left: 0; } /* line 117, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } @@ -4243,17 +4240,25 @@ span.req { text-overflow: ellipsis; white-space: nowrap; font-size: 1.2em; + line-height: 120%; margin-bottom: 5px; } -/* line 51, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 52, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 55, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; right: 0; } -/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .l-progress-bar { + display: block; + height: 15px; + line-height: 15px; + margin: .5em 0; + width: 100%; } +/* line 71, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4262,14 +4267,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 67, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 79, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: gray; -moz-border-radius: 3px; @@ -4308,14 +4313,14 @@ span.req { /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 95, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; bottom: 5px; left: 5px; overflow: auto; } - /* line 93, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 103, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog .field.l-med input[type='text'] { width: 100%; } diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index e76c2ca68c..c5a8e30456 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -66,6 +66,7 @@ $colorStatusCaution: #ffa864; $colorStatusAlert: $colorAlert; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: $colorKey; +$progressBarHOverlay: 15px; $progressBarStripeW: 20px; // Selects diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 3aca678c0a..59c1b2887e 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -2424,7 +2424,7 @@ label.checkbox.custom { width: auto; line-height: 18px; max-width: 300px; - padding: 0 5px 0 10px; + padding: 0 5px 0 5px; -moz-transform: translateX(-50%); -ms-transform: translateX(-50%); -webkit-transform: translateX(-50%); @@ -2435,9 +2435,6 @@ label.checkbox.custom { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 113, ../../../../general/res/sass/controls/_messages.scss */ - .l-message-banner a:first-child, .l-message-banner span:first-child { - margin-left: 0; } /* line 117, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } @@ -4166,17 +4163,25 @@ span.req { text-overflow: ellipsis; white-space: nowrap; font-size: 1.2em; + line-height: 120%; margin-bottom: 5px; } -/* line 51, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 52, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 55, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; right: 0; } -/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .l-progress-bar { + display: block; + height: 15px; + line-height: 15px; + margin: .5em 0; + width: 100%; } +/* line 71, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4185,14 +4190,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 67, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 79, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: #969696; -moz-border-radius: 4px; @@ -4222,14 +4227,14 @@ span.req { /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 95, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; bottom: 5px; left: 5px; overflow: auto; } - /* line 93, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 103, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog .field.l-med input[type='text'] { width: 100%; } diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 02897ef236..cd13385d6b 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -66,6 +66,7 @@ $colorStatusCaution: #ffa864; $colorStatusAlert: $colorAlert; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: #0a0; +$progressBarHOverlay: 15px; $progressBarStripeW: 20px; // Selects diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html index b9d0d525ea..59d3437c10 100644 --- a/testing/dialogTest/res/dialog-launch.html +++ b/testing/dialogTest/res/dialog-launch.html @@ -1 +1,5 @@ -   \ No newline at end of file + +    +    + + \ No newline at end of file diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js index bc088274e9..4d7bb4c258 100644 --- a/testing/dialogTest/src/DialogLaunchController.js +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -27,11 +27,12 @@ define( "use strict"; function DialogLaunchController($scope, dialogService, $timeout, $log, messageSeverity) { - $scope.launchProgress = function () { + $scope.launchProgress = function (knownProgress) { var model = { title: "Progress dialog example", progress: 0, hint: "Calculating...", + unknownProgress: !knownProgress, unknownDuration: false, severity: messageSeverity.INFO, actions: [ @@ -62,7 +63,9 @@ define( if (dialogService.showBlockingMessage(model)) { //Do processing here model.hint = "Processing 100 objects..."; - $timeout(incrementProgress, 1000); + if (knownProgress) { + $timeout(incrementProgress, 1000); + } } else { $log.error("Could not display modal dialog"); } From 6840e596a5ddaf3cd0364fbf03151e8fe89dd969 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 7 Oct 2015 10:25:47 -0700 Subject: [PATCH 008/201] [Frontend] Adding progress-bar.html template open #159 open #170 --- platform/commonUI/general/res/templates/progress-bar.html | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 platform/commonUI/general/res/templates/progress-bar.html diff --git a/platform/commonUI/general/res/templates/progress-bar.html b/platform/commonUI/general/res/templates/progress-bar.html new file mode 100644 index 0000000000..8f39196341 --- /dev/null +++ b/platform/commonUI/general/res/templates/progress-bar.html @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file From ad4292f1e969f50ddbf390889de13b91c295cd6f Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 7 Oct 2015 11:45:08 -0700 Subject: [PATCH 009/201] [Frontend] Mods to DialogService model and dialogs open #159 open #170 Properly re-cast model.hint and added model.actionText; Moved progressText into progress-bar.html; Tweaks to dialog styles; Tweaked styles for progress bar; Normalized various dialog templates markup; --- .../res/templates/blocking-message.html | 20 ++- .../commonUI/dialog/res/templates/dialog.html | 16 +-- .../dialog/res/templates/overlay-options.html | 12 +- platform/commonUI/dialog/src/DialogService.js | 3 + .../general/res/sass/controls/_controls.scss | 17 +-- .../general/res/sass/controls/_messages.scss | 6 +- .../general/res/sass/overlay/_overlay.scss | 4 + .../general/res/templates/message-banner.html | 7 +- .../general/res/templates/progress-bar.html | 10 +- .../espresso/res/css/theme-espresso.css | 114 ++++++++++-------- .../themes/snow/res/css/theme-snow.css | 114 ++++++++++-------- .../dialogTest/src/DialogLaunchController.js | 22 ++-- 12 files changed, 186 insertions(+), 159 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/blocking-message.html b/platform/commonUI/dialog/res/templates/blocking-message.html index bf2ff3d674..8db939cfdc 100644 --- a/platform/commonUI/dialog/res/templates/blocking-message.html +++ b/platform/commonUI/dialog/res/templates/blocking-message.html @@ -1,19 +1,17 @@
{{ngModel.dialog.title}}
-
Do not navigate away from this page or close this browser tab while this operation is in progress.
+
{{ngModel.dialog.hint}}
-
-
-
{{ngModel.dialog.hint}}
- - - - -
{{ngModel.dialog.progressText}}
+
+
+ {{ngModel.dialog.actionText}}
+ + +
diff --git a/platform/commonUI/dialog/res/templates/dialog.html b/platform/commonUI/dialog/res/templates/dialog.html index e3379b034e..4c7c02e3f2 100644 --- a/platform/commonUI/dialog/res/templates/dialog.html +++ b/platform/commonUI/dialog/res/templates/dialog.html @@ -21,17 +21,13 @@ -->
{{ngModel.title}}
-
- All fields marked * are required. -
+
All fields marked * are required.
-
-
- - -
+
+ +
{{ngModel.dialog.title}}
{{ngModel.dialog.hint}}
-
-
- - -
+
+ +
- + + ng-hide-x="ngModel.dialog.progress === undefined"> +
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/progress-bar.html b/platform/commonUI/general/res/templates/progress-bar.html index 8f39196341..337494164c 100644 --- a/platform/commonUI/general/res/templates/progress-bar.html +++ b/platform/commonUI/general/res/templates/progress-bar.html @@ -1,7 +1,9 @@ - + - \ No newline at end of file + +
+ {{ngModel.dialog.progressText}} +
\ 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 c1d844a3bc..5caef16706 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; } @@ -1881,33 +1881,35 @@ label.checkbox.custom { background-image: linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); } /* line 331, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar:not(.indeterminate) .progress-amt:before { - -moz-animation: progress 0.3s linear infinite; - -webkit-animation: progress 0.3s linear infinite; - animation: progress 0.3s linear infinite; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjIiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + -moz-animation: progress 0.4s linear infinite; + -webkit-animation: progress 0.4s linear infinite; + animation: progress 0.4s linear infinite; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; - background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); - background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); - background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.1) 100%); + background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.1) 100%); + background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.1) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.1) 100%); background-position: 0 center; background-repeat: repeat-x; background-size: 20px 40%; } - /* line 338, ../../../../general/res/sass/controls/_controls.scss */ + /* line 339, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar.indeterminate .progress-amt:before { -moz-animation: progress 0.6s linear infinite; -webkit-animation: progress 0.6s linear infinite; animation: progress 0.6s linear infinite; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC40Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); - background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); - background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); - background-position: 0 center; - background-repeat: repeat-x; - background-size: 20px 40%; } + background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, 0.2) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.2) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat; + background-size: 20px 20px; } + /* line 344, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar.indeterminate .progress-amt:after { + display: none; } /******************************************************** SLIDERS */ -/* line 351, ../../../../general/res/sass/controls/_controls.scss */ +/* line 354, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1926,7 +1928,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 362, ../../../../general/res/sass/controls/_controls.scss */ +/* line 365, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { background-color: #333; -moz-border-radius: 3px; @@ -2012,12 +2014,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #0099cc; } - /* line 373, ../../../../general/res/sass/controls/_controls.scss */ + /* line 376, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 380, ../../../../general/res/sass/controls/_controls.scss */ +/* line 383, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -2028,13 +2030,13 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 390, ../../../../general/res/sass/controls/_controls.scss */ + /* line 393, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 399, ../../../../general/res/sass/controls/_controls.scss */ + /* line 402, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2049,7 +2051,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 408, ../../../../general/res/sass/controls/_controls.scss */ + /* line 411, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2063,7 +2065,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 417, ../../../../general/res/sass/controls/_controls.scss */ + /* line 420, ../../../../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%; @@ -2072,7 +2074,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); background-image: linear-gradient(#5e5e5e, #525252 20px); } - /* line 422, ../../../../general/res/sass/controls/_controls.scss */ + /* line 425, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } } /***************************************************************************** @@ -2483,29 +2485,32 @@ label.checkbox.custom { transform: translateX(-50%); z-index: 2; } /* line 110, ../../../../general/res/sass/controls/_messages.scss */ - .l-message-banner a, .l-message-banner span { + .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 117, ../../../../general/res/sass/controls/_messages.scss */ + /* line 114, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 120, ../../../../general/res/sass/controls/_messages.scss */ + /* line 117, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 124, ../../../../general/res/sass/controls/_messages.scss */ + /* line 121, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 130, ../../../../general/res/sass/controls/_messages.scss */ + /* line 127, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } + /* line 133, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .progress-info.progress-estimate { + display: none; } -/* line 139, ../../../../general/res/sass/controls/_messages.scss */ +/* line 137, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner, .s-message-banner .s-action { -moz-transition-property: background-color; @@ -2521,7 +2526,7 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; } -/* line 144, ../../../../general/res/sass/controls/_messages.scss */ +/* line 142, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2538,21 +2543,21 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 148, ../../../../general/res/sass/controls/_messages.scss */ + /* line 146, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 149, ../../../../general/res/sass/controls/_messages.scss */ + /* line 147, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; } - /* line 152, ../../../../general/res/sass/controls/_messages.scss */ + /* line 150, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 154, ../../../../general/res/sass/controls/_messages.scss */ + /* line 152, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 158, ../../../../general/res/sass/controls/_messages.scss */ + /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok { background-color: #189543; color: #ccc; } @@ -2565,7 +2570,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover { background-color: #189543; } - /* line 161, ../../../../general/res/sass/controls/_messages.scss */ + /* line 159, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution { background-color: #ca5900; color: #ccc; } @@ -4243,22 +4248,25 @@ span.req { line-height: 120%; margin-bottom: 5px; } /* line 52, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .hint { + color: #b3b3b3; } +/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 60, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; right: 0; } -/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 66, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .l-progress-bar { display: block; height: 15px; line-height: 15px; margin: .5em 0; width: 100%; } -/* line 71, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 75, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4267,14 +4275,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 81, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 79, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: gray; -moz-border-radius: 3px; @@ -4313,14 +4321,14 @@ span.req { /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 95, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; bottom: 5px; left: 5px; overflow: auto; } - /* line 103, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog .field.l-med input[type='text'] { width: 100%; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 59c1b2887e..5c94d22297 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; } @@ -1851,33 +1851,35 @@ label.checkbox.custom { background-image: linear-gradient(rgba(0, 0, 0, 0) 5%, rgba(255, 255, 255, 0.25) 30%, rgba(0, 0, 0, 0) 100%); } /* line 331, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar:not(.indeterminate) .progress-amt:before { - -moz-animation: progress 0.3s linear infinite; - -webkit-animation: progress 0.3s linear infinite; - animation: progress 0.3s linear infinite; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjIiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + -moz-animation: progress 0.4s linear infinite; + -webkit-animation: progress 0.4s linear infinite; + animation: progress 0.4s linear infinite; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; - background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); - background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); - background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.2) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 100%); + background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.1) 100%); + background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.1) 100%); + background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.1) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.1) 100%); background-position: 0 center; background-repeat: repeat-x; background-size: 20px 40%; } - /* line 338, ../../../../general/res/sass/controls/_controls.scss */ + /* line 339, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar.indeterminate .progress-amt:before { -moz-animation: progress 0.6s linear infinite; -webkit-animation: progress 0.6s linear infinite; animation: progress 0.6s linear infinite; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC40Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); - background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); - background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.4) 0%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.4) 100%); - background-position: 0 center; - background-repeat: repeat-x; - background-size: 20px 40%; } + background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, 0.2) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.2) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat; + background-size: 20px 20px; } + /* line 344, ../../../../general/res/sass/controls/_controls.scss */ + .s-progress-bar.indeterminate .progress-amt:after { + display: none; } /******************************************************** SLIDERS */ -/* line 351, ../../../../general/res/sass/controls/_controls.scss */ +/* line 354, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1896,7 +1898,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 362, ../../../../general/res/sass/controls/_controls.scss */ +/* line 365, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { background-color: #969696; -moz-border-radius: 4px; @@ -1966,12 +1968,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #fcfcfc; } - /* line 373, ../../../../general/res/sass/controls/_controls.scss */ + /* line 376, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 380, ../../../../general/res/sass/controls/_controls.scss */ +/* line 383, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -1982,13 +1984,13 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 390, ../../../../general/res/sass/controls/_controls.scss */ + /* line 393, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 399, ../../../../general/res/sass/controls/_controls.scss */ + /* line 402, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2003,7 +2005,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 408, ../../../../general/res/sass/controls/_controls.scss */ + /* line 411, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2017,7 +2019,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 417, ../../../../general/res/sass/controls/_controls.scss */ + /* line 420, ../../../../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%; @@ -2026,7 +2028,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); background-image: linear-gradient(#00ace6, #0099cc 20px); } - /* line 422, ../../../../general/res/sass/controls/_controls.scss */ + /* line 425, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.1); } } /***************************************************************************** @@ -2431,29 +2433,32 @@ label.checkbox.custom { transform: translateX(-50%); z-index: 2; } /* line 110, ../../../../general/res/sass/controls/_messages.scss */ - .l-message-banner a, .l-message-banner span { + .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 117, ../../../../general/res/sass/controls/_messages.scss */ + /* line 114, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 120, ../../../../general/res/sass/controls/_messages.scss */ + /* line 117, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 124, ../../../../general/res/sass/controls/_messages.scss */ + /* line 121, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 130, ../../../../general/res/sass/controls/_messages.scss */ + /* line 127, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } + /* line 133, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner .progress-info.progress-estimate { + display: none; } -/* line 139, ../../../../general/res/sass/controls/_messages.scss */ +/* line 137, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner, .s-message-banner .s-action { -moz-transition-property: background-color; @@ -2469,7 +2474,7 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; } -/* line 144, ../../../../general/res/sass/controls/_messages.scss */ +/* line 142, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -2486,21 +2491,21 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 148, ../../../../general/res/sass/controls/_messages.scss */ + /* line 146, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 149, ../../../../general/res/sass/controls/_messages.scss */ + /* line 147, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } - /* line 152, ../../../../general/res/sass/controls/_messages.scss */ + /* line 150, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 154, ../../../../general/res/sass/controls/_messages.scss */ + /* line 152, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 158, ../../../../general/res/sass/controls/_messages.scss */ + /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok { background-color: #189543; color: #fff; } @@ -2513,7 +2518,7 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover { background-color: #189543; } - /* line 161, ../../../../general/res/sass/controls/_messages.scss */ + /* line 159, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution { background-color: #ca5900; color: #fff; } @@ -4166,22 +4171,25 @@ span.req { line-height: 120%; margin-bottom: 5px; } /* line 52, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .hint { + color: #999999; } +/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 60, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; right: 0; } -/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 66, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .l-progress-bar { display: block; height: 15px; line-height: 15px; margin: .5em 0; width: 100%; } -/* line 71, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 75, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4190,14 +4198,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 81, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 79, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: #969696; -moz-border-radius: 4px; @@ -4227,14 +4235,14 @@ span.req { /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 95, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; bottom: 5px; left: 5px; overflow: auto; } - /* line 103, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .contents.l-dialog .field.l-med input[type='text'] { width: 100%; } diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js index 4d7bb4c258..374e43a150 100644 --- a/testing/dialogTest/src/DialogLaunchController.js +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -29,9 +29,10 @@ define( function DialogLaunchController($scope, dialogService, $timeout, $log, messageSeverity) { $scope.launchProgress = function (knownProgress) { var model = { - title: "Progress dialog example", + title: "Progress Dialog Example", progress: 0, - hint: "Calculating...", + hint: "Do not navigate away from this page or close this browser tab while this operation is in progress.", + actionText: "Calculating...", unknownProgress: !knownProgress, unknownDuration: false, severity: messageSeverity.INFO, @@ -62,7 +63,7 @@ define( if (dialogService.showBlockingMessage(model)) { //Do processing here - model.hint = "Processing 100 objects..."; + model.actionText = "Processing 100 objects..."; if (knownProgress) { $timeout(incrementProgress, 1000); } @@ -73,14 +74,21 @@ define( $scope.launchError = function () { var model = { - title: "Error Message Title", - hint: "Something happened. It was not so good.", + title: "Error Dialog Example", + actionText: "Something happened, and it was not good.", severity: messageSeverity.ERROR, actions: [ { - label: "OK", + label: "Try Again", action: function () { - $log.debug("OK Pressed"); + $log.debug("Try Again Pressed"); + dialogService.dismiss(); + } + }, + { + label: "Cancel", + action: function () { + $log.debug("Cancel Pressed"); dialogService.dismiss(); } } From 7f529eec685a0ef3cf4b225271434306d5892b30 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 7 Oct 2015 12:11:30 -0700 Subject: [PATCH 010/201] [Frontend] Mods to OverlayService open #159 open #170 OverlayService can now be passed typeClass, which is added to the CSS class of the overlay's mct-include tag - intent is to allow the overlay to size itself based on the type of content to be displayed; --- platform/commonUI/dialog/src/DialogService.js | 7 +++++-- platform/commonUI/dialog/src/OverlayService.js | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index f598f0da58..99d361cf81 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -89,7 +89,8 @@ define( // will handle actual insertion into the DOM this.overlay = this.overlayService.createOverlay( key, - model + model, + "t-dialog" ); // Track that a dialog is already visible, to @@ -230,6 +231,7 @@ define( * progress, as well as a series of actions that * the user can take if necessary * @param {DialogModel} dialogModel defines options for the dialog + * @param {typeClass} string tells overlayService that this overlay should use appropriate CSS class * @returns {boolean} */ DialogService.prototype.showBlockingMessage = function(dialogModel) { @@ -238,7 +240,8 @@ define( // will handle actual insertion into the DOM this.overlay = this.overlayService.createOverlay( "blocking-message", - {dialog: dialogModel} + {dialog: dialogModel}, + "t-dialog-sm" ); this.dialogVisible = true; return true; diff --git a/platform/commonUI/dialog/src/OverlayService.js b/platform/commonUI/dialog/src/OverlayService.js index 5faba5dcf6..1874adb271 100644 --- a/platform/commonUI/dialog/src/OverlayService.js +++ b/platform/commonUI/dialog/src/OverlayService.js @@ -28,7 +28,7 @@ define( // Template to inject into the DOM to show the dialog; really just points to // the a specific template that can be included via mct-include - var TEMPLATE = ''; + var TEMPLATE = ''; /** @@ -72,7 +72,7 @@ define( * included overlay template (this will be passed * in via ng-model) */ - OverlayService.prototype.createOverlay = function (key, overlayModel) { + OverlayService.prototype.createOverlay = function (key, overlayModel, typeClass) { // Create a new scope for this overlay var scope = this.newScope(), element; @@ -87,9 +87,13 @@ define( // If no model is supplied, just fill in a default "cancel" overlayModel = overlayModel || { cancel: dismiss }; + // If no typeClass is specified, set to default "t-dialog" + typeClass = typeClass || 't-dialog'; + // Populate the scope; will be passed directly to the template scope.overlay = overlayModel; scope.key = key; + scope.typeClass = typeClass; // Create the overlay element and add it to the document's body element = this.$compile(TEMPLATE)(scope); From 3af23b7bc527a478744f572720a9efce45bc509a Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 7 Oct 2015 14:30:19 -0700 Subject: [PATCH 011/201] Added test cases for notification service --- bundles.json | 1 + .../notification/src/MessageSeverity.js | 9 + .../notification/src/NotificationService.js | 164 +++++++++++++----- .../test/NotificationServiceSpec.js | 146 ++++++++++++++++ .../commonUI/notification/test/suite.json | 3 + 5 files changed, 280 insertions(+), 43 deletions(-) create mode 100644 platform/commonUI/notification/src/MessageSeverity.js create mode 100644 platform/commonUI/notification/test/NotificationServiceSpec.js create mode 100644 platform/commonUI/notification/test/suite.json diff --git a/bundles.json b/bundles.json index a0f7edd7a8..15a05f9334 100644 --- a/bundles.json +++ b/bundles.json @@ -26,6 +26,7 @@ "platform/policy", "platform/entanglement", "platform/search", + "platform/commonUI/notification", "example/imagery", "example/eventGenerator", diff --git a/platform/commonUI/notification/src/MessageSeverity.js b/platform/commonUI/notification/src/MessageSeverity.js new file mode 100644 index 0000000000..5f17b917fe --- /dev/null +++ b/platform/commonUI/notification/src/MessageSeverity.js @@ -0,0 +1,9 @@ +/** + * Created by akhenry on 10/7/15. + */ +define(function(){ + return { + SUCCESS: 0, + ERROR: 1 + } +}) \ No newline at end of file diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 07aea14da4..30e746cc42 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -27,8 +27,8 @@ * @namespace platform/commonUI/dialog */ define( - [], - function () { + ["./MessageSeverity"], + function (MessageSeverity) { "use strict"; /** * The notification service is responsible for informing the user of @@ -36,28 +36,9 @@ define( * @memberof platform/commonUI/notification * @constructor */ - function NotificationService($log, $timeout, messageSeverity, DEFAULT_AUTO_DISMISS) { - //maintain an array of notifications. - //expose a method for adding notifications. - //expose a method for dismissing notifications. - //expose a method for minimizing notifications. - //expose a method for getting the 'current' notification. How - //this is determined could be a little nuanced. - //Allow for auto-dismissal of success messages - // - // - // - // Questions: - // 1) What happens when a newer, but lower priority - // message arrives (eg. success). Just show it? It will - // auto-dismissed, and the existing error message will be - // exposed. - // - + function NotificationService($timeout, DEFAULT_AUTO_DISMISS) { this.notifications = []; - this.$log = $log; this.$timeout = $timeout; - this.messageSeverity = messageSeverity; this.DEFAULT_AUTO_DISMISS = DEFAULT_AUTO_DISMISS; /** @@ -71,7 +52,6 @@ define( * @type {{notification: undefined}} */ this.active = { - notification: undefined }; } /** @@ -97,14 +77,18 @@ define( this.model = model; } - Notification.prototype.minimize = function () { + Notification.prototype.minimize = function (setValue) { if (typeof setValue !== undefined){ - model.minimized = setValue; + this.model.minimized = setValue; } else { - return model.minimized; + return this.model.minimized; } }; + NotificationService.prototype.getActiveNotification = function (){ + return this.active.notification; + } + /** * model = { * @@ -112,31 +96,125 @@ define( * @param model */ NotificationService.prototype.notify = function (model) { - var notification = new Notification(model); + var notification = new Notification(model), + that=this; this.notifications.push(notification); - this.setActiveNotification(notification); - }; + /* + Check if there is already an active (ie. visible) notification + */ + if (!this.active.notification){ + setActiveNotification.call(this, notification); + } else if (!this.active.timeout){ + /* + If there is already an active notification, time it out. If it's + already got a timeout in progress (either because it has had + timeout forced because of a queue of messages, or it had an + autodismiss specified), leave it to run. - - NotificationService.prototype.setActiveNotification = function () { - //If there is a message active, time it out, and then chain a - // new message to appear. - if (this.active.timeout){ - this.active.timeout = this.active.timeout.then(function (){ - this.active.timeout = $timeout(function(){ - this.dismiss(this.active.notification); - }); + This notifcation has been added to queue and will be + serviced as soon as possible. + */ + this.active.timeout = this.$timeout(function () { + that.dismissOrMinimize(that.active.notification); }); } + }; - NotificationService.prototype.dismiss = function (notification) { - var index = this.notifications.indexOf(notification); - if (index >= 0) { - this.notifications = this.notifications.splice(index, 1); - delete this.active.notification; + function setActiveNotification (notification) { + var that = this; + this.active.notification = notification; + /* + If autoDismiss has been specified, setup a timeout to + dismiss the dialog. + + If there are other notifications pending in the queue, set this + one to auto-dismiss + */ + if (notification.model.autoDismiss + || selectNextNotification.call(this)) { + var timeout = isNaN(notification.model.autoDismiss) ? + this.DEFAULT_AUTO_DISMISS : notification.model.autoDismiss; + + this.active.timeout = this.$timeout(function () { + that.dismissOrMinimize(notification); + }, timeout); } } + + function selectNextNotification () { + /* + Loop through the notifications queue and find the first one that + has not already been minimized (manually or otherwise). + */ + for (var i=0; i< this.notifications.length; i++) { + var notification = this.notifications[i]; + + if (!notification.model.minimized + && notification!= this.activeNotification) { + + return notification; + } + } + }; + + /** + * Minimize a notification. The notification will still be available + * from the notification list. Typically notifications with a + * severity of SUCCESS should not be minimized, but rather + * dismissed. + * @see dismiss + * @see dismissOrMinimize + * @param notification + */ + NotificationService.prototype.minimize = function (notification) { + //Check this is a known notification + var index = this.notifications.indexOf(notification); + if (index >= 0) { + notification.minimize(true); + delete this.active.notification; + delete this.active.timeout; + setActiveNotification.call(this, selectNextNotification.call(this)); + } + } + + /** + * Completely remove a notification. This will dismiss it from the + * message banner and remove it from the list of notifications. + * Typically only notifications with a severity of SUCCESS should be + * dismissed. If you're not sure whether to dismiss or minimize a + * notification, use the dismissOrMinimize method. + * dismiss + * @see dismissOrMinimize + * @param notification The notification to dismiss + */ + NotificationService.prototype.dismiss = function (notification) { + //Check this is a known notification + var index = this.notifications.indexOf(notification); + if (index >= 0) { + this.notifications.splice(index, 1); + + delete this.active.notification; + delete this.active.timeout; + + setActiveNotification.call(this, selectNextNotification.call(this)); + } + } + + /** + * Depending on the severity of the notification will selectively + * dismiss or minimize where appropriate. + * @see dismiss + * @see minimize + * @param notification + */ + NotificationService.prototype.dismissOrMinimize = function (notification){ + if (notification.model.severity > MessageSeverity.SUCCESS){ + this.minimize(notification); + } else { + this.dismiss(notification); + } + }; return NotificationService; }); \ No newline at end of file diff --git a/platform/commonUI/notification/test/NotificationServiceSpec.js b/platform/commonUI/notification/test/NotificationServiceSpec.js new file mode 100644 index 0000000000..c7a5fee234 --- /dev/null +++ b/platform/commonUI/notification/test/NotificationServiceSpec.js @@ -0,0 +1,146 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,describe,it,expect,beforeEach,waitsFor,jasmine */ + +define( + ['../src/NotificationService','../src/MessageSeverity'], + function (NotificationService, MessageSeverity) { + "use strict"; + + describe("The notification service ", function () { + var notificationService, + mockTimeout, + mockAutoDismiss, + successModel = { + title: "Mock Success Notification", + severity: MessageSeverity.SUCCESS + }, + errorModel = { + title: "Mock Error Notification", + severity: MessageSeverity.ERROR + }; + + /** + * 1) Calling .notify results in a new notification being created + * with the provided model and set to the active notification + * + * 2) Calling .notify with autoDismiss results in a SUCCESS notification + * becoming dismissed after timeout has elapsed + * + * 3) Calling .notify with autoDismiss results in an ERROR notification + * being MINIMIZED after a timeout has elapsed + * + * 4) Calling .notify with an active success notification results in that + * notification being auto-dismissed, and the new notification becoming + * active. DONE + * + * 5) Calling .notify with an active error notification results in that + * notification being auto-minimized and the new notification becoming + * active. DONE + * + * 6) Calling .notify with an active error notification, AND a + * queued error notification results in the active notification + * being auto-dismissed, the next message in the queue becoming + * active, then auto-dismissed, and then the provided notification + * becoming active. + */ + + /** + var model = { + title: string, + progress: number, + severity: MessageSeverity, + unknownProgress: boolean, + minimized: boolean, + autoDismiss: boolean | number, + actions: { + label: string, + action: function + } + } + */ + + beforeEach(function(){ + mockTimeout = jasmine.createSpy("$timeout"); + mockAutoDismiss = 0; + notificationService = new NotificationService( + mockTimeout, mockAutoDismiss); + }); + + it("Calls the notification service with a new notification, making" + + " the notification active", function() { + var activeNotification; + notificationService.notify(successModel); + activeNotification = notificationService.getActiveNotification(); + expect(activeNotification.model).toBe(successModel); + }); + + describe(" called with multiple notifications", function(){ + it("auto-dismisses the previously active notification, making" + + " the new notification active", function() { + var activeNotification; + //First pre-load with a success message + notificationService.notify(successModel); + activeNotification = + notificationService.getActiveNotification(); + //Initially expect the active notification to be success + expect(activeNotification.model).toBe(successModel); + //Then notify of an error + notificationService.notify(errorModel); + //But it should be auto-dismissed and replaced with the + // error notification + mockTimeout.mostRecentCall.args[0](); + activeNotification = notificationService.getActiveNotification(); + expect(activeNotification.model).toBe(errorModel); + }); + it("auto-dismisses an active success notification, removing" + + " it completely", function() { + //First pre-load with a success message + notificationService.notify(successModel); + //Then notify of an error + notificationService.notify(errorModel); + expect(notificationService.notifications.length).toEqual(2); + mockTimeout.mostRecentCall.args[0](); + //Previous success message should be completely dismissed + expect(notificationService.notifications.length).toEqual(1); + }); + it("auto-minimizes an active error notification", function() { + var activeNotification; + //First pre-load with a success message + notificationService.notify(errorModel); + //Then notify of an error + notificationService.notify(successModel); + expect(notificationService.notifications.length).toEqual(2); + //Mock the auto-minimize + mockTimeout.mostRecentCall.args[0](); + //Previous error message should be minimized, not + // dismissed + expect(notificationService.notifications.length).toEqual(2); + activeNotification = + notificationService.getActiveNotification(); + expect(activeNotification.model).toBe(successModel); + expect(errorModel.minimized).toEqual(true); + + }); + }); + }); + }); \ No newline at end of file diff --git a/platform/commonUI/notification/test/suite.json b/platform/commonUI/notification/test/suite.json new file mode 100644 index 0000000000..08238b16c0 --- /dev/null +++ b/platform/commonUI/notification/test/suite.json @@ -0,0 +1,3 @@ +[ + "NotificationService" +] \ No newline at end of file From 182eff977c21dfadc44130cb30106e84d6a234c4 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 7 Oct 2015 16:36:55 -0700 Subject: [PATCH 012/201] [Frontend] Dialog and overlay layout/positioning mods open #159 open #170 Restructured overlay size and positioning approach for better flexibility; Getting new dialogs and the overlay to play nicely in mobile context; --- .../res/templates/blocking-message.html | 2 +- .../commonUI/dialog/res/templates/dialog.html | 2 +- .../dialog/res/templates/overlay-options.html | 2 +- .../dialog/res/templates/overlay.html | 8 +- .../general/res/sass/controls/_messages.scss | 2 +- .../general/res/sass/mobile/_constants.scss | 2 +- .../res/sass/mobile/overlay/_overlay.scss | 80 +++++---- .../general/res/sass/overlay/_overlay.scss | 134 ++++++++------- .../res/sass/user-environ/_layout.scss | 6 +- .../espresso/res/css/theme-espresso.css | 161 +++++++++++------- .../themes/snow/res/css/theme-snow.css | 161 +++++++++++------- 11 files changed, 330 insertions(+), 230 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/blocking-message.html b/platform/commonUI/dialog/res/templates/blocking-message.html index 8db939cfdc..fc2b5c1df3 100644 --- a/platform/commonUI/dialog/res/templates/blocking-message.html +++ b/platform/commonUI/dialog/res/templates/blocking-message.html @@ -3,7 +3,7 @@
{{ngModel.dialog.title}}
{{ngModel.dialog.hint}}
-
+
{{ngModel.dialog.actionText}}
diff --git a/platform/commonUI/dialog/res/templates/dialog.html b/platform/commonUI/dialog/res/templates/dialog.html index 4c7c02e3f2..2fe2411875 100644 --- a/platform/commonUI/dialog/res/templates/dialog.html +++ b/platform/commonUI/dialog/res/templates/dialog.html @@ -23,7 +23,7 @@
{{ngModel.title}}
All fields marked * are required.
-
+
diff --git a/platform/commonUI/dialog/res/templates/overlay-options.html b/platform/commonUI/dialog/res/templates/overlay-options.html index 155ad0beab..7de75df31c 100644 --- a/platform/commonUI/dialog/res/templates/overlay-options.html +++ b/platform/commonUI/dialog/res/templates/overlay-options.html @@ -24,7 +24,7 @@
{{ngModel.dialog.title}}
{{ngModel.dialog.hint}}
-
+
diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index df8bd9c160..f2b7c0d9ee 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -25,11 +25,7 @@ - x - -
- -
+ class="clk-icon icon ui-symbol close">x +
\ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 697e841a5f..91dce92a09 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -131,7 +131,7 @@ width: 100px; } .progress-info.progress-estimate { display: none; } - z-index: 2; + z-index: 10; } .s-message-banner, diff --git a/platform/commonUI/general/res/sass/mobile/_constants.scss b/platform/commonUI/general/res/sass/mobile/_constants.scss index bd9443cc50..067bbef6ca 100644 --- a/platform/commonUI/general/res/sass/mobile/_constants.scss +++ b/platform/commonUI/general/res/sass/mobile/_constants.scss @@ -23,7 +23,7 @@ /************************** MOBILE REPRESENTATION ITEMS DIMENSIONS */ $mobileListIconSize: 30px; $mobileTitleDescH: 35px; -$mobileOverlayMargin: 10px; +$mobileOverlayMargin: 20px; $phoneItemH: floor($ueBrowseGridItemLg/4); $tabletItemH: floor($ueBrowseGridItemLg/3); diff --git a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss index caa6df0967..af0380a12b 100644 --- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss @@ -1,16 +1,12 @@ @include phoneandtablet { .overlay { - $m: 0; .clk-icon.close { top: $mobileOverlayMargin; right: $mobileOverlayMargin; } > .holder { - @include border-radius($m); - top: $m; - right: $m; - bottom: $m; - left: $m; + height: 90%; width: 90%; + > .contents { top: $mobileOverlayMargin; right: $mobileOverlayMargin; @@ -22,35 +18,61 @@ margin-right: 1.2em; } } - - .form.editor { - border: none; - - .contents { - top: 0; - right: 0; - bottom: 0; - left: 0; - } - } } } } } @include phone { - .overlay > .holder > .contents .form.editor .contents .form-row { - > .label, - > .controls { - //@include test(blue); - display: block; - float: none; - width: 100%; + .overlay > .holder { + //@include test(orange); // This works! + $m: 0; + @include border-radius($m); + top: $m; + right: $m; + bottom: $m; + left: $m; + height: auto; width: auto; + min-width: 200px; min-height: 200px; + max-height: 100%; max-width: 100%; + overflow: auto; + @include transform(none); + + .editor .form .form-row { + > .label, + > .controls { + //@include test(blue); + display: block; + float: none; + width: 100%; + } + > .label { + &:after { + float: none; + } + } + } + + .contents .top-bar, + .contents .editor, + .contents .bottom-bar { + //@include test(orange); + top: auto; right: auto; bottom: auto; left: auto; + height: auto; width: auto; + margin-bottom: $interiorMarginLg * 2; + position: relative; + } + } + .t-dialog-sm .overlay > .holder { + //@include test(blue); + height: auto; max-height: 100%; + } +} + +@include phonePortrait { + .overlay > .holder { + .contents .bottom-bar { + text-align: center; } - > .label { - &:after { - float: none; - } - } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 9724d6f463..327c41856d 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -20,93 +20,113 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .overlay { - .blocker { - background: $colorOvrBlocker; - z-index: 100; - } + .blocker { + background: $colorOvrBlocker; + z-index: 100; + } .clk-icon.close { font-size: 0.8rem; position: absolute; - top: $interiorMarginLg; right: $interiorMarginLg; bottom: auto; left: auto; - z-index: 100; + top: $interiorMarginLg; + right: $interiorMarginLg; + bottom: auto; + left: auto; + z-index: 100; } - >.holder { - $i: 15%; - @include containerSubtle($colorOvrBg, $colorOvrFg); - @include border-radius($basicCr * 3); - color: $colorOvrFg; - top: $i; right: $i; bottom: $i; left: $i; - z-index: 101; - >.contents { + > .holder { + //$i: 15%; + @include containerSubtle($colorOvrBg, $colorOvrFg); + @include border-radius($basicCr * 3); + color: $colorOvrFg; + top: 50%; + right: auto; + bottom: auto; + left: 50%; + @include transform(translateX(-50%) translateY(-50%)); + height: 70%; + width: 50%; + min-height: 300px; + max-height: 800px; + min-width: 450px; + max-width: 1000px; + z-index: 101; + > .contents { $m: $overlayMargin; - top: $m; right: $m; bottom: $m; left: $m; + top: $m; + right: $m; + bottom: $m; + left: $m; } - } + } .title { - @include ellipsize(); + @include ellipsize(); font-size: 1.2em; line-height: 120%; - margin-bottom: $interiorMargin; + margin-bottom: $interiorMargin; } .hint { color: pushBack($colorOvrFg, 20%); } - + .top-bar { height: $ovrTopBarH; } - + .editor { top: $ovrTopBarH + ($interiorMargin * 2); bottom: $ovrFooterH + $interiorMargin * 2; - left: 0; right: 0; + left: 0; + right: 0; + overflow: auto; + .field.l-med { + input[type='text'] { + width: 100%; + } + } } - .l-progress-bar { - $h: $progressBarHOverlay; + .l-progress-bar { + $h: $progressBarHOverlay; display: block; - height: $h; - line-height: $h; + height: $h; + line-height: $h; margin: .5em 0; - width: 100%; - } - + width: 100%; + } + .bottom-bar { - top: auto; right: 0; bottom: 0; left: 0; - overflow: visible; + top: auto; + right: 0; + bottom: 0; + left: 0; + overflow: visible; //font-size: 1em; height: $ovrFooterH; text-align: right; .s-btn { - $bg: $colorOvrBtnBg; - &:not(.major) { - @include btnSubtle($bg, pullForward($bg, 10%), $colorOvrBtnFg, $colorOvrBtnFg); - } - font-size: 95%; - height: $ovrFooterH; - line-height: $ovrFooterH; + $bg: $colorOvrBtnBg; + &:not(.major) { + @include btnSubtle($bg, pullForward($bg, 10%), $colorOvrBtnFg, $colorOvrBtnFg); + } + font-size: 95%; + height: $ovrFooterH; + line-height: $ovrFooterH; margin-left: $interiorMargin; - padding: 0 $interiorMargin * 3; - //&.major { - // @extend .s-btn.major; - // &:hover { - // @extend .s-btn.major:hover; - // } - //} + padding: 0 $interiorMargin * 3; + //&.major { + // @extend .s-btn.major; + // &:hover { + // @extend .s-btn.major:hover; + // } + //} } } - .contents.l-dialog { - $myM: $interiorMargin; - top: $myM; - right: $myM; - bottom: $myM; - left: $myM; - overflow: auto; - .field.l-med { - input[type='text'] { - width: 100%; - } - } - } +} + +.t-dialog-sm .overlay > .holder { + // Used for blocker and in-progress dialogs, modal alerts, etc. + //@include test(red); + min-height: 225px; + height: 225px; } \ 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 6a11e22eb0..84083dc08d 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -43,9 +43,9 @@ position: absolute; } -.editor { - @include border-radius($basicCr * 1.5); -} +//.editor { +// @include border-radius($basicCr * 1.5); +//} .contents { $myM: 0; //$interiorMargin; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 5caef16706..70c42472c7 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -2483,7 +2483,7 @@ label.checkbox.custom { -ms-transform: translateX(-50%); -webkit-transform: translateX(-50%); transform: translateX(-50%); - z-index: 2; } + z-index: 10; } /* line 110, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; @@ -3330,12 +3330,6 @@ span.req { .editor { position: absolute; } -/* line 46, ../../../../general/res/sass/user-environ/_layout.scss */ -.editor { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; } - /* line 50, ../../../../general/res/sass/user-environ/_layout.scss */ .contents { box-sizing: border-box; @@ -4204,7 +4198,7 @@ span.req { bottom: auto; left: auto; z-index: 100; } -/* line 33, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 36, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay > .holder { background-color: #4d4d4d; -moz-border-radius: 3px; @@ -4228,18 +4222,28 @@ span.req { -webkit-border-radius: 6px; border-radius: 6px; color: #e6e6e6; - top: 15%; - right: 15%; - bottom: 15%; - left: 15%; + top: 50%; + right: auto; + bottom: auto; + left: 50%; + -moz-transform: translateX(-50%) translateY(-50%); + -ms-transform: translateX(-50%) translateY(-50%); + -webkit-transform: translateX(-50%) translateY(-50%); + transform: translateX(-50%) translateY(-50%); + height: 70%; + width: 50%; + min-height: 300px; + max-height: 800px; + min-width: 450px; + max-width: 1000px; z-index: 101; } - /* line 40, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 53, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay > .holder > .contents { top: 25px; right: 25px; bottom: 25px; left: 25px; } -/* line 45, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .title { overflow: hidden; text-overflow: ellipsis; @@ -4247,26 +4251,30 @@ span.req { font-size: 1.2em; line-height: 120%; margin-bottom: 5px; } -/* line 52, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 68, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .hint { color: #b3b3b3; } -/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 72, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 60, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 76, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; - right: 0; } -/* line 66, ../../../../general/res/sass/overlay/_overlay.scss */ + right: 0; + overflow: auto; } + /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .editor .field.l-med input[type='text'] { + width: 100%; } +/* line 89, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .l-progress-bar { display: block; height: 15px; line-height: 15px; margin: .5em 0; width: 100%; } -/* line 75, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 98, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4275,14 +4283,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 81, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 109, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: gray; -moz-border-radius: 3px; @@ -4321,23 +4329,32 @@ span.req { /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .contents.l-dialog { - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - overflow: auto; } - /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .contents.l-dialog .field.l-med input[type='text'] { - width: 100%; } + +/* line 127, ../../../../general/res/sass/overlay/_overlay.scss */ +.t-dialog-sm .overlay > .holder { + min-height: 225px; + height: 225px; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 4, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay .clk-icon.close { - top: 10px; - right: 10px; } - /* line 8, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + top: 20px; + right: 20px; } + /* line 7, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder { + height: 90%; + width: 90%; } + /* line 10, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents { + top: 20px; + right: 20px; + bottom: 20px; + left: 20px; } + /* line 17, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .top-bar > .title { + margin-right: 1.2em; } } +@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) { + /* line 27, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder { -moz-border-radius: 0; -webkit-border-radius: 0; @@ -4345,35 +4362,49 @@ span.req { top: 0; right: 0; bottom: 0; - left: 0; } - /* line 14, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents { - top: 10px; - right: 10px; - bottom: 10px; - left: 10px; } - /* line 21, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .top-bar > .title { - margin-right: 1.2em; } - /* line 26, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor { - border: none; } - /* line 29, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents { - top: 0; - right: 0; - bottom: 0; - left: 0; } } -@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) { - /* line 43, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents .form-row > .label, - .overlay > .holder > .contents .form.editor .contents .form-row > .controls { - display: block; - float: none; - width: 100%; } - /* line 51, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents .form-row > .label:after { - float: none; } } + left: 0; + height: auto; + width: auto; + min-width: 200px; + min-height: 200px; + max-height: 100%; + max-width: 100%; + overflow: auto; + -moz-transform: none; + -ms-transform: none; + -webkit-transform: none; + transform: none; } + /* line 42, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .editor .form .form-row > .label, + .overlay > .holder .editor .form .form-row > .controls { + display: block; + float: none; + width: 100%; } + /* line 50, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .editor .form .form-row > .label:after { + float: none; } + /* line 56, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .contents .top-bar, + .overlay > .holder .contents .editor, + .overlay > .holder .contents .bottom-bar { + background-color: rgba(255, 165, 0, 0.2); + top: auto; + right: auto; + bottom: auto; + left: auto; + height: auto; + width: auto; + margin-bottom: 20px; + position: relative; } + + /* line 66, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .t-dialog-sm .overlay > .holder { + height: auto; + max-height: 100%; } } +@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { + /* line 74, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .contents .bottom-bar { + text-align: center; } } /***************************************************************************** * 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 5c94d22297..0789136f68 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -2431,7 +2431,7 @@ label.checkbox.custom { -ms-transform: translateX(-50%); -webkit-transform: translateX(-50%); transform: translateX(-50%); - z-index: 2; } + z-index: 10; } /* line 110, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; @@ -3262,12 +3262,6 @@ span.req { .editor { position: absolute; } -/* line 46, ../../../../general/res/sass/user-environ/_layout.scss */ -.editor { - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; } - /* line 50, ../../../../general/res/sass/user-environ/_layout.scss */ .contents { box-sizing: border-box; @@ -4136,7 +4130,7 @@ span.req { bottom: auto; left: auto; z-index: 100; } -/* line 33, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 36, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay > .holder { background-color: #fcfcfc; -moz-border-radius: 4px; @@ -4151,18 +4145,28 @@ span.req { -webkit-border-radius: 12px; border-radius: 12px; color: #666; - top: 15%; - right: 15%; - bottom: 15%; - left: 15%; + top: 50%; + right: auto; + bottom: auto; + left: 50%; + -moz-transform: translateX(-50%) translateY(-50%); + -ms-transform: translateX(-50%) translateY(-50%); + -webkit-transform: translateX(-50%) translateY(-50%); + transform: translateX(-50%) translateY(-50%); + height: 70%; + width: 50%; + min-height: 300px; + max-height: 800px; + min-width: 450px; + max-width: 1000px; z-index: 101; } - /* line 40, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 53, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay > .holder > .contents { top: 25px; right: 25px; bottom: 25px; left: 25px; } -/* line 45, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .title { overflow: hidden; text-overflow: ellipsis; @@ -4170,26 +4174,30 @@ span.req { font-size: 1.2em; line-height: 120%; margin-bottom: 5px; } -/* line 52, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 68, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .hint { color: #999999; } -/* line 56, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 72, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 60, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 76, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; - right: 0; } -/* line 66, ../../../../general/res/sass/overlay/_overlay.scss */ + right: 0; + overflow: auto; } + /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .editor .field.l-med input[type='text'] { + width: 100%; } +/* line 89, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .l-progress-bar { display: block; height: 15px; line-height: 15px; margin: .5em 0; width: 100%; } -/* line 75, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 98, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4198,14 +4206,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 81, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 109, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: #969696; -moz-border-radius: 4px; @@ -4235,23 +4243,32 @@ span.req { /* line 296, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .contents.l-dialog { - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - overflow: auto; } - /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .contents.l-dialog .field.l-med input[type='text'] { - width: 100%; } + +/* line 127, ../../../../general/res/sass/overlay/_overlay.scss */ +.t-dialog-sm .overlay > .holder { + min-height: 225px; + height: 225px; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 4, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay .clk-icon.close { - top: 10px; - right: 10px; } - /* line 8, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + top: 20px; + right: 20px; } + /* line 7, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder { + height: 90%; + width: 90%; } + /* line 10, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents { + top: 20px; + right: 20px; + bottom: 20px; + left: 20px; } + /* line 17, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .top-bar > .title { + margin-right: 1.2em; } } +@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) { + /* line 27, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder { -moz-border-radius: 0; -webkit-border-radius: 0; @@ -4259,35 +4276,49 @@ span.req { top: 0; right: 0; bottom: 0; - left: 0; } - /* line 14, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents { - top: 10px; - right: 10px; - bottom: 10px; - left: 10px; } - /* line 21, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .top-bar > .title { - margin-right: 1.2em; } - /* line 26, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor { - border: none; } - /* line 29, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents { - top: 0; - right: 0; - bottom: 0; - left: 0; } } -@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) { - /* line 43, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents .form-row > .label, - .overlay > .holder > .contents .form.editor .contents .form-row > .controls { - display: block; - float: none; - width: 100%; } - /* line 51, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents .form-row > .label:after { - float: none; } } + left: 0; + height: auto; + width: auto; + min-width: 200px; + min-height: 200px; + max-height: 100%; + max-width: 100%; + overflow: auto; + -moz-transform: none; + -ms-transform: none; + -webkit-transform: none; + transform: none; } + /* line 42, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .editor .form .form-row > .label, + .overlay > .holder .editor .form .form-row > .controls { + display: block; + float: none; + width: 100%; } + /* line 50, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .editor .form .form-row > .label:after { + float: none; } + /* line 56, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .contents .top-bar, + .overlay > .holder .contents .editor, + .overlay > .holder .contents .bottom-bar { + background-color: rgba(255, 165, 0, 0.2); + top: auto; + right: auto; + bottom: auto; + left: auto; + height: auto; + width: auto; + margin-bottom: 20px; + position: relative; } + + /* line 66, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .t-dialog-sm .overlay > .holder { + height: auto; + max-height: 100%; } } +@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { + /* line 74, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder .contents .bottom-bar { + text-align: center; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space From ac59df9595ae212b5825b4d48b069f342864beea Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 7 Oct 2015 17:56:25 -0700 Subject: [PATCH 013/201] [Frontend] Added type-icon to message dialogs open #159 open #170 Percent complete added to progress-bar.html; Refined overlay height; --- .../res/templates/blocking-message.html | 12 +++--- .../general/res/sass/controls/_messages.scss | 18 ++++++++- .../general/res/sass/overlay/_overlay.scss | 7 ++-- .../general/res/templates/indicator.html | 4 +- .../general/res/templates/progress-bar.html | 3 +- .../espresso/res/css/theme-espresso.css | 39 ++++++++++++------- .../themes/snow/res/css/theme-snow.css | 39 ++++++++++++------- testing/dialogTest/res/dialog-launch.html | 7 ++-- 8 files changed, 83 insertions(+), 46 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/blocking-message.html b/platform/commonUI/dialog/res/templates/blocking-message.html index fc2b5c1df3..4f2caf3df5 100644 --- a/platform/commonUI/dialog/res/templates/blocking-message.html +++ b/platform/commonUI/dialog/res/templates/blocking-message.html @@ -1,24 +1,24 @@ - + +
!
+
{{ngModel.dialog.title}}
{{ngModel.dialog.hint}}
-
+
{{ngModel.dialog.actionText}}
- -
-
{{dialogAction.label}}
+
\ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 91dce92a09..f3e1c82702 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -130,7 +130,7 @@ line-height: $h; width: 100px; } - .progress-info.progress-estimate { display: none; } + .progress-info { display: none; } z-index: 10; } @@ -159,4 +159,20 @@ &.caution { @include statusBannerColors($colorStatusCaution); } +} + +// Messages in overlays, as singleton or in list +.t-message .overlay { + // Singleton message overlay context + $iconW: 80px; + .type-icon.message-type.abs { + //color: pushBack($colorOvrFg, 40%); + font-size: $iconW; + opacity: 0.5; + right: auto; + width: $iconW; + } + .message-contents.abs { + left: $iconW + $overlayMargin; + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 327c41856d..4790d59768 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -47,7 +47,7 @@ width: 50%; min-height: 300px; max-height: 800px; - min-width: 450px; + min-width: 600px; max-width: 1000px; z-index: 101; > .contents { @@ -58,6 +58,7 @@ left: $m; } } + .title { @include ellipsize(); font-size: 1.2em; @@ -127,6 +128,6 @@ .t-dialog-sm .overlay > .holder { // Used for blocker and in-progress dialogs, modal alerts, etc. //@include test(red); - min-height: 225px; - height: 225px; + min-height: 275px; + height: 275px; } \ No newline at end of file diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html index 20bf22668b..e9be598b18 100644 --- a/platform/commonUI/general/res/templates/indicator.html +++ b/platform/commonUI/general/res/templates/indicator.html @@ -31,8 +31,8 @@ {{ngModel.getText()}} - 5 - + + diff --git a/platform/commonUI/general/res/templates/progress-bar.html b/platform/commonUI/general/res/templates/progress-bar.html index 337494164c..8337553765 100644 --- a/platform/commonUI/general/res/templates/progress-bar.html +++ b/platform/commonUI/general/res/templates/progress-bar.html @@ -4,6 +4,7 @@ -
+
+ {{ngModel.dialog.progress}}% complete. {{ngModel.dialog.progressText}}
\ 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 70c42472c7..3f7cc363b9 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -2507,7 +2507,7 @@ label.checkbox.custom { line-height: 8px; width: 100px; } /* line 133, ../../../../general/res/sass/controls/_messages.scss */ - .l-message-banner .progress-info.progress-estimate { + .l-message-banner .progress-info { display: none; } /* line 137, ../../../../general/res/sass/controls/_messages.scss */ @@ -2584,6 +2584,16 @@ label.checkbox.custom { .s-message-banner.caution .s-action:hover { background-color: #ca5900; } +/* line 168, ../../../../general/res/sass/controls/_messages.scss */ +.t-message .overlay .type-icon.message-type.abs, .t-message .overlay .s-menu span.type-icon.message-type.l-click-area, .s-menu .t-message .overlay span.type-icon.message-type.l-click-area { + font-size: 80px; + opacity: 0.5; + right: auto; + width: 80px; } +/* line 175, ../../../../general/res/sass/controls/_messages.scss */ +.t-message .overlay .message-contents.abs, .t-message .overlay .s-menu span.message-contents.l-click-area, .s-menu .t-message .overlay span.message-contents.l-click-area { + left: 105px; } + /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { position: relative; @@ -4234,7 +4244,7 @@ span.req { width: 50%; min-height: 300px; max-height: 800px; - min-width: 450px; + min-width: 600px; max-width: 1000px; z-index: 101; } /* line 53, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4243,7 +4253,7 @@ span.req { right: 25px; bottom: 25px; left: 25px; } -/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .title { overflow: hidden; text-overflow: ellipsis; @@ -4251,30 +4261,30 @@ span.req { font-size: 1.2em; line-height: 120%; margin-bottom: 5px; } -/* line 68, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .hint { color: #b3b3b3; } -/* line 72, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 73, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 76, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; right: 0; overflow: auto; } - /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor .field.l-med input[type='text'] { width: 100%; } -/* line 89, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 90, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .l-progress-bar { display: block; height: 15px; line-height: 15px; margin: .5em 0; width: 100%; } -/* line 98, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4283,14 +4293,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 108, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 109, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: gray; -moz-border-radius: 3px; @@ -4330,10 +4340,10 @@ span.req { .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 127, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 128, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { - min-height: 225px; - height: 225px; } + min-height: 300px; + height: 300px; } @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 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ @@ -4387,7 +4397,6 @@ span.req { .overlay > .holder .contents .top-bar, .overlay > .holder .contents .editor, .overlay > .holder .contents .bottom-bar { - background-color: rgba(255, 165, 0, 0.2); top: auto; right: auto; bottom: auto; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 0789136f68..3ad64bc37f 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -2455,7 +2455,7 @@ label.checkbox.custom { line-height: 8px; width: 100px; } /* line 133, ../../../../general/res/sass/controls/_messages.scss */ - .l-message-banner .progress-info.progress-estimate { + .l-message-banner .progress-info { display: none; } /* line 137, ../../../../general/res/sass/controls/_messages.scss */ @@ -2532,6 +2532,16 @@ label.checkbox.custom { .s-message-banner.caution .s-action:hover { background-color: #ca5900; } +/* line 168, ../../../../general/res/sass/controls/_messages.scss */ +.t-message .overlay .type-icon.message-type.abs, .t-message .overlay .s-menu span.type-icon.message-type.l-click-area, .s-menu .t-message .overlay span.type-icon.message-type.l-click-area { + font-size: 80px; + opacity: 0.5; + right: auto; + width: 80px; } +/* line 175, ../../../../general/res/sass/controls/_messages.scss */ +.t-message .overlay .message-contents.abs, .t-message .overlay .s-menu span.message-contents.l-click-area, .s-menu .t-message .overlay span.message-contents.l-click-area { + left: 105px; } + /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { position: relative; @@ -4157,7 +4167,7 @@ span.req { width: 50%; min-height: 300px; max-height: 800px; - min-width: 450px; + min-width: 600px; max-width: 1000px; z-index: 101; } /* line 53, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4166,7 +4176,7 @@ span.req { right: 25px; bottom: 25px; left: 25px; } -/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .title { overflow: hidden; text-overflow: ellipsis; @@ -4174,30 +4184,30 @@ span.req { font-size: 1.2em; line-height: 120%; margin-bottom: 5px; } -/* line 68, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .hint { color: #999999; } -/* line 72, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 73, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 76, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 40px; left: 0; right: 0; overflow: auto; } - /* line 83, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .editor .field.l-med input[type='text'] { width: 100%; } -/* line 89, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 90, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .l-progress-bar { display: block; height: 15px; line-height: 15px; margin: .5em 0; width: 100%; } -/* line 98, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -4206,14 +4216,14 @@ span.req { overflow: visible; height: 30px; text-align: right; } - /* line 107, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 108, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { font-size: 95%; height: 30px; line-height: 30px; margin-left: 5px; padding: 0 15px; } - /* line 109, ../../../../general/res/sass/overlay/_overlay.scss */ + /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { background-color: #969696; -moz-border-radius: 4px; @@ -4244,10 +4254,10 @@ span.req { .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { color: white; } } -/* line 127, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 128, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { - min-height: 225px; - height: 225px; } + min-height: 300px; + height: 300px; } @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 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ @@ -4301,7 +4311,6 @@ span.req { .overlay > .holder .contents .top-bar, .overlay > .holder .contents .editor, .overlay > .holder .contents .bottom-bar { - background-color: rgba(255, 165, 0, 0.2); top: auto; right: auto; bottom: auto; diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html index 59d3437c10..7c91fd8f1f 100644 --- a/testing/dialogTest/res/dialog-launch.html +++ b/testing/dialogTest/res/dialog-launch.html @@ -1,5 +1,6 @@ -    -    - + Dialogs: + Known | + Unknown | + Error \ No newline at end of file From 8ee93d9603e3b841ee461b6abcbf614569ee1b6d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 7 Oct 2015 18:26:11 -0700 Subject: [PATCH 014/201] [Frontend] Tweaks to dialog-launch; added ui-symbols open #159 open #170 --- .../icomoon.io-WTD-symbols-project.json | 300 +++++++++++------- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 11216 -> 11492 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 4 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 11040 -> 11316 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 11116 -> 11392 bytes .../general/res/sass/controls/_messages.scss | 2 +- .../espresso/res/css/theme-espresso.css | 6 +- .../themes/snow/res/css/theme-snow.css | 6 +- testing/dialogTest/res/dialog-launch.html | 13 +- 9 files changed, 211 insertions(+), 120 deletions(-) diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json index 7982d57200..a742a1c8eb 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json @@ -1,14 +1,30 @@ { "metadata": { - "name": "WTD Symbols v24", - "lastOpened": 1441992412958, - "created": 1441992410384 + "name": "WTD Symbols v2.3", + "lastOpened": 1444267493342, + "created": 1444266013303 }, "iconSets": [ { "selection": [ { - "order": 86, + "order": 90, + "id": 87, + "prevSize": 32, + "code": 58896, + "name": "icon-bell", + "tempChar": "" + }, + { + "order": 91, + "id": 86, + "prevSize": 32, + "code": 58889, + "name": "icon-hourglass", + "tempChar": "" + }, + { + "order": 92, "id": 85, "prevSize": 32, "code": 58888, @@ -18,119 +34,119 @@ 58890 ], "name": "icon-info-v15", - "tempChar": "" + "tempChar": "" }, { - "order": 82, + "order": 93, "id": 84, "prevSize": 32, "code": 58887, "name": "icon-x-in-circle", - "tempChar": "" + "tempChar": "" }, { - "order": 77, + "order": 94, "id": 83, "prevSize": 32, "code": 58881, "name": "icon-datatable", - "tempChar": "" + "tempChar": "" }, { - "order": 78, + "order": 95, "id": 82, "prevSize": 32, "code": 58882, "name": "icon-tabular-scrolling", - "tempChar": "" + "tempChar": "" }, { - "order": 79, + "order": 96, "id": 81, "prevSize": 32, "code": 58884, "name": "icon-tabular", - "tempChar": "" + "tempChar": "" }, { - "order": 80, + "order": 97, "id": 80, "prevSize": 32, "code": 58885, "name": "icon-calendar", - "tempChar": "" + "tempChar": "" }, { - "order": 83, + "order": 98, "id": 78, "prevSize": 32, "code": 58886, "name": "icon-paint-bucket", - "tempChar": "" + "tempChar": "" }, { - "order": 1, + "order": 99, "id": 75, "prevSize": 32, "code": 123, "name": "icon-pointer-left", - "tempChar": "" + "tempChar": "" }, { - "order": 3, + "order": 100, "id": 74, "prevSize": 32, "code": 125, "name": "icon-pointer-right", - "tempChar": "" + "tempChar": "" }, { - "order": 4, + "order": 101, "id": 73, "prevSize": 32, "code": 80, "name": "icon-person", - "tempChar": "" + "tempChar": "" }, { - "order": 5, + "order": 102, "id": 72, "prevSize": 32, "code": 232, "name": "icon-chain-links", - "tempChar": "" + "tempChar": "" }, { - "order": 6, + "order": 103, "id": 71, "prevSize": 32, "code": 115, "name": "icon-database-in-brackets", - "tempChar": "" + "tempChar": "" }, { - "order": 7, + "order": 104, "id": 70, "prevSize": 32, "code": 114, "name": "icon-refresh", - "tempChar": "" + "tempChar": "" }, { - "order": 8, + "order": 105, "id": 69, "prevSize": 32, "code": 108, "name": "icon-lock", - "tempChar": "" + "tempChar": "" }, { - "order": 9, + "order": 106, "id": 68, "prevSize": 32, "code": 51, "name": "icon-box-with-dashed-lines", - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -138,7 +154,7 @@ "prevSize": 32, "code": 58880, "name": "icon-box-with-arrow-cursor", - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -146,7 +162,7 @@ "prevSize": 32, "code": 65, "name": "icon-activity-mode", - "tempChar": "" + "tempChar": "" }, { "order": 12, @@ -154,15 +170,15 @@ "prevSize": 32, "code": 97, "name": "icon-activity", - "tempChar": "" + "tempChar": "" }, { - "order": 13, + "order": 87, "id": 64, "prevSize": 32, "code": 33, "name": "icon-alert-rect", - "tempChar": "" + "tempChar": "" }, { "order": 14, @@ -170,7 +186,7 @@ "prevSize": 32, "code": 58883, "name": "icon-alert-triangle", - "tempChar": "" + "tempChar": "" }, { "order": 15, @@ -178,7 +194,7 @@ "prevSize": 32, "code": 238, "name": "icon-arrow-double-down", - "tempChar": "" + "tempChar": "" }, { "order": 16, @@ -186,7 +202,7 @@ "prevSize": 32, "code": 235, "name": "icon-arrow-double-up", - "tempChar": "" + "tempChar": "" }, { "order": 2, @@ -194,7 +210,7 @@ "prevSize": 32, "code": 118, "name": "icon-arrow-down", - "tempChar": "" + "tempChar": "" }, { "order": 19, @@ -202,7 +218,7 @@ "prevSize": 32, "code": 60, "name": "icon-arrow-left", - "tempChar": "" + "tempChar": "" }, { "order": 20, @@ -210,7 +226,7 @@ "prevSize": 32, "code": 62, "name": "icon-arrow-right", - "tempChar": "" + "tempChar": "" }, { "order": 21, @@ -218,7 +234,7 @@ "prevSize": 32, "code": 236, "name": "icon-arrow-tall-down", - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -226,7 +242,7 @@ "prevSize": 32, "code": 237, "name": "icon-arrow-tall-up", - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -234,7 +250,7 @@ "prevSize": 32, "code": 94, "name": "icon-arrow-up", - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -242,7 +258,7 @@ "prevSize": 32, "code": 73, "name": "icon-arrows-out", - "tempChar": "" + "tempChar": "" }, { "order": 25, @@ -250,7 +266,7 @@ "prevSize": 32, "code": 58893, "name": "icon-arrows-right-left", - "tempChar": "" + "tempChar": "" }, { "order": 33, @@ -258,7 +274,7 @@ "prevSize": 32, "code": 53, "name": "icon-arrows-up-down", - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -266,7 +282,7 @@ "prevSize": 32, "code": 42, "name": "icon-asterisk", - "tempChar": "" + "tempChar": "" }, { "order": 27, @@ -274,7 +290,7 @@ "prevSize": 32, "code": 72, "name": "icon-autoflow-tabular", - "tempChar": "" + "tempChar": "" }, { "order": 28, @@ -282,7 +298,7 @@ "prevSize": 32, "code": 224, "name": "icon-box", - "tempChar": "" + "tempChar": "" }, { "order": 29, @@ -290,7 +306,7 @@ "prevSize": 32, "code": 50, "name": "icon-check", - "tempChar": "" + "tempChar": "" }, { "order": 30, @@ -298,7 +314,7 @@ "prevSize": 32, "code": 67, "name": "icon-clock", - "tempChar": "" + "tempChar": "" }, { "order": 31, @@ -306,7 +322,7 @@ "prevSize": 32, "code": 46, "name": "icon-connectivity", - "tempChar": "" + "tempChar": "" }, { "order": 32, @@ -314,7 +330,7 @@ "prevSize": 32, "code": 100, "name": "icon-database-query", - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -322,7 +338,7 @@ "prevSize": 32, "code": 68, "name": "icon-database", - "tempChar": "" + "tempChar": "" }, { "order": 35, @@ -330,7 +346,7 @@ "prevSize": 32, "code": 81, "name": "icon-dictionary", - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -338,7 +354,7 @@ "prevSize": 32, "code": 242, "name": "icon-duplicate", - "tempChar": "" + "tempChar": "" }, { "order": 37, @@ -346,7 +362,7 @@ "prevSize": 32, "code": 102, "name": "icon-folder-new", - "tempChar": "" + "tempChar": "" }, { "order": 38, @@ -354,7 +370,7 @@ "prevSize": 32, "code": 70, "name": "icon-folder", - "tempChar": "" + "tempChar": "" }, { "order": 39, @@ -362,7 +378,7 @@ "prevSize": 32, "code": 95, "name": "icon-fullscreen-collapse", - "tempChar": "" + "tempChar": "" }, { "order": 40, @@ -370,7 +386,7 @@ "prevSize": 32, "code": 122, "name": "icon-fullscreen-expand", - "tempChar": "" + "tempChar": "" }, { "order": 41, @@ -378,7 +394,7 @@ "prevSize": 32, "code": 71, "name": "icon-gear", - "tempChar": "" + "tempChar": "" }, { "order": 49, @@ -386,7 +402,7 @@ "prevSize": 32, "code": 227, "name": "icon-image", - "tempChar": "" + "tempChar": "" }, { "order": 42, @@ -394,7 +410,7 @@ "prevSize": 32, "code": 225, "name": "icon-layers", - "tempChar": "" + "tempChar": "" }, { "order": 43, @@ -402,7 +418,7 @@ "prevSize": 32, "code": 76, "name": "icon-layout", - "tempChar": "" + "tempChar": "" }, { "order": 44, @@ -410,7 +426,7 @@ "prevSize": 32, "code": 226, "name": "icon-line-horz", - "tempChar": "" + "tempChar": "" }, { "order": 75, @@ -418,7 +434,7 @@ "prevSize": 32, "code": 244, "name": "icon-link", - "tempChar": "" + "tempChar": "" }, { "order": 46, @@ -426,7 +442,7 @@ "prevSize": 32, "code": 88, "name": "icon-magnify-in", - "tempChar": "" + "tempChar": "" }, { "order": 47, @@ -434,7 +450,7 @@ "prevSize": 32, "code": 89, "name": "icon-magnify-out", - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -442,7 +458,7 @@ "prevSize": 32, "code": 77, "name": "icon-magnify", - "tempChar": "" + "tempChar": "" }, { "order": 34, @@ -450,7 +466,7 @@ "prevSize": 32, "code": 109, "name": "icon-menu", - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -458,7 +474,7 @@ "prevSize": 32, "code": 243, "name": "icon-move", - "tempChar": "" + "tempChar": "" }, { "order": 51, @@ -466,7 +482,7 @@ "prevSize": 32, "code": 121, "name": "icon-new-window", - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -474,7 +490,7 @@ "prevSize": 32, "code": 111, "name": "icon-object", - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -482,7 +498,7 @@ "prevSize": 32, "code": 63, "name": "icon-object-unknown", - "tempChar": "" + "tempChar": "" }, { "order": 53, @@ -490,7 +506,7 @@ "prevSize": 32, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -498,7 +514,7 @@ "prevSize": 32, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -506,7 +522,7 @@ "prevSize": 32, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -514,7 +530,7 @@ "prevSize": 32, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { "order": 65, @@ -522,7 +538,7 @@ "prevSize": 32, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -530,7 +546,7 @@ "prevSize": 32, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -538,7 +554,7 @@ "prevSize": 32, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -546,7 +562,7 @@ "prevSize": 32, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -554,7 +570,7 @@ "prevSize": 32, "code": 45, "name": "icon-minus", - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -562,7 +578,7 @@ "prevSize": 32, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -570,7 +586,7 @@ "prevSize": 32, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -578,7 +594,7 @@ "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -586,7 +602,7 @@ "prevSize": 32, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { "order": 18, @@ -594,7 +610,7 @@ "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -602,7 +618,7 @@ "prevSize": 32, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -610,7 +626,7 @@ "prevSize": 32, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -618,7 +634,7 @@ "prevSize": 32, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -626,7 +642,7 @@ "prevSize": 32, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -634,7 +650,7 @@ "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -642,7 +658,7 @@ "prevSize": 32, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -650,7 +666,7 @@ "prevSize": 32, "code": 58946, "name": "icon-x", - "tempChar": "" + "tempChar": "" } ], "id": 2, @@ -665,6 +681,58 @@ "height": 1024, "prevSize": 32, "icons": [ + { + "id": 87, + "paths": [ + "M512 1024c106 0 192-86 192-192h-384c0 106 86 192 192 192z", + "M896 448v-64c0-212-172-384-384-384s-384 172-384 384v64c0 70.6-57.4 128-128 128v128h1024v-128c-70.6 0-128-57.4-128-128z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-bell" + ], + "colorPermutations": { + "125525525516161751": [ + 1, + 1 + ] + } + }, + { + "id": 86, + "paths": [ + "M1024 0h-1024c0 282.8 229.2 512 512 512s512-229.2 512-512zM512 384c-102.6 0-199-40-271.6-112.4-41.2-41.2-72-90.2-90.8-143.6h724.6c-18.8 53.4-49.6 102.4-90.8 143.6-72.4 72.4-168.8 112.4-271.4 112.4z", + "M512 512c-282.8 0-512 229.2-512 512h1024c0-282.8-229.2-512-512-512z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-hourglass" + ], + "colorPermutations": { + "125525525516161751": [ + 1, + 1 + ] + } + }, { "id": 85, "paths": [ @@ -698,7 +766,8 @@ "icon-x-in-circle" ], "colorPermutations": { - "16161751": [] + "16161751": [], + "125525525516161751": [] } }, { @@ -899,6 +968,11 @@ 1, 1, 1 + ], + "125525525516161751": [ + 1, + 1, + 1 ] } }, @@ -1051,18 +1125,28 @@ { "id": 67, "paths": [ - "M832 512.4c0-0.2 0-0.2 0-0.4v-320c0-105.6-86.4-192-192-192h-448c-105.6 0-192 86.4-192 192v320c0 105.6 86.4 192 192 192h263.6l-197.2-445.6 573.6 254z", - "M766.8 659.8l193.8-20.4-576.6-255.4 255.4 576.6 20.4-193.8 257 257.2 107.2-107.2z" + "M894-2h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h400c-2.2-3.8-4-7.6-5.8-11.4l-255.2-576.8c-21.4-48.4-10.8-105 26.6-142.4 24.4-24.4 57.2-37.4 90.4-37.4 17.4 0 35.2 3.6 51.8 11l576.6 255.4c4 1.8 7.8 3.8 11.4 5.8v-400.2c0.2-70.4-57.4-128-127.8-128z", + "M958.6 637.4l-576.6-255.4 255.4 576.6 64.6-128.6 192 192 128-128-192-192z" ], "attrs": [ - {}, - {} + { + "fill": "rgb(0, 0, 0)" + }, + { + "fill": "rgb(0, 0, 0)" + } ], "isMulticolor": false, "grid": 0, "tags": [ "icon-box-with-arrow-cursor" - ] + ], + "colorPermutations": { + "125525525516161751": [ + 0, + 0 + ] + } }, { "id": 66, @@ -1338,6 +1422,9 @@ "colorPermutations": { "16161751": [ 0 + ], + "125525525516161751": [ + 0 ] } }, @@ -14853,6 +14940,5 @@ "gridSize": 16, "showLiga": false }, - "uid": -1, - "time": 1441993324496 + "uid": -1 } \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 95887455fe74465bcec2c835663ff125999ddb60..a721dd33847aae41a6a485ab0485f1fe65040ab4 100755 GIT binary patch delta 682 zcmXw0&rcIk5T5sTyTxGJ-Tt6LO6#_;+nT1D(zi{3kgXE1Zb*B=9|yG&q#%_d1ko5- zVxk8)KsFi^;?au-V(gJbHk^znV~F7oAdQ%)Cq0Pm`WE%@GBe*dGvCa-4;S|@bNfkv zOmdx5*p0n|+`78Hbo|pV02HEcaH2F<1ppoZU#GTZV*1`q_lv_}8kYgOAC$*SW6q~% zo&d=Elvm0WaGGooAWrL{t6Z61ywJi5G*)T9OVcwqN^7piqX3ELl;5nB7OOA@cL7eF zr}4?#rONn;$nMvx6rcj=Rdr@=9vDhN(r=W}qt-Zehd>1faK=y6=Qvh()p;X>hY@ew z$LAbF9fKV{!^HWTleraMvYOTo(`0ra4BfP!807+jzpY11A(@es>;URXw*?(x6cjR2 z%-8M92D38rumMEV2wKA!Tf8UaJ>Bl=aAB3<7>(o_+g8rhO=d?Ub{@lFoa-utygmnK zVFsZ!qBWMS#`ZEzLQs1z9YCMYV&bQ;l(oNg2gMBO+b zW>PrD!fz<9Y)wsVtrVLuvYHL2+<4cWiYTiiHpU*YjA{FJUQ_Q?BKdecA5nVs|AqG9 zFo5w+N?f7#-waOZ1aPDkBGOYJVyjWvPUPoe0g*%{f}t?m)T>3L_fM`A3#*g;8e!?K zYPDFH#j0u}Hlq?v*EM2%mtKZ)2YVaWJpDhQm9Gv4sEt delta 423 zcmaD7c_Ezbf;Iz#g7!oyz`(#Dz`(#10i-$7 zb1Kswf4kQSsNsMKVnCZ@3aALnIYP`d+^H_HGDupeL%WnfSj0rFKca!V?l*ja>u zd<&p?0Xg}}i8arQqZk-8I)L)4auX{G7?K#u85lH8fP96##N1Q~`73YZfC3>v4XX_G43je$o4FN$Ocw?R237`^$=?{QnK_>EPBvq5pIp!6#O^932vo~B`683U z$7{Rbg{Rb7qG^ z|9=ktg@yi%9LJdK91s27|6i1mF`MxKBUtp`0slhAegCG2{{OrG(7*rLn|~?(W|>^5 zt}{7QVvaH+&{<3j3}{1t`G4a7p5z8;qX3L&KagWb+3NHAbMy$r4)X qlijtZ$;R - + @@ -85,6 +85,8 @@ + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index 8f0f1d96108c2bb7c738154e5049a7a1c1e23b29..5bc0ca5290beac172e9234d7a030846d4b13f7c1 100755 GIT binary patch delta 664 zcmXw0&rcIk5T5sT`@>+%Zhuf{O6#_Cw>6}i!fQ<-xK#qy4QWr6cn}&vN~N+0K}?KY zqLBj}svC`oG4bNX0|)EDghU#S9t|=60j7xuy?GJa^)2e*WoEu_X1q711 z=U)IQK;QU6X;lRP4gk+mYhPHpd&BwiXp+WdfatyQd}+@1^z0UZ^p*0dG6if+)&~%y z^)OJbu5DblvpkJu+HZPk`Fg4DcvJ+4Kd1a|wX~ta9NYmoeTl}WZk4L@y`jVJ*C;>* z&>MAmbqyFw!Jy~y`v+Yy>P>(Q7O?6QXvA`&6bHMIoq; zF*dmFfa^@3!|%W{V`UVQZSNb|rq*N*6k_HvR*bU)`GCu9u^N~`s7{pjrqSNtq)7-G ze&L9%(FKeq3rrKbpzrS_o**7dj$wkrqC}?=oXF-x5pURuy~1z;M_Bj`h3&mcWpBIC zfvKHzFyX|9&O|7+Gi74zG0QYf-^}Z1nN%nji{(P8jP}3Kyc-74d&T%wYX8k(gMI)@ zGDQS>3PembD%+1d)`(XiVUb|SuXHrEfV9!Y?LvNMaa18J-Bnf#`4ue7CSo!&Q8Y~< z`g!qnAp7mhi<$1xpU}mcs_RU2v(c53~cKuh_`MTj&oDz^F6; delta 406 zcmdlIu^?=MV*RQ2#~BzHWq{ZwJ+Ziefq_AQfq^LkNOPp;RHi-tcCQo2PhenBsmVx9 zOkwvw&db1{b_XbLmH`xCKfof&z@RPyouKs_3g@O41 zgAjux&_D}DLqQWYWkn@6Q9%(gV?}0Gc5_u>b4GJ!heH2<4*rFO{)`;QnCu)6{oVgx zl#wx;@c<)O^xpyhLdJdnrilLkyZ_L?|Jj?p6o0c!KB%TMd8zmuWk#U0m>3w&%y{@Q zp5Nvx12+p$fPvwX#6dS0J()wpoH1mxgN7O-Q03$dP4&ssHK)nO@m~@U5(pERCnzA8 YBsfd(mf!~=JD?tri6NW)w4N~n04y+TfdBvi diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index d5bc74071ceb1fb9c17b2bc85141299efb8aa372..68386425cca8521ea1d4c29b671055f69ab4db51 100755 GIT binary patch delta 737 zcmXw1&rcIU6n-$8{%zt-^crvx_Upl`#JmhD!~+I5T$(b=}`lv&FD(k37oG z=2p=7%u^&z*D(gmw{x@O$e}TL%i!Ptb-ggRu!ud}+&C&Wg;1D+I9R}HJRyUY#sm9- zV0g%a9#lcqG?lDVN=>1;-FdFn-e#w9&dOX!P$G|0mdWQyC<)7!;N4Ms~bU)VwS9btd8G|D)>zROkEoat)%K-7OR z6uRh-4(R_6;)MYPFvjHWYZy;zut5iaB@$I7yb7W+H?-{_E!Lo0QUkI|Aw6Hy3mKvh zO%*fg($tWq^4M#*e$$@#@$JQp=Al2(#4}g;GPs0YA4lV| z5+m92Lq#UktQngj#dxPQ7<-}TXYVv02(mCOycavgC2>pq?d)-$cNUx<@hJPgS-1;! OmZ$!CUFFx^pU6Kk)V8t! delta 460 zcmZpOd=n;C?(gQtz{mgu+Bpo|U|NBJX>uWx*hC%qdK(4?Mw`p0-XBj-EG}SRU|IrH zzyZYq={c2YK(RFp3@SAs{P^3w&WzN=6b1%$4WJq`5N7v3&YJ-g1d1g9`6?jHet<g@{@t;G_C;EtODVh=SIa*xrr4(i!~d70t#T9#894>n41a| zTL9DuRLHnW{>t09g8bqVpdWlD{^{lhDRg0QU|?lnnLLTnnwjGn@8nC2?vtgNoY-BZ z1R0na7=a$NncTp{xp^&9rd$LA!~X*;49o`@gcu}&23jy03Yw@XD=M*x3W|ssD>AdP zo2v?&Gnz9y6#D;j@GmU%XXH4>WaoJ3@BaUyjEvcg2N=Pk{|@*UGVc2~MfCsQ{fGYj z&)z&u@i)t4UUi+xAI0Y=gF=~!f#J-IhacnlZN4&avj7Dc7%oX1bc4~8Lp018LpJwl ys4)UnPTr!aKKZfcG}$=*O9DayVFL361q71>X9?aC{2*ip)B`dxWb-VoXN&;NRChH1 diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index f3e1c82702..3bea644daa 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -70,7 +70,7 @@ } &:hover { .label { - max-width: 150px; + max-width: 450px; width: auto; } .count { diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 3f7cc363b9..389cdf1490 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -2437,7 +2437,7 @@ label.checkbox.custom { opacity: 1; } /* line 72, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { - max-width: 150px; + max-width: 450px; width: auto; } /* line 76, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .count { @@ -4342,8 +4342,8 @@ span.req { /* line 128, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { - min-height: 300px; - height: 300px; } + min-height: 275px; + height: 275px; } @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 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 3ad64bc37f..54a9973a4e 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -2385,7 +2385,7 @@ label.checkbox.custom { opacity: 1; } /* line 72, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { - max-width: 150px; + max-width: 450px; width: auto; } /* line 76, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .count { @@ -4256,8 +4256,8 @@ span.req { /* line 128, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { - min-height: 300px; - height: 300px; } + min-height: 275px; + height: 275px; } @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 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html index 7c91fd8f1f..e3ad984087 100644 --- a/testing/dialogTest/res/dialog-launch.html +++ b/testing/dialogTest/res/dialog-launch.html @@ -1,6 +1,9 @@ - - Dialogs: - Known | - Unknown | - Error + + + + Dialogs: + Known | + Unknown | + Error + \ No newline at end of file From dbcad51325504479ae9f29c3b4b9db6a7bd7c6f3 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 7 Oct 2015 21:32:34 -0700 Subject: [PATCH 015/201] [Frontend] Tiny mod to dialog-launch.html open #159 open #170 --- testing/dialogTest/res/dialog-launch.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html index e3ad984087..1b117c2ebf 100644 --- a/testing/dialogTest/res/dialog-launch.html +++ b/testing/dialogTest/res/dialog-launch.html @@ -1,9 +1,9 @@ - Dialogs: Known | Unknown | Error + Dialogs \ No newline at end of file From 0ca9e5c95203b64281a6be977abe6d050feb4d95 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 8 Oct 2015 09:37:43 -0700 Subject: [PATCH 016/201] [Frontend] Message list initially working open #159 open #170 Thank you @akhenry; launchMessages function added to DialogLaunchController.js; New message-list.html template; message.html is now its own include; blocking-message.html renamed to overlay-blocking-message.html; --- platform/commonUI/dialog/bundle.json | 12 ++++- ...locking-message.html => message-list.html} | 14 +++--- .../dialog/res/templates/message.html | 22 +++++++++ .../templates/overlay-blocking-message.html | 25 ++++++++++ platform/commonUI/dialog/src/DialogService.js | 20 +++++++- testing/dialogTest/res/dialog-launch.html | 3 +- .../dialogTest/src/DialogLaunchController.js | 47 +++++++++++++++++++ 7 files changed, 132 insertions(+), 11 deletions(-) rename platform/commonUI/dialog/res/templates/{blocking-message.html => message-list.html} (66%) create mode 100644 platform/commonUI/dialog/res/templates/message.html create mode 100644 platform/commonUI/dialog/res/templates/overlay-blocking-message.html diff --git a/platform/commonUI/dialog/bundle.json b/platform/commonUI/dialog/bundle.json index eab8fb000a..87ef06f764 100644 --- a/platform/commonUI/dialog/bundle.json +++ b/platform/commonUI/dialog/bundle.json @@ -36,8 +36,16 @@ "templateUrl": "templates/dialog.html" }, { - "key": "blocking-message", - "templateUrl": "templates/blocking-message.html" + "key": "overlay-blocking-message", + "templateUrl": "templates/overlay-blocking-message.html" + }, + { + "key": "message", + "templateUrl": "templates/message.html" + }, + { + "key": "message-list", + "templateUrl": "templates/message-list.html" } ], "containers": [ diff --git a/platform/commonUI/dialog/res/templates/blocking-message.html b/platform/commonUI/dialog/res/templates/message-list.html similarity index 66% rename from platform/commonUI/dialog/res/templates/blocking-message.html rename to platform/commonUI/dialog/res/templates/message-list.html index 4f2caf3df5..67fbdb28d0 100644 --- a/platform/commonUI/dialog/res/templates/blocking-message.html +++ b/platform/commonUI/dialog/res/templates/message-list.html @@ -1,17 +1,17 @@ -
!
+
{{ngModel.dialog.title}}
{{ngModel.dialog.hint}}
-
- {{ngModel.dialog.actionText}} -
- +
    +
  • + Message: {{msg.title}} + +
    • +
!
+
+
+
Title: {{ngModel.dialog.title}}
+
{{ngModel.dialog.hint}}
+
+
+
+ {{ngModel.dialog.actionText}} +
+ +
+
+ + {{dialogAction.label}} + +
+
\ No newline at end of file diff --git a/platform/commonUI/dialog/res/templates/overlay-blocking-message.html b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html new file mode 100644 index 0000000000..a4d4dc7276 --- /dev/null +++ b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index 99d361cf81..836805304e 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -239,7 +239,7 @@ define( // Add the overlay using the OverlayService, which // will handle actual insertion into the DOM this.overlay = this.overlayService.createOverlay( - "blocking-message", + "overlay-blocking-message", {dialog: dialogModel}, "t-dialog-sm" ); @@ -253,6 +253,24 @@ define( }; + DialogService.prototype.showMessageList = function(dialogModel) { + if (this.canShowDialog(dialogModel)) { + // Add the overlay using the OverlayService, which + // will handle actual insertion into the DOM + this.overlay = this.overlayService.createOverlay( + "message-list", + {dialog: dialogModel}, + "t-dialog t-message-list" + ); + this.dialogVisible = true; + return true; + } else { + //Could not show a dialog, so return indication of this to + //client code. + return false; + } + + }; return DialogService; } diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html index 1b117c2ebf..2b01ca60bb 100644 --- a/testing/dialogTest/res/dialog-launch.html +++ b/testing/dialogTest/res/dialog-launch.html @@ -3,7 +3,8 @@ Known | Unknown | - Error + Error | + Messages Dialogs \ No newline at end of file diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js index 374e43a150..7f51a91329 100644 --- a/testing/dialogTest/src/DialogLaunchController.js +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -99,6 +99,53 @@ define( $log.error("Could not display modal dialog"); } }; + + $scope.launchMessages = function () { + var model = { + title: "Messages", + severity: messageSeverity.MESSAGES, + actions: [ + { + label: "Done", + action: function () { + $log.debug("Done pressed"); + dialogService.dismiss(); + } + } + ], + messages: [] + }; + + function createMessage (messageNumber) { + var messageModel = { + ngModel: { + dialog: { + title: "Message " + messageNumber, + severity: messageSeverity.INFO, + actions: [ + { + label: "Cancel Duplication", + action: function () { + $log.debug("Cancel Duplication pressed"); + $log.debug("Message should be dismissed"); + } + } + ] + } + } + }; + return messageModel; + } + + if (dialogService.showMessageList(model)) { + //Do processing here + for (var i = 0; i < 4; i++) { + model.messages.push(createMessage(i)); + } + } else { + $log.error("Could not display modal dialog"); + } + }; } return DialogLaunchController; } From 5ff90f7254ffc7a2fe75816cb5d8a64fe01e7178 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 11:03:48 -0700 Subject: [PATCH 017/201] Added more tests, some refactoring --- .../notification/src/NotificationService.js | 203 +++++++++++------- .../test/NotificationServiceSpec.js | 98 +++++++-- 2 files changed, 200 insertions(+), 101 deletions(-) diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 30e746cc42..46950440da 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -23,13 +23,61 @@ /** * This bundle implements the notification service, which can be used to - * show banner notifications to the user. + * show banner notifications to the user. Banner notifications + * are used to inform users of events in a non-intrusive way. As + * much as possible, notifications share a model with blocking + * dialogs so that the same information can be provided in a dialog + * and then minimized to a banner notification if needed. + * * @namespace platform/commonUI/dialog */ define( ["./MessageSeverity"], function (MessageSeverity) { "use strict"; + + /** + * A representation of a user action. Actions are provided to + * dialogs and notifications and are shown as buttons. + * + * @typedef {object} NotificationAction + * @property {string} label the label to appear on the button for + * this action + * @property {function} action a callback function to be invoked + * when the button is clicked + */ + + /** + * A representation of a banner notification. Banner notifications + * are used to inform users of events in a non-intrusive way. As + * much as possible, notifications share a model with blocking + * dialogs so that the same information can be provided in a dialog + * and then minimized to a banner notification if needed. + * + * @typedef {object} Notification + * @property {string} title The title of the message + * @property {number} progress The completion status of a task + * represented numerically + * @property {MessageSeverity} messageSeverity The importance of the + * message (eg. error, success) + * @property {boolean} unknownProgress a boolean indicating that the + * progress of the underlying task is unknown. This will result in a + * visually distinct progress bar. + * @property {boolean | number} autoDismiss If truthy, dialog will + * be automatically minimized or dismissed (depending on severity). + * Additionally, if the provided value is a number, it will be used + * as the delay period before being dismissed. + * @property {NotificationAction} primaryAction the default user + * response to + * this message. Will be represented as a button with the provided + * label and action. May be used by banner notifications to display + * only the most important option to users. + * @property {NotificationAction[]} additionalActions any additional + * actions + * that the user can take. Will be represented as additional buttons + * that may or may not be available from a banner. + */ + /** * The notification service is responsible for informing the user of * events via the use of banner notifications. @@ -41,69 +89,51 @@ define( this.$timeout = $timeout; this.DEFAULT_AUTO_DISMISS = DEFAULT_AUTO_DISMISS; - /** - * Exposes the current "active" notification. This is a - * notification that is of current highest importance that has - * not been dismissed. The deinition of what is of highest - * importance might be a little nuanced and require tweaking. - * For example, if an important error message is visible and a - * success message is triggered, it may be desirable to - * temporarily show the success message and then auto-dismiss it. - * @type {{notification: undefined}} + /* + * A context in which to hold the active notification and a + * handle to its timeout. */ this.active = { }; } - /** - var model = { - title: string, - progress: number, - severity: MessageSeverity, - unknownProgress: boolean, - minimized: boolean, - autoDismiss: boolean | number, - actions: { - label: string, - action: function - } - } - */ /** - * Possibly refactor this out to a provider? - * @constructor + * Returns the notification that is currently visible in the banner area + * @returns {Notification} */ - function Notification (model) { - this.model = model; - } - - Notification.prototype.minimize = function (setValue) { - if (typeof setValue !== undefined){ - this.model.minimized = setValue; - } else { - return this.model.minimized; - } - }; - NotificationService.prototype.getActiveNotification = function (){ return this.active.notification; } /** - * model = { - * - * } - * @param model + * A convenience method for success notifications. Notifications + * created via this method will be auto-dismissed after a default + * wait period + * @param {Notification} notification The notification to display */ - NotificationService.prototype.notify = function (model) { - var notification = new Notification(model), - that=this; + NotificationService.prototype.success = function (notification) { + notification.autoDismiss = notification.autoDismiss || true; + NotificationService.prototype.notify(notification); + } + + /** + * Notifies the user of an event. If there is a banner notification + * already active, then it will be dismissed or minimized automatically, + * and the provided notification displayed in its place. + * + * @param {Notification} notification The notification to display + */ + NotificationService.prototype.notify = function (notification) { + /*var notification = new Notification(model), + that=this; */ + var that = this; + this.notifications.push(notification); /* Check if there is already an active (ie. visible) notification */ if (!this.active.notification){ - setActiveNotification.call(this, notification); + this.setActiveNotification(notification); } else if (!this.active.timeout){ /* @@ -122,28 +152,42 @@ define( }; - function setActiveNotification (notification) { - var that = this; - this.active.notification = notification; - /* - If autoDismiss has been specified, setup a timeout to - dismiss the dialog. + /** + * Used internally by the NotificationService + * @private + */ + NotificationService.prototype.setActiveNotification = + function (notification) { - If there are other notifications pending in the queue, set this - one to auto-dismiss - */ - if (notification.model.autoDismiss - || selectNextNotification.call(this)) { - var timeout = isNaN(notification.model.autoDismiss) ? - this.DEFAULT_AUTO_DISMISS : notification.model.autoDismiss; + var that = this; + this.active.notification = notification; + /* + If autoDismiss has been specified, setup a timeout to + dismiss the dialog. - this.active.timeout = this.$timeout(function () { - that.dismissOrMinimize(notification); - }, timeout); - } - } + If there are other notifications pending in the queue, set this + one to auto-dismiss + */ + if (notification && (notification.autoDismiss + || this.selectNextNotification())) { + var timeout = isNaN(notification.autoDismiss) ? + this.DEFAULT_AUTO_DISMISS : + notification.autoDismiss; - function selectNextNotification () { + this.active.timeout = this.$timeout(function () { + that.dismissOrMinimize(notification); + }, timeout); + } else { + delete this.active.timeout; + } + }; + + /** + * Used internally by the NotificationService + * + * @private + */ + NotificationService.prototype.selectNextNotification = function () { /* Loop through the notifications queue and find the first one that has not already been minimized (manually or otherwise). @@ -151,7 +195,7 @@ define( for (var i=0; i< this.notifications.length; i++) { var notification = this.notifications[i]; - if (!notification.model.minimized + if (!notification.minimized && notification!= this.activeNotification) { return notification; @@ -162,8 +206,9 @@ define( /** * Minimize a notification. The notification will still be available * from the notification list. Typically notifications with a - * severity of SUCCESS should not be minimized, but rather - * dismissed. + * severity of 'success' should not be minimized, but rather + * dismissed. If you're not sure which is appropriate, + * use {@link NotificationService#dismissOrMinimize} * @see dismiss * @see dismissOrMinimize * @param notification @@ -172,19 +217,17 @@ define( //Check this is a known notification var index = this.notifications.indexOf(notification); if (index >= 0) { - notification.minimize(true); - delete this.active.notification; - delete this.active.timeout; - setActiveNotification.call(this, selectNextNotification.call(this)); + notification.minimized=true; + this.setActiveNotification(this.selectNextNotification()); } - } + }; /** - * Completely remove a notification. This will dismiss it from the + * Completely removes a notification. This will dismiss it from the * message banner and remove it from the list of notifications. - * Typically only notifications with a severity of SUCCESS should be + * Typically only notifications with a severity of success should be * dismissed. If you're not sure whether to dismiss or minimize a - * notification, use the dismissOrMinimize method. + * notification, use {@link NotificationService#dismissOrMinimize}. * dismiss * @see dismissOrMinimize * @param notification The notification to dismiss @@ -194,11 +237,7 @@ define( var index = this.notifications.indexOf(notification); if (index >= 0) { this.notifications.splice(index, 1); - - delete this.active.notification; - delete this.active.timeout; - - setActiveNotification.call(this, selectNextNotification.call(this)); + this.setActiveNotification(this.selectNextNotification()); } } @@ -210,7 +249,7 @@ define( * @param notification */ NotificationService.prototype.dismissOrMinimize = function (notification){ - if (notification.model.severity > MessageSeverity.SUCCESS){ + if (notification.severity > MessageSeverity.SUCCESS){ this.minimize(notification); } else { this.dismiss(notification); diff --git a/platform/commonUI/notification/test/NotificationServiceSpec.js b/platform/commonUI/notification/test/NotificationServiceSpec.js index c7a5fee234..c54ba08e38 100644 --- a/platform/commonUI/notification/test/NotificationServiceSpec.js +++ b/platform/commonUI/notification/test/NotificationServiceSpec.js @@ -30,24 +30,18 @@ define( var notificationService, mockTimeout, mockAutoDismiss, - successModel = { - title: "Mock Success Notification", - severity: MessageSeverity.SUCCESS - }, - errorModel = { - title: "Mock Error Notification", - severity: MessageSeverity.ERROR - }; + successModel, + errorModel; /** * 1) Calling .notify results in a new notification being created - * with the provided model and set to the active notification + * with the provided model and set to the active notification. DONE * * 2) Calling .notify with autoDismiss results in a SUCCESS notification - * becoming dismissed after timeout has elapsed + * becoming dismissed after timeout has elapsed DONE * * 3) Calling .notify with autoDismiss results in an ERROR notification - * being MINIMIZED after a timeout has elapsed + * being MINIMIZED after a timeout has elapsed DONE * * 4) Calling .notify with an active success notification results in that * notification being auto-dismissed, and the new notification becoming @@ -84,17 +78,49 @@ define( mockAutoDismiss = 0; notificationService = new NotificationService( mockTimeout, mockAutoDismiss); + successModel = { + title: "Mock Success Notification", + severity: MessageSeverity.SUCCESS + }; + errorModel = { + title: "Mock Error Notification", + severity: MessageSeverity.ERROR + }; }); - it("Calls the notification service with a new notification, making" + + it("gets a new success notification, making" + " the notification active", function() { var activeNotification; notificationService.notify(successModel); activeNotification = notificationService.getActiveNotification(); - expect(activeNotification.model).toBe(successModel); + expect(activeNotification).toBe(successModel); }); - describe(" called with multiple notifications", function(){ + it("gets a new success notification with" + + " numerical auto-dismiss specified. ", function() { + var activeNotification; + successModel.autoDismiss = 1000; + notificationService.notify(successModel); + activeNotification = notificationService.getActiveNotification(); + expect(activeNotification).toBe(successModel); + mockTimeout.mostRecentCall.args[0](); + activeNotification = notificationService.getActiveNotification(); + expect(activeNotification).toBeUndefined(); + }); + + it("gets a new notification with" + + " boolean auto-dismiss specified. ", function() { + var activeNotification; + successModel.autoDismiss = true; + notificationService.notify(successModel); + activeNotification = notificationService.getActiveNotification(); + expect(activeNotification).toBe(successModel); + mockTimeout.mostRecentCall.args[0](); + activeNotification = notificationService.getActiveNotification(); + expect(activeNotification).toBeUndefined(); + }); + + describe(" gets called with multiple notifications", function(){ it("auto-dismisses the previously active notification, making" + " the new notification active", function() { var activeNotification; @@ -103,14 +129,14 @@ define( activeNotification = notificationService.getActiveNotification(); //Initially expect the active notification to be success - expect(activeNotification.model).toBe(successModel); + expect(activeNotification).toBe(successModel); //Then notify of an error notificationService.notify(errorModel); //But it should be auto-dismissed and replaced with the // error notification mockTimeout.mostRecentCall.args[0](); activeNotification = notificationService.getActiveNotification(); - expect(activeNotification.model).toBe(errorModel); + expect(activeNotification).toBe(errorModel); }); it("auto-dismisses an active success notification, removing" + " it completely", function() { @@ -125,9 +151,9 @@ define( }); it("auto-minimizes an active error notification", function() { var activeNotification; - //First pre-load with a success message + //First pre-load with an error message notificationService.notify(errorModel); - //Then notify of an error + //Then notify of success notificationService.notify(successModel); expect(notificationService.notifications.length).toEqual(2); //Mock the auto-minimize @@ -137,8 +163,42 @@ define( expect(notificationService.notifications.length).toEqual(2); activeNotification = notificationService.getActiveNotification(); - expect(activeNotification.model).toBe(successModel); + expect(activeNotification).toBe(successModel); expect(errorModel.minimized).toEqual(true); + }); + it("auto-minimizes errors when a number of them arrive in" + + " short succession ", function() { + var activeNotification; + var error2 = { + title: "Second Mock Error Notification", + severity: MessageSeverity.ERROR + } + var error3 = { + title: "Third Mock Error Notification", + severity: MessageSeverity.ERROR + } + //First pre-load with a success message + notificationService.notify(errorModel); + //Then notify of a third error + notificationService.notify(error2); + notificationService.notify(error3); + expect(notificationService.notifications.length).toEqual(3); + //Mock the auto-minimize + mockTimeout.mostRecentCall.args[0](); + //Previous error message should be minimized, not + // dismissed + expect(notificationService.notifications.length).toEqual(3); + activeNotification = + notificationService.getActiveNotification(); + expect(activeNotification).toBe(error2); + expect(errorModel.minimized).toEqual(true); + + //Mock the second auto-minimize + mockTimeout.mostRecentCall.args[0](); + activeNotification = + notificationService.getActiveNotification(); + expect(activeNotification).toBe(error3); + expect(error2.minimized).toEqual(true); }); }); From af1fa6e77aec37277e5cb6601b1e2b1155d7c47e Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 11:13:32 -0700 Subject: [PATCH 018/201] added semicolons to test spec --- .../commonUI/notification/test/NotificationServiceSpec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/notification/test/NotificationServiceSpec.js b/platform/commonUI/notification/test/NotificationServiceSpec.js index c54ba08e38..96994f26d2 100644 --- a/platform/commonUI/notification/test/NotificationServiceSpec.js +++ b/platform/commonUI/notification/test/NotificationServiceSpec.js @@ -172,11 +172,11 @@ define( var error2 = { title: "Second Mock Error Notification", severity: MessageSeverity.ERROR - } + }; var error3 = { title: "Third Mock Error Notification", severity: MessageSeverity.ERROR - } + }; //First pre-load with a success message notificationService.notify(errorModel); //Then notify of a third error From e1e5919f686da2c28ee1413f73ccc4ea197ca404 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 13:08:43 -0700 Subject: [PATCH 019/201] Added some semicolons --- platform/commonUI/notification/src/MessageSeverity.js | 5 +++-- platform/commonUI/notification/src/NotificationService.js | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/notification/src/MessageSeverity.js b/platform/commonUI/notification/src/MessageSeverity.js index 5f17b917fe..39e8e6d8d0 100644 --- a/platform/commonUI/notification/src/MessageSeverity.js +++ b/platform/commonUI/notification/src/MessageSeverity.js @@ -1,9 +1,10 @@ /** * Created by akhenry on 10/7/15. */ +/*global define*/ define(function(){ return { SUCCESS: 0, ERROR: 1 - } -}) \ No newline at end of file + }; +}); \ No newline at end of file diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 46950440da..ecdb8d6ddd 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -103,7 +103,7 @@ define( */ NotificationService.prototype.getActiveNotification = function (){ return this.active.notification; - } + }; /** * A convenience method for success notifications. Notifications @@ -114,7 +114,7 @@ define( NotificationService.prototype.success = function (notification) { notification.autoDismiss = notification.autoDismiss || true; NotificationService.prototype.notify(notification); - } + }; /** * Notifies the user of an event. If there is a banner notification @@ -239,7 +239,7 @@ define( this.notifications.splice(index, 1); this.setActiveNotification(this.selectNextNotification()); } - } + }; /** * Depending on the severity of the notification will selectively From 0e840ae003dc2e52e8a7740c0e43dbb97b95a131 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 8 Oct 2015 13:09:41 -0700 Subject: [PATCH 020/201] [Frontend] Messages major work open #159 open #170 CSS, markup and JS test files initially complete; Templates renamed for consistency; message-type icons styled; Added severity constant "alert"; TO-DO: check refactored CSS against mobile, see what's broken; --- platform/commonUI/dialog/bundle.json | 5 +- .../dialog/res/templates/message-list.html | 24 - .../dialog/res/templates/message.html | 40 +- .../templates/overlay-blocking-message.html | 2 +- .../res/templates/overlay-message-list.html | 25 + platform/commonUI/dialog/src/DialogService.js | 6 +- .../commonUI/general/res/sass/_constants.scss | 2 +- .../general/res/sass/controls/_messages.scss | 94 ++- .../res/sass/mobile/overlay/_overlay.scss | 20 +- .../general/res/sass/overlay/_overlay.scss | 57 +- .../espresso/res/css/theme-espresso.css | 541 +++++++++++------- .../themes/espresso/res/sass/_constants.scss | 9 +- .../themes/snow/res/css/theme-snow.css | 421 +++++++++----- .../themes/snow/res/sass/_constants.scss | 7 +- .../dialogTest/src/DialogLaunchController.js | 70 ++- 15 files changed, 846 insertions(+), 477 deletions(-) delete mode 100644 platform/commonUI/dialog/res/templates/message-list.html create mode 100644 platform/commonUI/dialog/res/templates/overlay-message-list.html diff --git a/platform/commonUI/dialog/bundle.json b/platform/commonUI/dialog/bundle.json index 87ef06f764..8b53971d4a 100644 --- a/platform/commonUI/dialog/bundle.json +++ b/platform/commonUI/dialog/bundle.json @@ -4,6 +4,7 @@ { "key": "messageSeverity", "value": { + "ALERT": "alert", "ERROR": "error", "INFO": "info", "SUCCESS": "success" @@ -44,8 +45,8 @@ "templateUrl": "templates/message.html" }, { - "key": "message-list", - "templateUrl": "templates/message-list.html" + "key": "overlay-message-list", + "templateUrl": "templates/overlay-message-list.html" } ], "containers": [ diff --git a/platform/commonUI/dialog/res/templates/message-list.html b/platform/commonUI/dialog/res/templates/message-list.html deleted file mode 100644 index 67fbdb28d0..0000000000 --- a/platform/commonUI/dialog/res/templates/message-list.html +++ /dev/null @@ -1,24 +0,0 @@ - -
-
-
-
{{ngModel.dialog.title}}
-
{{ngModel.dialog.hint}}
-
-
-
    -
  • - Message: {{msg.title}} - -
    • -
-
-
- - {{dialogAction.label}} - -
-
- \ No newline at end of file diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index 709a71adbb..d9fe79edfe 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -1,22 +1,24 @@ -
!
-
-
-
Title: {{ngModel.dialog.title}}
-
{{ngModel.dialog.hint}}
-
-
-
- {{ngModel.dialog.actionText}} +
+
+
+
+
{{ngModel.dialog.title}}
+
{{ngModel.dialog.hint}}
+
+
+
+ {{ngModel.dialog.actionText}} message-severity-{{ngModel.dialog.severity}} +
+ +
+
+ + {{dialogAction.label}} +
- -
-
- - {{dialogAction.label}} -
\ No newline at end of file diff --git a/platform/commonUI/dialog/res/templates/overlay-blocking-message.html b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html index a4d4dc7276..17fdcf152c 100644 --- a/platform/commonUI/dialog/res/templates/overlay-blocking-message.html +++ b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - + \ No newline at end of file diff --git a/platform/commonUI/dialog/res/templates/overlay-message-list.html b/platform/commonUI/dialog/res/templates/overlay-message-list.html new file mode 100644 index 0000000000..550c0bcda2 --- /dev/null +++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html @@ -0,0 +1,25 @@ + +
+
+
{{ngModel.dialog.title}}
+
Displaying {{ngModel.dialog.messages.length}} messages +
+
+
+ + +
+
+ + {{dialogAction.label}} + +
+
+ \ No newline at end of file diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index 836805304e..2fc6f41a60 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -176,7 +176,7 @@ define( /** * dialogModel: { - * severity: string "error" | "info", + * severity: string "error" | "info" | "alert", * title: string, * hint: string, * actionText: string, @@ -258,9 +258,9 @@ define( // Add the overlay using the OverlayService, which // will handle actual insertion into the DOM this.overlay = this.overlayService.createOverlay( - "message-list", + "overlay-message-list", {dialog: dialogModel}, - "t-dialog t-message-list" + "t-dialog" ); this.dialogVisible = true; return true; diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 78c7c916dd..2c425493ea 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -47,7 +47,7 @@ $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; // Overlay $ovrTopBarH: 60px; -$ovrFooterH: 30px; +$ovrFooterH: 24px; $overlayMargin: 25px; // Items $ueBrowseGridItemLg: 200px; diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 3bea644daa..d537ee8ff1 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -161,18 +161,92 @@ } } -// Messages in overlays, as singleton or in list -.t-message .overlay { - // Singleton message overlay context - $iconW: 80px; - .type-icon.message-type.abs { - //color: pushBack($colorOvrFg, 40%); +@mixin messageBlock($iconW: 32px) { + .type-icon.message-type { + @include txtShdw($shdwStatusIc); + &:before { content:"\e608"; } + color: $colorStatusDefault; font-size: $iconW; - opacity: 0.5; - right: auto; + padding-left: 1px; width: $iconW; } - .message-contents.abs { - left: $iconW + $overlayMargin; + + .message-severity-info .type-icon.message-type { + &:before { content:"\e608"; } + color: $colorStatusOk; + } + .message-severity-alert .type-icon.message-type { + &:before { content:"\e610"; } + color: $colorStatusCaution; + } + .message-severity-error .type-icon.message-type { + &:before { content:"\21"; } + color: $colorStatusAlert; + } +} +/* Paths: + t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message > + message-type > (icon) + message-contents > + top-bar > + title + hint + editor > + (if displaying list of messages) + ul > li > l-message > + ... same as above + bottom-bar +*/ + +.l-message { + @include display-flex; + @include flex-direction(row); + .type-icon.message-type { + //@include test(red); + @include flex(0 1 auto); + position: relative; + } + .message-contents { + //@include test(blue); + @include flex(1 1 auto); + margin-left: $overlayMargin; + position: relative; + + .top-bar, + .message-body { + margin-bottom: $interiorMarginLg * 2; + } + } +} + + +// Message as singleton +.t-message-single { + @include messageBlock(80px); +} + +// Messages in list +.t-message-list { + @include messageBlock(32px); + .message-contents { + .l-message { + //border-bottom: 1px solid pullForward($colorOvrBg, 20%); + @include border-radius($controlCr); + background: rgba($colorOvrFg, 0.1); + margin-bottom: $interiorMargin; + margin-right: $interiorMarginLg; + padding: $interiorMarginLg; + + .message-contents { + font-size: 0.9em; + .message-action { color: pushBack($colorOvrFg, 20%); } + .bottom-bar { text-align: left; } + } + + .top-bar, + .message-body { + margin-bottom: $interiorMarginLg; + } + } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss index af0380a12b..9fe624b2fd 100644 --- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss @@ -52,15 +52,17 @@ } } } - - .contents .top-bar, - .contents .editor, - .contents .bottom-bar { - //@include test(orange); - top: auto; right: auto; bottom: auto; left: auto; - height: auto; width: auto; - margin-bottom: $interiorMarginLg * 2; - position: relative; + + .contents { + .top-bar, + .editor, + .bottom-bar { + //@include test(orange); + top: auto; right: auto; bottom: auto; left: auto; + height: auto; width: auto; + margin-bottom: $interiorMarginLg * 2; + position: relative; + } } } .t-dialog-sm .overlay > .holder { diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 4790d59768..305534c0d0 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -20,6 +20,7 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .overlay { + font-size: 90%; .blocker { background: $colorOvrBlocker; z-index: 100; @@ -56,6 +57,12 @@ right: $m; bottom: $m; left: $m; + + //.top-bar, + //.editor, + //.bottom-bar { + // @include absPosDefault(); + //} } } @@ -70,11 +77,12 @@ color: pushBack($colorOvrFg, 20%); } - .top-bar { + .abs.top-bar { height: $ovrTopBarH; } - .editor { + .abs.editor, + .abs.message-body { top: $ovrTopBarH + ($interiorMargin * 2); bottom: $ovrFooterH + $interiorMargin * 2; left: 0; @@ -87,23 +95,7 @@ } } - .l-progress-bar { - $h: $progressBarHOverlay; - display: block; - height: $h; - line-height: $h; - margin: .5em 0; - width: 100%; - } - .bottom-bar { - top: auto; - right: 0; - bottom: 0; - left: 0; - overflow: visible; - //font-size: 1em; - height: $ovrFooterH; text-align: right; .s-btn { $bg: $colorOvrBtnBg; @@ -115,13 +107,30 @@ line-height: $ovrFooterH; margin-left: $interiorMargin; padding: 0 $interiorMargin * 3; - //&.major { - // @extend .s-btn.major; - // &:hover { - // @extend .s-btn.major:hover; - // } - //} + &:first-child { + margin-left: 0; + } } + + } + + .abs.bottom-bar { + top: auto; + right: 0; + bottom: 0; + left: 0; + overflow: visible; + //font-size: 1em; + height: $ovrFooterH; + } + + .l-progress-bar { + $h: $progressBarHOverlay; + display: block; + height: $h; + line-height: $h; + margin: .5em 0; + width: 100%; } } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 389cdf1490..1d4d0e0e79 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -600,10 +600,10 @@ mct-container { color: #0099cc; } /* line 34, ../../../../general/res/sass/_icons.scss */ .ui-symbol.icon.alert { - color: #ff3c00; } + color: #ff533a; } /* line 36, ../../../../general/res/sass/_icons.scss */ .ui-symbol.icon.alert:hover { - color: #ff8a66; } + color: #ffaca0; } /* line 40, ../../../../general/res/sass/_icons.scss */ .ui-symbol.icon.major { font-size: 1.65em; } @@ -637,7 +637,7 @@ mct-container { display: none !important; } /* line 76, ../../../../general/res/sass/_icons.scss */ .l-icon-alert:before { - color: #ff3c00; + color: #ff533a; content: "!"; } /* line 13, ../../../../general/res/sass/_limits.scss */ @@ -827,9 +827,9 @@ mct-container { /* line 150, ../../../../general/res/sass/helpers/_bubbles.scss */ .s-infobubble { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; @@ -1198,9 +1198,9 @@ mct-container { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 1.5px; - -webkit-border-radius: 1.5px; - border-radius: 1.5px; + -moz-border-radius: 2.25px; + -webkit-border-radius: 2.25px; + border-radius: 2.25px; -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; -webkit-transition: background-color 0.25s; @@ -1556,9 +1556,9 @@ mct-container { margin-top: 0; } /* line 29, ../../../../general/res/sass/controls/_controls.scss */ .accordion .accordion-head { - -moz-border-radius: 1.5px; - -webkit-border-radius: 1.5px; - border-radius: 1.5px; + -moz-border-radius: 2.25px; + -webkit-border-radius: 2.25px; + border-radius: 2.25px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1651,9 +1651,9 @@ label.checkbox.custom { min-width: 14px; } /* line 127, ../../../../general/res/sass/controls/_controls.scss */ label.checkbox.custom em:before { - -moz-border-radius: 1.5px; - -webkit-border-radius: 1.5px; - border-radius: 1.5px; + -moz-border-radius: 2.25px; + -webkit-border-radius: 2.25px; + border-radius: 2.25px; background: #4d4d4d; -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; @@ -1838,24 +1838,24 @@ label.checkbox.custom { /* line 309, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; -webkit-box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; box-shadow: inset rgba(0, 0, 0, 0.3) 0 1px 4px; background: rgba(0, 0, 0, 0.1); } /* line 314, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar .progress-amt { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; - -moz-border-radius: 1px; - -webkit-border-radius: 1px; - border-radius: 1px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; -moz-transition-property: width; -o-transition-property: width; -webkit-transition-property: width; @@ -2165,9 +2165,9 @@ label.checkbox.custom { position: relative; } /* line 70, ../../../../general/res/sass/controls/_menus.scss */ .menu-element .menu { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; background-color: #6e6e6e; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2399,10 +2399,10 @@ label.checkbox.custom { margin-right: 3px; } /* line 54, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator { - color: #60e68e; } + color: #44ba53; } /* line 57, ../../../../general/res/sass/controls/_messages.scss */ .status.block.caution .status-indicator { - color: #ffa864; } + color: #ff8545; } /* line 60, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; @@ -2446,14 +2446,14 @@ label.checkbox.custom { /* Styles for messages and message banners */ /* line 84, ../../../../general/res/sass/controls/_messages.scss */ .message.block { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; padding: 10px; } /* line 88, ../../../../general/res/sass/controls/_messages.scss */ .message.error { - background-color: rgba(255, 60, 0, 0.3); - color: #ff8a66; } + background-color: rgba(255, 83, 58, 0.3); + color: #ffaca0; } /* line 94, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { @@ -2548,9 +2548,9 @@ label.checkbox.custom { color: inherit; } /* line 147, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; } + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } /* line 150, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } @@ -2559,40 +2559,145 @@ label.checkbox.custom { opacity: 1; } /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok { - background-color: #189543; + background-color: #1b4a21; color: #ccc; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok:hover { - background-color: #1ec256; } + background-color: #296f32; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action { - background-color: #11692f; } + background-color: #0d2510; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover { - background-color: #189543; } + background-color: #1b4a21; } /* line 159, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution { - background-color: #ca5900; + background-color: #ab3b00; color: #ccc; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution:hover { - background-color: #fd6f00; } + background-color: #de4c00; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action { - background-color: #974200; } + background-color: #782900; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover { - background-color: #ca5900; } + background-color: #ab3b00; } -/* line 168, ../../../../general/res/sass/controls/_messages.scss */ -.t-message .overlay .type-icon.message-type.abs, .t-message .overlay .s-menu span.type-icon.message-type.l-click-area, .s-menu .t-message .overlay span.type-icon.message-type.l-click-area { +/* Paths: + t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message > + message-type > (icon) + message-contents > + top-bar > + title + hint + editor > + (if displaying list of messages) + ul > li > l-message > + ... same as above + bottom-bar +*/ +/* line 201, ../../../../general/res/sass/controls/_messages.scss */ +.l-message { + display: -webkit-flex; + display: flex; + -webkit-flex-direction: row; + flex-direction: row; } + /* line 204, ../../../../general/res/sass/controls/_messages.scss */ + .l-message .type-icon.message-type { + -webkit-flex: 0 1 auto; + flex: 0 1 auto; + position: relative; } + /* line 209, ../../../../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 215, ../../../../general/res/sass/controls/_messages.scss */ + .l-message .message-contents .top-bar, + .l-message .message-contents .message-body { + margin-bottom: 20px; } + +/* line 165, ../../../../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; - opacity: 0.5; - right: auto; + padding-left: 1px; width: 80px; } -/* line 175, ../../../../general/res/sass/controls/_messages.scss */ -.t-message .overlay .message-contents.abs, .t-message .overlay .s-menu span.message-contents.l-click-area, .s-menu .t-message .overlay span.message-contents.l-click-area { - left: 105px; } + /* line 167, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .type-icon.message-type:before { + content: "\e608"; } +/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-single .message-severity-info .type-icon.message-type { + color: #44ba53; } + /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .message-severity-info .type-icon.message-type:before { + content: "\e608"; } +/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-single .message-severity-alert .type-icon.message-type { + color: #ff8545; } + /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .message-severity-alert .type-icon.message-type:before { + content: "\e610"; } +/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-single .message-severity-error .type-icon.message-type { + color: #ff533a; } + /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .message-severity-error .type-icon.message-type:before { + content: "\21"; } + +/* line 165, ../../../../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-left: 1px; + width: 32px; } + /* line 167, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .type-icon.message-type:before { + content: "\e608"; } +/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-severity-info .type-icon.message-type { + color: #44ba53; } + /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-severity-info .type-icon.message-type:before { + content: "\e608"; } +/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-severity-alert .type-icon.message-type { + color: #ff8545; } + /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-severity-alert .type-icon.message-type:before { + content: "\e610"; } +/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-severity-error .type-icon.message-type { + color: #ff533a; } + /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-severity-error .type-icon.message-type:before { + content: "\21"; } +/* line 232, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-contents .l-message { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: rgba(230, 230, 230, 0.1); + margin-bottom: 5px; + margin-right: 10px; + padding: 10px; } + /* line 240, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message .message-contents { + font-size: 0.9em; } + /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message .message-contents .message-action { + color: #b3b3b3; } + /* line 243, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message .message-contents .bottom-bar { + text-align: left; } + /* line 246, ../../../../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; } /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { @@ -2749,9 +2854,9 @@ label.checkbox.custom { *****************************************************************************/ /* line 22, ../../../../general/res/sass/forms/_elems.scss */ .section-header { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; background: rgba(0, 0, 0, 0.2); color: #cccccc; font-size: 0.8em; @@ -2876,9 +2981,9 @@ label.form-control.checkbox input { vertical-align: top; } /* line 156, ../../../../general/res/sass/forms/_elems.scss */ .l-result div.s-hint { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; background: rgba(255, 51, 0, 0.8); display: block; color: #ffad99; @@ -4100,9 +4205,9 @@ span.req { visibility: visible; } /* line 178, ../../../../general/res/sass/search/_search.scss */ .search .active-filter-display { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -4195,152 +4300,166 @@ span.req { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 23, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .blocker { - background: rgba(0, 0, 0, 0.7); - z-index: 100; } -/* line 27, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .clk-icon.close { - font-size: 0.8rem; - position: absolute; - top: 10px; - right: 10px; - bottom: auto; - left: auto; - z-index: 100; } -/* line 36, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay > .holder { - background-color: #4d4d4d; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #e6e6e6; - display: inline-block; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#595959, #4d4d4d); - background-image: -webkit-linear-gradient(#595959, #4d4d4d); - background-image: linear-gradient(#595959, #4d4d4d); - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; - color: #e6e6e6; - top: 50%; - right: auto; - bottom: auto; - left: 50%; - -moz-transform: translateX(-50%) translateY(-50%); - -ms-transform: translateX(-50%) translateY(-50%); - -webkit-transform: translateX(-50%) translateY(-50%); - transform: translateX(-50%) translateY(-50%); - height: 70%; - width: 50%; - min-height: 300px; - max-height: 800px; - min-width: 600px; - max-width: 1000px; - z-index: 101; } - /* line 53, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay > .holder > .contents { - top: 25px; - right: 25px; - bottom: 25px; - left: 25px; } -/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .title { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 1.2em; - line-height: 120%; - margin-bottom: 5px; } -/* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .hint { - color: #b3b3b3; } -/* line 73, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .top-bar { - height: 60px; } -/* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .editor { - top: 70px; - bottom: 40px; - left: 0; - right: 0; - overflow: auto; } +/* line 22, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay { + font-size: 90%; } + /* line 24, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .blocker { + background: rgba(0, 0, 0, 0.7); + z-index: 100; } + /* line 28, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .clk-icon.close { + font-size: 0.8rem; + position: absolute; + top: 10px; + right: 10px; + bottom: auto; + left: auto; + z-index: 100; } + /* line 37, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay > .holder { + background-color: #4d4d4d; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #e6e6e6; + display: inline-block; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); + background-image: -moz-linear-gradient(#595959, #4d4d4d); + background-image: -webkit-linear-gradient(#595959, #4d4d4d); + background-image: linear-gradient(#595959, #4d4d4d); + -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -moz-border-radius: 9px; + -webkit-border-radius: 9px; + border-radius: 9px; + color: #e6e6e6; + top: 50%; + right: auto; + bottom: auto; + left: 50%; + -moz-transform: translateX(-50%) translateY(-50%); + -ms-transform: translateX(-50%) translateY(-50%); + -webkit-transform: translateX(-50%) translateY(-50%); + transform: translateX(-50%) translateY(-50%); + height: 70%; + width: 50%; + min-height: 300px; + max-height: 800px; + min-width: 600px; + max-width: 1000px; + z-index: 101; } + /* line 54, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay > .holder > .contents { + top: 25px; + right: 25px; + bottom: 25px; + left: 25px; } + /* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 1.2em; + line-height: 120%; + margin-bottom: 5px; } + /* line 76, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .hint { + color: #b3b3b3; } + /* line 80, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .abs.top-bar, .overlay .s-menu span.top-bar.l-click-area, .s-menu .overlay span.top-bar.l-click-area { + height: 60px; } /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .editor .field.l-med input[type='text'] { + .overlay .abs.editor, .overlay .s-menu span.editor.l-click-area, .s-menu .overlay span.editor.l-click-area, + .overlay .abs.message-body, + .overlay .s-menu span.message-body.l-click-area, + .s-menu .overlay span.message-body.l-click-area { + top: 70px; + bottom: 34px; + left: 0; + right: 0; + overflow: auto; } + /* line 92, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .abs.editor .field.l-med input[type='text'], .overlay .s-menu span.editor.l-click-area .field.l-med input[type='text'], .s-menu .overlay span.editor.l-click-area .field.l-med input[type='text'], + .overlay .abs.message-body .field.l-med input[type='text'], + .overlay .s-menu span.message-body.l-click-area .field.l-med input[type='text'], + .s-menu .overlay span.message-body.l-click-area .field.l-med input[type='text'] { + width: 100%; } + /* line 98, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar { + text-align: right; } + /* line 100, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { + font-size: 95%; + height: 24px; + line-height: 24px; + margin-left: 5px; + padding: 0 15px; } + /* line 102, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { + background-color: gray; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #fff; + display: inline-block; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzhjOGM4YyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8c8c8c), color-stop(100%, #808080)); + background-image: -moz-linear-gradient(#8c8c8c, #808080); + background-image: -webkit-linear-gradient(#8c8c8c, #808080); + background-image: linear-gradient(#8c8c8c, #808080); + -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -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.3) 0 1px 1px; } + /* line 289, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { + color: #fff; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 294, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { + background: linear-gradient(#a6a6a6, #999999); } + /* line 296, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { + color: white; } } + /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn:first-child, .overlay .bottom-bar .s-menu:first-child { + margin-left: 0; } + /* line 117, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .abs.bottom-bar, .overlay .s-menu span.bottom-bar.l-click-area, .s-menu .overlay span.bottom-bar.l-click-area { + top: auto; + right: 0; + bottom: 0; + left: 0; + overflow: visible; + height: 24px; } + /* line 127, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .l-progress-bar { + display: block; + height: 15px; + line-height: 15px; + margin: .5em 0; width: 100%; } -/* line 90, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .l-progress-bar { - display: block; - height: 15px; - line-height: 15px; - margin: .5em 0; - width: 100%; } -/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .bottom-bar { - top: auto; - right: 0; - bottom: 0; - left: 0; - overflow: visible; - height: 30px; - text-align: right; } - /* line 108, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { - font-size: 95%; - height: 30px; - line-height: 30px; - margin-left: 5px; - padding: 0 15px; } - /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { - background-color: gray; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #fff; - display: inline-block; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzhjOGM4YyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8c8c8c), color-stop(100%, #808080)); - background-image: -moz-linear-gradient(#8c8c8c, #808080); - background-image: -webkit-linear-gradient(#8c8c8c, #808080); - background-image: linear-gradient(#8c8c8c, #808080); - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -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.3) 0 1px 1px; } - /* line 289, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { - color: #fff; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 294, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { - background: linear-gradient(#a6a6a6, #999999); } - /* line 296, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { - color: white; } } -/* line 128, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 137, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { min-height: 275px; height: 275px; } @@ -4393,7 +4512,7 @@ span.req { /* line 50, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .editor .form .form-row > .label:after { float: none; } - /* line 56, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 57, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .top-bar, .overlay > .holder .contents .editor, .overlay > .holder .contents .bottom-bar { @@ -4406,12 +4525,12 @@ span.req { margin-bottom: 20px; position: relative; } - /* line 66, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 68, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { height: auto; max-height: 100%; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 74, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 76, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .bottom-bar { text-align: center; } } /***************************************************************************** @@ -4462,9 +4581,9 @@ ul.tree { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; -webkit-transition: background-color 0.25s; @@ -4524,7 +4643,7 @@ ul.tree { /* line 90, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .type-icon .icon.l-icon-alert, .search-result-item .label .type-icon .icon.l-icon-alert { - color: #ff3c00; + color: #ff533a; font-size: 8px; line-height: 8px; height: 8px; diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index c5a8e30456..1a9f5b4ed0 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -8,7 +8,7 @@ $colorKeySelectedBg: #005177; $colorKeyFg: #fff; $colorInteriorBorder: rgba($colorBodyFg, 0.1); $contrastRatioPercent: 7%; -$basicCr: 2px; +$basicCr: 3px; $controlCr: 3px; $smallCr: 2px; @@ -23,7 +23,7 @@ $contrastInvokeMenuPercent: 20%; // General Colors $colorAlt1: #ffc700; -$colorAlert: #ff3c00; +$colorAlert: #ff533a; $colorIconLink: #49dedb; $colorPausedBg: #c56f01; $colorPausedFg: #fff; @@ -61,13 +61,14 @@ $colorInputIcon: pushBack($colorBodyFg, 15%); // Status colors, mainly used for messaging and item ancillary symbols $colorStatusFg: #ccc; $colorStatusDefault: #ccc; -$colorStatusOk: #60e68e; -$colorStatusCaution: #ffa864; +$colorStatusOk: #44ba53; +$colorStatusCaution: #ff8545; $colorStatusAlert: $colorAlert; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: $colorKey; $progressBarHOverlay: 15px; $progressBarStripeW: 20px; +$shdwStatusIc: rgba(black, 0.4) 0 1px 2px; // Selects $colorSelectBg: $colorBtnBg; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 54a9973a4e..5db2792f52 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -600,10 +600,10 @@ mct-container { color: #0099cc; } /* line 34, ../../../../general/res/sass/_icons.scss */ .ui-symbol.icon.alert { - color: #ff3c00; } + color: #ff533a; } /* line 36, ../../../../general/res/sass/_icons.scss */ .ui-symbol.icon.alert:hover { - color: #ff8a66; } + color: #ffaca0; } /* line 40, ../../../../general/res/sass/_icons.scss */ .ui-symbol.icon.major { font-size: 1.65em; } @@ -637,7 +637,7 @@ mct-container { display: none !important; } /* line 76, ../../../../general/res/sass/_icons.scss */ .l-icon-alert:before { - color: #ff3c00; + color: #ff533a; content: "!"; } /* line 13, ../../../../general/res/sass/_limits.scss */ @@ -2347,10 +2347,10 @@ label.checkbox.custom { margin-right: 3px; } /* line 54, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator { - color: #60e68e; } + color: #44ba53; } /* line 57, ../../../../general/res/sass/controls/_messages.scss */ .status.block.caution .status-indicator { - color: #ffa864; } + color: #ff8545; } /* line 60, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; @@ -2400,8 +2400,8 @@ label.checkbox.custom { padding: 10px; } /* line 88, ../../../../general/res/sass/controls/_messages.scss */ .message.error { - background-color: rgba(255, 60, 0, 0.3); - color: #ff8a66; } + background-color: rgba(255, 83, 58, 0.3); + color: #ffaca0; } /* line 94, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { @@ -2507,40 +2507,145 @@ label.checkbox.custom { opacity: 1; } /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok { - background-color: #189543; + background-color: #1b4a21; color: #fff; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok:hover { - background-color: #1ec256; } + background-color: #296f32; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action { - background-color: #11692f; } + background-color: #0d2510; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover { - background-color: #189543; } + background-color: #1b4a21; } /* line 159, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution { - background-color: #ca5900; + background-color: #ab3b00; color: #fff; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution:hover { - background-color: #fd6f00; } + background-color: #de4c00; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action { - background-color: #974200; } + background-color: #782900; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover { - background-color: #ca5900; } + background-color: #ab3b00; } -/* line 168, ../../../../general/res/sass/controls/_messages.scss */ -.t-message .overlay .type-icon.message-type.abs, .t-message .overlay .s-menu span.type-icon.message-type.l-click-area, .s-menu .t-message .overlay span.type-icon.message-type.l-click-area { +/* Paths: + t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message > + message-type > (icon) + message-contents > + top-bar > + title + hint + editor > + (if displaying list of messages) + ul > li > l-message > + ... same as above + bottom-bar +*/ +/* line 201, ../../../../general/res/sass/controls/_messages.scss */ +.l-message { + display: -webkit-flex; + display: flex; + -webkit-flex-direction: row; + flex-direction: row; } + /* line 204, ../../../../general/res/sass/controls/_messages.scss */ + .l-message .type-icon.message-type { + -webkit-flex: 0 1 auto; + flex: 0 1 auto; + position: relative; } + /* line 209, ../../../../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 215, ../../../../general/res/sass/controls/_messages.scss */ + .l-message .message-contents .top-bar, + .l-message .message-contents .message-body { + margin-bottom: 20px; } + +/* line 165, ../../../../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; - opacity: 0.5; - right: auto; + padding-left: 1px; width: 80px; } -/* line 175, ../../../../general/res/sass/controls/_messages.scss */ -.t-message .overlay .message-contents.abs, .t-message .overlay .s-menu span.message-contents.l-click-area, .s-menu .t-message .overlay span.message-contents.l-click-area { - left: 105px; } + /* line 167, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .type-icon.message-type:before { + content: "\e608"; } +/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-single .message-severity-info .type-icon.message-type { + color: #44ba53; } + /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .message-severity-info .type-icon.message-type:before { + content: "\e608"; } +/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-single .message-severity-alert .type-icon.message-type { + color: #ff8545; } + /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .message-severity-alert .type-icon.message-type:before { + content: "\e610"; } +/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-single .message-severity-error .type-icon.message-type { + color: #ff533a; } + /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .message-severity-error .type-icon.message-type:before { + content: "\21"; } + +/* line 165, ../../../../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-left: 1px; + width: 32px; } + /* line 167, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .type-icon.message-type:before { + content: "\e608"; } +/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-severity-info .type-icon.message-type { + color: #44ba53; } + /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-severity-info .type-icon.message-type:before { + content: "\e608"; } +/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-severity-alert .type-icon.message-type { + color: #ff8545; } + /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-severity-alert .type-icon.message-type:before { + content: "\e610"; } +/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-severity-error .type-icon.message-type { + color: #ff533a; } + /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-severity-error .type-icon.message-type:before { + content: "\21"; } +/* line 232, ../../../../general/res/sass/controls/_messages.scss */ +.t-message-list .message-contents .l-message { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background: rgba(102, 102, 102, 0.1); + margin-bottom: 5px; + margin-right: 10px; + padding: 10px; } + /* line 240, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message .message-contents { + font-size: 0.9em; } + /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message .message-contents .message-action { + color: #999999; } + /* line 243, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message .message-contents .bottom-bar { + text-align: left; } + /* line 246, ../../../../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; } /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { @@ -4127,134 +4232,148 @@ span.req { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 23, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .blocker { - background: rgba(0, 0, 0, 0.7); - z-index: 100; } -/* line 27, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .clk-icon.close { - font-size: 0.8rem; - position: absolute; - top: 10px; - right: 10px; - bottom: auto; - left: auto; - z-index: 100; } -/* line 36, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay > .holder { - background-color: #fcfcfc; - -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: #666; - display: inline-block; - -moz-border-radius: 12px; - -webkit-border-radius: 12px; - border-radius: 12px; - color: #666; - top: 50%; - right: auto; - bottom: auto; - left: 50%; - -moz-transform: translateX(-50%) translateY(-50%); - -ms-transform: translateX(-50%) translateY(-50%); - -webkit-transform: translateX(-50%) translateY(-50%); - transform: translateX(-50%) translateY(-50%); - height: 70%; - width: 50%; - min-height: 300px; - max-height: 800px; - min-width: 600px; - max-width: 1000px; - z-index: 101; } - /* line 53, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay > .holder > .contents { - top: 25px; - right: 25px; - bottom: 25px; - left: 25px; } -/* line 62, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .title { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 1.2em; - line-height: 120%; - margin-bottom: 5px; } -/* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .hint { - color: #999999; } -/* line 73, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .top-bar { - height: 60px; } -/* line 77, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .editor { - top: 70px; - bottom: 40px; - left: 0; - right: 0; - overflow: auto; } +/* line 22, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay { + font-size: 90%; } + /* line 24, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .blocker { + background: rgba(0, 0, 0, 0.7); + z-index: 100; } + /* line 28, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .clk-icon.close { + font-size: 0.8rem; + position: absolute; + top: 10px; + right: 10px; + bottom: auto; + left: auto; + z-index: 100; } + /* line 37, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay > .holder { + background-color: #fcfcfc; + -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: #666; + display: inline-block; + -moz-border-radius: 12px; + -webkit-border-radius: 12px; + border-radius: 12px; + color: #666; + top: 50%; + right: auto; + bottom: auto; + left: 50%; + -moz-transform: translateX(-50%) translateY(-50%); + -ms-transform: translateX(-50%) translateY(-50%); + -webkit-transform: translateX(-50%) translateY(-50%); + transform: translateX(-50%) translateY(-50%); + height: 70%; + width: 50%; + min-height: 300px; + max-height: 800px; + min-width: 600px; + max-width: 1000px; + z-index: 101; } + /* line 54, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay > .holder > .contents { + top: 25px; + right: 25px; + bottom: 25px; + left: 25px; } + /* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 1.2em; + line-height: 120%; + margin-bottom: 5px; } + /* line 76, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .hint { + color: #999999; } + /* line 80, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .abs.top-bar, .overlay .s-menu span.top-bar.l-click-area, .s-menu .overlay span.top-bar.l-click-area { + height: 60px; } /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .editor .field.l-med input[type='text'] { + .overlay .abs.editor, .overlay .s-menu span.editor.l-click-area, .s-menu .overlay span.editor.l-click-area, + .overlay .abs.message-body, + .overlay .s-menu span.message-body.l-click-area, + .s-menu .overlay span.message-body.l-click-area { + top: 70px; + bottom: 34px; + left: 0; + right: 0; + overflow: auto; } + /* line 92, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .abs.editor .field.l-med input[type='text'], .overlay .s-menu span.editor.l-click-area .field.l-med input[type='text'], .s-menu .overlay span.editor.l-click-area .field.l-med input[type='text'], + .overlay .abs.message-body .field.l-med input[type='text'], + .overlay .s-menu span.message-body.l-click-area .field.l-med input[type='text'], + .s-menu .overlay span.message-body.l-click-area .field.l-med input[type='text'] { + width: 100%; } + /* line 98, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar { + text-align: right; } + /* line 100, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { + font-size: 95%; + height: 24px; + line-height: 24px; + margin-left: 5px; + padding: 0 15px; } + /* line 102, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { + background-color: #969696; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + 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 289, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { + color: #fff; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 294, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { + background: #7d7d7d; } + /* line 296, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { + color: white; } } + /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn:first-child, .overlay .bottom-bar .s-menu:first-child { + margin-left: 0; } + /* line 117, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .abs.bottom-bar, .overlay .s-menu span.bottom-bar.l-click-area, .s-menu .overlay span.bottom-bar.l-click-area { + top: auto; + right: 0; + bottom: 0; + left: 0; + overflow: visible; + height: 24px; } + /* line 127, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .l-progress-bar { + display: block; + height: 15px; + line-height: 15px; + margin: .5em 0; width: 100%; } -/* line 90, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .l-progress-bar { - display: block; - height: 15px; - line-height: 15px; - margin: .5em 0; - width: 100%; } -/* line 99, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .bottom-bar { - top: auto; - right: 0; - bottom: 0; - left: 0; - overflow: visible; - height: 30px; - text-align: right; } - /* line 108, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu { - font-size: 95%; - height: 30px; - line-height: 30px; - margin-left: 5px; - padding: 0 15px; } - /* line 110, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu:not(.major) { - background-color: #969696; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - 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 289, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu:not(.major) .icon { - color: #fff; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 294, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover { - background: #7d7d7d; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major):not(.disabled):hover > .icon, .overlay .bottom-bar .s-menu:not(.major):not(.disabled):hover > .icon { - color: white; } } -/* line 128, ../../../../general/res/sass/overlay/_overlay.scss */ +/* line 137, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { min-height: 275px; height: 275px; } @@ -4307,7 +4426,7 @@ span.req { /* line 50, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .editor .form .form-row > .label:after { float: none; } - /* line 56, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 57, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .top-bar, .overlay > .holder .contents .editor, .overlay > .holder .contents .bottom-bar { @@ -4320,12 +4439,12 @@ span.req { margin-bottom: 20px; position: relative; } - /* line 66, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 68, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { height: auto; max-height: 100%; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 74, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 76, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .bottom-bar { text-align: center; } } /***************************************************************************** @@ -4437,7 +4556,7 @@ ul.tree { /* line 90, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .type-icon .icon.l-icon-alert, .search-result-item .label .type-icon .icon.l-icon-alert { - color: #ff3c00; + color: #ff533a; font-size: 8px; line-height: 8px; height: 8px; diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index cd13385d6b..ea9d8437f5 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -23,7 +23,7 @@ $contrastInvokeMenuPercent: 40%; // General Colors $colorAlt1: #ff6600; -$colorAlert: #ff3c00; +$colorAlert: #ff533a; $colorIconLink: #49dedb; $colorPausedBg: #ff9900; $colorPausedFg: #fff; @@ -61,13 +61,14 @@ $colorInputIcon: pushBack($colorBodyFg, 25%); // Status colors, mainly used for messaging and item ancillary symbols $colorStatusFg: #fff; $colorStatusDefault: #ccc; -$colorStatusOk: #60e68e; -$colorStatusCaution: #ffa864; +$colorStatusOk: #44ba53; +$colorStatusCaution: #ff8545; $colorStatusAlert: $colorAlert; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: #0a0; $progressBarHOverlay: 15px; $progressBarStripeW: 20px; +$shdwStatusIc: rgba(white, 0.8) 0 0px 5px; // Selects $colorSelectBg: #ddd; diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js index 7f51a91329..917cb4bc4c 100644 --- a/testing/dialogTest/src/DialogLaunchController.js +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -115,31 +115,71 @@ define( ], messages: [] }; + + + function getExampleActionText() { + var actionTexts = [ + "Adipiscing turpis mauris in enim elementu hac, enim aliquam etiam.", + "Eros turpis, pulvinar turpis eros eu", + "Lundium nascetur a, lectus montes ac, parturient in natoque, duis risus risus pulvinar pid rhoncus, habitasse auctor natoque!" + ]; + return actionTexts[Math.floor(Math.random()*3)]; + } + + function getExampleActions() { + var actions = [ + { + label: "Try Again", + action: function () { + $log.debug("Try Again pressed"); + } + }, + { + label: "Remove", + action: function () { + $log.debug("Remove pressed"); + } + }, + { + label: "Cancel", + action: function () { + $log.debug("Cancel pressed"); + } + } + ]; + + // Randomly remove some actions off the top; leave at least one + actions.splice(0,Math.floor(Math.random() * actions.length)); + + return actions; + } + + function getExampleSeverity() { + var severities = [ + messageSeverity.INFO, + messageSeverity.ALERT, + messageSeverity.ERROR + ]; + return severities[Math.floor(Math.random() * severities.length)]; + } function createMessage (messageNumber) { var messageModel = { - ngModel: { - dialog: { - title: "Message " + messageNumber, - severity: messageSeverity.INFO, - actions: [ - { - label: "Cancel Duplication", - action: function () { - $log.debug("Cancel Duplication pressed"); - $log.debug("Message should be dismissed"); - } - } - ] + ngModel: { + dialog: { + title: "Message Title " + messageNumber, + actionText: getExampleActionText(), + severity: getExampleSeverity(), + actions: getExampleActions() + } } - } }; return messageModel; } if (dialogService.showMessageList(model)) { //Do processing here - for (var i = 0; i < 4; i++) { + for (var i = 0; i < 10; i++) { model.messages.push(createMessage(i)); } } else { From 12a94f828a3a806be67b9d89cd9f45cf1ed9865e Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 13:14:30 -0700 Subject: [PATCH 021/201] Added some more semicolons --- platform/commonUI/notification/src/NotificationService.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index ecdb8d6ddd..7d0db198da 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -159,7 +159,8 @@ define( NotificationService.prototype.setActiveNotification = function (notification) { - var that = this; + var that = this, + timeout; this.active.notification = notification; /* If autoDismiss has been specified, setup a timeout to @@ -170,7 +171,7 @@ define( */ if (notification && (notification.autoDismiss || this.selectNextNotification())) { - var timeout = isNaN(notification.autoDismiss) ? + timeout = isNaN(notification.autoDismiss) ? this.DEFAULT_AUTO_DISMISS : notification.autoDismiss; @@ -188,12 +189,13 @@ define( * @private */ NotificationService.prototype.selectNextNotification = function () { + var notification; /* Loop through the notifications queue and find the first one that has not already been minimized (manually or otherwise). */ for (var i=0; i< this.notifications.length; i++) { - var notification = this.notifications[i]; + notification = this.notifications[i]; if (!notification.minimized && notification!= this.activeNotification) { From fc8630dbc633074211a56061a9d2850ba1e882da Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 13:15:31 -0700 Subject: [PATCH 022/201] Moved some vars --- platform/commonUI/notification/src/NotificationService.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 7d0db198da..97761cd227 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -189,12 +189,13 @@ define( * @private */ NotificationService.prototype.selectNextNotification = function () { - var notification; + var notification, + i=0; /* Loop through the notifications queue and find the first one that has not already been minimized (manually or otherwise). */ - for (var i=0; i< this.notifications.length; i++) { + for (; i< this.notifications.length; i++) { notification = this.notifications[i]; if (!notification.minimized From df590107cbd0c721fe3c5a1401c1fb20ad212d22 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 13:17:12 -0700 Subject: [PATCH 023/201] Moved some more vars --- .../notification/src/NotificationService.js | 2 +- .../test/NotificationServiceSpec.js | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 97761cd227..1a521ad4da 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -199,7 +199,7 @@ define( notification = this.notifications[i]; if (!notification.minimized - && notification!= this.activeNotification) { + && notification!== this.activeNotification) { return notification; } diff --git a/platform/commonUI/notification/test/NotificationServiceSpec.js b/platform/commonUI/notification/test/NotificationServiceSpec.js index 96994f26d2..ca4d5eb2dd 100644 --- a/platform/commonUI/notification/test/NotificationServiceSpec.js +++ b/platform/commonUI/notification/test/NotificationServiceSpec.js @@ -168,15 +168,16 @@ define( }); it("auto-minimizes errors when a number of them arrive in" + " short succession ", function() { - var activeNotification; - var error2 = { - title: "Second Mock Error Notification", - severity: MessageSeverity.ERROR - }; - var error3 = { - title: "Third Mock Error Notification", - severity: MessageSeverity.ERROR - }; + var activeNotification, + error2 = { + title: "Second Mock Error Notification", + severity: MessageSeverity.ERROR + }; + error3 = { + title: "Third Mock Error Notification", + severity: MessageSeverity.ERROR + }; + //First pre-load with a success message notificationService.notify(errorModel); //Then notify of a third error From 5e713f279bebd2ddf604017e5d22c370edefc018 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 13:18:47 -0700 Subject: [PATCH 024/201] Moved some more vars --- .../commonUI/notification/test/NotificationServiceSpec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/notification/test/NotificationServiceSpec.js b/platform/commonUI/notification/test/NotificationServiceSpec.js index ca4d5eb2dd..1992865c8e 100644 --- a/platform/commonUI/notification/test/NotificationServiceSpec.js +++ b/platform/commonUI/notification/test/NotificationServiceSpec.js @@ -172,12 +172,12 @@ define( error2 = { title: "Second Mock Error Notification", severity: MessageSeverity.ERROR - }; + }, error3 = { title: "Third Mock Error Notification", severity: MessageSeverity.ERROR }; - + //First pre-load with a success message notificationService.notify(errorModel); //Then notify of a third error From ba614fe2d6757184366cced7ccd14087f2437a4e Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 13:46:42 -0700 Subject: [PATCH 025/201] Trying to sort out error --- bundles.json | 2 +- platform/commonUI/notification/bundle.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bundles.json b/bundles.json index 9d6687c4f8..56dbadc44a 100644 --- a/bundles.json +++ b/bundles.json @@ -5,6 +5,7 @@ "platform/commonUI/about", "platform/commonUI/browse", "platform/commonUI/edit", + "platform/commonUI/notification", "platform/commonUI/dialog", "platform/commonUI/general", "platform/commonUI/inspect", @@ -26,7 +27,6 @@ "platform/policy", "platform/entanglement", "platform/search", - "platform/commonUI/notification", "example/imagery", "example/eventGenerator", diff --git a/platform/commonUI/notification/bundle.json b/platform/commonUI/notification/bundle.json index 56087d9094..6c1ac21d88 100644 --- a/platform/commonUI/notification/bundle.json +++ b/platform/commonUI/notification/bundle.json @@ -10,8 +10,7 @@ { "key": "notificationService", "implementation": "NotificationService.js", - "depends": [ "$log", "$timeout", "messageSeverity", - "DEFAULT_AUTO_DISMISS" ] + "depends": [ "$timeout", "DEFAULT_AUTO_DISMISS" ] } ] } From 5ff3c71523e92bcb2e1734985013bbc1ebf1dfbd Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 13:56:59 -0700 Subject: [PATCH 026/201] Fixed the Banner Controller which was not returning reference to controller --- platform/commonUI/general/src/controllers/BannerController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index 1c6193e061..8f1128df1e 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -28,4 +28,5 @@ define( function BannerController($scope, notificationService){ $scope.activeNotification = notificationService.active.Notification; } + return BannerController; }); \ No newline at end of file From 82670584875a38f639a815abf9345a17f6222790 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 8 Oct 2015 15:08:26 -0700 Subject: [PATCH 027/201] Begun integration of Notifications framework with Charles' code --- .../general/res/templates/message-banner.html | 28 +++++++---- .../src/controllers/BannerController.js | 2 +- platform/commonUI/notification/bundle.json | 2 +- .../notification/src/NotificationService.js | 27 ++++++---- testing/dialogTest/bundle.json | 15 ++++++ .../dialogTest/res/notification-launch.html | 9 ++++ .../src/NotificationLaunchController.js | 44 ++++++++++++++++ .../src/NotificationLaunchIndicator.js | 50 +++++++++++++++++++ 8 files changed, 155 insertions(+), 22 deletions(-) create mode 100644 testing/dialogTest/res/notification-launch.html create mode 100644 testing/dialogTest/src/NotificationLaunchController.js create mode 100644 testing/dialogTest/src/NotificationLaunchIndicator.js diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index 5091f81548..2e53c2c94b 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -1,12 +1,18 @@ -
- +
+
+ + + +
\ No newline at end of file diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index 8f1128df1e..b1f26eddce 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -26,7 +26,7 @@ define( function () { "use strict"; function BannerController($scope, notificationService){ - $scope.activeNotification = notificationService.active.Notification; + $scope.active = notificationService.active; } return BannerController; }); \ No newline at end of file diff --git a/platform/commonUI/notification/bundle.json b/platform/commonUI/notification/bundle.json index 6c1ac21d88..6f793e7ee4 100644 --- a/platform/commonUI/notification/bundle.json +++ b/platform/commonUI/notification/bundle.json @@ -3,7 +3,7 @@ "constants": [ { "key": "DEFAULT_AUTO_DISMISS", - "value": 2000 + "value": 3000 } ], "services": [ diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 1a521ad4da..8ecf2ad0b4 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -93,8 +93,7 @@ define( * A context in which to hold the active notification and a * handle to its timeout. */ - this.active = { - }; + this.active = {}; } /** @@ -113,7 +112,7 @@ define( */ NotificationService.prototype.success = function (notification) { notification.autoDismiss = notification.autoDismiss || true; - NotificationService.prototype.notify(notification); + this.notify(notification); }; /** @@ -126,7 +125,12 @@ define( NotificationService.prototype.notify = function (notification) { /*var notification = new Notification(model), that=this; */ - var that = this; + var that = this, + timeout; + + if (notification.autoDismiss === true){ + notification.autoDismiss = this.DEFAULT_AUTO_DISMISS; + } this.notifications.push(notification); /* @@ -145,9 +149,12 @@ define( This notifcation has been added to queue and will be serviced as soon as possible. */ + timeout = notification.autoDismiss ? + notification.autoDismiss : + this.DEFAULT_AUTO_DISMISS; this.active.timeout = this.$timeout(function () { that.dismissOrMinimize(that.active.notification); - }); + }, timeout); } }; @@ -171,9 +178,9 @@ define( */ if (notification && (notification.autoDismiss || this.selectNextNotification())) { - timeout = isNaN(notification.autoDismiss) ? - this.DEFAULT_AUTO_DISMISS : - notification.autoDismiss; + timeout = notification.autoDismiss ? + notification.autoDismiss : + this.DEFAULT_AUTO_DISMISS; this.active.timeout = this.$timeout(function () { that.dismissOrMinimize(notification); @@ -258,5 +265,7 @@ define( this.dismiss(notification); } }; + return NotificationService; - }); \ No newline at end of file + } +); \ No newline at end of file diff --git a/testing/dialogTest/bundle.json b/testing/dialogTest/bundle.json index 36ec16e048..095f668c0f 100644 --- a/testing/dialogTest/bundle.json +++ b/testing/dialogTest/bundle.json @@ -4,6 +4,10 @@ { "key": "dialogLaunchTemplate", "templateUrl": "dialog-launch.html" + }, + { + "key": "notificationLaunchTemplate", + "templateUrl": "notification-launch.html" } ], "controllers": [ @@ -17,11 +21,22 @@ "$log", "messageSeverity" ] + }, + { + "key": "NotificationLaunchController", + "implementation": "NotificationLaunchController.js", + "depends": [ + "$scope", + "notificationService" + ] } ], "indicators": [ { "implementation": "DialogLaunchIndicator.js" + }, + { + "implementation": "NotificationLaunchIndicator.js" } ] } diff --git a/testing/dialogTest/res/notification-launch.html b/testing/dialogTest/res/notification-launch.html new file mode 100644 index 0000000000..73bc7c524f --- /dev/null +++ b/testing/dialogTest/res/notification-launch.html @@ -0,0 +1,9 @@ + + + + Success | + Error | + Progress + + Notifications + \ No newline at end of file diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/testing/dialogTest/src/NotificationLaunchController.js new file mode 100644 index 0000000000..d475df08cb --- /dev/null +++ b/testing/dialogTest/src/NotificationLaunchController.js @@ -0,0 +1,44 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define( + [], + function () { + "use strict"; + + function NotificationLaunchController($scope, notificationService) { + /** + * Success | + Error | + Progress + */ + $scope.newSuccess = function(){ + + notificationService.success({ + title: "Success notification!" + }) + }; + } + return NotificationLaunchController; + } +); diff --git a/testing/dialogTest/src/NotificationLaunchIndicator.js b/testing/dialogTest/src/NotificationLaunchIndicator.js new file mode 100644 index 0000000000..174810d721 --- /dev/null +++ b/testing/dialogTest/src/NotificationLaunchIndicator.js @@ -0,0 +1,50 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,window*/ + +define( + [], + function () { + "use strict"; + + function NotificationLaunchIndicator() { + + } + + NotificationLaunchIndicator.template = 'notificationLaunchTemplate'; + + NotificationLaunchIndicator.prototype.getGlyph = function () { + return "i"; + }; + NotificationLaunchIndicator.prototype.getGlyphClass = function () { + return 'caution'; + }; + NotificationLaunchIndicator.prototype.getText = function () { + return "Launch notification"; + }; + NotificationLaunchIndicator.prototype.getDescription = function () { + return "Launch notification"; + }; + + return NotificationLaunchIndicator; + } +); From 954fdd5906d8ce547b7e79664dbe8bfcedad6d51 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 8 Oct 2015 19:10:26 -0700 Subject: [PATCH 028/201] [Frontend] Sanding/positioning and Cancel button added to Messasges dialog open #159 open #170 Added Cancel button to Messages dialog in DialogService.js; Important tweaks to layout of messages to allow bottom-bar to align to bottom in singleton dialog view; Revised status colors in theme's constants files; --- .../dialog/res/templates/overlay.html | 3 +- platform/commonUI/dialog/src/DialogService.js | 17 ++- .../commonUI/general/res/sass/_constants.scss | 2 +- .../general/res/sass/controls/_messages.scss | 30 ++++- .../res/sass/mobile/overlay/_overlay.scss | 7 +- .../general/res/sass/overlay/_overlay.scss | 9 +- .../espresso/res/css/theme-espresso.css | 113 +++++++++++------- .../themes/espresso/res/sass/_constants.scss | 6 +- .../themes/snow/res/css/theme-snow.css | 113 +++++++++++------- .../themes/snow/res/sass/_constants.scss | 6 +- .../dialogTest/src/DialogLaunchController.js | 8 +- 11 files changed, 211 insertions(+), 103 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index f2b7c0d9ee..bc19a97b86 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -22,8 +22,7 @@
- x
diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index 2fc6f41a60..242f311147 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -240,7 +240,7 @@ define( // will handle actual insertion into the DOM this.overlay = this.overlayService.createOverlay( "overlay-blocking-message", - {dialog: dialogModel}, + { dialog: dialogModel }, "t-dialog-sm" ); this.dialogVisible = true; @@ -254,12 +254,25 @@ define( }; DialogService.prototype.showMessageList = function(dialogModel) { + var self = this; + + // Cancel function; this will be passed in to the + // overlay-dialog template and associated with a + // Cancel or X button click + function cancel() { + //deferred.reject(); // Not sure what this does + self.dismiss(); + } + if (this.canShowDialog(dialogModel)) { // Add the overlay using the OverlayService, which // will handle actual insertion into the DOM this.overlay = this.overlayService.createOverlay( "overlay-message-list", - {dialog: dialogModel}, + { + dialog: dialogModel, + cancel: cancel + }, "t-dialog" ); this.dialogVisible = true; diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 2c425493ea..c3851a715d 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -46,7 +46,7 @@ $ueBrowseLeftPaneW: 25%; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; // Overlay -$ovrTopBarH: 60px; +$ovrTopBarH: 45px; $ovrFooterH: 24px; $overlayMargin: 25px; // Items diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index d537ee8ff1..aa26760c9a 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -167,8 +167,8 @@ &:before { content:"\e608"; } color: $colorStatusDefault; font-size: $iconW; - padding-left: 1px; - width: $iconW; + padding: 1px; + width: $iconW + 2; } .message-severity-info .type-icon.message-type { @@ -201,6 +201,7 @@ .l-message { @include display-flex; @include flex-direction(row); + @include align-items(stretch); .type-icon.message-type { //@include test(red); @include flex(0 1 auto); @@ -223,22 +224,41 @@ // Message as singleton .t-message-single { @include messageBlock(80px); + + @include desktop { + .l-message, + .bottom-bar { + @include absPosDefault(); + } + + .bottom-bar { + top: auto; + height: $ovrFooterH; + } + } } // Messages in list .t-message-list { @include messageBlock(32px); + .message-contents { .l-message { //border-bottom: 1px solid pullForward($colorOvrBg, 20%); @include border-radius($controlCr); background: rgba($colorOvrFg, 0.1); margin-bottom: $interiorMargin; - margin-right: $interiorMarginLg; padding: $interiorMarginLg; + .message-contents, + .bottom-bar { + //@include test(green); + position: relative; + } + .message-contents { font-size: 0.9em; + margin-left: $interiorMarginLg; .message-action { color: pushBack($colorOvrFg, 20%); } .bottom-bar { text-align: left; } } @@ -249,4 +269,8 @@ } } } + + @include desktop { + .message-contents .l-message { margin-right: $interiorMarginLg; } + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss index 9fe624b2fd..9fd6721130 100644 --- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss @@ -54,9 +54,10 @@ } .contents { - .top-bar, - .editor, - .bottom-bar { + .abs.top-bar, + .abs.editor, + .abs.message-body, + .abs.bottom-bar { //@include test(orange); top: auto; right: auto; bottom: auto; left: auto; height: auto; width: auto; diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 305534c0d0..602af62887 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -83,8 +83,8 @@ .abs.editor, .abs.message-body { - top: $ovrTopBarH + ($interiorMargin * 2); - bottom: $ovrFooterH + $interiorMargin * 2; + top: $ovrTopBarH + $interiorMarginLg; + bottom: $ovrFooterH + $interiorMarginLg; left: 0; right: 0; overflow: auto; @@ -137,6 +137,7 @@ .t-dialog-sm .overlay > .holder { // Used for blocker and in-progress dialogs, modal alerts, etc. //@include test(red); - min-height: 275px; - height: 275px; + $h: 225px; + min-height: $h; + height: $h; } \ 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 1d4d0e0e79..229e97e44b 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -2399,10 +2399,10 @@ label.checkbox.custom { margin-right: 3px; } /* line 54, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator { - color: #44ba53; } + color: #62ba72; } /* line 57, ../../../../general/res/sass/controls/_messages.scss */ .status.block.caution .status-indicator { - color: #ff8545; } + color: #ffa66d; } /* line 60, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; @@ -2559,30 +2559,30 @@ label.checkbox.custom { opacity: 1; } /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok { - background-color: #1b4a21; + background-color: #285b31; color: #ccc; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok:hover { - background-color: #296f32; } + background-color: #387e44; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action { - background-color: #0d2510; } + background-color: #18381e; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover { - background-color: #1b4a21; } + background-color: #285b31; } /* line 159, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution { - background-color: #ab3b00; + background-color: #d35200; color: #ccc; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution:hover { - background-color: #de4c00; } + background-color: #ff6807; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action { - background-color: #782900; } + background-color: #a03e00; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover { - background-color: #ab3b00; } + background-color: #d35200; } /* Paths: t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message > @@ -2602,19 +2602,21 @@ label.checkbox.custom { display: -webkit-flex; display: flex; -webkit-flex-direction: row; - flex-direction: row; } - /* line 204, ../../../../general/res/sass/controls/_messages.scss */ + flex-direction: row; + -webkit-align-items: stretch; + align-items: stretch; } + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 209, ../../../../general/res/sass/controls/_messages.scss */ + /* line 210, ../../../../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 215, ../../../../general/res/sass/controls/_messages.scss */ + /* line 216, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } @@ -2624,80 +2626,104 @@ label.checkbox.custom { text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; color: #ccc; font-size: 80px; - padding-left: 1px; - width: 80px; } + padding: 1px; + width: 82px; } /* line 167, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } /* line 174, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { - color: #44ba53; } + color: #62ba72; } /* line 175, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } /* line 178, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { - color: #ff8545; } + color: #ffa66d; } /* line 179, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } /* line 182, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { - color: #ff533a; } + color: #d4585c; } /* line 183, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 229, ../../../../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 234, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .bottom-bar { + top: auto; + height: 24px; } } /* line 165, ../../../../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-left: 1px; - width: 32px; } + padding: 1px; + width: 34px; } /* line 167, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } /* line 174, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { - color: #44ba53; } + color: #62ba72; } /* line 175, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } /* line 178, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { - color: #ff8545; } + color: #ffa66d; } /* line 179, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } /* line 182, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { - color: #ff533a; } + color: #d4585c; } /* line 183, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 232, ../../../../general/res/sass/controls/_messages.scss */ +/* line 246, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; background: rgba(230, 230, 230, 0.1); margin-bottom: 5px; - margin-right: 10px; padding: 10px; } - /* line 240, ../../../../general/res/sass/controls/_messages.scss */ + /* line 253, ../../../../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 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { - font-size: 0.9em; } - /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + font-size: 0.9em; + margin-left: 10px; } + /* line 262, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #b3b3b3; } - /* line 243, ../../../../general/res/sass/controls/_messages.scss */ + /* line 263, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 246, ../../../../general/res/sass/controls/_messages.scss */ + /* line 266, ../../../../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 screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 274, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message { + margin-right: 10px; } } /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { @@ -4374,13 +4400,13 @@ span.req { color: #b3b3b3; } /* line 80, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .abs.top-bar, .overlay .s-menu span.top-bar.l-click-area, .s-menu .overlay span.top-bar.l-click-area { - height: 60px; } + height: 45px; } /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .abs.editor, .overlay .s-menu span.editor.l-click-area, .s-menu .overlay span.editor.l-click-area, .overlay .abs.message-body, .overlay .s-menu span.message-body.l-click-area, .s-menu .overlay span.message-body.l-click-area { - top: 70px; + top: 55px; bottom: 34px; left: 0; right: 0; @@ -4461,8 +4487,8 @@ span.req { /* line 137, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { - min-height: 275px; - height: 275px; } + min-height: 225px; + height: 225px; } @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 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ @@ -4513,9 +4539,16 @@ span.req { .overlay > .holder .editor .form .form-row > .label:after { float: none; } /* line 57, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder .contents .top-bar, - .overlay > .holder .contents .editor, - .overlay > .holder .contents .bottom-bar { + .overlay > .holder .contents .abs.top-bar, .overlay > .holder .contents .s-menu span.top-bar.l-click-area, .s-menu .overlay > .holder .contents span.top-bar.l-click-area, + .overlay > .holder .contents .abs.editor, + .overlay > .holder .contents .s-menu span.editor.l-click-area, + .s-menu .overlay > .holder .contents span.editor.l-click-area, + .overlay > .holder .contents .abs.message-body, + .overlay > .holder .contents .s-menu span.message-body.l-click-area, + .s-menu .overlay > .holder .contents span.message-body.l-click-area, + .overlay > .holder .contents .abs.bottom-bar, + .overlay > .holder .contents .s-menu span.bottom-bar.l-click-area, + .s-menu .overlay > .holder .contents span.bottom-bar.l-click-area { top: auto; right: auto; bottom: auto; @@ -4525,12 +4558,12 @@ span.req { margin-bottom: 20px; position: relative; } - /* line 68, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 69, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { height: auto; max-height: 100%; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 76, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 77, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .bottom-bar { text-align: center; } } /***************************************************************************** diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 1a9f5b4ed0..896241de5c 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -61,9 +61,9 @@ $colorInputIcon: pushBack($colorBodyFg, 15%); // Status colors, mainly used for messaging and item ancillary symbols $colorStatusFg: #ccc; $colorStatusDefault: #ccc; -$colorStatusOk: #44ba53; -$colorStatusCaution: #ff8545; -$colorStatusAlert: $colorAlert; +$colorStatusOk: #62ba72; +$colorStatusCaution: #ffa66d; +$colorStatusAlert: #d4585c; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: $colorKey; $progressBarHOverlay: 15px; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 5db2792f52..0ae366cd0e 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -2347,10 +2347,10 @@ label.checkbox.custom { margin-right: 3px; } /* line 54, ../../../../general/res/sass/controls/_messages.scss */ .status.block.ok .status-indicator { - color: #44ba53; } + color: #60ba7b; } /* line 57, ../../../../general/res/sass/controls/_messages.scss */ .status.block.caution .status-indicator { - color: #ff8545; } + color: #ffb66c; } /* line 60, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; @@ -2507,30 +2507,30 @@ label.checkbox.custom { opacity: 1; } /* line 156, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok { - background-color: #1b4a21; + background-color: #275a36; color: #fff; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok:hover { - background-color: #296f32; } + background-color: #367e4c; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action { - background-color: #0d2510; } + background-color: #183621; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.ok .s-action:hover { - background-color: #1b4a21; } + background-color: #275a36; } /* line 159, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution { - background-color: #ab3b00; + background-color: #d26a00; color: #fff; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution:hover { - background-color: #de4c00; } + background-color: #ff8306; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action { - background-color: #782900; } + background-color: #9f5000; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner.caution .s-action:hover { - background-color: #ab3b00; } + background-color: #d26a00; } /* Paths: t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message > @@ -2550,19 +2550,21 @@ label.checkbox.custom { display: -webkit-flex; display: flex; -webkit-flex-direction: row; - flex-direction: row; } - /* line 204, ../../../../general/res/sass/controls/_messages.scss */ + flex-direction: row; + -webkit-align-items: stretch; + align-items: stretch; } + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 209, ../../../../general/res/sass/controls/_messages.scss */ + /* line 210, ../../../../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 215, ../../../../general/res/sass/controls/_messages.scss */ + /* line 216, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } @@ -2572,80 +2574,104 @@ label.checkbox.custom { text-shadow: rgba(255, 255, 255, 0.8) 0 0px 5px; color: #ccc; font-size: 80px; - padding-left: 1px; - width: 80px; } + padding: 1px; + width: 82px; } /* line 167, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } /* line 174, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { - color: #44ba53; } + color: #60ba7b; } /* line 175, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } /* line 178, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { - color: #ff8545; } + color: #ffb66c; } /* line 179, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } /* line 182, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { - color: #ff533a; } + color: #c96b68; } /* line 183, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 229, ../../../../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 234, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-single .bottom-bar { + top: auto; + height: 24px; } } /* line 165, ../../../../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-left: 1px; - width: 32px; } + padding: 1px; + width: 34px; } /* line 167, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } /* line 174, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { - color: #44ba53; } + color: #60ba7b; } /* line 175, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } /* line 178, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { - color: #ff8545; } + color: #ffb66c; } /* line 179, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } /* line 182, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { - color: #ff533a; } + color: #c96b68; } /* line 183, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 232, ../../../../general/res/sass/controls/_messages.scss */ +/* line 246, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; background: rgba(102, 102, 102, 0.1); margin-bottom: 5px; - margin-right: 10px; padding: 10px; } - /* line 240, ../../../../general/res/sass/controls/_messages.scss */ + /* line 253, ../../../../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 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { - font-size: 0.9em; } - /* line 242, ../../../../general/res/sass/controls/_messages.scss */ + font-size: 0.9em; + margin-left: 10px; } + /* line 262, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #999999; } - /* line 243, ../../../../general/res/sass/controls/_messages.scss */ + /* line 263, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 246, ../../../../general/res/sass/controls/_messages.scss */ + /* line 266, ../../../../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 screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 274, ../../../../general/res/sass/controls/_messages.scss */ + .t-message-list .message-contents .l-message { + margin-right: 10px; } } /* line 1, ../../../../general/res/sass/controls/_time-controller.scss */ .l-time-controller { @@ -4297,13 +4323,13 @@ span.req { color: #999999; } /* line 80, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .abs.top-bar, .overlay .s-menu span.top-bar.l-click-area, .s-menu .overlay span.top-bar.l-click-area { - height: 60px; } + height: 45px; } /* line 84, ../../../../general/res/sass/overlay/_overlay.scss */ .overlay .abs.editor, .overlay .s-menu span.editor.l-click-area, .s-menu .overlay span.editor.l-click-area, .overlay .abs.message-body, .overlay .s-menu span.message-body.l-click-area, .s-menu .overlay span.message-body.l-click-area { - top: 70px; + top: 55px; bottom: 34px; left: 0; right: 0; @@ -4375,8 +4401,8 @@ span.req { /* line 137, ../../../../general/res/sass/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { - min-height: 275px; - height: 275px; } + min-height: 225px; + height: 225px; } @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 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ @@ -4427,9 +4453,16 @@ span.req { .overlay > .holder .editor .form .form-row > .label:after { float: none; } /* line 57, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder .contents .top-bar, - .overlay > .holder .contents .editor, - .overlay > .holder .contents .bottom-bar { + .overlay > .holder .contents .abs.top-bar, .overlay > .holder .contents .s-menu span.top-bar.l-click-area, .s-menu .overlay > .holder .contents span.top-bar.l-click-area, + .overlay > .holder .contents .abs.editor, + .overlay > .holder .contents .s-menu span.editor.l-click-area, + .s-menu .overlay > .holder .contents span.editor.l-click-area, + .overlay > .holder .contents .abs.message-body, + .overlay > .holder .contents .s-menu span.message-body.l-click-area, + .s-menu .overlay > .holder .contents span.message-body.l-click-area, + .overlay > .holder .contents .abs.bottom-bar, + .overlay > .holder .contents .s-menu span.bottom-bar.l-click-area, + .s-menu .overlay > .holder .contents span.bottom-bar.l-click-area { top: auto; right: auto; bottom: auto; @@ -4439,12 +4472,12 @@ span.req { margin-bottom: 20px; position: relative; } - /* line 68, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 69, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .t-dialog-sm .overlay > .holder { height: auto; max-height: 100%; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 76, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + /* line 77, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .bottom-bar { text-align: center; } } /***************************************************************************** diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index ea9d8437f5..02e0f7ab11 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -61,9 +61,9 @@ $colorInputIcon: pushBack($colorBodyFg, 25%); // Status colors, mainly used for messaging and item ancillary symbols $colorStatusFg: #fff; $colorStatusDefault: #ccc; -$colorStatusOk: #44ba53; -$colorStatusCaution: #ff8545; -$colorStatusAlert: $colorAlert; +$colorStatusOk: #60ba7b; +$colorStatusCaution: #ffb66c; +$colorStatusAlert: #c96b68; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: #0a0; $progressBarHOverlay: 15px; diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js index 917cb4bc4c..7946463abe 100644 --- a/testing/dialogTest/src/DialogLaunchController.js +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -115,8 +115,7 @@ define( ], messages: [] }; - - + function getExampleActionText() { var actionTexts = [ "Adipiscing turpis mauris in enim elementu hac, enim aliquam etiam.", @@ -177,6 +176,11 @@ define( return messageModel; } + function dismiss() { + scope.$destroy(); + element.remove(); + } + if (dialogService.showMessageList(model)) { //Do processing here for (var i = 0; i < 10; i++) { From 2b97d61d6cf840e2f79023e38258b03d87bf00d7 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 9 Oct 2015 10:59:36 -0700 Subject: [PATCH 029/201] Further integration work --- .../general/res/templates/message-banner.html | 22 +++++++++------- .../src/controllers/BannerController.js | 3 +++ .../notification/src/MessageSeverity.js | 3 ++- .../notification/src/NotificationService.js | 3 ++- .../src/NotificationLaunchController.js | 26 +++++++++++++++++-- 5 files changed, 43 insertions(+), 14 deletions(-) diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index 2e53c2c94b..a896b08702 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -3,16 +3,18 @@ class="l-message-banner s-message-banner"> - - +
\ No newline at end of file diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index b1f26eddce..214283633c 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -27,6 +27,9 @@ define( "use strict"; function BannerController($scope, notificationService){ $scope.active = notificationService.active; + $scope.dismiss = function(notification){ + notificationService.dismissOrMinimize(notification); + } } return BannerController; }); \ No newline at end of file diff --git a/platform/commonUI/notification/src/MessageSeverity.js b/platform/commonUI/notification/src/MessageSeverity.js index 39e8e6d8d0..5708dd9554 100644 --- a/platform/commonUI/notification/src/MessageSeverity.js +++ b/platform/commonUI/notification/src/MessageSeverity.js @@ -5,6 +5,7 @@ define(function(){ return { SUCCESS: 0, - ERROR: 1 + INFO: 1, + ERROR: 2 }; }); \ No newline at end of file diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 8ecf2ad0b4..078dde51d5 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -112,6 +112,7 @@ define( */ NotificationService.prototype.success = function (notification) { notification.autoDismiss = notification.autoDismiss || true; + notification.severity = MessageSeverity.SUCCESS; this.notify(notification); }; @@ -206,7 +207,7 @@ define( notification = this.notifications[i]; if (!notification.minimized - && notification!== this.activeNotification) { + && notification!== this.active.notification) { return notification; } diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/testing/dialogTest/src/NotificationLaunchController.js index d475df08cb..0c1aaed657 100644 --- a/testing/dialogTest/src/NotificationLaunchController.js +++ b/testing/dialogTest/src/NotificationLaunchController.js @@ -22,8 +22,8 @@ /*global define*/ define( - [], - function () { + ['../../../platform/commonUI/notification/src/MessageSeverity'], + function (MessageSeverity) { "use strict"; function NotificationLaunchController($scope, notificationService) { @@ -38,6 +38,28 @@ define( title: "Success notification!" }) }; + + $scope.newError = function(){ + + notificationService.notify({ + title: "Error notification!", + severity: MessageSeverity.ERROR + }) + }; + + $scope.newProgress = function(){ + + var notification = { + title: "Progress notification!", + severity: MessageSeverity.INFO, + progress: 0, + progressUnknown: true + + }; + + notificationService.notify(notification) + }; + } return NotificationLaunchController; } From 85300d374369a850aa3d5e5682ab4c8cc2816ab5 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 9 Oct 2015 11:57:47 -0700 Subject: [PATCH 030/201] Refactored DialogService a little --- .../dialog/res/templates/message.html | 12 ++--- .../res/templates/overlay-message-list.html | 2 +- platform/commonUI/dialog/src/DialogService.js | 50 ++----------------- .../general/res/templates/progress-bar.html | 10 ++-- .../notification/src/NotificationService.js | 24 ++++----- .../dialogTest/src/DialogLaunchController.js | 24 ++++++--- .../src/NotificationLaunchController.js | 5 -- 7 files changed, 44 insertions(+), 83 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index d9fe79edfe..5d78e408d8 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -1,20 +1,20 @@ -
+
-
{{ngModel.dialog.title}}
-
{{ngModel.dialog.hint}}
+
{{ngModel.title}}
+
{{ngModel.hint}}
- {{ngModel.dialog.actionText}} message-severity-{{ngModel.dialog.severity}} + {{ngModel.actionText}} message-severity-{{ngModel.severity}}
+ ng-hide="ngModel.progress === undefined">
- {{dialogAction.label}} diff --git a/platform/commonUI/dialog/res/templates/overlay-message-list.html b/platform/commonUI/dialog/res/templates/overlay-message-list.html index 550c0bcda2..9ad5aa6e47 100644 --- a/platform/commonUI/dialog/res/templates/overlay-message-list.html +++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html @@ -6,7 +6,7 @@
- + +
{{notifications.length}} Notifications + + {{notifications.length}} + \ No newline at end of file diff --git a/platform/commonUI/notification/src/NotificationIndicator.js b/platform/commonUI/notification/src/NotificationIndicator.js new file mode 100644 index 0000000000..b1d20e8264 --- /dev/null +++ b/platform/commonUI/notification/src/NotificationIndicator.js @@ -0,0 +1,50 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,window*/ + +define( + [], + function () { + "use strict"; + + function NotificationIndicator() { + + } + + NotificationIndicator.template = 'notificationIndicatorTemplate'; + + NotificationIndicator.prototype.getGlyph = function () { + return "A"; + }; + NotificationIndicator.prototype.getGlyphClass = function () { + return 'caution'; + }; + NotificationIndicator.prototype.getText = function () { + return "Notifications"; + }; + NotificationIndicator.prototype.getDescription = function () { + return "Notifications"; + }; + + return NotificationIndicator; + } +); diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js new file mode 100644 index 0000000000..ae417b1ba7 --- /dev/null +++ b/platform/commonUI/notification/src/NotificationIndicatorController.js @@ -0,0 +1,59 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define( + ['./MessageSeverity'], + function (MessageSeverity) { + "use strict"; + + function NotificationIndicatorController($scope, notificationService, dialogService) { + $scope.notifications = notificationService.notifications; + $scope.showNotificationsList = function(){ + + var model = { + title: "Messages", + severity: MessageSeverity.INFO, + actions: [ + { + label: "Done", + action: function () { + dialogService.dismiss(); + } + } + ], + messages: [] + }; + + model.messages = notificationService.notifications; + dialogService.getDialogResponse('overlay-message-list', { + dialog: model, + cancel: function(){ + dialogService.dismiss(); + } + }); + + }; + } + return NotificationIndicatorController; + } +); diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js index 11bba39da2..bc8cdcb419 100644 --- a/testing/dialogTest/src/DialogLaunchController.js +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -108,7 +108,6 @@ define( { label: "Done", action: function () { - $log.debug("Done pressed"); dialogService.dismiss(); } } @@ -173,19 +172,13 @@ define( } function dismiss() { - scope.$destroy(); - element.remove(); + dialogService.dismiss(); } - - //for (var i = 0; i < 10; i++) { - // model.messages.push(createMessage(i)); - //} + model.messages = notificationService.notifications; dialogService.getDialogResponse('overlay-message-list', { dialog: model, - cancel: function(){ - dialogService.dismiss(); - } + cancel: dismiss }); }; } diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/testing/dialogTest/src/NotificationLaunchController.js index 99caa8a71a..8150c2cfe5 100644 --- a/testing/dialogTest/src/NotificationLaunchController.js +++ b/testing/dialogTest/src/NotificationLaunchController.js @@ -35,17 +35,65 @@ define( }) }; + function getExampleActionText() { + var actionTexts = [ + "Adipiscing turpis mauris in enim elementu hac, enim aliquam etiam.", + "Eros turpis, pulvinar turpis eros eu", + "Lundium nascetur a, lectus montes ac, parturient in natoque, duis risus risus pulvinar pid rhoncus, habitasse auctor natoque!" + ]; + return actionTexts[Math.floor(Math.random()*3)]; + } + + function getExampleActions() { + var actions = [ + { + label: "Try Again", + action: function () { + $log.debug("Try Again pressed"); + } + }, + { + label: "Remove", + action: function () { + $log.debug("Remove pressed"); + } + }, + { + label: "Cancel", + action: function () { + $log.debug("Cancel pressed"); + } + } + ]; + + // Randomly remove some actions off the top; leave at least one + actions.splice(0,Math.floor(Math.random() * actions.length)); + + return actions; + } + + function getExampleSeverity() { + var severities = [ + MessageSeverity.INFO, + MessageSeverity.ALERT, + MessageSeverity.ERROR + ]; + return severities[Math.floor(Math.random() * severities.length)]; + } + $scope.newError = function(){ notificationService.notify({ title: "Error notification " + messageCounter++ + "!", + hint: "An error has occurred", severity: MessageSeverity.ERROR, primaryAction: { label: 'Retry', action: function() { console.log('Retry clicked'); } - }}); + }, + actions: getExampleActions}); }; $scope.newProgress = function(){ @@ -54,7 +102,7 @@ define( title: "Progress notification!", severity: MessageSeverity.INFO, progress: 0, - progressUnknown: true + unknownProgress: false }; From 11264759eccd41d177748b58f3a9b04dc382e61e Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 13 Oct 2015 11:14:28 -0700 Subject: [PATCH 034/201] Added highest severity calculation in NotifiationService --- .../commonUI/notification/res/notification-indicator.html | 3 ++- platform/commonUI/notification/src/NotificationService.js | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/notification/res/notification-indicator.html b/platform/commonUI/notification/res/notification-indicator.html index 1cf8f91881..f0c7ee48bb 100644 --- a/platform/commonUI/notification/res/notification-indicator.html +++ b/platform/commonUI/notification/res/notification-indicator.html @@ -1,4 +1,5 @@ - + ! {{notifications.length}} Notifications diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index c2386948eb..cadbea29f2 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -87,6 +87,7 @@ define( function NotificationService($timeout, DEFAULT_AUTO_DISMISS, FORCE_AUTO_DISMISS) { this.notifications = []; this.$timeout = $timeout; + this.highest ={ severity: MessageSeverity.INFO }; this.DEFAULT_AUTO_DISMISS = DEFAULT_AUTO_DISMISS; this.FORCE_AUTO_DISMISS = FORCE_AUTO_DISMISS; @@ -198,12 +199,18 @@ define( NotificationService.prototype.selectNextNotification = function () { var notification, i=0; + + this.highest.severity = MessageSeverity.INFO; + /* Loop through the notifications queue and find the first one self has not already been minimized (manually or otherwise). */ for (; i< this.notifications.length; i++) { notification = this.notifications[i]; + if (notification.severity > this.highest.severity){ + this.highest.severity = notification.severity; + } if (!notification.minimized && notification!== this.active.notification) { From b2a09599a07f3cb7a72f3e29bb2c60c9cc103f2f Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 13 Oct 2015 11:21:56 -0700 Subject: [PATCH 035/201] Modified messages dialog launcher --- platform/commonUI/dialog/res/templates/message.html | 3 +++ testing/dialogTest/res/dialog-launch.html | 3 +-- testing/dialogTest/src/NotificationLaunchController.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index 78ae8be035..ee2b60c58f 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -11,6 +11,9 @@
{{ngModel.hint}}
+
+ {{ngModel.actionText}} +
diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html index 2b01ca60bb..1b117c2ebf 100644 --- a/testing/dialogTest/res/dialog-launch.html +++ b/testing/dialogTest/res/dialog-launch.html @@ -3,8 +3,7 @@ Known | Unknown | - Error | - Messages + Error Dialogs \ No newline at end of file diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/testing/dialogTest/src/NotificationLaunchController.js index 8150c2cfe5..ccd2543252 100644 --- a/testing/dialogTest/src/NotificationLaunchController.js +++ b/testing/dialogTest/src/NotificationLaunchController.js @@ -93,7 +93,7 @@ define( console.log('Retry clicked'); } }, - actions: getExampleActions}); + actions: getExampleActions()}); }; $scope.newProgress = function(){ @@ -102,6 +102,7 @@ define( title: "Progress notification!", severity: MessageSeverity.INFO, progress: 0, + actionText: getExampleActionText(), unknownProgress: false }; From 2ba6f18c59cc58d34f1df188a886380ad2d09fe7 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 13 Oct 2015 17:13:24 -0700 Subject: [PATCH 036/201] Making changes to implement display queue --- .../commonUI/dialog/res/templates/message.html | 3 ++- .../general/res/templates/message-banner.html | 5 ++++- .../notification/res/notification-indicator.html | 10 +++++++--- .../src/NotificationIndicatorController.js | 3 +++ .../notification/src/NotificationService.js | 2 +- testing/dialogTest/res/notification-launch.html | 1 + .../src/NotificationLaunchController.js | 15 +++++++++++++++ 7 files changed, 33 insertions(+), 6 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index ee2b60c58f..28bd09cbb1 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -1,7 +1,8 @@
diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index d3d4a71ed5..5f032143b0 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -1,5 +1,8 @@
+ class="l-message-banner s-message-banner" ng-class="{ + 'error': highest.severity===MessageSeverity.ERROR, + 'alert': highest.severity===MessageSeverity.ALERT }" + ng-click="maximize(active.notification)"> diff --git a/platform/commonUI/notification/res/notification-indicator.html b/platform/commonUI/notification/res/notification-indicator.html index f0c7ee48bb..79ceb97302 100644 --- a/platform/commonUI/notification/res/notification-indicator.html +++ b/platform/commonUI/notification/res/notification-indicator.html @@ -1,8 +1,12 @@ - - ! + - {{notifications.length}} Notifications + {{notifications.length}} + Notifications {{highest.severity}} {{notifications.length}} \ No newline at end of file diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js index ae417b1ba7..9571b0f6a4 100644 --- a/platform/commonUI/notification/src/NotificationIndicatorController.js +++ b/platform/commonUI/notification/src/NotificationIndicatorController.js @@ -28,6 +28,9 @@ define( function NotificationIndicatorController($scope, notificationService, dialogService) { $scope.notifications = notificationService.notifications; + $scope.highest = notificationService.highest; + $scope.MessageSeverity = MessageSeverity; + $scope.showNotificationsList = function(){ var model = { diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index cadbea29f2..00457f959d 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -254,8 +254,8 @@ define( var index = this.notifications.indexOf(notification); if (index >= 0) { this.notifications.splice(index, 1); - this.setActiveNotification(this.selectNextNotification()); } + this.setActiveNotification(this.selectNextNotification()); }; /** diff --git a/testing/dialogTest/res/notification-launch.html b/testing/dialogTest/res/notification-launch.html index 73bc7c524f..e9b7e8f84e 100644 --- a/testing/dialogTest/res/notification-launch.html +++ b/testing/dialogTest/res/notification-launch.html @@ -3,6 +3,7 @@ Success | Error | + Alert | Progress Notifications diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/testing/dialogTest/src/NotificationLaunchController.js index ccd2543252..14709579b3 100644 --- a/testing/dialogTest/src/NotificationLaunchController.js +++ b/testing/dialogTest/src/NotificationLaunchController.js @@ -96,6 +96,21 @@ define( actions: getExampleActions()}); }; + $scope.newAlert = function(){ + + notificationService.notify({ + title: "Error notification " + messageCounter++ + "!", + hint: "An error has occurred", + severity: MessageSeverity.ALERT, + primaryAction: { + label: 'Retry', + action: function() { + console.log('Retry clicked'); + } + }, + actions: getExampleActions()}); + }; + $scope.newProgress = function(){ var notification = { From 34ea3ad9bbcfa3304a5f20cfd9eb0ce9e66930f6 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 13 Oct 2015 17:12:23 -0700 Subject: [PATCH 037/201] [Frontend] Banner message animations; class renaming open #163 open #170 Added transition animations to message banners; Renamed $colorStatus* class names to map more closely to severity constants; --- .../general/res/sass/controls/_messages.scss | 56 +++-- .../espresso/res/css/theme-espresso.css | 221 +++++++++++------- .../themes/espresso/res/sass/_constants.scss | 6 +- .../themes/snow/res/css/theme-snow.css | 221 +++++++++++------- .../themes/snow/res/sass/_constants.scss | 6 +- 5 files changed, 319 insertions(+), 191 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index aa26760c9a..740df6ba8d 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -51,11 +51,17 @@ .status-indicator { margin-right: $interiorMarginSm; } - &.ok .status-indicator { - color: $colorStatusOk; + &.ok .status-indicator, + &.info .status-indicator { + color: $colorStatusInfo; } + &.alert .status-indicator, + &.warning .status-indicator, &.caution .status-indicator { - color: $colorStatusCaution; + color: $colorStatusAlert; + } + &.error .status-indicator { + color: $colorStatusError; } .label { // Max-width silliness is necessary for width transition @@ -107,6 +113,22 @@ padding: 0 $interiorMargin 0 $interiorMargin; @include transform(translateX(-50%)); + &.minimized { + @include transition-property(left, opacity); + @include transition-duration(0.3s); + @include transition-timing-function(ease-in-out); + left: 0; + opacity: 0; + } + + &.new { + left: 50%; + opacity: 1; + &:not(.info) { + @include pulse(100ms, 10); + } + } + .banner-elem { @include flex(0 1 auto); margin-left: $interiorMargin; @@ -134,9 +156,10 @@ z-index: 10; } -.s-message-banner, -.s-message-banner .s-action { - @include trans-prop-nice(background-color, .25s); +.s-message-banner { + //@include transition-property(left, opacity); + //@include transition-duration(0.35s); + //@include transition-timing-function(ease-in-out); } .s-message-banner { @@ -146,6 +169,7 @@ a { color: inherit; } .s-action { @include border-radius($basicCr); + @include trans-prop-nice(background-color); } .close { opacity: 0.5; @@ -153,12 +177,18 @@ opacity: 1; } } - &.ok { - @include statusBannerColors($colorStatusOk); + &.ok, + &.info { + @include statusBannerColors($colorStatusInfo); } - &.caution { - @include statusBannerColors($colorStatusCaution); + &.caution, + &.warning, + &.alert { + @include statusBannerColors($colorStatusAlert); } + &.error { + @include statusBannerColors($colorStatusError); + } } @mixin messageBlock($iconW: 32px) { @@ -173,15 +203,15 @@ .message-severity-info .type-icon.message-type { &:before { content:"\e608"; } - color: $colorStatusOk; + color: $colorStatusInfo; } .message-severity-alert .type-icon.message-type { &:before { content:"\e610"; } - color: $colorStatusCaution; + color: $colorStatusAlert; } .message-severity-error .type-icon.message-type { &:before { content:"\21"; } - color: $colorStatusAlert; + color: $colorStatusError; } } /* Paths: diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 229e97e44b..13334809a2 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; } @@ -2398,12 +2398,15 @@ label.checkbox.custom { .status.block .status-indicator { margin-right: 3px; } /* line 54, ../../../../general/res/sass/controls/_messages.scss */ - .status.block.ok .status-indicator { + .status.block.ok .status-indicator, .status.block.info .status-indicator { color: #62ba72; } - /* line 57, ../../../../general/res/sass/controls/_messages.scss */ - .status.block.caution .status-indicator { + /* line 58, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.alert .status-indicator, .status.block.warning .status-indicator, .status.block.caution .status-indicator { color: #ffa66d; } - /* line 60, ../../../../general/res/sass/controls/_messages.scss */ + /* line 63, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.error .status-indicator { + color: #d4585c; } + /* line 66, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -2419,7 +2422,7 @@ label.checkbox.custom { transition-timing-function: ease-in-out; overflow: hidden; max-width: 0px; } - /* line 66, ../../../../general/res/sass/controls/_messages.scss */ + /* line 72, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2435,27 +2438,27 @@ label.checkbox.custom { transition-timing-function: ease-in-out; font-weight: bold; opacity: 1; } - /* line 72, ../../../../general/res/sass/controls/_messages.scss */ + /* line 78, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { max-width: 450px; width: auto; } - /* line 76, ../../../../general/res/sass/controls/_messages.scss */ + /* line 82, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .count { opacity: 0; } /* Styles for messages and message banners */ -/* line 84, ../../../../general/res/sass/controls/_messages.scss */ +/* line 90, ../../../../general/res/sass/controls/_messages.scss */ .message.block { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; padding: 10px; } -/* line 88, ../../../../general/res/sass/controls/_messages.scss */ +/* line 94, ../../../../general/res/sass/controls/_messages.scss */ .message.error { background-color: rgba(255, 83, 58, 0.3); color: #ffaca0; } -/* line 94, ../../../../general/res/sass/controls/_messages.scss */ +/* line 100, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -2484,49 +2487,70 @@ label.checkbox.custom { -webkit-transform: translateX(-50%); transform: translateX(-50%); z-index: 10; } - /* line 110, ../../../../general/res/sass/controls/_messages.scss */ + /* line 116, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner.minimized { + -moz-transition-property: left, opacity; + -o-transition-property: left, opacity; + -webkit-transition-property: left, opacity; + transition-property: left, opacity; + -moz-transition-duration: 0.3s; + -o-transition-duration: 0.3s; + -webkit-transition-duration: 0.3s; + transition-duration: 0.3s; + -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; + left: 0; + opacity: 0; } + /* line 124, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner.new { + left: 50%; + opacity: 1; } + /* line 127, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner.new:not(.info) { + -moz-animation-name: pulse; + -webkit-animation-name: pulse; + animation-name: pulse; + -moz-animation-duration: 100ms; + -webkit-animation-duration: 100ms; + animation-duration: 100ms; + -moz-animation-direction: alternate; + -webkit-animation-direction: alternate; + animation-direction: alternate; + -moz-animation-iteration-count: 10; + -webkit-animation-iteration-count: 10; + animation-iteration-count: 10; + -moz-animation-timing-function: ease-in-out; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; } + /* line 132, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 114, ../../../../general/res/sass/controls/_messages.scss */ + /* line 136, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 117, ../../../../general/res/sass/controls/_messages.scss */ + /* line 139, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 121, ../../../../general/res/sass/controls/_messages.scss */ + /* line 143, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 127, ../../../../general/res/sass/controls/_messages.scss */ + /* line 149, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } - /* line 133, ../../../../general/res/sass/controls/_messages.scss */ + /* line 155, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .progress-info { display: none; } -/* line 137, ../../../../general/res/sass/controls/_messages.scss */ -.s-message-banner, -.s-message-banner .s-action { - -moz-transition-property: background-color; - -o-transition-property: background-color; - -webkit-transition-property: background-color; - transition-property: background-color; - -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; } - -/* line 142, ../../../../general/res/sass/controls/_messages.scss */ +/* line 165, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2543,46 +2567,71 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 146, ../../../../general/res/sass/controls/_messages.scss */ + /* line 169, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 147, ../../../../general/res/sass/controls/_messages.scss */ + /* line 170, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; } - /* line 150, ../../../../general/res/sass/controls/_messages.scss */ + border-radius: 3px; + -moz-transition-property: background-color; + -o-transition-property: background-color; + -webkit-transition-property: background-color; + transition-property: background-color; + -moz-transition-duration: 500ms; + -o-transition-duration: 500ms; + -webkit-transition-duration: 500ms; + transition-duration: 500ms; + -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; } + /* line 174, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 152, ../../../../general/res/sass/controls/_messages.scss */ + /* line 176, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 156, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok { + /* line 180, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok, .s-message-banner.info { background-color: #285b31; color: #ccc; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok:hover { + .s-message-banner.ok:hover, .s-message-banner.info:hover { background-color: #387e44; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok .s-action { + .s-message-banner.ok .s-action, .s-message-banner.info .s-action { background-color: #18381e; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok .s-action:hover { + .s-message-banner.ok .s-action:hover, .s-message-banner.info .s-action:hover { background-color: #285b31; } - /* line 159, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution { + /* line 184, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution, .s-message-banner.warning, .s-message-banner.alert { background-color: #d35200; color: #ccc; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution:hover { + .s-message-banner.caution:hover, .s-message-banner.warning:hover, .s-message-banner.alert:hover { background-color: #ff6807; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution .s-action { + .s-message-banner.caution .s-action, .s-message-banner.warning .s-action, .s-message-banner.alert .s-action { background-color: #a03e00; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution .s-action:hover { + .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 189, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error { + background-color: #751e21; + color: #ccc; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error:hover { + background-color: #9d292c; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error .s-action { + background-color: #4c1415; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error .s-action:hover { + background-color: #751e21; } /* Paths: t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message > @@ -2597,7 +2646,7 @@ label.checkbox.custom { ... same as above bottom-bar */ -/* line 201, ../../../../general/res/sass/controls/_messages.scss */ +/* line 231, ../../../../general/res/sass/controls/_messages.scss */ .l-message { display: -webkit-flex; display: flex; @@ -2605,52 +2654,52 @@ label.checkbox.custom { flex-direction: row; -webkit-align-items: stretch; align-items: stretch; } - /* line 205, ../../../../general/res/sass/controls/_messages.scss */ + /* line 235, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 210, ../../../../general/res/sass/controls/_messages.scss */ + /* line 240, ../../../../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 216, ../../../../general/res/sass/controls/_messages.scss */ + /* line 246, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } -/* line 165, ../../../../general/res/sass/controls/_messages.scss */ +/* line 195, ../../../../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 167, ../../../../general/res/sass/controls/_messages.scss */ + /* line 197, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } -/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +/* line 204, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { color: #62ba72; } - /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +/* line 208, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { color: #ffa66d; } - /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + /* line 209, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +/* line 212, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { color: #d4585c; } - /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 229, ../../../../general/res/sass/controls/_messages.scss */ + /* line 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { overflow: hidden; @@ -2661,40 +2710,40 @@ label.checkbox.custom { left: 0px; width: auto; height: auto; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 264, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .bottom-bar { top: auto; height: 24px; } } -/* line 165, ../../../../general/res/sass/controls/_messages.scss */ +/* line 195, ../../../../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 167, ../../../../general/res/sass/controls/_messages.scss */ + /* line 197, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } -/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +/* line 204, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { color: #62ba72; } - /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +/* line 208, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { color: #ffa66d; } - /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + /* line 209, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +/* line 212, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { color: #d4585c; } - /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 246, ../../../../general/res/sass/controls/_messages.scss */ +/* line 276, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2702,26 +2751,26 @@ label.checkbox.custom { background: rgba(230, 230, 230, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 253, ../../../../general/res/sass/controls/_messages.scss */ + /* line 283, ../../../../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 259, ../../../../general/res/sass/controls/_messages.scss */ + /* line 289, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 262, ../../../../general/res/sass/controls/_messages.scss */ + /* line 292, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #b3b3b3; } - /* line 263, ../../../../general/res/sass/controls/_messages.scss */ + /* line 293, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 266, ../../../../general/res/sass/controls/_messages.scss */ + /* line 296, ../../../../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 screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/controls/_messages.scss */ + /* line 304, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 896241de5c..db68d1ab11 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -61,9 +61,9 @@ $colorInputIcon: pushBack($colorBodyFg, 15%); // Status colors, mainly used for messaging and item ancillary symbols $colorStatusFg: #ccc; $colorStatusDefault: #ccc; -$colorStatusOk: #62ba72; -$colorStatusCaution: #ffa66d; -$colorStatusAlert: #d4585c; +$colorStatusInfo: #62ba72; +$colorStatusAlert: #ffa66d; +$colorStatusError: #d4585c; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: $colorKey; $progressBarHOverlay: 15px; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 0ae366cd0e..de35232d0c 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; } @@ -2346,12 +2346,15 @@ label.checkbox.custom { .status.block .status-indicator { margin-right: 3px; } /* line 54, ../../../../general/res/sass/controls/_messages.scss */ - .status.block.ok .status-indicator { + .status.block.ok .status-indicator, .status.block.info .status-indicator { color: #60ba7b; } - /* line 57, ../../../../general/res/sass/controls/_messages.scss */ - .status.block.caution .status-indicator { + /* line 58, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.alert .status-indicator, .status.block.warning .status-indicator, .status.block.caution .status-indicator { color: #ffb66c; } - /* line 60, ../../../../general/res/sass/controls/_messages.scss */ + /* line 63, ../../../../general/res/sass/controls/_messages.scss */ + .status.block.error .status-indicator { + color: #c96b68; } + /* line 66, ../../../../general/res/sass/controls/_messages.scss */ .status.block .label { -moz-transition-property: max-width; -o-transition-property: max-width; @@ -2367,7 +2370,7 @@ label.checkbox.custom { transition-timing-function: ease-in-out; overflow: hidden; max-width: 0px; } - /* line 66, ../../../../general/res/sass/controls/_messages.scss */ + /* line 72, ../../../../general/res/sass/controls/_messages.scss */ .status.block .count { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2383,27 +2386,27 @@ label.checkbox.custom { transition-timing-function: ease-in-out; font-weight: bold; opacity: 1; } - /* line 72, ../../../../general/res/sass/controls/_messages.scss */ + /* line 78, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .label { max-width: 450px; width: auto; } - /* line 76, ../../../../general/res/sass/controls/_messages.scss */ + /* line 82, ../../../../general/res/sass/controls/_messages.scss */ .status.block:hover .count { opacity: 0; } /* Styles for messages and message banners */ -/* line 84, ../../../../general/res/sass/controls/_messages.scss */ +/* line 90, ../../../../general/res/sass/controls/_messages.scss */ .message.block { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; padding: 10px; } -/* line 88, ../../../../general/res/sass/controls/_messages.scss */ +/* line 94, ../../../../general/res/sass/controls/_messages.scss */ .message.error { background-color: rgba(255, 83, 58, 0.3); color: #ffaca0; } -/* line 94, ../../../../general/res/sass/controls/_messages.scss */ +/* line 100, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -2432,49 +2435,70 @@ label.checkbox.custom { -webkit-transform: translateX(-50%); transform: translateX(-50%); z-index: 10; } - /* line 110, ../../../../general/res/sass/controls/_messages.scss */ + /* line 116, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner.minimized { + -moz-transition-property: left, opacity; + -o-transition-property: left, opacity; + -webkit-transition-property: left, opacity; + transition-property: left, opacity; + -moz-transition-duration: 0.3s; + -o-transition-duration: 0.3s; + -webkit-transition-duration: 0.3s; + transition-duration: 0.3s; + -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; + left: 0; + opacity: 0; } + /* line 124, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner.new { + left: 50%; + opacity: 1; } + /* line 127, ../../../../general/res/sass/controls/_messages.scss */ + .l-message-banner.new:not(.info) { + -moz-animation-name: pulse; + -webkit-animation-name: pulse; + animation-name: pulse; + -moz-animation-duration: 100ms; + -webkit-animation-duration: 100ms; + animation-duration: 100ms; + -moz-animation-direction: alternate; + -webkit-animation-direction: alternate; + animation-direction: alternate; + -moz-animation-iteration-count: 10; + -webkit-animation-iteration-count: 10; + animation-iteration-count: 10; + -moz-animation-timing-function: ease-in-out; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; } + /* line 132, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .banner-elem { -webkit-flex: 0 1 auto; flex: 0 1 auto; margin-left: 5px; } - /* line 114, ../../../../general/res/sass/controls/_messages.scss */ + /* line 136, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner a { display: inline-block; } - /* line 117, ../../../../general/res/sass/controls/_messages.scss */ + /* line 139, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-action { line-height: 15px; padding: 0 5px; } - /* line 121, ../../../../general/res/sass/controls/_messages.scss */ + /* line 143, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .close { cursor: pointer; font-size: 7px; width: 8px; } - /* line 127, ../../../../general/res/sass/controls/_messages.scss */ + /* line 149, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .l-progress-bar { height: 8px; line-height: 8px; width: 100px; } - /* line 133, ../../../../general/res/sass/controls/_messages.scss */ + /* line 155, ../../../../general/res/sass/controls/_messages.scss */ .l-message-banner .progress-info { display: none; } -/* line 137, ../../../../general/res/sass/controls/_messages.scss */ -.s-message-banner, -.s-message-banner .s-action { - -moz-transition-property: background-color; - -o-transition-property: background-color; - -webkit-transition-property: background-color; - transition-property: background-color; - -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; } - -/* line 142, ../../../../general/res/sass/controls/_messages.scss */ +/* line 165, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -2491,46 +2515,71 @@ label.checkbox.custom { /* line 33, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action:hover { background-color: gray; } - /* line 146, ../../../../general/res/sass/controls/_messages.scss */ + /* line 169, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner a { color: inherit; } - /* line 147, ../../../../general/res/sass/controls/_messages.scss */ + /* line 170, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .s-action { -moz-border-radius: 4px; -webkit-border-radius: 4px; - border-radius: 4px; } - /* line 150, ../../../../general/res/sass/controls/_messages.scss */ + border-radius: 4px; + -moz-transition-property: background-color; + -o-transition-property: background-color; + -webkit-transition-property: background-color; + transition-property: background-color; + -moz-transition-duration: 500ms; + -o-transition-duration: 500ms; + -webkit-transition-duration: 500ms; + transition-duration: 500ms; + -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; } + /* line 174, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close { opacity: 0.5; } - /* line 152, ../../../../general/res/sass/controls/_messages.scss */ + /* line 176, ../../../../general/res/sass/controls/_messages.scss */ .s-message-banner .close:hover { opacity: 1; } - /* line 156, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok { + /* line 180, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.ok, .s-message-banner.info { background-color: #275a36; color: #fff; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok:hover { + .s-message-banner.ok:hover, .s-message-banner.info:hover { background-color: #367e4c; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok .s-action { + .s-message-banner.ok .s-action, .s-message-banner.info .s-action { background-color: #183621; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.ok .s-action:hover { + .s-message-banner.ok .s-action:hover, .s-message-banner.info .s-action:hover { background-color: #275a36; } - /* line 159, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution { + /* line 184, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.caution, .s-message-banner.warning, .s-message-banner.alert { background-color: #d26a00; color: #fff; } /* line 28, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution:hover { + .s-message-banner.caution:hover, .s-message-banner.warning:hover, .s-message-banner.alert:hover { background-color: #ff8306; } /* line 31, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution .s-action { + .s-message-banner.caution .s-action, .s-message-banner.warning .s-action, .s-message-banner.alert .s-action { background-color: #9f5000; } /* line 33, ../../../../general/res/sass/controls/_messages.scss */ - .s-message-banner.caution .s-action:hover { + .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 189, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error { + background-color: #702a28; + color: #fff; } + /* line 28, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error:hover { + background-color: #963835; } + /* line 31, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error .s-action { + background-color: #4a1c1b; } + /* line 33, ../../../../general/res/sass/controls/_messages.scss */ + .s-message-banner.error .s-action:hover { + background-color: #702a28; } /* Paths: t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message > @@ -2545,7 +2594,7 @@ label.checkbox.custom { ... same as above bottom-bar */ -/* line 201, ../../../../general/res/sass/controls/_messages.scss */ +/* line 231, ../../../../general/res/sass/controls/_messages.scss */ .l-message { display: -webkit-flex; display: flex; @@ -2553,52 +2602,52 @@ label.checkbox.custom { flex-direction: row; -webkit-align-items: stretch; align-items: stretch; } - /* line 205, ../../../../general/res/sass/controls/_messages.scss */ + /* line 235, ../../../../general/res/sass/controls/_messages.scss */ .l-message .type-icon.message-type { -webkit-flex: 0 1 auto; flex: 0 1 auto; position: relative; } - /* line 210, ../../../../general/res/sass/controls/_messages.scss */ + /* line 240, ../../../../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 216, ../../../../general/res/sass/controls/_messages.scss */ + /* line 246, ../../../../general/res/sass/controls/_messages.scss */ .l-message .message-contents .top-bar, .l-message .message-contents .message-body { margin-bottom: 20px; } -/* line 165, ../../../../general/res/sass/controls/_messages.scss */ +/* line 195, ../../../../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 167, ../../../../general/res/sass/controls/_messages.scss */ + /* line 197, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .type-icon.message-type:before { content: "\e608"; } -/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +/* line 204, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type { color: #60ba7b; } - /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +/* line 208, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type { color: #ffb66c; } - /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + /* line 209, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +/* line 212, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type { color: #c96b68; } - /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 229, ../../../../general/res/sass/controls/_messages.scss */ + /* line 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { overflow: hidden; @@ -2609,40 +2658,40 @@ label.checkbox.custom { left: 0px; width: auto; height: auto; } - /* line 234, ../../../../general/res/sass/controls/_messages.scss */ + /* line 264, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .bottom-bar { top: auto; height: 24px; } } -/* line 165, ../../../../general/res/sass/controls/_messages.scss */ +/* line 195, ../../../../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 167, ../../../../general/res/sass/controls/_messages.scss */ + /* line 197, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .type-icon.message-type:before { content: "\e608"; } -/* line 174, ../../../../general/res/sass/controls/_messages.scss */ +/* line 204, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type { color: #60ba7b; } - /* line 175, ../../../../general/res/sass/controls/_messages.scss */ + /* line 205, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-info .type-icon.message-type:before { content: "\e608"; } -/* line 178, ../../../../general/res/sass/controls/_messages.scss */ +/* line 208, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type { color: #ffb66c; } - /* line 179, ../../../../general/res/sass/controls/_messages.scss */ + /* line 209, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-alert .type-icon.message-type:before { content: "\e610"; } -/* line 182, ../../../../general/res/sass/controls/_messages.scss */ +/* line 212, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type { color: #c96b68; } - /* line 183, ../../../../general/res/sass/controls/_messages.scss */ + /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-severity-error .type-icon.message-type:before { content: "\21"; } -/* line 246, ../../../../general/res/sass/controls/_messages.scss */ +/* line 276, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -2650,26 +2699,26 @@ label.checkbox.custom { background: rgba(102, 102, 102, 0.1); margin-bottom: 5px; padding: 10px; } - /* line 253, ../../../../general/res/sass/controls/_messages.scss */ + /* line 283, ../../../../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 259, ../../../../general/res/sass/controls/_messages.scss */ + /* line 289, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents { font-size: 0.9em; margin-left: 10px; } - /* line 262, ../../../../general/res/sass/controls/_messages.scss */ + /* line 292, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .message-action { color: #999999; } - /* line 263, ../../../../general/res/sass/controls/_messages.scss */ + /* line 293, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message .message-contents .bottom-bar { text-align: left; } - /* line 266, ../../../../general/res/sass/controls/_messages.scss */ + /* line 296, ../../../../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 screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/controls/_messages.scss */ + /* line 304, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 02e0f7ab11..8a1d54642b 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -61,9 +61,9 @@ $colorInputIcon: pushBack($colorBodyFg, 25%); // Status colors, mainly used for messaging and item ancillary symbols $colorStatusFg: #fff; $colorStatusDefault: #ccc; -$colorStatusOk: #60ba7b; -$colorStatusCaution: #ffb66c; -$colorStatusAlert: #c96b68; +$colorStatusInfo: #60ba7b; +$colorStatusAlert: #ffb66c; +$colorStatusError: #c96b68; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: #0a0; $progressBarHOverlay: 15px; From ee382be38d49fbe2fe55ddba1960efcf223f5173 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 14 Oct 2015 11:45:39 -0700 Subject: [PATCH 038/201] Added transitions and severity classes --- .../dialog/res/templates/message.html | 1 - platform/commonUI/dialog/src/DialogService.js | 17 +---- .../general/res/templates/message-banner.html | 7 +- .../src/controllers/BannerController.js | 5 +- platform/commonUI/notification/bundle.json | 6 +- .../res/notification-indicator.html | 3 +- .../notification/src/NotificationService.js | 66 +++++++++++-------- .../src/NotificationLaunchController.js | 4 +- 8 files changed, 56 insertions(+), 53 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index 28bd09cbb1..ecf598daf4 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -1,6 +1,5 @@
-
\ No newline at end of file diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index 7089e3a714..8bbf5e21c1 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -28,7 +28,12 @@ define( function BannerController($scope, notificationService, dialogService) { $scope.active = notificationService.active; $scope.MessageSeverity = MessageSeverity; - $scope.dismiss = function(notification) { + $scope.action = function (action, $event){ + $event.stopPropagation(); + return action(); + } + $scope.dismiss = function(notification, $event) { + $event.stopPropagation(); notificationService.dismissOrMinimize(notification); }; $scope.maximize = function(notification) { diff --git a/platform/commonUI/notification/bundle.json b/platform/commonUI/notification/bundle.json index d8958d0ac1..d729e42673 100644 --- a/platform/commonUI/notification/bundle.json +++ b/platform/commonUI/notification/bundle.json @@ -34,7 +34,8 @@ ], "indicators": [ { - "implementation": "NotificationIndicator.js" + "implementation": "NotificationIndicator.js", + "priority": "fallback" } ], "services": [ diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 8a74fc7a3f..411e3727cb 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -180,7 +180,7 @@ define( notifications queued for display, setup a timeout to dismiss the dialog. */ - if (notification && (notification.autoDismiss !== false + if (notification && (notification.autoDismiss || this.selectNextNotification())) { timeout = notification.autoDismiss || this.DEFAULT_AUTO_DISMISS; diff --git a/testing/dialogTest/bundle.json b/testing/dialogTest/bundle.json index 0e55477bda..1b1acf6cc0 100644 --- a/testing/dialogTest/bundle.json +++ b/testing/dialogTest/bundle.json @@ -34,10 +34,12 @@ ], "indicators": [ { - "implementation": "DialogLaunchIndicator.js" + "implementation": "DialogLaunchIndicator.js", + "priority": "fallback" }, { - "implementation": "NotificationLaunchIndicator.js" + "implementation": "NotificationLaunchIndicator.js", + "priority": "fallback" } ] } From 301b73c6c605fff4cc4beb5dacf6bc213cb3c11f Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 14 Oct 2015 14:16:37 -0700 Subject: [PATCH 041/201] Banner notifications are not maximized if 'info' message --- .../commonUI/general/src/controllers/BannerController.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index 8bbf5e21c1..2baa18f9b5 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -37,10 +37,12 @@ define( notificationService.dismissOrMinimize(notification); }; $scope.maximize = function(notification) { - notification.cancel = function(){ - dialogService.dismiss(); + if (notification.severity > MessageSeverity.INFO){ + notification.cancel = function(){ + dialogService.dismiss(); + } + dialogService.showBlockingMessage(notification); } - dialogService.showBlockingMessage(notification); } } return BannerController; From f08725b6a27cacbe45f85d1282d16fbe0f0f4974 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 14 Oct 2015 15:03:29 -0700 Subject: [PATCH 042/201] Fixed jshint errors --- .../general/src/controllers/BannerController.js | 6 +++--- testing/dialogTest/bundle.json | 1 + testing/dialogTest/src/NotificationLaunchController.js | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index 2baa18f9b5..a59860f884 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -31,7 +31,7 @@ define( $scope.action = function (action, $event){ $event.stopPropagation(); return action(); - } + }; $scope.dismiss = function(notification, $event) { $event.stopPropagation(); notificationService.dismissOrMinimize(notification); @@ -40,10 +40,10 @@ define( if (notification.severity > MessageSeverity.INFO){ notification.cancel = function(){ dialogService.dismiss(); - } + }; dialogService.showBlockingMessage(notification); } - } + }; } return BannerController; }); \ No newline at end of file diff --git a/testing/dialogTest/bundle.json b/testing/dialogTest/bundle.json index 1b1acf6cc0..bb2d464d64 100644 --- a/testing/dialogTest/bundle.json +++ b/testing/dialogTest/bundle.json @@ -28,6 +28,7 @@ "depends": [ "$scope", "$timeout", + "$log", "notificationService" ] } diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/testing/dialogTest/src/NotificationLaunchController.js index eb38fcb3c3..63b436a894 100644 --- a/testing/dialogTest/src/NotificationLaunchController.js +++ b/testing/dialogTest/src/NotificationLaunchController.js @@ -26,13 +26,13 @@ define( function (MessageSeverity) { "use strict"; - function NotificationLaunchController($scope, $timeout, notificationService) { + function NotificationLaunchController($scope, $timeout, $log, notificationService) { var messageCounter = 1; $scope.newSuccess = function(){ notificationService.info({ title: "Success notification!" - }) + }); }; function getExampleActionText() { @@ -90,7 +90,7 @@ define( primaryAction: { label: 'Retry', action: function() { - console.log('Retry clicked'); + $log.info('Retry clicked'); } }, actions: getExampleActions()}); @@ -105,7 +105,7 @@ define( primaryAction: { label: 'Retry', action: function() { - console.log('Retry clicked'); + $log.info('Retry clicked'); } }, actions: getExampleActions()}); @@ -127,7 +127,7 @@ define( notification.progressText = ["Estimated time remaining:" + " about ", 60 - Math.floor((notification.progress / 100) * 60), " seconds"].join(" "); if (notification.progress < 100) { - $timeout(function(){incrementProgress(notification)}, 1000); + $timeout(function(){incrementProgress(notification);}, 1000); } } From 821a1a485c246e27e94ebf3cf7dc984dc7ddcdac Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 14 Oct 2015 16:44:02 -0700 Subject: [PATCH 043/201] [Production] Updated symbols font to v25 open #188 Added icon-dataset e611; --- .../icomoon.io-WTD-symbols-project.json | 324 ++++++++++++------ .../general/res/fonts/symbols/wtdsymbols.eot | Bin 11216 -> 11672 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 5 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 11040 -> 11496 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 11116 -> 11572 bytes 5 files changed, 221 insertions(+), 108 deletions(-) diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json index 7982d57200..9ff51f9f04 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json @@ -1,14 +1,38 @@ { "metadata": { - "name": "WTD Symbols v24", - "lastOpened": 1441992412958, - "created": 1441992410384 + "name": "WTD Symbols v25", + "lastOpened": 1444865544920, + "created": 1444865541293 }, "iconSets": [ { "selection": [ { - "order": 86, + "order": 108, + "id": 88, + "prevSize": 32, + "code": 58897, + "name": "icon-dataset", + "tempChar": "" + }, + { + "order": 90, + "id": 87, + "prevSize": 32, + "code": 58896, + "name": "icon-bell", + "tempChar": "" + }, + { + "order": 91, + "id": 86, + "prevSize": 32, + "code": 58889, + "name": "icon-hourglass", + "tempChar": "" + }, + { + "order": 92, "id": 85, "prevSize": 32, "code": 58888, @@ -18,119 +42,119 @@ 58890 ], "name": "icon-info-v15", - "tempChar": "" + "tempChar": "" }, { - "order": 82, + "order": 93, "id": 84, "prevSize": 32, "code": 58887, "name": "icon-x-in-circle", - "tempChar": "" + "tempChar": "" }, { - "order": 77, + "order": 94, "id": 83, "prevSize": 32, "code": 58881, "name": "icon-datatable", - "tempChar": "" + "tempChar": "" }, { - "order": 78, + "order": 95, "id": 82, "prevSize": 32, "code": 58882, "name": "icon-tabular-scrolling", - "tempChar": "" + "tempChar": "" }, { - "order": 79, + "order": 96, "id": 81, "prevSize": 32, "code": 58884, "name": "icon-tabular", - "tempChar": "" + "tempChar": "" }, { - "order": 80, + "order": 97, "id": 80, "prevSize": 32, "code": 58885, "name": "icon-calendar", - "tempChar": "" + "tempChar": "" }, { - "order": 83, + "order": 98, "id": 78, "prevSize": 32, "code": 58886, "name": "icon-paint-bucket", - "tempChar": "" + "tempChar": "" }, { - "order": 1, + "order": 99, "id": 75, "prevSize": 32, "code": 123, "name": "icon-pointer-left", - "tempChar": "" + "tempChar": "" }, { - "order": 3, + "order": 100, "id": 74, "prevSize": 32, "code": 125, "name": "icon-pointer-right", - "tempChar": "" + "tempChar": "" }, { - "order": 4, + "order": 101, "id": 73, "prevSize": 32, "code": 80, "name": "icon-person", - "tempChar": "" + "tempChar": "" }, { - "order": 5, + "order": 102, "id": 72, "prevSize": 32, "code": 232, "name": "icon-chain-links", - "tempChar": "" + "tempChar": "" }, { - "order": 6, + "order": 103, "id": 71, "prevSize": 32, "code": 115, "name": "icon-database-in-brackets", - "tempChar": "" + "tempChar": "" }, { - "order": 7, + "order": 104, "id": 70, "prevSize": 32, "code": 114, "name": "icon-refresh", - "tempChar": "" + "tempChar": "" }, { - "order": 8, + "order": 105, "id": 69, "prevSize": 32, "code": 108, "name": "icon-lock", - "tempChar": "" + "tempChar": "" }, { - "order": 9, + "order": 106, "id": 68, "prevSize": 32, "code": 51, "name": "icon-box-with-dashed-lines", - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -138,7 +162,7 @@ "prevSize": 32, "code": 58880, "name": "icon-box-with-arrow-cursor", - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -146,7 +170,7 @@ "prevSize": 32, "code": 65, "name": "icon-activity-mode", - "tempChar": "" + "tempChar": "" }, { "order": 12, @@ -154,15 +178,15 @@ "prevSize": 32, "code": 97, "name": "icon-activity", - "tempChar": "" + "tempChar": "" }, { - "order": 13, + "order": 87, "id": 64, "prevSize": 32, "code": 33, "name": "icon-alert-rect", - "tempChar": "" + "tempChar": "" }, { "order": 14, @@ -170,7 +194,7 @@ "prevSize": 32, "code": 58883, "name": "icon-alert-triangle", - "tempChar": "" + "tempChar": "" }, { "order": 15, @@ -178,7 +202,7 @@ "prevSize": 32, "code": 238, "name": "icon-arrow-double-down", - "tempChar": "" + "tempChar": "" }, { "order": 16, @@ -186,7 +210,7 @@ "prevSize": 32, "code": 235, "name": "icon-arrow-double-up", - "tempChar": "" + "tempChar": "" }, { "order": 2, @@ -194,7 +218,7 @@ "prevSize": 32, "code": 118, "name": "icon-arrow-down", - "tempChar": "" + "tempChar": "" }, { "order": 19, @@ -202,7 +226,7 @@ "prevSize": 32, "code": 60, "name": "icon-arrow-left", - "tempChar": "" + "tempChar": "" }, { "order": 20, @@ -210,7 +234,7 @@ "prevSize": 32, "code": 62, "name": "icon-arrow-right", - "tempChar": "" + "tempChar": "" }, { "order": 21, @@ -218,7 +242,7 @@ "prevSize": 32, "code": 236, "name": "icon-arrow-tall-down", - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -226,7 +250,7 @@ "prevSize": 32, "code": 237, "name": "icon-arrow-tall-up", - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -234,7 +258,7 @@ "prevSize": 32, "code": 94, "name": "icon-arrow-up", - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -242,7 +266,7 @@ "prevSize": 32, "code": 73, "name": "icon-arrows-out", - "tempChar": "" + "tempChar": "" }, { "order": 25, @@ -250,7 +274,7 @@ "prevSize": 32, "code": 58893, "name": "icon-arrows-right-left", - "tempChar": "" + "tempChar": "" }, { "order": 33, @@ -258,7 +282,7 @@ "prevSize": 32, "code": 53, "name": "icon-arrows-up-down", - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -266,7 +290,7 @@ "prevSize": 32, "code": 42, "name": "icon-asterisk", - "tempChar": "" + "tempChar": "" }, { "order": 27, @@ -274,7 +298,7 @@ "prevSize": 32, "code": 72, "name": "icon-autoflow-tabular", - "tempChar": "" + "tempChar": "" }, { "order": 28, @@ -282,7 +306,7 @@ "prevSize": 32, "code": 224, "name": "icon-box", - "tempChar": "" + "tempChar": "" }, { "order": 29, @@ -290,7 +314,7 @@ "prevSize": 32, "code": 50, "name": "icon-check", - "tempChar": "" + "tempChar": "" }, { "order": 30, @@ -298,7 +322,7 @@ "prevSize": 32, "code": 67, "name": "icon-clock", - "tempChar": "" + "tempChar": "" }, { "order": 31, @@ -306,7 +330,7 @@ "prevSize": 32, "code": 46, "name": "icon-connectivity", - "tempChar": "" + "tempChar": "" }, { "order": 32, @@ -314,7 +338,7 @@ "prevSize": 32, "code": 100, "name": "icon-database-query", - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -322,7 +346,7 @@ "prevSize": 32, "code": 68, "name": "icon-database", - "tempChar": "" + "tempChar": "" }, { "order": 35, @@ -330,7 +354,7 @@ "prevSize": 32, "code": 81, "name": "icon-dictionary", - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -338,7 +362,7 @@ "prevSize": 32, "code": 242, "name": "icon-duplicate", - "tempChar": "" + "tempChar": "" }, { "order": 37, @@ -346,7 +370,7 @@ "prevSize": 32, "code": 102, "name": "icon-folder-new", - "tempChar": "" + "tempChar": "" }, { "order": 38, @@ -354,7 +378,7 @@ "prevSize": 32, "code": 70, "name": "icon-folder", - "tempChar": "" + "tempChar": "" }, { "order": 39, @@ -362,7 +386,7 @@ "prevSize": 32, "code": 95, "name": "icon-fullscreen-collapse", - "tempChar": "" + "tempChar": "" }, { "order": 40, @@ -370,7 +394,7 @@ "prevSize": 32, "code": 122, "name": "icon-fullscreen-expand", - "tempChar": "" + "tempChar": "" }, { "order": 41, @@ -378,7 +402,7 @@ "prevSize": 32, "code": 71, "name": "icon-gear", - "tempChar": "" + "tempChar": "" }, { "order": 49, @@ -386,7 +410,7 @@ "prevSize": 32, "code": 227, "name": "icon-image", - "tempChar": "" + "tempChar": "" }, { "order": 42, @@ -394,7 +418,7 @@ "prevSize": 32, "code": 225, "name": "icon-layers", - "tempChar": "" + "tempChar": "" }, { "order": 43, @@ -402,7 +426,7 @@ "prevSize": 32, "code": 76, "name": "icon-layout", - "tempChar": "" + "tempChar": "" }, { "order": 44, @@ -410,7 +434,7 @@ "prevSize": 32, "code": 226, "name": "icon-line-horz", - "tempChar": "" + "tempChar": "" }, { "order": 75, @@ -418,7 +442,7 @@ "prevSize": 32, "code": 244, "name": "icon-link", - "tempChar": "" + "tempChar": "" }, { "order": 46, @@ -426,7 +450,7 @@ "prevSize": 32, "code": 88, "name": "icon-magnify-in", - "tempChar": "" + "tempChar": "" }, { "order": 47, @@ -434,7 +458,7 @@ "prevSize": 32, "code": 89, "name": "icon-magnify-out", - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -442,7 +466,7 @@ "prevSize": 32, "code": 77, "name": "icon-magnify", - "tempChar": "" + "tempChar": "" }, { "order": 34, @@ -450,7 +474,7 @@ "prevSize": 32, "code": 109, "name": "icon-menu", - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -458,7 +482,7 @@ "prevSize": 32, "code": 243, "name": "icon-move", - "tempChar": "" + "tempChar": "" }, { "order": 51, @@ -466,7 +490,7 @@ "prevSize": 32, "code": 121, "name": "icon-new-window", - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -474,7 +498,7 @@ "prevSize": 32, "code": 111, "name": "icon-object", - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -482,7 +506,7 @@ "prevSize": 32, "code": 63, "name": "icon-object-unknown", - "tempChar": "" + "tempChar": "" }, { "order": 53, @@ -490,7 +514,7 @@ "prevSize": 32, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -498,7 +522,7 @@ "prevSize": 32, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -506,7 +530,7 @@ "prevSize": 32, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -514,7 +538,7 @@ "prevSize": 32, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { "order": 65, @@ -522,7 +546,7 @@ "prevSize": 32, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -530,7 +554,7 @@ "prevSize": 32, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -538,7 +562,7 @@ "prevSize": 32, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -546,7 +570,7 @@ "prevSize": 32, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -554,7 +578,7 @@ "prevSize": 32, "code": 45, "name": "icon-minus", - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -562,7 +586,7 @@ "prevSize": 32, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -570,7 +594,7 @@ "prevSize": 32, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -578,7 +602,7 @@ "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -586,7 +610,7 @@ "prevSize": 32, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { "order": 18, @@ -594,7 +618,7 @@ "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -602,7 +626,7 @@ "prevSize": 32, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -610,7 +634,7 @@ "prevSize": 32, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -618,7 +642,7 @@ "prevSize": 32, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -626,7 +650,7 @@ "prevSize": 32, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -634,7 +658,7 @@ "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -642,7 +666,7 @@ "prevSize": 32, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -650,7 +674,7 @@ "prevSize": 32, "code": 58946, "name": "icon-x", - "tempChar": "" + "tempChar": "" } ], "id": 2, @@ -665,6 +689,74 @@ "height": 1024, "prevSize": 32, "icons": [ + { + "id": 88, + "paths": [ + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM320 896h-128v-320h128v320zM576 896h-128v-320h128v320zM832 896h-128v-320h128v320z" + ], + "attrs": [], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-dataset" + ], + "colorPermutations": { + "125525525516161751": [] + } + }, + { + "id": 87, + "paths": [ + "M512 1024c106 0 192-86 192-192h-384c0 106 86 192 192 192z", + "M896 448v-64c0-212-172-384-384-384s-384 172-384 384v64c0 70.6-57.4 128-128 128v128h1024v-128c-70.6 0-128-57.4-128-128z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-bell" + ], + "colorPermutations": { + "125525525516161751": [ + 1, + 1 + ] + } + }, + { + "id": 86, + "paths": [ + "M1024 0h-1024c0 282.8 229.2 512 512 512s512-229.2 512-512zM512 384c-102.6 0-199-40-271.6-112.4-41.2-41.2-72-90.2-90.8-143.6h724.6c-18.8 53.4-49.6 102.4-90.8 143.6-72.4 72.4-168.8 112.4-271.4 112.4z", + "M512 512c-282.8 0-512 229.2-512 512h1024c0-282.8-229.2-512-512-512z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-hourglass" + ], + "colorPermutations": { + "125525525516161751": [ + 1, + 1 + ] + } + }, { "id": 85, "paths": [ @@ -698,7 +790,8 @@ "icon-x-in-circle" ], "colorPermutations": { - "16161751": [] + "16161751": [], + "125525525516161751": [] } }, { @@ -899,6 +992,11 @@ 1, 1, 1 + ], + "125525525516161751": [ + 1, + 1, + 1 ] } }, @@ -1051,18 +1149,28 @@ { "id": 67, "paths": [ - "M832 512.4c0-0.2 0-0.2 0-0.4v-320c0-105.6-86.4-192-192-192h-448c-105.6 0-192 86.4-192 192v320c0 105.6 86.4 192 192 192h263.6l-197.2-445.6 573.6 254z", - "M766.8 659.8l193.8-20.4-576.6-255.4 255.4 576.6 20.4-193.8 257 257.2 107.2-107.2z" + "M894-2h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h400c-2.2-3.8-4-7.6-5.8-11.4l-255.2-576.8c-21.4-48.4-10.8-105 26.6-142.4 24.4-24.4 57.2-37.4 90.4-37.4 17.4 0 35.2 3.6 51.8 11l576.6 255.4c4 1.8 7.8 3.8 11.4 5.8v-400.2c0.2-70.4-57.4-128-127.8-128z", + "M958.6 637.4l-576.6-255.4 255.4 576.6 64.6-128.6 192 192 128-128-192-192z" ], "attrs": [ - {}, - {} + { + "fill": "rgb(0, 0, 0)" + }, + { + "fill": "rgb(0, 0, 0)" + } ], "isMulticolor": false, "grid": 0, "tags": [ "icon-box-with-arrow-cursor" - ] + ], + "colorPermutations": { + "125525525516161751": [ + 0, + 0 + ] + } }, { "id": 66, @@ -1338,6 +1446,9 @@ "colorPermutations": { "16161751": [ 0 + ], + "125525525516161751": [ + 0 ] } }, @@ -14853,6 +14964,5 @@ "gridSize": 16, "showLiga": false }, - "uid": -1, - "time": 1441993324496 + "uid": -1 } \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 95887455fe74465bcec2c835663ff125999ddb60..987277675a6c19a701daa242bc478b161fae67b5 100755 GIT binary patch delta 797 zcmX|7OHUI~6h8OPbc#IMP9GGS(mE|nTdhMvnbsg7gAxpmwGA6$G)jX=K`Miwq9%5T zOIVbQF}QR^;=&laF~NihD`H$2CH{nlm_T%)3#A?JfUr3C-0%C&`}4@^HD>h;z)pOH zNz!T0aA`$)RdnHx@|{g7Qc1FI^;?7&;A<4h_(HIEg!e6J32+L?J#x zrr~VJYC~a9$c8;!w}8Vm>_c{GeQIibDO-c|aw;I$@U~3|CYRGDM<1w^ZvM@5s>&iMc3is!Vjw^Q&YIU2P$v>l_~7cAuikG* zVK%{X$B)+L4mVbHRYh=U+SPi_R+Era(~nHs<=6bBVNd#|z4sS1(B?|;WnlIFk=Ncv zQfQ>S6X6jyYMLV!(d^MiEfssg-LqF5ykpAoj%{Zjuy5EsXWV(-sW`V>&45V$NcnrL Gg8l(n4$XrA delta 459 zcmbOceIcCff;Iz#g7!o}okbYPw*Z zf8}i)kRJlnu&N-xxP*ZjD8m4BG*F&_nfdMH0>)}?1t8Cb!GVF5fo1YHMr&q{XS|cm znA|7VGdZ!lN(ln>FiyV6ka6F? zDWd=X?mzVJfA;2IioaPV7pm(_4waar%m{QA69dDU84o|k^V@u7;AQ~|Ffd$_IOqnW zCueAyGlpzlpsB_PR5|&Cmipx1TGQ0y_%8_v34{sE6BH0k5}YM?OYnn`9Z(O*#1Mv3 T24ENi0Ta+u!kf=)pJW68i>`Yr diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg index 596a5dd3e9..021abf31c6 100755 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -76,7 +76,7 @@ - + @@ -85,6 +85,9 @@ + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index 8f0f1d96108c2bb7c738154e5049a7a1c1e23b29..d08b3099cc34de7d659c5f8cfb69586cb70da40b 100755 GIT binary patch delta 796 zcmX|A-%ry}6h8O1+aSQU?gxWqY<7iiC@E&68$l$U5)9V4MH7jM5f((oWHJO5W8z9; z;sZQPYmC0>6VV4_+=~e&G&~XGlM?@g#TSV__@b=!7KA3Jr{8x@&;8Dq+?SWWUoHaz zfF@9Yg5#Nsy)oCe%|@7yBqk<{xzbnrw?6?e;H#=u=WpdmCkdXXOZj05x6hakIt}h$)jb+k=pz3G;(q*!Uq0vBT#Q*kvC7vLT$A++o z!hD3NVeQCfN1Qio$6mHiz#I*`kX>0X6xLU=I;2;VLBWo2b&4Z)l>;mEgh}G)H<)W!mF!_d0?61O^6`nvB%M6n6jPybKI#cYyL{89)K{11zEp4C*34 zzDh=JNre+Ti!hLH0W>clCqLOSvF3Sk6a#}s2T;MP+{B6kh9rh^1_n(NAYUObF*jBI z%G)>~KLn^@RY87n3DBWHpba7v7?_#gPCQV}tpMb>FgP%O_GG)pEUH|_83j^~31|bGXpurZ5hJq$)%8E*CqJkn~ z#){0W?B=S%=8Wdd4u$^z9Q+Fl{TVrqG1)mD`n&(XC?jJw;{isn=)VL0g^c_DO%eV7 zcmJV(|FbuHDgI`ed{9ki@>20R%AlZSVqiEk@)e!C8X01V0Gb0rh}P3}Gl`00uD- OFabR!yjfoRBqIRaymVLq diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index d5bc74071ceb1fb9c17b2bc85141299efb8aa372..816eda299a06edbe316c6ff0e3657a744174bc1c 100755 GIT binary patch delta 856 zcmX|AOH30%82)E=+k()?cKZNQTDL9RR%%Ho+Zt?0QBuVUZ9GU~jHcmLNGnA^FeY|M zycjrCH!*lr4xIzu;HXPBgCtEAs&>(gBP`}GZmQRoByA0zWraD`F?rhifu8K zNB{z|PWC_(wZU(Il?=8$2=YbUXg*T_Kv{wTiXFqJ-;Q0+i(EWWbXC^;Whxo zAjRl~N-EZ)fE#|cLZd`{uo{c)`@GdEBAu^j0b;xWv=(v0pj z`H7!^IA}ntJVd88jeGh%PWgb&A(LXmXB!i318o*y0FfCCl%L|9vskOvwwWrk4NmAF zIRv-X%2{k-A%uL47>V|waJS8_aUwg{BYOA_K5CEpn7b8_l1T}bFvc~L(P8dt)wk(! zoY68#slT#S>sMu!*-lDS$7nI`_of_XUZbsH2BDIatSr|mTgya*pgbY`VT+`Tn#uyB zlK<5DzY>cRhr9c*gxsQ!R3jLW&VW2tw*gy)o)Gr1@E6i6o72;qE9oi>twx<81Ku@+ zT#?lw%CYrZMx{R0Rps7@YtZi>bVYjQ!w<>800SsvVxUOuK@B=+2hem!B!P?qNi-Wt z+m0++k5!P|qJ$weTa^oGB*&&!(y7&{SW;q1ukk`UHH+hM%Fvs*l$7P9M1mc~Zh-)V zAPlGIv_q&1g^;H{b*02RjL5@(9<~eH^Y~o1>U27XjIO~ delta 482 zcmdlI^(IWL+~3WOfsp|Sv~w7^!L$Mc)8s-Xv57ju^=!$xi3JP{j2S>|1HzY2y+59w zSPT?nS^`we0mTC8IhAQZu{8_~Dm5Vd_}jhCjMT&w1_pHvpc*p}X7@kNn*kIAiX{N~ zDj>{$fJHPTx1<6n)&ev?0EC^`S%h=)lY#2|G_C*@tpeei=fzREi4{PLH5-6@1u#xx zD9=mGO$CZA0BQuPV_YSF`1^V`WhjMdxka6F?DWd=X?mzVJfA;2SioaPV^Q!AicGXxcb7scFkMaCAUm3VrfDU9}xFm7V z4MtC9(KKfa*=(b!#>m9LFgZm_ee!gzX|i$rmjr|a!UX0C3J4|%&Jw&O_(8}Hs0S3A LA)EcQpD_XejS_dG From be79c104fba007679aa550d1df54b7b905d099e5 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 20 Oct 2015 12:36:11 -0700 Subject: [PATCH 044/201] [Frontend] Added new glyph prod-uisymbols Added e612 Save icon; --- .../icomoon.io-WTD-symbols-project.json | 206 ++++++++++-------- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 11672 -> 11836 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 1 + .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 11496 -> 11660 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 11572 -> 11736 bytes 5 files changed, 121 insertions(+), 86 deletions(-) diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json index 9ff51f9f04..72c9a01fa2 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json @@ -1,19 +1,27 @@ { "metadata": { - "name": "WTD Symbols v25", - "lastOpened": 1444865544920, - "created": 1444865541293 + "name": "WTD Symbols", + "lastOpened": 1445369623428, + "created": 1445367449289 }, "iconSets": [ { "selection": [ + { + "order": 109, + "id": 89, + "prevSize": 32, + "code": 58898, + "name": "icon-save", + "tempChar": "" + }, { "order": 108, "id": 88, "prevSize": 32, "code": 58897, "name": "icon-dataset", - "tempChar": "" + "tempChar": "" }, { "order": 90, @@ -21,7 +29,7 @@ "prevSize": 32, "code": 58896, "name": "icon-bell", - "tempChar": "" + "tempChar": "" }, { "order": 91, @@ -29,7 +37,7 @@ "prevSize": 32, "code": 58889, "name": "icon-hourglass", - "tempChar": "" + "tempChar": "" }, { "order": 92, @@ -42,7 +50,7 @@ 58890 ], "name": "icon-info-v15", - "tempChar": "" + "tempChar": "" }, { "order": 93, @@ -50,7 +58,7 @@ "prevSize": 32, "code": 58887, "name": "icon-x-in-circle", - "tempChar": "" + "tempChar": "" }, { "order": 94, @@ -58,7 +66,7 @@ "prevSize": 32, "code": 58881, "name": "icon-datatable", - "tempChar": "" + "tempChar": "" }, { "order": 95, @@ -66,7 +74,7 @@ "prevSize": 32, "code": 58882, "name": "icon-tabular-scrolling", - "tempChar": "" + "tempChar": "" }, { "order": 96, @@ -74,7 +82,7 @@ "prevSize": 32, "code": 58884, "name": "icon-tabular", - "tempChar": "" + "tempChar": "" }, { "order": 97, @@ -82,7 +90,7 @@ "prevSize": 32, "code": 58885, "name": "icon-calendar", - "tempChar": "" + "tempChar": "" }, { "order": 98, @@ -90,7 +98,7 @@ "prevSize": 32, "code": 58886, "name": "icon-paint-bucket", - "tempChar": "" + "tempChar": "" }, { "order": 99, @@ -98,7 +106,7 @@ "prevSize": 32, "code": 123, "name": "icon-pointer-left", - "tempChar": "" + "tempChar": "" }, { "order": 100, @@ -106,7 +114,7 @@ "prevSize": 32, "code": 125, "name": "icon-pointer-right", - "tempChar": "" + "tempChar": "" }, { "order": 101, @@ -114,7 +122,7 @@ "prevSize": 32, "code": 80, "name": "icon-person", - "tempChar": "" + "tempChar": "" }, { "order": 102, @@ -122,7 +130,7 @@ "prevSize": 32, "code": 232, "name": "icon-chain-links", - "tempChar": "" + "tempChar": "" }, { "order": 103, @@ -130,7 +138,7 @@ "prevSize": 32, "code": 115, "name": "icon-database-in-brackets", - "tempChar": "" + "tempChar": "" }, { "order": 104, @@ -138,7 +146,7 @@ "prevSize": 32, "code": 114, "name": "icon-refresh", - "tempChar": "" + "tempChar": "" }, { "order": 105, @@ -146,7 +154,7 @@ "prevSize": 32, "code": 108, "name": "icon-lock", - "tempChar": "" + "tempChar": "" }, { "order": 106, @@ -154,7 +162,7 @@ "prevSize": 32, "code": 51, "name": "icon-box-with-dashed-lines", - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -162,7 +170,7 @@ "prevSize": 32, "code": 58880, "name": "icon-box-with-arrow-cursor", - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -170,7 +178,7 @@ "prevSize": 32, "code": 65, "name": "icon-activity-mode", - "tempChar": "" + "tempChar": "" }, { "order": 12, @@ -178,7 +186,7 @@ "prevSize": 32, "code": 97, "name": "icon-activity", - "tempChar": "" + "tempChar": "" }, { "order": 87, @@ -186,7 +194,7 @@ "prevSize": 32, "code": 33, "name": "icon-alert-rect", - "tempChar": "" + "tempChar": "" }, { "order": 14, @@ -194,7 +202,7 @@ "prevSize": 32, "code": 58883, "name": "icon-alert-triangle", - "tempChar": "" + "tempChar": "" }, { "order": 15, @@ -202,7 +210,7 @@ "prevSize": 32, "code": 238, "name": "icon-arrow-double-down", - "tempChar": "" + "tempChar": "" }, { "order": 16, @@ -210,7 +218,7 @@ "prevSize": 32, "code": 235, "name": "icon-arrow-double-up", - "tempChar": "" + "tempChar": "" }, { "order": 2, @@ -218,7 +226,7 @@ "prevSize": 32, "code": 118, "name": "icon-arrow-down", - "tempChar": "" + "tempChar": "" }, { "order": 19, @@ -226,7 +234,7 @@ "prevSize": 32, "code": 60, "name": "icon-arrow-left", - "tempChar": "" + "tempChar": "" }, { "order": 20, @@ -234,7 +242,7 @@ "prevSize": 32, "code": 62, "name": "icon-arrow-right", - "tempChar": "" + "tempChar": "" }, { "order": 21, @@ -242,7 +250,7 @@ "prevSize": 32, "code": 236, "name": "icon-arrow-tall-down", - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -250,7 +258,7 @@ "prevSize": 32, "code": 237, "name": "icon-arrow-tall-up", - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -258,7 +266,7 @@ "prevSize": 32, "code": 94, "name": "icon-arrow-up", - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -266,7 +274,7 @@ "prevSize": 32, "code": 73, "name": "icon-arrows-out", - "tempChar": "" + "tempChar": "" }, { "order": 25, @@ -274,7 +282,7 @@ "prevSize": 32, "code": 58893, "name": "icon-arrows-right-left", - "tempChar": "" + "tempChar": "" }, { "order": 33, @@ -282,7 +290,7 @@ "prevSize": 32, "code": 53, "name": "icon-arrows-up-down", - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -290,7 +298,7 @@ "prevSize": 32, "code": 42, "name": "icon-asterisk", - "tempChar": "" + "tempChar": "" }, { "order": 27, @@ -298,7 +306,7 @@ "prevSize": 32, "code": 72, "name": "icon-autoflow-tabular", - "tempChar": "" + "tempChar": "" }, { "order": 28, @@ -306,7 +314,7 @@ "prevSize": 32, "code": 224, "name": "icon-box", - "tempChar": "" + "tempChar": "" }, { "order": 29, @@ -314,7 +322,7 @@ "prevSize": 32, "code": 50, "name": "icon-check", - "tempChar": "" + "tempChar": "" }, { "order": 30, @@ -322,7 +330,7 @@ "prevSize": 32, "code": 67, "name": "icon-clock", - "tempChar": "" + "tempChar": "" }, { "order": 31, @@ -330,7 +338,7 @@ "prevSize": 32, "code": 46, "name": "icon-connectivity", - "tempChar": "" + "tempChar": "" }, { "order": 32, @@ -338,7 +346,7 @@ "prevSize": 32, "code": 100, "name": "icon-database-query", - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -346,7 +354,7 @@ "prevSize": 32, "code": 68, "name": "icon-database", - "tempChar": "" + "tempChar": "" }, { "order": 35, @@ -354,7 +362,7 @@ "prevSize": 32, "code": 81, "name": "icon-dictionary", - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -362,7 +370,7 @@ "prevSize": 32, "code": 242, "name": "icon-duplicate", - "tempChar": "" + "tempChar": "" }, { "order": 37, @@ -370,7 +378,7 @@ "prevSize": 32, "code": 102, "name": "icon-folder-new", - "tempChar": "" + "tempChar": "" }, { "order": 38, @@ -378,7 +386,7 @@ "prevSize": 32, "code": 70, "name": "icon-folder", - "tempChar": "" + "tempChar": "" }, { "order": 39, @@ -386,7 +394,7 @@ "prevSize": 32, "code": 95, "name": "icon-fullscreen-collapse", - "tempChar": "" + "tempChar": "" }, { "order": 40, @@ -394,7 +402,7 @@ "prevSize": 32, "code": 122, "name": "icon-fullscreen-expand", - "tempChar": "" + "tempChar": "" }, { "order": 41, @@ -402,7 +410,7 @@ "prevSize": 32, "code": 71, "name": "icon-gear", - "tempChar": "" + "tempChar": "" }, { "order": 49, @@ -410,7 +418,7 @@ "prevSize": 32, "code": 227, "name": "icon-image", - "tempChar": "" + "tempChar": "" }, { "order": 42, @@ -418,7 +426,7 @@ "prevSize": 32, "code": 225, "name": "icon-layers", - "tempChar": "" + "tempChar": "" }, { "order": 43, @@ -426,7 +434,7 @@ "prevSize": 32, "code": 76, "name": "icon-layout", - "tempChar": "" + "tempChar": "" }, { "order": 44, @@ -434,7 +442,7 @@ "prevSize": 32, "code": 226, "name": "icon-line-horz", - "tempChar": "" + "tempChar": "" }, { "order": 75, @@ -442,7 +450,7 @@ "prevSize": 32, "code": 244, "name": "icon-link", - "tempChar": "" + "tempChar": "" }, { "order": 46, @@ -450,7 +458,7 @@ "prevSize": 32, "code": 88, "name": "icon-magnify-in", - "tempChar": "" + "tempChar": "" }, { "order": 47, @@ -458,7 +466,7 @@ "prevSize": 32, "code": 89, "name": "icon-magnify-out", - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -466,7 +474,7 @@ "prevSize": 32, "code": 77, "name": "icon-magnify", - "tempChar": "" + "tempChar": "" }, { "order": 34, @@ -474,7 +482,7 @@ "prevSize": 32, "code": 109, "name": "icon-menu", - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -482,7 +490,7 @@ "prevSize": 32, "code": 243, "name": "icon-move", - "tempChar": "" + "tempChar": "" }, { "order": 51, @@ -490,7 +498,7 @@ "prevSize": 32, "code": 121, "name": "icon-new-window", - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -498,7 +506,7 @@ "prevSize": 32, "code": 111, "name": "icon-object", - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -506,7 +514,7 @@ "prevSize": 32, "code": 63, "name": "icon-object-unknown", - "tempChar": "" + "tempChar": "" }, { "order": 53, @@ -514,7 +522,7 @@ "prevSize": 32, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -522,7 +530,7 @@ "prevSize": 32, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -530,7 +538,7 @@ "prevSize": 32, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -538,7 +546,7 @@ "prevSize": 32, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { "order": 65, @@ -546,7 +554,7 @@ "prevSize": 32, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -554,7 +562,7 @@ "prevSize": 32, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -562,7 +570,7 @@ "prevSize": 32, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -570,7 +578,7 @@ "prevSize": 32, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -578,7 +586,7 @@ "prevSize": 32, "code": 45, "name": "icon-minus", - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -586,7 +594,7 @@ "prevSize": 32, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -594,7 +602,7 @@ "prevSize": 32, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -602,7 +610,7 @@ "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -610,7 +618,7 @@ "prevSize": 32, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { "order": 18, @@ -618,7 +626,7 @@ "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -626,7 +634,7 @@ "prevSize": 32, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -634,7 +642,7 @@ "prevSize": 32, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -642,7 +650,7 @@ "prevSize": 32, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -650,7 +658,7 @@ "prevSize": 32, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -658,7 +666,7 @@ "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -666,7 +674,7 @@ "prevSize": 32, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -674,7 +682,7 @@ "prevSize": 32, "code": 58946, "name": "icon-x", - "tempChar": "" + "tempChar": "" } ], "id": 2, @@ -689,6 +697,32 @@ "height": 1024, "prevSize": 32, "icons": [ + { + "id": 89, + "paths": [ + "M192.2 576c-0.2 0-0.2 0 0 0l-0.2 448h640v-447.8c0 0 0 0-0.2-0.2h-639.6z", + "M978.8 210.8l-165.4-165.4c-25-25-74.2-45.4-109.4-45.4h-576c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128v-448c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v448c70.4 0 128-57.6 128-128v-576c0-35.2-20.4-84.4-45.2-109.2zM704 256c0 35.2-28.8 64-64 64h-448c-35.2 0-64-28.8-64-64v-192h320v192h128v-192h128v192z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + }, + { + "fill": "rgb(0, 0, 0)" + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-save-v2" + ], + "colorPermutations": { + "125525525516161751": [ + 0, + 0 + ] + } + }, { "id": 88, "paths": [ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 987277675a6c19a701daa242bc478b161fae67b5..491c4b12ca8dcdd9d8ba76bfa45591db87e65314 100755 GIT binary patch delta 443 zcmbOcy(fmvMvsA^M|UEd8B4i%>%oZ*6YB-8{bFEXlmTLw^u*!<1_lNJ1_q`CAkC4U zQ<=8eYGEFbpTWSOb|ND+F@=5GrCtUGO#`63Sq4ym{Q!$3kPnn+P|3(GsR-g=5d`vk zfaWFSRCuAZ60z@YU8D8DH;v7&$>jiH=@L3;s^uaK9Rn<^oH~|9EEg2yaPZmIZ$GOG9%CjObiSMTgA)c`E9;3aI=8? z#Bj;Soef4$&d@YxjM%(DGn#Socde}=!YM!*kiH0pQU+d-Dh4K?mxVW<*FMPz03Rf5 A-2eap delta 278 zcmdlJGb5U9hAsoc3!RBSq-JiZM>U$mB5j0TcUXLFO5%lU+3z%S;Fo^^NDZ`O3h} z0@A{8$z{e47(JOq%bYQMvyE0Xzrf+02!u7 A0ssI2 diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg index 021abf31c6..628b025ded 100755 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -89,5 +89,6 @@ + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index d08b3099cc34de7d659c5f8cfb69586cb70da40b..20417d579a7a9729a8f70b746c31f594a9113f88 100755 GIT binary patch delta 426 zcmXw!yGtWc6vn@E6BAKnok_;WDCqc@_&`zPM3EIn5G=;ZN)gn-SBgXfDk>IE<5n&z z(`c6!VBjfzVCO=f$!hk@%*WASo`t;P&3!$y1SJF zPz#79?v?AA{k7s)VS{xVFdx#Z?n?Cb={L|lz&w>^BPzpsSGQukNMtG zW^>uSJh;dJJ^z{CWZk_S*02lo=2^FHxY^Z)mgm<6HY6`x=Qg*t5n_bC%-P*vQvF|a zQlYU$z9DRXKtzkKIPW~3@vFTH7UH37m8h}6M9Knj$@g+@O0C1n$+^Esh4ftB-``IE88R~ zd!;rxRtZ+4LsB;b?pVUsC)B<`Nq&BzKHp9pKmhkg^}CBde!inR97Mv?^i<@#`*&R< hG+TV@nkRp%=TAJg!X((6#SUtMDF}`nE4K7L(ibKAX5#<= delta 261 zcmeB)ei1oAv7YbRF9rri86b8^Pb@BAU|oB(j4hIm1)UdjSGSN3=6$K2b4CO%nA0S^LFEKY&LjKCzI0go7kONi~y-h5d5BqIPX214Kf diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index 816eda299a06edbe316c6ff0e3657a744174bc1c..879197340048aa1cb7be6f8142ee67d248d8d271 100755 GIT binary patch delta 452 zcmXw$&o2W(6vyA&t`e27TU#s%>&I3p3AH6s$+~b@A#oB-(D>CuONFF_#9rKp$X+;# zL`1kK;y7;34bs2BiKB~XdDAe-XI|#}{Z8`U%Pt_Ii~s_yt{ixZbsq$0P4FEB z+jgs7zm{X`DFES$tg=6AOPn^u)=}LStwg3>=p-h-ldY?UrlSmrnpp{d~ z#JYHLW0SNT0M2nH%S0)$I#0RI0m|HP&bChy$=GHpNa8yQO+}Uw8!1Q&yH@bd<}1K1;J673rL zyRk)Ub}Le~FC_JaLt3v-k$S_1)TjGPs@>%2L#QbsBcw3F&f6~Uxjd}qnPFLmt_rrQ z8&4fJzE+1 n1dm9A0%XTV-T&1Q1N}Iai3FnPI30K8UV7x>e@$h^JKyjZKcCcOb8P7 zjpw)d%D~M6G>?JdlFN)8FnaO=O>@TZ%{Mfo87G@-ZxjFrNjO6(120%9C_sca^Xr^s F1OQV?Np1iD From dc5feb8b1a816f1f74d15db0a7d7277bc6d32cd5 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Oct 2015 10:54:48 -0700 Subject: [PATCH 045/201] Added some documentation to notification and dialog launchers --- testing/dialogTest/res/dialog-launch.html | 3 +- .../dialogTest/res/notification-launch.html | 2 +- .../dialogTest/src/DialogLaunchController.js | 105 ++++++------------ .../dialogTest/src/DialogLaunchIndicator.js | 6 + .../src/NotificationLaunchController.js | 54 +++++++-- 5 files changed, 86 insertions(+), 84 deletions(-) diff --git a/testing/dialogTest/res/dialog-launch.html b/testing/dialogTest/res/dialog-launch.html index 1b117c2ebf..bc56e6b4f2 100644 --- a/testing/dialogTest/res/dialog-launch.html +++ b/testing/dialogTest/res/dialog-launch.html @@ -3,7 +3,8 @@ Known | Unknown | - Error + Error | + Info Dialogs \ No newline at end of file diff --git a/testing/dialogTest/res/notification-launch.html b/testing/dialogTest/res/notification-launch.html index e9b7e8f84e..1e077bf3be 100644 --- a/testing/dialogTest/res/notification-launch.html +++ b/testing/dialogTest/res/notification-launch.html @@ -1,7 +1,7 @@ - Success | + Success | Error | Alert | Progress diff --git a/testing/dialogTest/src/DialogLaunchController.js b/testing/dialogTest/src/DialogLaunchController.js index bc8cdcb419..42882a0dfe 100644 --- a/testing/dialogTest/src/DialogLaunchController.js +++ b/testing/dialogTest/src/DialogLaunchController.js @@ -26,7 +26,23 @@ define( function (MessageSeverity) { "use strict"; + /** + * A controller for the dialog launch view. This view allows manual + * launching of dialogs for demonstration and testing purposes. It + * also demonstrates the use of the DialogService. + * @param $scope + * @param $timeout + * @param $log + * @param dialogService + * @param notificationService + * @constructor + */ function DialogLaunchController($scope, $timeout, $log, dialogService, notificationService) { + + /* + Demonstrates launching a progress dialog and updating it + periodically with the progress of an ongoing process. + */ $scope.launchProgress = function (knownProgress) { var model = { title: "Progress Dialog Example", @@ -72,6 +88,10 @@ define( } }; + + /* + Demonstrates launching an error dialog + */ $scope.launchError = function () { var model = { title: "Error Dialog Example", @@ -100,87 +120,32 @@ define( } }; - $scope.launchMessages = function () { + /* + Demonstrates launching an error dialog + */ + $scope.launchInfo = function () { var model = { - title: "Messages", + title: "Info Dialog Example", + actionText: "This is an example of a blocking info" + + " dialog. This dialog can be used to draw the user's" + + " attention to an event.", severity: MessageSeverity.INFO, actions: [ { - label: "Done", + label: "OK", action: function () { + $log.debug("OK Pressed"); dialogService.dismiss(); } - } - ], - messages: [] + }, + ] }; - function getExampleActionText() { - var actionTexts = [ - "Adipiscing turpis mauris in enim elementu hac, enim aliquam etiam.", - "Eros turpis, pulvinar turpis eros eu", - "Lundium nascetur a, lectus montes ac, parturient in natoque, duis risus risus pulvinar pid rhoncus, habitasse auctor natoque!" - ]; - return actionTexts[Math.floor(Math.random()*3)]; + if (!dialogService.showBlockingMessage(model)) { + $log.error("Could not display modal dialog"); } - - function getExampleActions() { - var actions = [ - { - label: "Try Again", - action: function () { - $log.debug("Try Again pressed"); - } - }, - { - label: "Remove", - action: function () { - $log.debug("Remove pressed"); - } - }, - { - label: "Cancel", - action: function () { - $log.debug("Cancel pressed"); - } - } - ]; - - // Randomly remove some actions off the top; leave at least one - actions.splice(0,Math.floor(Math.random() * actions.length)); - - return actions; - } - - function getExampleSeverity() { - var severities = [ - MessageSeverity.INFO, - MessageSeverity.ALERT, - MessageSeverity.ERROR - ]; - return severities[Math.floor(Math.random() * severities.length)]; - } - - function createMessage (messageNumber) { - var messageModel = { - title: "Message Title " + messageNumber, - actionText: getExampleActionText(), - severity: getExampleSeverity(), - actions: getExampleActions() - }; - return messageModel; - } - - function dismiss() { - dialogService.dismiss(); - } - - model.messages = notificationService.notifications; - dialogService.getDialogResponse('overlay-message-list', { - dialog: model, - cancel: dismiss - }); }; + } return DialogLaunchController; } diff --git a/testing/dialogTest/src/DialogLaunchIndicator.js b/testing/dialogTest/src/DialogLaunchIndicator.js index 47c516fc70..9330ce2194 100644 --- a/testing/dialogTest/src/DialogLaunchIndicator.js +++ b/testing/dialogTest/src/DialogLaunchIndicator.js @@ -26,6 +26,12 @@ define( function () { "use strict"; + /** + * A tool for manually invoking dialogs. When included this + * indicator will allow for dialogs of different types to be + * launched for demonstration and testing purposes. + * @constructor + */ function DialogLaunchIndicator() { } diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/testing/dialogTest/src/NotificationLaunchController.js index 63b436a894..b45bbfc094 100644 --- a/testing/dialogTest/src/NotificationLaunchController.js +++ b/testing/dialogTest/src/NotificationLaunchController.js @@ -26,14 +26,21 @@ define( function (MessageSeverity) { "use strict"; + /** + * Allows launching of notification messages for the purposes of + * demonstration and testing. Also demonstrates use of + * the NotificationService. Notifications are non-blocking messages that + * appear at the bottom of the screen to inform the user of events + * in a non-intrusive way. For more information see the + * {@link NotificationService} + * @param $scope + * @param $timeout + * @param $log + * @param notificationService + * @constructor + */ function NotificationLaunchController($scope, $timeout, $log, notificationService) { var messageCounter = 1; - $scope.newSuccess = function(){ - - notificationService.info({ - title: "Success notification!" - }); - }; function getExampleActionText() { var actionTexts = [ @@ -80,11 +87,14 @@ define( ]; return severities[Math.floor(Math.random() * severities.length)]; } - + + /** + * Launch a new notification with a severity level of 'Error'. + */ $scope.newError = function(){ notificationService.notify({ - title: "Error notification " + messageCounter++ + "!", + title: "Example error notification " + messageCounter++, hint: "An error has occurred", severity: MessageSeverity.ERROR, primaryAction: { @@ -95,11 +105,13 @@ define( }, actions: getExampleActions()}); }; - + /** + * Launch a new notification with a severity of 'Alert'. + */ $scope.newAlert = function(){ notificationService.notify({ - title: "Alert notification " + (messageCounter++) + "!", + title: "Alert notification " + (messageCounter++), hint: "This is an alert message", severity: MessageSeverity.ALERT, primaryAction: { @@ -111,17 +123,25 @@ define( actions: getExampleActions()}); }; + + /** + * Launch a new notification with a progress bar that is updated + * periodically, tracking an ongoing process. + */ $scope.newProgress = function(){ var notification = { - title: "Progress notification!", + title: "Progress notification example", severity: MessageSeverity.INFO, progress: 0, actionText: getExampleActionText(), unknownProgress: false - }; + /** + * Simulate an ongoing process and update the progress bar. + * @param notification + */ function incrementProgress(notification) { notification.progress = Math.min(100, Math.floor(notification.progress + Math.random() * 30)); notification.progressText = ["Estimated time remaining:" + @@ -135,6 +155,16 @@ define( incrementProgress(notification); }; + /** + * Launch a new notification with severity level of INFO. + */ + $scope.newInfo = function(){ + + notificationService.info({ + title: "Example Info notification " + messageCounter++ + }); + }; + } return NotificationLaunchController; } From 1c5101eca60dde69b2d8c9c8ca353ed3f12ee06b Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 11:30:57 -0700 Subject: [PATCH 046/201] [Time Conductor] Add DateAggregator Add DateAggregator, to allow composite services to expose different ways of parsing/formatting dates. nasa/openmctweb#182. --- .../general/src/services/DateAggregator.js | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 platform/commonUI/general/src/services/DateAggregator.js diff --git a/platform/commonUI/general/src/services/DateAggregator.js b/platform/commonUI/general/src/services/DateAggregator.js new file mode 100644 index 0000000000..3c2762d1bd --- /dev/null +++ b/platform/commonUI/general/src/services/DateAggregator.js @@ -0,0 +1,116 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define([ + +], function ( +) { + "use strict"; + + /** + * Formats dates for display and parses dates from user input, + * varying by a chosen time system. + * + * Time systems are typically domain keys from telemetry metadata. + * If omitted/left undefined, the time system is presumed to be UTC time, + * with its numeric interpretation being milliseconds since the + * start of 1970. + * + * @interface DateService + */ + + /** + * Check if the provided text can be parsed into a numeric + * representation of a time in the specified time system. + * @method validate + * @memberof DateService# + * @param {string} text the text to validate + * @param {string} [key] a key identifying the time system + * @returns {boolean} true if the text can be parsed + */ + + /** + * Parse the provided into a numeric representation of a time + * in the specified time system. + * + * Behavior of this method for invalid text is undefined; use + * the `validate` method to check for validity first. + * + * @method parse + * @memberof DateService# + * @param {string} text the text to parse + * @param {string} [key] a key identifying the time system + * @returns {number} a numeric representation of the date/time + */ + + /** + * Format the provided numeric representation of a time + * into a human-readable string appropriate for that time system. + * + * If the time system is not recognized, the return value will be + * `undefined`. + * + * @method format + * @memberof DateService# + * @param {number} value the time value to format + * @param {string} [key] a key identifying the time system + * @returns {string} a human-readable representation of the date/time + */ + + /** + * Composites multiple DateService implementations such that + * they can be used as one. + * @memberof platform/commonUI/general + * @constructor + */ + function DateAggregator(dateProviders) { + this.dateProviders = dateProviders; + } + + DateAggregator.prototype.validate = function (text, key) { + return this.dateProviders.some(function (provider) { + return provider.validate(text, key); + }); + }; + + DateAggregator.prototype.format = function (value, key) { + var i, text; + for (i = 0; i < this.dateProviders.length; i += 1) { + text = this.dateProviders[i].format(value, key); + if (text !== undefined) { + return text; + } + } + }; + + DateAggregator.prototype.parse = function (text, key) { + var i; + for (i = 0; i < this.dateProviders.length; i += 1) { + if (this.dateProviders[i].validate(text, key)) { + return this.dateProviders[i].parse(text, key); + } + } + }; + + return DateAggregator; +}); From 6b42d3bf4b5bf1856994acdbb128e6fb781760fd Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 11:43:42 -0700 Subject: [PATCH 047/201] [Time Conductor] Test DateAggregator --- .../test/services/DateAggregatorSpec.js | 94 +++++++++++++++++++ platform/commonUI/general/test/suite.json | 1 + 2 files changed, 95 insertions(+) create mode 100644 platform/commonUI/general/test/services/DateAggregatorSpec.js diff --git a/platform/commonUI/general/test/services/DateAggregatorSpec.js b/platform/commonUI/general/test/services/DateAggregatorSpec.js new file mode 100644 index 0000000000..ba55bc907a --- /dev/null +++ b/platform/commonUI/general/test/services/DateAggregatorSpec.js @@ -0,0 +1,94 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + + +define( + ["../../src/services/DateAggregator"], + function (DateAggregator) { + 'use strict'; + + var DATE_SERVICE_METHODS = [ "format", "validate", "parse" ]; + + describe("DateAggregator", function () { + var mockProviders, + dateAggregator; + + beforeEach(function () { + mockProviders = [ 'a', 'b', 'c', undefined ].map(function (k, i) { + var mockProvider = jasmine.createSpyObj( + 'provider-' + k, + DATE_SERVICE_METHODS + ); + + mockProvider.format.andCallFake(function (value, key) { + return key === k ? + ("Formatted " + value + " for " + k) : + undefined; + }); + + mockProvider.parse.andCallFake(function (text, key) { + return key === k ? i : undefined; + }); + + mockProvider.validate.andCallFake(function (text, key) { + return key === k; + }); + + return mockProvider; + }); + + dateAggregator = new DateAggregator(mockProviders); + }); + + it("formats dates using the first provider which gives a result", function () { + expect(dateAggregator.format(42, "a")) + .toEqual("Formatted 42 for a"); + expect(dateAggregator.format(12321, "b")) + .toEqual("Formatted 12321 for b"); + expect(dateAggregator.format(1977, "c")) + .toEqual("Formatted 1977 for c"); + expect(dateAggregator.format(0)) + .toEqual("Formatted 0 for undefined"); + }); + + it("parses dates using the first provider which validates", function () { + expect(dateAggregator.parse("x", "a")).toEqual(0); + expect(dateAggregator.parse("x", "b")).toEqual(1); + expect(dateAggregator.parse("x", "c")).toEqual(2); + expect(dateAggregator.parse("x")).toEqual(3); + }); + + it("validates across all providers", function () { + expect(dateAggregator.validate("x", "a")).toBeTruthy(); + expect(dateAggregator.validate("x", "b")).toBeTruthy(); + expect(dateAggregator.validate("x", "c")).toBeTruthy(); + expect(dateAggregator.validate("x")).toBeTruthy(); + expect(dateAggregator.validate("x", "z")).toBeFalsy(); + + mockProviders[3].validate.andReturn(false); + expect(dateAggregator.validate("x")).toBeFalsy(); + }); + + }); + } +); diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json index 0d19fbb9e4..3ab06212d4 100644 --- a/platform/commonUI/general/test/suite.json +++ b/platform/commonUI/general/test/suite.json @@ -17,6 +17,7 @@ "directives/MCTPopup", "directives/MCTResize", "directives/MCTScroll", + "services/DateAggregator", "services/Popup", "services/PopupService", "services/UrlService", From 794231143ecbd484951060f27d329dfda075c1fa Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 11:55:38 -0700 Subject: [PATCH 048/201] [Time Conductor] Add spec for UTCDateProvider Add test cases for UTCDateProvider, which will provide default date/time formatting/parsing. --- .../general/src/services/UTCDateProvider.js | 51 ++++++++++++++ .../test/services/UTCDateProviderSpec.js | 67 +++++++++++++++++++ platform/commonUI/general/test/suite.json | 1 + 3 files changed, 119 insertions(+) create mode 100644 platform/commonUI/general/src/services/UTCDateProvider.js create mode 100644 platform/commonUI/general/test/services/UTCDateProviderSpec.js diff --git a/platform/commonUI/general/src/services/UTCDateProvider.js b/platform/commonUI/general/src/services/UTCDateProvider.js new file mode 100644 index 0000000000..54fcbf4737 --- /dev/null +++ b/platform/commonUI/general/src/services/UTCDateProvider.js @@ -0,0 +1,51 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define([ + 'moment' +], function ( + moment +) { + "use strict"; + + /** + * Composites multiple DateService implementations such that + * they can be used as one. + * @memberof platform/commonUI/general + * @constructor + * @implements {DateService} + */ + function UTCDateProvider() { + } + + UTCDateProvider.prototype.validate = function (text, key) { + }; + + UTCDateProvider.prototype.format = function (value, key) { + }; + + UTCDateProvider.prototype.parse = function (text, key) { + }; + + return UTCDateProvider; +}); diff --git a/platform/commonUI/general/test/services/UTCDateProviderSpec.js b/platform/commonUI/general/test/services/UTCDateProviderSpec.js new file mode 100644 index 0000000000..1a1873030d --- /dev/null +++ b/platform/commonUI/general/test/services/UTCDateProviderSpec.js @@ -0,0 +1,67 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + + +define( + ["../../src/services/UTCDateProvider", "moment"], + function (UTCDateProvider, moment) { + 'use strict'; + + describe("UTCDateProvider", function () { + var testDate, testTimestamp, dateProvider; + + beforeEach(function () { + testDate = "1977-05-25 17:30:00"; + testTimestamp = moment.utc(testDate).valueOf(); + dateProvider = new UTCDateProvider(); + }); + + it("distinguishes valid dates from invalid dates", function () { + expect(dateProvider.validate(testDate)) + .toBeTruthy(); + expect(dateProvider.validate("2015-garbage :00:00")) + .toBeFalsy(); + }); + + it("parses dates to their numeric representations", function () { + expect(dateProvider.parse(testDate)).toEqual(testTimestamp); + }); + + it("formats to text representing UTC date/times", function () { + var formatted = dateProvider.format(testTimestamp); + expect(formatted).toEqual(jasmine.any(String)); + // Use moment to verify that formatted value is equal + // to the original date/time + expect(moment.utc(formatted).valueOf()).toEqual(testTimestamp); + }); + + it("does not handle defined keys", function () { + expect(dateProvider.validate(testDate, 'someKey')) + .toBeFalsy(); + expect(dateProvider.format(testTimestamp, 'someKey')) + .toBeUndefined(); + }); + + }); + } +); diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json index 3ab06212d4..9f80aaabc2 100644 --- a/platform/commonUI/general/test/suite.json +++ b/platform/commonUI/general/test/suite.json @@ -18,6 +18,7 @@ "directives/MCTResize", "directives/MCTScroll", "services/DateAggregator", + "services/UTCDateProvider", "services/Popup", "services/PopupService", "services/UrlService", From c882b2d4c3c14b93a147aba7ed5c47c4d544ece2 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 12:08:34 -0700 Subject: [PATCH 049/201] [Time Conductor] Implement date provider Implement UTCDateProvider sufficient to pass spec. --- .../general/src/services/UTCDateProvider.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/platform/commonUI/general/src/services/UTCDateProvider.js b/platform/commonUI/general/src/services/UTCDateProvider.js index 54fcbf4737..38b6c61b8b 100644 --- a/platform/commonUI/general/src/services/UTCDateProvider.js +++ b/platform/commonUI/general/src/services/UTCDateProvider.js @@ -28,6 +28,14 @@ define([ ) { "use strict"; + var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss", + DATE_FORMATS = [ + DATE_FORMAT, + "YYYY-MM-DD HH:mm:ss", + "YYYY-MM-DD HH:mm", + "YYYY-MM-DD" + ]; + /** * Composites multiple DateService implementations such that * they can be used as one. @@ -39,12 +47,17 @@ define([ } UTCDateProvider.prototype.validate = function (text, key) { + return key === undefined && moment.utc(text, DATE_FORMATS).isValid(); }; UTCDateProvider.prototype.format = function (value, key) { + return key === undefined ? + moment.utc(value).format(DATE_FORMAT) : + undefined; }; UTCDateProvider.prototype.parse = function (text, key) { + return key === undefined && moment.utc(text, DATE_FORMATS).valueOf(); }; return UTCDateProvider; From 0d47b7c47dc8bd186e024587f4b70b505330611b Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 12:10:12 -0700 Subject: [PATCH 050/201] [Time Conductor] Expose dateService in bundle definition --- platform/commonUI/general/bundle.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 1aa0b1dfc1..a69c810195 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -15,6 +15,19 @@ "depends": [ "$document", "$window" ] } ], + "components": [ + { + "type": "aggregator", + "provides": "dateService", + "implementation": "services/DateAggregator.js" + }, + { + "type": "provider", + "provides": "dateService", + "implementation": "services/UTCDateProvider.js", + "priority": "fallback" + } + ], "runs": [ { "implementation": "StyleSheetLoader.js", From 117470068a01951c90151a7c8fe8fe942d42c357 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 12:17:08 -0700 Subject: [PATCH 051/201] [Time Conductor] Use dateService from TimeRangeController --- platform/commonUI/general/bundle.json | 2 +- .../src/controllers/TimeRangeController.js | 17 +++++++++------ .../controllers/TimeRangeControllerSpec.js | 21 ++++++++++++++++++- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index a69c810195..05c86cbcf7 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -66,7 +66,7 @@ { "key": "TimeRangeController", "implementation": "controllers/TimeRangeController.js", - "depends": [ "$scope", "now" ] + "depends": [ "$scope", "dateService", "now" ] }, { "key": "DateTimePickerController", diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index d4fb21be08..9ec95bac23 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -30,23 +30,28 @@ define( TICK_SPACING_PX = 150; /** + * Controller used by the `time-controller` template. * @memberof platform/commonUI/general * @constructor */ - function TimeConductorController($scope, now) { + function TimeRangeController($scope, dateService, now) { var tickCount = 2, innerMinimumSpan = 1000, // 1 second outerMinimumSpan = 1000 * 60 * 60, // 1 hour initialDragValue; + function timeSystemKey() { + return ($scope.parameters || {}).domain; + } + function formatTimestamp(ts) { - return moment.utc(ts).format(DATE_FORMAT); + return dateService.format(ts, timeSystemKey()); } function parseTimestamp(text) { - var m = moment.utc(text, DATE_FORMAT); - if (m.isValid()) { - return m.valueOf(); + var key = timeSystemKey(); + if (dateService.validate(text, key)) { + return dateService.parse(text, key); } else { throw new Error("Could not parse " + text); } @@ -297,6 +302,6 @@ define( $scope.$watch("boundsModel.end", updateEndFromText); } - return TimeConductorController; + return TimeRangeController; } ); diff --git a/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js b/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js index 91d3ecb9db..30cddab922 100644 --- a/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js +++ b/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js @@ -33,6 +33,7 @@ define( describe("The TimeRangeController", function () { var mockScope, + mockDateService, mockNow, controller; @@ -57,8 +58,26 @@ define( "$scope", [ "$apply", "$watch", "$watchCollection" ] ); + mockDateService = jasmine.createSpyObj( + "dateService", + [ "validate", "format", "parse" ] + ); + mockDateService.validate.andCallFake(function (text) { + return moment.utc(text).isValid(); + }); + mockDateService.parse.andCallFake(function (text) { + return moment.utc(text).valueOf(); + }); + mockDateService.format.andCallFake(function (value) { + return moment.utc(value).format("YYYY-MM-DD HH:mm:ss"); + }); mockNow = jasmine.createSpy('now'); - controller = new TimeRangeController(mockScope, mockNow); + + controller = new TimeRangeController( + mockScope, + mockDateService, + mockNow + ); }); it("watches the model that was passed in", function () { From 950578f09b9762c8a60a1c199c7f61d2a31529ed Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 12:20:15 -0700 Subject: [PATCH 052/201] [Time Conductor] Hide datetime pickers for non-UTC domains --- .../general/res/templates/controls/time-controller.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index 300e56c381..e0d7804b3b 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -29,7 +29,10 @@ ng-model="boundsModel.start" ng-class="{ error: !boundsModel.startValid }"> - + +
- +
From c0fda5b5729116798392f7060fad7ad10b86bcc7 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 12:41:46 -0700 Subject: [PATCH 053/201] [Time Conductor] Add JSDoc Add typedefs relevant to the date aggregator; in particular, document properties used to determine how to format timestamps associated with a telemetry point. --- .../general/src/services/DateAggregator.js | 4 +- platform/telemetry/src/TelemetryCapability.js | 58 +++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/src/services/DateAggregator.js b/platform/commonUI/general/src/services/DateAggregator.js index 3c2762d1bd..ee01929b27 100644 --- a/platform/commonUI/general/src/services/DateAggregator.js +++ b/platform/commonUI/general/src/services/DateAggregator.js @@ -31,7 +31,9 @@ define([ * Formats dates for display and parses dates from user input, * varying by a chosen time system. * - * Time systems are typically domain keys from telemetry metadata. + * Time systems are typically specified as `system` properties + * of domains in {@link TelemetryDomainMetadata}. + * * If omitted/left undefined, the time system is presumed to be UTC time, * with its numeric interpretation being milliseconds since the * start of 1970. diff --git a/platform/telemetry/src/TelemetryCapability.js b/platform/telemetry/src/TelemetryCapability.js index 1fbd12a691..d89b3cd3bf 100644 --- a/platform/telemetry/src/TelemetryCapability.js +++ b/platform/telemetry/src/TelemetryCapability.js @@ -36,6 +36,64 @@ define( getRangeValue: ZERO }; + /** + * Provides metadata about telemetry associated with a + * given domain object. + * + * @typedef TelemetryMetadata + * @property {string} source the machine-readable identifier for + * the source of telemetry data for this object; used by + * {@link TelemetryService} implementations to determine + * whether or not they provide data for this object. + * @property {string} key the machine-readable identifier for + * telemetry data associated with this specific object, + * within that `source`. + * @property {TelemetryDomainMetadata[]} domains supported domain + * options for telemetry data associated with this object, + * to use in interpreting a {@link TelemetrySeries} + * @property {TelemetryRangeMetadata[]} ranges supported range + * options for telemetry data associated with this object, + * to use in interpreting a {@link TelemetrySeries} + */ + + /** + * Provides metadata about range options within a telemetry series. + * Range options describe distinct properties within any given datum + * of a telemetry series; for instance, a telemetry series containing + * both raw and uncalibrated values may provide separate ranges for + * each. + * + * @typedef TelemetryRangeMetadata + * @property {string} key machine-readable identifier for this range + * @property {string} name human-readable name for this range + * @property {string} [units] human-readable units for this range + * @property {string} [format] data format for this range; usually, + * one of `number`, or `string`. If `undefined`, + * should presume to be a `number`. Custom formats + * may be indicated here. + */ + + /** + * Provides metadata about domain options within a telemetry series. + * Domain options describe distinct properties within any given datum + * of a telemtry series; for instance, a telemetry series containing + * both spacecraft event time and earth received times may provide + * separate domains for each. + * + * Domains are typically used to represent timestamps in a telemetry + * series, but more generally may express any property which will + * have unique values for each datum in a series. It is this property + * which makes domains distinct from ranges, as it makes these values + * appropriate and meaningful for use to sort and bound a series. + * + * @typedef TelemetryDomainMetadata + * @property {string} key machine-readable identifier for this range + * @property {string} name human-readable name for this range + * @property {string} [system] machine-readable identifier for the + * time/date system associated with this domain; + * used by {@link DateService} + */ + /** * A telemetry capability provides a means of requesting telemetry * for a specific object, and for unwrapping the response (to get From 9bc4327c597261ead0c7becf35d3cebfbddc2752 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 12:51:10 -0700 Subject: [PATCH 054/201] [Time Conductor] Add non-time-like domain Add a non-time-like domain to sine wave generator telemetry, to support integration of custom domain formatting into time conductor. --- example/generator/bundle.json | 10 ++++ example/generator/src/SinewaveDateProvider.js | 55 +++++++++++++++++++ .../generator/src/SinewaveTelemetrySeries.js | 3 + 3 files changed, 68 insertions(+) create mode 100644 example/generator/src/SinewaveDateProvider.js diff --git a/example/generator/bundle.json b/example/generator/bundle.json index cdb4736957..fc18f31193 100644 --- a/example/generator/bundle.json +++ b/example/generator/bundle.json @@ -8,6 +8,11 @@ "type": "provider", "provides": "telemetryService", "depends": [ "$q", "$timeout" ] + }, + { + "implementation": "SinewaveDateProvider.js", + "type": "provider", + "provides": "dateService" } ], "capabilities": [ @@ -38,6 +43,11 @@ { "key": "yesterday", "name": "Yesterday" + }, + { + "key": "index", + "name": "Index", + "system": "generator.index" } ], "ranges": [ diff --git a/example/generator/src/SinewaveDateProvider.js b/example/generator/src/SinewaveDateProvider.js new file mode 100644 index 0000000000..9b819a8796 --- /dev/null +++ b/example/generator/src/SinewaveDateProvider.js @@ -0,0 +1,55 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define([ +], function ( +) { + "use strict"; + + /** + * Provides date-time formatting for the Sine Wave Generator's + * `index` domain; demonstrates how to support domains which should + * not necessarily be formatted as UTC dates. + * @memberof example/generator + * @constructor + * @implements {DateService} + */ + function SinewaveDateProvider() { + } + + SinewaveDateProvider.prototype.validate = function (text, key) { + return key === 'generator.index' && /^#\d+$/.test(text); + }; + + SinewaveDateProvider.prototype.format = function (value, key) { + return key === 'generator.index' ? + ('#' + Math.floor(value)) : + undefined; + }; + + SinewaveDateProvider.prototype.parse = function (text, key) { + return key === 'generator.index' && parseInt(key.substring(1), 10); + }; + + return SinewaveDateProvider; +}); diff --git a/example/generator/src/SinewaveTelemetrySeries.js b/example/generator/src/SinewaveTelemetrySeries.js index 1e84034766..17084a07da 100644 --- a/example/generator/src/SinewaveTelemetrySeries.js +++ b/example/generator/src/SinewaveTelemetrySeries.js @@ -58,6 +58,9 @@ define( }; generatorData.getDomainValue = function (i, domain) { + if (domain === 'index') { + return i; + } return (i + offset) * 1000 + firstTime * 1000 - (domain === 'yesterday' ? ONE_DAY : 0); }; From e8d7093eb57393f2c9e58925fa3c48b29987e54e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 13:07:04 -0700 Subject: [PATCH 055/201] [Time Conductor] Use time systems from time conductor --- example/generator/bundle.json | 12 ++++++++++ .../src/controllers/TimeRangeController.js | 4 ++-- platform/features/conductor/bundle.json | 4 ++-- .../res/templates/time-conductor.html | 1 + .../conductor/src/ConductorRepresenter.js | 23 +++++++++++-------- .../src/ConductorTelemetryDecorator.js | 2 +- .../features/conductor/src/TimeConductor.js | 20 ++++++++-------- 7 files changed, 42 insertions(+), 24 deletions(-) diff --git a/example/generator/bundle.json b/example/generator/bundle.json index fc18f31193..b2050e07e9 100644 --- a/example/generator/bundle.json +++ b/example/generator/bundle.json @@ -73,6 +73,18 @@ } ] } + ], + "constants": [ + { + "key": "TIME_CONDUCTOR_DOMAINS", + "value": [ + { "key": "time", "name": "Time" }, + { "key": "yesterday", "name": "Yesterday" }, + { "key": "index", "name": "Index", "system": "generator.index" } + ], + "priority": -1, + "comment": "Placeholder; to be replaced by inspection of available domains." + } ] } } diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index 9ec95bac23..5f2f0fa3e6 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -41,7 +41,7 @@ define( initialDragValue; function timeSystemKey() { - return ($scope.parameters || {}).domain; + return ($scope.parameters || {}).system; } function formatTimestamp(ts) { @@ -57,7 +57,7 @@ define( } } - // From 0.0-1.0 to "0%"-"1%" + // From 0.0-1.0 to "0%"-"100%" function toPercent(p) { return (100 * p) + "%"; } diff --git a/platform/features/conductor/bundle.json b/platform/features/conductor/bundle.json index de903cfb93..10d3f32665 100644 --- a/platform/features/conductor/bundle.json +++ b/platform/features/conductor/bundle.json @@ -36,9 +36,9 @@ { "key": "TIME_CONDUCTOR_DOMAINS", "value": [ - { "key": "time", "name": "Time" }, - { "key": "yesterday", "name": "Yesterday" } + { "key": "time", "name": "Time" } ], + "priority": "fallback", "comment": "Placeholder; to be replaced by inspection of available domains." } ] diff --git a/platform/features/conductor/res/templates/time-conductor.html b/platform/features/conductor/res/templates/time-conductor.html index 4126652d5b..16cc6296c8 100644 --- a/platform/features/conductor/res/templates/time-conductor.html +++ b/platform/features/conductor/res/templates/time-conductor.html @@ -1,4 +1,5 @@ ", + "", "" ].join(''), THROTTLE_MS = 200, @@ -74,11 +77,12 @@ define( broadcastBounds; // Combine start/end times into a single object - function bounds(start, end) { + function bounds() { + var domain = conductor.domain(); return { start: conductor.displayStart(), end: conductor.displayEnd(), - domain: conductor.domain() + domain: domain && domain.key }; } @@ -97,12 +101,10 @@ define( } function updateDomain(value) { - conductor.domain(value); - repScope.$broadcast('telemetry:display:bounds', bounds( - conductor.displayStart(), - conductor.displayEnd(), - conductor.domain() - )); + var newDomain = conductor.domain(value); + conductorScope.parameters.system = + newDomain && newDomain.system; + repScope.$broadcast('telemetry:display:bounds', bounds()); } // telemetry domain metadata -> option for a select control @@ -130,7 +132,8 @@ define( { outer: bounds(), inner: bounds() }; conductorScope.ngModel.options = conductor.domainOptions().map(makeOption); - conductorScope.ngModel.domain = conductor.domain(); + conductorScope.ngModel.domain = (conductor.domain() || {}).key; + conductorScope.parameters = {}; conductorScope .$watch('ngModel.conductor.inner.start', updateConductorInner); diff --git a/platform/features/conductor/src/ConductorTelemetryDecorator.js b/platform/features/conductor/src/ConductorTelemetryDecorator.js index ab2d958d7e..f359199ce2 100644 --- a/platform/features/conductor/src/ConductorTelemetryDecorator.js +++ b/platform/features/conductor/src/ConductorTelemetryDecorator.js @@ -51,7 +51,7 @@ define( request = request || {}; request.start = start; request.end = end; - request.domain = domain; + request.domain = domain && domain.key; return request; } diff --git a/platform/features/conductor/src/TimeConductor.js b/platform/features/conductor/src/TimeConductor.js index 0fa0403fd9..400cb06f97 100644 --- a/platform/features/conductor/src/TimeConductor.js +++ b/platform/features/conductor/src/TimeConductor.js @@ -43,7 +43,7 @@ define( function TimeConductor(start, end, domains) { this.range = { start: start, end: end }; this.domains = domains; - this.activeDomain = domains[0].key; + this.activeDomain = domains[0]; } /** @@ -73,7 +73,7 @@ define( /** * Get available domain options which can be used to bound time * selection. - * @returns {TelemetryDomain[]} available domains + * @returns {TelemetryDomainMetadata[]} available domains */ TimeConductor.prototype.domainOptions = function () { return this.domains; @@ -82,19 +82,21 @@ define( /** * Get or set (if called with an argument) the active domain. * @param {string} [key] the key identifying the domain choice - * @returns {TelemetryDomain} the active telemetry domain + * @returns {TelemetryDomainMetadata} the active telemetry domain */ TimeConductor.prototype.domain = function (key) { - function matchesKey(domain) { - return domain.key === key; - } + var i; if (arguments.length > 0) { - if (!this.domains.some(matchesKey)) { - throw new Error("Unknown domain " + key); + for (i = 0; i < this.domains.length; i += 1) { + if (this.domains[i].key === key) { + return (this.activeDomain = this.domains[i]); + } } - this.activeDomain = key; + + throw new Error("Unknown domain " + key); } + return this.activeDomain; }; From 4ff03b081dac5d7e6dcec577eae7acd74d0674e0 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 13:08:33 -0700 Subject: [PATCH 056/201] [Time Conductor] Suppress date picker for non-UTC time systems --- .../general/res/templates/controls/time-controller.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index e0d7804b3b..87b6c682b2 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -30,7 +30,7 @@ ng-class="{ error: !boundsModel.startValid }"> @@ -55,7 +55,7 @@ ng-class="{ error: !boundsModel.endValid }"> From 0628398b01ba4ac9c97eb05488d64ee4ead4891e Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Oct 2015 13:30:34 -0700 Subject: [PATCH 057/201] Moved notifications examples from 'testing' to examples --- bundles.json | 3 +-- {testing/dialogTest => example/notifications}/bundle.json | 0 .../notifications}/res/dialog-launch.html | 0 .../notifications}/res/notification-launch.html | 0 .../notifications}/src/DialogLaunchController.js | 0 .../notifications}/src/DialogLaunchIndicator.js | 0 .../notifications}/src/NotificationLaunchController.js | 0 .../notifications}/src/NotificationLaunchIndicator.js | 0 8 files changed, 1 insertion(+), 2 deletions(-) rename {testing/dialogTest => example/notifications}/bundle.json (100%) rename {testing/dialogTest => example/notifications}/res/dialog-launch.html (100%) rename {testing/dialogTest => example/notifications}/res/notification-launch.html (100%) rename {testing/dialogTest => example/notifications}/src/DialogLaunchController.js (100%) rename {testing/dialogTest => example/notifications}/src/DialogLaunchIndicator.js (100%) rename {testing/dialogTest => example/notifications}/src/NotificationLaunchController.js (100%) rename {testing/dialogTest => example/notifications}/src/NotificationLaunchIndicator.js (100%) diff --git a/bundles.json b/bundles.json index c85b681bf5..7119dc690a 100644 --- a/bundles.json +++ b/bundles.json @@ -31,6 +31,5 @@ "example/imagery", "example/eventGenerator", "example/generator", - - "testing/dialogTest" + "example/notifications" ] diff --git a/testing/dialogTest/bundle.json b/example/notifications/bundle.json similarity index 100% rename from testing/dialogTest/bundle.json rename to example/notifications/bundle.json diff --git a/testing/dialogTest/res/dialog-launch.html b/example/notifications/res/dialog-launch.html similarity index 100% rename from testing/dialogTest/res/dialog-launch.html rename to example/notifications/res/dialog-launch.html diff --git a/testing/dialogTest/res/notification-launch.html b/example/notifications/res/notification-launch.html similarity index 100% rename from testing/dialogTest/res/notification-launch.html rename to example/notifications/res/notification-launch.html diff --git a/testing/dialogTest/src/DialogLaunchController.js b/example/notifications/src/DialogLaunchController.js similarity index 100% rename from testing/dialogTest/src/DialogLaunchController.js rename to example/notifications/src/DialogLaunchController.js diff --git a/testing/dialogTest/src/DialogLaunchIndicator.js b/example/notifications/src/DialogLaunchIndicator.js similarity index 100% rename from testing/dialogTest/src/DialogLaunchIndicator.js rename to example/notifications/src/DialogLaunchIndicator.js diff --git a/testing/dialogTest/src/NotificationLaunchController.js b/example/notifications/src/NotificationLaunchController.js similarity index 100% rename from testing/dialogTest/src/NotificationLaunchController.js rename to example/notifications/src/NotificationLaunchController.js diff --git a/testing/dialogTest/src/NotificationLaunchIndicator.js b/example/notifications/src/NotificationLaunchIndicator.js similarity index 100% rename from testing/dialogTest/src/NotificationLaunchIndicator.js rename to example/notifications/src/NotificationLaunchIndicator.js From b98c1cdfe8dbdaa8c1ea273b1389e707fe93622e Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 22 Oct 2015 13:33:43 -0700 Subject: [PATCH 058/201] [Frontend] Manual re-do of collapse/expand panes open #90 Renamed BrowseTreeController to PaneController; Ensuring mobile functionality parity; --- platform/commonUI/browse/bundle.json | 4 +- .../commonUI/browse/res/templates/browse.html | 10 +- .../res/templates/browse/object-header.html | 2 +- .../commonUI/browse/src/BrowseController.js | 5 + ...wseTreeController.js => PaneController.js} | 1 + ...ontrollerSpec.js => PaneControllerSpec.js} | 8 +- platform/commonUI/browse/test/suite.json | 2 +- .../general/res/sass/mobile/_layout.scss | 22 +- .../res/sass/user-environ/_layout.scss | 50 +++++ .../espresso/res/css/theme-espresso.css | 209 +++++++----------- .../themes/snow/res/css/theme-snow.css | 209 +++++++----------- 11 files changed, 247 insertions(+), 275 deletions(-) rename platform/commonUI/browse/src/{BrowseTreeController.js => PaneController.js} (98%) rename platform/commonUI/browse/test/{BrowseTreeControllerSpec.js => PaneControllerSpec.js} (95%) diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index e3284d99b5..156ba7ec6a 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -26,8 +26,8 @@ ] }, { - "key": "BrowseTreeController", - "implementation": "BrowseTreeController.js", + "key": "PaneController", + "implementation": "PaneController.js", "priority": "preferred", "depends": [ "$scope", "agentService" ] }, diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 9a1be7e771..5f96c98ed5 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -23,8 +23,8 @@
+ ng-controller="PaneController as treePane" + ng-class="treePane.visible() ? 'browse-showtree' : 'browse-hidetree'">
@@ -58,9 +58,9 @@ key="'browse-object'">
-
m
+ m
diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index 7ea43a6b9f..79fca1b76c 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
+
{{type.getGlyph()}} diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js index e0c00d9521..9674cbb214 100644 --- a/platform/commonUI/browse/src/BrowseController.js +++ b/platform/commonUI/browse/src/BrowseController.js @@ -154,6 +154,11 @@ define( navigationService.removeListener(setNavigation); }); + // Models for panes + $scope.paneModelTree = {}; + $scope.paneModelInspect = {}; + + } return BrowseController; diff --git a/platform/commonUI/browse/src/BrowseTreeController.js b/platform/commonUI/browse/src/PaneController.js similarity index 98% rename from platform/commonUI/browse/src/BrowseTreeController.js rename to platform/commonUI/browse/src/PaneController.js index 31875de4fa..4436493eb6 100644 --- a/platform/commonUI/browse/src/BrowseTreeController.js +++ b/platform/commonUI/browse/src/PaneController.js @@ -63,6 +63,7 @@ define( */ BrowseTreeController.prototype.toggle = function () { this.state = !this.state; + console.log('tree toggled: ' + this.state); }; /** diff --git a/platform/commonUI/browse/test/BrowseTreeControllerSpec.js b/platform/commonUI/browse/test/PaneControllerSpec.js similarity index 95% rename from platform/commonUI/browse/test/BrowseTreeControllerSpec.js rename to platform/commonUI/browse/test/PaneControllerSpec.js index 077855febf..f7d51f1714 100644 --- a/platform/commonUI/browse/test/BrowseTreeControllerSpec.js +++ b/platform/commonUI/browse/test/PaneControllerSpec.js @@ -22,11 +22,11 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/BrowseTreeController"], - function (BrowseTreeController) { + ["../src/PaneController"], + function (PaneController) { 'use strict'; - describe("The BrowseTreeController", function () { + describe("The PaneController", function () { var mockScope, mockAgentService, mockDomainObjects, @@ -35,7 +35,7 @@ define( // We want to reinstantiate for each test case // because device state can influence constructor-time behavior function instantiateController() { - return new BrowseTreeController( + return new PaneController( mockScope, mockAgentService ); diff --git a/platform/commonUI/browse/test/suite.json b/platform/commonUI/browse/test/suite.json index aa73dd358d..b9292b6ef1 100644 --- a/platform/commonUI/browse/test/suite.json +++ b/platform/commonUI/browse/test/suite.json @@ -1,7 +1,7 @@ [ "BrowseController", "BrowseObjectController", - "BrowseTreeController", + "PaneController", "MenuArrowController", "creation/CreateAction", "creation/CreateActionProvider", diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index 17ff8c4213..cf252f6205 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -55,25 +55,19 @@ left: $bodyMargin !important; } - // When the tree is hidden, these are the + +// When the tree is hidden, these are the // classes used for the left menu and the // right representation. .browse-hidetree { - @include user-select(none); // Sets the left tree menu when the tree // is hidden. .pane.left.treeview { - opacity: 0; right: 100% !important; width: auto !important; overflow-y: hidden; overflow-x: hidden; } - // Sets the right represenation when - // the tree is hidden. - .pane.right-repr { - left: 0 !important; - } } .browse-showtree { @@ -82,14 +76,14 @@ // causing cut/copy/paste menu to // not appear. Should me moved in // future to properly work - @include user-select(none); + //@include user-select(none); // Sets the left tree menu when the tree is shown. .pane.left.treeview { - @include trans-prop-nice(opacity, .4s); + //@include trans-prop-nice(opacity, .4s); @include background-image(linear-gradient(90deg, rgba(black, 0) 98%, rgba(black, 0.3) 100%)); - opacity: 1; - display: block !important; + //opacity: 1; + //display: block !important; //width: auto !important; // CH CO right: auto !important; width: $proporMenuWithView !important; @@ -97,10 +91,6 @@ // Sets the right representation when the tree is shown. .pane.right-repr { left: $proporMenuWithView !important; - //width: auto !important; - - //left: 0 !important; - //transform: translateX($proporMenuWithView); } } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 0d8983c182..2f49367de4 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -343,4 +343,54 @@ @include webkitProp(flex, '1 1 0'); padding-right: $interiorMarginLg; } +} + +// MOVED from mobile/_layout.scss +// When the tree is hidden, these are the +// classes used for the left menu and the +// right representation. +.browse-hidetree { + @include user-select(none); + // Sets the left tree menu when the tree + // is hidden. + .pane.left.treeview { + opacity: 0; + //right: 100% !important; + //width: auto !important; + //overflow-y: hidden; + //overflow-x: hidden; + } + // Sets the right represenation when + // the tree is hidden. + .pane.right-repr { + left: 0 !important; + } +} + +.browse-showtree { + // NOTE: DISABLED SELECTION + // Selection disabled in both panes + // causing cut/copy/paste menu to + // not appear. Should me moved in + // future to properly work + //@include user-select(none); + + // Sets the left tree menu when the tree is shown. + .pane.left.treeview { + @include trans-prop-nice(opacity, .4s); + //@include background-image(linear-gradient(90deg, rgba(black, 0) 98%, rgba(black, 0.3) 100%)); + opacity: 1; + //display: block !important; + //width: auto !important; // CH CO + //right: auto; + //width: $proporMenuWithView; + } + // Sets the right representation when the tree is shown. + .pane.right-repr { + //left: $proporMenuWithView; + //width: auto !important; + + //left: 0 !important; + //transform: translateX($proporMenuWithView); + } } \ 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 fe402962fd..6d8a6137d3 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; } @@ -3651,6 +3651,35 @@ span.req { -webkit-flex: 1 1 0; padding-right: 10px; } +/* line 352, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-hidetree { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; } + /* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ + .browse-hidetree .pane.left.treeview { + opacity: 0; } + /* line 365, ../../../../general/res/sass/user-environ/_layout.scss */ + .browse-hidetree .pane.right-repr { + left: 0 !important; } + +/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-showtree .pane.left.treeview { + -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; + opacity: 1; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -3720,93 +3749,63 @@ span.req { bottom: 10px !important; left: 10px !important; } - /* line 61, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree .pane.left.treeview { - opacity: 0; - right: 100% !important; - width: auto !important; - overflow-y: hidden; - overflow-x: hidden; } - /* line 74, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree .pane.right-repr { - left: 0 !important; } + /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ + .browse-hidetree .pane.left.treeview { + right: 100% !important; + width: auto !important; + overflow-y: hidden; + overflow-x: hidden; } - /* line 79, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - /* line 88, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.left.treeview { - -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; - 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%); - opacity: 1; - display: block !important; - right: auto !important; - width: 40% !important; } - /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr { - left: 40% !important; } + /* line 82, ../../../../general/res/sass/mobile/_layout.scss */ + .browse-showtree .pane.left.treeview { + 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 92, ../../../../general/res/sass/mobile/_layout.scss */ + .browse-showtree .pane.right-repr { + left: 40% !important; } - /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-menu-icon { font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 114, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 117, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 120, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 129, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 123, ../../../../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 138, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 128, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 143, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3823,7 +3822,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 148, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 138, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3840,19 +3839,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 157, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.left.treeview { width: 90% !important; } - /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 163, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 171, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } /***************************************************************************** @@ -4142,32 +4141,10 @@ span.req { height: auto; max-height: 100%; position: relative; } - /* line 228, ../../../../general/res/sass/search/_search.scss */ + /* line 226, ../../../../general/res/sass/search/_search.scss */ .search .search-scroll .load-icon { - position: relative; - /* &.loading { - pointer-events: none; - margin-left: $leftMargin; - - .title-label { - // Text styling - font-style: italic; - font-size: .9em; - opacity: 0.5; - - // Text positioning - margin-left: $iconWidth + $leftMargin; - line-height: 24px; - } - .wait-spinner { - margin-left: $leftMargin; - } - } - - &:not(.loading) { - cursor: pointer; - }*/ } - /* line 255, ../../../../general/res/sass/search/_search.scss */ + position: relative; } + /* line 230, ../../../../general/res/sass/search/_search.scss */ .search .search-scroll .load-more-button { margin-top: 5px 0; font-size: 0.8em; @@ -4438,21 +4415,7 @@ ul.tree { height: 1.5rem; line-height: 1.5rem; margin-bottom: 3px; - position: relative; - /* - &.loading { - pointer-events: none; - .label { - opacity: 0.5; - .title-label { - font-style: italic; - } - } - .wait-spinner { - margin-left: 14px; - } - } - */ } + position: relative; } /* line 48, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control, .search-result-item .view-control { @@ -4499,7 +4462,7 @@ ul.tree { .search-result-item .label .type-icon .icon.l-icon-alert { position: absolute; z-index: 2; } - /* line 90, ../../../../general/res/sass/tree/_tree.scss */ + /* line 89, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .type-icon .icon.l-icon-alert, .search-result-item .label .type-icon .icon.l-icon-alert { color: #ff3c00; @@ -4509,7 +4472,7 @@ ul.tree { width: 8px; top: 1px; right: -2px; } - /* line 96, ../../../../general/res/sass/tree/_tree.scss */ + /* line 95, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .type-icon .icon.l-icon-link, .search-result-item .label .type-icon .icon.l-icon-link { color: #49dedb; @@ -4519,7 +4482,7 @@ ul.tree { width: 8px; left: -3px; bottom: 0px; } - /* line 104, ../../../../general/res/sass/tree/_tree.scss */ + /* line 103, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .title-label, .search-result-item .label .title-label { overflow: hidden; @@ -4535,47 +4498,47 @@ ul.tree { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 130, ../../../../general/res/sass/tree/_tree.scss */ + /* line 113, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected, .search-result-item.selected { background: #006080; color: #cccccc; } - /* line 133, ../../../../general/res/sass/tree/_tree.scss */ + /* line 116, ../../../../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 136, ../../../../general/res/sass/tree/_tree.scss */ + /* line 119, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .label .type-icon, .search-result-item.selected .label .type-icon { color: #cccccc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 144, ../../../../general/res/sass/tree/_tree.scss */ + /* line 127, ../../../../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 150, ../../../../general/res/sass/tree/_tree.scss */ + /* line 130, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover .icon, .search-result-item:not(.selected):hover .icon { color: #33ccff; } } - /* line 157, ../../../../general/res/sass/tree/_tree.scss */ + /* line 137, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.loading), .search-result-item:not(.loading) { cursor: pointer; } - /* line 161, ../../../../general/res/sass/tree/_tree.scss */ + /* line 141, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .context-trigger, .search-result-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 167, ../../../../general/res/sass/tree/_tree.scss */ + /* line 146, ../../../../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 176, ../../../../general/res/sass/tree/_tree.scss */ +/* line 155, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label { left: 15px; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 69af739435..ad5e3a07c2 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; } @@ -3598,6 +3598,35 @@ span.req { -webkit-flex: 1 1 0; padding-right: 10px; } +/* line 352, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-hidetree { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; } + /* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ + .browse-hidetree .pane.left.treeview { + opacity: 0; } + /* line 365, ../../../../general/res/sass/user-environ/_layout.scss */ + .browse-hidetree .pane.right-repr { + left: 0 !important; } + +/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-showtree .pane.left.treeview { + -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; + opacity: 1; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -3667,93 +3696,63 @@ span.req { bottom: 10px !important; left: 10px !important; } - /* line 61, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree .pane.left.treeview { - opacity: 0; - right: 100% !important; - width: auto !important; - overflow-y: hidden; - overflow-x: hidden; } - /* line 74, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree .pane.right-repr { - left: 0 !important; } + /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ + .browse-hidetree .pane.left.treeview { + right: 100% !important; + width: auto !important; + overflow-y: hidden; + overflow-x: hidden; } - /* line 79, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - /* line 88, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.left.treeview { - -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; - 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%); - opacity: 1; - display: block !important; - right: auto !important; - width: 40% !important; } - /* line 98, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr { - left: 40% !important; } + /* line 82, ../../../../general/res/sass/mobile/_layout.scss */ + .browse-showtree .pane.left.treeview { + 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 92, ../../../../general/res/sass/mobile/_layout.scss */ + .browse-showtree .pane.right-repr { + left: 40% !important; } - /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-menu-icon { font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 114, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 117, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 120, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 129, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 123, ../../../../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 138, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 128, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 143, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3770,7 +3769,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 148, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 138, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3787,19 +3786,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 157, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.left.treeview { width: 90% !important; } - /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 163, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 171, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } /***************************************************************************** @@ -4089,32 +4088,10 @@ span.req { height: auto; max-height: 100%; position: relative; } - /* line 228, ../../../../general/res/sass/search/_search.scss */ + /* line 226, ../../../../general/res/sass/search/_search.scss */ .search .search-scroll .load-icon { - position: relative; - /* &.loading { - pointer-events: none; - margin-left: $leftMargin; - - .title-label { - // Text styling - font-style: italic; - font-size: .9em; - opacity: 0.5; - - // Text positioning - margin-left: $iconWidth + $leftMargin; - line-height: 24px; - } - .wait-spinner { - margin-left: $leftMargin; - } - } - - &:not(.loading) { - cursor: pointer; - }*/ } - /* line 255, ../../../../general/res/sass/search/_search.scss */ + position: relative; } + /* line 230, ../../../../general/res/sass/search/_search.scss */ .search .search-scroll .load-more-button { margin-top: 5px 0; font-size: 0.8em; @@ -4367,21 +4344,7 @@ ul.tree { height: 1.5rem; line-height: 1.5rem; margin-bottom: 3px; - position: relative; - /* - &.loading { - pointer-events: none; - .label { - opacity: 0.5; - .title-label { - font-style: italic; - } - } - .wait-spinner { - margin-left: 14px; - } - } - */ } + position: relative; } /* line 48, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control, .search-result-item .view-control { @@ -4427,7 +4390,7 @@ ul.tree { .search-result-item .label .type-icon .icon.l-icon-alert { position: absolute; z-index: 2; } - /* line 90, ../../../../general/res/sass/tree/_tree.scss */ + /* line 89, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .type-icon .icon.l-icon-alert, .search-result-item .label .type-icon .icon.l-icon-alert { color: #ff3c00; @@ -4437,7 +4400,7 @@ ul.tree { width: 8px; top: 1px; right: -2px; } - /* line 96, ../../../../general/res/sass/tree/_tree.scss */ + /* line 95, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .type-icon .icon.l-icon-link, .search-result-item .label .type-icon .icon.l-icon-link { color: #49dedb; @@ -4447,7 +4410,7 @@ ul.tree { width: 8px; left: -3px; bottom: 0px; } - /* line 104, ../../../../general/res/sass/tree/_tree.scss */ + /* line 103, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label .title-label, .search-result-item .label .title-label { overflow: hidden; @@ -4463,47 +4426,47 @@ ul.tree { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 130, ../../../../general/res/sass/tree/_tree.scss */ + /* line 113, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected, .search-result-item.selected { background: #1ac6ff; color: #fcfcfc; } - /* line 133, ../../../../general/res/sass/tree/_tree.scss */ + /* line 116, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .view-control, .search-result-item.selected .view-control { color: #fcfcfc; } - /* line 136, ../../../../general/res/sass/tree/_tree.scss */ + /* line 119, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .label .type-icon, .search-result-item.selected .label .type-icon { color: #fcfcfc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 144, ../../../../general/res/sass/tree/_tree.scss */ + /* line 127, ../../../../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 150, ../../../../general/res/sass/tree/_tree.scss */ + /* line 130, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover .icon, .search-result-item:not(.selected):hover .icon { color: #0099cc; } } - /* line 157, ../../../../general/res/sass/tree/_tree.scss */ + /* line 137, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.loading), .search-result-item:not(.loading) { cursor: pointer; } - /* line 161, ../../../../general/res/sass/tree/_tree.scss */ + /* line 141, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .context-trigger, .search-result-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 167, ../../../../general/res/sass/tree/_tree.scss */ + /* line 146, ../../../../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 176, ../../../../general/res/sass/tree/_tree.scss */ +/* line 155, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .label { left: 15px; } From 0053989de893b4ef9feee891e8e940a0a4825104 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Oct 2015 14:14:21 -0700 Subject: [PATCH 059/201] renamed dialog and notification 'actions' to 'options' --- .../src/DialogLaunchController.js | 16 ++++++++-------- .../src/NotificationLaunchController.js | 18 +++++++++--------- .../commonUI/dialog/res/templates/message.html | 12 ++++++------ platform/commonUI/dialog/src/DialogService.js | 6 +++--- .../general/res/templates/message-banner.html | 6 +++--- .../notification/src/NotificationService.js | 10 +++++----- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/example/notifications/src/DialogLaunchController.js b/example/notifications/src/DialogLaunchController.js index 42882a0dfe..5679f990a0 100644 --- a/example/notifications/src/DialogLaunchController.js +++ b/example/notifications/src/DialogLaunchController.js @@ -52,17 +52,17 @@ define( unknownProgress: !knownProgress, unknownDuration: false, severity: MessageSeverity.INFO, - actions: [ + options: [ { label: "Cancel Operation", - action: function () { + callback: function () { $log.debug("Operation cancelled"); dialogService.dismiss(); } }, { label: "Do something else...", - action: function () { + callback: function () { $log.debug("Something else pressed"); } } @@ -97,17 +97,17 @@ define( title: "Error Dialog Example", actionText: "Something happened, and it was not good.", severity: MessageSeverity.ERROR, - actions: [ + options: [ { label: "Try Again", - action: function () { + callback: function () { $log.debug("Try Again Pressed"); dialogService.dismiss(); } }, { label: "Cancel", - action: function () { + callback: function () { $log.debug("Cancel Pressed"); dialogService.dismiss(); } @@ -130,10 +130,10 @@ define( " dialog. This dialog can be used to draw the user's" + " attention to an event.", severity: MessageSeverity.INFO, - actions: [ + options: [ { label: "OK", - action: function () { + callback: function () { $log.debug("OK Pressed"); dialogService.dismiss(); } diff --git a/example/notifications/src/NotificationLaunchController.js b/example/notifications/src/NotificationLaunchController.js index b45bbfc094..e59c009422 100644 --- a/example/notifications/src/NotificationLaunchController.js +++ b/example/notifications/src/NotificationLaunchController.js @@ -55,19 +55,19 @@ define( var actions = [ { label: "Try Again", - action: function () { + callback: function () { $log.debug("Try Again pressed"); } }, { label: "Remove", - action: function () { + callback: function () { $log.debug("Remove pressed"); } }, { label: "Cancel", - action: function () { + callback: function () { $log.debug("Cancel pressed"); } } @@ -97,13 +97,13 @@ define( title: "Example error notification " + messageCounter++, hint: "An error has occurred", severity: MessageSeverity.ERROR, - primaryAction: { + primaryOption: { label: 'Retry', - action: function() { + callback: function() { $log.info('Retry clicked'); } }, - actions: getExampleActions()}); + options: getExampleActions()}); }; /** * Launch a new notification with a severity of 'Alert'. @@ -114,13 +114,13 @@ define( title: "Alert notification " + (messageCounter++), hint: "This is an alert message", severity: MessageSeverity.ALERT, - primaryAction: { + primaryOption: { label: 'Retry', - action: function() { + callback: function() { $log.info('Retry clicked'); } }, - actions: getExampleActions()}); + options: getExampleActions()}); }; diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index ecf598daf4..6b8c5c99cc 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -19,15 +19,15 @@ ng-show="ngModel.progress !== undefined || ngModel.unknownProgress">
- - {{dialogAction.label}} + ng-click="dialogOption.callback()"> + {{dialogOption.label}} - {{ngModel.primaryAction.label}} + ng-if="ngModel.primaryOption" + ng-click="ngModel.primaryOption.callback()"> + {{ngModel.primaryOption.label}}
diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index 215d64fead..27ffa9ae8b 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -178,7 +178,7 @@ define( * A user action that can be performed from a blocking dialog. These * actions will be rendered as buttons within a blocking dialog. * - * @typedef DialogAction + * @typedef DialogOption * @property {string} label a label to be displayed as the button * text for this action * @property {function} action a function to be called when the @@ -207,12 +207,12 @@ define( * impossible to provide an estimate for. Providing a true value for * this attribute will indicate to the user that the progress and * duration cannot be estimated. - * @property {DialogAction} primaryAction an action that will + * @property {DialogOption} primaryOption an action that will * be added to the dialog as a button. The primary action can be * used as the suggested course of action for the user. Making it * distinct from other actions allows it to be styled differently, * and treated preferentially in banner mode. - * @property {DialogAction[]} actions a list of actions that will + * @property {DialogOption[]} options a list of actions that will * be added to the dialog as buttons. */ diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index 629fc1080d..0af92aeba5 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -14,10 +14,10 @@ ng-model="active.notification"> - diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 411e3727cb..c11b92c651 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -37,13 +37,13 @@ define( "use strict"; /** - * A representation of a user action. Actions are provided to + * A representation of a user action. Options are provided to * dialogs and notifications and are shown as buttons. * - * @typedef {object} NotificationAction + * @typedef {object} NotificationOption * @property {string} label the label to appear on the button for * this action - * @property {function} action a callback function to be invoked + * @property {function} callback a callback function to be invoked * when the button is clicked */ @@ -67,12 +67,12 @@ define( * be automatically minimized or dismissed (depending on severity). * Additionally, if the provided value is a number, it will be used * as the delay period before being dismissed. - * @property {NotificationAction} primaryAction the default user + * @property {NotificationOption} primaryOption the default user * response to * this message. Will be represented as a button with the provided * label and action. May be used by banner notifications to display * only the most important option to users. - * @property {NotificationAction[]} actions any additional + * @property {NotificationOption[]} options any additional * actions the user can take. Will be represented as additional buttons * that may or may not be available from a banner. */ From 4f27104663c4d3c929e665ca220fc9f97644aacb Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 22 Oct 2015 14:26:22 -0700 Subject: [PATCH 060/201] [Frontend] Manual re-do of collapse/expand panes open #90 Implementing PaneController; Added inspection pane and toggle button in browse-object.html; --- .../browse/res/templates/browse-object.html | 21 ++++-- .../commonUI/browse/res/templates/browse.html | 20 +++--- .../commonUI/browse/src/BrowseController.js | 6 -- .../commonUI/general/res/sass/_constants.scss | 3 +- .../res/sass/user-environ/_layout.scss | 15 +++-- .../espresso/res/css/theme-espresso.css | 65 ++++++++++--------- .../themes/snow/res/css/theme-snow.css | 65 ++++++++++--------- 7 files changed, 111 insertions(+), 84 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 3bd6138da6..8e980581fe 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -41,9 +41,22 @@
+ +
+ + + F +
- - + + +
+ Inspector goes here +
+ diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 5f96c98ed5..235585de64 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -23,9 +23,10 @@
- + ng-controller="PaneController as modelPaneTree" + ng-class="modelPaneTree.visible() ? 'browse-showtree' : 'browse-hidetree'"> +
- +
-
+ m +
+ key="'browse-object'" + ng-model="modelPaneInspect">
- m
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js index 9674cbb214..8c032f7de3 100644 --- a/platform/commonUI/browse/src/BrowseController.js +++ b/platform/commonUI/browse/src/BrowseController.js @@ -153,12 +153,6 @@ define( $scope.$on("$destroy", function () { navigationService.removeListener(setNavigation); }); - - // Models for panes - $scope.paneModelTree = {}; - $scope.paneModelInspect = {}; - - } return BrowseController; diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 918ace8c0f..6cc8312a3c 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -42,7 +42,8 @@ $ueFooterH: 25px; $ueColMargin: 1.5%; $ueAppLogoW: 105px; $ueEditToolBarH: 25px; -$ueBrowseLeftPaneW: 25%; +$ueBrowseLeftPaneTreeW: 25%; +$ueBrowseRightPaneInspectW: 10%; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; $ueTimeControlH: (33px, 20px, 20px); diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 2f49367de4..179979bd2f 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -205,10 +205,17 @@ .browse-mode { .split-layout { - .split-pane-component.pane.left { - min-width: 150px; - max-width: 800px; - width: $ueBrowseLeftPaneW; + .split-pane-component.pane { + &.treeview.left { + min-width: 150px; + max-width: 800px; + width: $ueBrowseLeftPaneTreeW; + } + &.t-inspector.right { + min-width: 150px; + max-width: 800px; + width: $ueBrowseRightPaneInspectW; + } } } } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 6d8a6137d3..ea4789e283 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -3513,40 +3513,45 @@ span.req { *zoom: 1; padding: 5px 0; } -/* line 208, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-mode .split-layout .split-pane-component.pane.left { +/* line 209, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-mode .split-layout .split-pane-component.pane.treeview.left { min-width: 150px; max-width: 800px; width: 25%; } +/* line 214, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-mode .split-layout .split-pane-component.pane.t-inspector.right { + min-width: 150px; + max-width: 800px; + width: 10%; } -/* line 218, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 225, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right { width: 15%; } - /* line 220, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { min-height: 50px; height: 30%; } -/* line 228, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 231, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 243, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3559,31 +3564,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 289, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 296, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 299, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3593,11 +3598,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 296, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 309, ../../../../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, @@ -3609,12 +3614,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3630,41 +3635,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 341, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 352, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 363, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.left.treeview { opacity: 0; } - /* line 365, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.right-repr { left: 0 !important; } -/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-showtree .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index ad5e3a07c2..a2aa51e183 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -3460,40 +3460,45 @@ span.req { *zoom: 1; padding: 5px 0; } -/* line 208, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-mode .split-layout .split-pane-component.pane.left { +/* line 209, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-mode .split-layout .split-pane-component.pane.treeview.left { min-width: 150px; max-width: 800px; width: 25%; } +/* line 214, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-mode .split-layout .split-pane-component.pane.t-inspector.right { + min-width: 150px; + max-width: 800px; + width: 10%; } -/* line 218, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 225, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right { width: 15%; } - /* line 220, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { min-height: 50px; height: 30%; } -/* line 228, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 231, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 243, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3506,31 +3511,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 289, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 296, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 299, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3540,11 +3545,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 296, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 309, ../../../../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, @@ -3556,12 +3561,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3577,41 +3582,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 341, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 352, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 363, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.left.treeview { opacity: 0; } - /* line 365, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.right-repr { left: 0 !important; } -/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-showtree .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; From 109ae3323d89192ad636e95825260f3e807d2c0d Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Oct 2015 15:10:53 -0700 Subject: [PATCH 061/201] Added jsdoc and moved MessageController to dialogs from notifications --- platform/commonUI/dialog/bundle.json | 7 ++++++ .../src/MessageController.js | 15 ++++++++++- .../src/controllers/BannerController.js | 19 ++++++++++++++ platform/commonUI/notification/bundle.json | 5 ---- .../src/NotificationIndicatorController.js | 25 +++++++++++-------- 5 files changed, 55 insertions(+), 16 deletions(-) rename platform/commonUI/{notification => dialog}/src/MessageController.js (68%) diff --git a/platform/commonUI/dialog/bundle.json b/platform/commonUI/dialog/bundle.json index 80cd456c20..fb94f14b61 100644 --- a/platform/commonUI/dialog/bundle.json +++ b/platform/commonUI/dialog/bundle.json @@ -43,6 +43,13 @@ "key": "overlay", "templateUrl": "templates/overlay.html" } + ], + "controllers": [ + { + "key": "MessageController", + "implementation": "MessageController.js", + "depends": ["$scope"] + } ] } } \ No newline at end of file diff --git a/platform/commonUI/notification/src/MessageController.js b/platform/commonUI/dialog/src/MessageController.js similarity index 68% rename from platform/commonUI/notification/src/MessageController.js rename to platform/commonUI/dialog/src/MessageController.js index 390f4463d3..595f429f9e 100644 --- a/platform/commonUI/notification/src/MessageController.js +++ b/platform/commonUI/dialog/src/MessageController.js @@ -22,10 +22,23 @@ /*global define*/ define( - ['./MessageSeverity'], + ['../../notification/src/MessageSeverity'], function (MessageSeverity) { "use strict"; + /** + * A controller for the message view which used to represent a + * message to the user in the dialogs and notifications systems. The + * message view (../res/templates/message.html) is included + * from the blocking message dialog + * (../res/templates/overlay-blocking-message.html), + * and the message list (../res/templates/overlay-message-list.html) + * shown from the notifications indicator + * @param $scope + * @constructor + * @see DialogService#showBlockingMessage + * @see NotificationService + */ function MessageController($scope) { $scope.MessageSeverity = MessageSeverity; } diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index a59860f884..c3f698fc38 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -25,10 +25,29 @@ define( ['../../../notification/src/MessageSeverity'], function (MessageSeverity) { "use strict"; + + /** + * A controller for banner notifications. Banner notifications are a + * non-blocking way of drawing the user's attention to an event such + * as system errors, or the progress or successful completion of an + * ongoing task. This controller provides scoped functions for + * dismissing and 'maximizing' notifications. See {@link NotificationService} + * for more details on Notifications. + * + * @param $scope + * @param notificationService + * @param dialogService + * @constructor + */ function BannerController($scope, notificationService, dialogService) { $scope.active = notificationService.active; $scope.MessageSeverity = MessageSeverity; + $scope.action = function (action, $event){ + /* + Prevents default 'maximize' behaviour when clicking on + notification button + */ $event.stopPropagation(); return action(); }; diff --git a/platform/commonUI/notification/bundle.json b/platform/commonUI/notification/bundle.json index d729e42673..f4dbd5c71a 100644 --- a/platform/commonUI/notification/bundle.json +++ b/platform/commonUI/notification/bundle.json @@ -21,11 +21,6 @@ } ], "controllers": [ - { - "key": "MessageController", - "implementation": "MessageController.js", - "depends": ["$scope"] - }, { "key": "NotificationIndicatorController", "implementation": "NotificationIndicatorController.js", diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js index 9571b0f6a4..e225fd41bf 100644 --- a/platform/commonUI/notification/src/NotificationIndicatorController.js +++ b/platform/commonUI/notification/src/NotificationIndicatorController.js @@ -26,25 +26,30 @@ define( function (MessageSeverity) { "use strict"; + /** + * Provides an indicator that is visible when there are + * banner notifications that have been minimized. Will also indicate + * the number of notifications. Notifications can be viewed by + * clicking on the indicator to launch a dialog showing a list of + * notifications. + * @param $scope + * @param notificationService + * @param dialogService + * @constructor + */ function NotificationIndicatorController($scope, notificationService, dialogService) { $scope.notifications = notificationService.notifications; $scope.highest = notificationService.highest; $scope.MessageSeverity = MessageSeverity; + /** + * Launch a dialog showing a list of current notifications. + */ $scope.showNotificationsList = function(){ var model = { title: "Messages", - severity: MessageSeverity.INFO, - actions: [ - { - label: "Done", - action: function () { - dialogService.dismiss(); - } - } - ], - messages: [] + severity: MessageSeverity.INFO }; model.messages = notificationService.notifications; From 552435b009e828aab2b9f3494fbce950dff73804 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 15:20:12 -0700 Subject: [PATCH 062/201] [Time Conductor] Add bundle for time handling --- platform/time/bundle.json | 18 ++++++ platform/time/src/TimeAggregator.js | 57 +++++++++++++++++++ platform/time/src/UTCTimeProvider.js | 44 ++++++++++++++ platform/time/src/UTCTimeSystem.js | 85 ++++++++++++++++++++++++++++ 4 files changed, 204 insertions(+) create mode 100644 platform/time/bundle.json create mode 100644 platform/time/src/TimeAggregator.js create mode 100644 platform/time/src/UTCTimeProvider.js create mode 100644 platform/time/src/UTCTimeSystem.js diff --git a/platform/time/bundle.json b/platform/time/bundle.json new file mode 100644 index 0000000000..9ab4fb1e97 --- /dev/null +++ b/platform/time/bundle.json @@ -0,0 +1,18 @@ +{ + "name": "Time services bundle", + "description": "Defines interfaces and provides default implementations for handling different time systems.", + "extensions": { + "components": [ + { + "provides": "timeService", + "type": "aggregator", + "implementation": "TimeAggregator.js" + }, + { + "provides": "timeService", + "type": "provider", + "implementation": "UTCTimeProvider.js" + } + ] + } +} diff --git a/platform/time/src/TimeAggregator.js b/platform/time/src/TimeAggregator.js new file mode 100644 index 0000000000..f3e0d5cfc3 --- /dev/null +++ b/platform/time/src/TimeAggregator.js @@ -0,0 +1,57 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define([ + +], function ( + +) { + "use strict"; + + function TimeAggregator(timeProviders) { + var systemMap = {}, + systemKeys = []; + + timeProviders.forEach(function (provider) { + provider.systems().forEach(function (key) { + if (!systemMap[key]) { + systemMap[key] = provider.system(key); + systemKeys.push(key); + } + }); + }); + + this.systemMap = systemMap; + this.systemKeys = systemKeys; + } + + TimeAggregator.prototype.systems = function () { + return this.systemKeys; + }; + + TimeAggregator.prototype.system = function (key) { + return this.systemMap[key || 'utc']; + }; + + return TimeAggregator; +}); diff --git a/platform/time/src/UTCTimeProvider.js b/platform/time/src/UTCTimeProvider.js new file mode 100644 index 0000000000..36c266c621 --- /dev/null +++ b/platform/time/src/UTCTimeProvider.js @@ -0,0 +1,44 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define([ + './UTCTimeSystem' +], function ( + UTCTimeSystem +) { + "use strict"; + + function UTCTimeProvider(now) { + this.utcTimeSystem = new UTCTimeSystem(now); + } + + UTCTimeProvider.prototype.systems = function () { + return [ 'utc' ]; + }; + + UTCTimeProvider.prototype.system = function (key) { + return key === 'utc' ? this.utcTimeSystem : undefined; + }; + + return UTCTimeProvider; +}); diff --git a/platform/time/src/UTCTimeSystem.js b/platform/time/src/UTCTimeSystem.js new file mode 100644 index 0000000000..22c3488b50 --- /dev/null +++ b/platform/time/src/UTCTimeSystem.js @@ -0,0 +1,85 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define([ + 'moment' +], function ( + moment +) { + "use strict"; + + var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss", + DATE_FORMATS = [ + DATE_FORMAT, + "YYYY-MM-DD HH:mm:ss", + "YYYY-MM-DD HH:mm", + "YYYY-MM-DD" + ], + SECOND = 1000, + MINUTE = 60 * SECOND, + HOUR = 60 * MINUTE, + DAY = 24 * HOUR, + WEEK = 7 * DAY, + MONTH_APPROX = 30 * DAY, + YEAR = 365 * DAY, + INCREMENTS = [ + SECOND, + MINUTE, + HOUR, + DAY, + WEEK, + MONTH_APPROX, + YEAR + ], + DEFAULT_INCREMENT = 3; + + + function UTCTimeSystem(now) { + this.nowFn = now; + } + + UTCTimeSystem.prototype.format = function (value) { + return moment.utc(value).format(DATE_FORMAT); + }; + + UTCTimeSystem.prototype.parse = function (text) { + return moment.utc(text, DATE_FORMATS).valueOf(); + }; + + UTCTimeSystem.prototype.validate = function (text) { + return moment.utc(text, DATE_FORMATS).isValid(); + }; + + UTCTimeSystem.prototype.now = function () { + return this.nowFn(); + }; + + UTCTimeSystem.prototype.increment = function (scale) { + var index = (scale || 0) + DEFAULT_INCREMENT; + index = Math.max(index, 0); + index = Math.min(index, INCREMENTS.length - 1); + return INCREMENTS[index]; + }; + + return UTCTimeSystem; +}); From 5e9f38dadd87bf38330df2bbafe34edcb0afc18e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 15:20:54 -0700 Subject: [PATCH 063/201] [Time Conductor] Add dependency to UTCTimeProvider --- platform/time/bundle.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/time/bundle.json b/platform/time/bundle.json index 9ab4fb1e97..9e831b5723 100644 --- a/platform/time/bundle.json +++ b/platform/time/bundle.json @@ -11,7 +11,8 @@ { "provides": "timeService", "type": "provider", - "implementation": "UTCTimeProvider.js" + "implementation": "UTCTimeProvider.js", + "depends": [ "now" ] } ] } From 1e71df5ce9cb9636a41ff2564ece27dad01b607e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 15:26:22 -0700 Subject: [PATCH 064/201] [Time Conductor] Implement timeService in sinewave telemetry Switch from initial dateService interface to more practical timeService interface. --- example/generator/bundle.json | 4 +- ...ateProvider.js => SinewaveTimeProvider.js} | 23 ++++---- example/generator/src/SinewaveTimeSystem.js | 55 +++++++++++++++++++ 3 files changed, 67 insertions(+), 15 deletions(-) rename example/generator/src/{SinewaveDateProvider.js => SinewaveTimeProvider.js} (73%) create mode 100644 example/generator/src/SinewaveTimeSystem.js diff --git a/example/generator/bundle.json b/example/generator/bundle.json index b2050e07e9..6a182e6a7a 100644 --- a/example/generator/bundle.json +++ b/example/generator/bundle.json @@ -10,9 +10,9 @@ "depends": [ "$q", "$timeout" ] }, { - "implementation": "SinewaveDateProvider.js", + "implementation": "SinewaveTimeProvider.js", "type": "provider", - "provides": "dateService" + "provides": "timeService" } ], "capabilities": [ diff --git a/example/generator/src/SinewaveDateProvider.js b/example/generator/src/SinewaveTimeProvider.js similarity index 73% rename from example/generator/src/SinewaveDateProvider.js rename to example/generator/src/SinewaveTimeProvider.js index 9b819a8796..2f2bcc2391 100644 --- a/example/generator/src/SinewaveDateProvider.js +++ b/example/generator/src/SinewaveTimeProvider.js @@ -22,7 +22,9 @@ /*global define*/ define([ + './SinewaveTimeSystem' ], function ( + SinewaveTimeSystem ) { "use strict"; @@ -32,24 +34,19 @@ define([ * not necessarily be formatted as UTC dates. * @memberof example/generator * @constructor - * @implements {DateService} + * @implements {TimeService} */ - function SinewaveDateProvider() { + function SinewaveTimeProvider() { + this.indexTimeSystem = new SinewaveTimeSystem(); } - SinewaveDateProvider.prototype.validate = function (text, key) { - return key === 'generator.index' && /^#\d+$/.test(text); + SinewaveTimeProvider.prototype.systems = function () { + return [ 'generator.index' ]; }; - SinewaveDateProvider.prototype.format = function (value, key) { - return key === 'generator.index' ? - ('#' + Math.floor(value)) : - undefined; + SinewaveTimeProvider.prototype.system = function (key) { + return key === 'generator.index' ? this.indexTimeSystem : undefined; }; - SinewaveDateProvider.prototype.parse = function (text, key) { - return key === 'generator.index' && parseInt(key.substring(1), 10); - }; - - return SinewaveDateProvider; + return SinewaveTimeProvider; }); diff --git a/example/generator/src/SinewaveTimeSystem.js b/example/generator/src/SinewaveTimeSystem.js new file mode 100644 index 0000000000..c248de4bfd --- /dev/null +++ b/example/generator/src/SinewaveTimeSystem.js @@ -0,0 +1,55 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define([ + './SinewaveTelemetrySeries' +], function ( + SinewaveTelemetrySeries +) { + "use strict"; + + function SinewaveTimeSystem(now) { + } + + SinewaveTimeSystem.prototype.format = function (value) { + return ('#' + Math.floor(value)); + }; + + SinewaveTimeSystem.prototype.parse = function (text) { + return parseInt(text.substring(1), 10); + }; + + SinewaveTimeSystem.prototype.validate = function (text) { + return (/^#\d+$/).test(text); + }; + + SinewaveTimeSystem.prototype.now = function () { + return new SinewaveTelemetrySeries().getPointCount(); + }; + + SinewaveTimeSystem.prototype.increment = function (scale) { + return Math.pow(10, (scale || 0) + 1); + }; + + return SinewaveTimeSystem; +}); From a154c9c8708580cc376adceb3777ef312858b6ac Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 15:51:12 -0700 Subject: [PATCH 065/201] [Time Conductor] Use timeService from control --- bundles.json | 1 + example/generator/src/SinewaveTimeSystem.js | 4 +- platform/commonUI/general/bundle.json | 2 +- .../templates/controls/time-controller.html | 2 +- .../src/controllers/TimeRangeController.js | 41 ++++++++++++++----- 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/bundles.json b/bundles.json index a0f7edd7a8..3c2eb90340 100644 --- a/bundles.json +++ b/bundles.json @@ -26,6 +26,7 @@ "platform/policy", "platform/entanglement", "platform/search", + "platform/time", "example/imagery", "example/eventGenerator", diff --git a/example/generator/src/SinewaveTimeSystem.js b/example/generator/src/SinewaveTimeSystem.js index c248de4bfd..24a9e35e62 100644 --- a/example/generator/src/SinewaveTimeSystem.js +++ b/example/generator/src/SinewaveTimeSystem.js @@ -44,11 +44,11 @@ define([ }; SinewaveTimeSystem.prototype.now = function () { - return new SinewaveTelemetrySeries().getPointCount(); + return new SinewaveTelemetrySeries({}).getPointCount(); }; SinewaveTimeSystem.prototype.increment = function (scale) { - return Math.pow(10, (scale || 0) + 1); + return Math.max(Math.pow(10, (scale || 0) + 1), 1); }; return SinewaveTimeSystem; diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 05c86cbcf7..c0f5141694 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -66,7 +66,7 @@ { "key": "TimeRangeController", "implementation": "controllers/TimeRangeController.js", - "depends": [ "$scope", "dateService", "now" ] + "depends": [ "$scope", "timeService", "now" ] }, { "key": "DateTimePickerController", diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index 87b6c682b2..5b41beeebf 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -102,7 +102,7 @@
diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index 5f2f0fa3e6..27efeeb3fc 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -34,24 +34,20 @@ define( * @memberof platform/commonUI/general * @constructor */ - function TimeRangeController($scope, dateService, now) { + function TimeRangeController($scope, timeService, now) { var tickCount = 2, innerMinimumSpan = 1000, // 1 second outerMinimumSpan = 1000 * 60 * 60, // 1 hour - initialDragValue; - - function timeSystemKey() { - return ($scope.parameters || {}).system; - } + initialDragValue, + timeSystem = timeService.system(); // Start with default function formatTimestamp(ts) { - return dateService.format(ts, timeSystemKey()); + return timeSystem.format(ts); } function parseTimestamp(text) { - var key = timeSystemKey(); - if (dateService.validate(text, key)) { - return dateService.parse(text, key); + if (timeSystem.validate(text)) { + return timeSystem.parse(text); } else { throw new Error("Could not parse " + text); } @@ -270,6 +266,30 @@ define( } } + function reinitializeBounds(now, increment) { + var end = Math.ceil(now / increment) * increment, + start = end - increment; + $scope.ngModel.outer.start = start; + $scope.ngModel.outer.end = end; + $scope.ngModel.inner.start = start; + $scope.ngModel.inner.end = end; + $scope.boundsModel = {}; + updateViewFromModel(); + } + + function updateTimeSystem(key) { + timeSystem = timeService.system(key) || timeService.system(); + + // One second / one hour in UTC; should be + // similarly useful in other time systems. + innerMinimumSpan = timeSystem.increment(-3); + outerMinimumSpan = timeSystem.increment(-1); + reinitializeBounds( + timeSystem.now(), + timeSystem.increment() + ); + } + function updateStartFromPicker(value) { updateOuterStart(value); updateBoundsText($scope.ngModel); @@ -300,6 +320,7 @@ define( $scope.$watch("ngModel.outer.end", updateEndFromPicker); $scope.$watch("boundsModel.start", updateStartFromText); $scope.$watch("boundsModel.end", updateEndFromText); + $scope.$watch("parameters.system", updateTimeSystem); } return TimeRangeController; From 16e4c327095d9a61dbd2b698bea32a2b8050de20 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 16:05:09 -0700 Subject: [PATCH 066/201] [Time Conductor] Remove now dependency, fix domain switch Remove dependency on now (current time can be retrieved via timeService); fix domain-switching behavior such that changes to time systems are reflected in changes to default bounds. --- platform/commonUI/general/bundle.json | 2 +- .../general/src/controllers/TimeRangeController.js | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index c0f5141694..30057dcff1 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -66,7 +66,7 @@ { "key": "TimeRangeController", "implementation": "controllers/TimeRangeController.js", - "depends": [ "$scope", "timeService", "now" ] + "depends": [ "$scope", "timeService" ] }, { "key": "DateTimePickerController", diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index 27efeeb3fc..321698c1b9 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -34,7 +34,7 @@ define( * @memberof platform/commonUI/general * @constructor */ - function TimeRangeController($scope, timeService, now) { + function TimeRangeController($scope, timeService) { var tickCount = 2, innerMinimumSpan = 1000, // 1 second outerMinimumSpan = 1000 * 60 * 60, // 1 hour @@ -91,7 +91,7 @@ define( } function defaultBounds() { - var t = now(); + var t = timeSystem.now(); return { start: t - 24 * 3600 * 1000, // One day end: t @@ -122,8 +122,6 @@ define( } function updateViewFromModel(ngModel) { - var t = now(); - ngModel = ngModel || {}; ngModel.outer = ngModel.outer || defaultBounds(); ngModel.inner = ngModel.inner || copyBounds(ngModel.outer); @@ -274,7 +272,7 @@ define( $scope.ngModel.inner.start = start; $scope.ngModel.inner.end = end; $scope.boundsModel = {}; - updateViewFromModel(); + updateViewFromModel($scope.ngModel); } function updateTimeSystem(key) { From b4dd95490c6ee216c23855b87c0749024678767f Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 16:07:21 -0700 Subject: [PATCH 067/201] [Time Conductor] Don't treat defaults as invalid --- .../commonUI/general/src/controllers/TimeRangeController.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index 321698c1b9..550ea49175 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -109,6 +109,9 @@ define( ngModel.outer[property]) { $scope.boundsModel[property] = formatTimestamp(ngModel.outer[property]); + // Never want to flag machine-generated text + // as invalid here. + $scope.boundsModel[property + 'Valid'] = true; } } catch (e) { // User-entered text is invalid, so leave it be From 67cf8d8cee1daf1ec7df41c595ff2e59861516d8 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 16:24:55 -0700 Subject: [PATCH 068/201] [Time Conductor] Support index domain from sine wave --- example/generator/src/SinewaveTelemetrySeries.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/example/generator/src/SinewaveTelemetrySeries.js b/example/generator/src/SinewaveTelemetrySeries.js index 17084a07da..529d4e80a2 100644 --- a/example/generator/src/SinewaveTelemetrySeries.js +++ b/example/generator/src/SinewaveTelemetrySeries.js @@ -49,6 +49,11 @@ define( Math.max(Math.floor(request.start / 1000), firstTime), offset = requestStart - firstTime; + if (request.domain === 'index') { + offset = Math.floor(request.start || 0); + count = Math.ceil(request.end || endTime); + } + if (request.size !== undefined) { offset = Math.max(offset, count - request.size); } @@ -59,7 +64,7 @@ define( generatorData.getDomainValue = function (i, domain) { if (domain === 'index') { - return i; + return i + offset; } return (i + offset) * 1000 + firstTime * 1000 - (domain === 'yesterday' ? ONE_DAY : 0); From 111b3bac09a841235274cc8564dc6425f31a0b65 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Oct 2015 16:27:21 -0700 Subject: [PATCH 069/201] [Time Conductor] Remove dateService Replaced by timeService --- platform/commonUI/general/bundle.json | 13 -- .../general/src/services/DateAggregator.js | 118 ------------------ .../general/src/services/UTCDateProvider.js | 64 ---------- .../test/services/DateAggregatorSpec.js | 94 -------------- .../test/services/UTCDateProviderSpec.js | 67 ---------- platform/commonUI/general/test/suite.json | 2 - 6 files changed, 358 deletions(-) delete mode 100644 platform/commonUI/general/src/services/DateAggregator.js delete mode 100644 platform/commonUI/general/src/services/UTCDateProvider.js delete mode 100644 platform/commonUI/general/test/services/DateAggregatorSpec.js delete mode 100644 platform/commonUI/general/test/services/UTCDateProviderSpec.js diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 30057dcff1..a4d4008f3d 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -15,19 +15,6 @@ "depends": [ "$document", "$window" ] } ], - "components": [ - { - "type": "aggregator", - "provides": "dateService", - "implementation": "services/DateAggregator.js" - }, - { - "type": "provider", - "provides": "dateService", - "implementation": "services/UTCDateProvider.js", - "priority": "fallback" - } - ], "runs": [ { "implementation": "StyleSheetLoader.js", diff --git a/platform/commonUI/general/src/services/DateAggregator.js b/platform/commonUI/general/src/services/DateAggregator.js deleted file mode 100644 index ee01929b27..0000000000 --- a/platform/commonUI/general/src/services/DateAggregator.js +++ /dev/null @@ -1,118 +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. - *****************************************************************************/ -/*global define*/ - -define([ - -], function ( -) { - "use strict"; - - /** - * Formats dates for display and parses dates from user input, - * varying by a chosen time system. - * - * Time systems are typically specified as `system` properties - * of domains in {@link TelemetryDomainMetadata}. - * - * If omitted/left undefined, the time system is presumed to be UTC time, - * with its numeric interpretation being milliseconds since the - * start of 1970. - * - * @interface DateService - */ - - /** - * Check if the provided text can be parsed into a numeric - * representation of a time in the specified time system. - * @method validate - * @memberof DateService# - * @param {string} text the text to validate - * @param {string} [key] a key identifying the time system - * @returns {boolean} true if the text can be parsed - */ - - /** - * Parse the provided into a numeric representation of a time - * in the specified time system. - * - * Behavior of this method for invalid text is undefined; use - * the `validate` method to check for validity first. - * - * @method parse - * @memberof DateService# - * @param {string} text the text to parse - * @param {string} [key] a key identifying the time system - * @returns {number} a numeric representation of the date/time - */ - - /** - * Format the provided numeric representation of a time - * into a human-readable string appropriate for that time system. - * - * If the time system is not recognized, the return value will be - * `undefined`. - * - * @method format - * @memberof DateService# - * @param {number} value the time value to format - * @param {string} [key] a key identifying the time system - * @returns {string} a human-readable representation of the date/time - */ - - /** - * Composites multiple DateService implementations such that - * they can be used as one. - * @memberof platform/commonUI/general - * @constructor - */ - function DateAggregator(dateProviders) { - this.dateProviders = dateProviders; - } - - DateAggregator.prototype.validate = function (text, key) { - return this.dateProviders.some(function (provider) { - return provider.validate(text, key); - }); - }; - - DateAggregator.prototype.format = function (value, key) { - var i, text; - for (i = 0; i < this.dateProviders.length; i += 1) { - text = this.dateProviders[i].format(value, key); - if (text !== undefined) { - return text; - } - } - }; - - DateAggregator.prototype.parse = function (text, key) { - var i; - for (i = 0; i < this.dateProviders.length; i += 1) { - if (this.dateProviders[i].validate(text, key)) { - return this.dateProviders[i].parse(text, key); - } - } - }; - - return DateAggregator; -}); diff --git a/platform/commonUI/general/src/services/UTCDateProvider.js b/platform/commonUI/general/src/services/UTCDateProvider.js deleted file mode 100644 index 38b6c61b8b..0000000000 --- a/platform/commonUI/general/src/services/UTCDateProvider.js +++ /dev/null @@ -1,64 +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. - *****************************************************************************/ -/*global define*/ - -define([ - 'moment' -], function ( - moment -) { - "use strict"; - - var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss", - DATE_FORMATS = [ - DATE_FORMAT, - "YYYY-MM-DD HH:mm:ss", - "YYYY-MM-DD HH:mm", - "YYYY-MM-DD" - ]; - - /** - * Composites multiple DateService implementations such that - * they can be used as one. - * @memberof platform/commonUI/general - * @constructor - * @implements {DateService} - */ - function UTCDateProvider() { - } - - UTCDateProvider.prototype.validate = function (text, key) { - return key === undefined && moment.utc(text, DATE_FORMATS).isValid(); - }; - - UTCDateProvider.prototype.format = function (value, key) { - return key === undefined ? - moment.utc(value).format(DATE_FORMAT) : - undefined; - }; - - UTCDateProvider.prototype.parse = function (text, key) { - return key === undefined && moment.utc(text, DATE_FORMATS).valueOf(); - }; - - return UTCDateProvider; -}); diff --git a/platform/commonUI/general/test/services/DateAggregatorSpec.js b/platform/commonUI/general/test/services/DateAggregatorSpec.js deleted file mode 100644 index ba55bc907a..0000000000 --- a/platform/commonUI/general/test/services/DateAggregatorSpec.js +++ /dev/null @@ -1,94 +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. - *****************************************************************************/ -/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ - - -define( - ["../../src/services/DateAggregator"], - function (DateAggregator) { - 'use strict'; - - var DATE_SERVICE_METHODS = [ "format", "validate", "parse" ]; - - describe("DateAggregator", function () { - var mockProviders, - dateAggregator; - - beforeEach(function () { - mockProviders = [ 'a', 'b', 'c', undefined ].map(function (k, i) { - var mockProvider = jasmine.createSpyObj( - 'provider-' + k, - DATE_SERVICE_METHODS - ); - - mockProvider.format.andCallFake(function (value, key) { - return key === k ? - ("Formatted " + value + " for " + k) : - undefined; - }); - - mockProvider.parse.andCallFake(function (text, key) { - return key === k ? i : undefined; - }); - - mockProvider.validate.andCallFake(function (text, key) { - return key === k; - }); - - return mockProvider; - }); - - dateAggregator = new DateAggregator(mockProviders); - }); - - it("formats dates using the first provider which gives a result", function () { - expect(dateAggregator.format(42, "a")) - .toEqual("Formatted 42 for a"); - expect(dateAggregator.format(12321, "b")) - .toEqual("Formatted 12321 for b"); - expect(dateAggregator.format(1977, "c")) - .toEqual("Formatted 1977 for c"); - expect(dateAggregator.format(0)) - .toEqual("Formatted 0 for undefined"); - }); - - it("parses dates using the first provider which validates", function () { - expect(dateAggregator.parse("x", "a")).toEqual(0); - expect(dateAggregator.parse("x", "b")).toEqual(1); - expect(dateAggregator.parse("x", "c")).toEqual(2); - expect(dateAggregator.parse("x")).toEqual(3); - }); - - it("validates across all providers", function () { - expect(dateAggregator.validate("x", "a")).toBeTruthy(); - expect(dateAggregator.validate("x", "b")).toBeTruthy(); - expect(dateAggregator.validate("x", "c")).toBeTruthy(); - expect(dateAggregator.validate("x")).toBeTruthy(); - expect(dateAggregator.validate("x", "z")).toBeFalsy(); - - mockProviders[3].validate.andReturn(false); - expect(dateAggregator.validate("x")).toBeFalsy(); - }); - - }); - } -); diff --git a/platform/commonUI/general/test/services/UTCDateProviderSpec.js b/platform/commonUI/general/test/services/UTCDateProviderSpec.js deleted file mode 100644 index 1a1873030d..0000000000 --- a/platform/commonUI/general/test/services/UTCDateProviderSpec.js +++ /dev/null @@ -1,67 +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. - *****************************************************************************/ -/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ - - -define( - ["../../src/services/UTCDateProvider", "moment"], - function (UTCDateProvider, moment) { - 'use strict'; - - describe("UTCDateProvider", function () { - var testDate, testTimestamp, dateProvider; - - beforeEach(function () { - testDate = "1977-05-25 17:30:00"; - testTimestamp = moment.utc(testDate).valueOf(); - dateProvider = new UTCDateProvider(); - }); - - it("distinguishes valid dates from invalid dates", function () { - expect(dateProvider.validate(testDate)) - .toBeTruthy(); - expect(dateProvider.validate("2015-garbage :00:00")) - .toBeFalsy(); - }); - - it("parses dates to their numeric representations", function () { - expect(dateProvider.parse(testDate)).toEqual(testTimestamp); - }); - - it("formats to text representing UTC date/times", function () { - var formatted = dateProvider.format(testTimestamp); - expect(formatted).toEqual(jasmine.any(String)); - // Use moment to verify that formatted value is equal - // to the original date/time - expect(moment.utc(formatted).valueOf()).toEqual(testTimestamp); - }); - - it("does not handle defined keys", function () { - expect(dateProvider.validate(testDate, 'someKey')) - .toBeFalsy(); - expect(dateProvider.format(testTimestamp, 'someKey')) - .toBeUndefined(); - }); - - }); - } -); diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json index 9f80aaabc2..0d19fbb9e4 100644 --- a/platform/commonUI/general/test/suite.json +++ b/platform/commonUI/general/test/suite.json @@ -17,8 +17,6 @@ "directives/MCTPopup", "directives/MCTResize", "directives/MCTScroll", - "services/DateAggregator", - "services/UTCDateProvider", "services/Popup", "services/PopupService", "services/UrlService", From 83276d70d3942a9b46d9a176e4398841e725e51b Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Oct 2015 16:29:10 -0700 Subject: [PATCH 070/201] Removed MessageSeverity enum and MessageController --- .../src/DialogLaunchController.js | 10 +-- .../src/NotificationLaunchController.js | 16 ++--- platform/commonUI/dialog/bundle.json | 7 -- .../dialog/res/templates/message.html | 8 +-- .../commonUI/dialog/src/MessageController.js | 47 ------------- .../general/res/templates/message-banner.html | 5 +- .../src/controllers/BannerController.js | 7 +- .../res/notification-indicator.html | 5 +- .../notification/src/MessageSeverity.js | 11 --- .../src/NotificationIndicatorController.js | 8 +-- .../notification/src/NotificationService.js | 29 ++++---- .../test/NotificationServiceSpec.js | 69 ++----------------- 12 files changed, 44 insertions(+), 178 deletions(-) delete mode 100644 platform/commonUI/dialog/src/MessageController.js delete mode 100644 platform/commonUI/notification/src/MessageSeverity.js diff --git a/example/notifications/src/DialogLaunchController.js b/example/notifications/src/DialogLaunchController.js index 5679f990a0..e6a8b4e132 100644 --- a/example/notifications/src/DialogLaunchController.js +++ b/example/notifications/src/DialogLaunchController.js @@ -22,8 +22,8 @@ /*global define*/ define( - ['../../../platform/commonUI/notification/src/MessageSeverity'], - function (MessageSeverity) { + [], + function () { "use strict"; /** @@ -51,7 +51,7 @@ define( actionText: "Calculating...", unknownProgress: !knownProgress, unknownDuration: false, - severity: MessageSeverity.INFO, + severity: "info", options: [ { label: "Cancel Operation", @@ -96,7 +96,7 @@ define( var model = { title: "Error Dialog Example", actionText: "Something happened, and it was not good.", - severity: MessageSeverity.ERROR, + severity: "error", options: [ { label: "Try Again", @@ -129,7 +129,7 @@ define( actionText: "This is an example of a blocking info" + " dialog. This dialog can be used to draw the user's" + " attention to an event.", - severity: MessageSeverity.INFO, + severity: "info", options: [ { label: "OK", diff --git a/example/notifications/src/NotificationLaunchController.js b/example/notifications/src/NotificationLaunchController.js index e59c009422..7d0618ada4 100644 --- a/example/notifications/src/NotificationLaunchController.js +++ b/example/notifications/src/NotificationLaunchController.js @@ -22,8 +22,8 @@ /*global define*/ define( - ['../../../platform/commonUI/notification/src/MessageSeverity'], - function (MessageSeverity) { + [], + function () { "use strict"; /** @@ -81,9 +81,9 @@ define( function getExampleSeverity() { var severities = [ - MessageSeverity.INFO, - MessageSeverity.ALERT, - MessageSeverity.ERROR + "info", + "alert", + "error" ]; return severities[Math.floor(Math.random() * severities.length)]; } @@ -96,7 +96,7 @@ define( notificationService.notify({ title: "Example error notification " + messageCounter++, hint: "An error has occurred", - severity: MessageSeverity.ERROR, + severity: "error", primaryOption: { label: 'Retry', callback: function() { @@ -113,7 +113,7 @@ define( notificationService.notify({ title: "Alert notification " + (messageCounter++), hint: "This is an alert message", - severity: MessageSeverity.ALERT, + severity: "alert", primaryOption: { label: 'Retry', callback: function() { @@ -132,7 +132,7 @@ define( var notification = { title: "Progress notification example", - severity: MessageSeverity.INFO, + severity: "info", progress: 0, actionText: getExampleActionText(), unknownProgress: false diff --git a/platform/commonUI/dialog/bundle.json b/platform/commonUI/dialog/bundle.json index fb94f14b61..80cd456c20 100644 --- a/platform/commonUI/dialog/bundle.json +++ b/platform/commonUI/dialog/bundle.json @@ -43,13 +43,6 @@ "key": "overlay", "templateUrl": "templates/overlay.html" } - ], - "controllers": [ - { - "key": "MessageController", - "implementation": "MessageController.js", - "depends": ["$scope"] - } ] } } \ No newline at end of file diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index 6b8c5c99cc..8568fe5fb1 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -1,9 +1,5 @@ -
+
diff --git a/platform/commonUI/dialog/src/MessageController.js b/platform/commonUI/dialog/src/MessageController.js deleted file mode 100644 index 595f429f9e..0000000000 --- a/platform/commonUI/dialog/src/MessageController.js +++ /dev/null @@ -1,47 +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. - *****************************************************************************/ -/*global define*/ - -define( - ['../../notification/src/MessageSeverity'], - function (MessageSeverity) { - "use strict"; - - /** - * A controller for the message view which used to represent a - * message to the user in the dialogs and notifications systems. The - * message view (../res/templates/message.html) is included - * from the blocking message dialog - * (../res/templates/overlay-blocking-message.html), - * and the message list (../res/templates/overlay-message-list.html) - * shown from the notifications indicator - * @param $scope - * @constructor - * @see DialogService#showBlockingMessage - * @see NotificationService - */ - function MessageController($scope) { - $scope.MessageSeverity = MessageSeverity; - } - return MessageController; - } -); diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index 0af92aeba5..29b107126e 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -1,8 +1,5 @@
diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index c3f698fc38..511bf23b38 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -22,8 +22,8 @@ /*global define*/ define( - ['../../../notification/src/MessageSeverity'], - function (MessageSeverity) { + [], + function () { "use strict"; /** @@ -41,7 +41,6 @@ define( */ function BannerController($scope, notificationService, dialogService) { $scope.active = notificationService.active; - $scope.MessageSeverity = MessageSeverity; $scope.action = function (action, $event){ /* @@ -56,7 +55,7 @@ define( notificationService.dismissOrMinimize(notification); }; $scope.maximize = function(notification) { - if (notification.severity > MessageSeverity.INFO){ + if (notification.severity != "info"){ notification.cancel = function(){ dialogService.dismiss(); }; diff --git a/platform/commonUI/notification/res/notification-indicator.html b/platform/commonUI/notification/res/notification-indicator.html index 1d2bf90960..9c7e80a639 100644 --- a/platform/commonUI/notification/res/notification-indicator.html +++ b/platform/commonUI/notification/res/notification-indicator.html @@ -1,8 +1,5 @@ diff --git a/platform/commonUI/notification/src/MessageSeverity.js b/platform/commonUI/notification/src/MessageSeverity.js deleted file mode 100644 index 44064bf92f..0000000000 --- a/platform/commonUI/notification/src/MessageSeverity.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Created by akhenry on 10/7/15. - */ -/*global define*/ -define(function(){ - return { - INFO: 0, - ALERT: 1, - ERROR: 2 - }; -}); \ No newline at end of file diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js index e225fd41bf..21da649a8f 100644 --- a/platform/commonUI/notification/src/NotificationIndicatorController.js +++ b/platform/commonUI/notification/src/NotificationIndicatorController.js @@ -22,8 +22,8 @@ /*global define*/ define( - ['./MessageSeverity'], - function (MessageSeverity) { + [], + function () { "use strict"; /** @@ -40,7 +40,6 @@ define( function NotificationIndicatorController($scope, notificationService, dialogService) { $scope.notifications = notificationService.notifications; $scope.highest = notificationService.highest; - $scope.MessageSeverity = MessageSeverity; /** * Launch a dialog showing a list of current notifications. @@ -48,8 +47,7 @@ define( $scope.showNotificationsList = function(){ var model = { - title: "Messages", - severity: MessageSeverity.INFO + title: "Messages" }; model.messages = notificationService.notifications; diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index c11b92c651..2e1a44a1a8 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -32,8 +32,8 @@ * @namespace platform/commonUI/dialog */ define( - ["./MessageSeverity"], - function (MessageSeverity) { + [], + function () { "use strict"; /** @@ -56,8 +56,9 @@ define( * * @typedef {object} Notification * @property {string} title The title of the message - * @property {MessageSeverity} severity The importance of the - * message (eg. error, info) + * @property {string} severity The importance of the + * message (one of 'info', 'alert', or 'error' where info < alert < + * error) * @property {number} progress The completion status of a task * represented numerically * @property {boolean} unknownProgress a boolean indicating that the @@ -91,7 +92,7 @@ define( function NotificationService($timeout, DEFAULT_AUTO_DISMISS, MINIMIZE_TIMEOUT) { this.notifications = []; this.$timeout = $timeout; - this.highest ={ severity: MessageSeverity.INFO }; + this.highest ={ severity: "info" }; this.DEFAULT_AUTO_DISMISS = DEFAULT_AUTO_DISMISS; this.MINIMIZE_TIMEOUT = MINIMIZE_TIMEOUT; @@ -118,7 +119,7 @@ define( */ NotificationService.prototype.info = function (notification) { notification.autoDismiss = notification.autoDismiss || true; - notification.severity = MessageSeverity.INFO; + notification.severity = "info"; this.notify(notification); }; @@ -130,13 +131,18 @@ define( * @param {Notification} notification The notification to display */ NotificationService.prototype.notify = function (notification) { - var self = this; - + var self = this, + ordinality = { + "info": 1, + "alert": 2, + "error": 3 + }; + notification.severity = notification.severity || "info" if (notification.autoDismiss === true){ notification.autoDismiss = this.DEFAULT_AUTO_DISMISS; } - if (notification.severity > this.highest.severity){ + if (ordinality[notification.severity.toLowerCase()] > ordinality[this.highest.severity.toLowerCase()]){ this.highest.severity = notification.severity; } @@ -271,11 +277,6 @@ define( //For now minimize everything, and have discussion around which //kind of messages should or should not be in the minimized //notifications list - /*if (notification.severity > MessageSeverity.INFO){ - this.minimize(notification); - } else { - this.dismiss(notification); - }*/ this.minimize(notification); }; diff --git a/platform/commonUI/notification/test/NotificationServiceSpec.js b/platform/commonUI/notification/test/NotificationServiceSpec.js index 3957fe622e..dca76652ce 100644 --- a/platform/commonUI/notification/test/NotificationServiceSpec.js +++ b/platform/commonUI/notification/test/NotificationServiceSpec.js @@ -22,8 +22,8 @@ /*global define,describe,it,expect,beforeEach,waitsFor,jasmine */ define( - ['../src/NotificationService','../src/MessageSeverity'], - function (NotificationService, MessageSeverity) { + ['../src/NotificationService'], + function (NotificationService) { "use strict"; describe("The notification service ", function () { @@ -34,46 +34,6 @@ define( successModel, errorModel; - /** - * 1) Calling .notify results in a new notification being created - * with the provided model and set to the active notification. DONE - * - * 2) Calling .notify with autoDismiss results in a SUCCESS notification - * becoming dismissed after timeout has elapsed DONE - * - * 3) Calling .notify with autoDismiss results in an ERROR notification - * being MINIMIZED after a timeout has elapsed DONE - * - * 4) Calling .notify with an active info notification results in that - * notification being auto-dismissed, and the new notification becoming - * active. DONE - * - * 5) Calling .notify with an active error notification results in that - * notification being auto-minimized and the new notification becoming - * active. DONE - * - * 6) Calling .notify with an active error notification, AND a - * queued error notification results in the active notification - * being auto-dismissed, the next message in the queue becoming - * active, then auto-dismissed, and then the provided notification - * becoming active. - */ - - /** - var model = { - title: string, - progress: number, - severity: MessageSeverity, - unknownProgress: boolean, - minimized: boolean, - autoDismiss: boolean | number, - actions: { - label: string, - action: function - } - } - */ - beforeEach(function(){ mockTimeout = jasmine.createSpy("$timeout"); mockAutoDismiss = mockMinimizeTimeout = 1000; @@ -81,11 +41,11 @@ define( mockTimeout, mockAutoDismiss, mockMinimizeTimeout); successModel = { title: "Mock Success Notification", - severity: MessageSeverity.INFO + severity: "info" }; errorModel = { title: "Mock Error Notification", - severity: MessageSeverity.ERROR + severity: "error" }; }); @@ -147,23 +107,6 @@ define( activeNotification = notificationService.getActiveNotification(); expect(activeNotification).toBe(errorModel); }); - /* Test is temporarily invalid as info messages are being - minimized - it("auto-dismisses an active success notification, removing" + - " it completely", function() { - //First pre-load with a info message - notificationService.notify(successModel); - //Then notify of an error - notificationService.notify(errorModel); - expect(notificationService.notifications.length).toEqual(2); - mockTimeout.mostRecentCall.args[0](); - //Two timeouts, one is to force minimization after - // displaying the message for a minimum period, the - // second is to allow minimization animation to take place. - mockTimeout.mostRecentCall.args[0](); - //Previous info message should be completely dismissed - expect(notificationService.notifications.length).toEqual(1); - });*/ it("auto-minimizes an active error notification", function() { var activeNotification; //First pre-load with an error message @@ -190,11 +133,11 @@ define( var activeNotification, error2 = { title: "Second Mock Error Notification", - severity: MessageSeverity.ERROR + severity: "error" }, error3 = { title: "Third Mock Error Notification", - severity: MessageSeverity.ERROR + severity: "error" }; //First pre-load with a info message From e3ef68bc6f711a30973b274e6a58a55d9299755e Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Oct 2015 16:41:09 -0700 Subject: [PATCH 071/201] Fixed jslint errors --- example/notifications/src/DialogLaunchController.js | 6 ++---- .../commonUI/general/src/controllers/BannerController.js | 2 +- platform/commonUI/notification/src/NotificationService.js | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/example/notifications/src/DialogLaunchController.js b/example/notifications/src/DialogLaunchController.js index e6a8b4e132..f35d008cd0 100644 --- a/example/notifications/src/DialogLaunchController.js +++ b/example/notifications/src/DialogLaunchController.js @@ -130,15 +130,13 @@ define( " dialog. This dialog can be used to draw the user's" + " attention to an event.", severity: "info", - options: [ - { + primaryOption: { label: "OK", callback: function () { $log.debug("OK Pressed"); dialogService.dismiss(); } - }, - ] + } }; if (!dialogService.showBlockingMessage(model)) { diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index 511bf23b38..068b5cda81 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -55,7 +55,7 @@ define( notificationService.dismissOrMinimize(notification); }; $scope.maximize = function(notification) { - if (notification.severity != "info"){ + if (notification.severity !== "info"){ notification.cancel = function(){ dialogService.dismiss(); }; diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 2e1a44a1a8..8887e7cb9a 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -137,7 +137,7 @@ define( "alert": 2, "error": 3 }; - notification.severity = notification.severity || "info" + notification.severity = notification.severity || "info"; if (notification.autoDismiss === true){ notification.autoDismiss = this.DEFAULT_AUTO_DISMISS; } From 536d5616d4a23f95838c7b9ac05665a8906e75c7 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 22 Oct 2015 18:28:25 -0700 Subject: [PATCH 072/201] [Frontend] Manual re-do of collapse/expand panes open #90 Major work on new .mini-tab elements, used as controls to expand/collapse panes; Cleaned up splitter hover behavior; Changed mixin controlGrippy to not be tied to :before; --- .../browse/res/templates/browse-object.html | 51 +- .../commonUI/browse/res/templates/browse.html | 4 +- .../commonUI/general/res/sass/_global.scss | 4 - .../commonUI/general/res/sass/_icons.scss | 1 + .../commonUI/general/res/sass/_mixins.scss | 48 +- .../general/res/sass/controls/_buttons.scss | 80 ++- .../general/res/sass/controls/_controls.scss | 2 - .../general/res/sass/helpers/_splitter.scss | 24 +- .../general/res/sass/mobile/_layout.scss | 5 +- .../res/sass/user-environ/_layout.scss | 61 +- .../espresso/res/css/theme-espresso.css | 581 ++++++++++-------- .../themes/snow/res/css/theme-snow.css | 573 ++++++++++------- 12 files changed, 855 insertions(+), 579 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 8e980581fe..12bf5af841 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -20,43 +20,42 @@ at runtime from the About dialog for additional information. --> -
-
- - - -
-
- - - - - -
-
- +
+
+
+ + + +
+
+ + + + + +
+
- F +
- Inspector goes here +
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 235585de64..678b15be87 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -54,9 +54,7 @@
- m +
+ $xpos: $iconD + 2px; + &:before { + content:'\3e'; + left: $xpos; + } + &:hover:before { left: $xpos + 3; } + } +} + .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 diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index eef87c3439..bc61fbc35e 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -306,8 +306,6 @@ label.checkbox.custom { left: 0; } .knob { - //@include btnSubtle(); - //@include controlGrippy(rgba(black, 0.3), vertical, 1px, solid); @include trans-prop-nice-fade(.25s); background-color: $sliderColorKnob; &:hover { diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss index f91f5936d4..b329f6fa11 100644 --- a/platform/commonUI/general/res/sass/helpers/_splitter.scss +++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss @@ -26,14 +26,16 @@ background-color: $b; @include border-radius($splitterEndCr); @include boxShdw($splitterShdw); - overflow: hidden; + //overflow: hidden; position: absolute; z-index: 1; - //@if $colorSplitterHover != 'none' { - &:hover { - background-color: $colorSplitterHover; - } - //} + &:hover { + background-color: $colorSplitterHover; + &:after { + //@include trans-prop-nice("border-color", 25ms); + border-color: $colorGrippyInteriorHover !important; + } + } } &.horizontal { // Slides vertically up and down, splitting the element horizontally @@ -49,7 +51,9 @@ } } >.splitter { - @include controlGrippy($colorSplitterInterior, horizontal); + &:after { + @include controlGrippy($colorSplitterInterior, horizontal); + } cursor: row-resize; left: 0; right: 0; width: auto; @@ -69,16 +73,18 @@ } } >.splitter { - @include controlGrippy($colorBodyBg, vertical); bottom: 0; cursor: col-resize; width: $splitterW; + &:after { + @include controlGrippy($colorBodyBg, vertical); + } } } } .browse-area .splitter { - top: $ueTopBarH + $interiorMarginLg; + top: 0; //$ueTopBarH + $interiorMarginLg; } .edit-area .splitter { diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index cf252f6205..f6627e6a5d 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -94,11 +94,14 @@ } } - .mobile-menu-icon { + .toggle-tree { font-size: 110%; position: absolute; top: $bodyMargin + 2; left: $bodyMargin; + &:before { + content:'m' !important; + } } .object-browse-bar { diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 179979bd2f..a3ce8275bd 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -252,6 +252,36 @@ top: $ueTopBarH + $interiorMarginLg + $treeSearchInputBarH + $interiorMargin; } } + .mini-tab.toggle-pane { + $h: $ueTopBarH; + $paneOffset: $interiorMarginLg * -3; + //font-size: 0.7rem; + //position: absolute; + //height: $h; + //line-height: $h; + top: 5px; + z-index: 2; + &.toggle-tree.anchor-left { + //@include test(green); + left: $paneOffset; +/* &:hover { + left: $paneOffset - 2; + }*/ + &:after { + content:'F'; + } + } + &.toggle-inspect.anchor-right { + $xpos: $paneOffset + $interiorMargin; + right: $xpos; +/* &:hover { + right: $xpos - 2; + }*/ + &:after { + content:'F'; //\e612 + } + } + } &.items { .object-browse-bar { .left.abs, @@ -289,7 +319,6 @@ } } } - } } @@ -358,46 +387,20 @@ // right representation. .browse-hidetree { @include user-select(none); - // Sets the left tree menu when the tree - // is hidden. + // Sets the left tree menu when the tree is hidden. .pane.left.treeview { opacity: 0; - //right: 100% !important; - //width: auto !important; - //overflow-y: hidden; - //overflow-x: hidden; } - // Sets the right represenation when - // the tree is hidden. + // Sets the right represenation when the tree is hidden. .pane.right-repr { left: 0 !important; } } .browse-showtree { - // NOTE: DISABLED SELECTION - // Selection disabled in both panes - // causing cut/copy/paste menu to - // not appear. Should me moved in - // future to properly work - //@include user-select(none); - // Sets the left tree menu when the tree is shown. .pane.left.treeview { @include trans-prop-nice(opacity, .4s); - //@include background-image(linear-gradient(90deg, rgba(black, 0) 98%, rgba(black, 0.3) 100%)); opacity: 1; - //display: block !important; - //width: auto !important; // CH CO - //right: auto; - //width: $proporMenuWithView; - } - // Sets the right representation when the tree is shown. - .pane.right-repr { - //left: $proporMenuWithView; - //width: auto !important; - - //left: 0 !important; - //transform: translateX($proporMenuWithView); } } \ 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 ea4789e283..d02fb40bb2 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -313,21 +313,17 @@ a.disabled { src: url("../../../../general/res/fonts/symbols/wtdsymbols.eot?#iefix") format("embedded-opentype"), url("../../../../general/res/fonts/symbols/wtdsymbols.woff") format("woff"), url("../../../../general/res/fonts/symbols/wtdsymbols.ttf") format("truetype"), url("../../../../general/res/fonts/symbols/wtdsymbols.svg#armataregular") format("svg"); font-weight: normal; font-style: normal; } -/* line 37, ../../../../general/res/sass/_global.scss */ -.ui-symbol, .l-datetime-picker .l-month-year-pager .pager { - font-family: 'symbolsfont'; } - /************************** HTML ENTITIES */ -/* line 42, ../../../../general/res/sass/_global.scss */ +/* line 38, ../../../../general/res/sass/_global.scss */ a { color: #ccc; cursor: pointer; text-decoration: none; } - /* line 46, ../../../../general/res/sass/_global.scss */ + /* line 42, ../../../../general/res/sass/_global.scss */ a:hover { color: #fff; } -/* line 51, ../../../../general/res/sass/_global.scss */ +/* line 47, ../../../../general/res/sass/_global.scss */ body, html { -webkit-font-smoothing: subpixel-antialiased; -moz-osx-font-smoothing: grayscale; @@ -339,24 +335,24 @@ body, html { width: 100%; overflow: hidden; } -/* line 64, ../../../../general/res/sass/_global.scss */ +/* line 60, ../../../../general/res/sass/_global.scss */ em { font-style: normal; } -/* line 68, ../../../../general/res/sass/_global.scss */ +/* line 64, ../../../../general/res/sass/_global.scss */ input, textarea { font-family: Helvetica, Arial, sans-serif; } -/* line 72, ../../../../general/res/sass/_global.scss */ +/* line 68, ../../../../general/res/sass/_global.scss */ input[type="text"] { vertical-align: baseline; padding: 3px 5px !important; } -/* line 77, ../../../../general/res/sass/_global.scss */ +/* line 73, ../../../../general/res/sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 81, ../../../../general/res/sass/_global.scss */ +/* line 77, ../../../../general/res/sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -364,15 +360,15 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 89, ../../../../general/res/sass/_global.scss */ +/* line 85, ../../../../general/res/sass/_global.scss */ p { margin-bottom: 10px; } -/* line 93, ../../../../general/res/sass/_global.scss */ +/* line 89, ../../../../general/res/sass/_global.scss */ mct-container { display: block; } -/* line 97, ../../../../general/res/sass/_global.scss */ +/* line 93, ../../../../general/res/sass/_global.scss */ .abs, .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .val, .s-menu-btn span.l-click-area { position: absolute; @@ -383,50 +379,50 @@ mct-container { height: auto; width: auto; } -/* line 107, ../../../../general/res/sass/_global.scss */ +/* line 103, ../../../../general/res/sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 114, ../../../../general/res/sass/_global.scss */ +/* line 110, ../../../../general/res/sass/_global.scss */ .codehilite { background-color: rgba(153, 153, 153, 0.1); padding: 1em; } -/* line 120, ../../../../general/res/sass/_global.scss */ +/* line 116, ../../../../general/res/sass/_global.scss */ .align-right { text-align: right; } -/* line 124, ../../../../general/res/sass/_global.scss */ +/* line 120, ../../../../general/res/sass/_global.scss */ .centered { text-align: center; } -/* line 128, ../../../../general/res/sass/_global.scss */ +/* line 124, ../../../../general/res/sass/_global.scss */ .scrolling { overflow: auto; } -/* line 132, ../../../../general/res/sass/_global.scss */ +/* line 128, ../../../../general/res/sass/_global.scss */ .vscroll { overflow-y: auto; } -/* line 136, ../../../../general/res/sass/_global.scss */ +/* line 132, ../../../../general/res/sass/_global.scss */ .no-margin { margin: 0; } -/* line 140, ../../../../general/res/sass/_global.scss */ +/* line 136, ../../../../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 144, ../../../../general/res/sass/_global.scss */ +/* line 140, ../../../../general/res/sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 149, ../../../../general/res/sass/_global.scss */ +/* line 145, ../../../../general/res/sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -606,53 +602,56 @@ mct-container { border-top: 5px solid #0099cc; border-right: 5px solid transparent; } -/* line 32, ../../../../general/res/sass/_icons.scss */ -.ui-symbol.type-icon, .l-datetime-picker .l-month-year-pager .type-icon.pager { - color: #cccccc; } -/* line 35, ../../../../general/res/sass/_icons.scss */ -.ui-symbol.icon, .l-datetime-picker .l-month-year-pager .icon.pager { - color: #0099cc; } - /* line 37, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert, .l-datetime-picker .l-month-year-pager .icon.alert.pager { - color: #ff3c00; } - /* line 39, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { - color: #ff8a66; } - /* line 43, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.major, .l-datetime-picker .l-month-year-pager .icon.major.pager { - font-size: 1.65em; } -/* line 47, ../../../../general/res/sass/_icons.scss */ -.ui-symbol.icon-calendar:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { - content: "\e605"; } +/* line 31, ../../../../general/res/sass/_icons.scss */ +.ui-symbol, .s-icon-btn, .mini-tab, .l-datetime-picker .l-month-year-pager .pager { + font-family: 'symbolsfont'; } + /* line 33, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.type-icon, .type-icon.s-icon-btn, .type-icon.mini-tab, .l-datetime-picker .l-month-year-pager .type-icon.pager { + color: #cccccc; } + /* line 36, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon, .icon.s-icon-btn, .icon.mini-tab, .l-datetime-picker .l-month-year-pager .icon.pager { + color: #0099cc; } + /* line 38, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.alert, .icon.alert.s-icon-btn, .icon.alert.mini-tab, .l-datetime-picker .l-month-year-pager .icon.alert.pager { + color: #ff3c00; } + /* line 40, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.alert:hover, .icon.alert.s-icon-btn:hover, .icon.alert.mini-tab:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { + color: #ff8a66; } + /* line 44, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.major, .icon.major.s-icon-btn, .icon.major.mini-tab, .l-datetime-picker .l-month-year-pager .icon.major.pager { + font-size: 1.65em; } + /* line 48, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon-calendar:after, .icon-calendar.s-icon-btn:after, .icon-calendar.mini-tab:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { + content: "\e605"; } -/* line 52, ../../../../general/res/sass/_icons.scss */ -.bar .ui-symbol, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { +/* line 53, ../../../../general/res/sass/_icons.scss */ +.bar .ui-symbol, .bar .s-icon-btn, .bar .mini-tab, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { display: inline-block; } -/* line 56, ../../../../general/res/sass/_icons.scss */ +/* line 57, ../../../../general/res/sass/_icons.scss */ .invoke-menu { text-shadow: none; display: inline-block; } -/* line 61, ../../../../general/res/sass/_icons.scss */ +/* line 62, ../../../../general/res/sass/_icons.scss */ .s-menu-btn .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } -/* line 66, ../../../../general/res/sass/_icons.scss */ +/* line 67, ../../../../general/res/sass/_icons.scss */ .menu .type-icon, .tree-item .type-icon, .super-menu.menu .type-icon { position: absolute; } -/* line 76, ../../../../general/res/sass/_icons.scss */ +/* line 77, ../../../../general/res/sass/_icons.scss */ .l-icon-link:before { content: "\f4"; } -/* line 80, ../../../../general/res/sass/_icons.scss */ +/* line 81, ../../../../general/res/sass/_icons.scss */ .l-icon-alert { display: none !important; } - /* line 82, ../../../../general/res/sass/_icons.scss */ + /* line 83, ../../../../general/res/sass/_icons.scss */ .l-icon-alert:before { color: #ff3c00; content: "!"; } @@ -910,58 +909,36 @@ mct-container { -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; - overflow: hidden; position: absolute; z-index: 1; } - /* line 33, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 32, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout .splitter:hover { background-color: none; } -/* line 38, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 34, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout .splitter:hover:after { + border-color: #0099cc !important; } +/* line 40, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal { overflow: hidden; } - /* line 41, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 43, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane { left: 0; right: 0; } - /* line 44, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 46, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.top { bottom: auto; } - /* line 47, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 49, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.bottom { top: auto; } - /* line 51, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 53, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal > .splitter { cursor: row-resize; left: 0; right: 0; width: auto; height: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ - .split-layout.horizontal > .splitter:before { - -moz-transition-property: "border-color"; - -o-transition-property: "border-color"; - -webkit-transition-property: "border-color"; - transition-property: "border-color"; - -moz-transition-duration: 0.75s; - -o-transition-duration: 0.75s; - -webkit-transition-duration: 0.75s; - transition-duration: 0.75s; - -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; - content: ''; - display: block; - height: auto; - pointer-events: none; - position: absolute; - z-index: 2; - border-top: 1px dotted #0d0d0d; - top: 2px; - left: 5px; - right: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ - .split-layout.horizontal > .splitter:not(.disabled):hover:before { + /* line 54, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.horizontal > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; -webkit-transition-property: "border-color"; @@ -974,48 +951,33 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - border-color: #0099cc; } -/* line 61, ../../../../general/res/sass/helpers/_splitter.scss */ + content: ''; + display: block; + pointer-events: none; + position: absolute; + z-index: 2; + border-top: 1px dotted #0d0d0d; + top: 2px; + left: 5px; + right: 5px; + height: 1px; } +/* line 65, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane { top: 0; bottom: 0; } - /* line 64, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.left { right: auto; } - /* line 67, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.right { left: auto; } -/* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 75, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical > .splitter { bottom: 0; cursor: col-resize; width: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ - .split-layout.vertical > .splitter:before { - -moz-transition-property: "border-color"; - -o-transition-property: "border-color"; - -webkit-transition-property: "border-color"; - transition-property: "border-color"; - -moz-transition-duration: 0.75s; - -o-transition-duration: 0.75s; - -webkit-transition-duration: 0.75s; - transition-duration: 0.75s; - -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; - content: ''; - display: block; - height: auto; - pointer-events: none; - position: absolute; - z-index: 2; - border-left: 1px dotted #0d0d0d; - left: 2px; - bottom: 5px; - top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ - .split-layout.vertical > .splitter:not(.disabled):hover:before { + /* line 79, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.vertical > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; -webkit-transition-property: "border-color"; @@ -1028,13 +990,22 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - border-color: #0099cc; } + content: ''; + display: block; + pointer-events: none; + position: absolute; + z-index: 2; + border-left: 1px dotted #0d0d0d; + left: 2px; + bottom: 5px; + top: 5px; + width: 1px; } -/* line 80, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 86, ../../../../general/res/sass/helpers/_splitter.scss */ .browse-area .splitter { - top: 34px; } + top: 0; } -/* line 84, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 90, ../../../../general/res/sass/helpers/_splitter.scss */ .edit-area .splitter { top: 0; } @@ -1343,10 +1314,8 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 25, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu-btn { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; +.s-btn, .s-menu-btn, +.s-icon-btn { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; @@ -1354,26 +1323,32 @@ mct-container { cursor: pointer; text-decoration: none; height: 25px; - line-height: 25px; + line-height: 25px; } + +/* line 34, ../../../../general/res/sass/controls/_buttons.scss */ +.s-btn, .s-menu-btn { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; padding: 0 7.5px; font-size: 0.7rem; } - /* line 35, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 39, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn .icon, .s-menu-btn .icon { font-size: 0.8rem; color: #0099cc; } - /* line 40, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn .title-label, .s-menu-btn .title-label { vertical-align: top; } - /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.lg, .lg.s-menu-btn { font-size: 1rem; } - /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.sm, .sm.s-menu-btn { padding: 0 5px; } - /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.vsm, .vsm.s-menu-btn { padding: 0 2.5px; } - /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 60, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.major, .major.s-menu-btn { background-color: #0099cc; -moz-border-radius: 3px; @@ -1402,17 +1377,17 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { color: white; } } - /* line 62, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn:not(.major), .s-menu-btn:not(.major) { background-color: #454545; -moz-border-radius: 3px; @@ -1441,20 +1416,20 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { color: #33ccff; } } - /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play .icon:before, .pause-play.s-menu-btn .icon:before { content: "\0000F1"; } - /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused, .pause-play.paused.s-menu-btn { background-color: #c56f01; -moz-border-radius: 3px; @@ -1483,17 +1458,17 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: linear-gradient(#fe9815, #f88c01); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { color: white; } } - /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -1510,23 +1485,110 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu-btn .icon :before { content: "\0000EF"; } - /* line 86, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 90, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before { content: "\000039"; } -/* line 92, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 96, ../../../../general/res/sass/controls/_buttons.scss */ +.s-icon-btn { + color: #0099cc; } + /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ + .s-icon-btn:hover { + color: #33ccff; } + +/* line 104, ../../../../general/res/sass/controls/_buttons.scss */ +.mini-tab { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + color: #595959; + cursor: pointer; + display: block; + position: absolute; + font-size: 12px; + line-height: 12px; + height: 12px; + width: 12px; } + /* line 120, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover { + color: #8c8c8c; } + /* line 122, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover:after { + color: #0099cc; } + /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before, .mini-tab:after { + -moz-transition-property: color; + -o-transition-property: color; + -webkit-transition-property: color; + transition-property: color; + -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; + display: block; + position: absolute; } + /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + font-size: 7px; + height: 100%; + width: 7px; } + /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:after { + width: 100%; + height: 100%; } + /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:before { + content: '\3c'; + left: -8px; } + /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:hover:before { + left: -11px; } + /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:before { + content: '\3e'; + left: 14px; } + /* line 164, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:hover:before { + left: 17px; } + +/* line 168, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 98, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 174, ../../../../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 104, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 180, ../../../../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; @@ -1535,7 +1597,7 @@ mct-container { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 111, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 187, ../../../../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; @@ -1544,7 +1606,7 @@ mct-container { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 118, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 194, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -1950,10 +2012,10 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 313, ../../../../general/res/sass/controls/_controls.scss */ + /* line 311, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:hover { background-color: #0099cc; } -/* line 324, ../../../../general/res/sass/controls/_controls.scss */ +/* line 322, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-l { -moz-border-radius-topleft: 10px; -webkit-border-top-left-radius: 10px; @@ -1962,7 +2024,7 @@ label.checkbox.custom { -webkit-border-bottom-left-radius: 10px; border-bottom-left-radius: 10px; cursor: w-resize; } -/* line 328, ../../../../general/res/sass/controls/_controls.scss */ +/* line 326, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-r { -moz-border-radius-topright: 10px; -webkit-border-top-right-radius: 10px; @@ -1971,7 +2033,7 @@ label.checkbox.custom { -webkit-border-bottom-right-radius: 10px; border-bottom-right-radius: 10px; cursor: e-resize; } -/* line 332, ../../../../general/res/sass/controls/_controls.scss */ +/* line 330, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; @@ -1994,12 +2056,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 343, ../../../../general/res/sass/controls/_controls.scss */ + /* line 341, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background-color: rgba(0, 153, 204, 0.5); } /******************************************************** DATETIME PICKER */ -/* line 350, ../../../../general/res/sass/controls/_controls.scss */ +/* line 348, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker { -moz-user-select: -moz-none; -ms-user-select: none; @@ -2008,65 +2070,65 @@ label.checkbox.custom { font-size: 0.8rem; padding: 10px !important; width: 230px; } - /* line 356, ../../../../general/res/sass/controls/_controls.scss */ + /* line 354, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager { height: 15px; margin-bottom: 5px; position: relative; } - /* line 368, ../../../../general/res/sass/controls/_controls.scss */ + /* line 366, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager { width: 20px; } - /* line 371, ../../../../general/res/sass/controls/_controls.scss */ + /* line 369, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev { right: auto; } - /* line 373, ../../../../general/res/sass/controls/_controls.scss */ + /* line 371, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev:before { content: "\3c"; } - /* line 377, ../../../../general/res/sass/controls/_controls.scss */ + /* line 375, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next { left: auto; text-align: right; } - /* line 380, ../../../../general/res/sass/controls/_controls.scss */ + /* line 378, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next:before { content: "\3e"; } - /* line 385, ../../../../general/res/sass/controls/_controls.scss */ + /* line 383, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .val { text-align: center; left: 25px; right: 25px; } - /* line 391, ../../../../general/res/sass/controls/_controls.scss */ + /* line 389, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-calendar, .l-datetime-picker .l-time-selects { border-top: 1px solid rgba(153, 153, 153, 0.1); } - /* line 395, ../../../../general/res/sass/controls/_controls.scss */ + /* line 393, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-time-selects { line-height: 22px; } /******************************************************** CALENDAR */ -/* line 403, ../../../../general/res/sass/controls/_controls.scss */ +/* line 401, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row { display: -webkit-flex; display: flex; -webkit-flex-flow: row nowrap; flex-flow: row nowrap; margin-top: 1px; } - /* line 407, ../../../../general/res/sass/controls/_controls.scss */ + /* line 405, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row:first-child { margin-top: 0; } - /* line 410, ../../../../general/res/sass/controls/_controls.scss */ + /* line 408, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row li { -webkit-flex: 1 0; flex: 1 0; margin-left: 1px; padding: 5px; text-align: center; } - /* line 416, ../../../../general/res/sass/controls/_controls.scss */ + /* line 414, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row li:first-child { margin-left: 0; } - /* line 420, ../../../../general/res/sass/controls/_controls.scss */ + /* line 418, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-header li { color: #b3b3b3; } - /* line 423, ../../../../general/res/sass/controls/_controls.scss */ + /* line 421, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li { -moz-transition-property: background-color; -o-transition-property: background-color; @@ -2081,31 +2143,31 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; cursor: pointer; } - /* line 426, ../../../../general/res/sass/controls/_controls.scss */ + /* line 424, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.in-month { background-color: #616161; } - /* line 429, ../../../../general/res/sass/controls/_controls.scss */ + /* line 427, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li .sub { color: #b3b3b3; font-size: 0.8em; } - /* line 433, ../../../../general/res/sass/controls/_controls.scss */ + /* line 431, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected { background: #006080; color: #cccccc; } - /* line 436, ../../../../general/res/sass/controls/_controls.scss */ + /* line 434, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected .sub { color: inherit; } - /* line 440, ../../../../general/res/sass/controls/_controls.scss */ + /* line 438, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li:hover { background-color: #0099cc; color: #fff; } - /* line 443, ../../../../general/res/sass/controls/_controls.scss */ + /* line 441, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li:hover .sub { color: inherit; } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 454, ../../../../general/res/sass/controls/_controls.scss */ + /* line 452, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2120,7 +2182,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 463, ../../../../general/res/sass/controls/_controls.scss */ + /* line 461, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2134,7 +2196,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 472, ../../../../general/res/sass/controls/_controls.scss */ + /* line 470, ../../../../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%; @@ -2143,7 +2205,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); background-image: linear-gradient(#5e5e5e, #525252 20px); } - /* line 477, ../../../../general/res/sass/controls/_controls.scss */ + /* line 475, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } } /***************************************************************************** @@ -2224,7 +2286,7 @@ label.checkbox.custom { left: 0; text-align: left; } /* line 57, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { + .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { width: 12px; } /******************************************************** MENUS THEMSELVES */ @@ -2268,7 +2330,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -2512,8 +2574,10 @@ mct-include.l-time-controller { mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl { color: #666666; } /* line 69, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.s-icon-btn, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.pager { font-size: 11px; @@ -2820,7 +2884,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2877,7 +2941,7 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2905,7 +2969,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -2964,14 +3028,14 @@ textarea { overflow: hidden; position: relative; line-height: 22px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover > .icon { color: #33ccff; } } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ @@ -3053,7 +3117,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../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 */ @@ -3219,7 +3283,7 @@ span.req { padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3235,8 +3299,10 @@ span.req { .t-filter input.t-filter-input:not(.ng-dirty) + .t-a-clear { display: none; } /* line 42, ../../../../general/res/sass/forms/_filter.scss */ -.filter .icon.ui-symbol, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, +.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, .t-filter .icon.ui-symbol, +.t-filter .icon.s-icon-btn, +.t-filter .icon.mini-tab, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager { -moz-border-radius: 3px; @@ -3249,14 +3315,18 @@ span.req { padding: 0px 5px; vertical-align: middle; } /* line 50, ../../../../general/res/sass/forms/_filter.scss */ - .filter .icon.ui-symbol:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, + .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, .t-filter .icon.ui-symbol:hover, + .t-filter .icon.s-icon-btn:hover, + .t-filter .icon.mini-tab:hover, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager:hover { background: rgba(255, 255, 255, 0.1); } /* line 54, ../../../../general/res/sass/forms/_filter.scss */ -.filter .s-a-clear.ui-symbol, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, +.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, .t-filter .s-a-clear.ui-symbol, +.t-filter .s-a-clear.s-icon-btn, +.t-filter .s-a-clear.mini-tab, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager { -moz-border-radius: 3px; @@ -3282,8 +3352,10 @@ span.req { text-align: center; z-index: 5; } /* line 74, ../../../../general/res/sass/forms/_filter.scss */ - .filter .s-a-clear.ui-symbol:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, + .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, .t-filter .s-a-clear.ui-symbol:hover, + .t-filter .s-a-clear.s-icon-btn:hover, + .t-filter .s-a-clear.mini-tab:hover, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager:hover { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60); @@ -3551,7 +3623,29 @@ span.req { .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane { + top: 5px; + z-index: 2; } + /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { + left: -30px; + /* &:hover { + left: $paneOffset - 2; + }*/ } + /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { + content: 'F'; } + /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { + right: -25px; + /* &:hover { + right: $xpos - 2; + }*/ } + /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { + content: 'F'; } + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3564,31 +3658,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 296, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 299, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3598,11 +3692,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 338, ../../../../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, @@ -3614,12 +3708,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3635,41 +3729,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 363, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.left.treeview { opacity: 0; } - /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.right-repr { left: 0 !important; } -/* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-showtree .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3775,42 +3869,45 @@ span.req { left: 40% !important; } /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-menu-icon { + .toggle-tree { font-size: 110%; position: absolute; top: 12px; left: 10px; } + /* line 102, ../../../../general/res/sass/mobile/_layout.scss */ + .toggle-tree:before { + content: 'm' !important; } - /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 113, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 115, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 123, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 126, ../../../../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 128, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 131, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 136, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3827,7 +3924,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 138, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 141, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3844,19 +3941,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.left.treeview { width: 90% !important; } - /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 156, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 164, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } /***************************************************************************** @@ -4297,14 +4394,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../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: linear-gradient(#a6a6a6, #999999); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../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 { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4389,7 +4486,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5657,14 +5754,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: linear-gradient(#666666, #595959); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5799,14 +5896,14 @@ table { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #80dfff; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover > .icon { color: #33ccff; } } /* line 137, ../../../../general/res/sass/items/_item.scss */ @@ -6251,7 +6348,7 @@ table { left: 0; z-index: 1; } /* line 22, ../../../../general/res/sass/features/_time-display.scss */ - .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { + .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { font-size: 0.8em; } /* line 26, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer:hover .l-elem.l-value { diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index a2aa51e183..b1efcd8cff 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -313,21 +313,17 @@ a.disabled { src: url("../../../../general/res/fonts/symbols/wtdsymbols.eot?#iefix") format("embedded-opentype"), url("../../../../general/res/fonts/symbols/wtdsymbols.woff") format("woff"), url("../../../../general/res/fonts/symbols/wtdsymbols.ttf") format("truetype"), url("../../../../general/res/fonts/symbols/wtdsymbols.svg#armataregular") format("svg"); font-weight: normal; font-style: normal; } -/* line 37, ../../../../general/res/sass/_global.scss */ -.ui-symbol, .l-datetime-picker .l-month-year-pager .pager { - font-family: 'symbolsfont'; } - /************************** HTML ENTITIES */ -/* line 42, ../../../../general/res/sass/_global.scss */ +/* line 38, ../../../../general/res/sass/_global.scss */ a { color: #999; cursor: pointer; text-decoration: none; } - /* line 46, ../../../../general/res/sass/_global.scss */ + /* line 42, ../../../../general/res/sass/_global.scss */ a:hover { color: #0099cc; } -/* line 51, ../../../../general/res/sass/_global.scss */ +/* line 47, ../../../../general/res/sass/_global.scss */ body, html { -webkit-font-smoothing: subpixel-antialiased; -moz-osx-font-smoothing: grayscale; @@ -339,24 +335,24 @@ body, html { width: 100%; overflow: hidden; } -/* line 64, ../../../../general/res/sass/_global.scss */ +/* line 60, ../../../../general/res/sass/_global.scss */ em { font-style: normal; } -/* line 68, ../../../../general/res/sass/_global.scss */ +/* line 64, ../../../../general/res/sass/_global.scss */ input, textarea { font-family: Helvetica, Arial, sans-serif; } -/* line 72, ../../../../general/res/sass/_global.scss */ +/* line 68, ../../../../general/res/sass/_global.scss */ input[type="text"] { vertical-align: baseline; padding: 3px 5px !important; } -/* line 77, ../../../../general/res/sass/_global.scss */ +/* line 73, ../../../../general/res/sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 81, ../../../../general/res/sass/_global.scss */ +/* line 77, ../../../../general/res/sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -364,15 +360,15 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 89, ../../../../general/res/sass/_global.scss */ +/* line 85, ../../../../general/res/sass/_global.scss */ p { margin-bottom: 10px; } -/* line 93, ../../../../general/res/sass/_global.scss */ +/* line 89, ../../../../general/res/sass/_global.scss */ mct-container { display: block; } -/* line 97, ../../../../general/res/sass/_global.scss */ +/* line 93, ../../../../general/res/sass/_global.scss */ .abs, .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .val, .s-menu-btn span.l-click-area { position: absolute; @@ -383,50 +379,50 @@ mct-container { height: auto; width: auto; } -/* line 107, ../../../../general/res/sass/_global.scss */ +/* line 103, ../../../../general/res/sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 114, ../../../../general/res/sass/_global.scss */ +/* line 110, ../../../../general/res/sass/_global.scss */ .codehilite { background-color: rgba(102, 102, 102, 0.1); padding: 1em; } -/* line 120, ../../../../general/res/sass/_global.scss */ +/* line 116, ../../../../general/res/sass/_global.scss */ .align-right { text-align: right; } -/* line 124, ../../../../general/res/sass/_global.scss */ +/* line 120, ../../../../general/res/sass/_global.scss */ .centered { text-align: center; } -/* line 128, ../../../../general/res/sass/_global.scss */ +/* line 124, ../../../../general/res/sass/_global.scss */ .scrolling { overflow: auto; } -/* line 132, ../../../../general/res/sass/_global.scss */ +/* line 128, ../../../../general/res/sass/_global.scss */ .vscroll { overflow-y: auto; } -/* line 136, ../../../../general/res/sass/_global.scss */ +/* line 132, ../../../../general/res/sass/_global.scss */ .no-margin { margin: 0; } -/* line 140, ../../../../general/res/sass/_global.scss */ +/* line 136, ../../../../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 144, ../../../../general/res/sass/_global.scss */ +/* line 140, ../../../../general/res/sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 149, ../../../../general/res/sass/_global.scss */ +/* line 145, ../../../../general/res/sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -606,53 +602,56 @@ mct-container { border-top: 5px solid #0099cc; border-right: 5px solid transparent; } -/* line 32, ../../../../general/res/sass/_icons.scss */ -.ui-symbol.type-icon, .l-datetime-picker .l-month-year-pager .type-icon.pager { - color: #b3b3b3; } -/* line 35, ../../../../general/res/sass/_icons.scss */ -.ui-symbol.icon, .l-datetime-picker .l-month-year-pager .icon.pager { - color: #0099cc; } - /* line 37, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert, .l-datetime-picker .l-month-year-pager .icon.alert.pager { - color: #ff3c00; } - /* line 39, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { - color: #ff8a66; } - /* line 43, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.major, .l-datetime-picker .l-month-year-pager .icon.major.pager { - font-size: 1.65em; } -/* line 47, ../../../../general/res/sass/_icons.scss */ -.ui-symbol.icon-calendar:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { - content: "\e605"; } +/* line 31, ../../../../general/res/sass/_icons.scss */ +.ui-symbol, .s-icon-btn, .mini-tab, .l-datetime-picker .l-month-year-pager .pager { + font-family: 'symbolsfont'; } + /* line 33, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.type-icon, .type-icon.s-icon-btn, .type-icon.mini-tab, .l-datetime-picker .l-month-year-pager .type-icon.pager { + color: #b3b3b3; } + /* line 36, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon, .icon.s-icon-btn, .icon.mini-tab, .l-datetime-picker .l-month-year-pager .icon.pager { + color: #0099cc; } + /* line 38, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.alert, .icon.alert.s-icon-btn, .icon.alert.mini-tab, .l-datetime-picker .l-month-year-pager .icon.alert.pager { + color: #ff3c00; } + /* line 40, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.alert:hover, .icon.alert.s-icon-btn:hover, .icon.alert.mini-tab:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { + color: #ff8a66; } + /* line 44, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.major, .icon.major.s-icon-btn, .icon.major.mini-tab, .l-datetime-picker .l-month-year-pager .icon.major.pager { + font-size: 1.65em; } + /* line 48, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon-calendar:after, .icon-calendar.s-icon-btn:after, .icon-calendar.mini-tab:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { + content: "\e605"; } -/* line 52, ../../../../general/res/sass/_icons.scss */ -.bar .ui-symbol, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { +/* line 53, ../../../../general/res/sass/_icons.scss */ +.bar .ui-symbol, .bar .s-icon-btn, .bar .mini-tab, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { display: inline-block; } -/* line 56, ../../../../general/res/sass/_icons.scss */ +/* line 57, ../../../../general/res/sass/_icons.scss */ .invoke-menu { text-shadow: none; display: inline-block; } -/* line 61, ../../../../general/res/sass/_icons.scss */ +/* line 62, ../../../../general/res/sass/_icons.scss */ .s-menu-btn .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } -/* line 66, ../../../../general/res/sass/_icons.scss */ +/* line 67, ../../../../general/res/sass/_icons.scss */ .menu .type-icon, .tree-item .type-icon, .super-menu.menu .type-icon { position: absolute; } -/* line 76, ../../../../general/res/sass/_icons.scss */ +/* line 77, ../../../../general/res/sass/_icons.scss */ .l-icon-link:before { content: "\f4"; } -/* line 80, ../../../../general/res/sass/_icons.scss */ +/* line 81, ../../../../general/res/sass/_icons.scss */ .l-icon-alert { display: none !important; } - /* line 82, ../../../../general/res/sass/_icons.scss */ + /* line 83, ../../../../general/res/sass/_icons.scss */ .l-icon-alert:before { color: #ff3c00; content: "!"; } @@ -907,58 +906,36 @@ mct-container { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - overflow: hidden; position: absolute; z-index: 1; } - /* line 33, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 32, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout .splitter:hover { background-color: #0099cc; } -/* line 38, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 34, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout .splitter:hover:after { + border-color: #fcfcfc !important; } +/* line 40, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal { overflow: hidden; } - /* line 41, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 43, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane { left: 0; right: 0; } - /* line 44, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 46, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.top { bottom: auto; } - /* line 47, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 49, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.bottom { top: auto; } - /* line 51, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 53, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal > .splitter { cursor: row-resize; left: 0; right: 0; width: auto; height: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ - .split-layout.horizontal > .splitter:before { - -moz-transition-property: "border-color"; - -o-transition-property: "border-color"; - -webkit-transition-property: "border-color"; - transition-property: "border-color"; - -moz-transition-duration: 0.75s; - -o-transition-duration: 0.75s; - -webkit-transition-duration: 0.75s; - transition-duration: 0.75s; - -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; - content: ''; - display: block; - height: auto; - pointer-events: none; - position: absolute; - z-index: 2; - border-top: 1px dotted #d6d6d6; - top: 2px; - left: 5px; - right: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ - .split-layout.horizontal > .splitter:not(.disabled):hover:before { + /* line 54, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.horizontal > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; -webkit-transition-property: "border-color"; @@ -971,48 +948,33 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - border-color: #fcfcfc; } -/* line 61, ../../../../general/res/sass/helpers/_splitter.scss */ + content: ''; + display: block; + pointer-events: none; + position: absolute; + z-index: 2; + border-top: 1px dotted #d6d6d6; + top: 2px; + left: 5px; + right: 5px; + height: 1px; } +/* line 65, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane { top: 0; bottom: 0; } - /* line 64, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.left { right: auto; } - /* line 67, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.right { left: auto; } -/* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 75, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical > .splitter { bottom: 0; cursor: col-resize; width: 5px; } - /* line 159, ../../../../general/res/sass/_mixins.scss */ - .split-layout.vertical > .splitter:before { - -moz-transition-property: "border-color"; - -o-transition-property: "border-color"; - -webkit-transition-property: "border-color"; - transition-property: "border-color"; - -moz-transition-duration: 0.75s; - -o-transition-duration: 0.75s; - -webkit-transition-duration: 0.75s; - transition-duration: 0.75s; - -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; - content: ''; - display: block; - height: auto; - pointer-events: none; - position: absolute; - z-index: 2; - border-left: 1px dotted #d6d6d6; - left: 2px; - bottom: 5px; - top: 5px; } - /* line 181, ../../../../general/res/sass/_mixins.scss */ - .split-layout.vertical > .splitter:not(.disabled):hover:before { + /* line 79, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.vertical > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; -webkit-transition-property: "border-color"; @@ -1025,13 +987,22 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - border-color: #fcfcfc; } + content: ''; + display: block; + pointer-events: none; + position: absolute; + z-index: 2; + border-left: 1px dotted #d6d6d6; + left: 2px; + bottom: 5px; + top: 5px; + width: 1px; } -/* line 80, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 86, ../../../../general/res/sass/helpers/_splitter.scss */ .browse-area .splitter { - top: 34px; } + top: 0; } -/* line 84, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 90, ../../../../general/res/sass/helpers/_splitter.scss */ .edit-area .splitter { top: 0; } @@ -1340,10 +1311,8 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 25, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu-btn { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; +.s-btn, .s-menu-btn, +.s-icon-btn { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; @@ -1351,26 +1320,32 @@ mct-container { cursor: pointer; text-decoration: none; height: 25px; - line-height: 25px; + line-height: 25px; } + +/* line 34, ../../../../general/res/sass/controls/_buttons.scss */ +.s-btn, .s-menu-btn { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; padding: 0 7.5px; font-size: 0.7rem; } - /* line 35, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 39, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn .icon, .s-menu-btn .icon { font-size: 0.8rem; color: #0099cc; } - /* line 40, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn .title-label, .s-menu-btn .title-label { vertical-align: top; } - /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.lg, .lg.s-menu-btn { font-size: 1rem; } - /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.sm, .sm.s-menu-btn { padding: 0 5px; } - /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.vsm, .vsm.s-menu-btn { padding: 0 2.5px; } - /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 60, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.major, .major.s-menu-btn { background-color: #0099cc; -moz-border-radius: 4px; @@ -1390,17 +1365,17 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: deepskyblue; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { color: white; } } - /* line 62, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn:not(.major), .s-menu-btn:not(.major) { background-color: #969696; -moz-border-radius: 4px; @@ -1420,20 +1395,20 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { color: #eee; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: #0099cc; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { color: white; } } - /* line 71, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play .icon:before, .pause-play.s-menu-btn .icon:before { content: "\0000F1"; } - /* line 74, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused, .pause-play.paused.s-menu-btn { background-color: #ff9900; -moz-border-radius: 4px; @@ -1453,17 +1428,17 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: #ffad33; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { color: white; } } - /* line 76, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -1480,23 +1455,110 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu-btn .icon :before { content: "\0000EF"; } - /* line 86, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 90, ../../../../general/res/sass/controls/_buttons.scss */ .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before { content: "\000039"; } -/* line 92, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 96, ../../../../general/res/sass/controls/_buttons.scss */ +.s-icon-btn { + color: #eee; } + /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ + .s-icon-btn:hover { + color: white; } + +/* line 104, ../../../../general/res/sass/controls/_buttons.scss */ +.mini-tab { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + color: #d6d6d6; + cursor: pointer; + display: block; + position: absolute; + font-size: 12px; + line-height: 12px; + height: 12px; + width: 12px; } + /* line 120, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover { + color: #a3a3a3; } + /* line 122, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover:after { + color: #0099cc; } + /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before, .mini-tab:after { + -moz-transition-property: color; + -o-transition-property: color; + -webkit-transition-property: color; + transition-property: color; + -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; + display: block; + position: absolute; } + /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + font-size: 7px; + height: 100%; + width: 7px; } + /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:after { + width: 100%; + height: 100%; } + /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:before { + content: '\3c'; + left: -8px; } + /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:hover:before { + left: -11px; } + /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:before { + content: '\3e'; + left: 14px; } + /* line 164, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:hover:before { + left: 17px; } + +/* line 168, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 98, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 174, ../../../../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 104, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 180, ../../../../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; @@ -1505,7 +1567,7 @@ mct-container { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 111, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 187, ../../../../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; @@ -1514,7 +1576,7 @@ mct-container { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 118, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 194, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -1920,10 +1982,10 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 313, ../../../../general/res/sass/controls/_controls.scss */ + /* line 311, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:hover { background-color: rgba(0, 153, 204, 0.7); } -/* line 324, ../../../../general/res/sass/controls/_controls.scss */ +/* line 322, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-l { -moz-border-radius-topleft: 10px; -webkit-border-top-left-radius: 10px; @@ -1932,7 +1994,7 @@ label.checkbox.custom { -webkit-border-bottom-left-radius: 10px; border-bottom-left-radius: 10px; cursor: w-resize; } -/* line 328, ../../../../general/res/sass/controls/_controls.scss */ +/* line 326, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-r { -moz-border-radius-topright: 10px; -webkit-border-top-right-radius: 10px; @@ -1941,7 +2003,7 @@ label.checkbox.custom { -webkit-border-bottom-right-radius: 10px; border-bottom-right-radius: 10px; cursor: e-resize; } -/* line 332, ../../../../general/res/sass/controls/_controls.scss */ +/* line 330, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; @@ -1964,12 +2026,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 343, ../../../../general/res/sass/controls/_controls.scss */ + /* line 341, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background-color: rgba(0, 153, 204, 0.4); } /******************************************************** DATETIME PICKER */ -/* line 350, ../../../../general/res/sass/controls/_controls.scss */ +/* line 348, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker { -moz-user-select: -moz-none; -ms-user-select: none; @@ -1978,65 +2040,65 @@ label.checkbox.custom { font-size: 0.8rem; padding: 10px !important; width: 230px; } - /* line 356, ../../../../general/res/sass/controls/_controls.scss */ + /* line 354, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager { height: 15px; margin-bottom: 5px; position: relative; } - /* line 368, ../../../../general/res/sass/controls/_controls.scss */ + /* line 366, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager { width: 20px; } - /* line 371, ../../../../general/res/sass/controls/_controls.scss */ + /* line 369, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev { right: auto; } - /* line 373, ../../../../general/res/sass/controls/_controls.scss */ + /* line 371, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev:before { content: "\3c"; } - /* line 377, ../../../../general/res/sass/controls/_controls.scss */ + /* line 375, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next { left: auto; text-align: right; } - /* line 380, ../../../../general/res/sass/controls/_controls.scss */ + /* line 378, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next:before { content: "\3e"; } - /* line 385, ../../../../general/res/sass/controls/_controls.scss */ + /* line 383, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .val { text-align: center; left: 25px; right: 25px; } - /* line 391, ../../../../general/res/sass/controls/_controls.scss */ + /* line 389, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-calendar, .l-datetime-picker .l-time-selects { border-top: 1px solid rgba(102, 102, 102, 0.2); } - /* line 395, ../../../../general/res/sass/controls/_controls.scss */ + /* line 393, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-time-selects { line-height: 22px; } /******************************************************** CALENDAR */ -/* line 403, ../../../../general/res/sass/controls/_controls.scss */ +/* line 401, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row { display: -webkit-flex; display: flex; -webkit-flex-flow: row nowrap; flex-flow: row nowrap; margin-top: 1px; } - /* line 407, ../../../../general/res/sass/controls/_controls.scss */ + /* line 405, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row:first-child { margin-top: 0; } - /* line 410, ../../../../general/res/sass/controls/_controls.scss */ + /* line 408, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row li { -webkit-flex: 1 0; flex: 1 0; margin-left: 1px; padding: 5px; text-align: center; } - /* line 416, ../../../../general/res/sass/controls/_controls.scss */ + /* line 414, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row li:first-child { margin-left: 0; } - /* line 420, ../../../../general/res/sass/controls/_controls.scss */ + /* line 418, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-header li { color: #999999; } - /* line 423, ../../../../general/res/sass/controls/_controls.scss */ + /* line 421, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li { -moz-transition-property: background-color; -o-transition-property: background-color; @@ -2051,31 +2113,31 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; cursor: pointer; } - /* line 426, ../../../../general/res/sass/controls/_controls.scss */ + /* line 424, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.in-month { background-color: #f2f2f2; } - /* line 429, ../../../../general/res/sass/controls/_controls.scss */ + /* line 427, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li .sub { color: #999999; font-size: 0.8em; } - /* line 433, ../../../../general/res/sass/controls/_controls.scss */ + /* line 431, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected { background: #1ac6ff; color: #fcfcfc; } - /* line 436, ../../../../general/res/sass/controls/_controls.scss */ + /* line 434, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected .sub { color: inherit; } - /* line 440, ../../../../general/res/sass/controls/_controls.scss */ + /* line 438, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li:hover { background-color: #0099cc; color: #fff; } - /* line 443, ../../../../general/res/sass/controls/_controls.scss */ + /* line 441, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li:hover .sub { color: inherit; } /******************************************************** BROWSER ELEMENTS */ @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 454, ../../../../general/res/sass/controls/_controls.scss */ + /* line 452, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2090,7 +2152,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 463, ../../../../general/res/sass/controls/_controls.scss */ + /* line 461, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2104,7 +2166,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 472, ../../../../general/res/sass/controls/_controls.scss */ + /* line 470, ../../../../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%; @@ -2113,7 +2175,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); background-image: linear-gradient(#00ace6, #0099cc 20px); } - /* line 477, ../../../../general/res/sass/controls/_controls.scss */ + /* line 475, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.1); } } /***************************************************************************** @@ -2194,7 +2256,7 @@ label.checkbox.custom { left: 0; text-align: left; } /* line 57, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { + .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { width: 12px; } /******************************************************** MENUS THEMSELVES */ @@ -2232,7 +2294,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -2476,8 +2538,10 @@ mct-include.l-time-controller { mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl { color: #999999; } /* line 69, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.s-icon-btn, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.pager { font-size: 11px; @@ -2784,7 +2848,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2841,7 +2905,7 @@ input[type="text"] { color: #666; outline: none; padding: 0 3px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2869,7 +2933,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -2918,7 +2982,7 @@ textarea { overflow: hidden; position: relative; line-height: 22px; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #eee; } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ @@ -3000,7 +3064,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../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 */ @@ -3166,7 +3230,7 @@ span.req { padding: 0 3px; background: white; border-bottom: 1px solid white; } - /* line 296, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3182,8 +3246,10 @@ span.req { .t-filter input.t-filter-input:not(.ng-dirty) + .t-a-clear { display: none; } /* line 42, ../../../../general/res/sass/forms/_filter.scss */ -.filter .icon.ui-symbol, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, +.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, .t-filter .icon.ui-symbol, +.t-filter .icon.s-icon-btn, +.t-filter .icon.mini-tab, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager { -moz-border-radius: 4px; @@ -3196,14 +3262,18 @@ span.req { padding: 0px 5px; vertical-align: middle; } /* line 50, ../../../../general/res/sass/forms/_filter.scss */ - .filter .icon.ui-symbol:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, + .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, .t-filter .icon.ui-symbol:hover, + .t-filter .icon.s-icon-btn:hover, + .t-filter .icon.mini-tab:hover, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager:hover { background: rgba(255, 255, 255, 0.1); } /* line 54, ../../../../general/res/sass/forms/_filter.scss */ -.filter .s-a-clear.ui-symbol, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, +.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, .t-filter .s-a-clear.ui-symbol, +.t-filter .s-a-clear.s-icon-btn, +.t-filter .s-a-clear.mini-tab, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager { -moz-border-radius: 4px; @@ -3229,8 +3299,10 @@ span.req { text-align: center; z-index: 5; } /* line 74, ../../../../general/res/sass/forms/_filter.scss */ - .filter .s-a-clear.ui-symbol:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, + .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, .t-filter .s-a-clear.ui-symbol:hover, + .t-filter .s-a-clear.s-icon-btn:hover, + .t-filter .s-a-clear.mini-tab:hover, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager:hover { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60); @@ -3498,7 +3570,29 @@ span.req { .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane { + top: 5px; + z-index: 2; } + /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { + left: -30px; + /* &:hover { + left: $paneOffset - 2; + }*/ } + /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { + content: 'F'; } + /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { + right: -25px; + /* &:hover { + right: $xpos - 2; + }*/ } + /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { + content: 'F'; } + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3511,31 +3605,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 296, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 299, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3545,11 +3639,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 338, ../../../../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, @@ -3561,12 +3655,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3582,41 +3676,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 348, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 363, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.left.treeview { opacity: 0; } - /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.right-repr { left: 0 !important; } -/* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-showtree .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3722,42 +3816,45 @@ span.req { left: 40% !important; } /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-menu-icon { + .toggle-tree { font-size: 110%; position: absolute; top: 12px; left: 10px; } + /* line 102, ../../../../general/res/sass/mobile/_layout.scss */ + .toggle-tree:before { + content: 'm' !important; } - /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 113, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 115, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 123, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 126, ../../../../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 128, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 131, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 136, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3774,7 +3871,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 138, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 141, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3791,19 +3888,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.left.treeview { width: 90% !important; } - /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 156, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 164, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } /***************************************************************************** @@ -4226,14 +4323,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../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: #7d7d7d; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../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 { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4318,7 +4415,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 329, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5576,14 +5673,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 277, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: #d0d0d0; } - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5709,7 +5806,7 @@ table { transition: background, 0.25s; text-shadow: none; color: #80dfff; } - /* line 272, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #eee; } /* line 137, ../../../../general/res/sass/items/_item.scss */ @@ -6154,7 +6251,7 @@ table { left: 0; z-index: 1; } /* line 22, ../../../../general/res/sass/features/_time-display.scss */ - .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { + .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { font-size: 0.8em; } /* line 26, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer:hover .l-elem.l-value { From 3687cc5edd051a406fc9d0b00baea435a9b3b5f0 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 22 Oct 2015 18:45:47 -0700 Subject: [PATCH 073/201] [Frontend] Manual re-do of collapse/expand panes open #90 Fixed broken mobile styles; Removed commented out scss; --- .../commonUI/general/res/sass/_mixins.scss | 5 - .../general/res/sass/controls/_buttons.scss | 108 ++++---- .../general/res/sass/mobile/_layout.scss | 7 +- .../res/sass/user-environ/_layout.scss | 38 ++- .../espresso/res/css/theme-espresso.css | 255 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 255 +++++++++--------- 6 files changed, 327 insertions(+), 341 deletions(-) diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index c3e62fee7a..1a1d651b6c 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -179,11 +179,6 @@ top: 5px; width: 1px; } - //} - //&:not(.disabled):hover:before { - // @include trans-prop-nice("border-color", 25ms); - // border-color: $colorGrippyInteriorHover; - //} } @mixin boxIncised($sVal: 0.6, $inset: 5px) { diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 4932ff6fc3..b7ef4fe28b 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -104,64 +104,66 @@ $pad: $interiorMargin * $baseRatio; .mini-tab { // Meant to be used as pane hide/show control elements in concert with mct-splitter @extend .ui-symbol; - @include trans-prop-nice(left, 150ms); - //@include test(green); - $iconD: 12px; - $arwD: 7px; - $c: pullForward($colorBodyBg, 15%); - color: $c; - cursor: pointer; - display: block; - position: absolute; - font-size: $iconD; - line-height: $iconD; - height: $iconD; width: $iconD; - - &:hover { - color: pullForward($c, 20%); - &:after { - color: $colorKey; - } - } - - &:before, - &:after { - @include trans-prop-nice(color, 200ms); - display: block; - position: absolute; - } - - &:before { - // Always the arrow icon + @include desktop { @include trans-prop-nice(left, 150ms); //@include test(green); - font-size: $arwD; - height: 100%; width: $arwD; - } - &:after { - // Representative icon - //@include test(red); - width: 100%; - height: 100%; - } + $iconD: 12px; + $arwD: 7px; + $c: pullForward($colorBodyBg, 15%); + color: $c; + cursor: pointer; + display: block; + position: absolute; + font-size: $iconD; + line-height: $iconD; + height: $iconD; width: $iconD; - &.anchor-left { - // < [] - $xpos: (1px + $arwD) * -1; - &:before { - content:'\3c'; - left: $xpos; + &:hover { + color: pullForward($c, 20%); + &:after { + color: $colorKey; + } } - &:hover:before { left: $xpos - 3; } - } - &.anchor-right { - // [] > - $xpos: $iconD + 2px; - &:before { - content:'\3e'; - left: $xpos; + + &:before, + &:after { + @include trans-prop-nice(color, 200ms); + display: block; + position: absolute; + } + + &:before { + // Always the arrow icon + @include trans-prop-nice(left, 150ms); + //@include test(green); + font-size: $arwD; + height: 100%; width: $arwD; + } + &:after { + // Representative icon + //@include test(red); + width: 100%; + height: 100%; + } + + &.anchor-left { + // < [] + $xpos: (1px + $arwD) * -1; + &:before { + content:'\3c'; + left: $xpos; + } + &:hover:before { left: $xpos - 3; } + } + &.anchor-right { + // [] > + $xpos: $iconD + 2px; + &:before { + content:'\3e'; + left: $xpos; + } + &:hover:before { left: $xpos + 3; } } - &:hover:before { left: $xpos + 3; } } } diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index f6627e6a5d..acbf1499b6 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -80,11 +80,7 @@ // Sets the left tree menu when the tree is shown. .pane.left.treeview { - //@include trans-prop-nice(opacity, .4s); @include background-image(linear-gradient(90deg, rgba(black, 0) 98%, rgba(black, 0.3) 100%)); - //opacity: 1; - //display: block !important; - //width: auto !important; // CH CO right: auto !important; width: $proporMenuWithView !important; } @@ -95,11 +91,12 @@ } .toggle-tree { + color: $colorKey !important; font-size: 110%; position: absolute; top: $bodyMargin + 2; left: $bodyMargin; - &:before { + &:after { content:'m' !important; } } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index a3ce8275bd..11dc10dc4c 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -252,36 +252,30 @@ top: $ueTopBarH + $interiorMarginLg + $treeSearchInputBarH + $interiorMargin; } } + .mini-tab.toggle-pane { $h: $ueTopBarH; $paneOffset: $interiorMarginLg * -3; - //font-size: 0.7rem; - //position: absolute; - //height: $h; - //line-height: $h; - top: 5px; z-index: 2; - &.toggle-tree.anchor-left { - //@include test(green); - left: $paneOffset; -/* &:hover { - left: $paneOffset - 2; - }*/ - &:after { - content:'F'; + @include desktop { + top: 5px; + &.toggle-tree.anchor-left { + //@include test(green); + left: $paneOffset; + &:after { + content: 'F'; + } } - } - &.toggle-inspect.anchor-right { - $xpos: $paneOffset + $interiorMargin; - right: $xpos; -/* &:hover { - right: $xpos - 2; - }*/ - &:after { - content:'F'; //\e612 + &.toggle-inspect.anchor-right { + $xpos: $paneOffset + $interiorMargin; + right: $xpos; + &:after { + content: '\e608'; + } } } } + &.items { .object-browse-bar { .left.abs, diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index d02fb40bb2..7dcadd87a0 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -1499,52 +1499,9 @@ mct-container { .s-icon-btn:hover { color: #33ccff; } -/* line 104, ../../../../general/res/sass/controls/_buttons.scss */ -.mini-tab { - -moz-transition-property: left; - -o-transition-property: left; - -webkit-transition-property: left; - transition-property: left; - -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; - color: #595959; - cursor: pointer; - display: block; - position: absolute; - font-size: 12px; - line-height: 12px; - height: 12px; - width: 12px; } - /* line 120, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover { - color: #8c8c8c; } - /* line 122, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover:after { - color: #0099cc; } - /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before, .mini-tab:after { - -moz-transition-property: color; - -o-transition-property: color; - -webkit-transition-property: color; - transition-property: color; - -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; - display: block; - position: absolute; } - /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before { +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab { -moz-transition-property: left; -o-transition-property: left; -webkit-transition-property: left; @@ -1557,38 +1514,82 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - font-size: 7px; - height: 100%; - width: 7px; } - /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:after { - width: 100%; - height: 100%; } - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:before { - content: '\3c'; - left: -8px; } - /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:hover:before { - left: -11px; } - /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:before { - content: '\3e'; - left: 14px; } - /* line 164, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:hover:before { - left: 17px; } + color: #595959; + cursor: pointer; + display: block; + position: absolute; + font-size: 12px; + line-height: 12px; + height: 12px; + width: 12px; } + /* line 121, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover { + color: #8c8c8c; } + /* line 123, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover:after { + color: #0099cc; } + /* line 128, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before, .mini-tab:after { + -moz-transition-property: color; + -o-transition-property: color; + -webkit-transition-property: color; + transition-property: color; + -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; + display: block; + position: absolute; } + /* line 135, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + font-size: 7px; + height: 100%; + width: 7px; } + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:after { + width: 100%; + height: 100%; } + /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:before { + content: '\3c'; + left: -8px; } + /* line 156, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:hover:before { + left: -11px; } + /* line 161, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:before { + content: '\3e'; + left: 14px; } + /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:hover:before { + left: 17px; } } -/* line 168, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 170, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 176, ../../../../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 180, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 182, ../../../../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; @@ -1597,7 +1598,7 @@ mct-container { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 189, ../../../../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; @@ -1606,7 +1607,7 @@ mct-container { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 194, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -3623,29 +3624,26 @@ span.req { .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { - top: 5px; z-index: 2; } - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { - left: -30px; - /* &:hover { - left: $paneOffset - 2; - }*/ } - /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { - content: 'F'; } - /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { - right: -25px; - /* &:hover { - right: $xpos - 2; - }*/ } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { - content: 'F'; } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane { + top: 5px; } + /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { + left: -30px; } + /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { + content: 'F'; } + /* line 269, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { + right: -25px; } + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { + content: '\e608'; } } + /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3658,31 +3656,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 305, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3692,11 +3690,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 326, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 332, ../../../../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, @@ -3708,12 +3706,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3729,41 +3727,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 360, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.left.treeview { opacity: 0; } - /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 389, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.right-repr { left: 0 !important; } -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-showtree .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3870,44 +3868,45 @@ span.req { /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ .toggle-tree { + color: #0099cc !important; font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 102, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree:before { + /* line 103, ../../../../general/res/sass/mobile/_layout.scss */ + .toggle-tree:after { content: 'm' !important; } - /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 108, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 113, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 114, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 115, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 116, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 123, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 126, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 127, ../../../../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 131, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 132, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 136, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 137, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3924,7 +3923,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 141, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 142, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3941,19 +3940,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 151, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.left.treeview { width: 90% !important; } - /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 154, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 156, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 157, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 164, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 165, ../../../../general/res/sass/mobile/_layout.scss */ .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 b1efcd8cff..5c99b3a6cb 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -1469,52 +1469,9 @@ mct-container { .s-icon-btn:hover { color: white; } -/* line 104, ../../../../general/res/sass/controls/_buttons.scss */ -.mini-tab { - -moz-transition-property: left; - -o-transition-property: left; - -webkit-transition-property: left; - transition-property: left; - -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; - color: #d6d6d6; - cursor: pointer; - display: block; - position: absolute; - font-size: 12px; - line-height: 12px; - height: 12px; - width: 12px; } - /* line 120, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover { - color: #a3a3a3; } - /* line 122, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover:after { - color: #0099cc; } - /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before, .mini-tab:after { - -moz-transition-property: color; - -o-transition-property: color; - -webkit-transition-property: color; - transition-property: color; - -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; - display: block; - position: absolute; } - /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before { +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab { -moz-transition-property: left; -o-transition-property: left; -webkit-transition-property: left; @@ -1527,38 +1484,82 @@ mct-container { -o-transition-timing-function: ease-in-out; -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; - font-size: 7px; - height: 100%; - width: 7px; } - /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:after { - width: 100%; - height: 100%; } - /* line 151, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:before { - content: '\3c'; - left: -8px; } - /* line 155, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:hover:before { - left: -11px; } - /* line 160, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:before { - content: '\3e'; - left: 14px; } - /* line 164, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:hover:before { - left: 17px; } + color: #d6d6d6; + cursor: pointer; + display: block; + position: absolute; + font-size: 12px; + line-height: 12px; + height: 12px; + width: 12px; } + /* line 121, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover { + color: #a3a3a3; } + /* line 123, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover:after { + color: #0099cc; } + /* line 128, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before, .mini-tab:after { + -moz-transition-property: color; + -o-transition-property: color; + -webkit-transition-property: color; + transition-property: color; + -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; + display: block; + position: absolute; } + /* line 135, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + font-size: 7px; + height: 100%; + width: 7px; } + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:after { + width: 100%; + height: 100%; } + /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:before { + content: '\3c'; + left: -8px; } + /* line 156, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:hover:before { + left: -11px; } + /* line 161, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:before { + content: '\3e'; + left: 14px; } + /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:hover:before { + left: 17px; } } -/* line 168, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 170, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 176, ../../../../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 180, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 182, ../../../../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; @@ -1567,7 +1568,7 @@ mct-container { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 189, ../../../../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; @@ -1576,7 +1577,7 @@ mct-container { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 194, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -3570,29 +3571,26 @@ span.req { .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { - top: 5px; z-index: 2; } - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { - left: -30px; - /* &:hover { - left: $paneOffset - 2; - }*/ } - /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { - content: 'F'; } - /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { - right: -25px; - /* &:hover { - right: $xpos - 2; - }*/ } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { - content: 'F'; } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane { + top: 5px; } + /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { + left: -30px; } + /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { + content: 'F'; } + /* line 269, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { + right: -25px; } + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { + content: '\e608'; } } + /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3605,31 +3603,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 305, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3639,11 +3637,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 326, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 332, ../../../../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, @@ -3655,12 +3653,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3676,41 +3674,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 360, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.left.treeview { opacity: 0; } - /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 389, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-hidetree .pane.right-repr { left: 0 !important; } -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-showtree .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -3817,44 +3815,45 @@ span.req { /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ .toggle-tree { + color: #0099cc !important; font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 102, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree:before { + /* line 103, ../../../../general/res/sass/mobile/_layout.scss */ + .toggle-tree:after { content: 'm' !important; } - /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 108, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 113, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 114, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 115, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 116, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 122, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 123, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 126, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 127, ../../../../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 131, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 132, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 136, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 137, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3871,7 +3870,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 141, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 142, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3888,19 +3887,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 151, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.left.treeview { width: 90% !important; } - /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 154, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 156, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 157, ../../../../general/res/sass/mobile/_layout.scss */ .browse-showtree .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 164, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 165, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } /***************************************************************************** From 57f11a9767b4dfc0f29c25d914037d6358a24a6a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 22 Oct 2015 19:26:59 -0700 Subject: [PATCH 074/201] [Frontend] Manual re-do of collapse/expand panes open #90 Refined positioning of .mini-tab elements when panes are collapsed; --- .../browse/res/templates/browse-object.html | 3 +- .../commonUI/browse/res/templates/browse.html | 4 +- .../general/res/sass/controls/_buttons.scss | 34 ++- .../general/res/sass/mobile/_layout.scss | 6 +- .../res/sass/user-environ/_layout.scss | 10 +- .../espresso/res/css/theme-espresso.css | 208 ++++++++++-------- .../themes/snow/res/css/theme-snow.css | 200 +++++++++-------- 7 files changed, 269 insertions(+), 196 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 12bf5af841..8e99e218a1 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -48,7 +48,8 @@ class="abs object-holder"> + ng-click="ngModel.toggle()" + ng-class="{ collapsed : !ngModel.visible() }">
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 678b15be87..88454399f1 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -24,7 +24,7 @@
+ ng-class="modelPaneTree.visible() ? 'pane-tree-showing' : 'pane-tree-hidden'">
@@ -54,7 +54,7 @@
- +
- $xpos: $iconD + 2px; + $xpos: $arwToRightX; &:before { content:'\3e'; left: $xpos; } - &:hover:before { left: $xpos + 3; } + &:hover:before { left: $xpos + $arwToRightAnimX; } + &.collapsed { + $xpos: $arwToLeftX; + &:before { + content:'\3c'; + left: $xpos; + } + &:hover:before { left: $xpos + $arwToLeftAnimX; } + } + } + + &.collapsed { + // State when the pane this element controls has been collapsed } } } diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index acbf1499b6..df730e7559 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -59,7 +59,7 @@ // When the tree is hidden, these are the // classes used for the left menu and the // right representation. - .browse-hidetree { + .pane-tree-hidden { // Sets the left tree menu when the tree // is hidden. .pane.left.treeview { @@ -70,7 +70,7 @@ } } - .browse-showtree { + .pane-tree-showing { // NOTE: DISABLED SELECTION // Selection disabled in both panes // causing cut/copy/paste menu to @@ -143,7 +143,7 @@ } @include phonePortrait { - .browse-showtree { + .pane-tree-showing { .pane.left.treeview { width: $proporMenuOnly !important; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 11dc10dc4c..1c12d13c45 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -265,6 +265,9 @@ &:after { content: 'F'; } + &.collapsed { + left: -1 * $bodyMargin; + } } &.toggle-inspect.anchor-right { $xpos: $paneOffset + $interiorMargin; @@ -272,6 +275,9 @@ &:after { content: '\e608'; } + &.collapsed { + right: -1 * $interiorMargin; + } } } } @@ -379,7 +385,7 @@ // When the tree is hidden, these are the // classes used for the left menu and the // right representation. -.browse-hidetree { +.pane-tree-hidden { @include user-select(none); // Sets the left tree menu when the tree is hidden. .pane.left.treeview { @@ -391,7 +397,7 @@ } } -.browse-showtree { +.pane-tree-showing { // Sets the left tree menu when the tree is shown. .pane.left.treeview { @include trans-prop-nice(opacity, .4s); diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 7dcadd87a0..1a3300cd00 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -1377,14 +1377,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1416,14 +1416,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { color: #33ccff; } } /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1458,14 +1458,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: linear-gradient(#fe9815, #f88c01); } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1522,13 +1522,13 @@ mct-container { line-height: 12px; height: 12px; width: 12px; } - /* line 121, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #8c8c8c; } - /* line 123, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 129, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover:after { color: #0099cc; } - /* line 128, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: color; -o-transition-property: color; @@ -1544,7 +1544,7 @@ mct-container { transition-timing-function: ease-in-out; display: block; position: absolute; } - /* line 135, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { -moz-transition-property: left; -o-transition-property: left; @@ -1561,35 +1561,49 @@ mct-container { font-size: 7px; height: 100%; width: 7px; } - /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; height: 100%; } - /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; left: -8px; } - /* line 156, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:hover:before { left: -11px; } - /* line 161, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left.collapsed:before { + content: '\3e'; + left: 13px; } + /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left.collapsed:hover:before { + left: 16px; } + /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; - left: 14px; } - /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + left: 13px; } + /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:hover:before { - left: 17px; } } + left: 16px; } + /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right.collapsed:before { + content: '\3c'; + left: -8px; } + /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right.collapsed:hover:before { + left: -11px; } } -/* line 170, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 176, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 202, ../../../../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 182, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 208, ../../../../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; @@ -1598,7 +1612,7 @@ mct-container { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 189, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 215, ../../../../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; @@ -1607,7 +1621,7 @@ mct-container { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 222, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -2331,7 +2345,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 331, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -2885,7 +2899,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2942,7 +2956,7 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2970,7 +2984,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -3029,14 +3043,14 @@ textarea { overflow: hidden; position: relative; line-height: 22px; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover > .icon { color: #33ccff; } } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ @@ -3118,7 +3132,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../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 */ @@ -3284,7 +3298,7 @@ span.req { padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3637,13 +3651,19 @@ span.req { /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 269, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { + left: -10px; } + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { - content: '\e608'; } } - /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ + content: '\e608'; } + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { + right: -5px; } } + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3656,31 +3676,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 305, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3690,11 +3710,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 326, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 338, ../../../../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, @@ -3706,12 +3726,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3727,42 +3747,42 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 360, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-hidetree { +/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ - .browse-hidetree .pane.left.treeview { + /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane-tree-hidden .pane.left.treeview { opacity: 0; } - /* line 389, ../../../../general/res/sass/user-environ/_layout.scss */ - .browse-hidetree .pane.right-repr { + /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane-tree-hidden .pane.right-repr { left: 0 !important; } -/* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-showtree .pane.left.treeview { +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-showing .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; -webkit-transition-property: opacity; @@ -3847,14 +3867,14 @@ span.req { left: 10px !important; } /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree .pane.left.treeview { + .pane-tree-hidden .pane.left.treeview { right: 100% !important; width: auto !important; overflow-y: hidden; overflow-x: hidden; } /* line 82, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.left.treeview { + .pane-tree-showing .pane.left.treeview { 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%); @@ -3862,51 +3882,51 @@ span.req { 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 92, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr { + /* line 88, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right-repr { left: 40% !important; } - /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 93, ../../../../general/res/sass/mobile/_layout.scss */ .toggle-tree { color: #0099cc !important; font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 103, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 99, ../../../../general/res/sass/mobile/_layout.scss */ .toggle-tree:after { content: 'm' !important; } - /* line 108, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 114, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 116, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 123, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 127, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 123, ../../../../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 132, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 128, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 137, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3923,7 +3943,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 142, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 138, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3940,19 +3960,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 151, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.left.treeview { + /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.left.treeview { width: 90% !important; } - /* line 154, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr { + /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 157, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr #content-area { + /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 165, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } /***************************************************************************** @@ -4393,14 +4413,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../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: linear-gradient(#a6a6a6, #999999); } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../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 { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4485,7 +4505,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 331, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5753,14 +5773,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: linear-gradient(#666666, #595959); } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5895,14 +5915,14 @@ table { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #80dfff; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover > .icon { color: #33ccff; } } /* line 137, ../../../../general/res/sass/items/_item.scss */ diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 5c99b3a6cb..ce2f71b5d8 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -1365,14 +1365,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: deepskyblue; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1395,14 +1395,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { color: #eee; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: #0099cc; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { color: white; } } /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1428,14 +1428,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: #ffad33; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1492,13 +1492,13 @@ mct-container { line-height: 12px; height: 12px; width: 12px; } - /* line 121, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #a3a3a3; } - /* line 123, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 129, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover:after { color: #0099cc; } - /* line 128, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: color; -o-transition-property: color; @@ -1514,7 +1514,7 @@ mct-container { transition-timing-function: ease-in-out; display: block; position: absolute; } - /* line 135, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { -moz-transition-property: left; -o-transition-property: left; @@ -1531,35 +1531,49 @@ mct-container { font-size: 7px; height: 100%; width: 7px; } - /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; height: 100%; } - /* line 152, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; left: -8px; } - /* line 156, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:hover:before { left: -11px; } - /* line 161, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left.collapsed:before { + content: '\3e'; + left: 13px; } + /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left.collapsed:hover:before { + left: 16px; } + /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; - left: 14px; } - /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + left: 13px; } + /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:hover:before { - left: 17px; } } + left: 16px; } + /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right.collapsed:before { + content: '\3c'; + left: -8px; } + /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right.collapsed:hover:before { + left: -11px; } } -/* line 170, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 176, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 202, ../../../../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 182, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 208, ../../../../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; @@ -1568,7 +1582,7 @@ mct-container { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 189, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 215, ../../../../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; @@ -1577,7 +1591,7 @@ mct-container { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 222, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -2295,7 +2309,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 331, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -2849,7 +2863,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2906,7 +2920,7 @@ input[type="text"] { color: #666; outline: none; padding: 0 3px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2934,7 +2948,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -2983,7 +2997,7 @@ textarea { overflow: hidden; position: relative; line-height: 22px; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #eee; } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ @@ -3065,7 +3079,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../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 */ @@ -3231,7 +3245,7 @@ span.req { padding: 0 3px; background: white; border-bottom: 1px solid white; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ + /* line 293, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3584,13 +3598,19 @@ span.req { /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 269, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { + left: -10px; } + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { - content: '\e608'; } } - /* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ + content: '\e608'; } + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { + right: -5px; } } + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3603,31 +3623,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 302, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 305, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3637,11 +3657,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 326, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 338, ../../../../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, @@ -3653,12 +3673,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 345, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3674,42 +3694,42 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 360, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-hidetree { +/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ - .browse-hidetree .pane.left.treeview { + /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane-tree-hidden .pane.left.treeview { opacity: 0; } - /* line 389, ../../../../general/res/sass/user-environ/_layout.scss */ - .browse-hidetree .pane.right-repr { + /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane-tree-hidden .pane.right-repr { left: 0 !important; } -/* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-showtree .pane.left.treeview { +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-showing .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; -webkit-transition-property: opacity; @@ -3794,14 +3814,14 @@ span.req { left: 10px !important; } /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-hidetree .pane.left.treeview { + .pane-tree-hidden .pane.left.treeview { right: 100% !important; width: auto !important; overflow-y: hidden; overflow-x: hidden; } /* line 82, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.left.treeview { + .pane-tree-showing .pane.left.treeview { 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%); @@ -3809,51 +3829,51 @@ span.req { 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 92, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr { + /* line 88, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right-repr { left: 40% !important; } - /* line 97, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 93, ../../../../general/res/sass/mobile/_layout.scss */ .toggle-tree { color: #0099cc !important; font-size: 110%; position: absolute; top: 12px; left: 10px; } - /* line 103, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 99, ../../../../general/res/sass/mobile/_layout.scss */ .toggle-tree:after { content: 'm' !important; } - /* line 108, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar { left: 30px !important; } - /* line 111, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .context-available { opacity: 1 !important; } - /* line 114, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher { margin-right: 0 !important; } - /* line 116, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ .object-browse-bar .view-switcher .title-label { display: none; } - /* line 123, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ .tree-holder { overflow-x: hidden !important; } - /* line 127, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 123, ../../../../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 132, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 128, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-hide, .mobile-hide-important { display: none !important; } - /* line 137, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 133, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-hide { pointer-events: none; -moz-transition-property: opacity; @@ -3870,7 +3890,7 @@ span.req { transition-timing-function: ease-in-out; opacity: 0; } - /* line 142, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 138, ../../../../general/res/sass/mobile/_layout.scss */ .mobile-back-unhide { pointer-events: all; -moz-transition-property: opacity; @@ -3887,19 +3907,19 @@ span.req { transition-timing-function: ease-in-out; opacity: 1; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 151, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.left.treeview { + /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.left.treeview { width: 90% !important; } - /* line 154, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr { + /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right-repr { left: 0 !important; transform: translateX(90%); -webkit-transform: translateX(90%); } - /* line 157, ../../../../general/res/sass/mobile/_layout.scss */ - .browse-showtree .pane.right-repr #content-area { + /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right-repr #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 165, ../../../../general/res/sass/mobile/_layout.scss */ + /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } /***************************************************************************** @@ -4322,14 +4342,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../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: #7d7d7d; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../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 { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4414,7 +4434,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 331, ../../../../general/res/sass/_mixins.scss */ + /* line 326, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5672,14 +5692,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: #d0d0d0; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ + /* line 276, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5805,7 +5825,7 @@ table { transition: background, 0.25s; text-shadow: none; color: #80dfff; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 269, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #eee; } /* line 137, ../../../../general/res/sass/items/_item.scss */ From 827e1af581521bccd119556c2d8886ad36f16625 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 09:18:59 -0700 Subject: [PATCH 075/201] [Frontend] Manual re-do of collapse/expand panes open #90 Added code to MCTSplitter and MCTSplitPane to allow toggling of CSS class 'resizing' on pane elements when the user is actively using the splitter; Added resize transition animation to split pane elements when user not actively resizing; --- .../general/res/sass/helpers/_splitter.scss | 3 + .../res/sass/user-environ/_layout.scss | 5 + .../general/src/directives/MCTSplitPane.js | 9 ++ .../general/src/directives/MCTSplitter.js | 8 +- .../espresso/res/css/theme-espresso.css | 110 ++++++++++-------- .../themes/snow/res/css/theme-snow.css | 110 ++++++++++-------- 6 files changed, 152 insertions(+), 93 deletions(-) diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss index b329f6fa11..a765b34ec9 100644 --- a/platform/commonUI/general/res/sass/helpers/_splitter.scss +++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss @@ -36,6 +36,9 @@ border-color: $colorGrippyInteriorHover !important; } } + &:active { + background-color: pullForward($b, 5%); + } } &.horizontal { // Slides vertically up and down, splitting the element horizontally diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 1c12d13c45..8cb48282b8 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -232,6 +232,11 @@ } } +.pane:not(.resizing) { + // Add transition CSS + @include trans-prop-nice-resize-w(250ms); +} + .pane { position: absolute; &.treeview.left { diff --git a/platform/commonUI/general/src/directives/MCTSplitPane.js b/platform/commonUI/general/src/directives/MCTSplitPane.js index abc54f772e..19c17bcb1c 100644 --- a/platform/commonUI/general/src/directives/MCTSplitPane.js +++ b/platform/commonUI/general/src/directives/MCTSplitPane.js @@ -178,6 +178,14 @@ define( return position; } + // Dynamically apply a CSS class to elements when the user is actively resizing + function splitterState(state) { + var children = $element.children(); + for (var i = 0; i < children.length; i++) { + children.eq(i).toggleClass('resizing'); + } + } + // Make sure anchor parameter is something we know if (!ANCHORS[anchorKey]) { $log.warn(ANCHOR_WARNING_MESSAGE); @@ -208,6 +216,7 @@ define( // Interface exposed by controller, for mct-splitter to user return { position: getSetPosition, + action: splitterState, anchor: function () { return anchor; } diff --git a/platform/commonUI/general/src/directives/MCTSplitter.js b/platform/commonUI/general/src/directives/MCTSplitter.js index c163c107e0..3c8147b7e4 100644 --- a/platform/commonUI/general/src/directives/MCTSplitter.js +++ b/platform/commonUI/general/src/directives/MCTSplitter.js @@ -29,7 +29,8 @@ define( // Pixel width to allocate for the splitter itself var SPLITTER_TEMPLATE = "
", + "mct-drag=\"splitter.move(delta)\" " + + "mct-drag-up=\"splitter.endMove()\">
", OFFSETS_BY_EDGE = { left: "offsetLeft", right: "offsetRight", @@ -53,6 +54,7 @@ define( startMove: function () { var splitter = element[0]; initialPosition = mctSplitPane.position(); + mctSplitPane.action('startMove'); }, // Handle user changes to splitter position move: function (delta) { @@ -63,6 +65,10 @@ define( // Update the position of this splitter mctSplitPane.position(initialPosition + pixelDelta); + }, + // Grab the event when the user is done moving the splitter and pass it on + endMove: function() { + mctSplitPane.action('endMove'); } }; } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 1a3300cd00..1137623cf8 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -917,27 +917,30 @@ mct-container { /* line 34, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout .splitter:hover:after { border-color: #0099cc !important; } -/* line 40, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 39, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout .splitter:active { + background-color: #525252; } +/* line 43, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal { overflow: hidden; } - /* line 43, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 46, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane { left: 0; right: 0; } - /* line 46, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 49, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.top { bottom: auto; } - /* line 49, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 52, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.bottom { top: auto; } - /* line 53, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 56, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal > .splitter { cursor: row-resize; left: 0; right: 0; width: auto; height: 5px; } - /* line 54, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 57, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -961,22 +964,22 @@ mct-container { left: 5px; right: 5px; height: 1px; } -/* line 65, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane { top: 0; bottom: 0; } - /* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.left { right: auto; } - /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 74, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.right { left: auto; } -/* line 75, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 78, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical > .splitter { bottom: 0; cursor: col-resize; width: 5px; } - /* line 79, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 82, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -1001,11 +1004,11 @@ mct-container { top: 5px; width: 1px; } -/* line 86, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 89, ../../../../general/res/sass/helpers/_splitter.scss */ .browse-area .splitter { top: 0; } -/* line 90, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 93, ../../../../general/res/sass/helpers/_splitter.scss */ .edit-area .splitter { top: 0; } @@ -3620,50 +3623,65 @@ span.req { height: 30%; } /* line 235, ../../../../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; } + +/* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 243, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { z-index: 2; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { top: 5px; } - /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 267, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { left: -30px; } - /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { left: -10px; } - /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 277, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { content: '\e608'; } - /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { right: -5px; } } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3676,31 +3694,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 313, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3710,11 +3728,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 343, ../../../../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, @@ -3726,12 +3744,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3747,41 +3765,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 369, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 393, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.left.treeview { opacity: 0; } - /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 400, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.right-repr { left: 0 !important; } -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 407, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index ce2f71b5d8..8c98b9e44e 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -914,27 +914,30 @@ mct-container { /* line 34, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout .splitter:hover:after { border-color: #fcfcfc !important; } -/* line 40, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 39, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout .splitter:active { + background-color: #898989; } +/* line 43, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal { overflow: hidden; } - /* line 43, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 46, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane { left: 0; right: 0; } - /* line 46, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 49, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.top { bottom: auto; } - /* line 49, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 52, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.bottom { top: auto; } - /* line 53, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 56, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal > .splitter { cursor: row-resize; left: 0; right: 0; width: auto; height: 5px; } - /* line 54, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 57, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.horizontal > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -958,22 +961,22 @@ mct-container { left: 5px; right: 5px; height: 1px; } -/* line 65, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane { top: 0; bottom: 0; } - /* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.left { right: auto; } - /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 74, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical .pane.right { left: auto; } -/* line 75, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 78, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical > .splitter { bottom: 0; cursor: col-resize; width: 5px; } - /* line 79, ../../../../general/res/sass/helpers/_splitter.scss */ + /* line 82, ../../../../general/res/sass/helpers/_splitter.scss */ .split-layout.vertical > .splitter:after { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -998,11 +1001,11 @@ mct-container { top: 5px; width: 1px; } -/* line 86, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 89, ../../../../general/res/sass/helpers/_splitter.scss */ .browse-area .splitter { top: 0; } -/* line 90, ../../../../general/res/sass/helpers/_splitter.scss */ +/* line 93, ../../../../general/res/sass/helpers/_splitter.scss */ .edit-area .splitter { top: 0; } @@ -3567,50 +3570,65 @@ span.req { height: 30%; } /* line 235, ../../../../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; } + +/* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 243, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { z-index: 2; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { top: 5px; } - /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 267, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { left: -30px; } - /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { left: -10px; } - /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 277, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { content: '\e608'; } - /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { right: -5px; } } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3623,31 +3641,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 313, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3657,11 +3675,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 343, ../../../../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, @@ -3673,12 +3691,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3694,41 +3712,41 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 369, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 393, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden { -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.left.treeview { opacity: 0; } - /* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 400, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.right-repr { left: 0 !important; } -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 407, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .pane.left.treeview { -moz-transition-property: opacity; -o-transition-property: opacity; From a283a2a0d3f4dc43dac453717b61fe4977892087 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 10:52:28 -0700 Subject: [PATCH 076/201] [Frontend] Manual re-do of collapse/expand panes open #90 Animation, styles, hide-show added panes and splitters; Finessed spacing; trans-prop* mixins normalized and added delay arg; --- .../browse/res/templates/browse-object.html | 7 +- .../commonUI/browse/res/templates/browse.html | 8 +- .../commonUI/general/res/sass/_constants.scss | 1 + .../commonUI/general/res/sass/_mixins.scss | 17 +- .../general/res/sass/controls/_buttons.scss | 4 +- .../general/res/sass/mobile/_layout.scss | 8 +- .../res/sass/user-environ/_layout.scss | 57 ++- .../espresso/res/css/theme-espresso.css | 405 +++++++++++------- .../themes/snow/res/css/theme-snow.css | 397 +++++++++++------ 9 files changed, 584 insertions(+), 320 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 8e99e218a1..9464aaee45 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -49,13 +49,12 @@ + ng-class="{ collapsed : !ngModel.visible() }">
- + -
+
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 88454399f1..c1eff0b907 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -51,11 +51,13 @@
- + -
+
-
+
diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 6cc8312a3c..6365119894 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -47,6 +47,7 @@ $ueBrowseRightPaneInspectW: 10%; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; $ueTimeControlH: (33px, 20px, 20px); +$ueCollapsedEdgeMargin: 15px; // Overlay $ovrTopBarH: 60px; $ovrFooterH: 30px; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 1a1d651b6c..360ea8e17c 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -41,36 +41,41 @@ width: $d; } -@mixin trans-prop-nice($props, $t: 500ms) { +@mixin trans-prop-nice($prop, $t: 500ms, $delay: 0) { + // This only works for a single property right now @if $t == 0 { @include transition-property(none); } @else { - @include transition-property($props); + @include transition-property($prop); @include transition-duration($t); @include transition-timing-function(ease-in-out); + @include transition-delay($delay); } } -@mixin trans-prop-nice-fade($t: 0.5s) { +@mixin trans-prop-nice-fade($t: 500ms, $delay: 0) { @if $t == 0 { @include transition-property(none); } @else { - @include transition-property(visibility, opacity, background-color, border-color); + @include transition-property(opacity, background-color, border-color, color); @include transition-duration($t); @include transition-timing-function(ease-in-out); + @include transition-delay($delay); } } -@mixin trans-prop-nice-resize-h($t: 0.5s) { +@mixin trans-prop-nice-resize-h($t: 500ms, $delay: 0) { @include transition-property(height, bottom, top); @include transition-duration($t); @include transition-timing-function(ease-in-out); + @include transition-delay($delay); } -@mixin trans-prop-nice-resize-w($t: 0.5s) { +@mixin trans-prop-nice-resize-w($t: 500ms, $delay: 0) { @include transition-property(width, left, right); @include transition-duration($t); @include transition-timing-function(ease-in-out); + @include transition-delay($delay); } @mixin triangle-right($size, $color) { diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index c73e42040c..c33e2306ac 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -109,8 +109,8 @@ $pad: $interiorMargin * $baseRatio; //@include test(green); $iconD: 12px; $arwD: 7px; - $arwOffsetX: 1px; - $arwAnimOffsetX: 3px; + $arwOffsetX: 0px; + $arwAnimOffsetX: 2px; $arwToLeftAnimX: -1 * $arwAnimOffsetX; $arwToRightAnimX: $arwAnimOffsetX; $arwToLeftX: ($arwOffsetX + $arwD) * -1; diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index df730e7559..d3b101370b 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -32,7 +32,7 @@ background-color: $colorMobilePaneLeft; } - .pane.right-repr { + .pane.right.items { //@include test(); @include slMenuTransitions; margin-left: 0 !important; @@ -85,7 +85,7 @@ width: $proporMenuWithView !important; } // Sets the right representation when the tree is shown. - .pane.right-repr { + .pane.right.items { left: $proporMenuWithView !important; } } @@ -147,9 +147,9 @@ .pane.left.treeview { width: $proporMenuOnly !important; } - .pane.right-repr { + .pane.right.items { left: 0 !important; - @include webkitProp(transform, translateX($proporMenuOnly)); + @include transform(translateX($proporMenuOnly)); #content-area { opacity: 0; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 8cb48282b8..6d7895ec83 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -211,7 +211,7 @@ max-width: 800px; width: $ueBrowseLeftPaneTreeW; } - &.t-inspector.right { + &.t-inspect.right { min-width: 150px; max-width: 800px; width: $ueBrowseRightPaneInspectW; @@ -232,11 +232,6 @@ } } -.pane:not(.resizing) { - // Add transition CSS - @include trans-prop-nice-resize-w(250ms); -} - .pane { position: absolute; &.treeview.left { @@ -271,7 +266,7 @@ content: 'F'; } &.collapsed { - left: -1 * $bodyMargin; + left: (-1 * $bodyMargin) - $ueCollapsedEdgeMargin; } } &.toggle-inspect.anchor-right { @@ -281,7 +276,7 @@ content: '\e608'; } &.collapsed { - right: -1 * $interiorMargin; + right: -1 * $interiorMargin - $ueCollapsedEdgeMargin; } } } @@ -391,21 +386,53 @@ // classes used for the left menu and the // right representation. .pane-tree-hidden { - @include user-select(none); // Sets the left tree menu when the tree is hidden. - .pane.left.treeview { + .pane.left.treeview, + .splitter-treeview { opacity: 0; } - // Sets the right represenation when the tree is hidden. - .pane.right-repr { - left: 0 !important; + // Sets the right representation when the tree is hidden. + .pane.right.items { + left: $ueCollapsedEdgeMargin !important; } } .pane-tree-showing { // Sets the left tree menu when the tree is shown. - .pane.left.treeview { - @include trans-prop-nice(opacity, .4s); + .pane.left.treeview, + .splitter-treeview { + @include trans-prop-nice-fade(250ms, 250ms); opacity: 1; } +} + +.pane-inspect-showing { + .l-object-and-inspector { + .pane.right, + .splitter-inspect { + @include trans-prop-nice-fade(250ms, 250ms); + opacity: 1; + } + } +} +.pane-inspect-hidden { + .l-object-and-inspector { + .pane.right, + .splitter-inspect { + opacity: 0; + } + .pane.left { + right: $ueCollapsedEdgeMargin !important; + } + } +} + +.pane.right.t-inspect { + @include test(orange, 0.3); // TEMP! +} + +@include desktop { + .pane:not(.resizing) { + @include trans-prop-nice-resize-w(250ms); + } } \ 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 1137623cf8..772729448b 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -954,6 +954,10 @@ mct-container { -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; content: ''; display: block; pointer-events: none; @@ -993,6 +997,10 @@ mct-container { -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; content: ''; display: block; pointer-events: none; @@ -1380,14 +1388,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1419,14 +1427,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { color: #33ccff; } } /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1461,14 +1469,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: linear-gradient(#fe9815, #f88c01); } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1517,6 +1525,10 @@ mct-container { -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; display: block; @@ -1545,6 +1557,10 @@ mct-container { -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; position: absolute; } /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1561,6 +1577,10 @@ mct-container { -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; font-size: 7px; height: 100%; width: 7px; } @@ -1571,31 +1591,31 @@ mct-container { /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; - left: -8px; } + left: -7px; } /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:hover:before { - left: -11px; } + left: -9px; } /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; - left: 13px; } + left: 12px; } /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { - left: 16px; } + left: 14px; } /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; - left: 13px; } + left: 12px; } /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:hover:before { - left: 16px; } + left: 14px; } /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { content: '\3c'; - left: -8px; } + left: -7px; } /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { - left: -11px; } } + left: -9px; } } /* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { @@ -1668,10 +1688,10 @@ mct-container { -webkit-box-sizing: border-box; box-sizing: border-box; text-shadow: rgba(0, 0, 0, 0.8) 0 1px 2px; - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -1680,6 +1700,10 @@ mct-container { -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; border: 1px solid transparent; color: #fff; display: block; @@ -1932,10 +1956,10 @@ label.checkbox.custom { /* line 227, ../../../../general/res/sass/controls/_controls.scss */ .view-switcher { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 100ms; -o-transition-duration: 100ms; -webkit-transition-duration: 100ms; @@ -1943,7 +1967,11 @@ label.checkbox.custom { -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; } + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; } /******************************************************** OBJECT-HEADER */ /* line 232, ../../../../general/res/sass/controls/_controls.scss */ @@ -1994,6 +2022,10 @@ label.checkbox.custom { -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 287, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { @@ -2010,10 +2042,10 @@ label.checkbox.custom { left: 0; } /* line 308, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -2022,6 +2054,10 @@ label.checkbox.custom { -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; background-color: rgba(0, 153, 204, 0.6); position: absolute; height: 100%; @@ -2053,10 +2089,10 @@ label.checkbox.custom { cursor: e-resize; } /* line 330, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -2065,6 +2101,10 @@ label.checkbox.custom { -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; background-color: rgba(0, 153, 204, 0.3); cursor: ew-resize; position: absolute; @@ -2160,6 +2200,10 @@ label.checkbox.custom { -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; cursor: pointer; } /* line 424, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.in-month { @@ -2348,7 +2392,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 326, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -2703,10 +2747,10 @@ mct-include.l-time-controller { z-index: 2; } /* line 161, ../../../../general/res/sass/controls/_time-controller.scss */ mct-include.l-time-controller .knob .range-value { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -2715,6 +2759,10 @@ mct-include.l-time-controller { -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; padding: 0 10px; position: absolute; height: 20px; @@ -2902,7 +2950,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2959,7 +3007,7 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2987,7 +3035,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -3046,14 +3094,14 @@ textarea { overflow: hidden; position: relative; line-height: 22px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover > .icon { color: #33ccff; } } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ @@ -3135,7 +3183,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../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 */ @@ -3301,7 +3349,7 @@ span.req { padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3609,7 +3657,7 @@ span.req { max-width: 800px; width: 25%; } /* line 214, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-mode .split-layout .split-pane-component.pane.t-inspector.right { +.browse-mode .split-layout .split-pane-component.pane.t-inspect.right { min-width: 150px; max-width: 800px; width: 10%; } @@ -3623,65 +3671,50 @@ span.req { height: 30%; } /* line 235, ../../../../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; } - -/* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 243, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { z-index: 2; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { top: 5px; } - /* line 267, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { left: -30px; } - /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { - left: -10px; } - /* line 277, ../../../../general/res/sass/user-environ/_layout.scss */ + left: -25px; } + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { content: '\e608'; } - /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { - right: -5px; } } - /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ + right: -20px; } } + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3694,31 +3727,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 313, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3728,11 +3761,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 343, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 338, ../../../../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, @@ -3744,12 +3777,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3765,56 +3798,108 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 369, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 393, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-tree-hidden { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - /* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-tree-hidden .pane.left.treeview { - opacity: 0; } - /* line 400, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-tree-hidden .pane.right-repr { - left: 0 !important; } +/* line 390, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden .pane.left.treeview, +.pane-tree-hidden .splitter-treeview { + opacity: 0; } +/* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden .pane.right.items { + left: 15px !important; } -/* line 407, ../../../../general/res/sass/user-environ/_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: 0.4s; - -o-transition-duration: 0.4s; - -webkit-transition-duration: 0.4s; - transition-duration: 0.4s; +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-showing .pane.left.treeview, +.pane-tree-showing .splitter-treeview { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; opacity: 1; } +/* line 411, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-showing .l-object-and-inspector .pane.right, +.pane-inspect-showing .l-object-and-inspector .splitter-inspect { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + opacity: 1; } + +/* line 420, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-hidden .l-object-and-inspector .pane.right, +.pane-inspect-hidden .l-object-and-inspector .splitter-inspect { + opacity: 0; } +/* line 424, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-hidden .l-object-and-inspector .pane.left { + right: 15px !important; } + +/* line 430, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane.right.t-inspect { + background-color: rgba(255, 165, 0, 0.3) !important; } + +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 435, ../../../../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; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -3850,7 +3935,7 @@ span.req { background-color: #262626; } /* line 35, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right-repr { + .pane.right.items { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; -webkit-transition-duration: 0.35s; @@ -3859,7 +3944,7 @@ span.req { backface-visibility: hidden; margin-left: 0 !important; } /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right-repr #content-area { + .pane.right.items #content-area { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; -webkit-transition-duration: 0.35s; @@ -3901,7 +3986,7 @@ span.req { right: auto !important; width: 40% !important; } /* line 88, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right-repr { + .pane-tree-showing .pane.right.items { left: 40% !important; } /* line 93, ../../../../general/res/sass/mobile/_layout.scss */ @@ -3959,6 +4044,10 @@ span.req { -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 138, ../../../../general/res/sass/mobile/_layout.scss */ @@ -3976,18 +4065,24 @@ span.req { -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 screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.left.treeview { width: 90% !important; } /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right-repr { + .pane-tree-showing .pane.right.items { left: 0 !important; - transform: translateX(90%); - -webkit-transform: translateX(90%); } + -moz-transform: translateX(90%); + -ms-transform: translateX(90%); + -webkit-transform: translateX(90%); + transform: translateX(90%); } /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right-repr #content-area { + .pane-tree-showing .pane.right.items #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ @@ -4431,14 +4526,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../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: linear-gradient(#a6a6a6, #999999); } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../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 { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4523,7 +4618,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 326, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5791,14 +5886,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: linear-gradient(#666666, #595959); } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5881,6 +5976,10 @@ table { -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; color: #8c8c8c; font-size: 3em; @@ -5933,14 +6032,14 @@ table { transition: background, 0.25s; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #80dfff; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover > .icon { color: #33ccff; } } /* line 137, ../../../../general/res/sass/items/_item.scss */ @@ -6085,10 +6184,10 @@ table { font-size: 0.75rem; } /* line 32, ../../../../general/res/sass/_autoflow.scss */ .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu-btn { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 50ms; -o-transition-duration: 50ms; -webkit-transition-duration: 50ms; @@ -6097,6 +6196,10 @@ table { -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 40, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-header { @@ -6109,10 +6212,10 @@ table { vertical-align: middle; } /* line 48, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu-btn { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 500ms; -o-transition-duration: 500ms; -webkit-transition-duration: 500ms; @@ -6121,6 +6224,10 @@ table { -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 52, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-header .l-filter { @@ -6381,6 +6488,10 @@ table { -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; position: absolute; left: 0; z-index: 1; } @@ -6395,10 +6506,10 @@ table { color: #fff; } /* line 38, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display .l-btn.control { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 200ms; -o-transition-duration: 200ms; -webkit-transition-duration: 200ms; @@ -6407,6 +6518,10 @@ table { -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; font-size: 0.65em; vertical-align: top; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 8c98b9e44e..e7de0af509 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -951,6 +951,10 @@ mct-container { -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; content: ''; display: block; pointer-events: none; @@ -990,6 +994,10 @@ mct-container { -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; content: ''; display: block; pointer-events: none; @@ -1368,14 +1376,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: deepskyblue; } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1398,14 +1406,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { color: #eee; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: #0099cc; } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { color: white; } } /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1431,14 +1439,14 @@ mct-container { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: #ffad33; } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { color: white; } } /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1487,6 +1495,10 @@ mct-container { -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; display: block; @@ -1515,6 +1527,10 @@ mct-container { -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; position: absolute; } /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1531,6 +1547,10 @@ mct-container { -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; font-size: 7px; height: 100%; width: 7px; } @@ -1541,31 +1561,31 @@ mct-container { /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; - left: -8px; } + left: -7px; } /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:hover:before { - left: -11px; } + left: -9px; } /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; - left: 13px; } + left: 12px; } /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { - left: 16px; } + left: 14px; } /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; - left: 13px; } + left: 12px; } /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:hover:before { - left: 16px; } + left: 14px; } /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { content: '\3c'; - left: -8px; } + left: -7px; } /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { - left: -11px; } } + left: -9px; } } /* line 196, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { @@ -1638,10 +1658,10 @@ mct-container { -webkit-box-sizing: border-box; box-sizing: border-box; text-shadow: rgba(0, 0, 0, 0.8) 0 1px 2px; - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -1650,6 +1670,10 @@ mct-container { -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; border: 1px solid transparent; color: #fff; display: block; @@ -1902,10 +1926,10 @@ label.checkbox.custom { /* line 227, ../../../../general/res/sass/controls/_controls.scss */ .view-switcher { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 100ms; -o-transition-duration: 100ms; -webkit-transition-duration: 100ms; @@ -1913,7 +1937,11 @@ label.checkbox.custom { -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; } + transition-timing-function: ease-in-out; + -moz-transition-delay: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; } /******************************************************** OBJECT-HEADER */ /* line 232, ../../../../general/res/sass/controls/_controls.scss */ @@ -1964,6 +1992,10 @@ label.checkbox.custom { -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 287, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { @@ -1980,10 +2012,10 @@ label.checkbox.custom { left: 0; } /* line 308, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -1992,6 +2024,10 @@ label.checkbox.custom { -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; background-color: rgba(0, 153, 204, 0.5); position: absolute; height: 100%; @@ -2023,10 +2059,10 @@ label.checkbox.custom { cursor: e-resize; } /* line 330, ../../../../general/res/sass/controls/_controls.scss */ .slider .range { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -2035,6 +2071,10 @@ label.checkbox.custom { -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; background-color: rgba(0, 153, 204, 0.2); cursor: ew-resize; position: absolute; @@ -2130,6 +2170,10 @@ label.checkbox.custom { -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; cursor: pointer; } /* line 424, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.in-month { @@ -2312,7 +2356,7 @@ label.checkbox.custom { .menu ul { margin: 0; padding: 0; } - /* line 326, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ .menu ul li { list-style-type: none; margin: 0; @@ -2667,10 +2711,10 @@ mct-include.l-time-controller { z-index: 2; } /* line 161, ../../../../general/res/sass/controls/_time-controller.scss */ mct-include.l-time-controller .knob .range-value { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; -webkit-transition-duration: 0.25s; @@ -2679,6 +2723,10 @@ mct-include.l-time-controller { -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; padding: 0 10px; position: absolute; height: 20px; @@ -2866,7 +2914,7 @@ mct-include.l-time-controller { padding: 0 3px; position: relative; height: 150px; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .form .form-row .selector-list.error { background: rgba(255, 0, 0, 0.5); } /* line 124, ../../../../general/res/sass/forms/_elems.scss */ @@ -2923,7 +2971,7 @@ input[type="text"] { color: #666; outline: none; padding: 0 3px; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 172, ../../../../general/res/sass/forms/_elems.scss */ @@ -2951,7 +2999,7 @@ textarea { position: absolute; height: 100%; width: 100%; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ textarea.error { background: rgba(255, 0, 0, 0.5); } @@ -3000,7 +3048,7 @@ textarea { overflow: hidden; position: relative; line-height: 22px; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .select .icon { color: #eee; } /* line 31, ../../../../general/res/sass/forms/_selects.scss */ @@ -3082,7 +3130,7 @@ textarea { max-height: 400px; overflow: auto; padding: 5px; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../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 */ @@ -3248,7 +3296,7 @@ span.req { padding: 0 3px; background: white; border-bottom: 1px solid white; } - /* line 293, ../../../../general/res/sass/_mixins.scss */ + /* line 298, ../../../../general/res/sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3556,7 +3604,7 @@ span.req { max-width: 800px; width: 25%; } /* line 214, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-mode .split-layout .split-pane-component.pane.t-inspector.right { +.browse-mode .split-layout .split-pane-component.pane.t-inspect.right { min-width: 150px; max-width: 800px; width: 10%; } @@ -3570,65 +3618,50 @@ span.req { height: 30%; } /* line 235, ../../../../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; } - -/* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 243, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { z-index: 2; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { top: 5px; } - /* line 267, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { left: -30px; } - /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { - left: -10px; } - /* line 277, ../../../../general/res/sass/user-environ/_layout.scss */ + left: -25px; } + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { content: '\e608'; } - /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { - right: -5px; } } - /* line 292, ../../../../general/res/sass/user-environ/_layout.scss */ + right: -20px; } } + /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3641,31 +3674,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 313, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 320, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 322, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3675,11 +3708,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 337, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 343, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 338, ../../../../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, @@ -3691,12 +3724,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3712,56 +3745,108 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 369, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 393, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-tree-hidden { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - /* line 396, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-tree-hidden .pane.left.treeview { - opacity: 0; } - /* line 400, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane-tree-hidden .pane.right-repr { - left: 0 !important; } +/* line 390, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden .pane.left.treeview, +.pane-tree-hidden .splitter-treeview { + opacity: 0; } +/* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden .pane.right.items { + left: 15px !important; } -/* line 407, ../../../../general/res/sass/user-environ/_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: 0.4s; - -o-transition-duration: 0.4s; - -webkit-transition-duration: 0.4s; - transition-duration: 0.4s; +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-showing .pane.left.treeview, +.pane-tree-showing .splitter-treeview { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; opacity: 1; } +/* line 411, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-showing .l-object-and-inspector .pane.right, +.pane-inspect-showing .l-object-and-inspector .splitter-inspect { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + opacity: 1; } + +/* line 420, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-hidden .l-object-and-inspector .pane.right, +.pane-inspect-hidden .l-object-and-inspector .splitter-inspect { + opacity: 0; } +/* line 424, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-hidden .l-object-and-inspector .pane.left { + right: 15px !important; } + +/* line 430, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane.right.t-inspect { + background-color: rgba(255, 165, 0, 0.3) !important; } + +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 435, ../../../../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; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -3797,7 +3882,7 @@ span.req { background-color: #f7f7f7; } /* line 35, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right-repr { + .pane.right.items { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; -webkit-transition-duration: 0.35s; @@ -3806,7 +3891,7 @@ span.req { backface-visibility: hidden; margin-left: 0 !important; } /* line 39, ../../../../general/res/sass/mobile/_layout.scss */ - .pane.right-repr #content-area { + .pane.right.items #content-area { -moz-transition-duration: 0.35s; -o-transition-duration: 0.35s; -webkit-transition-duration: 0.35s; @@ -3848,7 +3933,7 @@ span.req { right: auto !important; width: 40% !important; } /* line 88, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right-repr { + .pane-tree-showing .pane.right.items { left: 40% !important; } /* line 93, ../../../../general/res/sass/mobile/_layout.scss */ @@ -3906,6 +3991,10 @@ span.req { -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 138, ../../../../general/res/sass/mobile/_layout.scss */ @@ -3923,18 +4012,24 @@ span.req { -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 screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.left.treeview { width: 90% !important; } /* line 150, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right-repr { + .pane-tree-showing .pane.right.items { left: 0 !important; - transform: translateX(90%); - -webkit-transform: translateX(90%); } + -moz-transform: translateX(90%); + -ms-transform: translateX(90%); + -webkit-transform: translateX(90%); + transform: translateX(90%); } /* line 153, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right-repr #content-area { + .pane-tree-showing .pane.right.items #content-area { opacity: 0; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ @@ -4360,14 +4455,14 @@ span.req { -webkit-transition: background, 0.25s; transition: background, 0.25s; text-shadow: none; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { color: #fff; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../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: #7d7d7d; } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../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 { color: white; } } /* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ @@ -4452,7 +4547,7 @@ ul.tree { -ms-user-select: none; -webkit-user-select: none; user-select: none; } - /* line 326, ../../../../general/res/sass/_mixins.scss */ + /* line 331, ../../../../general/res/sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -5710,14 +5805,14 @@ table { margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon { color: #0099cc; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 274, ../../../../general/res/sass/_mixins.scss */ + /* line 279, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: #d0d0d0; } - /* line 276, ../../../../general/res/sass/_mixins.scss */ + /* line 281, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover > .icon { color: #33ccff; } } /* line 45, ../../../../general/res/sass/items/_item.scss */ @@ -5800,6 +5895,10 @@ table { -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; color: #8c8c8c; font-size: 3em; @@ -5843,7 +5942,7 @@ table { transition: background, 0.25s; text-shadow: none; color: #80dfff; } - /* line 269, ../../../../general/res/sass/_mixins.scss */ + /* line 274, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon { color: #eee; } /* line 137, ../../../../general/res/sass/items/_item.scss */ @@ -5988,10 +6087,10 @@ table { font-size: 0.75rem; } /* line 32, ../../../../general/res/sass/_autoflow.scss */ .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu-btn { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 50ms; -o-transition-duration: 50ms; -webkit-transition-duration: 50ms; @@ -6000,6 +6099,10 @@ table { -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 40, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-header { @@ -6012,10 +6115,10 @@ table { vertical-align: middle; } /* line 48, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu-btn { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 500ms; -o-transition-duration: 500ms; -webkit-transition-duration: 500ms; @@ -6024,6 +6127,10 @@ table { -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 52, ../../../../general/res/sass/_autoflow.scss */ .autoflow .l-autoflow-header .l-filter { @@ -6284,6 +6391,10 @@ table { -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; position: absolute; left: 0; z-index: 1; } @@ -6298,10 +6409,10 @@ table { color: #fff; } /* line 38, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display .l-btn.control { - -moz-transition-property: visibility, opacity, background-color, border-color; - -o-transition-property: visibility, opacity, background-color, border-color; - -webkit-transition-property: visibility, opacity, background-color, border-color; - transition-property: visibility, opacity, background-color, border-color; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; -moz-transition-duration: 200ms; -o-transition-duration: 200ms; -webkit-transition-duration: 200ms; @@ -6310,6 +6421,10 @@ table { -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; font-size: 0.65em; vertical-align: top; } From 0c4d422e2d26f04c98a32e467a939e7d92105ca0 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 11:13:51 -0700 Subject: [PATCH 077/201] [Frontend] Manual re-do of collapse/expand panes open #90 Refactored templates to move all split-pane elements into browse.html; --- .../browse/res/templates/browse-object.html | 59 ++++++++----------- .../commonUI/browse/res/templates/browse.html | 20 +++++-- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 9464aaee45..9dc1c8f83a 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -20,42 +20,29 @@ at runtime from the About dialog for additional information. --> - -
-
-
- - - -
-
- - - - - -
-
- +
+
+ + - -
- - - -
-
- +
+ + + + + +
+
+ + diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index c1eff0b907..d59ac222c0 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -58,10 +58,22 @@
- - + +
+ + + +
+ + + +
+ +
+
From 2452b25fd47288f8fed6ff9fd5987d9e9b1b5dd6 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 11:37:02 -0700 Subject: [PATCH 078/201] [Frontend] Manual integration of Inspector open #90 open #73 In-progress manual integrated Sarah Hale's work on ObjectInspector; --- platform/commonUI/browse/res/templates/browse.html | 5 ++++- platform/commonUI/general/bundle.json | 9 +++++++++ platform/commonUI/general/test/suite.json | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index d59ac222c0..79644b5bb5 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -71,7 +71,10 @@
- + +
diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 1aa0b1dfc1..a927ee8a51 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -107,6 +107,11 @@ "key": "SelectorController", "implementation": "controllers/SelectorController.js", "depends": [ "objectService", "$scope" ] + }, + { + "key": "ObjectInspectorController", + "implementation": "controllers/ObjectInspectorController.js", + "depends": [ "$scope", "objectService" ] } ], "directives": [ @@ -232,6 +237,10 @@ "key": "switcher", "templateUrl": "templates/controls/switcher.html", "uses": [ "view" ] + }, + { + "key": "object-inspector", + "templateUrl": "templates/object-inspector.html" } ], "controls": [ diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json index 0d19fbb9e4..08e9c28e61 100644 --- a/platform/commonUI/general/test/suite.json +++ b/platform/commonUI/general/test/suite.json @@ -5,6 +5,7 @@ "controllers/ContextMenuController", "controllers/DateTimePickerController", "controllers/GetterSetterController", + "controllers/ObjectInspectorController", "controllers/SelectorController", "controllers/SplitPaneController", "controllers/TimeRangeController", From 1d3870d07f8d5c11a84b39d588c1a22ca3252821 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 11:42:06 -0700 Subject: [PATCH 079/201] [Frontend] Manual integration of Inspector open #90 open #73 Adding missed new files; --- .../res/templates/object-inspector.html | 55 ++++++++ .../controllers/ObjectInspectorController.js | 117 ++++++++++++++++++ .../ObjectInspectorControllerSpec.js | 112 +++++++++++++++++ 3 files changed, 284 insertions(+) create mode 100644 platform/commonUI/general/res/templates/object-inspector.html create mode 100644 platform/commonUI/general/src/controllers/ObjectInspectorController.js create mode 100644 platform/commonUI/general/test/controllers/ObjectInspectorControllerSpec.js diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html new file mode 100644 index 0000000000..02e7f3fcc1 --- /dev/null +++ b/platform/commonUI/general/res/templates/object-inspector.html @@ -0,0 +1,55 @@ + + +
    +
  • + {{ data.name }} + {{ data.value }} +
    • +
  • + + Location + + + + + +
    • +
  • + + Original Location + + + + + +
    • +
+ diff --git a/platform/commonUI/general/src/controllers/ObjectInspectorController.js b/platform/commonUI/general/src/controllers/ObjectInspectorController.js new file mode 100644 index 0000000000..5b04304af0 --- /dev/null +++ b/platform/commonUI/general/src/controllers/ObjectInspectorController.js @@ -0,0 +1,117 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,Promise*/ + +/** + * Module defining ObjectInspectorController. Created by shale on 08/21/2015. + */ +define( + [], + function () { + "use strict"; + + /** + * The ObjectInspectorController gets and formats the data for + * the inspector display + * + * @constructor + */ + function ObjectInspectorController($scope, objectService) { + $scope.primaryParents = []; + $scope.contextutalParents = []; + //$scope.isLink = false; + + // Gets an array of the contextual parents/anscestors of the selected object + function getContextualPath() { + var currentObj = $scope.ngModel.selectedObject, + currentParent, + parents = []; + + currentParent = currentObj && + currentObj.hasCapability('context') && + currentObj.getCapability('context').getParent(); + + while (currentParent && currentParent.getModel().type !== 'root' && + currentParent.hasCapability('context')) { + // Record this object + parents.unshift(currentParent); + + // Get the next one up the tree + currentObj = currentParent; + currentParent = currentObj.getCapability('context').getParent(); + } + + $scope.contextutalParents = parents; + } + + // Gets an array of the parents/anscestors of the selected object's + // primary location (locational of original non-link) + function getPrimaryPath(current) { + var location; + + // If this the the initial call of this recursive function + if (!current) { + current = $scope.ngModel.selectedObject; + $scope.primaryParents = []; + } + + location = current.getModel().location; + + if (location && location !== 'root') { + objectService.getObjects([location]).then(function (obj) { + var next = obj[location]; + + $scope.primaryParents.unshift(next); + getPrimaryPath(next); + }); + } + + } + + // Gets the metadata for the selected object + function getMetadata() { + $scope.metadata = $scope.ngModel.selectedObject && + $scope.ngModel.selectedObject.hasCapability('metadata') && + $scope.ngModel.selectedObject.useCapability('metadata'); + } + + // Set scope variables when the selected object changes + $scope.$watch('ngModel.selectedObject', function () { + $scope.isLink = $scope.ngModel.selectedObject && + $scope.ngModel.selectedObject.hasCapability('location') && + $scope.ngModel.selectedObject.getCapability('location').isLink(); + + if ($scope.isLink) { + getPrimaryPath(); + getContextualPath(); + } else { + $scope.primaryParents = []; + getContextualPath(); + } + + getMetadata(); + }); + } + + return ObjectInspectorController; + } +); \ No newline at end of file diff --git a/platform/commonUI/general/test/controllers/ObjectInspectorControllerSpec.js b/platform/commonUI/general/test/controllers/ObjectInspectorControllerSpec.js new file mode 100644 index 0000000000..496467ea2d --- /dev/null +++ b/platform/commonUI/general/test/controllers/ObjectInspectorControllerSpec.js @@ -0,0 +1,112 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + +/** + * Created by shale on 08/24/2015. + */ +define( + ["../../src/controllers/ObjectInspectorController"], + function (ObjectInspectorController) { + "use strict"; + + describe("The object inspector controller ", function () { + var mockScope, + mockObjectService, + mockPromise, + mockDomainObject, + mockContextCapability, + mockLocationCapability, + controller; + + beforeEach(function () { + mockScope = jasmine.createSpyObj( + "$scope", + [ "$watch" ] + ); + mockScope.ngModel = {}; + mockScope.ngModel.selectedObject = 'mock selected object'; + + mockObjectService = jasmine.createSpyObj( + "objectService", + [ "getObjects" ] + ); + mockPromise = jasmine.createSpyObj( + "promise", + [ "then" ] + ); + mockObjectService.getObjects.andReturn(mockPromise); + + mockDomainObject = jasmine.createSpyObj( + "selectedObject", + [ "hasCapability", "getCapability", "useCapability", "getModel" ] + ); + mockDomainObject.getModel.andReturn({location: 'somewhere'}); + mockDomainObject.hasCapability.andReturn(true); + + mockContextCapability = jasmine.createSpyObj( + "context capability", + [ "getParent" ] + ); + mockLocationCapability = jasmine.createSpyObj( + "location capability", + [ "isLink" ] + ); + mockDomainObject.getCapability.andCallFake(function (param) { + if (param === 'location') { + return mockLocationCapability; + } else if (param === 'context') { + return mockContextCapability; + } + }); + + controller = new ObjectInspectorController(mockScope, mockObjectService); + + // Change the selected object to trigger the watch call + mockScope.ngModel.selectedObject = mockDomainObject; + }); + + it("watches for changes to the selected object", function () { + expect(mockScope.$watch).toHaveBeenCalledWith('ngModel.selectedObject', jasmine.any(Function)); + }); + + it("looks for contextual parent objects", function () { + mockScope.$watch.mostRecentCall.args[1](); + expect(mockContextCapability.getParent).toHaveBeenCalled(); + }); + + it("if link, looks for primary parent objects", function () { + mockLocationCapability.isLink.andReturn(true); + + mockScope.$watch.mostRecentCall.args[1](); + expect(mockDomainObject.getModel).toHaveBeenCalled(); + expect(mockObjectService.getObjects).toHaveBeenCalled(); + mockPromise.then.mostRecentCall.args[0]({'somewhere': mockDomainObject}); + }); + + it("gets metadata", function () { + mockScope.$watch.mostRecentCall.args[1](); + expect(mockDomainObject.useCapability).toHaveBeenCalledWith('metadata'); + }); + }); + } +); \ No newline at end of file From 78b528b4a575f606f2c481f8f7707a7fd2f23232 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 23 Oct 2015 11:48:25 -0700 Subject: [PATCH 080/201] Added additional test cases, and some tidying --- .../notification/src/NotificationIndicator.js | 17 +--- .../src/NotificationIndicatorController.js | 11 +-- .../NotificationIndicatorControllerSpec.js | 80 +++++++++++++++++++ .../commonUI/notification/test/suite.json | 3 +- 4 files changed, 87 insertions(+), 24 deletions(-) create mode 100644 platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js diff --git a/platform/commonUI/notification/src/NotificationIndicator.js b/platform/commonUI/notification/src/NotificationIndicator.js index b1d20e8264..29a831d251 100644 --- a/platform/commonUI/notification/src/NotificationIndicator.js +++ b/platform/commonUI/notification/src/NotificationIndicator.js @@ -26,25 +26,10 @@ define( function () { "use strict"; - function NotificationIndicator() { - - } + function NotificationIndicator() {} NotificationIndicator.template = 'notificationIndicatorTemplate'; - NotificationIndicator.prototype.getGlyph = function () { - return "A"; - }; - NotificationIndicator.prototype.getGlyphClass = function () { - return 'caution'; - }; - NotificationIndicator.prototype.getText = function () { - return "Notifications"; - }; - NotificationIndicator.prototype.getDescription = function () { - return "Notifications"; - }; - return NotificationIndicator; } ); diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js index 21da649a8f..685152de9c 100644 --- a/platform/commonUI/notification/src/NotificationIndicatorController.js +++ b/platform/commonUI/notification/src/NotificationIndicatorController.js @@ -45,14 +45,11 @@ define( * Launch a dialog showing a list of current notifications. */ $scope.showNotificationsList = function(){ - - var model = { - title: "Messages" - }; - - model.messages = notificationService.notifications; dialogService.getDialogResponse('overlay-message-list', { - dialog: model, + dialog: { + title: "Messages", + messages: notificationService.notifications + }, cancel: function(){ dialogService.dismiss(); } diff --git a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js new file mode 100644 index 0000000000..fa906012ae --- /dev/null +++ b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js @@ -0,0 +1,80 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,describe,it,expect,beforeEach,waitsFor,jasmine */ + +define( + ['../src/NotificationIndicatorController'], + function (NotificationIndicatorController) { + "use strict"; + + describe("The notification indicator controller ", function () { + var mockNotificationService, + mockScope, + mockDialogService; + + beforeEach(function(){ + mockNotificationService = jasmine.createSpy("notificationService"); + mockScope = jasmine.createSpy("$scope"); + mockDialogService = { + getDialogResponse: function(template, model){}, + dismiss: function(){} + } + + spyOn(mockDialogService, 'getDialogResponse'); + spyOn(mockDialogService, 'dismiss'); + }); + + it("exposes the highest notification severity to the template", function() { + mockNotificationService.highest = { + severity: "error" + }; + var controller = new NotificationIndicatorController(mockScope, mockNotificationService, mockDialogService); + expect(mockScope.highest).toBeTruthy(); + expect(mockScope.highest.severity).toBe("error"); + }); + + it("invokes the dialog service to show list of messages", function() { + var controller = new NotificationIndicatorController(mockScope, mockNotificationService, mockDialogService); + expect(mockScope.showNotificationsList).toBeDefined(); + mockScope.showNotificationsList(); + expect(mockDialogService.getDialogResponse).toHaveBeenCalled(); + expect(mockDialogService.getDialogResponse.mostRecentCall.args[0]).toBe('overlay-message-list'); + expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].dialog).toBeDefined(); + expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel).toBeDefined(); + //Invoke the cancel callback + mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel(); + expect(mockDialogService.dismiss).toHaveBeenCalled(); + }); + + it("provides a means of dismissing the message list", function() { + var controller = new NotificationIndicatorController(mockScope, mockNotificationService, mockDialogService); + expect(mockScope.showNotificationsList).toBeDefined(); + mockScope.showNotificationsList(); + expect(mockDialogService.getDialogResponse).toHaveBeenCalled(); + expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel).toBeDefined(); + //Invoke the cancel callback + mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel(); + expect(mockDialogService.dismiss).toHaveBeenCalled(); + }) + + }); + }); \ No newline at end of file diff --git a/platform/commonUI/notification/test/suite.json b/platform/commonUI/notification/test/suite.json index 08238b16c0..2b52722303 100644 --- a/platform/commonUI/notification/test/suite.json +++ b/platform/commonUI/notification/test/suite.json @@ -1,3 +1,4 @@ [ - "NotificationService" + "NotificationService", + "NotificationIndicatorController" ] \ No newline at end of file From fa7431d68bb8070710c3e072661595b67e9ad23d Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 23 Oct 2015 12:01:48 -0700 Subject: [PATCH 081/201] Added test case to DialogServiceSpec --- platform/commonUI/dialog/test/DialogServiceSpec.js | 11 +++++++++++ .../test/NotificationIndicatorControllerSpec.js | 11 ++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/platform/commonUI/dialog/test/DialogServiceSpec.js b/platform/commonUI/dialog/test/DialogServiceSpec.js index 949c1102a8..ddd826ef39 100644 --- a/platform/commonUI/dialog/test/DialogServiceSpec.js +++ b/platform/commonUI/dialog/test/DialogServiceSpec.js @@ -121,6 +121,17 @@ define( ); }); + it("invokes the overlay service with the correct parameters when" + + " a blocking dialog is requested", function() { + var dialogModel = {}; + expect(dialogService.showBlockingMessage(dialogModel)).toBe(true); + expect(mockOverlayService.createOverlay).toHaveBeenCalledWith( + "overlay-blocking-message", + dialogModel, + "t-dialog-sm" + ); + }); + }); } ); \ No newline at end of file diff --git a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js index fa906012ae..f20e3dd357 100644 --- a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js +++ b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js @@ -34,13 +34,10 @@ define( beforeEach(function(){ mockNotificationService = jasmine.createSpy("notificationService"); mockScope = jasmine.createSpy("$scope"); - mockDialogService = { - getDialogResponse: function(template, model){}, - dismiss: function(){} - } - - spyOn(mockDialogService, 'getDialogResponse'); - spyOn(mockDialogService, 'dismiss'); + mockDialogService = jasmine.createSpyObj( + "dialogService", + ["getDialogResponse","dismiss"] + ); }); it("exposes the highest notification severity to the template", function() { From 89046ecad563319d06d4972329ca5c6b30ed85f7 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 23 Oct 2015 12:03:56 -0700 Subject: [PATCH 082/201] fixed jslint error --- .../notification/test/NotificationIndicatorControllerSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js index f20e3dd357..1c85704fc4 100644 --- a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js +++ b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js @@ -71,7 +71,7 @@ define( //Invoke the cancel callback mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel(); expect(mockDialogService.dismiss).toHaveBeenCalled(); - }) + }); }); }); \ No newline at end of file From e05858e26bc82d00ee4d15109dbff9e40b876f92 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 23 Oct 2015 12:11:37 -0700 Subject: [PATCH 083/201] Added newline to end of source files --- platform/commonUI/dialog/test/DialogServiceSpec.js | 2 +- platform/commonUI/notification/bundle.json | 2 +- .../notification/src/NotificationIndicatorController.js | 1 + platform/commonUI/notification/src/NotificationService.js | 2 +- .../notification/test/NotificationIndicatorControllerSpec.js | 3 ++- platform/commonUI/notification/test/NotificationServiceSpec.js | 3 ++- platform/commonUI/notification/test/suite.json | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/platform/commonUI/dialog/test/DialogServiceSpec.js b/platform/commonUI/dialog/test/DialogServiceSpec.js index ddd826ef39..2dc109ac44 100644 --- a/platform/commonUI/dialog/test/DialogServiceSpec.js +++ b/platform/commonUI/dialog/test/DialogServiceSpec.js @@ -134,4 +134,4 @@ define( }); } -); \ No newline at end of file +); diff --git a/platform/commonUI/notification/bundle.json b/platform/commonUI/notification/bundle.json index f4dbd5c71a..4851dd28b6 100644 --- a/platform/commonUI/notification/bundle.json +++ b/platform/commonUI/notification/bundle.json @@ -42,4 +42,4 @@ } ] } -} \ No newline at end of file +} diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js index 685152de9c..66ad825a32 100644 --- a/platform/commonUI/notification/src/NotificationIndicatorController.js +++ b/platform/commonUI/notification/src/NotificationIndicatorController.js @@ -60,3 +60,4 @@ define( return NotificationIndicatorController; } ); + diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 8887e7cb9a..140c4537c8 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -282,4 +282,4 @@ define( return NotificationService; } -); \ No newline at end of file +); diff --git a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js index 1c85704fc4..59450fd060 100644 --- a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js +++ b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js @@ -74,4 +74,5 @@ define( }); }); - }); \ No newline at end of file + } +); diff --git a/platform/commonUI/notification/test/NotificationServiceSpec.js b/platform/commonUI/notification/test/NotificationServiceSpec.js index dca76652ce..695275bc70 100644 --- a/platform/commonUI/notification/test/NotificationServiceSpec.js +++ b/platform/commonUI/notification/test/NotificationServiceSpec.js @@ -174,4 +174,5 @@ define( }); }); }); - }); \ No newline at end of file + } +); diff --git a/platform/commonUI/notification/test/suite.json b/platform/commonUI/notification/test/suite.json index 2b52722303..75e88599fd 100644 --- a/platform/commonUI/notification/test/suite.json +++ b/platform/commonUI/notification/test/suite.json @@ -1,4 +1,4 @@ [ "NotificationService", "NotificationIndicatorController" -] \ No newline at end of file +] From a7ea4c3c6e2c43d18101745f6182f68d50722972 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 12:35:55 -0700 Subject: [PATCH 084/201] [Frontend] Inspector styling, in progress open #90 --- .../commonUI/browse/res/templates/browse.html | 3 +- .../{_properties.scss => _inspector.scss} | 54 +- platform/commonUI/general/res/sass/_main.scss | 2 +- .../res/sass/user-environ/_layout.scss | 4 - .../res/templates/object-inspector.html | 19 +- .../espresso/res/css/theme-espresso.css | 59 +- .../themes/espresso/res/sass/_constants.scss | 7 + .../themes/snow/res/css/theme-snow.css | 6535 +---------------- 8 files changed, 210 insertions(+), 6473 deletions(-) rename platform/commonUI/general/res/sass/{_properties.scss => _inspector.scss} (51%) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 79644b5bb5..0ea964780c 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -73,7 +73,8 @@
+ ng-model="treeModel" + class="t-inspector">
diff --git a/platform/commonUI/general/res/sass/_properties.scss b/platform/commonUI/general/res/sass/_inspector.scss similarity index 51% rename from platform/commonUI/general/res/sass/_properties.scss rename to platform/commonUI/general/res/sass/_inspector.scss index b48fe66406..69e00dbab6 100644 --- a/platform/commonUI/general/res/sass/_properties.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -19,17 +19,55 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* Classes to be used for lists of properties and values */ +/* Styles for the Inspector pane */ -.properties { - .s-row { - border-top: 1px solid $colorInteriorBorder; - font-size: 0.8em; - &:first-child { +//.pane.right.t-inspect { @include test(green, 0.3); } // TEMP! + +.t-inspector, +.t-inspector table tr td { + font-size: 0.7rem; +} + +.t-inspector { + ul li, + em { + display: block; + position: relative; + } + + ul li { + line-height: 130%; + margin-bottom: $interiorMarginLg * 2; + } + + em { + @include border-radius($basicCr); + background-color: $colorInspectorSectionHeaderBg; + color: $colorInspectorSectionHeaderFg; + margin-bottom: $interiorMargin; + padding: $formTBPad $formLRPad; + text-transform: uppercase; + } + + table tr { + td { border: none; + border-top: 1px solid $colorInteriorBorder !important; + padding: 2px 0; + vertical-align: top; + &.label { + color: $colorInspectorPropName !important; + padding-right: $interiorMargin !important; + white-space: nowrap; + } + &.value { + //word-wrap: break-word; // Doesn't work in ? + word-break: break-all; + } } - .s-value { - color: #fff; + + &:first-child td { + border-top: none !important; } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 80023f55ac..f22d5a4231 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -30,7 +30,7 @@ @import "helpers/splitter"; @import "helpers/wait-spinner"; @import "messages"; -@import "properties"; +@import "inspector"; /********************************* CONTROLS */ @import "controls/breadcrumb"; diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 6d7895ec83..49944adc44 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -427,10 +427,6 @@ } } -.pane.right.t-inspect { - @include test(orange, 0.3); // TEMP! -} - @include desktop { .pane:not(.resizing) { @include trans-prop-nice-resize-w(250ms); diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html index 02e7f3fcc1..f5f8e6921b 100644 --- a/platform/commonUI/general/res/templates/object-inspector.html +++ b/platform/commonUI/general/res/templates/object-inspector.html @@ -21,14 +21,17 @@ -->
    -
  • - {{ data.name }} - {{ data.value }} +
  • + Properties + + + + + +
    {{ data.name }}{{ data.value }}
  • - - Location - + Location
  • - - Original Location - + Original Location .splitter { - cursor: row-resize; - left: 0; - right: 0; - width: auto; - height: 5px; } - /* line 57, ../../../../general/res/sass/helpers/_splitter.scss */ - .split-layout.horizontal > .splitter:after { - -moz-transition-property: "border-color"; - -o-transition-property: "border-color"; - -webkit-transition-property: "border-color"; - transition-property: "border-color"; - -moz-transition-duration: 25ms; - -o-transition-duration: 25ms; - -webkit-transition-duration: 25ms; - transition-duration: 25ms; - -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; - content: ''; - display: block; - pointer-events: none; - position: absolute; - z-index: 2; - border-top: 1px dotted #d6d6d6; - top: 2px; - left: 5px; - right: 5px; - height: 1px; } -/* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ -.split-layout.vertical .pane { - top: 0; - bottom: 0; } - /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ - .split-layout.vertical .pane.left { - right: auto; } - /* line 74, ../../../../general/res/sass/helpers/_splitter.scss */ - .split-layout.vertical .pane.right { - left: auto; } -/* line 78, ../../../../general/res/sass/helpers/_splitter.scss */ -.split-layout.vertical > .splitter { - bottom: 0; - cursor: col-resize; - width: 5px; } - /* line 82, ../../../../general/res/sass/helpers/_splitter.scss */ - .split-layout.vertical > .splitter:after { - -moz-transition-property: "border-color"; - -o-transition-property: "border-color"; - -webkit-transition-property: "border-color"; - transition-property: "border-color"; - -moz-transition-duration: 25ms; - -o-transition-duration: 25ms; - -webkit-transition-duration: 25ms; - transition-duration: 25ms; - -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; - content: ''; - display: block; - pointer-events: none; - position: absolute; - z-index: 2; - border-left: 1px dotted #d6d6d6; - left: 2px; - bottom: 5px; - top: 5px; - width: 1px; } - -/* line 89, ../../../../general/res/sass/helpers/_splitter.scss */ -.browse-area .splitter { - top: 0; } - -/* line 93, ../../../../general/res/sass/helpers/_splitter.scss */ -.edit-area .splitter { - top: 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. - *****************************************************************************/ -@-moz-keyframes rotation { - 0% { - transform: rotate(0deg); } - 100% { - transform: rotate(359deg); } } -@-webkit-keyframes rotation { - 0% { - transform: rotate(0deg); } - 100% { - transform: rotate(359deg); } } -@keyframes rotation { - 0% { - transform: rotate(0deg); } - 100% { - transform: rotate(359deg); } } -/* line 63, ../../../../general/res/sass/helpers/_wait-spinner.scss */ -.t-wait-spinner, -.wait-spinner { - display: block; - position: absolute; - -webkit-animation: rotation .6s infinite linear; - -moz-animation: rotation .6s infinite linear; - -o-animation: rotation .6s infinite linear; - animation: rotation .6s infinite linear; - border-color: rgba(0, 153, 204, 0.25); - border-top-color: #0099cc; - border-style: solid; - border-width: 0.5em; - -moz-border-radius: 100%; - -webkit-border-radius: 100%; - border-radius: 100%; - top: 50%; - left: 50%; - height: auto; - width: auto; - padding: 5%; - pointer-events: none; - margin-top: -5%; - margin-left: -5%; - z-index: 2; } - /* line 74, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .t-wait-spinner.inline, - .wait-spinner.inline { - display: inline-block !important; - margin-right: 5px; - position: relative !important; - vertical-align: middle; } - -/* line 82, ../../../../general/res/sass/helpers/_wait-spinner.scss */ -.l-wait-spinner-holder { - pointer-events: none; - position: absolute; } - /* line 86, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .l-wait-spinner-holder.align-left .t-wait-spinner { - left: 0; - margin-left: 0; } - /* line 91, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .l-wait-spinner-holder.full-size { - display: inline-block; - height: 100%; - width: 100%; } - /* line 94, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .l-wait-spinner-holder.full-size .t-wait-spinner { - top: 0; - margin-top: 0; - padding: 30%; } - -/* line 103, ../../../../general/res/sass/helpers/_wait-spinner.scss */ -.treeview .wait-spinner { - display: block; - position: absolute; - -webkit-animation: rotation .6s infinite linear; - -moz-animation: rotation .6s infinite linear; - -o-animation: rotation .6s infinite linear; - animation: rotation .6s infinite linear; - border-color: rgba(0, 153, 204, 0.25); - border-top-color: #0099cc; - border-style: solid; - border-width: 0.25em; - -moz-border-radius: 100%; - -webkit-border-radius: 100%; - border-radius: 100%; - height: 10px; - width: 10px; - margin: 0 !important; - padding: 0 !important; - top: 2px; - left: 0; } - -/* line 112, ../../../../general/res/sass/helpers/_wait-spinner.scss */ -.wait-spinner.sm { - display: block; - position: absolute; - -webkit-animation: rotation .6s infinite linear; - -moz-animation: rotation .6s infinite linear; - -o-animation: rotation .6s infinite linear; - animation: rotation .6s infinite linear; - border-color: rgba(0, 153, 204, 0.25); - border-top-color: #0099cc; - border-style: solid; - border-width: 0.25em; - -moz-border-radius: 100%; - -webkit-border-radius: 100%; - border-radius: 100%; - height: 13px; - width: 13px; - margin-left: 0 !important; - margin-top: 0 !important; - padding: 0 !important; - top: 0; - left: 0; } - -/* line 122, ../../../../general/res/sass/helpers/_wait-spinner.scss */ -.loading { - pointer-events: none; } - /* line 125, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .loading:before, .loading:after { - content: ''; } - /* line 129, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .loading:before { - -moz-animation-name: rotateCentered; - -webkit-animation-name: rotateCentered; - animation-name: rotateCentered; - -moz-animation-duration: 0.5s; - -webkit-animation-duration: 0.5s; - animation-duration: 0.5s; - -moz-animation-iteration-count: infinite; - -webkit-animation-iteration-count: infinite; - animation-iteration-count: infinite; - -moz-animation-timing-function: linear; - -webkit-animation-timing-function: linear; - animation-timing-function: linear; - border-color: rgba(119, 107, 162, 0.25); - border-top-color: #776ba2; - border-style: solid; - border-width: 5px; - -moz-border-radius: 100%; - -webkit-border-radius: 100%; - border-radius: 100%; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: block; - position: absolute; - height: 0; - width: 0; - padding: 7%; - left: 50%; - top: 50%; - z-index: 10; } -@-moz-keyframes rotateCentered { - 0% { - transform: translateX(-50%) translateY(-50%) rotate(0deg); } - 100% { - transform: translateX(-50%) translateY(-50%) rotate(359deg); } } -@-webkit-keyframes rotateCentered { - 0% { - transform: translateX(-50%) translateY(-50%) rotate(0deg); } - 100% { - transform: translateX(-50%) translateY(-50%) rotate(359deg); } } -@keyframes rotateCentered { - 0% { - transform: translateX(-50%) translateY(-50%) rotate(0deg); } - 100% { - transform: translateX(-50%) translateY(-50%) rotate(359deg); } } - /* line 133, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .loading:after { - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; - background: rgba(119, 107, 162, 0.1); - display: block; - z-index: 9; } - /* line 139, ../../../../general/res/sass/helpers/_wait-spinner.scss */ - .loading.tree-item:before { - padding: 0.375rem; - border-width: 2px; } - -/* Styles for messages */ -/* line 4, ../../../../general/res/sass/_messages.scss */ -.message.block { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - padding: 10px; } -/* line 8, ../../../../general/res/sass/_messages.scss */ -.message.error { - background-color: rgba(255, 60, 0, 0.3); - color: #ff8a66; } - -/***************************************************************************** - * 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. - *****************************************************************************/ -/* Classes to be used for lists of properties and values */ -/* line 25, ../../../../general/res/sass/_properties.scss */ -.properties .s-row { - border-top: 1px solid rgba(102, 102, 102, 0.2); - font-size: 0.8em; } - /* line 28, ../../../../general/res/sass/_properties.scss */ - .properties .s-row:first-child { - border: none; } - /* line 31, ../../../../general/res/sass/_properties.scss */ - .properties .s-row .s-value { - color: #fff; } - -/********************************* CONTROLS */ -/* line 1, ../../../../general/res/sass/controls/_breadcrumb.scss */ -.l-breadcrumb { - font-size: 0.7rem; - line-height: 1em; - margin-bottom: 5px; - margin-left: -4px; } - /* line 10, ../../../../general/res/sass/controls/_breadcrumb.scss */ - .l-breadcrumb .l-breadcrumb-item a { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-transition: background-color 0.25s; - -o-transition: background-color 0.25s; - -webkit-transition: background-color 0.25s; - transition: background-color 0.25s; - color: #404040; - display: inline-block; - padding: 2px 4px; } - /* line 18, ../../../../general/res/sass/controls/_breadcrumb.scss */ - .l-breadcrumb .l-breadcrumb-item a .icon { - color: #0099cc; - margin-right: 5px; } - /* line 22, ../../../../general/res/sass/controls/_breadcrumb.scss */ - .l-breadcrumb .l-breadcrumb-item a:hover { - background: white; - color: gray; } - /* line 25, ../../../../general/res/sass/controls/_breadcrumb.scss */ - .l-breadcrumb .l-breadcrumb-item a:hover .icon { - color: #0099cc; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 25, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu-btn, -.s-icon-btn { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; - cursor: pointer; - text-decoration: none; - height: 25px; - line-height: 25px; } - -/* line 34, ../../../../general/res/sass/controls/_buttons.scss */ -.s-btn, .s-menu-btn { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - padding: 0 7.5px; - font-size: 0.7rem; } - /* line 39, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .icon, .s-menu-btn .icon { - font-size: 0.8rem; - color: #0099cc; } - /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn .title-label, .s-menu-btn .title-label { - vertical-align: top; } - /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.lg, .lg.s-menu-btn { - font-size: 1rem; } - /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.sm, .sm.s-menu-btn { - padding: 0 5px; } - /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.vsm, .vsm.s-menu-btn { - padding: 0 2.5px; } - /* line 60, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.major, .major.s-menu-btn { - background-color: #0099cc; - -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 274, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major .icon, .major.s-menu-btn .icon { - color: #fff; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { - background: deepskyblue; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ - .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { - color: white; } } - /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn:not(.major), .s-menu-btn:not(.major) { - 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 274, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { - color: #eee; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { - background: #0099cc; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ - .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { - color: white; } } - /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play .icon:before, .pause-play.s-menu-btn .icon:before { - content: "\0000F1"; } - /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused, .pause-play.paused.s-menu-btn { - background-color: #ff9900; - -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 274, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { - color: #fff; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { - background: #ffad33; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ - .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { - color: white; } } - /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { - -moz-animation-name: pulse; - -webkit-animation-name: pulse; - animation-name: pulse; - -moz-animation-duration: 1000ms; - -webkit-animation-duration: 1000ms; - animation-duration: 1000ms; - -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; } - /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu-btn .icon :before { - content: "\0000EF"; } - /* line 90, ../../../../general/res/sass/controls/_buttons.scss */ - .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before { - content: "\000039"; } - -/* line 96, ../../../../general/res/sass/controls/_buttons.scss */ -.s-icon-btn { - color: #eee; } - /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ - .s-icon-btn:hover { - color: white; } - -@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab { - -moz-transition-property: left; - -o-transition-property: left; - -webkit-transition-property: left; - transition-property: left; - -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; - color: #d6d6d6; - cursor: pointer; - display: block; - position: absolute; - font-size: 12px; - line-height: 12px; - height: 12px; - width: 12px; } - /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover { - color: #a3a3a3; } - /* line 129, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:hover:after { - color: #0099cc; } - /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before, .mini-tab:after { - -moz-transition-property: color; - -o-transition-property: color; - -webkit-transition-property: color; - transition-property: color; - -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: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - display: block; - position: absolute; } - /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:before { - -moz-transition-property: left; - -o-transition-property: left; - -webkit-transition-property: left; - transition-property: left; - -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; - font-size: 7px; - height: 100%; - width: 7px; } - /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab:after { - width: 100%; - height: 100%; } - /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:before { - content: '\3c'; - left: -7px; } - /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left:hover:before { - left: -9px; } - /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed:before { - content: '\3e'; - left: 12px; } - /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-left.collapsed:hover:before { - left: 14px; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:before { - content: '\3e'; - left: 12px; } - /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right:hover:before { - left: 14px; } - /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed:before { - content: '\3c'; - left: -7px; } - /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ - .mini-tab.anchor-right.collapsed:hover:before { - left: -9px; } } - -/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ -.l-btn-set { - font-size: 0; } - /* line 202, ../../../../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 208, ../../../../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; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - margin-left: 0; } - /* line 215, ../../../../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; - border-top-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; } - -/* line 222, ../../../../general/res/sass/controls/_buttons.scss */ -.paused:not(.s-btn):not(.s-menu-btn) { - border-color: #ff9900 !important; - color: #ff9900 !important; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/controls/_color-palette.scss */ -.l-color-palette { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - padding: 5px !important; } - /* line 31, ../../../../general/res/sass/controls/_color-palette.scss */ - .l-color-palette .l-palette-row { - overflow: hidden; - *zoom: 1; - line-height: 16px; - width: 170px; } - /* line 36, ../../../../general/res/sass/controls/_color-palette.scss */ - .l-color-palette .l-palette-row .l-palette-item { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - text-shadow: rgba(0, 0, 0, 0.8) 0 1px 2px; - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -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; - border: 1px solid transparent; - color: #fff; - display: block; - font-family: 'symbolsfont'; - float: left; - height: 16px; - width: 16px; - line-height: 16px; - margin: 0 1px 1px 0; - text-align: center; - vertical-align: middle; } - /* line 53, ../../../../general/res/sass/controls/_color-palette.scss */ - .l-color-palette .l-palette-row .s-palette-item:hover { - -moz-transition-property: none; - -o-transition-property: none; - -webkit-transition-property: none; - transition-property: none; - border-color: #fff !important; } - /* line 59, ../../../../general/res/sass/controls/_color-palette.scss */ - .l-color-palette .l-palette-row .l-palette-item-label { - margin-left: 5px; } - /* line 63, ../../../../general/res/sass/controls/_color-palette.scss */ - .l-color-palette .l-palette-row.l-option-row { - margin-bottom: 5px; } - /* line 65, ../../../../general/res/sass/controls/_color-palette.scss */ - .l-color-palette .l-palette-row.l-option-row .s-palette-item { - border-color: #666; } - -/***************************************************************************** - * 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. - *****************************************************************************/ -/*.control { - // UNUSED? - &.view-control { - .icon { - display: inline-block; - margin: -1px 5px 1px 2px; - vertical-align: middle; - &.triangle-down { - margin: 2px 2px -2px 0px; - } - } - - .label { - display: inline-block; - font-size: 11px; - vertical-align: middle; - } - - .toggle { - @include border-radius(3px); - display: inline-block; - padding: 1px 6px 4px 4px; - &:hover { - background: rgba(white, 0.1); - } - } - } -}*/ -/* line 51, ../../../../general/res/sass/controls/_controls.scss */ -.accordion { - margin-top: 5px; } - /* line 54, ../../../../general/res/sass/controls/_controls.scss */ - .accordion:first-child { - margin-top: 0; } - /* line 57, ../../../../general/res/sass/controls/_controls.scss */ - .accordion .accordion-head { - -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; - background: rgba(102, 102, 102, 0.2); - cursor: pointer; - font-size: 0.75em; - line-height: 18px; - margin-bottom: 5px; - padding: 0 5px; - position: absolute; - top: 0; - right: 0; - bottom: auto; - left: 0; - width: auto; - height: 18px; - text-transform: uppercase; } - /* line 75, ../../../../general/res/sass/controls/_controls.scss */ - .accordion .accordion-head:hover { - background: rgba(102, 102, 102, 0.4); } - /* line 78, ../../../../general/res/sass/controls/_controls.scss */ - .accordion .accordion-head:after { - content: "^"; - display: block; - font-family: 'symbolsfont'; - font-size: 0.9em; - position: absolute; - right: 5px; - text-transform: none; - top: 0; } - /* line 88, ../../../../general/res/sass/controls/_controls.scss */ - .accordion .accordion-head:not(.expanded):after { - content: "v"; } - /* line 92, ../../../../general/res/sass/controls/_controls.scss */ - .accordion .accordion-contents { - position: absolute; - top: 23px; - right: 0; - bottom: 0; - left: 0; - overflow-y: auto; - overflow-x: hidden; } - -/* line 103, ../../../../general/res/sass/controls/_controls.scss */ -.l-composite-control { - vertical-align: middle; } - /* line 106, ../../../../general/res/sass/controls/_controls.scss */ - .l-composite-control.l-checkbox .composite-control-label { - line-height: 18px; } - -/* line 112, ../../../../general/res/sass/controls/_controls.scss */ -.l-control-group { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - border-left: 1px solid rgba(102, 102, 102, 0.2); - display: inline-block; - padding: 0 5px; - position: relative; } - /* line 120, ../../../../general/res/sass/controls/_controls.scss */ - .l-control-group:first-child { - border-left: none; - padding-left: 0; } - -/* line 126, ../../../../general/res/sass/controls/_controls.scss */ -.l-local-controls { - position: absolute; - top: 5px; - right: 5px; - z-index: 5; } - -/* line 136, ../../../../general/res/sass/controls/_controls.scss */ -.s-local-controls { - font-size: 0.7rem; } - -/* line 140, ../../../../general/res/sass/controls/_controls.scss */ -label.checkbox.custom { - cursor: pointer; - display: inline-block; - line-height: 14px; - margin-right: 20px; - padding-left: 19px; - position: relative; - vertical-align: middle; } - /* line 150, ../../../../general/res/sass/controls/_controls.scss */ - label.checkbox.custom em { - color: #666; - display: inline-block; - height: 14px; - min-width: 14px; } - /* line 155, ../../../../general/res/sass/controls/_controls.scss */ - label.checkbox.custom em:before { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background: #e3e3e3; - -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; - box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; - box-sizing: border-box; - content: " "; - font-family: 'symbolsfont'; - font-size: 0.8em; - display: inline-block; - margin-right: 5px; - height: 14px; - width: 14px; - left: 0; - top: 0; - position: absolute; - text-align: center; } - /* line 174, ../../../../general/res/sass/controls/_controls.scss */ - label.checkbox.custom.no-text { - overflow: hidden; - margin-right: 0; - padding-left: 0; - height: 14px; - width: 14px; } - /* line 180, ../../../../general/res/sass/controls/_controls.scss */ - label.checkbox.custom.no-text em { - overflow: hidden; } - /* line 184, ../../../../general/res/sass/controls/_controls.scss */ - label.checkbox.custom input { - display: none; } - /* line 186, ../../../../general/res/sass/controls/_controls.scss */ - label.checkbox.custom input:checked ~ em:before { - background: #0099cc; - color: #ccf2ff; - content: "2"; } - -/* line 194, ../../../../general/res/sass/controls/_controls.scss */ -.input-labeled { - margin-left: 5px; } - /* line 196, ../../../../general/res/sass/controls/_controls.scss */ - .input-labeled label { - display: inline-block; - margin-right: 3px; } - /* line 200, ../../../../general/res/sass/controls/_controls.scss */ - .input-labeled.inline { - display: inline-block; } - /* line 203, ../../../../general/res/sass/controls/_controls.scss */ - .input-labeled:first-child { - margin-left: 0; } - -/* line 208, ../../../../general/res/sass/controls/_controls.scss */ -.s-menu-btn label.checkbox.custom { - margin-left: 5px; } - -/* line 213, ../../../../general/res/sass/controls/_controls.scss */ -.item .checkbox.checked label { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - border-bottom: none; } - -/* line 219, ../../../../general/res/sass/controls/_controls.scss */ -.context-available { - color: #0099cc; } - /* line 222, ../../../../general/res/sass/controls/_controls.scss */ - .context-available:hover { - color: deepskyblue; } - -/* line 227, ../../../../general/res/sass/controls/_controls.scss */ -.view-switcher { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, 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; } - -/******************************************************** OBJECT-HEADER */ -/* line 232, ../../../../general/res/sass/controls/_controls.scss */ -.object-header { - font-size: 1em; } - /* line 243, ../../../../general/res/sass/controls/_controls.scss */ - .object-header > .type-icon { - color: #b3b3b3; - font-size: 120%; - float: left; - margin-right: 5px; } - /* line 250, ../../../../general/res/sass/controls/_controls.scss */ - .object-header .l-elem-wrapper { - justify-content: flex-start; - -webkit-justify-content: flex-start; } - /* line 253, ../../../../general/res/sass/controls/_controls.scss */ - .object-header .l-elem-wrapper mct-representation { - min-width: 0.7em; } - /* line 261, ../../../../general/res/sass/controls/_controls.scss */ - .object-header .action { - margin-right: 5px; } - /* line 265, ../../../../general/res/sass/controls/_controls.scss */ - .object-header .title-label { - color: #666; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - flex: 0 1 auto; - -webkit-flex: 0 1 auto; - padding-right: 0.35em; } - /* line 275, ../../../../general/res/sass/controls/_controls.scss */ - .object-header .context-available { - font-size: 0.7em; - flex: 0 0 1; - -webkit-flex: 0 0 1; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 282, ../../../../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 287, ../../../../general/res/sass/controls/_controls.scss */ - .object-header:hover .context-available { - opacity: 1; } } - -/******************************************************** SLIDERS */ -/* line 298, ../../../../general/res/sass/controls/_controls.scss */ -.slider .slot { - width: auto; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; } -/* line 308, ../../../../general/res/sass/controls/_controls.scss */ -.slider .knob { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -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; - background-color: rgba(0, 153, 204, 0.5); - position: absolute; - height: 100%; - width: 10px; - top: 0; - auto: 0; - bottom: auto; - left: auto; } - /* line 311, ../../../../general/res/sass/controls/_controls.scss */ - .slider .knob:hover { - background-color: rgba(0, 153, 204, 0.7); } -/* line 322, ../../../../general/res/sass/controls/_controls.scss */ -.slider .knob-l { - -moz-border-radius-topleft: 10px; - -webkit-border-top-left-radius: 10px; - border-top-left-radius: 10px; - -moz-border-radius-bottomleft: 10px; - -webkit-border-bottom-left-radius: 10px; - border-bottom-left-radius: 10px; - cursor: w-resize; } -/* line 326, ../../../../general/res/sass/controls/_controls.scss */ -.slider .knob-r { - -moz-border-radius-topright: 10px; - -webkit-border-top-right-radius: 10px; - border-top-right-radius: 10px; - -moz-border-radius-bottomright: 10px; - -webkit-border-bottom-right-radius: 10px; - border-bottom-right-radius: 10px; - cursor: e-resize; } -/* line 330, ../../../../general/res/sass/controls/_controls.scss */ -.slider .range { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -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; - background-color: rgba(0, 153, 204, 0.2); - cursor: ew-resize; - position: absolute; - top: 0; - right: auto; - bottom: 0; - left: auto; - height: auto; - width: auto; } - /* line 341, ../../../../general/res/sass/controls/_controls.scss */ - .slider .range:hover { - background-color: rgba(0, 153, 204, 0.4); } - -/******************************************************** DATETIME PICKER */ -/* line 348, ../../../../general/res/sass/controls/_controls.scss */ -.l-datetime-picker { - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; - font-size: 0.8rem; - padding: 10px !important; - width: 230px; } - /* line 354, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-month-year-pager { - height: 15px; - margin-bottom: 5px; - position: relative; } - /* line 366, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-month-year-pager .pager { - width: 20px; } - /* line 369, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-month-year-pager .pager.prev { - right: auto; } - /* line 371, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-month-year-pager .pager.prev:before { - content: "\3c"; } - /* line 375, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-month-year-pager .pager.next { - left: auto; - text-align: right; } - /* line 378, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-month-year-pager .pager.next:before { - content: "\3e"; } - /* line 383, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-month-year-pager .val { - text-align: center; - left: 25px; - right: 25px; } - /* line 389, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-calendar, - .l-datetime-picker .l-time-selects { - border-top: 1px solid rgba(102, 102, 102, 0.2); } - /* line 393, ../../../../general/res/sass/controls/_controls.scss */ - .l-datetime-picker .l-time-selects { - line-height: 22px; } - -/******************************************************** CALENDAR */ -/* line 401, ../../../../general/res/sass/controls/_controls.scss */ -.l-calendar ul.l-cal-row { - display: -webkit-flex; - display: flex; - -webkit-flex-flow: row nowrap; - flex-flow: row nowrap; - margin-top: 1px; } - /* line 405, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row:first-child { - margin-top: 0; } - /* line 408, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row li { - -webkit-flex: 1 0; - flex: 1 0; - margin-left: 1px; - padding: 5px; - text-align: center; } - /* line 414, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row li:first-child { - margin-left: 0; } - /* line 418, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-header li { - color: #999999; } - /* line 421, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-body li { - -moz-transition-property: background-color; - -o-transition-property: background-color; - -webkit-transition-property: background-color; - transition-property: background-color; - -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; - cursor: pointer; } - /* line 424, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-body li.in-month { - background-color: #f2f2f2; } - /* line 427, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-body li .sub { - color: #999999; - font-size: 0.8em; } - /* line 431, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-body li.selected { - background: #1ac6ff; - color: #fcfcfc; } - /* line 434, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-body li.selected .sub { - color: inherit; } - /* line 438, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-body li:hover { - background-color: #0099cc; - color: #fff; } - /* line 441, ../../../../general/res/sass/controls/_controls.scss */ - .l-calendar ul.l-cal-row.l-body li:hover .sub { - color: inherit; } - -/******************************************************** BROWSER ELEMENTS */ -@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 452, ../../../../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 461, ../../../../general/res/sass/controls/_controls.scss */ - ::-webkit-scrollbar-thumb { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - 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 470, ../../../../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); } - - /* line 475, ../../../../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 - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 23, ../../../../general/res/sass/controls/_lists.scss */ -.checkbox-list label.checkbox.custom { - display: block; - margin-bottom: 5px; } -/* line 27, ../../../../general/res/sass/controls/_lists.scss */ -.checkbox-list li { - margin-bottom: 5px; } - -/* line 35, ../../../../general/res/sass/controls/_lists.scss */ -.l-tree-item-flat-list .tree-item .label { - left: 5px !important; } - -/***************************************************************************** - * 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. - *****************************************************************************/ -/******************************************************** MENU BUTTONS */ -/* line 31, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu-btn .icon { - font-size: 120%; } -/* line 35, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu-btn .title-label { - margin-left: 3px; } -/* line 39, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu-btn:after { - text-shadow: none; - content: '\76'; - display: inline-block; - font-family: 'symbolsfont'; - margin-left: 3px; - vertical-align: top; - color: rgba(255, 255, 255, 0.4); } -/* line 46, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu-btn.create-btn .title-label { - font-size: 1rem; } -/* line 54, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu-btn .menu { - left: 0; - text-align: left; } - /* line 57, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { - width: 12px; } - -/******************************************************** MENUS THEMSELVES */ -/* line 64, ../../../../general/res/sass/controls/_menus.scss */ -.menu-element { - cursor: pointer; - position: relative; } - -/* line 69, ../../../../general/res/sass/controls/_menus.scss */ -.s-menu, .menu { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - background-color: white; - -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: #4d4d4d; - display: inline-block; - -moz-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; - -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; - box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; - text-shadow: none; - padding: 3px 0; } - -/* line 77, ../../../../general/res/sass/controls/_menus.scss */ -.menu { - display: block; - position: absolute; - z-index: 10; } - /* line 82, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul { - margin: 0; - padding: 0; } - /* line 331, ../../../../general/res/sass/_mixins.scss */ - .menu ul li { - list-style-type: none; - margin: 0; - padding: 0; } - /* line 84, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - border-top: 1px solid white; - color: #666666; - line-height: 1.5rem; - padding: 3px 10px 3px 30px; - position: relative; - white-space: nowrap; } - /* line 92, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li:first-child { - border: none; } - /* line 95, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li:hover { - background: #e6e6e6; - color: #4d4d4d; } - /* line 98, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li:hover .icon { - color: #0099cc; } - /* line 102, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li .type-icon { - left: 10px; } - -/* line 109, ../../../../general/res/sass/controls/_menus.scss */ -.menu, -.context-menu, -.checkbox-menu, -.super-menu { - pointer-events: auto; } - /* line 115, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li a, - .context-menu ul li a, - .checkbox-menu ul li a, - .super-menu ul li a { - color: #4d4d4d; } - /* line 118, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li .icon, - .context-menu ul li .icon, - .checkbox-menu ul li .icon, - .super-menu ul li .icon { - color: #0099cc; } - /* line 121, ../../../../general/res/sass/controls/_menus.scss */ - .menu ul li .type-icon, - .context-menu ul li .type-icon, - .checkbox-menu ul li .type-icon, - .super-menu ul li .type-icon { - left: 5px; } - -/* line 133, ../../../../general/res/sass/controls/_menus.scss */ -.checkbox-menu ul li { - padding-left: 50px; } - /* line 135, ../../../../general/res/sass/controls/_menus.scss */ - .checkbox-menu ul li .checkbox { - position: absolute; - left: 5px; - top: 0.53333rem; } - /* line 140, ../../../../general/res/sass/controls/_menus.scss */ - .checkbox-menu ul li .checkbox em { - height: 0.7rem; - width: 0.7rem; } - /* line 143, ../../../../general/res/sass/controls/_menus.scss */ - .checkbox-menu ul li .checkbox em:before { - font-size: 7px !important; - height: 0.7rem; - width: 0.7rem; - line-height: 0.7rem; } - /* line 151, ../../../../general/res/sass/controls/_menus.scss */ - .checkbox-menu ul li .type-icon { - left: 25px; } - -/* line 157, ../../../../general/res/sass/controls/_menus.scss */ -.super-menu { - display: block; - width: 500px; - height: 480px; } - /* line 165, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .contents { - overflow: hidden; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - width: auto; - height: auto; } - /* line 168, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .pane { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; } - /* line 170, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .pane.left { - border-right: 1px solid #e6e6e6; - left: 0; - padding-right: 5px; - right: auto; - width: 50%; - overflow-x: hidden; - overflow-y: auto; } - /* line 180, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .pane.left ul li { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - padding-left: 30px; - border-top: none; } - /* line 187, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .pane.right { - left: auto; - right: 0; - padding: 25px; - width: 50%; } - /* line 197, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .menu-item-description .desc-area.icon { - color: #0099cc; - position: relative; - font-size: 8em; - left: 0; - height: 150px; - line-height: 150px; - margin-bottom: 25px; - text-align: center; } - /* line 208, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .menu-item-description .desc-area.title { - color: #666; - font-size: 1.2em; - margin-bottom: 0.5em; } - /* line 213, ../../../../general/res/sass/controls/_menus.scss */ - .super-menu .menu-item-description .desc-area.description { - color: #666; - font-size: 0.8em; - line-height: 1.5em; } - -/* line 222, ../../../../general/res/sass/controls/_menus.scss */ -.context-menu, .checkbox-menu { - font-size: 0.80rem; } - -/* line 226, ../../../../general/res/sass/controls/_menus.scss */ -.context-menu-holder, -.menu-holder { - position: absolute; - z-index: 70; } - /* line 230, ../../../../general/res/sass/controls/_menus.scss */ - .context-menu-holder .context-menu-wrapper, - .menu-holder .context-menu-wrapper { - position: absolute; - height: 100%; - width: 100%; } - /* line 235, ../../../../general/res/sass/controls/_menus.scss */ - .context-menu-holder.go-left .context-menu, .context-menu-holder.go-left .checkbox-menu, .context-menu-holder.go-left .menu, - .menu-holder.go-left .context-menu, - .menu-holder.go-left .checkbox-menu, - .menu-holder.go-left .menu { - right: 0; } - /* line 239, ../../../../general/res/sass/controls/_menus.scss */ - .context-menu-holder.go-up .context-menu, .context-menu-holder.go-up .checkbox-menu, .context-menu-holder.go-up .menu, - .menu-holder.go-up .context-menu, - .menu-holder.go-up .checkbox-menu, - .menu-holder.go-up .menu { - bottom: 0; } - -/* line 245, ../../../../general/res/sass/controls/_menus.scss */ -.context-menu-holder { - pointer-events: none; - height: 200px; - width: 170px; } - -/* line 251, ../../../../general/res/sass/controls/_menus.scss */ -.btn-bar.right .menu, -.menus-to-left .menu { - left: auto; - right: 0; - width: auto; } - -/* line 13, ../../../../general/res/sass/controls/_time-controller.scss */ -mct-include.l-time-controller { - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; - display: block; - top: auto; - height: 83px; - min-width: 500px; - font-size: 0.8rem; } - /* line 38, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder, - mct-include.l-time-controller .l-time-range-slider-holder, - mct-include.l-time-controller .l-time-range-ticks-holder { - overflow: visible; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - top: auto; } - /* line 47, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider, - mct-include.l-time-controller .l-time-range-ticks { - overflow: visible; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; - left: 150px; - right: 150px; } - /* line 54, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder { - height: 33px; - bottom: 46px; - padding-top: 5px; - border-top: 1px solid rgba(102, 102, 102, 0.2); } - /* line 59, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .type-icon { - font-size: 120%; - vertical-align: middle; } - /* line 63, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input, - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem { - margin-right: 5px; } - /* line 66, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .lbl, - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl { - color: #999999; } - /* line 69, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon, - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.s-icon-btn, - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab, - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .l-datetime-picker .l-month-year-pager .icon.pager, - .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.pager { - font-size: 11px; - width: 11px; } - /* line 76, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder { - height: 20px; - bottom: 23px; } - /* line 79, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder .range-holder { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - background: none; - border: none; } - /* line 84, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line { - -moz-transform: translateX(50%); - -ms-transform: translateX(50%); - -webkit-transform: translateX(50%); - transform: translateX(50%); - position: absolute; - top: 0; - right: 0; - bottom: 0px; - left: auto; - width: 8px; - height: auto; - z-index: 2; } - /* line 94, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after { - background-color: #666; - content: ""; - position: absolute; } - /* line 100, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before { - top: 0; - right: auto; - bottom: -10px; - left: 3px; - width: 2px; } - /* line 106, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; - -moz-transform: translateY(-50%); - -ms-transform: translateY(-50%); - -webkit-transform: translateY(-50%); - transform: translateY(-50%); - top: 50%; - right: 0; - bottom: auto; - left: 0; - width: auto; - height: 8px; } - /* line 3, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:after { - background-color: #0052b5; } - /* line 122, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .knob, - mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .range { - -moz-transition-property: left, right; - -o-transition-property: left, right; - -webkit-transition-property: left, right; - transition-property: left, right; - -moz-transition-duration: 500ms; - -o-transition-duration: 500ms; - -webkit-transition-duration: 500ms; - transition-duration: 500ms; - -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; } - /* line 131, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-ticks-holder { - height: 20px; } - /* line 133, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { - border-top: 1px solid rgba(0, 0, 0, 0.2); } - /* line 135, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { - background-color: rgba(0, 0, 0, 0.2); - border: none; - height: 5px; - width: 1px; - margin-left: -1px; - position: absolute; } - /* line 142, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child { - margin-left: 0; } - /* line 145, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { - transform: translateX(-50%); - -webkit-transform: translateX(-50%); - color: #999999; - display: inline-block; - font-size: 0.9em; - position: absolute; - top: 8px; - white-space: nowrap; - z-index: 2; } - /* line 159, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob { - z-index: 2; } - /* line 161, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob .range-value { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -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; - padding: 0 10px; - position: absolute; - height: 20px; - line-height: 20px; - white-space: nowrap; } - /* line 170, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob:hover .range-value { - color: rgba(0, 153, 204, 0.7); } - /* line 173, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob.knob-l { - margin-left: -10px; } - /* line 176, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob.knob-l .range-value { - text-align: right; - right: 10px; } - /* line 181, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob.knob-r { - margin-right: -10px; } - /* line 184, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob.knob-r .range-value { - left: 10px; } - /* line 3, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:before, mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:after { - background-color: #0052b5; } - -/* line 198, ../../../../general/res/sass/controls/_time-controller.scss */ -.s-time-range-val { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - background-color: #fff; - padding: 1px 1px 0 5px; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -@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 26, ../../../../general/res/sass/mobile/controls/_menus.scss */ - .menu-element .super-menu { - width: 250px; - height: 250px; } - /* line 32, ../../../../general/res/sass/mobile/controls/_menus.scss */ - .menu-element .super-menu .pane.left { - border-right: none; - padding-right: 0; - width: 100%; } - /* line 37, ../../../../general/res/sass/mobile/controls/_menus.scss */ - .menu-element .super-menu .pane.right { - display: none; } } -/********************************* FORMS */ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/forms/_elems.scss */ -.section-header { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - background: rgba(0, 0, 0, 0.05); - color: #999999; - font-size: 0.8em; - padding: 5px 5px; - text-transform: uppercase; } - -/* line 33, ../../../../general/res/sass/forms/_elems.scss */ -.form { - color: gray; } - /* line 36, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-section { - position: relative; - margin-bottom: 20px; } - /* line 41, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - *zoom: 1; - border-top: 1px solid rgba(0, 0, 0, 0.1); - margin-top: 5px; - padding: 5px 0; - position: relative; } - /* line 49, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row.first { - border-top: none; } - /* line 53, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row > .label, - .form .form-row > .controls { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - *zoom: 1; - font-size: 0.8rem; - line-height: 22px; - min-height: 22px; } - /* line 62, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row > .label { - float: left; - min-width: 120px; - position: relative; - white-space: nowrap; - width: 30%; } - /* line 72, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .value { - color: #666; } - /* line 76, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls { - float: left; - position: relative; - width: 69.9%; } - /* line 83, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-composite-control.l-checkbox { - display: inline-block; - line-height: 14px; - margin-right: 5px; } - /* line 92, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-med input[type="text"] { - width: 200px; } - /* line 96, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-small input[type="text"] { - width: 50px; } - /* line 100, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .l-numeric input[type="text"] { - text-align: right; } - /* line 104, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .controls .select { - margin-right: 5px; } - /* line 109, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .field-hints { - color: #333333; } - /* line 113, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .selector-list { - -moz-appearance: none; - -webkit-appearance: none; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - background: #fff; - border: none; - color: #666; - outline: none; - padding: 0 3px; - position: relative; - height: 150px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ - .form .form-row .selector-list.error { - background: rgba(255, 0, 0, 0.5); } - /* line 124, ../../../../general/res/sass/forms/_elems.scss */ - .form .form-row .selector-list > .wrapper { - overflow: auto; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; } - -/* line 138, ../../../../general/res/sass/forms/_elems.scss */ -label.form-control.checkbox input { - margin-right: 5px; - vertical-align: top; } - -/* line 144, ../../../../general/res/sass/forms/_elems.scss */ -.hint, -.s-hint { - font-size: 0.9em; } - -/* line 149, ../../../../general/res/sass/forms/_elems.scss */ -.l-result { - display: inline-block; - min-width: 32px; - min-height: 32px; - position: relative; - vertical-align: top; } - /* line 156, ../../../../general/res/sass/forms/_elems.scss */ - .l-result div.s-hint { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - background: rgba(255, 34, 0, 0.8); - display: block; - color: #ffa799; - padding: 5px; } - -/* line 165, ../../../../general/res/sass/forms/_elems.scss */ -input[type="text"] { - -moz-appearance: none; - -webkit-appearance: none; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - background: #fff; - border: none; - color: #666; - outline: none; - padding: 0 3px; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ - input[type="text"].error { - background: rgba(255, 0, 0, 0.5); } - /* line 172, ../../../../general/res/sass/forms/_elems.scss */ - input[type="text"].numeric { - text-align: right; } - -/* line 177, ../../../../general/res/sass/forms/_elems.scss */ -textarea { - -moz-appearance: none; - -webkit-appearance: none; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - background: #fff; - border: none; - color: #666; - outline: none; - padding: 5px; - position: absolute; - height: 100%; - width: 100%; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ - textarea.error { - background: rgba(255, 0, 0, 0.5); } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/forms/_selects.scss */ -.select { - background-color: #ddd; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #fff; - 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; - padding: 0 5px; - overflow: hidden; - position: relative; - line-height: 22px; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ - .select .icon { - color: #eee; } - /* line 31, ../../../../general/res/sass/forms/_selects.scss */ - .select select { - -moz-appearance: none; - -webkit-appearance: none; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - background: none; - color: #666; - cursor: pointer; - border: none !important; - padding: 4px 25px 2px 0px; - width: 120%; } - /* line 40, ../../../../general/res/sass/forms/_selects.scss */ - .select select option { - margin: 5px 0; } - /* line 44, ../../../../general/res/sass/forms/_selects.scss */ - .select:after { - text-shadow: none; - content: '\76'; - display: inline-block; - font-family: 'symbolsfont'; - margin-left: 3px; - vertical-align: top; - pointer-events: none; - color: rgba(102, 102, 102, 0.4); - position: absolute; - right: 5px; - top: 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. - *****************************************************************************/ -/* line 23, ../../../../general/res/sass/forms/_channel-selector.scss */ -.channel-selector .line { - margin-bottom: 5px; - min-height: 22px; } -/* line 27, ../../../../general/res/sass/forms/_channel-selector.scss */ -.channel-selector .treeview { - -moz-appearance: none; - -webkit-appearance: none; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - background: #fcfcfc; - border: none; - color: #666; - outline: none; - padding: 0 3px; - background: white; - border-bottom: 1px solid white; - min-height: 300px; - max-height: 400px; - overflow: auto; - padding: 5px; } - /* line 298, ../../../../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 */ -.channel-selector .btns-add-remove { - margin-top: 150px; } - /* line 39, ../../../../general/res/sass/forms/_channel-selector.scss */ - .channel-selector .btns-add-remove .s-btn, .channel-selector .btns-add-remove .s-menu-btn { - display: block; - margin-bottom: 5px; - text-align: center; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 29, ../../../../general/res/sass/forms/_datetime.scss */ -.complex.datetime { - /* - .field-hints, - .fields { - } - - - .field-hints { - - } - */ } - /* line 30, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime span { - display: inline-block; - margin-right: 5px; } - /* line 46, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime .fields { - margin-top: 3px 0; - padding: 3px 0; } - /* line 51, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime .date { - width: 85px; } - /* line 24, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime .date input[type="text"] { - width: 80px; } - /* line 55, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime .time.md { - width: 65px; } - /* line 24, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime .time.md input[type="text"] { - width: 60px; } - /* line 59, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime .time.sm { - width: 45px; } - /* line 24, ../../../../general/res/sass/forms/_datetime.scss */ - .complex.datetime .time.sm input[type="text"] { - width: 40px; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 23, ../../../../general/res/sass/forms/_validation.scss */ -.validates > .label { - padding-right: 10px; } - /* line 25, ../../../../general/res/sass/forms/_validation.scss */ - .validates > .label::after { - float: right; - font-family: symbolsfont; - font-size: 0.7em; } -/* line 33, ../../../../general/res/sass/forms/_validation.scss */ -.validates.invalid > .label::after, .validates.invalid.req > .label::after { - color: #ff2200; - content: "x"; } -/* line 40, ../../../../general/res/sass/forms/_validation.scss */ -.validates.valid > .label::after, .validates.valid.req > .label::after { - color: #33cc33; - content: "2"; } -/* line 46, ../../../../general/res/sass/forms/_validation.scss */ -.validates.req > .label::after { - color: #0099cc; - content: "*"; } - -/* line 52, ../../../../general/res/sass/forms/_validation.scss */ -.req { - font-size: 0.7em; } - -/* line 55, ../../../../general/res/sass/forms/_validation.scss */ -span.req { - color: #0099cc; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 24, ../../../../general/res/sass/forms/_filter.scss */ -.filter input.filter, -.filter input.t-filter-input, -.t-filter input.filter, -.t-filter input.t-filter-input { - -moz-appearance: none; - -webkit-appearance: none; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; - background: #fcfcfc; - border: none; - color: #666; - outline: none; - padding: 0 3px; - background: white; - border-bottom: 1px solid white; } - /* line 298, ../../../../general/res/sass/_mixins.scss */ - .filter input.filter.error, - .filter input.t-filter-input.error, - .t-filter input.filter.error, - .t-filter input.t-filter-input.error { - background: rgba(255, 0, 0, 0.5); } -/* line 28, ../../../../general/res/sass/forms/_filter.scss */ -.filter input.t-filter-input, -.t-filter input.t-filter-input { - height: 22px; - width: 200px; } - /* line 38, ../../../../general/res/sass/forms/_filter.scss */ - .filter input.t-filter-input:not(.ng-dirty) + .t-a-clear, - .t-filter input.t-filter-input:not(.ng-dirty) + .t-a-clear { - display: none; } -/* line 42, ../../../../general/res/sass/forms/_filter.scss */ -.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, -.t-filter .icon.ui-symbol, -.t-filter .icon.s-icon-btn, -.t-filter .icon.mini-tab, -.t-filter .l-datetime-picker .l-month-year-pager .icon.pager, -.l-datetime-picker .l-month-year-pager .t-filter .icon.pager { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - display: inline-block; - font-size: 1.3em; - height: 22px; - line-height: 22px; - padding: 0px 5px; - vertical-align: middle; } - /* line 50, ../../../../general/res/sass/forms/_filter.scss */ - .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, - .t-filter .icon.ui-symbol:hover, - .t-filter .icon.s-icon-btn:hover, - .t-filter .icon.mini-tab:hover, - .t-filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, - .l-datetime-picker .l-month-year-pager .t-filter .icon.pager:hover { - background: rgba(255, 255, 255, 0.1); } -/* line 54, ../../../../general/res/sass/forms/_filter.scss */ -.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, -.t-filter .s-a-clear.ui-symbol, -.t-filter .s-a-clear.s-icon-btn, -.t-filter .s-a-clear.mini-tab, -.t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, -.l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager { - -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; - filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20); - opacity: 0.2; - background: #fff; - color: #333; - display: block; - position: absolute; - height: 13px; - width: 13px; - line-height: 13px; - margin-top: -6.5px; - overflow: hidden; - padding-top: 1px; - right: 4.5px; - top: 50%; - text-align: center; - z-index: 5; } - /* line 74, ../../../../general/res/sass/forms/_filter.scss */ - .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, - .t-filter .s-a-clear.ui-symbol:hover, - .t-filter .s-a-clear.s-icon-btn:hover, - .t-filter .s-a-clear.mini-tab:hover, - .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, - .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager:hover { - filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60); - opacity: 0.6; - background-color: #0099cc; } - -/* line 82, ../../../../general/res/sass/forms/_filter.scss */ -.l-filter { - display: inline-block; - position: relative; } - -/* line 89, ../../../../general/res/sass/forms/_filter.scss */ -.top-bar input.filter { - font-size: .9em; - height: 24px; - line-height: 24px; - margin-right: 5px; - padding-left: 10px; - padding-right: 10px; - vertical-align: top; } -/* line 100, ../../../../general/res/sass/forms/_filter.scss */ -.top-bar .icon-filter { - font-size: 1.4em; } - -/********************************* USER ENVIRON */ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 32, ../../../../general/res/sass/user-environ/_layout.scss */ -.holder-all { - top: 0; - right: 0; - bottom: 0; - left: 0; } - -/* line 40, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-area, -.edit-area, -.editor { - position: absolute; } - -/* line 46, ../../../../general/res/sass/user-environ/_layout.scss */ -.editor { - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; } - -/* line 50, ../../../../general/res/sass/user-environ/_layout.scss */ -.contents { - box-sizing: border-box; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; } - /* line 58, ../../../../general/res/sass/user-environ/_layout.scss */ - .contents.nomargin { - right: 0px; - bottom: 0px; - left: 0px; } - -/* line 67, ../../../../general/res/sass/user-environ/_layout.scss */ -.bar .icon.major { - margin-right: 5px; } -/* line 70, ../../../../general/res/sass/user-environ/_layout.scss */ -.bar.abs, .l-datetime-picker .l-month-year-pager .bar.pager, -.l-datetime-picker .l-month-year-pager .bar.val, .s-menu-btn span.bar.l-click-area { - text-wrap: none; - white-space: nowrap; } - /* line 73, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.left, .l-datetime-picker .l-month-year-pager .bar.left.pager, - .l-datetime-picker .l-month-year-pager .bar.left.val, .s-menu-btn span.bar.left.l-click-area, - .bar.abs .left, - .l-datetime-picker .l-month-year-pager .bar.pager .left, - .l-datetime-picker .l-month-year-pager .bar.val .left, - .s-menu-btn span.bar.l-click-area .left { - width: 45%; - right: auto; } - /* line 78, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.right, .l-datetime-picker .l-month-year-pager .bar.right.pager, - .l-datetime-picker .l-month-year-pager .bar.right.val, .s-menu-btn span.bar.right.l-click-area, - .bar.abs .right, - .l-datetime-picker .l-month-year-pager .bar.pager .right, - .l-datetime-picker .l-month-year-pager .bar.val .right, - .s-menu-btn span.bar.l-click-area .right { - width: 45%; - left: auto; - text-align: right; } - /* line 83, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs.right .icon.major, .l-datetime-picker .l-month-year-pager .bar.right.pager .icon.major, - .l-datetime-picker .l-month-year-pager .bar.right.val .icon.major, .s-menu-btn span.bar.right.l-click-area .icon.major, - .bar.abs .right .icon.major, - .l-datetime-picker .l-month-year-pager .bar.pager .right .icon.major, - .l-datetime-picker .l-month-year-pager .bar.val .right .icon.major, - .s-menu-btn span.bar.l-click-area .right .icon.major { - margin-left: 15px; } - /* line 89, ../../../../general/res/sass/user-environ/_layout.scss */ - .bar.abs .l-flex .left, .l-datetime-picker .l-month-year-pager .bar.pager .l-flex .left, - .l-datetime-picker .l-month-year-pager .bar.val .l-flex .left, .s-menu-btn span.bar.l-click-area .l-flex .left, - .bar.abs .l-flex .right, - .l-datetime-picker .l-month-year-pager .bar.pager .l-flex .right, - .l-datetime-picker .l-month-year-pager .bar.val .l-flex .right, - .s-menu-btn span.bar.l-click-area .l-flex .right, .bar.abs.l-flex .left, .l-datetime-picker .l-month-year-pager .bar.l-flex.pager .left, - .l-datetime-picker .l-month-year-pager .bar.l-flex.val .left, .s-menu-btn span.bar.l-flex.l-click-area .left, - .bar.abs.l-flex .right, - .l-datetime-picker .l-month-year-pager .bar.l-flex.pager .right, - .l-datetime-picker .l-month-year-pager .bar.l-flex.val .right, - .s-menu-btn span.bar.l-flex.l-click-area .right { - width: auto; } - -/* line 98, ../../../../general/res/sass/user-environ/_layout.scss */ -.user-environ .browse-area, -.user-environ .edit-area, -.user-environ .editor { - top: 39px; - right: 10px; - bottom: 35px; - left: 10px; } -/* line 109, ../../../../general/res/sass/user-environ/_layout.scss */ -.user-environ .browse-area > .contents, -.user-environ .edit-area > .contents { - left: 0; - right: 0; } -/* line 115, ../../../../general/res/sass/user-environ/_layout.scss */ -.user-environ .edit-area { - top: 45px; } - /* line 118, ../../../../general/res/sass/user-environ/_layout.scss */ - .user-environ .edit-area .tool-bar { - bottom: auto; - height: 30px; - line-height: 25px; } - /* line 123, ../../../../general/res/sass/user-environ/_layout.scss */ - .user-environ .edit-area .work-area { - top: 40px; } -/* line 128, ../../../../general/res/sass/user-environ/_layout.scss */ -.user-environ .ue-bottom-bar { - overflow: hidden; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; - top: auto; - height: 25px; } - /* line 133, ../../../../general/res/sass/user-environ/_layout.scss */ - .user-environ .ue-bottom-bar .status-holder { - z-index: 1; } - /* line 137, ../../../../general/res/sass/user-environ/_layout.scss */ - .user-environ .ue-bottom-bar .app-logo { - left: auto; - width: 105px; - z-index: 2; } - -/* line 145, ../../../../general/res/sass/user-environ/_layout.scss */ -.cols { - overflow: hidden; - *zoom: 1; } - /* line 147, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols .col { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - *zoom: 1; - float: left; - margin-left: 1.5%; - padding-left: 5px; - position: relative; } - /* line 155, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols .col:first-child { - margin-left: 0; - padding-left: 0; } - /* line 162, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-2 .col-1 { - min-width: 250px; - width: 48.5%; } - /* line 168, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-2-ff .col-100px { - width: 100px; } - /* line 175, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-6 .col-1 { - min-width: 83.33333px; - width: 15.16667%; } - /* line 181, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-16 .col-1 { - min-width: 31.25px; - width: 4.75%; } - /* line 184, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-16 .col-2 { - min-width: 62.5px; - width: 11%; } - /* line 187, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-16 .col-7 { - min-width: 218.75px; - width: 42.25%; } - /* line 193, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-32 .col-2 { - min-width: 31.25px; - width: 4.75%; } - /* line 196, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols.cols-32 .col-15 { - min-width: 234.375px; - width: 45.375%; } - /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ - .cols .l-row { - overflow: hidden; - *zoom: 1; - padding: 5px 0; } - -/* line 209, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-mode .split-layout .split-pane-component.pane.treeview.left { - min-width: 150px; - max-width: 800px; - width: 25%; } -/* line 214, ../../../../general/res/sass/user-environ/_layout.scss */ -.browse-mode .split-layout .split-pane-component.pane.t-inspect.right { - min-width: 150px; - max-width: 800px; - width: 10%; } - -/* line 225, ../../../../general/res/sass/user-environ/_layout.scss */ -.edit-mode .split-layout .split-pane-component.pane.right { - width: 15%; } - /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ - .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { - min-height: 50px; - height: 30%; } - -/* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane { - position: absolute; } - /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.treeview.left .create-btn-holder { - bottom: auto; - top: 0; - height: 24px; } - /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.treeview.left .create-btn-holder .wrapper.menu-element { - position: absolute; - bottom: 5px; } - /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.treeview.left .search-holder { - top: 34px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.treeview.left .tree-holder { - overflow: auto; - top: 64px; } - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane { - z-index: 2; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane { - top: 5px; } - /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { - left: -30px; } - /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { - content: 'F'; } - /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { - left: -25px; } - /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { - right: -25px; } - /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { - content: '\e608'; } - /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { - right: -20px; } } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ - .pane.items .object-browse-bar .left.abs, .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 .right.abs, - .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .right.pager, - .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .right.pager, - .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .right.val, - .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .right.val, - .pane.items .object-browse-bar .s-menu-btn span.right.l-click-area, - .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { - top: auto; } - -/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ -.split-layout.horizontal > .pane { - margin-top: 5px; } - /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout.horizontal > .pane:first-child { - margin-top: 0; } -/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ -.split-layout.vertical > .pane { - margin-left: 5px; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout.vertical > .pane > .holder { - left: 0; - right: 0; } - /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout.vertical > .pane:first-child { - margin-left: 0; } - /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout.vertical > .pane:first-child .holder { - right: 3px; } - -/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ -.object-holder { - overflow: hidden; - top: 34px; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ - .object-holder > ng-include { - overflow: auto; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; } - /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ - .object-holder.l-controls-visible.l-time-controller-visible { - bottom: 88px; } - -/* line 338, ../../../../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, -.top-bar .s-menu-btn, -.tool-bar .s-btn, -.tool-bar .s-menu-btn, -.tool-bar .s-menu-btn { - height: 25px; - line-height: 25px; - vertical-align: top; } - -/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ -.object-browse-bar .view-switcher, -.top-bar .view-switcher { - margin-right: 20px; } - -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ -.object-browse-bar { - overflow: visible; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - height: 24px; - line-height: 24px; - white-space: nowrap; } - /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ - .object-browse-bar .left { - padding-right: 20px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ - .object-browse-bar .left .l-back { - display: inline-block; - float: left; - margin-right: 10px; } - -/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ -.l-flex { - display: flex; - display: -webkit-flex; - flex-flow: row nowrap; - -webkit-flex-flow: row nowrap; } - /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ - .l-flex .left { - flex: 1 1 0; - -webkit-flex: 1 1 0; - padding-right: 10px; } - -/* line 390, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-tree-hidden .pane.left.treeview, -.pane-tree-hidden .splitter-treeview { - opacity: 0; } -/* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-tree-hidden .pane.right.items { - left: 15px !important; } - -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-tree-showing .pane.left.treeview, -.pane-tree-showing .splitter-treeview { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -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; - opacity: 1; } - -/* line 411, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-inspect-showing .l-object-and-inspector .pane.right, -.pane-inspect-showing .l-object-and-inspector .splitter-inspect { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -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; - opacity: 1; } - -/* line 420, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-inspect-hidden .l-object-and-inspector .pane.right, -.pane-inspect-hidden .l-object-and-inspector .splitter-inspect { - opacity: 0; } -/* line 424, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane-inspect-hidden .l-object-and-inspector .pane.left { - right: 15px !important; } - -/* line 430, ../../../../general/res/sass/user-environ/_layout.scss */ -.pane.right.t-inspect { - background-color: rgba(255, 165, 0, 0.3) !important; } - -@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 435, ../../../../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; } } -/***************************************************************************** - * 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. - *****************************************************************************/ -@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 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 { - -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 #content-area { - -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; - opacity: 1; } - - /* line 45, ../../../../general/res/sass/mobile/_layout.scss */ - .user-environ .browse-area, - .user-environ .edit-area, - .user-environ .editor { - top: 0; - left: 0; - right: 0; - bottom: 25px; } - - /* line 51, ../../../../general/res/sass/mobile/_layout.scss */ - .holder.l-mobile { - top: 10px !important; - right: 10px !important; - bottom: 10px !important; - left: 10px !important; } - - /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-hidden .pane.left.treeview { - right: 100% !important; - width: auto !important; - overflow-y: hidden; - overflow-x: hidden; } - - /* line 82, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.left.treeview { - 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 88, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items { - left: 40% !important; } - - /* line 93, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree { - color: #0099cc !important; - font-size: 110%; - position: absolute; - top: 12px; - left: 10px; } - /* line 99, ../../../../general/res/sass/mobile/_layout.scss */ - .toggle-tree:after { - content: 'm' !important; } - - /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar { - left: 30px !important; } - /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .context-available { - opacity: 1 !important; } - /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .view-switcher { - margin-right: 0 !important; } - /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ - .object-browse-bar .view-switcher .title-label { - display: none; } - - /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ - .tree-holder { - overflow-x: hidden !important; } - - /* line 123, ../../../../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 128, ../../../../general/res/sass/mobile/_layout.scss */ - .mobile-hide, - .mobile-hide-important { - display: none !important; } - - /* line 133, ../../../../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; - opacity: 0; } - - /* line 138, ../../../../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 screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { - /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.left.treeview { - width: 90% !important; } - /* line 150, ../../../../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 153, ../../../../general/res/sass/mobile/_layout.scss */ - .pane-tree-showing .pane.right.items #content-area { - opacity: 0; } } -@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ - .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 - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 26, ../../../../general/res/sass/edit/_editor.scss */ -.edit-main .edit-corner, -.edit-main .edit-handle { - position: absolute; - z-index: 2; } -/* line 32, ../../../../general/res/sass/edit/_editor.scss */ -.edit-main .edit-corner { - width: 15px; - height: 15px; } - /* line 35, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-corner:hover { - z-index: 11; } - /* line 38, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-corner.edit-resize-nw { - -moz-border-radius-bottomright: 5px; - -webkit-border-bottom-right-radius: 5px; - border-bottom-right-radius: 5px; - cursor: nw-resize; - top: 0; - left: 0; } - /* line 43, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-corner.edit-resize-ne { - -moz-border-radius-bottomleft: 5px; - -webkit-border-bottom-left-radius: 5px; - border-bottom-left-radius: 5px; - cursor: ne-resize; - top: 0; - right: 0; } - /* line 48, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-corner.edit-resize-se { - -moz-border-radius-topleft: 5px; - -webkit-border-top-left-radius: 5px; - border-top-left-radius: 5px; - cursor: se-resize; - bottom: 0; - right: 0; } - /* line 53, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-corner.edit-resize-sw { - -moz-border-radius-topright: 5px; - -webkit-border-top-right-radius: 5px; - border-top-right-radius: 5px; - cursor: sw-resize; - bottom: 0; - left: 0; } -/* line 61, ../../../../general/res/sass/edit/_editor.scss */ -.edit-main .edit-handle { - top: 15px; - right: 15px; - bottom: 15px; - left: 15px; } - /* line 63, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-handle.edit-move { - cursor: move; - left: 0; - right: 0; - top: 0; - bottom: 0; - z-index: 1; } - /* line 73, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-handle.edit-resize-n { - top: 0px; - bottom: auto; - height: 15px; - cursor: n-resize; } - /* line 78, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-handle.edit-resize-e { - right: 0px; - left: auto; - width: 15px; - cursor: e-resize; } - /* line 83, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-handle.edit-resize-s { - bottom: 0px; - top: auto; - height: 15px; - cursor: s-resize; } - /* line 88, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .edit-handle.edit-resize-w { - left: 0px; - right: auto; - width: 15px; - cursor: w-resize; } -/* line 97, ../../../../general/res/sass/edit/_editor.scss */ -.edit-main .frame.child-frame.panel:hover { - -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - border-color: #0099cc; } - /* line 101, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .frame.child-frame.panel:hover .view-switcher { - opacity: 1; } - /* line 104, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .frame.child-frame.panel:hover .edit-corner { - background-color: rgba(0, 153, 204, 0.8); } - /* line 106, ../../../../general/res/sass/edit/_editor.scss */ - .edit-main .frame.child-frame.panel:hover .edit-corner:hover { - background-color: #0099cc; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 23, ../../../../general/res/sass/search/_search.scss */ -.abs.search-holder, .l-datetime-picker .l-month-year-pager .search-holder.pager, -.l-datetime-picker .l-month-year-pager .search-holder.val, .s-menu-btn span.search-holder.l-click-area { - height: 25px; - bottom: 0; - top: 23px; - z-index: 5; } - /* line 27, ../../../../general/res/sass/search/_search.scss */ - .abs.search-holder.active, .l-datetime-picker .l-month-year-pager .search-holder.active.pager, - .l-datetime-picker .l-month-year-pager .search-holder.active.val, .s-menu-btn span.search-holder.active.l-click-area { - height: auto; - bottom: 0; } - -/* line 38, ../../../../general/res/sass/search/_search.scss */ -.search { - display: flex; - display: -webkit-flex; - flex-direction: column; - -webkit-flex-direction: column; - height: 100%; } - /* line 48, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar { - font-size: 0.8em; - max-width: 250px; - position: relative; - width: 100%; } - /* line 60, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-input { - height: 25px; - line-height: 25px; - padding-top: 0; - padding-bottom: 0; } - /* line 67, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-icon, - .search .search-bar .clear-icon, - .search .search-bar .menu-icon { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #a6a6a6; - height: 17px; - width: 17px; - line-height: 17px; - position: absolute; - text-align: center; - top: 4px; } - /* line 80, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .clear-icon, - .search .search-bar .menu-icon { - cursor: pointer; - -moz-transition: color, 0.25s; - -o-transition: color, 0.25s; - -webkit-transition: color, 0.25s; - transition: color, 0.25s; } - /* line 87, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-input { - position: relative; - width: 100%; - padding-left: 22px !important; - padding-right: 44px !important; } - /* line 94, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-input input { - width: 100%; } - /* line 99, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-icon { - left: 3px; - transition: visibility .15s, opacity .15s, color .2s; - pointer-events: none; } - /* line 119, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-input:hover + div.search-icon { - color: #8c8c8c; } - /* line 123, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .clear-icon { - right: 22px; - visibility: hidden; - opacity: 0; - transition: visibility .15s, opacity .15s, color .2s; } - /* line 132, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .clear-icon.content { - visibility: visible; - opacity: 1; } - /* line 137, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .clear-icon:hover { - color: #8c8c8c; } - /* line 142, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .menu-icon { - font-size: 0.8em; - padding-right: 4px; - right: 4px; - text-align: right; } - /* line 148, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .menu-icon:hover { - color: #8c8c8c; } - /* line 153, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-menu-holder { - float: right; - left: -20px; - z-index: 1; - transition: visibility .05s, opacity .05s; } - /* line 163, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .search-menu-holder.off { - visibility: hidden; - opacity: 0; } - /* line 170, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar .menu-icon:hover + div.search-menu-holder { - visibility: visible; } - /* line 173, ../../../../general/res/sass/search/_search.scss */ - .search .search-bar div.search-menu-holder:hover { - visibility: visible; } - /* line 178, ../../../../general/res/sass/search/_search.scss */ - .search .active-filter-display { - -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; - line-height: 130%; - padding: 5px 0; - padding-left: 1.4625em; - font-size: 0.65em; - margin-top: 3px; } - /* line 193, ../../../../general/res/sass/search/_search.scss */ - .search .active-filter-display .clear-filters-icon { - color: #a6a6a6; - opacity: 1; - font-size: 0.8em; - position: absolute; - left: 1px; - cursor: pointer; } - /* line 205, ../../../../general/res/sass/search/_search.scss */ - .search .active-filter-display.off { - visibility: hidden; - opacity: 0; - height: 0; - margin: 0; - padding: 0; - border: 0; } - /* line 215, ../../../../general/res/sass/search/_search.scss */ - .search .search-scroll { - order: 3; - margin-top: 4px; - overflow-y: auto; - top: auto; - height: auto; - max-height: 100%; - position: relative; } - /* line 226, ../../../../general/res/sass/search/_search.scss */ - .search .search-scroll .load-icon { - position: relative; } - /* line 230, ../../../../general/res/sass/search/_search.scss */ - .search .search-scroll .load-more-button { - margin-top: 5px 0; - font-size: 0.8em; - position: relative; - left: 50%; - margin-left: -45px; - text-align: center; - width: 90px; - white-space: nowrap; } - -@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) { - /* line 5, ../../../../general/res/sass/mobile/search/_search.scss */ - .search .search-bar .menu-icon { - display: none; } - /* line 8, ../../../../general/res/sass/mobile/search/_search.scss */ - .search .search-bar .clear-icon { - right: 5px; } } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 23, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .blocker { - background: rgba(0, 0, 0, 0.7); - z-index: 100; } -/* line 27, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .clk-icon.close { - font-size: 0.8rem; - position: absolute; - top: 10px; - right: 10px; - bottom: auto; - left: auto; - z-index: 100; } -/* line 33, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay > .holder { - background-color: #fcfcfc; - -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: #666; - display: inline-block; - -moz-border-radius: 12px; - -webkit-border-radius: 12px; - border-radius: 12px; - color: #666; - top: 15%; - right: 15%; - bottom: 15%; - left: 15%; - z-index: 101; } - /* line 40, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay > .holder > .contents { - top: 25px; - right: 25px; - bottom: 25px; - left: 25px; } -/* line 45, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .title { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 1.2em; - margin-bottom: 5px; } -/* line 51, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .top-bar { - height: 60px; } -/* line 55, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .editor { - top: 70px; - bottom: 40px; - left: 0; - right: 0; } -/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .bottom-bar { - top: auto; - right: 0; - bottom: 0; - left: 0; - overflow: visible; - height: 30px; - text-align: right; } - /* line 67, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu-btn { - font-size: 95%; - height: 30px; - line-height: 30px; - margin-left: 5px; - padding: 0 15px; } - /* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu-btn:not(.major) { - 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 274, ../../../../general/res/sass/_mixins.scss */ - .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { - color: #fff; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../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: #7d7d7d; } - /* line 281, ../../../../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 { - color: white; } } -/* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ -.overlay .contents.l-dialog { - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - overflow: auto; } - /* line 93, ../../../../general/res/sass/overlay/_overlay.scss */ - .overlay .contents.l-dialog .field.l-med input[type='text'] { - width: 100%; } - -@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 4, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay .clk-icon.close { - top: 10px; - right: 10px; } - /* line 8, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder { - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; - top: 0; - right: 0; - bottom: 0; - left: 0; } - /* line 14, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents { - top: 10px; - right: 10px; - bottom: 10px; - left: 10px; } - /* line 21, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .top-bar > .title { - margin-right: 1.2em; } - /* line 26, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor { - border: none; } - /* line 29, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents { - top: 0; - right: 0; - bottom: 0; - left: 0; } } -@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) { - /* line 43, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents .form-row > .label, - .overlay > .holder > .contents .form.editor .contents .form-row > .controls { - display: block; - float: none; - width: 100%; } - /* line 51, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ - .overlay > .holder > .contents .form.editor .contents .form-row > .label:after { - float: none; } } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 23, ../../../../general/res/sass/tree/_tree.scss */ -ul.tree { - margin: 0; - padding: 0; - -moz-user-select: -moz-none; - -ms-user-select: none; - -webkit-user-select: none; - user-select: none; } - /* line 331, ../../../../general/res/sass/_mixins.scss */ - ul.tree li { - list-style-type: none; - margin: 0; - padding: 0; } - /* line 26, ../../../../general/res/sass/tree/_tree.scss */ - ul.tree li { - display: block; - position: relative; } - /* line 30, ../../../../general/res/sass/tree/_tree.scss */ - ul.tree ul.tree { - margin-left: 15px; } - -/* line 35, ../../../../general/res/sass/tree/_tree.scss */ -.tree-item, -.search-result-item { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-transition: background-color 0.25s; - -o-transition: background-color 0.25s; - -webkit-transition: background-color 0.25s; - transition: background-color 0.25s; - display: block; - font-size: 0.8rem; - height: 1.5rem; - line-height: 1.5rem; - margin-bottom: 3px; - position: relative; } - /* line 48, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .view-control, - .search-result-item .view-control { - color: #666; - display: inline-block; - margin-left: 5px; - font-size: 0.75em; - width: 10px; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 57, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .view-control:hover, - .search-result-item .view-control:hover { - color: #0099cc !important; } } - /* line 63, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .label, - .search-result-item .label { - display: block; - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; - line-height: 1.5rem; } - /* line 71, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .label .type-icon, - .search-result-item .label .type-icon { - font-size: 16px; - color: #0099cc; - left: 5px; - position: absolute; - top: 4px; - bottom: auto; - height: 16px; - line-height: 100%; - right: auto; - width: 16px; } - /* line 84, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .label .type-icon .icon.l-icon-link, .tree-item .label .type-icon .icon.l-icon-alert, - .search-result-item .label .type-icon .icon.l-icon-link, - .search-result-item .label .type-icon .icon.l-icon-alert { - position: absolute; - z-index: 2; } - /* line 89, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .label .type-icon .icon.l-icon-alert, - .search-result-item .label .type-icon .icon.l-icon-alert { - color: #ff3c00; - font-size: 8px; - line-height: 8px; - height: 8px; - width: 8px; - top: 1px; - right: -2px; } - /* line 95, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .label .type-icon .icon.l-icon-link, - .search-result-item .label .type-icon .icon.l-icon-link { - color: #49dedb; - font-size: 8px; - line-height: 8px; - height: 8px; - width: 8px; - left: -3px; - bottom: 0px; } - /* line 103, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .label .title-label, - .search-result-item .label .title-label { - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; - display: block; - left: 30px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } - /* line 113, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item.selected, - .search-result-item.selected { - background: #1ac6ff; - color: #fcfcfc; } - /* line 116, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item.selected .view-control, - .search-result-item.selected .view-control { - color: #fcfcfc; } - /* line 119, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item.selected .label .type-icon, - .search-result-item.selected .label .type-icon { - color: #fcfcfc; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 127, ../../../../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 130, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item:not(.selected):hover .icon, - .search-result-item:not(.selected):hover .icon { - color: #0099cc; } } - /* line 137, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item:not(.loading), - .search-result-item:not(.loading) { - cursor: pointer; } - /* line 141, ../../../../general/res/sass/tree/_tree.scss */ - .tree-item .context-trigger, - .search-result-item .context-trigger { - top: -1px; - position: absolute; - right: 3px; } - /* line 146, ../../../../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 155, ../../../../general/res/sass/tree/_tree.scss */ -.tree-item .label { - left: 15px; } - -/***************************************************************************** - * 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. - *****************************************************************************/ -@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 27, ../../../../general/res/sass/mobile/_tree.scss */ - ul.tree ul.tree { - margin-left: 20px; } - - /* line 31, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item, - .search-result-item { - height: 35px; - line-height: 35px; - margin-bottom: 0px; } - /* line 36, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .view-control, - .search-result-item .view-control { - position: absolute; - font-size: 1.1em; - right: 0px; - width: 30px; - text-align: center; } - /* line 45, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .label, - .search-result-item .label { - left: 0; - right: 35px; - line-height: 35px; } - /* line 50, ../../../../general/res/sass/mobile/_tree.scss */ - .tree-item .label .type-icon, - .search-result-item .label .type-icon { - top: 9px; - bottom: auto; - height: 16px; } } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 25, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame.child-frame.panel { - background: #fcfcfc; - border: 1px solid rgba(102, 102, 102, 0.2); } - /* line 28, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.child-frame.panel:hover { - border-color: rgba(128, 128, 128, 0.2); } -/* line 32, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame > .object-header.abs, .l-datetime-picker .l-month-year-pager .frame > .object-header.pager, -.l-datetime-picker .l-month-year-pager .frame > .object-header.val, .s-menu-btn .frame > span.object-header.l-click-area { - font-size: 0.75em; - height: 16px; - line-height: 16px; } -/* line 38, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame > .object-holder.abs, .l-datetime-picker .l-month-year-pager .frame > .object-holder.pager, -.l-datetime-picker .l-month-year-pager .frame > .object-holder.val, .s-menu-btn .frame > span.object-holder.l-click-area { - top: 21px; } -/* line 41, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame .contents { - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; } -/* line 49, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame.frame-template .s-btn, .frame.frame-template .s-menu-btn, -.frame.frame-template .s-menu-btn { - height: 16px; - line-height: 16px; - padding: 0 5px; } - /* line 54, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.frame-template .s-btn > span, .frame.frame-template .s-menu-btn > span, - .frame.frame-template .s-menu-btn > span { - font-size: 0.65rem; } -/* line 59, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame.frame-template .s-menu-btn:after { - font-size: 8px; } -/* line 63, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame.frame-template .view-switcher { - z-index: 10; } -@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 69, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.frame-template .view-switcher { - opacity: 0; } - /* line 72, ../../../../general/res/sass/user-environ/_frame.scss */ - .frame.frame-template:hover .view-switcher { - opacity: 1; } } -/* line 80, ../../../../general/res/sass/user-environ/_frame.scss */ -.frame .view-switcher .title-label { - display: none; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.top-bar { - /* .title { - color: #fff; - }*/ } - /* line 23, ../../../../general/res/sass/user-environ/_top-bar.scss */ - .top-bar.browse, .top-bar.edit { - border-bottom: 1px solid rgba(102, 102, 102, 0.2); - top: 10px; - right: 10px; - bottom: auto; - left: 10px; - height: 30px; - line-height: 24px; } - /* line 35, ../../../../general/res/sass/user-environ/_top-bar.scss */ - .top-bar .buttons-main { - font-size: 0.8em; - left: auto; - text-align: right; } - -/* line 48, ../../../../general/res/sass/user-environ/_top-bar.scss */ -.edit-mode .top-bar .buttons-main { - white-space: nowrap; } - /* line 52, ../../../../general/res/sass/user-environ/_top-bar.scss */ - .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .l-datetime-picker .l-month-year-pager .buttons-main.pager, .l-datetime-picker .l-month-year-pager .edit-mode .top-bar .buttons-main.pager, - .edit-mode .top-bar .l-datetime-picker .l-month-year-pager .buttons-main.val, - .l-datetime-picker .l-month-year-pager .edit-mode .top-bar .buttons-main.val, .edit-mode .top-bar .s-menu-btn span.buttons-main.l-click-area, .s-menu-btn .edit-mode .top-bar span.buttons-main.l-click-area { - bottom: auto; - left: auto; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ -.ue-bottom-bar { - background: #000; - color: white; - font-size: .7rem; } - /* line 28, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .status-holder { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - width: auto; - height: auto; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - line-height: 15px; - right: 120px; - text-transform: uppercase; } - /* line 39, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .app-logo { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - overflow: hidden; - position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; - width: auto; - height: auto; - left: auto; - cursor: pointer; } - /* line 48, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .ue-bottom-bar .app-logo.logo-openmctweb { - background: url("../../../../general/res/images/logo-openmctweb.svg") no-repeat center center; } - -/* line 54, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ -.status.block { - display: inline; - margin-right: 10px; } - /* line 58, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator { - display: inline-block; - margin-right: 3px; - color: #0099cc; } - /* line 65, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator.ok { - color: #009900; } - /* line 68, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ - .status.block .status-indicator.caution { - color: #ffaa00; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/user-environ/_tool-bar.scss */ -.tool-bar { - border-bottom: 1px solid rgba(102, 102, 102, 0.2); } - /* line 24, ../../../../general/res/sass/user-environ/_tool-bar.scss */ - .tool-bar .l-control-group { - height: 25px; } - /* line 27, ../../../../general/res/sass/user-environ/_tool-bar.scss */ - .tool-bar input[type="text"] { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - font-size: .9em; - height: 25px; - margin-bottom: 1px; - position: relative; } - /* line 33, ../../../../general/res/sass/user-environ/_tool-bar.scss */ - .tool-bar input[type="text"].sm { - width: 25px; } - /* line 37, ../../../../general/res/sass/user-environ/_tool-bar.scss */ - .tool-bar .input-labeled label { - font-size: 11.25px; } - -/********************************* VIEWS */ -/***************************************************************************** -* Open MCT Web, Copyright (c) 2014-2015, United States Government -* as represented by the Administrator of the National Aeronautics and Space -* Administration. All rights reserved. -* -* Open MCT Web is licensed under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0. -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -* License for the specific language governing permissions and limitations -* under the License. -* -* Open MCT Web includes source code licensed under additional open source -* licenses. See the Open Source Licenses file (LICENSES.md) included with -* this source code distribution or the Licensing information page available -* at runtime from the About dialog for additional information. -*****************************************************************************/ -/* line 23, ../../../../general/res/sass/_fixed-position.scss */ -.t-fixed-position.l-fixed-position { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; } - /* line 33, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position.l-fixed-position .l-grid-holder { - position: relative; - height: 100%; - width: 100%; } - /* line 37, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position.l-fixed-position .l-grid-holder .l-grid { - position: absolute; - height: 100%; - width: 100%; - pointer-events: none; - z-index: 0; } -/* line 48, ../../../../general/res/sass/_fixed-position.scss */ -.t-fixed-position .l-fixed-position-item { - position: absolute; - border: 1px solid transparent; } - /* line 52, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item.s-selected { - -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - border-color: #0099cc; - cursor: move; } - /* line 57, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item.s-not-selected { - opacity: 0.8; } - /* line 61, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-box, - .t-fixed-position .l-fixed-position-item .l-fixed-position-image, - .t-fixed-position .l-fixed-position-item .l-fixed-position-text { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - height: 100%; - width: 100%; } - /* line 72, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-image { - background-size: cover; - background-repeat: no-repeat; - background-position: center; } - /* line 78, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-text { - border: 1px solid transparent; - font-size: 0.8rem; - line-height: 100%; } - /* line 84, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text { - padding: 1px; } - /* line 89, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: block; - padding: 2px; } - /* line 96, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title { - float: none; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - width: auto; } - /* line 105, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - float: right; - margin-left: 5px; - padding-left: 5px; - padding-right: 5px; - text-align: right; } - /* line 116, ../../../../general/res/sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { - margin-left: 0; - width: 100%; } -/* line 126, ../../../../general/res/sass/_fixed-position.scss */ -.t-fixed-position .l-fixed-position-item-handle { - background: rgba(0, 153, 204, 0.5); - cursor: crosshair; - border: 1px solid #0099cc; - position: absolute; } - -/* line 140, ../../../../general/res/sass/_fixed-position.scss */ -.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-x { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); - background-size: 100%; - background-image: -moz-linear-gradient(0deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-image: -webkit-linear-gradient(0deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-image: linear-gradient(90deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-repeat: repeat-x; } -/* line 144, ../../../../general/res/sass/_fixed-position.scss */ -.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-y { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); - background-size: 100%; - background-image: -moz-linear-gradient(90deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-image: -webkit-linear-gradient(90deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-image: linear-gradient(0deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-repeat: repeat-y; } -/* line 152, ../../../../general/res/sass/_fixed-position.scss */ -.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected) { - border: 1px dotted rgba(0, 153, 204, 0.75); } - /* line 154, ../../../../general/res/sass/_fixed-position.scss */ - .edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover { - border: 1px dotted #0099cc; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/lists/_tabular.scss */ -.w1, .w2 { - position: relative; - height: 100%; } - -/* line 27, ../../../../general/res/sass/lists/_tabular.scss */ -.tabular, -table { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - border-spacing: 0; - border-collapse: collapse; - display: table; - font-size: 0.75rem; - position: relative; - width: 100%; } - /* line 36, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular thead, .tabular .thead, - .tabular tbody tr, .tabular .tbody .tr, - table thead, - table .thead, - table tbody tr, - table .tbody .tr { - width: 100%; } - /* line 40, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular thead, .tabular .thead, - table thead, - table .thead { - border-bottom: 1px solid #fcfcfc; } - /* line 44, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular:not(.fixed-header) tr th, - table:not(.fixed-header) tr th { - background-color: #e3e3e3; } - /* line 48, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tbody, .tabular .tbody, - table tbody, - table .tbody { - display: table-row-group; } - /* line 51, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tbody tr:hover, .tabular tbody .tr:hover, .tabular .tbody tr:hover, .tabular .tbody .tr:hover, - table tbody tr:hover, - table tbody .tr:hover, - table .tbody tr:hover, - table .tbody .tr:hover { - background: rgba(51, 51, 51, 0.1); } - /* line 56, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr, .tabular .tr, - table tr, - table .tr { - display: table-row; } - /* line 58, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr:first-child .td, .tabular .tr:first-child .td, - table tr:first-child .td, - table .tr:first-child .td { - border-top: none; } - /* line 62, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr.group-header td, .tabular tr.group-header .td, .tabular .tr.group-header td, .tabular .tr.group-header .td, - table tr.group-header td, - table tr.group-header .td, - table .tr.group-header td, - table .tr.group-header .td { - background-color: #efefef; - color: #404040; } - /* line 68, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr th, .tabular tr .th, .tabular tr td, .tabular tr .td, .tabular .tr th, .tabular .tr .th, .tabular .tr td, .tabular .tr .td, - table tr th, - table tr .th, - table tr td, - table tr .td, - table .tr th, - table .tr .th, - table .tr td, - table .tr .td { - display: table-cell; } - /* line 71, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr th, .tabular tr .th, .tabular .tr th, .tabular .tr .th, - table tr th, - table tr .th, - table .tr th, - table .tr .th { - border-left: 1px solid #fcfcfc; - color: #333333; - padding: 5px 5px; - white-space: nowrap; - vertical-align: middle; } - /* line 77, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr th:first-child, .tabular tr .th:first-child, .tabular .tr th:first-child, .tabular .tr .th:first-child, - table tr th:first-child, - table tr .th:first-child, - table .tr th:first-child, - table .tr .th:first-child { - border-left: none; } - /* line 81, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr th.sort.sort:after, .tabular tr .th.sort.sort:after, .tabular .tr th.sort.sort:after, .tabular .tr .th.sort.sort:after, - table tr th.sort.sort:after, - table tr .th.sort.sort:after, - table .tr th.sort.sort:after, - table .tr .th.sort.sort:after { - color: #49dedb; - font-family: symbolsfont; - font-size: 8px; - content: "\ed"; - display: inline-block; - margin-left: 3px; } - /* line 89, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr th.sort.sort.desc:after, .tabular tr .th.sort.sort.desc:after, .tabular .tr th.sort.sort.desc:after, .tabular .tr .th.sort.sort.desc:after, - table tr th.sort.sort.desc:after, - table tr .th.sort.sort.desc:after, - table .tr th.sort.sort.desc:after, - table .tr .th.sort.sort.desc:after { - content: "\ec"; } - /* line 93, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr th.sortable, .tabular tr .th.sortable, .tabular .tr th.sortable, .tabular .tr .th.sortable, - table tr th.sortable, - table tr .th.sortable, - table .tr th.sortable, - table .tr .th.sortable { - cursor: pointer; } - /* line 97, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr td, .tabular tr .td, .tabular .tr td, .tabular .tr .td, - table tr td, - table tr .td, - table .tr td, - table .tr .td { - border-bottom: 1px solid #e3e3e3; - min-width: 20px; - color: #333333; - padding: 3px 5px; - word-wrap: break-word; - vertical-align: top; } - /* line 104, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr td.numeric, .tabular tr .td.numeric, .tabular .tr td.numeric, .tabular .tr .td.numeric, - table tr td.numeric, - table tr .td.numeric, - table .tr td.numeric, - table .tr .td.numeric { - text-align: right; } - /* line 107, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr td.s-cell-type-value, .tabular tr .td.s-cell-type-value, .tabular .tr td.s-cell-type-value, .tabular .tr .td.s-cell-type-value, - table tr td.s-cell-type-value, - table tr .td.s-cell-type-value, - table .tr td.s-cell-type-value, - table .tr .td.s-cell-type-value { - text-align: right; } - /* line 109, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular tr td.s-cell-type-value .l-cell-contents, .tabular tr .td.s-cell-type-value .l-cell-contents, .tabular .tr td.s-cell-type-value .l-cell-contents, .tabular .tr .td.s-cell-type-value .l-cell-contents, - table tr td.s-cell-type-value .l-cell-contents, - table tr .td.s-cell-type-value .l-cell-contents, - table .tr td.s-cell-type-value .l-cell-contents, - table .tr .td.s-cell-type-value .l-cell-contents { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - padding-left: 5px; - padding-right: 5px; } - /* line 125, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.filterable tbody, .tabular.filterable .tbody, - table.filterable tbody, - table.filterable .tbody { - top: 44px; } - /* line 128, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.filterable input[type="text"], - table.filterable input[type="text"] { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - width: 100%; } - /* line 134, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.fixed-header, - table.fixed-header { - height: 100%; } - /* line 136, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.fixed-header thead, .tabular.fixed-header .thead, - .tabular.fixed-header tbody tr, .tabular.fixed-header .tbody .tr, - table.fixed-header thead, - table.fixed-header .thead, - table.fixed-header tbody tr, - table.fixed-header .tbody .tr { - display: table; - table-layout: fixed; } - /* line 141, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.fixed-header thead, .tabular.fixed-header .thead, - table.fixed-header thead, - table.fixed-header .thead { - width: calc(100% - 10px); } - /* line 143, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.fixed-header thead:before, .tabular.fixed-header .thead:before, - table.fixed-header thead:before, - table.fixed-header .thead:before { - content: ""; - display: block; - z-index: 0; - position: absolute; - width: 100%; - height: 22px; - background-color: #e3e3e3; } - /* line 153, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.fixed-header tbody, .tabular.fixed-header .tbody, - table.fixed-header tbody, - table.fixed-header .tbody { - overflow: hidden; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; - top: 22px; - display: block; - overflow-y: scroll; } - /* line 161, ../../../../general/res/sass/lists/_tabular.scss */ - .tabular.t-event-messages td, .tabular.t-event-messages .td, - table.t-event-messages td, - table.t-event-messages .td { - min-width: 150px; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 31, ../../../../general/res/sass/plots/_plots-main.scss */ -.gl-plot { - color: #666; - font-size: 0.7rem; - position: relative; - width: 100%; - height: 100%; - /****************************** Limits and Out-of-Bounds data */ } - /* line 38, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-axis-area { - position: absolute; } - /* line 41, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-axis-area.gl-plot-x { - top: auto; - right: 0; - bottom: 5px; - left: 60px; - height: 32px; - width: auto; - overflow: hidden; } - /* line 50, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-axis-area.gl-plot-y { - top: 25px; - right: auto; - bottom: 37px; - left: 0; - width: 60px; } - /* line 59, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-coords { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - background: black; - color: #b3b3b3; - padding: 2px 5px; - position: absolute; - top: 35px; - right: auto; - bottom: auto; - left: 70px; - z-index: 10; } - /* line 71, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-coords:empty { - display: none; } - /* line 76, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-display-area { - background-color: rgba(0, 0, 0, 0.05); - position: absolute; - top: 25px; - right: 0; - bottom: 37px; - left: 60px; - cursor: crosshair; - border: 1px solid rgba(102, 102, 102, 0.2); } - /* line 89, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label, - .gl-plot .l-plot-label { - color: #999999; - position: absolute; - text-align: center; } - /* line 97, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label, - .gl-plot .l-plot-label.gl-plot-x-label, - .gl-plot .l-plot-label.l-plot-x-label { - top: auto; - right: 0; - bottom: 0; - left: 0; - height: auto; } - /* line 106, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label, - .gl-plot .l-plot-label.gl-plot-y-label, - .gl-plot .l-plot-label.l-plot-y-label { - -moz-transform-origin: 50% 0; - -ms-transform-origin: 50% 0; - -webkit-transform-origin: 50% 0; - transform-origin: 50% 0; - -moz-transform: translateX(-50%) rotate(-90deg); - -ms-transform: translateX(-50%) rotate(-90deg); - -webkit-transform: translateX(-50%) rotate(-90deg); - transform: translateX(-50%) rotate(-90deg); - display: inline-block; - margin-left: 5px; - left: 0; - top: 50%; - white-space: nowrap; } - /* line 120, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-y-options { - position: absolute; - top: 50%; - right: auto; - bottom: auto; - left: auto5px; - margin-top: -16px; - height: auto; - min-height: 32px; - width: 32px; } - /* line 134, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-hash { - position: absolute; - border: 0 rgba(0, 0, 0, 0.2) dashed; } - /* line 137, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-hash.hash-v { - border-right-width: 1px; - height: 100%; } - /* line 141, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-hash.hash-h { - border-bottom-width: 1px; - width: 100%; } - /* line 147, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-legend { - position: absolute; - top: 0; - right: 0; - bottom: auto; - left: 0; - height: 20px; - overflow-x: hidden; - overflow-y: auto; } - /* line 160, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar, - .gl-plot .l-oob-data { - position: absolute; - left: 0; - right: 0; - width: auto; } - /* line 168, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar { - height: auto; - z-index: 0; } - /* line 176, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar.s-limit-yellow { - background: rgba(255, 170, 0, 0.2); } - /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar.s-limit-red { - background: rgba(255, 0, 0, 0.2); } - /* line 180, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .l-oob-data { - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; - pointer-events: none; - height: 10px; - z-index: 1; } - /* line 188, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .l-oob-data.l-oob-data-up { - top: 0; - bottom: auto; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); - background-size: 100%; - background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } - /* line 193, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot .l-oob-data.l-oob-data-dwn { - bottom: 0; - top: auto; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); - background-size: 100%; - background-image: -moz-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } - -/* line 203, ../../../../general/res/sass/plots/_plots-main.scss */ -.gl-plot-legend .plot-legend-item, -.gl-plot-legend .legend-item, -.legend .plot-legend-item, -.legend .legend-item { - display: inline-block; - margin-right: 10px; - margin-bottom: 3px; } - /* line 208, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item span, - .gl-plot-legend .legend-item span, - .legend .plot-legend-item span, - .legend .legend-item span { - vertical-align: middle; } - /* line 211, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item .plot-color-swatch, - .gl-plot-legend .plot-legend-item .color-swatch, - .gl-plot-legend .legend-item .plot-color-swatch, - .gl-plot-legend .legend-item .color-swatch, - .legend .plot-legend-item .plot-color-swatch, - .legend .plot-legend-item .color-swatch, - .legend .legend-item .plot-color-swatch, - .legend .legend-item .color-swatch { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - display: inline-block; - height: 8px; - width: 8px; } - -/* line 228, ../../../../general/res/sass/plots/_plots-main.scss */ -.gl-plot-legend .plot-legend-item { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - line-height: 1.5em; - padding: 0px 5px; } - /* line 234, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item .plot-color-swatch { - border: 1px solid #fcfcfc; - height: 9px; - width: 9px; } - -/* line 242, ../../../../general/res/sass/plots/_plots-main.scss */ -.tick { - position: absolute; - border: 0 rgba(0, 0, 0, 0.2) solid; } - /* line 245, ../../../../general/res/sass/plots/_plots-main.scss */ - .tick.tick-x { - border-right-width: 1px; - height: 100%; } - -/* line 251, ../../../../general/res/sass/plots/_plots-main.scss */ -.gl-plot-tick, -.tick-label { - font-size: 0.7rem; - position: absolute; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; } - /* line 259, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, - .tick-label.gl-plot-x-tick-label, - .tick-label.tick-label-x { - right: auto; - bottom: auto; - left: auto; - height: auto; - width: 20%; - margin-left: -10%; - text-align: center; } - /* line 269, ../../../../general/res/sass/plots/_plots-main.scss */ - .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, - .tick-label.gl-plot-y-tick-label, - .tick-label.tick-label-y { - top: auto; - height: 1em; - width: auto; - margin-bottom: -0.5em; - text-align: right; } - -/* line 281, ../../../../general/res/sass/plots/_plots-main.scss */ -.gl-plot-tick.gl-plot-x-tick-label { - top: 5px; } -/* line 284, ../../../../general/res/sass/plots/_plots-main.scss */ -.gl-plot-tick.gl-plot-y-tick-label { - right: 5px; - left: 5px; } - -/* line 291, ../../../../general/res/sass/plots/_plots-main.scss */ -.tick-label.tick-label-x { - top: 0; } -/* line 294, ../../../../general/res/sass/plots/_plots-main.scss */ -.tick-label.tick-label-y { - right: 0; - left: 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. - *****************************************************************************/ -/* Styles for the iframe EmbeddedPageController element */ -/* line 25, ../../../../general/res/sass/_iframe.scss */ -.l-iframe iframe { - display: block; - height: 100%; - width: 100%; } - -/***************************************************************************** - * 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. - *****************************************************************************/ -/******************************** BROWSE */ -/* line 27, ../../../../general/res/sass/_hide-non-functional.scss */ -.browse-mode .browse.top-bar { - display: none; } -/* line 32, ../../../../general/res/sass/_hide-non-functional.scss */ -.browse-mode .browse-area.holder { - top: 10px; } - -/* Styles for sub-dividing views generically */ -/* line 3, ../../../../general/res/sass/_views.scss */ -.l-view-section { - overflow: hidden; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; - font-size: 0.8rem; } - /* line 6, ../../../../general/res/sass/_views.scss */ - .l-view-section h2 { - color: #fff; - margin-bottom: 5px; } - /* line 10, ../../../../general/res/sass/_views.scss */ - .l-view-section.fixed { - font-size: 0.8em; } - /* line 13, ../../../../general/res/sass/_views.scss */ - .l-view-section .controls, - .l-view-section label, - .l-view-section .inline-block { - display: inline-block; } - -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/items/_item.scss */ -.items-holder { - overflow: hidden; - *zoom: 1; - overflow-y: auto; } - /* line 25, ../../../../general/res/sass/items/_item.scss */ - .items-holder .contents { - top: 0; } - /* line 29, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item { - background-color: #ddd; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #666; - 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; - box-sizing: border-box; - cursor: pointer; - float: left; - height: 200px; - width: 200px; - margin-bottom: 3px; - margin-right: 3px; - position: relative; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item .icon { - color: #0099cc; } - @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 279, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover { - background: #d0d0d0; } - /* line 281, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item:not(.disabled):hover > .icon { - color: #33ccff; } } - /* line 45, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item:hover .item-main .item-type { - color: deepskyblue; } - /* line 47, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item:hover .item-main .item-type .l-icon-link { - color: #49dedb; } - /* line 51, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item:hover .item-main .item-open { - opacity: 1; } - /* line 55, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .contents { - top: 10px; - right: 10px; - bottom: 10px; - left: 10px; } - /* line 61, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - bottom: auto; - color: #8c8c8c; - height: 20px; - line-height: 20px; - text-align: right; - z-index: 5; } - /* line 68, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .bar.top-bar .left, .items-holder .item.grid-item .bar.top-bar .right { - width: auto; } - /* line 70, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .bar.top-bar .left .icon, .items-holder .item.grid-item .bar.top-bar .right .icon { - margin-left: 3px; } - /* line 72, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .bar.top-bar .left .icon.l-icon-link, .items-holder .item.grid-item .bar.top-bar .right .icon.l-icon-link { - color: #49dedb; } - /* line 78, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - top: auto; - line-height: 110%; } - /* line 83, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .item-main { - line-height: 160px; - z-index: 1; } - /* line 89, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - overflow: false; - position: absolute; - top: 40px; - right: 40px; - bottom: 40px; - left: 40px; - width: auto; - height: auto; - text-align: center; - font-size: 96.9px; - line-height: 102px; - bottom: auto; - height: 102px; - top: 30px; } - /* line 100, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .item-main .item-type .l-icon-link { - color: #49dedb; - height: auto; - line-height: 100%; - position: absolute; - font-size: 0.3em; - left: 0px; - bottom: 10px; - z-index: 2; } - /* line 111, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - -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: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 0; - color: #8c8c8c; - font-size: 3em; - left: auto; - width: 50px; - pointer-events: none; - text-align: right; } - /* line 121, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .title { - text-shadow: none; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - color: #666; } - /* line 126, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item .details { - text-shadow: none; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - color: #8c8c8c; - font-size: 0.8em; } - /* line 132, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item.selected { - background-color: #0099cc; - -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; - color: #80dfff; } - /* line 274, ../../../../general/res/sass/_mixins.scss */ - .items-holder .item.grid-item.selected .icon { - color: #eee; } - /* line 137, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { - color: #80dfff; } - /* line 138, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item.selected .item-main .item-open { - color: #80dfff; } - /* line 139, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item.selected .title { - color: white; } - /* line 141, ../../../../general/res/sass/items/_item.scss */ - .items-holder .item.grid-item.selected:hover .item-main .item-type { - color: white !important; } - -/***************************************************************************** - * 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. - *****************************************************************************/ -@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 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 { - font-size: 30px; - right: auto; - bottom: auto; - left: 0; - line-height: 100%; - text-align: left; - width: 30px; } - /* line 61, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type .l-icon-link { - bottom: 0; } - /* line 65, ../../../../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 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) { - /* line 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - height: 50px; } - /* line 78, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - line-height: 50px !important; } - /* line 82, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - top: 7px; - bottom: auto; - height: 35px; } - /* line 87, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - top: 10px; - bottom: auto; - height: 30px; } - /* line 90, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - line-height: 50px; } } -@media 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 29, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item { - height: 66px; } - /* line 100, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.top-bar { - line-height: 66px !important; } - /* line 104, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .bar.bottom-bar { - top: 15px; - bottom: auto; - height: 35px; } - /* line 109, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - top: 18px; - bottom: auto; - height: 30px; } - /* line 112, ../../../../general/res/sass/mobile/_item.scss */ - .items-holder .item.grid-item .item-main .item-open { - line-height: 66px; } } - -/********************************* TO BE MOVED */ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../../../../general/res/sass/_autoflow.scss */ -.autoflow { - font-size: 0.75rem; } - /* line 32, ../../../../general/res/sass/_autoflow.scss */ - .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu-btn { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -moz-transition-duration: 50ms; - -o-transition-duration: 50ms; - -webkit-transition-duration: 50ms; - transition-duration: 50ms; - -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 40, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-header { - bottom: auto; - height: 22px; - line-height: 22px; - min-width: 225px; } - /* line 45, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-header span { - vertical-align: middle; } - /* line 48, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu-btn { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -moz-transition-duration: 500ms; - -o-transition-duration: 500ms; - -webkit-transition-duration: 500ms; - transition-duration: 500ms; - -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 52, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-header .l-filter { - margin-left: 5px; } - /* line 54, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-header .l-filter input.t-filter-input { - width: 100px; } - /* line 60, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items { - overflow-x: scroll; - overflow-y: hidden; - top: 32px; - white-space: nowrap; } - /* line 66, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - border-left: 1px solid rgba(102, 102, 102, 0.2); - display: inline-block; - padding-left: 5px; - padding-right: 5px; - vertical-align: top; - width: 225px; } - /* line 76, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - border-bottom: 1px solid rgba(255, 255, 255, 0.05); - display: block; - height: 15px; - line-height: 15px; - margin-bottom: 1px; - margin-top: 1px; - position: relative; } - /* line 85, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:first-child { - border-top: none; } - /* line 88, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover { - background: rgba(255, 255, 255, 0.1); } - /* line 93, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.l { - color: rgba(51, 51, 51, 0.3) !important; - font-style: italic; } - /* line 94, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.r { - color: rgba(51, 51, 51, 0.5) !important; - font-style: italic; } - /* line 97, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.s-stale) .l-autoflow-item.r { - color: gray; } - /* line 101, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { - border-top: 1px solid rgba(153, 153, 153, 0.2); } - /* line 104, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { - display: block; } - /* line 106, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.l { - float: none; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - width: auto; } - /* line 113, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.r { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - float: right; - margin-left: 5px; - padding-left: 5px; - padding-right: 5px; - text-align: right; } - /* line 124, ../../../../general/res/sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col:first-child { - border-left: none; - padding-left: 0; } - -/* line 1, ../../../../general/res/sass/features/_imagery.scss */ -.l-image-main-wrapper, -.l-image-main, -.l-image-main-controlbar, -.l-image-thumbs-wrapper { - overflow: false; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; } - -/*************************************** MAIN LAYOUT */ -/* line 9, ../../../../general/res/sass/features/_imagery.scss */ -.l-image-main-wrapper { - min-height: 100px; - min-width: 150px; } - /* line 16, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-wrapper .l-image-main { - background-color: rgba(0, 0, 0, 0.05); - bottom: 30px; } - /* line 20, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-wrapper .l-image-main-controlbar { - top: auto; - height: 25px; } - -/* line 26, ../../../../general/res/sass/features/_imagery.scss */ -.l-image-thumbs-wrapper { - top: auto; - height: 168px; } - -/* line 32, ../../../../general/res/sass/features/_imagery.scss */ -.l-date, -.l-time, -.l-timezone { - display: inline-block; } - -/*************************************** MAIN IMAGE */ -/* line 40, ../../../../general/res/sass/features/_imagery.scss */ -.l-image-main, -.l-image-thumb-item .l-thumb { - background-size: contain; - background-position: center; - background-repeat: no-repeat; } - -/* line 51, ../../../../general/res/sass/features/_imagery.scss */ -.l-image-main-controlbar { - font-size: 0.8em; - line-height: 25px; } - /* line 55, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .left, .l-image-main-controlbar .right { - direction: rtl; - overflow: hidden; } - /* line 59, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .left { - text-align: left; } - /* line 63, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .right { - z-index: 2; } - /* line 67, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .l-date, - .l-image-main-controlbar .l-time { - color: #333333; } - /* line 71, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .l-mag { - direction: ltr; - display: inline-block; } - /* line 75, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .l-mag:before { - content: "\000049"; } - /* line 79, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .s-mag { - color: #999999; } - /* line 82, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-main-controlbar .l-btn.show-thumbs { - display: none; } - -/* line 87, ../../../../general/res/sass/features/_imagery.scss */ -.s-image-main { - border: 1px solid transparent; } - /* line 89, ../../../../general/res/sass/features/_imagery.scss */ - .s-image-main.paused { - border-color: #ff9900; } - -/*************************************** THUMBS */ -/* line 96, ../../../../general/res/sass/features/_imagery.scss */ -.l-image-thumbs-wrapper { - direction: rtl; - overflow-x: auto; - overflow-y: hidden; - padding-bottom: 5px; - white-space: nowrap; - z-index: 70; } - -/* line 106, ../../../../general/res/sass/features/_imagery.scss */ -.l-image-thumb-item { - -moz-transition: background-color 0.25s; - -o-transition: background-color 0.25s; - -webkit-transition: background-color 0.25s; - transition: background-color 0.25s; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - padding: 1px; - position: relative; - cursor: pointer; - direction: ltr; - display: inline-block; - font-size: 0.8em; - margin-left: 3px; - text-align: left; - width: 122px; - white-space: normal; } - /* line 111, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-thumb-item .l-thumb, - .l-image-thumb-item .l-date, - .l-image-thumb-item .l-time { - display: inline-block; } - /* line 116, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-thumb-item .l-date, - .l-image-thumb-item .l-time { - padding: 2px 3px; } - /* line 128, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-thumb-item:hover { - background: rgba(255, 255, 255, 0.2); } - /* line 130, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-thumb-item:hover .l-date, - .l-image-thumb-item:hover .l-time { - color: #fff; } - /* line 135, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-thumb-item.selected { - background: #0099cc; } - /* line 137, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-thumb-item.selected .l-date, - .l-image-thumb-item.selected .l-time { - color: #fff; } - /* line 142, ../../../../general/res/sass/features/_imagery.scss */ - .l-image-thumb-item .l-thumb { - background-color: rgba(255, 255, 255, 0.1); - height: 120px; - width: 120px; - margin-top: 0; } - -/*************************************** WHEN IN FRAME */ -/* line 152, ../../../../general/res/sass/features/_imagery.scss */ -.frame .t-imagery .l-image-main-wrapper { - bottom: 0; } - /* line 154, ../../../../general/res/sass/features/_imagery.scss */ - .frame .t-imagery .l-image-main-wrapper .l-image-main-controlbar { - font-size: 0.7em; } -/* line 163, ../../../../general/res/sass/features/_imagery.scss */ -.frame .t-imagery .l-image-thumbs-wrapper { - display: none; } - -/* line 5, ../../../../general/res/sass/features/_time-display.scss */ -.l-time-display:hover .l-btn.control { - opacity: 1; } -/* line 9, ../../../../general/res/sass/features/_time-display.scss */ -.l-time-display .l-elem-wrapper { - position: relative; } -/* line 12, ../../../../general/res/sass/features/_time-display.scss */ -.l-time-display .l-elem { - display: inline-block; } -/* line 17, ../../../../general/res/sass/features/_time-display.scss */ -.l-time-display.l-timer .l-elem.l-value { - -moz-transition-property: left; - -o-transition-property: left; - -webkit-transition-property: left; - transition-property: left; - -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: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - position: absolute; - left: 0; - z-index: 1; } - /* line 22, ../../../../general/res/sass/features/_time-display.scss */ - .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { - font-size: 0.8em; } -/* line 26, ../../../../general/res/sass/features/_time-display.scss */ -.l-time-display.l-timer:hover .l-elem.l-value { - left: 20px; } -/* line 33, ../../../../general/res/sass/features/_time-display.scss */ -.l-time-display .l-elem .value.active, .l-time-display .l-elem.value.active { - color: #fff; } -/* line 38, ../../../../general/res/sass/features/_time-display.scss */ -.l-time-display .l-btn.control { - -moz-transition-property: opacity, background-color, border-color, color; - -o-transition-property: opacity, background-color, border-color, color; - -webkit-transition-property: opacity, background-color, border-color, color; - transition-property: opacity, background-color, border-color, color; - -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: 0; - -o-transition-delay: 0; - -webkit-transition-delay: 0; - transition-delay: 0; - opacity: 0; - font-size: 0.65em; - vertical-align: top; } - -/* line 3, ../sass/_controls.scss */ -.s-btn.major .title-label, .major.s-menu-btn .title-label { - text-transform: uppercase; } +/* +Error: Undefined variable: "$colorInspectorSectionHeaderBg". + on line 45 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_inspector.scss + from line 33 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_main.scss + from line 36 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/themes/snow/res/sass/theme-snow.scss + +Backtrace: +/Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_inspector.scss:45 +/Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_main.scss:33 +/Users/iMac/dev/nasa/wtd-dev/platform/commonUI/themes/snow/res/sass/theme-snow.scss:36 +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/script/tree/variable.rb:49:in `_perform' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/script/tree/node.rb:50:in `perform' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:394:in `visit_prop' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block (2 levels) in visit_rule' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `map' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block in visit_rule' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:179:in `with_environment' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:428:in `visit_rule' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block (2 levels) in visit_rule' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `map' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block in visit_rule' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:179:in `with_environment' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:428:in `visit_rule' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block (2 levels) in visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `map' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block in visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `block in with_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `with_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:322:in `visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block (2 levels) in visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `map' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block in visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `block in with_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `with_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:322:in `visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:52:in `block in visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:52:in `map' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:52:in `visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:167:in `block in visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:179:in `with_environment' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:166:in `visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:186:in `visit_root' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:157:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:8:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/root_node.rb:36:in `css_tree' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/root_node.rb:20:in `render' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/engine.rb:268:in `render' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:492:in `update_stylesheet' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:209:in `each' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:209:in `update_stylesheets' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/sass_compiler.rb:40:in `compile!' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/commands/update_project.rb:49:in `perform' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/commands/base.rb:18:in `execute' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/commands/project_base.rb:19:in `execute' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/exec/sub_command_ui.rb:43:in `perform!' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/exec/sub_command_ui.rb:15:in `run!' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/bin/compass:30:in `block in ' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/bin/compass:44:in `call' +/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/bin/compass:44:in `' +/usr/bin/compass:23:in `load' +/usr/bin/compass:23:in `
    ' +*/ +body:before { + white-space: pre; + font-family: monospace; + content: "Error: Undefined variable: \"$colorInspectorSectionHeaderBg\".\A on line 45 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_inspector.scss\A from line 33 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_main.scss\A from line 36 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/themes/snow/res/sass/theme-snow.scss"; } From efd209826dc541417fa687359a9276f165fa503a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 15:14:07 -0700 Subject: [PATCH 085/201] [Frontend] Inspector styling, in progress open #90 Significant styling in object-inspector.html; --- .../commonUI/browse/res/templates/browse.html | 3 +- .../commonUI/general/res/sass/_constants.scss | 2 +- .../commonUI/general/res/sass/_inspector.scss | 39 +- .../general/res/sass/controls/_controls.scss | 2 +- .../commonUI/general/res/sass/tree/_tree.scss | 4 +- .../res/sass/user-environ/_layout.scss | 11 +- .../commonUI/general/res/templates/label.html | 22 +- .../res/templates/object-inspector.html | 15 +- .../espresso/res/css/theme-espresso.css | 188 +- .../themes/espresso/res/sass/_constants.scss | 4 +- .../themes/snow/res/css/theme-snow.css | 6596 ++++++++++++++++- .../themes/snow/res/sass/_constants.scss | 9 + 12 files changed, 6689 insertions(+), 206 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 0ea964780c..79644b5bb5 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -73,8 +73,7 @@
    + ng-model="treeModel">
    diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 6365119894..4f196b8f74 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -43,7 +43,7 @@ $ueColMargin: 1.5%; $ueAppLogoW: 105px; $ueEditToolBarH: 25px; $ueBrowseLeftPaneTreeW: 25%; -$ueBrowseRightPaneInspectW: 10%; +$ueBrowseRightPaneInspectW: 20%; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; $ueTimeControlH: (33px, 20px, 20px); diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index 69e00dbab6..fcb8ebc959 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -23,12 +23,18 @@ //.pane.right.t-inspect { @include test(green, 0.3); } // TEMP! -.t-inspector, -.t-inspector table tr td { +.l-inspect, +.l-inspect table tr td { font-size: 0.7rem; } -.t-inspector { +.l-inspect { + color: $colorInspectorFg; + .pane-header { + color: pushBack($colorInspectorFg, 20%); + font-size: 0.8rem; + } + ul li, em { display: block; @@ -36,7 +42,6 @@ } ul li { - line-height: 130%; margin-bottom: $interiorMarginLg * 2; } @@ -61,7 +66,6 @@ white-space: nowrap; } &.value { - //word-wrap: break-word; // Doesn't work in ? word-break: break-all; } } @@ -70,4 +74,29 @@ border-top: none !important; } } + + .inspector-location { + line-height: 180%; + .location-item { + cursor: pointer; + display: inline; + position: relative; + padding: 2px 4px; + &:hover { + background: $colorItemTreeHoverBg; + color: $colorItemTreeHoverFg; + .icon { + color: $colorItemTreeIconHover; + } + } + } + &:not(.first):before { + color: pushBack($colorInspectorFg, 15%); + content: '\3e'; + display: inline-block; + font-family: symbolsfont; + font-size:7px; + width: 4px; + } + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index bc61fbc35e..429dc361fe 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -249,7 +249,7 @@ label.checkbox.custom { .l-elem-wrapper { //@include test(#66f, 0.2); - @include webkitProp(justify-content, flex-start); + @include justify-content(flex-start); mct-representation { // Holds the context-available item // Must have min-width to make flex work properly diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index d64f456b2e..b4ec062bbe 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -125,8 +125,8 @@ ul.tree { // NOTE: [Mobile] Removed Hover on Mobile @include desktop { &:hover { - background: rgba($colorBodyFg, 0.1); //lighten($colorBodyBg, 5%); - color: pullForward($colorBodyFg, 20%); + background: $colorItemTreeHoverBg; + color: $colorItemTreeHoverFg; .icon { color: $colorItemTreeIconHover; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 49944adc44..6a3d9ac2f5 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -212,7 +212,7 @@ width: $ueBrowseLeftPaneTreeW; } &.t-inspect.right { - min-width: 150px; + min-width: 100px; max-width: 800px; width: $ueBrowseRightPaneInspectW; } @@ -234,6 +234,14 @@ .pane { position: absolute; + + .pane-header { + text-transform: uppercase; + height: $ueTopBarH; + line-height: $ueTopBarH; + margin-bottom: $interiorMargin; + } + &.treeview.left { .create-btn-holder { bottom: auto; @@ -381,7 +389,6 @@ } } -// MOVED from mobile/_layout.scss // When the tree is hidden, these are the // classes used for the left menu and the // right representation. diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index 7ca73bb026..235678ad2d 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -20,15 +20,15 @@ at runtime from the About dialog for additional information. --> - - {{type.getGlyph()}} - - - - - {{model.name}} - + +{{type.getGlyph()}} + + + + +{{model.name}} + diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html index f5f8e6921b..b635b4ccca 100644 --- a/platform/commonUI/general/res/templates/object-inspector.html +++ b/platform/commonUI/general/res/templates/object-inspector.html @@ -19,7 +19,8 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - + +
    Inspection
    • Properties @@ -33,22 +34,26 @@
    • Location + ng-repeat="parent in contextutalParents" + ng-class="{ first:$index === 0 }"> + ng-click="ngModel.selectedObject = parent" + class="location-item">
    • Original Location + ng-repeat="parent in primaryParents" + ng-class="{ first:$index === 0 }"> + ng-click="ngModel.selectedObject = parent" + class="location-item">
      • diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 3c1622bda3..08c6beb3d7 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -1259,46 +1259,76 @@ mct-container { *****************************************************************************/ /* Styles for the Inspector pane */ /* line 26, ../../../../general/res/sass/_inspector.scss */ -.t-inspector, -.t-inspector table tr td { +.l-inspect, +.l-inspect table tr td { font-size: 0.7rem; } -/* line 32, ../../../../general/res/sass/_inspector.scss */ -.t-inspector ul li, -.t-inspector em { - display: block; - position: relative; } -/* line 38, ../../../../general/res/sass/_inspector.scss */ -.t-inspector ul li { - line-height: 130%; - margin-bottom: 20px; } -/* line 43, ../../../../general/res/sass/_inspector.scss */ -.t-inspector em { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - background-color: #404040; - color: #999999; - margin-bottom: 5px; - padding: 5px 5px; - text-transform: uppercase; } -/* line 53, ../../../../general/res/sass/_inspector.scss */ -.t-inspector table tr td { - border: none; - border-top: 1px solid rgba(153, 153, 153, 0.1) !important; - padding: 2px 0; - vertical-align: top; } +/* line 31, ../../../../general/res/sass/_inspector.scss */ +.l-inspect { + color: #999; } + /* line 33, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .pane-header { + color: #666666; + font-size: 0.8rem; } + /* line 38, ../../../../general/res/sass/_inspector.scss */ + .l-inspect ul li, + .l-inspect em { + display: block; + position: relative; } + /* line 44, ../../../../general/res/sass/_inspector.scss */ + .l-inspect ul li { + margin-bottom: 20px; } + /* line 48, ../../../../general/res/sass/_inspector.scss */ + .l-inspect em { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + background-color: #404040; + color: #999999; + margin-bottom: 5px; + padding: 5px 5px; + text-transform: uppercase; } /* line 58, ../../../../general/res/sass/_inspector.scss */ - .t-inspector table tr td.label { - color: #666666 !important; - padding-right: 5px !important; - white-space: nowrap; } - /* line 63, ../../../../general/res/sass/_inspector.scss */ - .t-inspector table tr td.value { - word-break: break-all; } -/* line 69, ../../../../general/res/sass/_inspector.scss */ -.t-inspector table tr:first-child td { - border-top: none !important; } + .l-inspect table tr td { + border: none; + border-top: 1px solid rgba(153, 153, 153, 0.1) !important; + padding: 2px 0; + vertical-align: top; } + /* line 63, ../../../../general/res/sass/_inspector.scss */ + .l-inspect table tr td.label { + color: #666666 !important; + padding-right: 5px !important; + white-space: nowrap; } + /* line 68, ../../../../general/res/sass/_inspector.scss */ + .l-inspect table tr td.value { + word-break: break-all; } + /* line 73, ../../../../general/res/sass/_inspector.scss */ + .l-inspect table tr:first-child td { + border-top: none !important; } + /* line 78, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location { + line-height: 180%; } + /* line 80, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location .location-item { + cursor: pointer; + display: inline; + position: relative; + padding: 2px 4px; } + /* line 85, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location .location-item:hover { + background: rgba(153, 153, 153, 0.1); + color: #cccccc; } + /* line 88, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location .location-item:hover .icon { + color: #33ccff; } + /* line 93, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location:not(.first):before { + color: #737373; + content: '\3e'; + display: inline-block; + font-family: symbolsfont; + font-size: 7px; + width: 4px; } /********************************* CONTROLS */ /* line 1, ../../../../general/res/sass/controls/_breadcrumb.scss */ @@ -2016,8 +2046,8 @@ label.checkbox.custom { margin-right: 5px; } /* line 250, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper { - justify-content: flex-start; - -webkit-justify-content: flex-start; } + -webkit-justify-content: flex-start; + justify-content: flex-start; } /* line 253, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper mct-representation { min-width: 0.7em; } @@ -3689,9 +3719,9 @@ span.req { width: 25%; } /* line 214, ../../../../general/res/sass/user-environ/_layout.scss */ .browse-mode .split-layout .split-pane-component.pane.t-inspect.right { - min-width: 150px; + min-width: 100px; max-width: 800px; - width: 10%; } + width: 20%; } /* line 225, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right { @@ -3705,47 +3735,53 @@ span.req { .pane { position: absolute; } /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .pane-header { + text-transform: uppercase; + height: 24px; + line-height: 24px; + margin-bottom: 5px; } + /* line 246, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 242, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 247, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 258, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { z-index: 2; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 256, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { top: 5px; } - /* line 262, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { left: -30px; } - /* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 276, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { left: -25px; } - /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { content: '\e608'; } - /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 286, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { right: -20px; } } - /* line 287, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3758,31 +3794,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 298, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 301, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 315, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 323, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 317, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3792,11 +3828,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 332, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 340, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 346, ../../../../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, @@ -3808,12 +3844,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 351, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 356, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3829,36 +3865,36 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 390, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 397, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.left.treeview, .pane-tree-hidden .splitter-treeview { opacity: 0; } -/* line 395, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.right.items { left: 15px !important; } -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 409, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .pane.left.treeview, .pane-tree-showing .splitter-treeview { -moz-transition-property: opacity, background-color, border-color, color; @@ -3879,7 +3915,7 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 411, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 418, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-showing .l-object-and-inspector .pane.right, .pane-inspect-showing .l-object-and-inspector .splitter-inspect { -moz-transition-property: opacity, background-color, border-color, color; @@ -3900,16 +3936,16 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 420, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 427, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.right, .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } -/* line 424, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 431, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.left { right: 15px !important; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 431, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 438, ../../../../general/res/sass/user-environ/_layout.scss */ .pane:not(.resizing) { -moz-transition-property: width, left, right; -o-transition-property: width, left, right; diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 8aa2bcbdf0..df85c6ecdb 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -73,7 +73,7 @@ $colorInputFg: pullForward($colorBodyFg, 20%); $colorFormText: rgba(#fff, 0.5); $colorInputIcon: pushBack($colorBodyFg, 15%); -// Inspector - TO-DO: Add to snow theme +// Inspector $colorInspectorFg: $colorBodyFg; $colorInspectorPropName: pushBack($colorBodyFg, 20%); $colorInspectorPropVal: $colorInspectorFg; @@ -134,6 +134,8 @@ $colorPlotAreaBorder: $colorInteriorBorder; $colorPlotLabelFg: pushBack($colorPlotFg, 20%); // Tree +$colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); +$colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%); $colorItemTreeFg: $colorBodyFg; diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 869495b986..126ad40fa9 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -1,101 +1,6497 @@ -/* -Error: Undefined variable: "$colorInspectorSectionHeaderBg". - on line 45 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_inspector.scss - from line 33 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_main.scss - from line 36 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/themes/snow/res/sass/theme-snow.scss +@charset "UTF-8"; +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 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, +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: inherit; + font-size: 100%; + vertical-align: baseline; } -Backtrace: -/Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_inspector.scss:45 -/Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_main.scss:33 -/Users/iMac/dev/nasa/wtd-dev/platform/commonUI/themes/snow/res/sass/theme-snow.scss:36 -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/script/tree/variable.rb:49:in `_perform' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/script/tree/node.rb:50:in `perform' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:394:in `visit_prop' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block (2 levels) in visit_rule' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `map' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block in visit_rule' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:179:in `with_environment' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:428:in `visit_rule' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block (2 levels) in visit_rule' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `map' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:430:in `block in visit_rule' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:179:in `with_environment' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:428:in `visit_rule' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block (2 levels) in visit_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `map' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block in visit_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `block in with_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `with_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:322:in `visit_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block (2 levels) in visit_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `map' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:325:in `block in visit_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `block in with_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:88:in `with_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:322:in `visit_import' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `block in visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `block in with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:115:in `with_frame' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/stack.rb:79:in `with_base' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:158:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:52:in `block in visit_children' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:52:in `map' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:52:in `visit_children' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:167:in `block in visit_children' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:179:in `with_environment' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:166:in `visit_children' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `block in visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:186:in `visit_root' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/base.rb:36:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:157:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/visitors/perform.rb:8:in `visit' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/root_node.rb:36:in `css_tree' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/tree/root_node.rb:20:in `render' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/engine.rb:268:in `render' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:492:in `update_stylesheet' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:209:in `each' -/Library/Ruby/Gems/2.0.0/gems/sass-3.4.13/lib/sass/plugin/compiler.rb:209:in `update_stylesheets' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/sass_compiler.rb:40:in `compile!' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/commands/update_project.rb:49:in `perform' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/commands/base.rb:18:in `execute' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/commands/project_base.rb:19:in `execute' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/exec/sub_command_ui.rb:43:in `perform!' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/lib/compass/exec/sub_command_ui.rb:15:in `run!' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/bin/compass:30:in `block in ' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/bin/compass:44:in `call' -/Library/Ruby/Gems/2.0.0/gems/compass-1.0.3/bin/compass:44:in `' -/usr/bin/compass:23:in `load' -/usr/bin/compass:23:in `
      ' -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Error: Undefined variable: \"$colorInspectorSectionHeaderBg\".\A on line 45 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_inspector.scss\A from line 33 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/general/res/sass/_main.scss\A from line 36 of /Users/iMac/dev/nasa/wtd-dev/platform/commonUI/themes/snow/res/sass/theme-snow.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 */ +ol, ul { + list-style: none; } + +/* 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 */ +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 */ +q, blockquote { + quotes: none; } + /* 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 */ +a img { + border: none; } + +/* 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; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +/*********************************************** CONTROLS, FORM ELEMENTS */ +/***************************************************************************** + * 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 */ +/***************************************************************************** + * 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. + *****************************************************************************/ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/_effects.scss */ +.disabled, +a.disabled { + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=30); + opacity: 0.3; + pointer-events: none !important; + cursor: default !important; } + +/* line 29, ../../../../general/res/sass/_effects.scss */ +.incised { + -moz-box-shadow: inset rgba(0, 0, 0, 0.8) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.8) 0 1px 5px; + box-shadow: inset rgba(0, 0, 0, 0.8) 0 1px 5px; + border-bottom: 1px solid rgba(255, 255, 255, 0.3); } + +/* line 34, ../../../../general/res/sass/_effects.scss */ +.outline { + border: 1px solid white; } + +/* line 38, ../../../../general/res/sass/_effects.scss */ +.test-stripes { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmMDAiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiNmZmZmMDAiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiNmZmZmMDAiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(135deg, rgba(255, 255, 0, 0.1) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 0, 0.1) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat; + background-size: 40px 40px; } + +/* line 42, ../../../../general/res/sass/_effects.scss */ +.test { + background-color: rgba(255, 204, 0, 0.2) !important; } + +@-moz-keyframes pulse { + 0% { + opacity: 0.5; } + 100% { + opacity: 1; } } +@-webkit-keyframes pulse { + 0% { + opacity: 0.5; } + 100% { + opacity: 1; } } +@keyframes pulse { + 0% { + opacity: 0.5; } + 100% { + opacity: 1; } } +/* line 69, ../../../../general/res/sass/_effects.scss */ +.pulse { + -moz-animation-name: pulse; + -webkit-animation-name: pulse; + animation-name: pulse; + -moz-animation-duration: 750ms; + -webkit-animation-duration: 750ms; + animation-duration: 750ms; + -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; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +/************************** FONTS */ +@font-face { + /* + * Use https://icomoon.io/app with /platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json + */ + font-family: 'symbolsfont'; + src: url("../../../../general/res/fonts/symbols/wtdsymbols.eot"); + src: url("../../../../general/res/fonts/symbols/wtdsymbols.eot?#iefix") format("embedded-opentype"), url("../../../../general/res/fonts/symbols/wtdsymbols.woff") format("woff"), url("../../../../general/res/fonts/symbols/wtdsymbols.ttf") format("truetype"), url("../../../../general/res/fonts/symbols/wtdsymbols.svg#armataregular") format("svg"); + font-weight: normal; + font-style: normal; } +/************************** HTML ENTITIES */ +/* line 38, ../../../../general/res/sass/_global.scss */ +a { + color: #999; + cursor: pointer; + text-decoration: none; } + /* line 42, ../../../../general/res/sass/_global.scss */ + a:hover { + color: #0099cc; } + +/* 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; + font-size: 100%; + height: 100%; + width: 100%; + overflow: hidden; } + +/* line 60, ../../../../general/res/sass/_global.scss */ +em { + font-style: normal; } + +/* line 64, ../../../../general/res/sass/_global.scss */ +input, textarea { + font-family: Helvetica, Arial, sans-serif; } + +/* line 68, ../../../../general/res/sass/_global.scss */ +input[type="text"] { + vertical-align: baseline; + padding: 3px 5px !important; } + +/* line 73, ../../../../general/res/sass/_global.scss */ +h1, h2, h3 { + margin: 0; } + +/* line 77, ../../../../general/res/sass/_global.scss */ +h1 { + font-size: 1.7em; + font-weight: normal !important; + line-height: 120%; + margin-bottom: 20px; + margin-top: 0; } + +/* line 85, ../../../../general/res/sass/_global.scss */ +p { + margin-bottom: 10px; } + +/* line 89, ../../../../general/res/sass/_global.scss */ +mct-container { + display: block; } + +/* line 93, ../../../../general/res/sass/_global.scss */ +.abs, .l-datetime-picker .l-month-year-pager .pager, +.l-datetime-picker .l-month-year-pager .val, .s-menu-btn span.l-click-area { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + height: auto; + width: auto; } + +/* line 103, ../../../../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 */ +.codehilite { + background-color: rgba(102, 102, 102, 0.1); + padding: 1em; } + +/* line 116, ../../../../general/res/sass/_global.scss */ +.align-right { + text-align: right; } + +/* line 120, ../../../../general/res/sass/_global.scss */ +.centered { + text-align: center; } + +/* line 124, ../../../../general/res/sass/_global.scss */ +.scrolling { + overflow: auto; } + +/* line 128, ../../../../general/res/sass/_global.scss */ +.vscroll { + overflow-y: auto; } + +/* line 132, ../../../../general/res/sass/_global.scss */ +.no-margin { + margin: 0; } + +/* line 136, ../../../../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 140, ../../../../general/res/sass/_global.scss */ +.hide, +.hidden { + display: none !important; } + +/* line 145, ../../../../general/res/sass/_global.scss */ +.sep { + color: rgba(255, 255, 255, 0.2); } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 26, ../../../../general/res/sass/_about.scss */ +.l-about.abs, .l-datetime-picker .l-month-year-pager .l-about.pager, +.l-datetime-picker .l-month-year-pager .l-about.val, .s-menu-btn span.l-about.l-click-area { + overflow: auto; } +/* line 31, ../../../../general/res/sass/_about.scss */ +.l-about .l-logo-holder { + position: relative; + height: 45%; } + /* line 34, ../../../../general/res/sass/_about.scss */ + .l-about .l-logo-holder .l-logo { + position: absolute; } + /* line 37, ../../../../general/res/sass/_about.scss */ + .l-about .l-logo-holder .l-logo.l-logo-app { + top: 0; + right: 15%; + bottom: 0; + left: 15%; } + /* line 41, ../../../../general/res/sass/_about.scss */ + .l-about .l-logo-holder .l-logo.s-logo-nasa { + background-image: url("../../../../general/res/images/logo-nasa.svg"); + top: 10px; + right: auto; + bottom: auto; + left: 10px; + width: 10%; + height: auto; + padding-bottom: 5%; + padding-top: 5%; } +/* line 50, ../../../../general/res/sass/_about.scss */ +.l-about .l-content { + position: relative; + margin-top: 10px; } + +/* line 57, ../../../../general/res/sass/_about.scss */ +.s-about { + line-height: 120%; } + /* line 61, ../../../../general/res/sass/_about.scss */ + .s-about a { + color: #84b3ff; } + /* line 68, ../../../../general/res/sass/_about.scss */ + .s-about .s-logo-holder { + background: url("../../../../general/res/images/bg-about-openmctweb.jpg") no-repeat center; + background-size: cover; } + /* line 72, ../../../../general/res/sass/_about.scss */ + .s-about .s-logo { + background-position: center; + background-repeat: no-repeat; + background-size: contain; } + /* line 78, ../../../../general/res/sass/_about.scss */ + .s-about .s-logo-openmctweb { + background-image: url("../../../../general/res/images/logo-openmctweb-shdw.svg"); } + /* line 81, ../../../../general/res/sass/_about.scss */ + .s-about .s-btn, .s-about .s-menu-btn { + line-height: 2em; } + /* line 85, ../../../../general/res/sass/_about.scss */ + .s-about .l-licenses-software .l-license-software { + border-top: 1px solid rgba(102, 102, 102, 0.2); + padding: 0.5em 0; } + /* line 88, ../../../../general/res/sass/_about.scss */ + .s-about .l-licenses-software .l-license-software:first-child { + border-top: none; } + /* line 91, ../../../../general/res/sass/_about.scss */ + .s-about .l-licenses-software .l-license-software em { + color: #999999; } + /* line 98, ../../../../general/res/sass/_about.scss */ + .s-about .l-licenses-software .l-license-software h3 { + font-size: 1.25em; } + /* line 101, ../../../../general/res/sass/_about.scss */ + .s-about .l-licenses-software .l-license-software .s-license-text { + font-size: 0.9em; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 24, ../../../../general/res/sass/_text.scss */ +.abs.l-standalone, .l-datetime-picker .l-month-year-pager .l-standalone.pager, +.l-datetime-picker .l-month-year-pager .l-standalone.val, .s-menu-btn span.l-standalone.l-click-area { + padding: 5% 20%; } + +/* line 29, ../../../../general/res/sass/_text.scss */ +.s-text { + font-size: 0.8em; } + /* line 31, ../../../../general/res/sass/_text.scss */ + .s-text ol, .s-text ul { + list-style: square; + margin-left: 1.5em; } + /* line 39, ../../../../general/res/sass/_text.scss */ + .s-text h1, .s-text h2, .s-text h3 { + color: #333333; + font-weight: normal !important; + margin-bottom: 1em; } + /* line 45, ../../../../general/res/sass/_text.scss */ + .s-text h2 { + border-top: 1px solid rgba(102, 102, 102, 0.2); + font-size: 1.5em; + margin-top: 2em; + padding-top: 1em; } + /* line 52, ../../../../general/res/sass/_text.scss */ + .s-text h3 { + margin-top: 2em; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/_icons.scss */ +.triangle { + width: 0; + height: 0; + border-top: 5px solid transparent; + border-left: 5px solid #0099cc; + border-bottom: 5px solid transparent; } + /* line 26, ../../../../general/res/sass/_icons.scss */ + .triangle.triangle-down { + width: 0; + height: 0; + border-left: 5px solid transparent; + border-top: 5px solid #0099cc; + border-right: 5px solid transparent; } + +/* line 31, ../../../../general/res/sass/_icons.scss */ +.ui-symbol, .s-icon-btn, .mini-tab, .l-datetime-picker .l-month-year-pager .pager { + font-family: 'symbolsfont'; } + /* line 33, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.type-icon, .type-icon.s-icon-btn, .type-icon.mini-tab, .l-datetime-picker .l-month-year-pager .type-icon.pager { + color: #b3b3b3; } + /* line 36, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon, .icon.s-icon-btn, .icon.mini-tab, .l-datetime-picker .l-month-year-pager .icon.pager { + color: #0099cc; } + /* line 38, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.alert, .icon.alert.s-icon-btn, .icon.alert.mini-tab, .l-datetime-picker .l-month-year-pager .icon.alert.pager { + color: #ff3c00; } + /* line 40, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.alert:hover, .icon.alert.s-icon-btn:hover, .icon.alert.mini-tab:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { + color: #ff8a66; } + /* line 44, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon.major, .icon.major.s-icon-btn, .icon.major.mini-tab, .l-datetime-picker .l-month-year-pager .icon.major.pager { + font-size: 1.65em; } + /* line 48, ../../../../general/res/sass/_icons.scss */ + .ui-symbol.icon-calendar:after, .icon-calendar.s-icon-btn:after, .icon-calendar.mini-tab:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { + content: "\e605"; } + +/* line 53, ../../../../general/res/sass/_icons.scss */ +.bar .ui-symbol, .bar .s-icon-btn, .bar .mini-tab, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { + display: inline-block; } + +/* line 57, ../../../../general/res/sass/_icons.scss */ +.invoke-menu { + text-shadow: none; + display: inline-block; } + +/* line 62, ../../../../general/res/sass/_icons.scss */ +.s-menu-btn .invoke-menu, +.icon.major .invoke-menu { + margin-left: 3px; } + +/* line 67, ../../../../general/res/sass/_icons.scss */ +.menu .type-icon, +.tree-item .type-icon, +.super-menu.menu .type-icon { + position: absolute; } + +/* line 77, ../../../../general/res/sass/_icons.scss */ +.l-icon-link:before { + content: "\f4"; } + +/* line 81, ../../../../general/res/sass/_icons.scss */ +.l-icon-alert { + display: none !important; } + /* line 83, ../../../../general/res/sass/_icons.scss */ + .l-icon-alert:before { + color: #ff3c00; + content: "!"; } + +/* line 13, ../../../../general/res/sass/_limits.scss */ +[class*="s-limit"]:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.75em; + font-style: normal !important; + margin-right: 3px; + vertical-align: middle; } + +/* line 23, ../../../../general/res/sass/_limits.scss */ +.s-limit-upr-red { + background: rgba(255, 0, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ + .s-limit-upr-red:before { + color: red; + content: "ë"; } + +/* line 24, ../../../../general/res/sass/_limits.scss */ +.s-limit-upr-yellow { + background: rgba(255, 170, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ + .s-limit-upr-yellow:before { + color: #ffaa00; + content: "í"; } + +/* line 25, ../../../../general/res/sass/_limits.scss */ +.s-limit-lwr-yellow { + background: rgba(255, 170, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ + .s-limit-lwr-yellow:before { + color: #ffaa00; + content: "ì"; } + +/* line 26, ../../../../general/res/sass/_limits.scss */ +.s-limit-lwr-red { + background: rgba(255, 0, 0, 0.3) !important; } + /* line 4, ../../../../general/res/sass/_limits.scss */ + .s-limit-lwr-red:before { + color: red; + content: "î"; } + +/* line 1, ../../../../general/res/sass/_data-status.scss */ +.s-stale { + color: rgba(51, 51, 51, 0.5) !important; + font-style: italic; } + /* line 3, ../../../../general/res/sass/_data-status.scss */ + .s-stale .td { + color: rgba(51, 51, 51, 0.5) !important; + font-style: italic; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 24, ../../../../general/res/sass/helpers/_bubbles.scss */ +.bubble-container { + pointer-events: none; } + +/* line 31, ../../../../general/res/sass/helpers/_bubbles.scss */ +.l-infobubble-wrapper { + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + position: relative; + z-index: 50; } + /* line 36, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble { + display: inline-block; + min-width: 100px; + max-width: 300px; + padding: 5px 10px; } + /* line 41, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble:before { + content: ""; + position: absolute; + width: 0; + height: 0; } + /* line 47, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble table { + width: 100%; } + /* line 50, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble table tr td { + padding: 2px 0; + vertical-align: top; } + /* line 53, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble table tr td.label { + padding-right: 10px; + white-space: nowrap; } + /* line 57, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble table tr td.value { + word-break: break-all; } + /* line 61, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble table tr td.align-wrap { + white-space: normal; } + /* line 67, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .l-infobubble .title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-bottom: 5px; } + /* line 74, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-left { + margin-left: 20px; } + /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-left .l-infobubble::before { + right: 100%; } + @media 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), screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-left .l-infobubble::before { + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-right: 10px solid white; } } + @media 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), screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 88, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-right { + margin-right: 20px; } } + /* line 95, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-right .l-infobubble::before { + left: 100%; } + @media 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), screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 95, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-right .l-infobubble::before { + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-left: 10px solid white; } } + /* line 108, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-top .l-infobubble::before { + top: 20px; } + /* line 114, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-btm .l-infobubble::before { + bottom: 20px; } + /* line 119, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-down { + margin-bottom: 10px; } + /* line 121, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-down .l-infobubble::before { + left: 50%; + top: 100%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 7.5px solid white; } + /* line 130, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .arw { + z-index: 2; } + /* line 133, ../../../../general/res/sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-up .arw.arw-down, .l-infobubble-wrapper.arw-down .arw.arw-up { + display: none; } + +/* line 142, ../../../../general/res/sass/helpers/_bubbles.scss */ +.l-thumbsbubble-wrapper .arw-up { + width: 0; + height: 0; + border-left: 6.66667px solid transparent; + border-right: 6.66667px solid transparent; + border-bottom: 10px solid #e3e3e3; } +/* line 145, ../../../../general/res/sass/helpers/_bubbles.scss */ +.l-thumbsbubble-wrapper .arw-down { + width: 0; + height: 0; + border-left: 6.66667px solid transparent; + border-right: 6.66667px solid transparent; + border-top: 10px solid #e3e3e3; } + +/* line 150, ../../../../general/res/sass/helpers/_bubbles.scss */ +.s-infobubble { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + background: white; + color: #666; + font-size: 0.8rem; } + /* line 157, ../../../../general/res/sass/helpers/_bubbles.scss */ + .s-infobubble .title { + color: #333333; + font-weight: bold; } + /* line 163, ../../../../general/res/sass/helpers/_bubbles.scss */ + .s-infobubble table tr td { + border: none; + border-top: 1px solid #e6e6e6 !important; + font-size: 0.9em; } + /* line 169, ../../../../general/res/sass/helpers/_bubbles.scss */ + .s-infobubble table tr:first-child td { + border-top: none !important; } + /* line 174, ../../../../general/res/sass/helpers/_bubbles.scss */ + .s-infobubble:first-child td { + border-top: none; } + /* line 178, ../../../../general/res/sass/helpers/_bubbles.scss */ + .s-infobubble .label { + color: gray; } + /* line 182, ../../../../general/res/sass/helpers/_bubbles.scss */ + .s-infobubble .value { + color: #333333; } + +/* line 188, ../../../../general/res/sass/helpers/_bubbles.scss */ +.s-thumbsbubble { + background: #e3e3e3; + color: #4d4d4d; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 25, ../../../../general/res/sass/helpers/_splitter.scss */ +.split-layout .splitter { + background-color: #969696; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + position: absolute; + z-index: 1; } + /* line 32, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout .splitter:hover { + background-color: #0099cc; } + /* line 34, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout .splitter:hover:after { + border-color: #fcfcfc !important; } + /* line 39, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout .splitter:active { + background-color: #898989; } +/* line 43, ../../../../general/res/sass/helpers/_splitter.scss */ +.split-layout.horizontal { + overflow: hidden; } + /* line 46, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.horizontal .pane { + left: 0; + right: 0; } + /* line 49, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.horizontal .pane.top { + bottom: auto; } + /* line 52, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.horizontal .pane.bottom { + top: auto; } + /* line 56, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.horizontal > .splitter { + cursor: row-resize; + left: 0; + right: 0; + width: auto; + height: 5px; } + /* line 57, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.horizontal > .splitter:after { + -moz-transition-property: "border-color"; + -o-transition-property: "border-color"; + -webkit-transition-property: "border-color"; + transition-property: "border-color"; + -moz-transition-duration: 25ms; + -o-transition-duration: 25ms; + -webkit-transition-duration: 25ms; + transition-duration: 25ms; + -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; + content: ''; + display: block; + pointer-events: none; + position: absolute; + z-index: 2; + border-top: 1px dotted #d6d6d6; + top: 2px; + left: 5px; + right: 5px; + height: 1px; } +/* line 68, ../../../../general/res/sass/helpers/_splitter.scss */ +.split-layout.vertical .pane { + top: 0; + bottom: 0; } + /* line 71, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.vertical .pane.left { + right: auto; } + /* line 74, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.vertical .pane.right { + left: auto; } +/* line 78, ../../../../general/res/sass/helpers/_splitter.scss */ +.split-layout.vertical > .splitter { + bottom: 0; + cursor: col-resize; + width: 5px; } + /* line 82, ../../../../general/res/sass/helpers/_splitter.scss */ + .split-layout.vertical > .splitter:after { + -moz-transition-property: "border-color"; + -o-transition-property: "border-color"; + -webkit-transition-property: "border-color"; + transition-property: "border-color"; + -moz-transition-duration: 25ms; + -o-transition-duration: 25ms; + -webkit-transition-duration: 25ms; + transition-duration: 25ms; + -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; + content: ''; + display: block; + pointer-events: none; + position: absolute; + z-index: 2; + border-left: 1px dotted #d6d6d6; + left: 2px; + bottom: 5px; + top: 5px; + width: 1px; } + +/* line 89, ../../../../general/res/sass/helpers/_splitter.scss */ +.browse-area .splitter { + top: 0; } + +/* line 93, ../../../../general/res/sass/helpers/_splitter.scss */ +.edit-area .splitter { + top: 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. + *****************************************************************************/ +@-moz-keyframes rotation { + 0% { + transform: rotate(0deg); } + 100% { + transform: rotate(359deg); } } +@-webkit-keyframes rotation { + 0% { + transform: rotate(0deg); } + 100% { + transform: rotate(359deg); } } +@keyframes rotation { + 0% { + transform: rotate(0deg); } + 100% { + transform: rotate(359deg); } } +/* line 63, ../../../../general/res/sass/helpers/_wait-spinner.scss */ +.t-wait-spinner, +.wait-spinner { + display: block; + position: absolute; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; + border-color: rgba(0, 153, 204, 0.25); + border-top-color: #0099cc; + border-style: solid; + border-width: 0.5em; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; + top: 50%; + left: 50%; + height: auto; + width: auto; + padding: 5%; + pointer-events: none; + margin-top: -5%; + margin-left: -5%; + z-index: 2; } + /* line 74, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .t-wait-spinner.inline, + .wait-spinner.inline { + display: inline-block !important; + margin-right: 5px; + position: relative !important; + vertical-align: middle; } + +/* line 82, ../../../../general/res/sass/helpers/_wait-spinner.scss */ +.l-wait-spinner-holder { + pointer-events: none; + position: absolute; } + /* line 86, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .l-wait-spinner-holder.align-left .t-wait-spinner { + left: 0; + margin-left: 0; } + /* line 91, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .l-wait-spinner-holder.full-size { + display: inline-block; + height: 100%; + width: 100%; } + /* line 94, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .l-wait-spinner-holder.full-size .t-wait-spinner { + top: 0; + margin-top: 0; + padding: 30%; } + +/* line 103, ../../../../general/res/sass/helpers/_wait-spinner.scss */ +.treeview .wait-spinner { + display: block; + position: absolute; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; + border-color: rgba(0, 153, 204, 0.25); + border-top-color: #0099cc; + border-style: solid; + border-width: 0.25em; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; + height: 10px; + width: 10px; + margin: 0 !important; + padding: 0 !important; + top: 2px; + left: 0; } + +/* line 112, ../../../../general/res/sass/helpers/_wait-spinner.scss */ +.wait-spinner.sm { + display: block; + position: absolute; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; + border-color: rgba(0, 153, 204, 0.25); + border-top-color: #0099cc; + border-style: solid; + border-width: 0.25em; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; + height: 13px; + width: 13px; + margin-left: 0 !important; + margin-top: 0 !important; + padding: 0 !important; + top: 0; + left: 0; } + +/* line 122, ../../../../general/res/sass/helpers/_wait-spinner.scss */ +.loading { + pointer-events: none; } + /* line 125, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .loading:before, .loading:after { + content: ''; } + /* line 129, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .loading:before { + -moz-animation-name: rotateCentered; + -webkit-animation-name: rotateCentered; + animation-name: rotateCentered; + -moz-animation-duration: 0.5s; + -webkit-animation-duration: 0.5s; + animation-duration: 0.5s; + -moz-animation-iteration-count: infinite; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + -moz-animation-timing-function: linear; + -webkit-animation-timing-function: linear; + animation-timing-function: linear; + border-color: rgba(119, 107, 162, 0.25); + border-top-color: #776ba2; + border-style: solid; + border-width: 5px; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + display: block; + position: absolute; + height: 0; + width: 0; + padding: 7%; + left: 50%; + top: 50%; + z-index: 10; } +@-moz-keyframes rotateCentered { + 0% { + transform: translateX(-50%) translateY(-50%) rotate(0deg); } + 100% { + transform: translateX(-50%) translateY(-50%) rotate(359deg); } } +@-webkit-keyframes rotateCentered { + 0% { + transform: translateX(-50%) translateY(-50%) rotate(0deg); } + 100% { + transform: translateX(-50%) translateY(-50%) rotate(359deg); } } +@keyframes rotateCentered { + 0% { + transform: translateX(-50%) translateY(-50%) rotate(0deg); } + 100% { + transform: translateX(-50%) translateY(-50%) rotate(359deg); } } + /* line 133, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .loading:after { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + background: rgba(119, 107, 162, 0.1); + display: block; + z-index: 9; } + /* line 139, ../../../../general/res/sass/helpers/_wait-spinner.scss */ + .loading.tree-item:before { + padding: 0.375rem; + border-width: 2px; } + +/* Styles for messages */ +/* line 4, ../../../../general/res/sass/_messages.scss */ +.message.block { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + padding: 10px; } +/* line 8, ../../../../general/res/sass/_messages.scss */ +.message.error { + background-color: rgba(255, 60, 0, 0.3); + color: #ff8a66; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +/* Styles for the Inspector pane */ +/* line 26, ../../../../general/res/sass/_inspector.scss */ +.l-inspect, +.l-inspect table tr td { + font-size: 0.7rem; } + +/* line 31, ../../../../general/res/sass/_inspector.scss */ +.l-inspect { + color: #666; } + /* line 33, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .pane-header { + color: #999999; + font-size: 0.8rem; } + /* line 38, ../../../../general/res/sass/_inspector.scss */ + .l-inspect ul li, + .l-inspect em { + display: block; + position: relative; } + /* line 44, ../../../../general/res/sass/_inspector.scss */ + .l-inspect ul li { + margin-bottom: 20px; } + /* line 48, ../../../../general/res/sass/_inspector.scss */ + .l-inspect em { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #efefef; + color: #969696; + margin-bottom: 5px; + padding: 5px 5px; + text-transform: uppercase; } + /* line 58, ../../../../general/res/sass/_inspector.scss */ + .l-inspect table tr td { + border: none; + border-top: 1px solid rgba(102, 102, 102, 0.2) !important; + padding: 2px 0; + vertical-align: top; } + /* line 63, ../../../../general/res/sass/_inspector.scss */ + .l-inspect table tr td.label { + color: #999999 !important; + padding-right: 5px !important; + white-space: nowrap; } + /* line 68, ../../../../general/res/sass/_inspector.scss */ + .l-inspect table tr td.value { + word-break: break-all; } + /* line 73, ../../../../general/res/sass/_inspector.scss */ + .l-inspect table tr:first-child td { + border-top: none !important; } + /* line 78, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location { + line-height: 180%; } + /* line 80, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location .location-item { + cursor: pointer; + display: inline; + position: relative; + padding: 2px 4px; } + /* line 85, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location .location-item:hover { + background: rgba(102, 102, 102, 0.1); + color: #333333; } + /* line 88, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location .location-item:hover .icon { + color: #0099cc; } + /* line 93, ../../../../general/res/sass/_inspector.scss */ + .l-inspect .inspector-location:not(.first):before { + color: #8c8c8c; + content: '\3e'; + display: inline-block; + font-family: symbolsfont; + font-size: 7px; + width: 4px; } + +/********************************* CONTROLS */ +/* line 1, ../../../../general/res/sass/controls/_breadcrumb.scss */ +.l-breadcrumb { + font-size: 0.7rem; + line-height: 1em; + margin-bottom: 5px; + margin-left: -4px; } + /* line 10, ../../../../general/res/sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-transition: background-color 0.25s; + -o-transition: background-color 0.25s; + -webkit-transition: background-color 0.25s; + transition: background-color 0.25s; + color: #404040; + display: inline-block; + padding: 2px 4px; } + /* line 18, ../../../../general/res/sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a .icon { + color: #0099cc; + margin-right: 5px; } + /* line 22, ../../../../general/res/sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a:hover { + background: white; + color: gray; } + /* line 25, ../../../../general/res/sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a:hover .icon { + color: #0099cc; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 25, ../../../../general/res/sass/controls/_buttons.scss */ +.s-btn, .s-menu-btn, +.s-icon-btn { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + cursor: pointer; + text-decoration: none; + height: 25px; + line-height: 25px; } + +/* line 34, ../../../../general/res/sass/controls/_buttons.scss */ +.s-btn, .s-menu-btn { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 0 7.5px; + font-size: 0.7rem; } + /* line 39, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn .icon, .s-menu-btn .icon { + font-size: 0.8rem; + color: #0099cc; } + /* line 44, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn .title-label, .s-menu-btn .title-label { + vertical-align: top; } + /* line 48, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.lg, .lg.s-menu-btn { + font-size: 1rem; } + /* line 52, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.sm, .sm.s-menu-btn { + padding: 0 5px; } + /* line 56, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.vsm, .vsm.s-menu-btn { + padding: 0 2.5px; } + /* line 60, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.major, .major.s-menu-btn { + background-color: #0099cc; + -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 274, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major .icon, .major.s-menu-btn .icon { + color: #fff; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 279, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { + background: deepskyblue; } + /* line 281, ../../../../general/res/sass/_mixins.scss */ + .s-btn.major:not(.disabled):hover > .icon, .major.s-menu-btn:not(.disabled):hover > .icon { + color: white; } } + /* line 66, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn:not(.major), .s-menu-btn:not(.major) { + 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 274, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon { + color: #eee; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 279, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { + background: #0099cc; } + /* line 281, ../../../../general/res/sass/_mixins.scss */ + .s-btn:not(.major):not(.disabled):hover > .icon, .s-menu-btn:not(.major):not(.disabled):hover > .icon { + color: white; } } + /* line 75, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play .icon:before, .pause-play.s-menu-btn .icon:before { + content: "\0000F1"; } + /* line 78, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused, .pause-play.paused.s-menu-btn { + background-color: #ff9900; + -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 274, ../../../../general/res/sass/_mixins.scss */ + .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { + color: #fff; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 279, ../../../../general/res/sass/_mixins.scss */ + .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { + background: #ffad33; } + /* line 281, ../../../../general/res/sass/_mixins.scss */ + .s-btn.pause-play.paused:not(.disabled):hover > .icon, .pause-play.paused.s-menu-btn:not(.disabled):hover > .icon { + color: white; } } + /* line 80, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon { + -moz-animation-name: pulse; + -webkit-animation-name: pulse; + animation-name: pulse; + -moz-animation-duration: 1000ms; + -webkit-animation-duration: 1000ms; + animation-duration: 1000ms; + -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; } + /* line 82, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.pause-play.paused .icon :before, .pause-play.paused.s-menu-btn .icon :before { + content: "\0000EF"; } + /* line 90, ../../../../general/res/sass/controls/_buttons.scss */ + .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before { + content: "\000039"; } + +/* line 96, ../../../../general/res/sass/controls/_buttons.scss */ +.s-icon-btn { + color: #eee; } + /* line 99, ../../../../general/res/sass/controls/_buttons.scss */ + .s-icon-btn:hover { + color: white; } + +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + color: #d6d6d6; + cursor: pointer; + display: block; + position: absolute; + font-size: 12px; + line-height: 12px; + height: 12px; + width: 12px; } + /* line 127, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover { + color: #a3a3a3; } + /* line 129, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:hover:after { + color: #0099cc; } + /* line 134, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before, .mini-tab:after { + -moz-transition-property: color; + -o-transition-property: color; + -webkit-transition-property: color; + transition-property: color; + -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: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + display: block; + position: absolute; } + /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:before { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + font-size: 7px; + height: 100%; + width: 7px; } + /* line 148, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab:after { + width: 100%; + height: 100%; } + /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:before { + content: '\3c'; + left: -7px; } + /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left:hover:before { + left: -9px; } + /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left.collapsed:before { + content: '\3e'; + left: 12px; } + /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-left.collapsed:hover:before { + left: 14px; } + /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:before { + content: '\3e'; + left: 12px; } + /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right:hover:before { + left: 14px; } + /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right.collapsed:before { + content: '\3c'; + left: -7px; } + /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab.anchor-right.collapsed:hover:before { + left: -9px; } } + +/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ +.l-btn-set { + font-size: 0; } + /* line 202, ../../../../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 208, ../../../../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; + border-top-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + margin-left: 0; } + /* line 215, ../../../../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; + border-top-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; } + +/* line 222, ../../../../general/res/sass/controls/_buttons.scss */ +.paused:not(.s-btn):not(.s-menu-btn) { + border-color: #ff9900 !important; + color: #ff9900 !important; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/controls/_color-palette.scss */ +.l-color-palette { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 5px !important; } + /* line 31, ../../../../general/res/sass/controls/_color-palette.scss */ + .l-color-palette .l-palette-row { + overflow: hidden; + *zoom: 1; + line-height: 16px; + width: 170px; } + /* line 36, ../../../../general/res/sass/controls/_color-palette.scss */ + .l-color-palette .l-palette-row .l-palette-item { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + text-shadow: rgba(0, 0, 0, 0.8) 0 1px 2px; + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + border: 1px solid transparent; + color: #fff; + display: block; + font-family: 'symbolsfont'; + float: left; + height: 16px; + width: 16px; + line-height: 16px; + margin: 0 1px 1px 0; + text-align: center; + vertical-align: middle; } + /* line 53, ../../../../general/res/sass/controls/_color-palette.scss */ + .l-color-palette .l-palette-row .s-palette-item:hover { + -moz-transition-property: none; + -o-transition-property: none; + -webkit-transition-property: none; + transition-property: none; + border-color: #fff !important; } + /* line 59, ../../../../general/res/sass/controls/_color-palette.scss */ + .l-color-palette .l-palette-row .l-palette-item-label { + margin-left: 5px; } + /* line 63, ../../../../general/res/sass/controls/_color-palette.scss */ + .l-color-palette .l-palette-row.l-option-row { + margin-bottom: 5px; } + /* line 65, ../../../../general/res/sass/controls/_color-palette.scss */ + .l-color-palette .l-palette-row.l-option-row .s-palette-item { + border-color: #666; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +/*.control { + // UNUSED? + &.view-control { + .icon { + display: inline-block; + margin: -1px 5px 1px 2px; + vertical-align: middle; + &.triangle-down { + margin: 2px 2px -2px 0px; + } + } + + .label { + display: inline-block; + font-size: 11px; + vertical-align: middle; + } + + .toggle { + @include border-radius(3px); + display: inline-block; + padding: 1px 6px 4px 4px; + &:hover { + background: rgba(white, 0.1); + } + } + } +}*/ +/* line 51, ../../../../general/res/sass/controls/_controls.scss */ +.accordion { + margin-top: 5px; } + /* line 54, ../../../../general/res/sass/controls/_controls.scss */ + .accordion:first-child { + margin-top: 0; } + /* line 57, ../../../../general/res/sass/controls/_controls.scss */ + .accordion .accordion-head { + -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; + background: rgba(102, 102, 102, 0.2); + cursor: pointer; + font-size: 0.75em; + line-height: 18px; + margin-bottom: 5px; + padding: 0 5px; + position: absolute; + top: 0; + right: 0; + bottom: auto; + left: 0; + width: auto; + height: 18px; + text-transform: uppercase; } + /* line 75, ../../../../general/res/sass/controls/_controls.scss */ + .accordion .accordion-head:hover { + background: rgba(102, 102, 102, 0.4); } + /* line 78, ../../../../general/res/sass/controls/_controls.scss */ + .accordion .accordion-head:after { + content: "^"; + display: block; + font-family: 'symbolsfont'; + font-size: 0.9em; + position: absolute; + right: 5px; + text-transform: none; + top: 0; } + /* line 88, ../../../../general/res/sass/controls/_controls.scss */ + .accordion .accordion-head:not(.expanded):after { + content: "v"; } + /* line 92, ../../../../general/res/sass/controls/_controls.scss */ + .accordion .accordion-contents { + position: absolute; + top: 23px; + right: 0; + bottom: 0; + left: 0; + overflow-y: auto; + overflow-x: hidden; } + +/* line 103, ../../../../general/res/sass/controls/_controls.scss */ +.l-composite-control { + vertical-align: middle; } + /* line 106, ../../../../general/res/sass/controls/_controls.scss */ + .l-composite-control.l-checkbox .composite-control-label { + line-height: 18px; } + +/* line 112, ../../../../general/res/sass/controls/_controls.scss */ +.l-control-group { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-left: 1px solid rgba(102, 102, 102, 0.2); + display: inline-block; + padding: 0 5px; + position: relative; } + /* line 120, ../../../../general/res/sass/controls/_controls.scss */ + .l-control-group:first-child { + border-left: none; + padding-left: 0; } + +/* line 126, ../../../../general/res/sass/controls/_controls.scss */ +.l-local-controls { + position: absolute; + top: 5px; + right: 5px; + z-index: 5; } + +/* line 136, ../../../../general/res/sass/controls/_controls.scss */ +.s-local-controls { + font-size: 0.7rem; } + +/* line 140, ../../../../general/res/sass/controls/_controls.scss */ +label.checkbox.custom { + cursor: pointer; + display: inline-block; + line-height: 14px; + margin-right: 20px; + padding-left: 19px; + position: relative; + vertical-align: middle; } + /* line 150, ../../../../general/res/sass/controls/_controls.scss */ + label.checkbox.custom em { + color: #666; + display: inline-block; + height: 14px; + min-width: 14px; } + /* line 155, ../../../../general/res/sass/controls/_controls.scss */ + label.checkbox.custom em:before { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: #e3e3e3; + -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; + box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 2px; + box-sizing: border-box; + content: " "; + font-family: 'symbolsfont'; + font-size: 0.8em; + display: inline-block; + margin-right: 5px; + height: 14px; + width: 14px; + left: 0; + top: 0; + position: absolute; + text-align: center; } + /* line 174, ../../../../general/res/sass/controls/_controls.scss */ + label.checkbox.custom.no-text { + overflow: hidden; + margin-right: 0; + padding-left: 0; + height: 14px; + width: 14px; } + /* line 180, ../../../../general/res/sass/controls/_controls.scss */ + label.checkbox.custom.no-text em { + overflow: hidden; } + /* line 184, ../../../../general/res/sass/controls/_controls.scss */ + label.checkbox.custom input { + display: none; } + /* line 186, ../../../../general/res/sass/controls/_controls.scss */ + label.checkbox.custom input:checked ~ em:before { + background: #0099cc; + color: #ccf2ff; + content: "2"; } + +/* line 194, ../../../../general/res/sass/controls/_controls.scss */ +.input-labeled { + margin-left: 5px; } + /* line 196, ../../../../general/res/sass/controls/_controls.scss */ + .input-labeled label { + display: inline-block; + margin-right: 3px; } + /* line 200, ../../../../general/res/sass/controls/_controls.scss */ + .input-labeled.inline { + display: inline-block; } + /* line 203, ../../../../general/res/sass/controls/_controls.scss */ + .input-labeled:first-child { + margin-left: 0; } + +/* line 208, ../../../../general/res/sass/controls/_controls.scss */ +.s-menu-btn label.checkbox.custom { + margin-left: 5px; } + +/* line 213, ../../../../general/res/sass/controls/_controls.scss */ +.item .checkbox.checked label { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + border-bottom: none; } + +/* line 219, ../../../../general/res/sass/controls/_controls.scss */ +.context-available { + color: #0099cc; } + /* line 222, ../../../../general/res/sass/controls/_controls.scss */ + .context-available:hover { + color: deepskyblue; } + +/* line 227, ../../../../general/res/sass/controls/_controls.scss */ +.view-switcher { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, 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; } + +/******************************************************** OBJECT-HEADER */ +/* line 232, ../../../../general/res/sass/controls/_controls.scss */ +.object-header { + font-size: 1em; } + /* line 243, ../../../../general/res/sass/controls/_controls.scss */ + .object-header > .type-icon { + color: #b3b3b3; + font-size: 120%; + float: left; + margin-right: 5px; } + /* line 250, ../../../../general/res/sass/controls/_controls.scss */ + .object-header .l-elem-wrapper { + -webkit-justify-content: flex-start; + justify-content: flex-start; } + /* line 253, ../../../../general/res/sass/controls/_controls.scss */ + .object-header .l-elem-wrapper mct-representation { + min-width: 0.7em; } + /* line 261, ../../../../general/res/sass/controls/_controls.scss */ + .object-header .action { + margin-right: 5px; } + /* line 265, ../../../../general/res/sass/controls/_controls.scss */ + .object-header .title-label { + color: #666; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex: 0 1 auto; + -webkit-flex: 0 1 auto; + padding-right: 0.35em; } + /* line 275, ../../../../general/res/sass/controls/_controls.scss */ + .object-header .context-available { + font-size: 0.7em; + flex: 0 0 1; + -webkit-flex: 0 0 1; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 282, ../../../../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 287, ../../../../general/res/sass/controls/_controls.scss */ + .object-header:hover .context-available { + opacity: 1; } } + +/******************************************************** SLIDERS */ +/* line 298, ../../../../general/res/sass/controls/_controls.scss */ +.slider .slot { + width: auto; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } +/* line 308, ../../../../general/res/sass/controls/_controls.scss */ +.slider .knob { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + background-color: rgba(0, 153, 204, 0.5); + position: absolute; + height: 100%; + width: 10px; + top: 0; + auto: 0; + bottom: auto; + left: auto; } + /* line 311, ../../../../general/res/sass/controls/_controls.scss */ + .slider .knob:hover { + background-color: rgba(0, 153, 204, 0.7); } +/* line 322, ../../../../general/res/sass/controls/_controls.scss */ +.slider .knob-l { + -moz-border-radius-topleft: 10px; + -webkit-border-top-left-radius: 10px; + border-top-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + -webkit-border-bottom-left-radius: 10px; + border-bottom-left-radius: 10px; + cursor: w-resize; } +/* line 326, ../../../../general/res/sass/controls/_controls.scss */ +.slider .knob-r { + -moz-border-radius-topright: 10px; + -webkit-border-top-right-radius: 10px; + border-top-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + -webkit-border-bottom-right-radius: 10px; + border-bottom-right-radius: 10px; + cursor: e-resize; } +/* line 330, ../../../../general/res/sass/controls/_controls.scss */ +.slider .range { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + background-color: rgba(0, 153, 204, 0.2); + cursor: ew-resize; + position: absolute; + top: 0; + right: auto; + bottom: 0; + left: auto; + height: auto; + width: auto; } + /* line 341, ../../../../general/res/sass/controls/_controls.scss */ + .slider .range:hover { + background-color: rgba(0, 153, 204, 0.4); } + +/******************************************************** DATETIME PICKER */ +/* line 348, ../../../../general/res/sass/controls/_controls.scss */ +.l-datetime-picker { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; + font-size: 0.8rem; + padding: 10px !important; + width: 230px; } + /* line 354, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-month-year-pager { + height: 15px; + margin-bottom: 5px; + position: relative; } + /* line 366, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-month-year-pager .pager { + width: 20px; } + /* line 369, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-month-year-pager .pager.prev { + right: auto; } + /* line 371, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-month-year-pager .pager.prev:before { + content: "\3c"; } + /* line 375, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-month-year-pager .pager.next { + left: auto; + text-align: right; } + /* line 378, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-month-year-pager .pager.next:before { + content: "\3e"; } + /* line 383, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-month-year-pager .val { + text-align: center; + left: 25px; + right: 25px; } + /* line 389, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-calendar, + .l-datetime-picker .l-time-selects { + border-top: 1px solid rgba(102, 102, 102, 0.2); } + /* line 393, ../../../../general/res/sass/controls/_controls.scss */ + .l-datetime-picker .l-time-selects { + line-height: 22px; } + +/******************************************************** CALENDAR */ +/* line 401, ../../../../general/res/sass/controls/_controls.scss */ +.l-calendar ul.l-cal-row { + display: -webkit-flex; + display: flex; + -webkit-flex-flow: row nowrap; + flex-flow: row nowrap; + margin-top: 1px; } + /* line 405, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row:first-child { + margin-top: 0; } + /* line 408, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row li { + -webkit-flex: 1 0; + flex: 1 0; + margin-left: 1px; + padding: 5px; + text-align: center; } + /* line 414, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row li:first-child { + margin-left: 0; } + /* line 418, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-header li { + color: #999999; } + /* line 421, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-body li { + -moz-transition-property: background-color; + -o-transition-property: background-color; + -webkit-transition-property: background-color; + transition-property: background-color; + -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; + cursor: pointer; } + /* line 424, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-body li.in-month { + background-color: #f2f2f2; } + /* line 427, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-body li .sub { + color: #999999; + font-size: 0.8em; } + /* line 431, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-body li.selected { + background: #1ac6ff; + color: #fcfcfc; } + /* line 434, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-body li.selected .sub { + color: inherit; } + /* line 438, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-body li:hover { + background-color: #0099cc; + color: #fff; } + /* line 441, ../../../../general/res/sass/controls/_controls.scss */ + .l-calendar ul.l-cal-row.l-body li:hover .sub { + color: inherit; } + +/******************************************************** BROWSER ELEMENTS */ +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 452, ../../../../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 461, ../../../../general/res/sass/controls/_controls.scss */ + ::-webkit-scrollbar-thumb { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + 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 470, ../../../../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); } + + /* line 475, ../../../../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 + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/controls/_lists.scss */ +.checkbox-list label.checkbox.custom { + display: block; + margin-bottom: 5px; } +/* line 27, ../../../../general/res/sass/controls/_lists.scss */ +.checkbox-list li { + margin-bottom: 5px; } + +/* line 35, ../../../../general/res/sass/controls/_lists.scss */ +.l-tree-item-flat-list .tree-item .label { + left: 5px !important; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +/******************************************************** MENU BUTTONS */ +/* line 31, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu-btn .icon { + font-size: 120%; } +/* line 35, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu-btn .title-label { + margin-left: 3px; } +/* line 39, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu-btn:after { + text-shadow: none; + content: '\76'; + display: inline-block; + font-family: 'symbolsfont'; + margin-left: 3px; + vertical-align: top; + color: rgba(255, 255, 255, 0.4); } +/* line 46, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu-btn.create-btn .title-label { + font-size: 1rem; } +/* line 54, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu-btn .menu { + left: 0; + text-align: left; } + /* line 57, ../../../../general/res/sass/controls/_menus.scss */ + .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { + width: 12px; } + +/******************************************************** MENUS THEMSELVES */ +/* line 64, ../../../../general/res/sass/controls/_menus.scss */ +.menu-element { + cursor: pointer; + position: relative; } + +/* line 69, ../../../../general/res/sass/controls/_menus.scss */ +.s-menu, .menu { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: white; + -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: #4d4d4d; + display: inline-block; + -moz-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; + box-shadow: rgba(0, 0, 0, 0.5) 0 1px 5px; + text-shadow: none; + padding: 3px 0; } + +/* line 77, ../../../../general/res/sass/controls/_menus.scss */ +.menu { + display: block; + position: absolute; + z-index: 10; } + /* line 82, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul { + margin: 0; + padding: 0; } + /* line 331, ../../../../general/res/sass/_mixins.scss */ + .menu ul li { + list-style-type: none; + margin: 0; + padding: 0; } + /* line 84, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-top: 1px solid white; + color: #666666; + line-height: 1.5rem; + padding: 3px 10px 3px 30px; + position: relative; + white-space: nowrap; } + /* line 92, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li:first-child { + border: none; } + /* line 95, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li:hover { + background: #e6e6e6; + color: #4d4d4d; } + /* line 98, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li:hover .icon { + color: #0099cc; } + /* line 102, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li .type-icon { + left: 10px; } + +/* line 109, ../../../../general/res/sass/controls/_menus.scss */ +.menu, +.context-menu, +.checkbox-menu, +.super-menu { + pointer-events: auto; } + /* line 115, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li a, + .context-menu ul li a, + .checkbox-menu ul li a, + .super-menu ul li a { + color: #4d4d4d; } + /* line 118, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li .icon, + .context-menu ul li .icon, + .checkbox-menu ul li .icon, + .super-menu ul li .icon { + color: #0099cc; } + /* line 121, ../../../../general/res/sass/controls/_menus.scss */ + .menu ul li .type-icon, + .context-menu ul li .type-icon, + .checkbox-menu ul li .type-icon, + .super-menu ul li .type-icon { + left: 5px; } + +/* line 133, ../../../../general/res/sass/controls/_menus.scss */ +.checkbox-menu ul li { + padding-left: 50px; } + /* line 135, ../../../../general/res/sass/controls/_menus.scss */ + .checkbox-menu ul li .checkbox { + position: absolute; + left: 5px; + top: 0.53333rem; } + /* line 140, ../../../../general/res/sass/controls/_menus.scss */ + .checkbox-menu ul li .checkbox em { + height: 0.7rem; + width: 0.7rem; } + /* line 143, ../../../../general/res/sass/controls/_menus.scss */ + .checkbox-menu ul li .checkbox em:before { + font-size: 7px !important; + height: 0.7rem; + width: 0.7rem; + line-height: 0.7rem; } + /* line 151, ../../../../general/res/sass/controls/_menus.scss */ + .checkbox-menu ul li .type-icon { + left: 25px; } + +/* line 157, ../../../../general/res/sass/controls/_menus.scss */ +.super-menu { + display: block; + width: 500px; + height: 480px; } + /* line 165, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .contents { + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; } + /* line 168, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .pane { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } + /* line 170, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .pane.left { + border-right: 1px solid #e6e6e6; + left: 0; + padding-right: 5px; + right: auto; + width: 50%; + overflow-x: hidden; + overflow-y: auto; } + /* line 180, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .pane.left ul li { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + padding-left: 30px; + border-top: none; } + /* line 187, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .pane.right { + left: auto; + right: 0; + padding: 25px; + width: 50%; } + /* line 197, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .menu-item-description .desc-area.icon { + color: #0099cc; + position: relative; + font-size: 8em; + left: 0; + height: 150px; + line-height: 150px; + margin-bottom: 25px; + text-align: center; } + /* line 208, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .menu-item-description .desc-area.title { + color: #666; + font-size: 1.2em; + margin-bottom: 0.5em; } + /* line 213, ../../../../general/res/sass/controls/_menus.scss */ + .super-menu .menu-item-description .desc-area.description { + color: #666; + font-size: 0.8em; + line-height: 1.5em; } + +/* line 222, ../../../../general/res/sass/controls/_menus.scss */ +.context-menu, .checkbox-menu { + font-size: 0.80rem; } + +/* line 226, ../../../../general/res/sass/controls/_menus.scss */ +.context-menu-holder, +.menu-holder { + position: absolute; + z-index: 70; } + /* line 230, ../../../../general/res/sass/controls/_menus.scss */ + .context-menu-holder .context-menu-wrapper, + .menu-holder .context-menu-wrapper { + position: absolute; + height: 100%; + width: 100%; } + /* line 235, ../../../../general/res/sass/controls/_menus.scss */ + .context-menu-holder.go-left .context-menu, .context-menu-holder.go-left .checkbox-menu, .context-menu-holder.go-left .menu, + .menu-holder.go-left .context-menu, + .menu-holder.go-left .checkbox-menu, + .menu-holder.go-left .menu { + right: 0; } + /* line 239, ../../../../general/res/sass/controls/_menus.scss */ + .context-menu-holder.go-up .context-menu, .context-menu-holder.go-up .checkbox-menu, .context-menu-holder.go-up .menu, + .menu-holder.go-up .context-menu, + .menu-holder.go-up .checkbox-menu, + .menu-holder.go-up .menu { + bottom: 0; } + +/* line 245, ../../../../general/res/sass/controls/_menus.scss */ +.context-menu-holder { + pointer-events: none; + height: 200px; + width: 170px; } + +/* line 251, ../../../../general/res/sass/controls/_menus.scss */ +.btn-bar.right .menu, +.menus-to-left .menu { + left: auto; + right: 0; + width: auto; } + +/* line 13, ../../../../general/res/sass/controls/_time-controller.scss */ +mct-include.l-time-controller { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + display: block; + top: auto; + height: 83px; + min-width: 500px; + font-size: 0.8rem; } + /* line 38, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-inputs-holder, + mct-include.l-time-controller .l-time-range-slider-holder, + mct-include.l-time-controller .l-time-range-ticks-holder { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + top: auto; } + /* line 47, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider, + mct-include.l-time-controller .l-time-range-ticks { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + left: 150px; + right: 150px; } + /* line 54, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-inputs-holder { + height: 33px; + bottom: 46px; + padding-top: 5px; + border-top: 1px solid rgba(102, 102, 102, 0.2); } + /* line 59, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-inputs-holder .type-icon { + font-size: 120%; + vertical-align: middle; } + /* line 63, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem { + margin-right: 5px; } + /* line 66, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .lbl, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl { + color: #999999; } + /* line 69, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.s-icon-btn, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .l-datetime-picker .l-month-year-pager .icon.pager, + .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.pager { + font-size: 11px; + width: 11px; } + /* line 76, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder { + height: 20px; + bottom: 23px; } + /* line 79, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder .range-holder { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + background: none; + border: none; } + /* line 84, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line { + -moz-transform: translateX(50%); + -ms-transform: translateX(50%); + -webkit-transform: translateX(50%); + transform: translateX(50%); + position: absolute; + top: 0; + right: 0; + bottom: 0px; + left: auto; + width: 8px; + height: auto; + z-index: 2; } + /* line 94, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after { + background-color: #666; + content: ""; + position: absolute; } + /* line 100, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before { + top: 0; + right: auto; + bottom: -10px; + left: 3px; + width: 2px; } + /* line 106, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after { + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + top: 50%; + right: 0; + bottom: auto; + left: 0; + width: auto; + height: 8px; } + /* line 3, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:after { + background-color: #0052b5; } + /* line 122, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .knob, + mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .range { + -moz-transition-property: left, right; + -o-transition-property: left, right; + -webkit-transition-property: left, right; + transition-property: left, right; + -moz-transition-duration: 500ms; + -o-transition-duration: 500ms; + -webkit-transition-duration: 500ms; + transition-duration: 500ms; + -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; } + /* line 131, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-ticks-holder { + height: 20px; } + /* line 133, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { + border-top: 1px solid rgba(0, 0, 0, 0.2); } + /* line 135, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { + background-color: rgba(0, 0, 0, 0.2); + border: none; + height: 5px; + width: 1px; + margin-left: -1px; + position: absolute; } + /* line 142, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child { + margin-left: 0; } + /* line 145, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { + transform: translateX(-50%); + -webkit-transform: translateX(-50%); + color: #999999; + display: inline-block; + font-size: 0.9em; + position: absolute; + top: 8px; + white-space: nowrap; + z-index: 2; } + /* line 159, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob { + z-index: 2; } + /* line 161, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob .range-value { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + padding: 0 10px; + position: absolute; + height: 20px; + line-height: 20px; + white-space: nowrap; } + /* line 170, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob:hover .range-value { + color: rgba(0, 153, 204, 0.7); } + /* line 173, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob.knob-l { + margin-left: -10px; } + /* line 176, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob.knob-l .range-value { + text-align: right; + right: 10px; } + /* line 181, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob.knob-r { + margin-right: -10px; } + /* line 184, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob.knob-r .range-value { + left: 10px; } + /* line 3, ../../../../general/res/sass/controls/_time-controller.scss */ + mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:before, mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:after { + background-color: #0052b5; } + +/* line 198, ../../../../general/res/sass/controls/_time-controller.scss */ +.s-time-range-val { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background-color: #fff; + padding: 1px 1px 0 5px; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +@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 26, ../../../../general/res/sass/mobile/controls/_menus.scss */ + .menu-element .super-menu { + width: 250px; + height: 250px; } + /* line 32, ../../../../general/res/sass/mobile/controls/_menus.scss */ + .menu-element .super-menu .pane.left { + border-right: none; + padding-right: 0; + width: 100%; } + /* line 37, ../../../../general/res/sass/mobile/controls/_menus.scss */ + .menu-element .super-menu .pane.right { + display: none; } } +/********************************* FORMS */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/forms/_elems.scss */ +.section-header { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background: rgba(0, 0, 0, 0.05); + color: #999999; + font-size: 0.8em; + padding: 5px 5px; + text-transform: uppercase; } + +/* line 33, ../../../../general/res/sass/forms/_elems.scss */ +.form { + color: gray; } + /* line 36, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-section { + position: relative; + margin-bottom: 20px; } + /* line 41, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + *zoom: 1; + border-top: 1px solid rgba(0, 0, 0, 0.1); + margin-top: 5px; + padding: 5px 0; + position: relative; } + /* line 49, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row.first { + border-top: none; } + /* line 53, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row > .label, + .form .form-row > .controls { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + *zoom: 1; + font-size: 0.8rem; + line-height: 22px; + min-height: 22px; } + /* line 62, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row > .label { + float: left; + min-width: 120px; + position: relative; + white-space: nowrap; + width: 30%; } + /* line 72, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .value { + color: #666; } + /* line 76, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls { + float: left; + position: relative; + width: 69.9%; } + /* line 83, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-composite-control.l-checkbox { + display: inline-block; + line-height: 14px; + margin-right: 5px; } + /* line 92, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-med input[type="text"] { + width: 200px; } + /* line 96, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-small input[type="text"] { + width: 50px; } + /* line 100, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .l-numeric input[type="text"] { + text-align: right; } + /* line 104, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .controls .select { + margin-right: 5px; } + /* line 109, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .field-hints { + color: #333333; } + /* line 113, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .selector-list { + -moz-appearance: none; + -webkit-appearance: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + background: #fff; + border: none; + color: #666; + outline: none; + padding: 0 3px; + position: relative; + height: 150px; } + /* line 298, ../../../../general/res/sass/_mixins.scss */ + .form .form-row .selector-list.error { + background: rgba(255, 0, 0, 0.5); } + /* line 124, ../../../../general/res/sass/forms/_elems.scss */ + .form .form-row .selector-list > .wrapper { + overflow: auto; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; } + +/* line 138, ../../../../general/res/sass/forms/_elems.scss */ +label.form-control.checkbox input { + margin-right: 5px; + vertical-align: top; } + +/* line 144, ../../../../general/res/sass/forms/_elems.scss */ +.hint, +.s-hint { + font-size: 0.9em; } + +/* line 149, ../../../../general/res/sass/forms/_elems.scss */ +.l-result { + display: inline-block; + min-width: 32px; + min-height: 32px; + position: relative; + vertical-align: top; } + /* line 156, ../../../../general/res/sass/forms/_elems.scss */ + .l-result div.s-hint { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background: rgba(255, 34, 0, 0.8); + display: block; + color: #ffa799; + padding: 5px; } + +/* line 165, ../../../../general/res/sass/forms/_elems.scss */ +input[type="text"] { + -moz-appearance: none; + -webkit-appearance: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + background: #fff; + border: none; + color: #666; + outline: none; + padding: 0 3px; } + /* line 298, ../../../../general/res/sass/_mixins.scss */ + input[type="text"].error { + background: rgba(255, 0, 0, 0.5); } + /* line 172, ../../../../general/res/sass/forms/_elems.scss */ + input[type="text"].numeric { + text-align: right; } + +/* line 177, ../../../../general/res/sass/forms/_elems.scss */ +textarea { + -moz-appearance: none; + -webkit-appearance: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + background: #fff; + border: none; + color: #666; + outline: none; + padding: 5px; + position: absolute; + height: 100%; + width: 100%; } + /* line 298, ../../../../general/res/sass/_mixins.scss */ + textarea.error { + background: rgba(255, 0, 0, 0.5); } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/forms/_selects.scss */ +.select { + background-color: #ddd; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #fff; + 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; + padding: 0 5px; + overflow: hidden; + position: relative; + line-height: 22px; } + /* line 274, ../../../../general/res/sass/_mixins.scss */ + .select .icon { + color: #eee; } + /* line 31, ../../../../general/res/sass/forms/_selects.scss */ + .select select { + -moz-appearance: none; + -webkit-appearance: none; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + background: none; + color: #666; + cursor: pointer; + border: none !important; + padding: 4px 25px 2px 0px; + width: 120%; } + /* line 40, ../../../../general/res/sass/forms/_selects.scss */ + .select select option { + margin: 5px 0; } + /* line 44, ../../../../general/res/sass/forms/_selects.scss */ + .select:after { + text-shadow: none; + content: '\76'; + display: inline-block; + font-family: 'symbolsfont'; + margin-left: 3px; + vertical-align: top; + pointer-events: none; + color: rgba(102, 102, 102, 0.4); + position: absolute; + right: 5px; + top: 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. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/forms/_channel-selector.scss */ +.channel-selector .line { + margin-bottom: 5px; + min-height: 22px; } +/* line 27, ../../../../general/res/sass/forms/_channel-selector.scss */ +.channel-selector .treeview { + -moz-appearance: none; + -webkit-appearance: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + background: #fcfcfc; + border: none; + color: #666; + outline: none; + padding: 0 3px; + background: white; + border-bottom: 1px solid white; + min-height: 300px; + max-height: 400px; + overflow: auto; + padding: 5px; } + /* line 298, ../../../../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 */ +.channel-selector .btns-add-remove { + margin-top: 150px; } + /* line 39, ../../../../general/res/sass/forms/_channel-selector.scss */ + .channel-selector .btns-add-remove .s-btn, .channel-selector .btns-add-remove .s-menu-btn { + display: block; + margin-bottom: 5px; + text-align: center; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 29, ../../../../general/res/sass/forms/_datetime.scss */ +.complex.datetime { + /* + .field-hints, + .fields { + } + + + .field-hints { + + } + */ } + /* line 30, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime span { + display: inline-block; + margin-right: 5px; } + /* line 46, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime .fields { + margin-top: 3px 0; + padding: 3px 0; } + /* line 51, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime .date { + width: 85px; } + /* line 24, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime .date input[type="text"] { + width: 80px; } + /* line 55, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime .time.md { + width: 65px; } + /* line 24, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime .time.md input[type="text"] { + width: 60px; } + /* line 59, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime .time.sm { + width: 45px; } + /* line 24, ../../../../general/res/sass/forms/_datetime.scss */ + .complex.datetime .time.sm input[type="text"] { + width: 40px; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/forms/_validation.scss */ +.validates > .label { + padding-right: 10px; } + /* line 25, ../../../../general/res/sass/forms/_validation.scss */ + .validates > .label::after { + float: right; + font-family: symbolsfont; + font-size: 0.7em; } +/* line 33, ../../../../general/res/sass/forms/_validation.scss */ +.validates.invalid > .label::after, .validates.invalid.req > .label::after { + color: #ff2200; + content: "x"; } +/* line 40, ../../../../general/res/sass/forms/_validation.scss */ +.validates.valid > .label::after, .validates.valid.req > .label::after { + color: #33cc33; + content: "2"; } +/* line 46, ../../../../general/res/sass/forms/_validation.scss */ +.validates.req > .label::after { + color: #0099cc; + content: "*"; } + +/* line 52, ../../../../general/res/sass/forms/_validation.scss */ +.req { + font-size: 0.7em; } + +/* line 55, ../../../../general/res/sass/forms/_validation.scss */ +span.req { + color: #0099cc; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 24, ../../../../general/res/sass/forms/_filter.scss */ +.filter input.filter, +.filter input.t-filter-input, +.t-filter input.filter, +.t-filter input.t-filter-input { + -moz-appearance: none; + -webkit-appearance: none; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px; + background: #fcfcfc; + border: none; + color: #666; + outline: none; + padding: 0 3px; + background: white; + border-bottom: 1px solid white; } + /* line 298, ../../../../general/res/sass/_mixins.scss */ + .filter input.filter.error, + .filter input.t-filter-input.error, + .t-filter input.filter.error, + .t-filter input.t-filter-input.error { + background: rgba(255, 0, 0, 0.5); } +/* line 28, ../../../../general/res/sass/forms/_filter.scss */ +.filter input.t-filter-input, +.t-filter input.t-filter-input { + height: 22px; + width: 200px; } + /* line 38, ../../../../general/res/sass/forms/_filter.scss */ + .filter input.t-filter-input:not(.ng-dirty) + .t-a-clear, + .t-filter input.t-filter-input:not(.ng-dirty) + .t-a-clear { + display: none; } +/* line 42, ../../../../general/res/sass/forms/_filter.scss */ +.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, +.t-filter .icon.ui-symbol, +.t-filter .icon.s-icon-btn, +.t-filter .icon.mini-tab, +.t-filter .l-datetime-picker .l-month-year-pager .icon.pager, +.l-datetime-picker .l-month-year-pager .t-filter .icon.pager { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + display: inline-block; + font-size: 1.3em; + height: 22px; + line-height: 22px; + padding: 0px 5px; + vertical-align: middle; } + /* line 50, ../../../../general/res/sass/forms/_filter.scss */ + .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, + .t-filter .icon.ui-symbol:hover, + .t-filter .icon.s-icon-btn:hover, + .t-filter .icon.mini-tab:hover, + .t-filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, + .l-datetime-picker .l-month-year-pager .t-filter .icon.pager:hover { + background: rgba(255, 255, 255, 0.1); } +/* line 54, ../../../../general/res/sass/forms/_filter.scss */ +.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, +.t-filter .s-a-clear.ui-symbol, +.t-filter .s-a-clear.s-icon-btn, +.t-filter .s-a-clear.mini-tab, +.t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, +.l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager { + -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; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20); + opacity: 0.2; + background: #fff; + color: #333; + display: block; + position: absolute; + height: 13px; + width: 13px; + line-height: 13px; + margin-top: -6.5px; + overflow: hidden; + padding-top: 1px; + right: 4.5px; + top: 50%; + text-align: center; + z-index: 5; } + /* line 74, ../../../../general/res/sass/forms/_filter.scss */ + .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, + .t-filter .s-a-clear.ui-symbol:hover, + .t-filter .s-a-clear.s-icon-btn:hover, + .t-filter .s-a-clear.mini-tab:hover, + .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, + .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager:hover { + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60); + opacity: 0.6; + background-color: #0099cc; } + +/* line 82, ../../../../general/res/sass/forms/_filter.scss */ +.l-filter { + display: inline-block; + position: relative; } + +/* line 89, ../../../../general/res/sass/forms/_filter.scss */ +.top-bar input.filter { + font-size: .9em; + height: 24px; + line-height: 24px; + margin-right: 5px; + padding-left: 10px; + padding-right: 10px; + vertical-align: top; } +/* line 100, ../../../../general/res/sass/forms/_filter.scss */ +.top-bar .icon-filter { + font-size: 1.4em; } + +/********************************* USER ENVIRON */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 32, ../../../../general/res/sass/user-environ/_layout.scss */ +.holder-all { + top: 0; + right: 0; + bottom: 0; + left: 0; } + +/* line 40, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-area, +.edit-area, +.editor { + position: absolute; } + +/* line 46, ../../../../general/res/sass/user-environ/_layout.scss */ +.editor { + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } + +/* line 50, ../../../../general/res/sass/user-environ/_layout.scss */ +.contents { + box-sizing: border-box; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } + /* line 58, ../../../../general/res/sass/user-environ/_layout.scss */ + .contents.nomargin { + right: 0px; + bottom: 0px; + left: 0px; } + +/* line 67, ../../../../general/res/sass/user-environ/_layout.scss */ +.bar .icon.major { + margin-right: 5px; } +/* line 70, ../../../../general/res/sass/user-environ/_layout.scss */ +.bar.abs, .l-datetime-picker .l-month-year-pager .bar.pager, +.l-datetime-picker .l-month-year-pager .bar.val, .s-menu-btn span.bar.l-click-area { + text-wrap: none; + white-space: nowrap; } + /* line 73, ../../../../general/res/sass/user-environ/_layout.scss */ + .bar.abs.left, .l-datetime-picker .l-month-year-pager .bar.left.pager, + .l-datetime-picker .l-month-year-pager .bar.left.val, .s-menu-btn span.bar.left.l-click-area, + .bar.abs .left, + .l-datetime-picker .l-month-year-pager .bar.pager .left, + .l-datetime-picker .l-month-year-pager .bar.val .left, + .s-menu-btn span.bar.l-click-area .left { + width: 45%; + right: auto; } + /* line 78, ../../../../general/res/sass/user-environ/_layout.scss */ + .bar.abs.right, .l-datetime-picker .l-month-year-pager .bar.right.pager, + .l-datetime-picker .l-month-year-pager .bar.right.val, .s-menu-btn span.bar.right.l-click-area, + .bar.abs .right, + .l-datetime-picker .l-month-year-pager .bar.pager .right, + .l-datetime-picker .l-month-year-pager .bar.val .right, + .s-menu-btn span.bar.l-click-area .right { + width: 45%; + left: auto; + text-align: right; } + /* line 83, ../../../../general/res/sass/user-environ/_layout.scss */ + .bar.abs.right .icon.major, .l-datetime-picker .l-month-year-pager .bar.right.pager .icon.major, + .l-datetime-picker .l-month-year-pager .bar.right.val .icon.major, .s-menu-btn span.bar.right.l-click-area .icon.major, + .bar.abs .right .icon.major, + .l-datetime-picker .l-month-year-pager .bar.pager .right .icon.major, + .l-datetime-picker .l-month-year-pager .bar.val .right .icon.major, + .s-menu-btn span.bar.l-click-area .right .icon.major { + margin-left: 15px; } + /* line 89, ../../../../general/res/sass/user-environ/_layout.scss */ + .bar.abs .l-flex .left, .l-datetime-picker .l-month-year-pager .bar.pager .l-flex .left, + .l-datetime-picker .l-month-year-pager .bar.val .l-flex .left, .s-menu-btn span.bar.l-click-area .l-flex .left, + .bar.abs .l-flex .right, + .l-datetime-picker .l-month-year-pager .bar.pager .l-flex .right, + .l-datetime-picker .l-month-year-pager .bar.val .l-flex .right, + .s-menu-btn span.bar.l-click-area .l-flex .right, .bar.abs.l-flex .left, .l-datetime-picker .l-month-year-pager .bar.l-flex.pager .left, + .l-datetime-picker .l-month-year-pager .bar.l-flex.val .left, .s-menu-btn span.bar.l-flex.l-click-area .left, + .bar.abs.l-flex .right, + .l-datetime-picker .l-month-year-pager .bar.l-flex.pager .right, + .l-datetime-picker .l-month-year-pager .bar.l-flex.val .right, + .s-menu-btn span.bar.l-flex.l-click-area .right { + width: auto; } + +/* line 98, ../../../../general/res/sass/user-environ/_layout.scss */ +.user-environ .browse-area, +.user-environ .edit-area, +.user-environ .editor { + top: 39px; + right: 10px; + bottom: 35px; + left: 10px; } +/* line 109, ../../../../general/res/sass/user-environ/_layout.scss */ +.user-environ .browse-area > .contents, +.user-environ .edit-area > .contents { + left: 0; + right: 0; } +/* line 115, ../../../../general/res/sass/user-environ/_layout.scss */ +.user-environ .edit-area { + top: 45px; } + /* line 118, ../../../../general/res/sass/user-environ/_layout.scss */ + .user-environ .edit-area .tool-bar { + bottom: auto; + height: 30px; + line-height: 25px; } + /* line 123, ../../../../general/res/sass/user-environ/_layout.scss */ + .user-environ .edit-area .work-area { + top: 40px; } +/* line 128, ../../../../general/res/sass/user-environ/_layout.scss */ +.user-environ .ue-bottom-bar { + overflow: hidden; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + top: auto; + height: 25px; } + /* line 133, ../../../../general/res/sass/user-environ/_layout.scss */ + .user-environ .ue-bottom-bar .status-holder { + z-index: 1; } + /* line 137, ../../../../general/res/sass/user-environ/_layout.scss */ + .user-environ .ue-bottom-bar .app-logo { + left: auto; + width: 105px; + z-index: 2; } + +/* line 145, ../../../../general/res/sass/user-environ/_layout.scss */ +.cols { + overflow: hidden; + *zoom: 1; } + /* line 147, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols .col { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + *zoom: 1; + float: left; + margin-left: 1.5%; + padding-left: 5px; + position: relative; } + /* line 155, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols .col:first-child { + margin-left: 0; + padding-left: 0; } + /* line 162, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-2 .col-1 { + min-width: 250px; + width: 48.5%; } + /* line 168, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-2-ff .col-100px { + width: 100px; } + /* line 175, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-6 .col-1 { + min-width: 83.33333px; + width: 15.16667%; } + /* line 181, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-16 .col-1 { + min-width: 31.25px; + width: 4.75%; } + /* line 184, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-16 .col-2 { + min-width: 62.5px; + width: 11%; } + /* line 187, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-16 .col-7 { + min-width: 218.75px; + width: 42.25%; } + /* line 193, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-32 .col-2 { + min-width: 31.25px; + width: 4.75%; } + /* line 196, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols.cols-32 .col-15 { + min-width: 234.375px; + width: 45.375%; } + /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ + .cols .l-row { + overflow: hidden; + *zoom: 1; + padding: 5px 0; } + +/* line 209, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-mode .split-layout .split-pane-component.pane.treeview.left { + min-width: 150px; + max-width: 800px; + width: 25%; } +/* line 214, ../../../../general/res/sass/user-environ/_layout.scss */ +.browse-mode .split-layout .split-pane-component.pane.t-inspect.right { + min-width: 100px; + max-width: 800px; + width: 20%; } + +/* line 225, ../../../../general/res/sass/user-environ/_layout.scss */ +.edit-mode .split-layout .split-pane-component.pane.right { + width: 15%; } + /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ + .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { + min-height: 50px; + height: 30%; } + +/* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane { + position: absolute; } + /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .pane-header { + text-transform: uppercase; + height: 24px; + line-height: 24px; + margin-bottom: 5px; } + /* line 246, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane.treeview.left .create-btn-holder { + bottom: auto; + top: 0; + height: 24px; } + /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane.treeview.left .create-btn-holder .wrapper.menu-element { + position: absolute; + bottom: 5px; } + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane.treeview.left .search-holder { + top: 34px; } + /* line 258, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane.treeview.left .tree-holder { + overflow: auto; + top: 64px; } + /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane { + z-index: 2; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane { + top: 5px; } + /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { + left: -30px; } + /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { + content: 'F'; } + /* line 276, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { + left: -25px; } + /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { + right: -25px; } + /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { + content: '\e608'; } + /* line 286, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { + right: -20px; } } + /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ + .pane.items .object-browse-bar .left.abs, .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 .right.abs, + .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .right.pager, + .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .right.pager, + .pane.items .object-browse-bar .l-datetime-picker .l-month-year-pager .right.val, + .l-datetime-picker .l-month-year-pager .pane.items .object-browse-bar .right.val, + .pane.items .object-browse-bar .s-menu-btn span.right.l-click-area, + .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { + top: auto; } + +/* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ +.split-layout.horizontal > .pane { + margin-top: 5px; } + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout.horizontal > .pane:first-child { + margin-top: 0; } +/* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ +.split-layout.vertical > .pane { + margin-left: 5px; } + /* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout.vertical > .pane > .holder { + left: 0; + right: 0; } + /* line 323, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout.vertical > .pane:first-child { + margin-left: 0; } + /* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout.vertical > .pane:first-child .holder { + right: 3px; } + +/* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ +.object-holder { + overflow: hidden; + top: 34px; } + /* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ + .object-holder > ng-include { + overflow: auto; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; } + /* line 340, ../../../../general/res/sass/user-environ/_layout.scss */ + .object-holder.l-controls-visible.l-time-controller-visible { + bottom: 88px; } + +/* line 346, ../../../../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, +.top-bar .s-menu-btn, +.tool-bar .s-btn, +.tool-bar .s-menu-btn, +.tool-bar .s-menu-btn { + height: 25px; + line-height: 25px; + vertical-align: top; } + +/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ +.object-browse-bar .view-switcher, +.top-bar .view-switcher { + margin-right: 20px; } + +/* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ +.object-browse-bar { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + height: 24px; + line-height: 24px; + white-space: nowrap; } + /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ + .object-browse-bar .left { + padding-right: 20px; } + /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ + .object-browse-bar .left .l-back { + display: inline-block; + float: left; + margin-right: 10px; } + +/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ +.l-flex { + display: flex; + display: -webkit-flex; + flex-flow: row nowrap; + -webkit-flex-flow: row nowrap; } + /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ + .l-flex .left { + flex: 1 1 0; + -webkit-flex: 1 1 0; + padding-right: 10px; } + +/* line 397, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden .pane.left.treeview, +.pane-tree-hidden .splitter-treeview { + opacity: 0; } +/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-hidden .pane.right.items { + left: 15px !important; } + +/* line 409, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-tree-showing .pane.left.treeview, +.pane-tree-showing .splitter-treeview { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + opacity: 1; } + +/* line 418, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-showing .l-object-and-inspector .pane.right, +.pane-inspect-showing .l-object-and-inspector .splitter-inspect { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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; + opacity: 1; } + +/* line 427, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-hidden .l-object-and-inspector .pane.right, +.pane-inspect-hidden .l-object-and-inspector .splitter-inspect { + opacity: 0; } +/* line 431, ../../../../general/res/sass/user-environ/_layout.scss */ +.pane-inspect-hidden .l-object-and-inspector .pane.left { + right: 15px !important; } + +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 438, ../../../../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; } } +/***************************************************************************** + * 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. + *****************************************************************************/ +@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 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 { + -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 #content-area { + -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; + opacity: 1; } + + /* line 45, ../../../../general/res/sass/mobile/_layout.scss */ + .user-environ .browse-area, + .user-environ .edit-area, + .user-environ .editor { + top: 0; + left: 0; + right: 0; + bottom: 25px; } + + /* line 51, ../../../../general/res/sass/mobile/_layout.scss */ + .holder.l-mobile { + top: 10px !important; + right: 10px !important; + bottom: 10px !important; + left: 10px !important; } + + /* line 65, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-hidden .pane.left.treeview { + right: 100% !important; + width: auto !important; + overflow-y: hidden; + overflow-x: hidden; } + + /* line 82, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.left.treeview { + 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 88, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right.items { + left: 40% !important; } + + /* line 93, ../../../../general/res/sass/mobile/_layout.scss */ + .toggle-tree { + color: #0099cc !important; + font-size: 110%; + position: absolute; + top: 12px; + left: 10px; } + /* line 99, ../../../../general/res/sass/mobile/_layout.scss */ + .toggle-tree:after { + content: 'm' !important; } + + /* line 104, ../../../../general/res/sass/mobile/_layout.scss */ + .object-browse-bar { + left: 30px !important; } + /* line 107, ../../../../general/res/sass/mobile/_layout.scss */ + .object-browse-bar .context-available { + opacity: 1 !important; } + /* line 110, ../../../../general/res/sass/mobile/_layout.scss */ + .object-browse-bar .view-switcher { + margin-right: 0 !important; } + /* line 112, ../../../../general/res/sass/mobile/_layout.scss */ + .object-browse-bar .view-switcher .title-label { + display: none; } + + /* line 119, ../../../../general/res/sass/mobile/_layout.scss */ + .tree-holder { + overflow-x: hidden !important; } + + /* line 123, ../../../../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 128, ../../../../general/res/sass/mobile/_layout.scss */ + .mobile-hide, + .mobile-hide-important { + display: none !important; } + + /* line 133, ../../../../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; + opacity: 0; } + + /* line 138, ../../../../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 screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px) { + /* line 147, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.left.treeview { + width: 90% !important; } + /* line 150, ../../../../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 153, ../../../../general/res/sass/mobile/_layout.scss */ + .pane-tree-showing .pane.right.items #content-area { + opacity: 0; } } +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 161, ../../../../general/res/sass/mobile/_layout.scss */ + .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 + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 26, ../../../../general/res/sass/edit/_editor.scss */ +.edit-main .edit-corner, +.edit-main .edit-handle { + position: absolute; + z-index: 2; } +/* line 32, ../../../../general/res/sass/edit/_editor.scss */ +.edit-main .edit-corner { + width: 15px; + height: 15px; } + /* line 35, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-corner:hover { + z-index: 11; } + /* line 38, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-nw { + -moz-border-radius-bottomright: 5px; + -webkit-border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; + cursor: nw-resize; + top: 0; + left: 0; } + /* line 43, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-ne { + -moz-border-radius-bottomleft: 5px; + -webkit-border-bottom-left-radius: 5px; + border-bottom-left-radius: 5px; + cursor: ne-resize; + top: 0; + right: 0; } + /* line 48, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-se { + -moz-border-radius-topleft: 5px; + -webkit-border-top-left-radius: 5px; + border-top-left-radius: 5px; + cursor: se-resize; + bottom: 0; + right: 0; } + /* line 53, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-sw { + -moz-border-radius-topright: 5px; + -webkit-border-top-right-radius: 5px; + border-top-right-radius: 5px; + cursor: sw-resize; + bottom: 0; + left: 0; } +/* line 61, ../../../../general/res/sass/edit/_editor.scss */ +.edit-main .edit-handle { + top: 15px; + right: 15px; + bottom: 15px; + left: 15px; } + /* line 63, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-move { + cursor: move; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 1; } + /* line 73, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-n { + top: 0px; + bottom: auto; + height: 15px; + cursor: n-resize; } + /* line 78, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-e { + right: 0px; + left: auto; + width: 15px; + cursor: e-resize; } + /* line 83, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-s { + bottom: 0px; + top: auto; + height: 15px; + cursor: s-resize; } + /* line 88, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-w { + left: 0px; + right: auto; + width: 15px; + cursor: w-resize; } +/* line 97, ../../../../general/res/sass/edit/_editor.scss */ +.edit-main .frame.child-frame.panel:hover { + -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + border-color: #0099cc; } + /* line 101, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .view-switcher { + opacity: 1; } + /* line 104, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner { + background-color: rgba(0, 153, 204, 0.8); } + /* line 106, ../../../../general/res/sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner:hover { + background-color: #0099cc; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/search/_search.scss */ +.abs.search-holder, .l-datetime-picker .l-month-year-pager .search-holder.pager, +.l-datetime-picker .l-month-year-pager .search-holder.val, .s-menu-btn span.search-holder.l-click-area { + height: 25px; + bottom: 0; + top: 23px; + z-index: 5; } + /* line 27, ../../../../general/res/sass/search/_search.scss */ + .abs.search-holder.active, .l-datetime-picker .l-month-year-pager .search-holder.active.pager, + .l-datetime-picker .l-month-year-pager .search-holder.active.val, .s-menu-btn span.search-holder.active.l-click-area { + height: auto; + bottom: 0; } + +/* line 38, ../../../../general/res/sass/search/_search.scss */ +.search { + display: flex; + display: -webkit-flex; + flex-direction: column; + -webkit-flex-direction: column; + height: 100%; } + /* line 48, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar { + font-size: 0.8em; + max-width: 250px; + position: relative; + width: 100%; } + /* line 60, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-input { + height: 25px; + line-height: 25px; + padding-top: 0; + padding-bottom: 0; } + /* line 67, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-icon, + .search .search-bar .clear-icon, + .search .search-bar .menu-icon { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #a6a6a6; + height: 17px; + width: 17px; + line-height: 17px; + position: absolute; + text-align: center; + top: 4px; } + /* line 80, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .clear-icon, + .search .search-bar .menu-icon { + cursor: pointer; + -moz-transition: color, 0.25s; + -o-transition: color, 0.25s; + -webkit-transition: color, 0.25s; + transition: color, 0.25s; } + /* line 87, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-input { + position: relative; + width: 100%; + padding-left: 22px !important; + padding-right: 44px !important; } + /* line 94, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-input input { + width: 100%; } + /* line 99, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-icon { + left: 3px; + transition: visibility .15s, opacity .15s, color .2s; + pointer-events: none; } + /* line 119, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-input:hover + div.search-icon { + color: #8c8c8c; } + /* line 123, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .clear-icon { + right: 22px; + visibility: hidden; + opacity: 0; + transition: visibility .15s, opacity .15s, color .2s; } + /* line 132, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .clear-icon.content { + visibility: visible; + opacity: 1; } + /* line 137, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .clear-icon:hover { + color: #8c8c8c; } + /* line 142, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .menu-icon { + font-size: 0.8em; + padding-right: 4px; + right: 4px; + text-align: right; } + /* line 148, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .menu-icon:hover { + color: #8c8c8c; } + /* line 153, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-menu-holder { + float: right; + left: -20px; + z-index: 1; + transition: visibility .05s, opacity .05s; } + /* line 163, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .search-menu-holder.off { + visibility: hidden; + opacity: 0; } + /* line 170, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar .menu-icon:hover + div.search-menu-holder { + visibility: visible; } + /* line 173, ../../../../general/res/sass/search/_search.scss */ + .search .search-bar div.search-menu-holder:hover { + visibility: visible; } + /* line 178, ../../../../general/res/sass/search/_search.scss */ + .search .active-filter-display { + -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; + line-height: 130%; + padding: 5px 0; + padding-left: 1.4625em; + font-size: 0.65em; + margin-top: 3px; } + /* line 193, ../../../../general/res/sass/search/_search.scss */ + .search .active-filter-display .clear-filters-icon { + color: #a6a6a6; + opacity: 1; + font-size: 0.8em; + position: absolute; + left: 1px; + cursor: pointer; } + /* line 205, ../../../../general/res/sass/search/_search.scss */ + .search .active-filter-display.off { + visibility: hidden; + opacity: 0; + height: 0; + margin: 0; + padding: 0; + border: 0; } + /* line 215, ../../../../general/res/sass/search/_search.scss */ + .search .search-scroll { + order: 3; + margin-top: 4px; + overflow-y: auto; + top: auto; + height: auto; + max-height: 100%; + position: relative; } + /* line 226, ../../../../general/res/sass/search/_search.scss */ + .search .search-scroll .load-icon { + position: relative; } + /* line 230, ../../../../general/res/sass/search/_search.scss */ + .search .search-scroll .load-more-button { + margin-top: 5px 0; + font-size: 0.8em; + position: relative; + left: 50%; + margin-left: -45px; + text-align: center; + width: 90px; + white-space: nowrap; } + +@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) { + /* line 5, ../../../../general/res/sass/mobile/search/_search.scss */ + .search .search-bar .menu-icon { + display: none; } + /* line 8, ../../../../general/res/sass/mobile/search/_search.scss */ + .search .search-bar .clear-icon { + right: 5px; } } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .blocker { + background: rgba(0, 0, 0, 0.7); + z-index: 100; } +/* line 27, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .clk-icon.close { + font-size: 0.8rem; + position: absolute; + top: 10px; + right: 10px; + bottom: auto; + left: auto; + z-index: 100; } +/* line 33, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay > .holder { + background-color: #fcfcfc; + -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: #666; + display: inline-block; + -moz-border-radius: 12px; + -webkit-border-radius: 12px; + border-radius: 12px; + color: #666; + top: 15%; + right: 15%; + bottom: 15%; + left: 15%; + z-index: 101; } + /* line 40, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay > .holder > .contents { + top: 25px; + right: 25px; + bottom: 25px; + left: 25px; } +/* line 45, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 1.2em; + margin-bottom: 5px; } +/* line 51, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .top-bar { + height: 60px; } +/* line 55, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .editor { + top: 70px; + bottom: 40px; + left: 0; + right: 0; } +/* line 61, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .bottom-bar { + top: auto; + right: 0; + bottom: 0; + left: 0; + overflow: visible; + height: 30px; + text-align: right; } + /* line 67, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn, .overlay .bottom-bar .s-menu-btn { + font-size: 95%; + height: 30px; + line-height: 30px; + margin-left: 5px; + padding: 0 15px; } + /* line 69, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .bottom-bar .s-btn:not(.major), .overlay .bottom-bar .s-menu-btn:not(.major) { + 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 274, ../../../../general/res/sass/_mixins.scss */ + .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon { + color: #fff; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 279, ../../../../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: #7d7d7d; } + /* line 281, ../../../../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 { + color: white; } } +/* line 85, ../../../../general/res/sass/overlay/_overlay.scss */ +.overlay .contents.l-dialog { + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + overflow: auto; } + /* line 93, ../../../../general/res/sass/overlay/_overlay.scss */ + .overlay .contents.l-dialog .field.l-med input[type='text'] { + width: 100%; } + +@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { + /* line 4, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay .clk-icon.close { + top: 10px; + right: 10px; } + /* line 8, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + top: 0; + right: 0; + bottom: 0; + left: 0; } + /* line 14, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents { + top: 10px; + right: 10px; + bottom: 10px; + left: 10px; } + /* line 21, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .top-bar > .title { + margin-right: 1.2em; } + /* line 26, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .form.editor { + border: none; } + /* line 29, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .form.editor .contents { + top: 0; + right: 0; + bottom: 0; + left: 0; } } +@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) { + /* line 43, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .form.editor .contents .form-row > .label, + .overlay > .holder > .contents .form.editor .contents .form-row > .controls { + display: block; + float: none; + width: 100%; } + /* line 51, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ + .overlay > .holder > .contents .form.editor .contents .form-row > .label:after { + float: none; } } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 23, ../../../../general/res/sass/tree/_tree.scss */ +ul.tree { + margin: 0; + padding: 0; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; } + /* line 331, ../../../../general/res/sass/_mixins.scss */ + ul.tree li { + list-style-type: none; + margin: 0; + padding: 0; } + /* line 26, ../../../../general/res/sass/tree/_tree.scss */ + ul.tree li { + display: block; + position: relative; } + /* line 30, ../../../../general/res/sass/tree/_tree.scss */ + ul.tree ul.tree { + margin-left: 15px; } + +/* line 35, ../../../../general/res/sass/tree/_tree.scss */ +.tree-item, +.search-result-item { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-transition: background-color 0.25s; + -o-transition: background-color 0.25s; + -webkit-transition: background-color 0.25s; + transition: background-color 0.25s; + display: block; + font-size: 0.8rem; + height: 1.5rem; + line-height: 1.5rem; + margin-bottom: 3px; + position: relative; } + /* line 48, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .view-control, + .search-result-item .view-control { + color: #666; + display: inline-block; + margin-left: 5px; + font-size: 0.75em; + width: 10px; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 57, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .view-control:hover, + .search-result-item .view-control:hover { + color: #0099cc !important; } } + /* line 63, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .label, + .search-result-item .label { + display: block; + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + line-height: 1.5rem; } + /* line 71, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .label .type-icon, + .search-result-item .label .type-icon { + font-size: 16px; + color: #0099cc; + left: 5px; + position: absolute; + top: 4px; + bottom: auto; + height: 16px; + line-height: 100%; + right: auto; + width: 16px; } + /* line 84, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .label .type-icon .icon.l-icon-link, .tree-item .label .type-icon .icon.l-icon-alert, + .search-result-item .label .type-icon .icon.l-icon-link, + .search-result-item .label .type-icon .icon.l-icon-alert { + position: absolute; + z-index: 2; } + /* line 89, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .label .type-icon .icon.l-icon-alert, + .search-result-item .label .type-icon .icon.l-icon-alert { + color: #ff3c00; + font-size: 8px; + line-height: 8px; + height: 8px; + width: 8px; + top: 1px; + right: -2px; } + /* line 95, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .label .type-icon .icon.l-icon-link, + .search-result-item .label .type-icon .icon.l-icon-link { + color: #49dedb; + font-size: 8px; + line-height: 8px; + height: 8px; + width: 8px; + left: -3px; + bottom: 0px; } + /* line 103, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .label .title-label, + .search-result-item .label .title-label { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + display: block; + left: 30px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } + /* line 113, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item.selected, + .search-result-item.selected { + background: #1ac6ff; + color: #fcfcfc; } + /* line 116, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item.selected .view-control, + .search-result-item.selected .view-control { + color: #fcfcfc; } + /* line 119, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item.selected .label .type-icon, + .search-result-item.selected .label .type-icon { + color: #fcfcfc; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 127, ../../../../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 130, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item:not(.selected):hover .icon, + .search-result-item:not(.selected):hover .icon { + color: #0099cc; } } + /* line 137, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item:not(.loading), + .search-result-item:not(.loading) { + cursor: pointer; } + /* line 141, ../../../../general/res/sass/tree/_tree.scss */ + .tree-item .context-trigger, + .search-result-item .context-trigger { + top: -1px; + position: absolute; + right: 3px; } + /* line 146, ../../../../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 155, ../../../../general/res/sass/tree/_tree.scss */ +.tree-item .label { + left: 15px; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +@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 27, ../../../../general/res/sass/mobile/_tree.scss */ + ul.tree ul.tree { + margin-left: 20px; } + + /* line 31, ../../../../general/res/sass/mobile/_tree.scss */ + .tree-item, + .search-result-item { + height: 35px; + line-height: 35px; + margin-bottom: 0px; } + /* line 36, ../../../../general/res/sass/mobile/_tree.scss */ + .tree-item .view-control, + .search-result-item .view-control { + position: absolute; + font-size: 1.1em; + right: 0px; + width: 30px; + text-align: center; } + /* line 45, ../../../../general/res/sass/mobile/_tree.scss */ + .tree-item .label, + .search-result-item .label { + left: 0; + right: 35px; + line-height: 35px; } + /* line 50, ../../../../general/res/sass/mobile/_tree.scss */ + .tree-item .label .type-icon, + .search-result-item .label .type-icon { + top: 9px; + bottom: auto; + height: 16px; } } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 25, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame.child-frame.panel { + background: #fcfcfc; + border: 1px solid rgba(102, 102, 102, 0.2); } + /* line 28, ../../../../general/res/sass/user-environ/_frame.scss */ + .frame.child-frame.panel:hover { + border-color: rgba(128, 128, 128, 0.2); } +/* line 32, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame > .object-header.abs, .l-datetime-picker .l-month-year-pager .frame > .object-header.pager, +.l-datetime-picker .l-month-year-pager .frame > .object-header.val, .s-menu-btn .frame > span.object-header.l-click-area { + font-size: 0.75em; + height: 16px; + line-height: 16px; } +/* line 38, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame > .object-holder.abs, .l-datetime-picker .l-month-year-pager .frame > .object-holder.pager, +.l-datetime-picker .l-month-year-pager .frame > .object-holder.val, .s-menu-btn .frame > span.object-holder.l-click-area { + top: 21px; } +/* line 41, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame .contents { + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; } +/* line 49, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame.frame-template .s-btn, .frame.frame-template .s-menu-btn, +.frame.frame-template .s-menu-btn { + height: 16px; + line-height: 16px; + padding: 0 5px; } + /* line 54, ../../../../general/res/sass/user-environ/_frame.scss */ + .frame.frame-template .s-btn > span, .frame.frame-template .s-menu-btn > span, + .frame.frame-template .s-menu-btn > span { + font-size: 0.65rem; } +/* line 59, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame.frame-template .s-menu-btn:after { + font-size: 8px; } +/* line 63, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame.frame-template .view-switcher { + z-index: 10; } +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 69, ../../../../general/res/sass/user-environ/_frame.scss */ + .frame.frame-template .view-switcher { + opacity: 0; } + /* line 72, ../../../../general/res/sass/user-environ/_frame.scss */ + .frame.frame-template:hover .view-switcher { + opacity: 1; } } +/* line 80, ../../../../general/res/sass/user-environ/_frame.scss */ +.frame .view-switcher .title-label { + display: none; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/user-environ/_top-bar.scss */ +.top-bar { + /* .title { + color: #fff; + }*/ } + /* line 23, ../../../../general/res/sass/user-environ/_top-bar.scss */ + .top-bar.browse, .top-bar.edit { + border-bottom: 1px solid rgba(102, 102, 102, 0.2); + top: 10px; + right: 10px; + bottom: auto; + left: 10px; + height: 30px; + line-height: 24px; } + /* line 35, ../../../../general/res/sass/user-environ/_top-bar.scss */ + .top-bar .buttons-main { + font-size: 0.8em; + left: auto; + text-align: right; } + +/* line 48, ../../../../general/res/sass/user-environ/_top-bar.scss */ +.edit-mode .top-bar .buttons-main { + white-space: nowrap; } + /* line 52, ../../../../general/res/sass/user-environ/_top-bar.scss */ + .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .l-datetime-picker .l-month-year-pager .buttons-main.pager, .l-datetime-picker .l-month-year-pager .edit-mode .top-bar .buttons-main.pager, + .edit-mode .top-bar .l-datetime-picker .l-month-year-pager .buttons-main.val, + .l-datetime-picker .l-month-year-pager .edit-mode .top-bar .buttons-main.val, .edit-mode .top-bar .s-menu-btn span.buttons-main.l-click-area, .s-menu-btn .edit-mode .top-bar span.buttons-main.l-click-area { + bottom: auto; + left: auto; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ +.ue-bottom-bar { + background: #000; + color: white; + font-size: .7rem; } + /* line 28, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ + .ue-bottom-bar .status-holder { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + line-height: 15px; + right: 120px; + text-transform: uppercase; } + /* line 39, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ + .ue-bottom-bar .app-logo { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + left: auto; + cursor: pointer; } + /* line 48, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ + .ue-bottom-bar .app-logo.logo-openmctweb { + background: url("../../../../general/res/images/logo-openmctweb.svg") no-repeat center center; } + +/* line 54, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ +.status.block { + display: inline; + margin-right: 10px; } + /* line 58, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ + .status.block .status-indicator { + display: inline-block; + margin-right: 3px; + color: #0099cc; } + /* line 65, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ + .status.block .status-indicator.ok { + color: #009900; } + /* line 68, ../../../../general/res/sass/user-environ/_bottom-bar.scss */ + .status.block .status-indicator.caution { + color: #ffaa00; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/user-environ/_tool-bar.scss */ +.tool-bar { + border-bottom: 1px solid rgba(102, 102, 102, 0.2); } + /* line 24, ../../../../general/res/sass/user-environ/_tool-bar.scss */ + .tool-bar .l-control-group { + height: 25px; } + /* line 27, ../../../../general/res/sass/user-environ/_tool-bar.scss */ + .tool-bar input[type="text"] { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + font-size: .9em; + height: 25px; + margin-bottom: 1px; + position: relative; } + /* line 33, ../../../../general/res/sass/user-environ/_tool-bar.scss */ + .tool-bar input[type="text"].sm { + width: 25px; } + /* line 37, ../../../../general/res/sass/user-environ/_tool-bar.scss */ + .tool-bar .input-labeled label { + font-size: 11.25px; } + +/********************************* VIEWS */ +/***************************************************************************** +* Open MCT Web, Copyright (c) 2014-2015, United States Government +* as represented by the Administrator of the National Aeronautics and Space +* Administration. All rights reserved. +* +* Open MCT Web is licensed under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0. +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +* License for the specific language governing permissions and limitations +* under the License. +* +* Open MCT Web includes source code licensed under additional open source +* licenses. See the Open Source Licenses file (LICENSES.md) included with +* this source code distribution or the Licensing information page available +* at runtime from the About dialog for additional information. +*****************************************************************************/ +/* line 23, ../../../../general/res/sass/_fixed-position.scss */ +.t-fixed-position.l-fixed-position { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; } + /* line 33, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position.l-fixed-position .l-grid-holder { + position: relative; + height: 100%; + width: 100%; } + /* line 37, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position.l-fixed-position .l-grid-holder .l-grid { + position: absolute; + height: 100%; + width: 100%; + pointer-events: none; + z-index: 0; } +/* line 48, ../../../../general/res/sass/_fixed-position.scss */ +.t-fixed-position .l-fixed-position-item { + position: absolute; + border: 1px solid transparent; } + /* line 52, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item.s-selected { + -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + border-color: #0099cc; + cursor: move; } + /* line 57, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item.s-not-selected { + opacity: 0.8; } + /* line 61, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-box, + .t-fixed-position .l-fixed-position-item .l-fixed-position-image, + .t-fixed-position .l-fixed-position-item .l-fixed-position-text { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + height: 100%; + width: 100%; } + /* line 72, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-image { + background-size: cover; + background-repeat: no-repeat; + background-position: center; } + /* line 78, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text { + border: 1px solid transparent; + font-size: 0.8rem; + line-height: 100%; } + /* line 84, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text { + padding: 1px; } + /* line 89, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + display: block; + padding: 2px; } + /* line 96, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title { + float: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: auto; } + /* line 105, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + float: right; + margin-left: 5px; + padding-left: 5px; + padding-right: 5px; + text-align: right; } + /* line 116, ../../../../general/res/sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { + margin-left: 0; + width: 100%; } +/* line 126, ../../../../general/res/sass/_fixed-position.scss */ +.t-fixed-position .l-fixed-position-item-handle { + background: rgba(0, 153, 204, 0.5); + cursor: crosshair; + border: 1px solid #0099cc; + position: absolute; } + +/* line 140, ../../../../general/res/sass/_fixed-position.scss */ +.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-x { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); + background-size: 100%; + background-image: -moz-linear-gradient(0deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(0deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(90deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat-x; } +/* line 144, ../../../../general/res/sass/_fixed-position.scss */ +.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-y { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); + background-size: 100%; + background-image: -moz-linear-gradient(90deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(90deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(0deg, rgba(0, 0, 0, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat-y; } +/* line 152, ../../../../general/res/sass/_fixed-position.scss */ +.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected) { + border: 1px dotted rgba(0, 153, 204, 0.75); } + /* line 154, ../../../../general/res/sass/_fixed-position.scss */ + .edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover { + border: 1px dotted #0099cc; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/lists/_tabular.scss */ +.w1, .w2 { + position: relative; + height: 100%; } + +/* line 27, ../../../../general/res/sass/lists/_tabular.scss */ +.tabular, +table { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-spacing: 0; + border-collapse: collapse; + display: table; + font-size: 0.75rem; + position: relative; + width: 100%; } + /* line 36, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular thead, .tabular .thead, + .tabular tbody tr, .tabular .tbody .tr, + table thead, + table .thead, + table tbody tr, + table .tbody .tr { + width: 100%; } + /* line 40, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular thead, .tabular .thead, + table thead, + table .thead { + border-bottom: 1px solid #fcfcfc; } + /* line 44, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular:not(.fixed-header) tr th, + table:not(.fixed-header) tr th { + background-color: #e3e3e3; } + /* line 48, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tbody, .tabular .tbody, + table tbody, + table .tbody { + display: table-row-group; } + /* line 51, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tbody tr:hover, .tabular tbody .tr:hover, .tabular .tbody tr:hover, .tabular .tbody .tr:hover, + table tbody tr:hover, + table tbody .tr:hover, + table .tbody tr:hover, + table .tbody .tr:hover { + background: rgba(51, 51, 51, 0.1); } + /* line 56, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr, .tabular .tr, + table tr, + table .tr { + display: table-row; } + /* line 58, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr:first-child .td, .tabular .tr:first-child .td, + table tr:first-child .td, + table .tr:first-child .td { + border-top: none; } + /* line 62, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr.group-header td, .tabular tr.group-header .td, .tabular .tr.group-header td, .tabular .tr.group-header .td, + table tr.group-header td, + table tr.group-header .td, + table .tr.group-header td, + table .tr.group-header .td { + background-color: #efefef; + color: #404040; } + /* line 68, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr th, .tabular tr .th, .tabular tr td, .tabular tr .td, .tabular .tr th, .tabular .tr .th, .tabular .tr td, .tabular .tr .td, + table tr th, + table tr .th, + table tr td, + table tr .td, + table .tr th, + table .tr .th, + table .tr td, + table .tr .td { + display: table-cell; } + /* line 71, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr th, .tabular tr .th, .tabular .tr th, .tabular .tr .th, + table tr th, + table tr .th, + table .tr th, + table .tr .th { + border-left: 1px solid #fcfcfc; + color: #333333; + padding: 5px 5px; + white-space: nowrap; + vertical-align: middle; } + /* line 77, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr th:first-child, .tabular tr .th:first-child, .tabular .tr th:first-child, .tabular .tr .th:first-child, + table tr th:first-child, + table tr .th:first-child, + table .tr th:first-child, + table .tr .th:first-child { + border-left: none; } + /* line 81, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr th.sort.sort:after, .tabular tr .th.sort.sort:after, .tabular .tr th.sort.sort:after, .tabular .tr .th.sort.sort:after, + table tr th.sort.sort:after, + table tr .th.sort.sort:after, + table .tr th.sort.sort:after, + table .tr .th.sort.sort:after { + color: #49dedb; + font-family: symbolsfont; + font-size: 8px; + content: "\ed"; + display: inline-block; + margin-left: 3px; } + /* line 89, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr th.sort.sort.desc:after, .tabular tr .th.sort.sort.desc:after, .tabular .tr th.sort.sort.desc:after, .tabular .tr .th.sort.sort.desc:after, + table tr th.sort.sort.desc:after, + table tr .th.sort.sort.desc:after, + table .tr th.sort.sort.desc:after, + table .tr .th.sort.sort.desc:after { + content: "\ec"; } + /* line 93, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr th.sortable, .tabular tr .th.sortable, .tabular .tr th.sortable, .tabular .tr .th.sortable, + table tr th.sortable, + table tr .th.sortable, + table .tr th.sortable, + table .tr .th.sortable { + cursor: pointer; } + /* line 97, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr td, .tabular tr .td, .tabular .tr td, .tabular .tr .td, + table tr td, + table tr .td, + table .tr td, + table .tr .td { + border-bottom: 1px solid #e3e3e3; + min-width: 20px; + color: #333333; + padding: 3px 5px; + word-wrap: break-word; + vertical-align: top; } + /* line 104, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr td.numeric, .tabular tr .td.numeric, .tabular .tr td.numeric, .tabular .tr .td.numeric, + table tr td.numeric, + table tr .td.numeric, + table .tr td.numeric, + table .tr .td.numeric { + text-align: right; } + /* line 107, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr td.s-cell-type-value, .tabular tr .td.s-cell-type-value, .tabular .tr td.s-cell-type-value, .tabular .tr .td.s-cell-type-value, + table tr td.s-cell-type-value, + table tr .td.s-cell-type-value, + table .tr td.s-cell-type-value, + table .tr .td.s-cell-type-value { + text-align: right; } + /* line 109, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular tr td.s-cell-type-value .l-cell-contents, .tabular tr .td.s-cell-type-value .l-cell-contents, .tabular .tr td.s-cell-type-value .l-cell-contents, .tabular .tr .td.s-cell-type-value .l-cell-contents, + table tr td.s-cell-type-value .l-cell-contents, + table tr .td.s-cell-type-value .l-cell-contents, + table .tr td.s-cell-type-value .l-cell-contents, + table .tr .td.s-cell-type-value .l-cell-contents { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + padding-left: 5px; + padding-right: 5px; } + /* line 125, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.filterable tbody, .tabular.filterable .tbody, + table.filterable tbody, + table.filterable .tbody { + top: 44px; } + /* line 128, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.filterable input[type="text"], + table.filterable input[type="text"] { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 100%; } + /* line 134, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.fixed-header, + table.fixed-header { + height: 100%; } + /* line 136, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.fixed-header thead, .tabular.fixed-header .thead, + .tabular.fixed-header tbody tr, .tabular.fixed-header .tbody .tr, + table.fixed-header thead, + table.fixed-header .thead, + table.fixed-header tbody tr, + table.fixed-header .tbody .tr { + display: table; + table-layout: fixed; } + /* line 141, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.fixed-header thead, .tabular.fixed-header .thead, + table.fixed-header thead, + table.fixed-header .thead { + width: calc(100% - 10px); } + /* line 143, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.fixed-header thead:before, .tabular.fixed-header .thead:before, + table.fixed-header thead:before, + table.fixed-header .thead:before { + content: ""; + display: block; + z-index: 0; + position: absolute; + width: 100%; + height: 22px; + background-color: #e3e3e3; } + /* line 153, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.fixed-header tbody, .tabular.fixed-header .tbody, + table.fixed-header tbody, + table.fixed-header .tbody { + overflow: hidden; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + top: 22px; + display: block; + overflow-y: scroll; } + /* line 161, ../../../../general/res/sass/lists/_tabular.scss */ + .tabular.t-event-messages td, .tabular.t-event-messages .td, + table.t-event-messages td, + table.t-event-messages .td { + min-width: 150px; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 31, ../../../../general/res/sass/plots/_plots-main.scss */ +.gl-plot { + color: #666; + font-size: 0.7rem; + position: relative; + width: 100%; + height: 100%; + /****************************** Limits and Out-of-Bounds data */ } + /* line 38, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-axis-area { + position: absolute; } + /* line 41, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-axis-area.gl-plot-x { + top: auto; + right: 0; + bottom: 5px; + left: 60px; + height: 32px; + width: auto; + overflow: hidden; } + /* line 50, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-axis-area.gl-plot-y { + top: 25px; + right: auto; + bottom: 37px; + left: 0; + width: 60px; } + /* line 59, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-coords { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + background: black; + color: #b3b3b3; + padding: 2px 5px; + position: absolute; + top: 35px; + right: auto; + bottom: auto; + left: 70px; + z-index: 10; } + /* line 71, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-coords:empty { + display: none; } + /* line 76, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-display-area { + background-color: rgba(0, 0, 0, 0.05); + position: absolute; + top: 25px; + right: 0; + bottom: 37px; + left: 60px; + cursor: crosshair; + border: 1px solid rgba(102, 102, 102, 0.2); } + /* line 89, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label, + .gl-plot .l-plot-label { + color: #999999; + position: absolute; + text-align: center; } + /* line 97, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label, + .gl-plot .l-plot-label.gl-plot-x-label, + .gl-plot .l-plot-label.l-plot-x-label { + top: auto; + right: 0; + bottom: 0; + left: 0; + height: auto; } + /* line 106, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label, + .gl-plot .l-plot-label.gl-plot-y-label, + .gl-plot .l-plot-label.l-plot-y-label { + -moz-transform-origin: 50% 0; + -ms-transform-origin: 50% 0; + -webkit-transform-origin: 50% 0; + transform-origin: 50% 0; + -moz-transform: translateX(-50%) rotate(-90deg); + -ms-transform: translateX(-50%) rotate(-90deg); + -webkit-transform: translateX(-50%) rotate(-90deg); + transform: translateX(-50%) rotate(-90deg); + display: inline-block; + margin-left: 5px; + left: 0; + top: 50%; + white-space: nowrap; } + /* line 120, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-y-options { + position: absolute; + top: 50%; + right: auto; + bottom: auto; + left: auto5px; + margin-top: -16px; + height: auto; + min-height: 32px; + width: 32px; } + /* line 134, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-hash { + position: absolute; + border: 0 rgba(0, 0, 0, 0.2) dashed; } + /* line 137, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-hash.hash-v { + border-right-width: 1px; + height: 100%; } + /* line 141, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-hash.hash-h { + border-bottom-width: 1px; + width: 100%; } + /* line 147, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-legend { + position: absolute; + top: 0; + right: 0; + bottom: auto; + left: 0; + height: 20px; + overflow-x: hidden; + overflow-y: auto; } + /* line 160, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .l-limit-bar, + .gl-plot .l-oob-data { + position: absolute; + left: 0; + right: 0; + width: auto; } + /* line 168, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .l-limit-bar { + height: auto; + z-index: 0; } + /* line 176, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .l-limit-bar.s-limit-yellow { + background: rgba(255, 170, 0, 0.2); } + /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .l-limit-bar.s-limit-red { + background: rgba(255, 0, 0, 0.2); } + /* line 180, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .l-oob-data { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + pointer-events: none; + height: 10px; + z-index: 1; } + /* line 188, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .l-oob-data.l-oob-data-up { + top: 0; + bottom: auto; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); + background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); + background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } + /* line 193, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .l-oob-data.l-oob-data-dwn { + bottom: 0; + top: auto; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); + background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); + background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } + +/* line 203, ../../../../general/res/sass/plots/_plots-main.scss */ +.gl-plot-legend .plot-legend-item, +.gl-plot-legend .legend-item, +.legend .plot-legend-item, +.legend .legend-item { + display: inline-block; + margin-right: 10px; + margin-bottom: 3px; } + /* line 208, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot-legend .plot-legend-item span, + .gl-plot-legend .legend-item span, + .legend .plot-legend-item span, + .legend .legend-item span { + vertical-align: middle; } + /* line 211, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot-legend .plot-legend-item .plot-color-swatch, + .gl-plot-legend .plot-legend-item .color-swatch, + .gl-plot-legend .legend-item .plot-color-swatch, + .gl-plot-legend .legend-item .color-swatch, + .legend .plot-legend-item .plot-color-swatch, + .legend .plot-legend-item .color-swatch, + .legend .legend-item .plot-color-swatch, + .legend .legend-item .color-swatch { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + display: inline-block; + height: 8px; + width: 8px; } + +/* line 228, ../../../../general/res/sass/plots/_plots-main.scss */ +.gl-plot-legend .plot-legend-item { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + line-height: 1.5em; + padding: 0px 5px; } + /* line 234, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot-legend .plot-legend-item .plot-color-swatch { + border: 1px solid #fcfcfc; + height: 9px; + width: 9px; } + +/* line 242, ../../../../general/res/sass/plots/_plots-main.scss */ +.tick { + position: absolute; + border: 0 rgba(0, 0, 0, 0.2) solid; } + /* line 245, ../../../../general/res/sass/plots/_plots-main.scss */ + .tick.tick-x { + border-right-width: 1px; + height: 100%; } + +/* line 251, ../../../../general/res/sass/plots/_plots-main.scss */ +.gl-plot-tick, +.tick-label { + font-size: 0.7rem; + position: absolute; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } + /* line 259, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, + .tick-label.gl-plot-x-tick-label, + .tick-label.tick-label-x { + right: auto; + bottom: auto; + left: auto; + height: auto; + width: 20%; + margin-left: -10%; + text-align: center; } + /* line 269, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, + .tick-label.gl-plot-y-tick-label, + .tick-label.tick-label-y { + top: auto; + height: 1em; + width: auto; + margin-bottom: -0.5em; + text-align: right; } + +/* line 281, ../../../../general/res/sass/plots/_plots-main.scss */ +.gl-plot-tick.gl-plot-x-tick-label { + top: 5px; } +/* line 284, ../../../../general/res/sass/plots/_plots-main.scss */ +.gl-plot-tick.gl-plot-y-tick-label { + right: 5px; + left: 5px; } + +/* line 291, ../../../../general/res/sass/plots/_plots-main.scss */ +.tick-label.tick-label-x { + top: 0; } +/* line 294, ../../../../general/res/sass/plots/_plots-main.scss */ +.tick-label.tick-label-y { + right: 0; + left: 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. + *****************************************************************************/ +/* Styles for the iframe EmbeddedPageController element */ +/* line 25, ../../../../general/res/sass/_iframe.scss */ +.l-iframe iframe { + display: block; + height: 100%; + width: 100%; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +/******************************** BROWSE */ +/* line 27, ../../../../general/res/sass/_hide-non-functional.scss */ +.browse-mode .browse.top-bar { + display: none; } +/* line 32, ../../../../general/res/sass/_hide-non-functional.scss */ +.browse-mode .browse-area.holder { + top: 10px; } + +/* Styles for sub-dividing views generically */ +/* line 3, ../../../../general/res/sass/_views.scss */ +.l-view-section { + overflow: hidden; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + font-size: 0.8rem; } + /* line 6, ../../../../general/res/sass/_views.scss */ + .l-view-section h2 { + color: #fff; + margin-bottom: 5px; } + /* line 10, ../../../../general/res/sass/_views.scss */ + .l-view-section.fixed { + font-size: 0.8em; } + /* line 13, ../../../../general/res/sass/_views.scss */ + .l-view-section .controls, + .l-view-section label, + .l-view-section .inline-block { + display: inline-block; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/items/_item.scss */ +.items-holder { + overflow: hidden; + *zoom: 1; + overflow-y: auto; } + /* line 25, ../../../../general/res/sass/items/_item.scss */ + .items-holder .contents { + top: 0; } + /* line 29, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item { + background-color: #ddd; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #666; + 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; + box-sizing: border-box; + cursor: pointer; + float: left; + height: 200px; + width: 200px; + margin-bottom: 3px; + margin-right: 3px; + position: relative; } + /* line 274, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item .icon { + color: #0099cc; } + @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 279, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover { + background: #d0d0d0; } + /* line 281, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover > .icon { + color: #33ccff; } } + /* line 45, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item:hover .item-main .item-type { + color: deepskyblue; } + /* line 47, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item:hover .item-main .item-type .l-icon-link { + color: #49dedb; } + /* line 51, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item:hover .item-main .item-open { + opacity: 1; } + /* line 55, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .contents { + top: 10px; + right: 10px; + bottom: 10px; + left: 10px; } + /* line 61, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .bar.top-bar { + bottom: auto; + color: #8c8c8c; + height: 20px; + line-height: 20px; + text-align: right; + z-index: 5; } + /* line 68, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .bar.top-bar .left, .items-holder .item.grid-item .bar.top-bar .right { + width: auto; } + /* line 70, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .bar.top-bar .left .icon, .items-holder .item.grid-item .bar.top-bar .right .icon { + margin-left: 3px; } + /* line 72, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .bar.top-bar .left .icon.l-icon-link, .items-holder .item.grid-item .bar.top-bar .right .icon.l-icon-link { + color: #49dedb; } + /* line 78, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .bar.bottom-bar { + top: auto; + line-height: 110%; } + /* line 83, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .item-main { + line-height: 160px; + z-index: 1; } + /* line 89, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .item-main .item-type { + overflow: false; + position: absolute; + top: 40px; + right: 40px; + bottom: 40px; + left: 40px; + width: auto; + height: auto; + text-align: center; + font-size: 96.9px; + line-height: 102px; + bottom: auto; + height: 102px; + top: 30px; } + /* line 100, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .item-main .item-type .l-icon-link { + color: #49dedb; + height: auto; + line-height: 100%; + position: absolute; + font-size: 0.3em; + left: 0px; + bottom: 10px; + z-index: 2; } + /* line 111, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .item-main .item-open { + -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: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0; + color: #8c8c8c; + font-size: 3em; + left: auto; + width: 50px; + pointer-events: none; + text-align: right; } + /* line 121, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .title { + text-shadow: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #666; } + /* line 126, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item .details { + text-shadow: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #8c8c8c; + font-size: 0.8em; } + /* line 132, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item.selected { + background-color: #0099cc; + -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; + color: #80dfff; } + /* line 274, ../../../../general/res/sass/_mixins.scss */ + .items-holder .item.grid-item.selected .icon { + color: #eee; } + /* line 137, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { + color: #80dfff; } + /* line 138, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item.selected .item-main .item-open { + color: #80dfff; } + /* line 139, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item.selected .title { + color: white; } + /* line 141, ../../../../general/res/sass/items/_item.scss */ + .items-holder .item.grid-item.selected:hover .item-main .item-type { + color: white !important; } + +/***************************************************************************** + * 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. + *****************************************************************************/ +@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 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 { + font-size: 30px; + right: auto; + bottom: auto; + left: 0; + line-height: 100%; + text-align: left; + width: 30px; } + /* line 61, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-type .l-icon-link { + bottom: 0; } + /* line 65, ../../../../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 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) { + /* line 29, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item { + height: 50px; } + /* line 78, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.top-bar { + line-height: 50px !important; } + /* line 82, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.bottom-bar { + top: 7px; + bottom: auto; + height: 35px; } + /* line 87, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-type { + top: 10px; + bottom: auto; + height: 30px; } + /* line 90, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-open { + line-height: 50px; } } +@media 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 29, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item { + height: 66px; } + /* line 100, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.top-bar { + line-height: 66px !important; } + /* line 104, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .bar.bottom-bar { + top: 15px; + bottom: auto; + height: 35px; } + /* line 109, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-type { + top: 18px; + bottom: auto; + height: 30px; } + /* line 112, ../../../../general/res/sass/mobile/_item.scss */ + .items-holder .item.grid-item .item-main .item-open { + line-height: 66px; } } + +/********************************* TO BE MOVED */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../../../../general/res/sass/_autoflow.scss */ +.autoflow { + font-size: 0.75rem; } + /* line 32, ../../../../general/res/sass/_autoflow.scss */ + .autoflow:hover .l-autoflow-header .s-btn.change-column-width, .autoflow:hover .l-autoflow-header .change-column-width.s-menu-btn { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -moz-transition-duration: 50ms; + -o-transition-duration: 50ms; + -webkit-transition-duration: 50ms; + transition-duration: 50ms; + -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 40, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-header { + bottom: auto; + height: 22px; + line-height: 22px; + min-width: 225px; } + /* line 45, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-header span { + vertical-align: middle; } + /* line 48, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-header .s-btn.change-column-width, .autoflow .l-autoflow-header .change-column-width.s-menu-btn { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -moz-transition-duration: 500ms; + -o-transition-duration: 500ms; + -webkit-transition-duration: 500ms; + transition-duration: 500ms; + -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 52, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-header .l-filter { + margin-left: 5px; } + /* line 54, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-header .l-filter input.t-filter-input { + width: 100px; } + /* line 60, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items { + overflow-x: scroll; + overflow-y: hidden; + top: 32px; + white-space: nowrap; } + /* line 66, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-left: 1px solid rgba(102, 102, 102, 0.2); + display: inline-block; + padding-left: 5px; + padding-right: 5px; + vertical-align: top; + width: 225px; } + /* line 76, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-bottom: 1px solid rgba(255, 255, 255, 0.05); + display: block; + height: 15px; + line-height: 15px; + margin-bottom: 1px; + margin-top: 1px; + position: relative; } + /* line 85, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:first-child { + border-top: none; } + /* line 88, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover { + background: rgba(255, 255, 255, 0.1); } + /* line 93, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.l { + color: rgba(51, 51, 51, 0.3) !important; + font-style: italic; } + /* line 94, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.r { + color: rgba(51, 51, 51, 0.5) !important; + font-style: italic; } + /* line 97, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.s-stale) .l-autoflow-item.r { + color: gray; } + /* line 101, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { + border-top: 1px solid rgba(153, 153, 153, 0.2); } + /* line 104, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { + display: block; } + /* line 106, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.l { + float: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: auto; } + /* line 113, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.r { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + float: right; + margin-left: 5px; + padding-left: 5px; + padding-right: 5px; + text-align: right; } + /* line 124, ../../../../general/res/sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col:first-child { + border-left: none; + padding-left: 0; } + +/* line 1, ../../../../general/res/sass/features/_imagery.scss */ +.l-image-main-wrapper, +.l-image-main, +.l-image-main-controlbar, +.l-image-thumbs-wrapper { + overflow: false; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; } + +/*************************************** MAIN LAYOUT */ +/* line 9, ../../../../general/res/sass/features/_imagery.scss */ +.l-image-main-wrapper { + min-height: 100px; + min-width: 150px; } + /* line 16, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-wrapper .l-image-main { + background-color: rgba(0, 0, 0, 0.05); + bottom: 30px; } + /* line 20, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-wrapper .l-image-main-controlbar { + top: auto; + height: 25px; } + +/* line 26, ../../../../general/res/sass/features/_imagery.scss */ +.l-image-thumbs-wrapper { + top: auto; + height: 168px; } + +/* line 32, ../../../../general/res/sass/features/_imagery.scss */ +.l-date, +.l-time, +.l-timezone { + display: inline-block; } + +/*************************************** MAIN IMAGE */ +/* line 40, ../../../../general/res/sass/features/_imagery.scss */ +.l-image-main, +.l-image-thumb-item .l-thumb { + background-size: contain; + background-position: center; + background-repeat: no-repeat; } + +/* line 51, ../../../../general/res/sass/features/_imagery.scss */ +.l-image-main-controlbar { + font-size: 0.8em; + line-height: 25px; } + /* line 55, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .left, .l-image-main-controlbar .right { + direction: rtl; + overflow: hidden; } + /* line 59, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .left { + text-align: left; } + /* line 63, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .right { + z-index: 2; } + /* line 67, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .l-date, + .l-image-main-controlbar .l-time { + color: #333333; } + /* line 71, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .l-mag { + direction: ltr; + display: inline-block; } + /* line 75, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .l-mag:before { + content: "\000049"; } + /* line 79, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .s-mag { + color: #999999; } + /* line 82, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-main-controlbar .l-btn.show-thumbs { + display: none; } + +/* line 87, ../../../../general/res/sass/features/_imagery.scss */ +.s-image-main { + border: 1px solid transparent; } + /* line 89, ../../../../general/res/sass/features/_imagery.scss */ + .s-image-main.paused { + border-color: #ff9900; } + +/*************************************** THUMBS */ +/* line 96, ../../../../general/res/sass/features/_imagery.scss */ +.l-image-thumbs-wrapper { + direction: rtl; + overflow-x: auto; + overflow-y: hidden; + padding-bottom: 5px; + white-space: nowrap; + z-index: 70; } + +/* line 106, ../../../../general/res/sass/features/_imagery.scss */ +.l-image-thumb-item { + -moz-transition: background-color 0.25s; + -o-transition: background-color 0.25s; + -webkit-transition: background-color 0.25s; + transition: background-color 0.25s; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 1px; + position: relative; + cursor: pointer; + direction: ltr; + display: inline-block; + font-size: 0.8em; + margin-left: 3px; + text-align: left; + width: 122px; + white-space: normal; } + /* line 111, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-thumb-item .l-thumb, + .l-image-thumb-item .l-date, + .l-image-thumb-item .l-time { + display: inline-block; } + /* line 116, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-thumb-item .l-date, + .l-image-thumb-item .l-time { + padding: 2px 3px; } + /* line 128, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-thumb-item:hover { + background: rgba(255, 255, 255, 0.2); } + /* line 130, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-thumb-item:hover .l-date, + .l-image-thumb-item:hover .l-time { + color: #fff; } + /* line 135, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-thumb-item.selected { + background: #0099cc; } + /* line 137, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-thumb-item.selected .l-date, + .l-image-thumb-item.selected .l-time { + color: #fff; } + /* line 142, ../../../../general/res/sass/features/_imagery.scss */ + .l-image-thumb-item .l-thumb { + background-color: rgba(255, 255, 255, 0.1); + height: 120px; + width: 120px; + margin-top: 0; } + +/*************************************** WHEN IN FRAME */ +/* line 152, ../../../../general/res/sass/features/_imagery.scss */ +.frame .t-imagery .l-image-main-wrapper { + bottom: 0; } + /* line 154, ../../../../general/res/sass/features/_imagery.scss */ + .frame .t-imagery .l-image-main-wrapper .l-image-main-controlbar { + font-size: 0.7em; } +/* line 163, ../../../../general/res/sass/features/_imagery.scss */ +.frame .t-imagery .l-image-thumbs-wrapper { + display: none; } + +/* line 5, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display:hover .l-btn.control { + opacity: 1; } +/* line 9, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display .l-elem-wrapper { + position: relative; } +/* line 12, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display .l-elem { + display: inline-block; } +/* line 17, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display.l-timer .l-elem.l-value { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + position: absolute; + left: 0; + z-index: 1; } + /* line 22, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { + font-size: 0.8em; } +/* line 26, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display.l-timer:hover .l-elem.l-value { + left: 20px; } +/* line 33, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display .l-elem .value.active, .l-time-display .l-elem.value.active { + color: #fff; } +/* line 38, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display .l-btn.control { + -moz-transition-property: opacity, background-color, border-color, color; + -o-transition-property: opacity, background-color, border-color, color; + -webkit-transition-property: opacity, background-color, border-color, color; + transition-property: opacity, background-color, border-color, color; + -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: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + opacity: 0; + font-size: 0.65em; + vertical-align: top; } + +/* line 3, ../sass/_controls.scss */ +.s-btn.major .title-label, .major.s-menu-btn .title-label { + text-transform: uppercase; } diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index f97f2a4df0..13390fa79e 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -75,6 +75,13 @@ $colorInputIcon: pushBack($colorBodyFg, 25%); $colorSelectBg: #ddd; $colorSelectFg: $colorBodyFg; +// Inspector +$colorInspectorFg: $colorBodyFg; +$colorInspectorPropName: pushBack($colorBodyFg, 20%); +$colorInspectorPropVal: $colorInspectorFg; +$colorInspectorSectionHeaderBg: pullForward($colorBodyBg, 5%); +$colorInspectorSectionHeaderFg: pullForward($colorBodyBg, 40%); + // Limits and staleness colors// $colorTelemFresh: pullForward($colorBodyFg, 20%); $colorTelemStale: pushBack($colorBodyFg, 20%); @@ -110,6 +117,7 @@ $colorItemBgSelected: $colorKey; // Tabular $colorTabBorder: pullForward($colorBodyBg, 10%); +$colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); $colorTabBodyBg: $colorBodyBg; $colorTabBodyFg: pullForward($colorBodyFg, 20%); $colorTabHeaderBg: pullForward($colorBodyBg, 10%); @@ -125,6 +133,7 @@ $colorPlotAreaBorder: $colorInteriorBorder; $colorPlotLabelFg: pushBack($colorPlotFg, 20%); // Tree +$colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: $colorItemTreeIcon; //pushBack($colorItemTreeIcon, 20%); $colorItemTreeVCHover: $colorKey; From 17b3378655346a006c8ec2e1345fea08d1fcb6c5 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 23 Oct 2015 15:36:52 -0700 Subject: [PATCH 086/201] [Frontend] Expand/collapse styling open #90 Modding mini-tab look, just started; --- .../commonUI/general/res/sass/_inspector.scss | 2 - .../general/res/sass/controls/_buttons.scss | 91 ++++++ .../res/sass/user-environ/_layout.scss | 2 + .../espresso/res/css/theme-espresso.css | 282 ++++++++++++------ .../themes/snow/res/css/theme-snow.css | 282 ++++++++++++------ 5 files changed, 491 insertions(+), 168 deletions(-) diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index fcb8ebc959..bd818738a9 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -21,8 +21,6 @@ *****************************************************************************/ /* Styles for the Inspector pane */ -//.pane.right.t-inspect { @include test(green, 0.3); } // TEMP! - .l-inspect, .l-inspect table tr td { font-size: 0.7rem; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index c33e2306ac..8efcc9af18 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -102,6 +102,97 @@ $pad: $interiorMargin * $baseRatio; } .mini-tab { + // Meant to be used as pane hide/show control elements in concert with mct-splitter + @extend .ui-symbol; + @include desktop { + @include trans-prop-nice(left, 150ms); + //@include test(green); + $iconD: 12px; + $arwD: 7px; + $arwOffsetX: 0px; + $arwAnimOffsetX: 2px; + $arwToLeftAnimX: -1 * $arwAnimOffsetX; + $arwToRightAnimX: $arwAnimOffsetX; + $arwToLeftX: ($arwOffsetX + $arwD) * -1; + $arwToRightX: $iconD + $arwOffsetX; + $c: pullForward($colorBodyBg, 15%); + color: $c; + cursor: pointer; + display: block; + position: absolute; + font-size: $iconD; + line-height: $iconD; + height: $iconD; width: $iconD; + + &:hover { + color: pullForward($c, 20%); + &:after { + color: $colorKey; + } + } + + &:before, + &:after { + @include trans-prop-nice(color, 200ms); + display: block; + position: absolute; + } + + &:before { + // Always the arrow icon + @include trans-prop-nice(left, 150ms); + //@include test(green); + font-size: $arwD; + height: 100%; width: $arwD; + } + &:after { + // Always vertical bar element + width: 100%; + height: 100%; + } + + &.anchor-left { + // < [] + $xpos: $arwToLeftX; + &:before { + content:'\3c'; + left: $xpos; + } + &:hover:before { left: $xpos + $arwToLeftAnimX; } + &.collapsed { + $xpos: $arwToRightX; + &:before { + content:'\3e'; + left: $xpos; + } + &:hover:before { left: $xpos + $arwToRightAnimX; } + } + } + &.anchor-right { + // [] > + $xpos: $arwToRightX; + &:before { + content:'\3e'; + left: $xpos; + } + &:hover:before { left: $xpos + $arwToRightAnimX; } + &.collapsed { + $xpos: $arwToLeftX; + &:before { + content:'\3c'; + left: $xpos; + } + &:hover:before { left: $xpos + $arwToLeftAnimX; } + } + } + + &.collapsed { + // State when the pane this element controls has been collapsed + } + } +} + +.mini-tab-icon { // Meant to be used as pane hide/show control elements in concert with mct-splitter @extend .ui-symbol; @include desktop { diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 6a3d9ac2f5..d32ac2cb93 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -214,6 +214,7 @@ &.t-inspect.right { min-width: 100px; max-width: 800px; + padding-left: 15px; // Allow room for mini-tab element width: $ueBrowseRightPaneInspectW; } } @@ -233,6 +234,7 @@ } .pane { + @include box-sizing(border-box); position: absolute; .pane-header { diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 08c6beb3d7..602b4455ed 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -603,29 +603,29 @@ mct-container { border-right: 5px solid transparent; } /* line 31, ../../../../general/res/sass/_icons.scss */ -.ui-symbol, .s-icon-btn, .mini-tab, .l-datetime-picker .l-month-year-pager .pager { +.ui-symbol, .s-icon-btn, .mini-tab, .mini-tab-icon, .l-datetime-picker .l-month-year-pager .pager { font-family: 'symbolsfont'; } /* line 33, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.type-icon, .type-icon.s-icon-btn, .type-icon.mini-tab, .l-datetime-picker .l-month-year-pager .type-icon.pager { + .ui-symbol.type-icon, .type-icon.s-icon-btn, .type-icon.mini-tab, .type-icon.mini-tab-icon, .l-datetime-picker .l-month-year-pager .type-icon.pager { color: #cccccc; } /* line 36, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon, .icon.s-icon-btn, .icon.mini-tab, .l-datetime-picker .l-month-year-pager .icon.pager { + .ui-symbol.icon, .icon.s-icon-btn, .icon.mini-tab, .icon.mini-tab-icon, .l-datetime-picker .l-month-year-pager .icon.pager { color: #0099cc; } /* line 38, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert, .icon.alert.s-icon-btn, .icon.alert.mini-tab, .l-datetime-picker .l-month-year-pager .icon.alert.pager { + .ui-symbol.icon.alert, .icon.alert.s-icon-btn, .icon.alert.mini-tab, .icon.alert.mini-tab-icon, .l-datetime-picker .l-month-year-pager .icon.alert.pager { color: #ff3c00; } /* line 40, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert:hover, .icon.alert.s-icon-btn:hover, .icon.alert.mini-tab:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { + .ui-symbol.icon.alert:hover, .icon.alert.s-icon-btn:hover, .icon.alert.mini-tab:hover, .icon.alert.mini-tab-icon:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { color: #ff8a66; } /* line 44, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.major, .icon.major.s-icon-btn, .icon.major.mini-tab, .l-datetime-picker .l-month-year-pager .icon.major.pager { + .ui-symbol.icon.major, .icon.major.s-icon-btn, .icon.major.mini-tab, .icon.major.mini-tab-icon, .l-datetime-picker .l-month-year-pager .icon.major.pager { font-size: 1.65em; } /* line 48, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon-calendar:after, .icon-calendar.s-icon-btn:after, .icon-calendar.mini-tab:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { + .ui-symbol.icon-calendar:after, .icon-calendar.s-icon-btn:after, .icon-calendar.mini-tab:after, .icon-calendar.mini-tab-icon:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { content: "\e605"; } /* line 53, ../../../../general/res/sass/_icons.scss */ -.bar .ui-symbol, .bar .s-icon-btn, .bar .mini-tab, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { +.bar .ui-symbol, .bar .s-icon-btn, .bar .mini-tab, .bar .mini-tab-icon, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { display: inline-block; } /* line 57, ../../../../general/res/sass/_icons.scss */ @@ -1258,27 +1258,27 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* Styles for the Inspector pane */ -/* line 26, ../../../../general/res/sass/_inspector.scss */ +/* line 24, ../../../../general/res/sass/_inspector.scss */ .l-inspect, .l-inspect table tr td { font-size: 0.7rem; } -/* line 31, ../../../../general/res/sass/_inspector.scss */ +/* line 29, ../../../../general/res/sass/_inspector.scss */ .l-inspect { color: #999; } - /* line 33, ../../../../general/res/sass/_inspector.scss */ + /* line 31, ../../../../general/res/sass/_inspector.scss */ .l-inspect .pane-header { color: #666666; font-size: 0.8rem; } - /* line 38, ../../../../general/res/sass/_inspector.scss */ + /* line 36, ../../../../general/res/sass/_inspector.scss */ .l-inspect ul li, .l-inspect em { display: block; position: relative; } - /* line 44, ../../../../general/res/sass/_inspector.scss */ + /* line 42, ../../../../general/res/sass/_inspector.scss */ .l-inspect ul li { margin-bottom: 20px; } - /* line 48, ../../../../general/res/sass/_inspector.scss */ + /* line 46, ../../../../general/res/sass/_inspector.scss */ .l-inspect em { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -1288,40 +1288,40 @@ mct-container { margin-bottom: 5px; padding: 5px 5px; text-transform: uppercase; } - /* line 58, ../../../../general/res/sass/_inspector.scss */ + /* line 56, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr td { border: none; border-top: 1px solid rgba(153, 153, 153, 0.1) !important; padding: 2px 0; vertical-align: top; } - /* line 63, ../../../../general/res/sass/_inspector.scss */ + /* line 61, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr td.label { color: #666666 !important; padding-right: 5px !important; white-space: nowrap; } - /* line 68, ../../../../general/res/sass/_inspector.scss */ + /* line 66, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr td.value { word-break: break-all; } - /* line 73, ../../../../general/res/sass/_inspector.scss */ + /* line 71, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr:first-child td { border-top: none !important; } - /* line 78, ../../../../general/res/sass/_inspector.scss */ + /* line 76, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location { line-height: 180%; } - /* line 80, ../../../../general/res/sass/_inspector.scss */ + /* line 78, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item { cursor: pointer; display: inline; position: relative; padding: 2px 4px; } - /* line 85, ../../../../general/res/sass/_inspector.scss */ + /* line 83, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover { background: rgba(153, 153, 153, 0.1); color: #cccccc; } - /* line 88, ../../../../general/res/sass/_inspector.scss */ + /* line 86, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover .icon { color: #33ccff; } - /* line 93, ../../../../general/res/sass/_inspector.scss */ + /* line 91, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location:not(.first):before { color: #737373; content: '\3e'; @@ -1649,45 +1649,152 @@ mct-container { .mini-tab:after { width: 100%; height: 100%; } - /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 157, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; left: -7px; } - /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 161, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:hover:before { left: -9px; } - /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 164, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 12px; } - /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 168, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 14px; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 12px; } - /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 178, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:hover:before { left: 14px; } - /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 181, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { content: '\3c'; left: -7px; } - /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { left: -9px; } } -/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 195, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + color: #595959; + cursor: pointer; + display: block; + position: absolute; + font-size: 12px; + line-height: 12px; + height: 12px; + width: 12px; } + /* line 218, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:hover { + color: #8c8c8c; } + /* line 220, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:hover:after { + color: #0099cc; } + /* line 225, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:before, .mini-tab-icon:after { + -moz-transition-property: color; + -o-transition-property: color; + -webkit-transition-property: color; + transition-property: color; + -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: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + display: block; + position: absolute; } + /* line 232, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:before { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + font-size: 7px; + height: 100%; + width: 7px; } + /* line 239, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:after { + width: 100%; + height: 100%; } + /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left:before { + content: '\3c'; + left: -7px; } + /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left:hover:before { + left: -9px; } + /* line 256, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left.collapsed:before { + content: '\3e'; + left: 12px; } + /* line 260, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left.collapsed:hover:before { + left: 14px; } + /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right:before { + content: '\3e'; + left: 12px; } + /* line 270, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right:hover:before { + left: 14px; } + /* line 273, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right.collapsed:before { + content: '\3c'; + left: -7px; } + /* line 277, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right.collapsed:hover:before { + left: -9px; } } + +/* line 287, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 293, ../../../../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 208, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 299, ../../../../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; @@ -1696,7 +1803,7 @@ mct-container { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 306, ../../../../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; @@ -1705,7 +1812,7 @@ mct-container { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 222, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 313, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -2409,7 +2516,7 @@ label.checkbox.custom { left: 0; text-align: left; } /* line 57, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { + .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .icon.mini-tab-icon, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { width: 12px; } /******************************************************** MENUS THEMSELVES */ @@ -2697,10 +2804,11 @@ mct-include.l-time-controller { mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl { color: #666666; } /* line 69, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.pager { font-size: 11px; @@ -3426,10 +3534,11 @@ span.req { .t-filter input.t-filter-input:not(.ng-dirty) + .t-a-clear { display: none; } /* line 42, ../../../../general/res/sass/forms/_filter.scss */ -.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, +.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .icon.mini-tab-icon, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, .t-filter .icon.ui-symbol, .t-filter .icon.s-icon-btn, .t-filter .icon.mini-tab, +.t-filter .icon.mini-tab-icon, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager { -moz-border-radius: 3px; @@ -3442,18 +3551,20 @@ span.req { padding: 0px 5px; vertical-align: middle; } /* line 50, ../../../../general/res/sass/forms/_filter.scss */ - .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, + .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .icon.mini-tab-icon:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, .t-filter .icon.ui-symbol:hover, .t-filter .icon.s-icon-btn:hover, .t-filter .icon.mini-tab:hover, + .t-filter .icon.mini-tab-icon:hover, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager:hover { background: rgba(255, 255, 255, 0.1); } /* line 54, ../../../../general/res/sass/forms/_filter.scss */ -.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, +.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .s-a-clear.mini-tab-icon, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, .t-filter .s-a-clear.ui-symbol, .t-filter .s-a-clear.s-icon-btn, .t-filter .s-a-clear.mini-tab, +.t-filter .s-a-clear.mini-tab-icon, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager { -moz-border-radius: 3px; @@ -3479,10 +3590,11 @@ span.req { text-align: center; z-index: 5; } /* line 74, ../../../../general/res/sass/forms/_filter.scss */ - .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, + .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .s-a-clear.mini-tab-icon:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, .t-filter .s-a-clear.ui-symbol:hover, .t-filter .s-a-clear.s-icon-btn:hover, .t-filter .s-a-clear.mini-tab:hover, + .t-filter .s-a-clear.mini-tab-icon:hover, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager:hover { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60); @@ -3721,67 +3833,71 @@ span.req { .browse-mode .split-layout .split-pane-component.pane.t-inspect.right { min-width: 100px; max-width: 800px; + padding-left: 15px; width: 20%; } -/* line 225, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 226, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right { width: 15%; } - /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 228, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { min-height: 50px; height: 30%; } -/* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; position: absolute; } - /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .pane-header { text-transform: uppercase; height: 24px; line-height: 24px; margin-bottom: 5px; } - /* line 246, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 248, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 258, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 260, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { z-index: 2; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { top: 5px; } - /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { left: -30px; } - /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 276, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { left: -25px; } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 282, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { content: '\e608'; } - /* line 286, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 288, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { right: -20px; } } - /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 297, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3794,31 +3910,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 321, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 323, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3828,11 +3944,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 340, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 342, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 346, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 348, ../../../../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, @@ -3844,12 +3960,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3865,36 +3981,36 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 376, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 384, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 387, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 397, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 399, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.left.treeview, .pane-tree-hidden .splitter-treeview { opacity: 0; } -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 404, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.right.items { left: 15px !important; } -/* line 409, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 411, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .pane.left.treeview, .pane-tree-showing .splitter-treeview { -moz-transition-property: opacity, background-color, border-color, color; @@ -3915,7 +4031,7 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 418, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 420, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-showing .l-object-and-inspector .pane.right, .pane-inspect-showing .l-object-and-inspector .splitter-inspect { -moz-transition-property: opacity, background-color, border-color, color; @@ -3936,16 +4052,16 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 427, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 429, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.right, .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } -/* line 431, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 433, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.left { right: 15px !important; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 438, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 440, ../../../../general/res/sass/user-environ/_layout.scss */ .pane:not(.resizing) { -moz-transition-property: width, left, right; -o-transition-property: width, left, right; @@ -6559,7 +6675,7 @@ table { left: 0; z-index: 1; } /* line 22, ../../../../general/res/sass/features/_time-display.scss */ - .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { + .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab-icon, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { font-size: 0.8em; } /* line 26, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer:hover .l-elem.l-value { diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 126ad40fa9..575e954f6c 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -603,29 +603,29 @@ mct-container { border-right: 5px solid transparent; } /* line 31, ../../../../general/res/sass/_icons.scss */ -.ui-symbol, .s-icon-btn, .mini-tab, .l-datetime-picker .l-month-year-pager .pager { +.ui-symbol, .s-icon-btn, .mini-tab, .mini-tab-icon, .l-datetime-picker .l-month-year-pager .pager { font-family: 'symbolsfont'; } /* line 33, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.type-icon, .type-icon.s-icon-btn, .type-icon.mini-tab, .l-datetime-picker .l-month-year-pager .type-icon.pager { + .ui-symbol.type-icon, .type-icon.s-icon-btn, .type-icon.mini-tab, .type-icon.mini-tab-icon, .l-datetime-picker .l-month-year-pager .type-icon.pager { color: #b3b3b3; } /* line 36, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon, .icon.s-icon-btn, .icon.mini-tab, .l-datetime-picker .l-month-year-pager .icon.pager { + .ui-symbol.icon, .icon.s-icon-btn, .icon.mini-tab, .icon.mini-tab-icon, .l-datetime-picker .l-month-year-pager .icon.pager { color: #0099cc; } /* line 38, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert, .icon.alert.s-icon-btn, .icon.alert.mini-tab, .l-datetime-picker .l-month-year-pager .icon.alert.pager { + .ui-symbol.icon.alert, .icon.alert.s-icon-btn, .icon.alert.mini-tab, .icon.alert.mini-tab-icon, .l-datetime-picker .l-month-year-pager .icon.alert.pager { color: #ff3c00; } /* line 40, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.alert:hover, .icon.alert.s-icon-btn:hover, .icon.alert.mini-tab:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { + .ui-symbol.icon.alert:hover, .icon.alert.s-icon-btn:hover, .icon.alert.mini-tab:hover, .icon.alert.mini-tab-icon:hover, .l-datetime-picker .l-month-year-pager .icon.alert.pager:hover { color: #ff8a66; } /* line 44, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon.major, .icon.major.s-icon-btn, .icon.major.mini-tab, .l-datetime-picker .l-month-year-pager .icon.major.pager { + .ui-symbol.icon.major, .icon.major.s-icon-btn, .icon.major.mini-tab, .icon.major.mini-tab-icon, .l-datetime-picker .l-month-year-pager .icon.major.pager { font-size: 1.65em; } /* line 48, ../../../../general/res/sass/_icons.scss */ - .ui-symbol.icon-calendar:after, .icon-calendar.s-icon-btn:after, .icon-calendar.mini-tab:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { + .ui-symbol.icon-calendar:after, .icon-calendar.s-icon-btn:after, .icon-calendar.mini-tab:after, .icon-calendar.mini-tab-icon:after, .l-datetime-picker .l-month-year-pager .icon-calendar.pager:after { content: "\e605"; } /* line 53, ../../../../general/res/sass/_icons.scss */ -.bar .ui-symbol, .bar .s-icon-btn, .bar .mini-tab, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { +.bar .ui-symbol, .bar .s-icon-btn, .bar .mini-tab, .bar .mini-tab-icon, .bar .l-datetime-picker .l-month-year-pager .pager, .l-datetime-picker .l-month-year-pager .bar .pager { display: inline-block; } /* line 57, ../../../../general/res/sass/_icons.scss */ @@ -1255,27 +1255,27 @@ mct-container { * at runtime from the About dialog for additional information. *****************************************************************************/ /* Styles for the Inspector pane */ -/* line 26, ../../../../general/res/sass/_inspector.scss */ +/* line 24, ../../../../general/res/sass/_inspector.scss */ .l-inspect, .l-inspect table tr td { font-size: 0.7rem; } -/* line 31, ../../../../general/res/sass/_inspector.scss */ +/* line 29, ../../../../general/res/sass/_inspector.scss */ .l-inspect { color: #666; } - /* line 33, ../../../../general/res/sass/_inspector.scss */ + /* line 31, ../../../../general/res/sass/_inspector.scss */ .l-inspect .pane-header { color: #999999; font-size: 0.8rem; } - /* line 38, ../../../../general/res/sass/_inspector.scss */ + /* line 36, ../../../../general/res/sass/_inspector.scss */ .l-inspect ul li, .l-inspect em { display: block; position: relative; } - /* line 44, ../../../../general/res/sass/_inspector.scss */ + /* line 42, ../../../../general/res/sass/_inspector.scss */ .l-inspect ul li { margin-bottom: 20px; } - /* line 48, ../../../../general/res/sass/_inspector.scss */ + /* line 46, ../../../../general/res/sass/_inspector.scss */ .l-inspect em { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1285,40 +1285,40 @@ mct-container { margin-bottom: 5px; padding: 5px 5px; text-transform: uppercase; } - /* line 58, ../../../../general/res/sass/_inspector.scss */ + /* line 56, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr td { border: none; border-top: 1px solid rgba(102, 102, 102, 0.2) !important; padding: 2px 0; vertical-align: top; } - /* line 63, ../../../../general/res/sass/_inspector.scss */ + /* line 61, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr td.label { color: #999999 !important; padding-right: 5px !important; white-space: nowrap; } - /* line 68, ../../../../general/res/sass/_inspector.scss */ + /* line 66, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr td.value { word-break: break-all; } - /* line 73, ../../../../general/res/sass/_inspector.scss */ + /* line 71, ../../../../general/res/sass/_inspector.scss */ .l-inspect table tr:first-child td { border-top: none !important; } - /* line 78, ../../../../general/res/sass/_inspector.scss */ + /* line 76, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location { line-height: 180%; } - /* line 80, ../../../../general/res/sass/_inspector.scss */ + /* line 78, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item { cursor: pointer; display: inline; position: relative; padding: 2px 4px; } - /* line 85, ../../../../general/res/sass/_inspector.scss */ + /* line 83, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover { background: rgba(102, 102, 102, 0.1); color: #333333; } - /* line 88, ../../../../general/res/sass/_inspector.scss */ + /* line 86, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location .location-item:hover .icon { color: #0099cc; } - /* line 93, ../../../../general/res/sass/_inspector.scss */ + /* line 91, ../../../../general/res/sass/_inspector.scss */ .l-inspect .inspector-location:not(.first):before { color: #8c8c8c; content: '\3e'; @@ -1619,45 +1619,152 @@ mct-container { .mini-tab:after { width: 100%; height: 100%; } - /* line 158, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 157, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; left: -7px; } - /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 161, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:hover:before { left: -9px; } - /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 164, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 12px; } - /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 168, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 14px; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 174, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 12px; } - /* line 179, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 178, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:hover:before { left: 14px; } - /* line 182, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 181, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { content: '\3c'; left: -7px; } - /* line 186, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 185, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { left: -9px; } } -/* line 196, ../../../../general/res/sass/controls/_buttons.scss */ +@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { + /* line 195, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + color: #d6d6d6; + cursor: pointer; + display: block; + position: absolute; + font-size: 12px; + line-height: 12px; + height: 12px; + width: 12px; } + /* line 218, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:hover { + color: #a3a3a3; } + /* line 220, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:hover:after { + color: #0099cc; } + /* line 225, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:before, .mini-tab-icon:after { + -moz-transition-property: color; + -o-transition-property: color; + -webkit-transition-property: color; + transition-property: color; + -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: 0; + -o-transition-delay: 0; + -webkit-transition-delay: 0; + transition-delay: 0; + display: block; + position: absolute; } + /* line 232, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:before { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -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; + font-size: 7px; + height: 100%; + width: 7px; } + /* line 239, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon:after { + width: 100%; + height: 100%; } + /* line 249, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left:before { + content: '\3c'; + left: -7px; } + /* line 253, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left:hover:before { + left: -9px; } + /* line 256, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left.collapsed:before { + content: '\3e'; + left: 12px; } + /* line 260, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-left.collapsed:hover:before { + left: 14px; } + /* line 266, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right:before { + content: '\3e'; + left: 12px; } + /* line 270, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right:hover:before { + left: 14px; } + /* line 273, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right.collapsed:before { + content: '\3c'; + left: -7px; } + /* line 277, ../../../../general/res/sass/controls/_buttons.scss */ + .mini-tab-icon.anchor-right.collapsed:hover:before { + left: -9px; } } + +/* line 287, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 293, ../../../../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 208, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 299, ../../../../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; @@ -1666,7 +1773,7 @@ mct-container { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 215, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 306, ../../../../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; @@ -1675,7 +1782,7 @@ mct-container { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 222, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 313, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -2379,7 +2486,7 @@ label.checkbox.custom { left: 0; text-align: left; } /* line 57, ../../../../general/res/sass/controls/_menus.scss */ - .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { + .s-menu-btn .menu .ui-symbol.icon, .s-menu-btn .menu .icon.s-icon-btn, .s-menu-btn .menu .icon.mini-tab, .s-menu-btn .menu .icon.mini-tab-icon, .s-menu-btn .menu .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .s-menu-btn .menu .icon.pager { width: 12px; } /******************************************************** MENUS THEMSELVES */ @@ -2661,10 +2768,11 @@ mct-include.l-time-controller { mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl { color: #999999; } /* line 69, ../../../../general/res/sass/controls/_time-controller.scss */ - mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.mini-tab-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab, + mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.mini-tab-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .icon.pager { font-size: 11px; @@ -3373,10 +3481,11 @@ span.req { .t-filter input.t-filter-input:not(.ng-dirty) + .t-a-clear { display: none; } /* line 42, ../../../../general/res/sass/forms/_filter.scss */ -.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, +.filter .icon.ui-symbol, .filter .icon.s-icon-btn, .filter .icon.mini-tab, .filter .icon.mini-tab-icon, .filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .filter .icon.pager, .t-filter .icon.ui-symbol, .t-filter .icon.s-icon-btn, .t-filter .icon.mini-tab, +.t-filter .icon.mini-tab-icon, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager { -moz-border-radius: 4px; @@ -3389,18 +3498,20 @@ span.req { padding: 0px 5px; vertical-align: middle; } /* line 50, ../../../../general/res/sass/forms/_filter.scss */ - .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, + .filter .icon.ui-symbol:hover, .filter .icon.s-icon-btn:hover, .filter .icon.mini-tab:hover, .filter .icon.mini-tab-icon:hover, .filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .filter .icon.pager:hover, .t-filter .icon.ui-symbol:hover, .t-filter .icon.s-icon-btn:hover, .t-filter .icon.mini-tab:hover, + .t-filter .icon.mini-tab-icon:hover, .t-filter .l-datetime-picker .l-month-year-pager .icon.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .icon.pager:hover { background: rgba(255, 255, 255, 0.1); } /* line 54, ../../../../general/res/sass/forms/_filter.scss */ -.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, +.filter .s-a-clear.ui-symbol, .filter .s-a-clear.s-icon-btn, .filter .s-a-clear.mini-tab, .filter .s-a-clear.mini-tab-icon, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager, .t-filter .s-a-clear.ui-symbol, .t-filter .s-a-clear.s-icon-btn, .t-filter .s-a-clear.mini-tab, +.t-filter .s-a-clear.mini-tab-icon, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager { -moz-border-radius: 4px; @@ -3426,10 +3537,11 @@ span.req { text-align: center; z-index: 5; } /* line 74, ../../../../general/res/sass/forms/_filter.scss */ - .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, + .filter .s-a-clear.ui-symbol:hover, .filter .s-a-clear.s-icon-btn:hover, .filter .s-a-clear.mini-tab:hover, .filter .s-a-clear.mini-tab-icon:hover, .filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .filter .s-a-clear.pager:hover, .t-filter .s-a-clear.ui-symbol:hover, .t-filter .s-a-clear.s-icon-btn:hover, .t-filter .s-a-clear.mini-tab:hover, + .t-filter .s-a-clear.mini-tab-icon:hover, .t-filter .l-datetime-picker .l-month-year-pager .s-a-clear.pager:hover, .l-datetime-picker .l-month-year-pager .t-filter .s-a-clear.pager:hover { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60); @@ -3668,67 +3780,71 @@ span.req { .browse-mode .split-layout .split-pane-component.pane.t-inspect.right { min-width: 100px; max-width: 800px; + padding-left: 15px; width: 20%; } -/* line 225, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 226, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right { width: 15%; } - /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 228, ../../../../general/res/sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { min-height: 50px; height: 30%; } -/* line 235, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ .pane { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; position: absolute; } - /* line 238, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 240, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .pane-header { text-transform: uppercase; height: 24px; line-height: 24px; margin-bottom: 5px; } - /* line 246, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 248, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 250, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 252, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 257, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 258, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 260, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { z-index: 2; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 266, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane { top: 5px; } - /* line 270, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 272, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left { left: -30px; } - /* line 273, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 275, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left:after { content: 'F'; } - /* line 276, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 278, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-tree.anchor-left.collapsed { left: -25px; } - /* line 280, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 282, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right { right: -25px; } - /* line 283, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 285, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right:after { content: '\e608'; } - /* line 286, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 288, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab.toggle-pane.toggle-inspect.anchor-right.collapsed { right: -20px; } } - /* line 295, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 297, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .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, @@ -3741,31 +3857,31 @@ span.req { .s-menu-btn .pane.items .object-browse-bar span.right.l-click-area { top: auto; } -/* line 306, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 308, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 311, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 316, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 319, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 321, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 323, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 325, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 335, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: hidden; top: 34px; } - /* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 338, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder > ng-include { overflow: auto; position: absolute; @@ -3775,11 +3891,11 @@ span.req { left: 0; width: auto; height: auto; } - /* line 340, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 342, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder.l-controls-visible.l-time-controller-visible { bottom: 88px; } -/* line 346, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 348, ../../../../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, @@ -3791,12 +3907,12 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 359, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 364, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -3812,36 +3928,36 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 376, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 382, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 384, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 387, ../../../../general/res/sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; padding-right: 10px; } -/* line 397, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 399, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.left.treeview, .pane-tree-hidden .splitter-treeview { opacity: 0; } -/* line 402, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 404, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.right.items { left: 15px !important; } -/* line 409, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 411, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .pane.left.treeview, .pane-tree-showing .splitter-treeview { -moz-transition-property: opacity, background-color, border-color, color; @@ -3862,7 +3978,7 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 418, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 420, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-showing .l-object-and-inspector .pane.right, .pane-inspect-showing .l-object-and-inspector .splitter-inspect { -moz-transition-property: opacity, background-color, border-color, color; @@ -3883,16 +3999,16 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 427, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 429, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.right, .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } -/* line 431, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 433, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.left { right: 15px !important; } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 438, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 440, ../../../../general/res/sass/user-environ/_layout.scss */ .pane:not(.resizing) { -moz-transition-property: width, left, right; -o-transition-property: width, left, right; @@ -6462,7 +6578,7 @@ table { left: 0; z-index: 1; } /* line 22, ../../../../general/res/sass/features/_time-display.scss */ - .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { + .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab, .l-time-display.l-timer .l-elem.l-value .direction.mini-tab-icon, .l-time-display.l-timer .l-elem.l-value .l-datetime-picker .l-month-year-pager .direction.pager, .l-datetime-picker .l-month-year-pager .l-time-display.l-timer .l-elem.l-value .direction.pager { font-size: 0.8em; } /* line 26, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer:hover .l-elem.l-value { From 789b640b9bb8979c9620d46c678573a510b9a52e Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 23 Oct 2015 16:28:42 -0700 Subject: [PATCH 087/201] Refactored dismiss and minimize out of NotificationService and on to returned Notification type --- .../src/NotificationLaunchController.js | 19 +- .../general/res/templates/message-banner.html | 18 +- .../src/controllers/BannerController.js | 9 +- .../src/NotificationIndicatorController.js | 6 +- .../notification/src/NotificationService.js | 233 +++++++++++------- .../test/NotificationServiceSpec.js | 47 +++- 6 files changed, 218 insertions(+), 114 deletions(-) diff --git a/example/notifications/src/NotificationLaunchController.js b/example/notifications/src/NotificationLaunchController.js index 7d0618ada4..851e0575f5 100644 --- a/example/notifications/src/NotificationLaunchController.js +++ b/example/notifications/src/NotificationLaunchController.js @@ -130,7 +130,7 @@ define( */ $scope.newProgress = function(){ - var notification = { + var notificationModel = { title: "Progress notification example", severity: "info", progress: 0, @@ -142,17 +142,18 @@ define( * Simulate an ongoing process and update the progress bar. * @param notification */ - function incrementProgress(notification) { - notification.progress = Math.min(100, Math.floor(notification.progress + Math.random() * 30)); - notification.progressText = ["Estimated time remaining:" + - " about ", 60 - Math.floor((notification.progress / 100) * 60), " seconds"].join(" "); - if (notification.progress < 100) { - $timeout(function(){incrementProgress(notification);}, 1000); + function incrementProgress(notificationModel) { + notificationModel.progress = Math.min(100, Math.floor(notificationModel.progress + Math.random() * 30)); + notificationModel.progressText = ["Estimated time" + + " remaining:" + + " about ", 60 - Math.floor((notificationModel.progress / 100) * 60), " seconds"].join(" "); + if (notificationModel.progress < 100) { + $timeout(function(){incrementProgress(notificationModel);}, 1000); } } - notificationService.notify(notification); - incrementProgress(notification); + notificationService.notify(notificationModel); + incrementProgress(notificationModel); }; /** diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index 29b107126e..44c7f915b6 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -1,20 +1,20 @@
      - + - diff --git a/platform/commonUI/general/src/controllers/BannerController.js b/platform/commonUI/general/src/controllers/BannerController.js index 068b5cda81..4be9304cc6 100644 --- a/platform/commonUI/general/src/controllers/BannerController.js +++ b/platform/commonUI/general/src/controllers/BannerController.js @@ -52,14 +52,15 @@ define( }; $scope.dismiss = function(notification, $event) { $event.stopPropagation(); - notificationService.dismissOrMinimize(notification); + notification.dismissOrMinimize(); }; $scope.maximize = function(notification) { - if (notification.severity !== "info"){ - notification.cancel = function(){ + if (notification.model.severity !== "info"){ + + notification.model.cancel = function(){ dialogService.dismiss(); }; - dialogService.showBlockingMessage(notification); + dialogService.showBlockingMessage(notification.model); } }; } diff --git a/platform/commonUI/notification/src/NotificationIndicatorController.js b/platform/commonUI/notification/src/NotificationIndicatorController.js index 66ad825a32..e58b0a606b 100644 --- a/platform/commonUI/notification/src/NotificationIndicatorController.js +++ b/platform/commonUI/notification/src/NotificationIndicatorController.js @@ -48,7 +48,11 @@ define( dialogService.getDialogResponse('overlay-message-list', { dialog: { title: "Messages", - messages: notificationService.notifications + //Launch the message list dialog with the models + // from the notifications + messages: notificationService.notifications && notificationService.notifications.map(function(notification){ + return notification.model; + }) }, cancel: function(){ dialogService.dismiss(); diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 140c4537c8..cff2d57d7a 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -29,7 +29,7 @@ * dialogs so that the same information can be provided in a dialog * and then minimized to a banner notification if needed. * - * @namespace platform/commonUI/dialog + * @namespace platform/commonUI/notification */ define( [], @@ -54,11 +54,10 @@ define( * dialogs so that the same information can be provided in a dialog * and then minimized to a banner notification if needed. * - * @typedef {object} Notification + * @typedef {object} NotificationModel * @property {string} title The title of the message - * @property {string} severity The importance of the - * message (one of 'info', 'alert', or 'error' where info < alert < - * error) + * @property {string} severity The importance of the message (one of + * 'info', 'alert', or 'error' where info < alert