From 37f466705af01f1da8d2dd9ceac5f38dc0ee58e5 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 2 Nov 2015 18:22:13 -0800 Subject: [PATCH 01/88] [Frontend] IN-PROGRESS stubbing in files ported from /warp open #208 Moving files from /warp; stuff will NOT compile at this point; --- platform/features/timeline/style/bundle.json | 12 + platform/features/timeline/style/config.rb | 26 ++ .../timeline/style/sass/_activities.scss | 103 +++++ .../timeline/style/sass/_constants.scss | 56 +++ .../timeline/style/sass/_timelines.scss | 401 ++++++++++++++++++ .../style/sass/timeline-espresso.scss | 11 + .../features/timeline/style/timeline-sass.sh | 15 + 7 files changed, 624 insertions(+) create mode 100644 platform/features/timeline/style/bundle.json create mode 100755 platform/features/timeline/style/config.rb create mode 100644 platform/features/timeline/style/sass/_activities.scss create mode 100644 platform/features/timeline/style/sass/_constants.scss create mode 100644 platform/features/timeline/style/sass/_timelines.scss create mode 100644 platform/features/timeline/style/sass/timeline-espresso.scss create mode 100644 platform/features/timeline/style/timeline-sass.sh diff --git a/platform/features/timeline/style/bundle.json b/platform/features/timeline/style/bundle.json new file mode 100644 index 0000000000..d0fb8a9f95 --- /dev/null +++ b/platform/features/timeline/style/bundle.json @@ -0,0 +1,12 @@ +{ + "name": "Timeline Styling", + "description": "CSS for Timelines. Ported from /warp", + "extensions": { + "stylesheets": [ + { + "stylesheetUrl": "css/timeline.css", + "priority": "10" + } + ] + } +} diff --git a/platform/features/timeline/style/config.rb b/platform/features/timeline/style/config.rb new file mode 100755 index 0000000000..a5def82481 --- /dev/null +++ b/platform/features/timeline/style/config.rb @@ -0,0 +1,26 @@ +# Require any additional compass plugins here. +# require "compass-growl" + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "css" +sass_dir = "sass" +images_dir = "images" +javascripts_dir = "js" + +# You can select your preferred output style here (can be overridden via the command line): +# :expanded, :compressed, :nested +output_style = :nested + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass vfn_platform/static/sass scss && rm -rf sass && mv scss sass diff --git a/platform/features/timeline/style/sass/_activities.scss b/platform/features/timeline/style/sass/_activities.scss new file mode 100644 index 0000000000..75f3a81072 --- /dev/null +++ b/platform/features/timeline/style/sass/_activities.scss @@ -0,0 +1,103 @@ +.l-timeline-gantt { + position: absolute; + top: $timelineSwimlaneGanttVM; bottom: $timelineSwimlaneGanttVM; + + .bar { + @include ellipsize(); + height: $activityBarH; + line-height: $activityBarH + 2; + padding: 0 $interiorMargin; + + span { + display: inline; + &.s-activity-type { + &.timeline { + &:before { + content:"S"; + } + } + &.activity { + &:before { + content:"A"; + } + } + } + &.s-title { + @include text-shadow(rgba(black, 0.1) 0 1px 2px); +// right: 5px; +// width: 50%; + } + &.duration { + left: auto; + opacity: 0.75; + right: 0; + text-align: right; + width: 60px; + } + &.handle { + //background: rgba(red, 0.2); + top: 0; + bottom: 0; + height: auto; + width: 15px; + &.left { + right: auto; + } + &.middle { + right: 15px; + left: 15px; + width: auto; + } + &.right { + right: 0; + left: auto; + } + } + } + } +} + +.s-timeline-gantt { + $br: $controlCr; + .bar { + color: $activityTypeFg; +// opacity: 0.9; +// @include background-image(linear-gradient(lighten($activityTypeBg, 10), $activityTypeBg)); + @include activityBg($activityTypeBg); + @include border-radius($br); + @include box-shadow(rgba(black, 0.4) 0 1px 3px); + &.expanded { + @include border-top-radius($br); + @include border-bottom-radius(0); + } + &.leaf { + @include border-top-radius(0); + @include border-bottom-radius($br); + } + .s-toggle { + color: $colorKey; + } + } +} + +.edit-mode .s-timeline-gantt { + .bar { + &:hover { + @include background-image(linear-gradient(lighten($activityTypeBg, 20), lighten($activityTypeBg, 10))); + } + } + + .handle { + cursor: col-resize; + &.start { +// @include test(red); + } + &.mid { +// @include test(green); + cursor: ew-resize; + } + &.end { +// @include test(blue); + } + } +} \ No newline at end of file diff --git a/platform/features/timeline/style/sass/_constants.scss b/platform/features/timeline/style/sass/_constants.scss new file mode 100644 index 0000000000..26bcd55eaf --- /dev/null +++ b/platform/features/timeline/style/sass/_constants.scss @@ -0,0 +1,56 @@ +$dirImgs: '../images/'; //Relative to warp.css +/*$interiorMargin: 5px; +$interiorMarginLg: $interiorMargin * 2; +$interiorMarginSm: 3px;*/ +$logoAspect: .17; + +// Timeline constants +$activityBarH: 17px; +$timelinePaneLeftW: 30%; +$timelinePaneBtmH: 30%; +$timelineResourceGraphYLabelsMargin: 70px; +$timelineTopPaneHeaderH: 30px; +$timelineHeaderColorBg: lighten($colorBodyBg, 5%); +$timelineColorAlt1: lighten($timelineHeaderColorBg, 10%); +$timelineSwimlaneGanttVM: 2px; // The vertical space above and below the gantt bars +$timelineSwimlaneH: $activityBarH + ($timelineSwimlaneGanttVM * 2); +$timelineTopPaneHeaderElemMargin: $interiorMargin; +$activityTypeFg: #fff; +$activityTypeBg: #5555aa; +$activityTypeTabularFgIcon: #8594ff; + + +// Swimlane colors +$colorDropTarg: rgba($activityTypeBg, 0.4); +$colorSwimlaneSelectedBg: #222; +$colorSwimlaneSelectedFg: #ccc; +$colorSwimlaneSelectedGanttBg: #ccc; +$colorSwimlaneSelectedGanttFg: #333; + +// Timeline Tabular constants +$timelineColIconW: 16px; +$timelineColResourcePlotW: $timelineColIconW; +$timelineColTitleW: 250px; +$timelineColDatetimeW: 110px; +$timelineColDurationW: 70px; +$timelineColActivityModesW: $timelineColTitleW; +$timelineColPadR: 50px; +$timelineTabularTitleW: $timelineColResourcePlotW + $timelineColTitleW; +$timelineTabularDataW: ($timelineColDatetimeW * 2) + $timelineColDurationW + $timelineColActivityModesW + $timelineColPadR; + + +// // Ported from legacy timelines SASS +$activitiesHolderM: 30px; +$scenarioTopPad: 25px; +$swimlaneVM: 2px; +$timelineVM: 10px; +$timelineBPad: $interiorMargin * 2; +$graphResourceSummaryH: 200px; +$graphResourceSummaryLegendH: 20px; +$scenarioTimelineSummaryH: 20px; +$scenarioTimelineSummaryHExpanded: $graphResourceSummaryH + 30px; +$scenarioPanZoomSliderH: 16px; +$scenarioTicksH: 7px; +$scenarioTickLabelsH: 10px; + + diff --git a/platform/features/timeline/style/sass/_timelines.scss b/platform/features/timeline/style/sass/_timelines.scss new file mode 100644 index 0000000000..bdb8211a3e --- /dev/null +++ b/platform/features/timeline/style/sass/_timelines.scss @@ -0,0 +1,401 @@ +//*************************************************************** LAYOUT +.l-timeline-holder { +// @include test(); + @include absPosDefault(); + + .l-timeline-pane { + @include absPosDefault(); + + .l-width-control { + position: relative; + } + + .l-swimlanes-holder { + @include absPosDefault(); + top: $timelineTopPaneHeaderH + 1; + } + + // Overall layout + &.t-pane-h { + &.s-timeline-tabular .t-pane-v { + // Vertical panes within tabular area + @include absPosDefault(); + &.l-tabular-l { + // Tree area with item title + right: auto; // Set this to auto and uncomment width below when additional tabular columns are added + width: $timelineTabularTitleW; + } + &.l-tabular-r { + // Start, end, duration, activity modes columns + @include scrollH(); + left: $timelineTabularTitleW; + .l-width { + @include absPosDefault(0, visible); + min-width: $timelineTabularDataW; + width: 100%; + } + } + } + &.l-timeline-gantt { +// @include testObj(); + + .l-swimlanes-holder { + @include scrollV(scroll); + } + + } + &.l-timeline-resource-legend { + @include box-sizing(border-box); + padding: $interiorMargin 0; + white-space: nowrap; + .l-title { + } + + .l-legend-items { + @include absPosDefault(); + @include scrollV(); + top: 25px; + color: lighten($timelineColorAlt1, 10%); +// margin-top: $interiorMargin; + } + .legend-item { + // Inherits from /platform/commonUI/general/res/sass/plots/_plots-main.scss +// border-bottom: 1px solid $colorInteriorBorder; + display: block; + margin-bottom: $interiorMarginSm; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + .color-swatch { + vertical-align: baseline; + } + .title-label { + vertical-align: baseline; + } + } + } + + &.l-timeline-resource-graph { + $m: $interiorMargin; + + .l-graphs-holder { +// @include test(blue); + @include absPosDefault(); + bottom: $scrollbarTrackSize; + + .l-graphs { + @include absPosDefault(); + @include scrollV(scroll); + } + + .l-graph-labels-holder { +// @include test(red); + @include absPosDefault(); + overflow: hidden; + right: auto; + width: 400px; + } + } + + .l-scroll-control { + @include absPosDefault(); + overflow-x: scroll; + overflow-y: hidden; + top: auto; right: $scrollbarTrackSize; + height: $scrollbarTrackSize; + .l-width-control { + height: 10px; // Need to add height to force scrollbar to appear + } + } + + .l-graph, + .l-graph-labels { + height: 80px; //was 120px + margin-bottom: $interiorMarginSm; + position: relative; + } + + .l-title { + @include ellipsize(); + color: rgba(#fff, 0.4); + top: $m; left: $m; + position: absolute; + } + + .l-graph { + background: rgba(black, 0.3); + width: 100%; + .l-graph-area { + canvas { + width: 100%; + height: 100%; + } + } + } + + .l-graph-labels { + z-index: 10; + } + + .l-graph-area { + @include absPosDefault(); + top: 20px; bottom: 5px; + .l-labels-holder { + @include absPosDefault(); + left: $m; + .tick-label.tick-label-y { + text-align: left; + } + } + } + } + } + + &.l-pane-l { +// @include test(red); + right: auto; + min-width: 50px; + max-width: 90%; + width: $timelinePaneLeftW; + } + + &.l-pane-r { +// @include test(blue); + left: 0; + &:hover { + .l-hover-btns-holder { + @include trans-prop-nice-fade(100ms); + opacity: 1; + } + } + } + + &.l-pane-top { +// @include test(green); + bottom: $timelinePaneBtmH; + } + &.l-pane-btm { +// @include test(orange); + top: auto; + min-height: 20px; + max-height: 80%; + height: $timelinePaneBtmH; + } + } + + .l-swimlane { + height: $timelineSwimlaneH; + position: relative; + } + + // Header + .s-timeline-tabular .l-header, + .s-timeline-gantt .l-header { +// @include test(white,0.05); + @include absPosDefault(0, visible); + bottom: auto; height: $timelineTopPaneHeaderH; + + .l-header-elem { + @include absPosDefault($timelineTopPaneHeaderElemMargin, visible); +// bottom: auto; height: 15px; + display: block; + &.l-labels { + .l-label { + position: absolute; + width: 140px; + margin-left: -70px; + text-align: center; + } + } + } + } + + .l-hover-btns-holder { + @include absPosDefault(); + @include box-sizing(border-box); + @include trans-prop-nice-fade(500ms); + opacity: 0; + height: $timelineTopPaneHeaderH; + width: 100px; left: auto; + padding: $interiorMargin; + text-align: right; + z-index: 10; + } + + // Tabular Columns + .l-cols { +// @include test(#66ff66, 0.1); + @include absPosDefault(0, visible); + text-wrap: none; + white-space: nowrap; + .l-col { + @include box-sizing(border-box); + @include ellipsize(); +// @include test(red, 0.05); + display: inline-block; + height: 100%; + padding: 0 $interiorMargin; + position: relative; + text-wrap: none; + white-space: nowrap; + + &.l-col-icon { + width: $timelineColIconW; + text-align: center; + padding: 0; + .ui-symbol { + color: $colorKey; + } + } + + &.l-plot-resource { + border-left: none !important; + cursor: pointer; + padding-left: 0; +// .ui-symbol { +// color: $colorFormValid; +// } + } + + &.l-title { + width: $timelineColTitleW; + } + + &.l-start, + &.l-end, + &.l-duration { + width: $timelineColDatetimeW; + } + + //&.l-duration { + // width: $timelineColDurationW; + //} + + &.l-activity-modes { + display: none; // Temp, until modes can be displayed + width: $timelineColActivityModesW; + } + + } + } + + .s-timeline-tabular { + .l-header .l-cols { + top: $timelineTopPaneHeaderElemMargin; bottom: $timelineTopPaneHeaderElemMargin; + .l-col { + border-left: 1px solid rgba(#fff, 0.1); +// height: 100%; + } + } + + .l-pane-l { + // Left pane of the tabular area + .l-cols { + left: $timelineTopPaneHeaderElemMargin; + .s-label .ui-symbol.icon { + //color: $colorKeyFg; + color: $activityTypeTabularFgIcon; + } + } + } + + .l-pane-r { + // Right pane of the tabular area +// @include test(red, 0.05); + } + } + + .splitter { + // Top of splitter within Timelines should be 0 + top: 0; + } + + // Ticks + .l-ticks, + .l-subticks { + @include absPosDefault(); + top: auto; bottom: $interiorMarginSm; + } + + .l-ticks { + height: 10px + } + + .l-subticks { + height: 5px + } +} + +//*************************************************************** STYLING +.s-timeline { + font-size: 0.75rem; + .s-header { + background-color: $timelineHeaderColorBg; + } + .s-swimlane { + // @include transition-property(background-color); + // @include transition-duration(0.2s); + // @include transition-timing-function(ease-out); + // border-top: 1px solid rgba(black, 0.2); + border-bottom: 1px solid rgba(white, 0.1); + line-height: $activityBarH + 2 + 1; + /* &:hover { + background: rgba(white, 0.1); + }*/ + &.exceeded { + @include bgDiagonalStripes(#fff, 0.05, $timelineSwimlaneH + 1); + } + + &.selected { + $bg: $colorSwimlaneSelectedBg; + background-color: $bg; + color: #fff; +// @include background-image(linear-gradient(darken($bg, 5), $bg)); + + .s-timeline-gantt .bar { + @include activityBg($colorSwimlaneSelectedGanttBg, 10); + color: $colorSwimlaneSelectedGanttFg; +// background-color: red; +// background-image: none; + } + } + + &.drop-into { + background-color: rgba($colorDropTarg, 0.7); + .s-timeline-gantt { + opacity: 0.7; + } + } + &.drop-after { + background-color: rgba(#000, 0.2); + border-bottom-color: rgba($colorDropTarg, 1.0); + } + } + + .s-ticks { + @include bgTicks($timelineColorAlt1); + } + .s-hover-btns-holder { + $bg: $timelineHeaderColorBg; + $bga: 1; + $l: 5%; + @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); + .s-btn { + @include containerSubtle(lighten($colorBodyBg, $l), lighten($colorBodyFg, $l), true); + } + } +} + +.edit-mode .s-swimlane { + cursor: pointer; + .s-label { + @include border-radius($controlCr); + padding: 2px 5px; + &:hover { + background: rgba(#fff, 0.1); + color: #fff; + } + } +} + + diff --git a/platform/features/timeline/style/sass/timeline-espresso.scss b/platform/features/timeline/style/sass/timeline-espresso.scss new file mode 100644 index 0000000000..3cad04322e --- /dev/null +++ b/platform/features/timeline/style/sass/timeline-espresso.scss @@ -0,0 +1,11 @@ +@import "compass"; +@import "compass/css3"; +@import "compass/utilities"; + +@import "../../../../platform/commonUI/general/res/sass/constants"; +@import "../../../../platform/commonUI/general/res/sass/mixins"; +@import "mixins"; +@import "constants"; +@import "about"; +@import "activities"; +@import "timelines"; \ No newline at end of file diff --git a/platform/features/timeline/style/timeline-sass.sh b/platform/features/timeline/style/timeline-sass.sh new file mode 100644 index 0000000000..073c193342 --- /dev/null +++ b/platform/features/timeline/style/timeline-sass.sh @@ -0,0 +1,15 @@ +# echo "* Compiling all sass in wtd-dev" + +# echo "Compiling general" +# cd ~/dev/wtd-dev/platform/commonUI/general/res/ +# compass compile --force + +echo "*** Compiling themes/espresso" +cd ~/dev/wtd-dev/platform/commonUI/themes/espresso/res/ +compass compile --force + +echo "** Compiling themes/snow" +cd ~/dev/wtd-dev/platform/commonUI/themes/snow/res/ +compass compile --force + +echo "**** All wtd-dev sass compiled" \ No newline at end of file From eabde6b2d0f018a7e6098a356ad79715f551ce63 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 3 Nov 2015 14:58:58 -0800 Subject: [PATCH 02/88] [Frontend] Integrate Timeline into open; themes open #208 Copied SASS styles from /warp and created new platform/features/timeline/themes/espresso; Styling looks complete, but Timeline itself has functional issues; TO-DO: remove styles from /warp/.../sass/ as needed; --- bundles.json | 4 +- .../style/sass/timeline-espresso.scss | 11 - .../features/timeline/style/timeline-sass.sh | 15 - .../timeline/themes/compile-themes-sass.sh | 7 + .../{style => themes/espresso}/bundle.json | 2 +- .../timeline/themes/espresso/res/config.rb | 26 + .../themes/espresso/res/css/timeline.css | 652 ++++++++++++++++++ .../themes/espresso/res/sass/_activities.scss | 103 +++ .../espresso/res}/sass/_constants.scss | 8 +- .../themes/espresso/res/sass/_timelines.scss | 401 +++++++++++ .../themes/espresso/res/sass/timeline.scss | 11 + 11 files changed, 1207 insertions(+), 33 deletions(-) delete mode 100644 platform/features/timeline/style/sass/timeline-espresso.scss delete mode 100644 platform/features/timeline/style/timeline-sass.sh create mode 100644 platform/features/timeline/themes/compile-themes-sass.sh rename platform/features/timeline/{style => themes/espresso}/bundle.json (86%) create mode 100755 platform/features/timeline/themes/espresso/res/config.rb create mode 100644 platform/features/timeline/themes/espresso/res/css/timeline.css create mode 100644 platform/features/timeline/themes/espresso/res/sass/_activities.scss rename platform/features/timeline/{style => themes/espresso/res}/sass/_constants.scss (91%) create mode 100644 platform/features/timeline/themes/espresso/res/sass/_timelines.scss create mode 100644 platform/features/timeline/themes/espresso/res/sass/timeline.scss diff --git a/bundles.json b/bundles.json index 2b5c5f862d..f87cc8e1d4 100644 --- a/bundles.json +++ b/bundles.json @@ -14,12 +14,14 @@ "platform/execution", "platform/telemetry", "platform/features/clock", + "platform/features/events", "platform/features/imagery", "platform/features/layout", "platform/features/pages", "platform/features/plot", "platform/features/scrolling", - "platform/features/events", + "platform/features/timeline", + "platform/features/timeline/themes/espresso", "platform/forms", "platform/identity", "platform/persistence/local", diff --git a/platform/features/timeline/style/sass/timeline-espresso.scss b/platform/features/timeline/style/sass/timeline-espresso.scss deleted file mode 100644 index 3cad04322e..0000000000 --- a/platform/features/timeline/style/sass/timeline-espresso.scss +++ /dev/null @@ -1,11 +0,0 @@ -@import "compass"; -@import "compass/css3"; -@import "compass/utilities"; - -@import "../../../../platform/commonUI/general/res/sass/constants"; -@import "../../../../platform/commonUI/general/res/sass/mixins"; -@import "mixins"; -@import "constants"; -@import "about"; -@import "activities"; -@import "timelines"; \ No newline at end of file diff --git a/platform/features/timeline/style/timeline-sass.sh b/platform/features/timeline/style/timeline-sass.sh deleted file mode 100644 index 073c193342..0000000000 --- a/platform/features/timeline/style/timeline-sass.sh +++ /dev/null @@ -1,15 +0,0 @@ -# echo "* Compiling all sass in wtd-dev" - -# echo "Compiling general" -# cd ~/dev/wtd-dev/platform/commonUI/general/res/ -# compass compile --force - -echo "*** Compiling themes/espresso" -cd ~/dev/wtd-dev/platform/commonUI/themes/espresso/res/ -compass compile --force - -echo "** Compiling themes/snow" -cd ~/dev/wtd-dev/platform/commonUI/themes/snow/res/ -compass compile --force - -echo "**** All wtd-dev sass compiled" \ No newline at end of file diff --git a/platform/features/timeline/themes/compile-themes-sass.sh b/platform/features/timeline/themes/compile-themes-sass.sh new file mode 100644 index 0000000000..6e0e18e677 --- /dev/null +++ b/platform/features/timeline/themes/compile-themes-sass.sh @@ -0,0 +1,7 @@ +echo "*** Compiling timeline-espresso" +cd espresso/res +compass compile --force + +# echo "*** Compiling timeline-snow" +# cd espresso/snow +# compass compile --force \ No newline at end of file diff --git a/platform/features/timeline/style/bundle.json b/platform/features/timeline/themes/espresso/bundle.json similarity index 86% rename from platform/features/timeline/style/bundle.json rename to platform/features/timeline/themes/espresso/bundle.json index d0fb8a9f95..eef844096c 100644 --- a/platform/features/timeline/style/bundle.json +++ b/platform/features/timeline/themes/espresso/bundle.json @@ -5,7 +5,7 @@ "stylesheets": [ { "stylesheetUrl": "css/timeline.css", - "priority": "10" + "priority": "mandatory" } ] } diff --git a/platform/features/timeline/themes/espresso/res/config.rb b/platform/features/timeline/themes/espresso/res/config.rb new file mode 100755 index 0000000000..58843cd76e --- /dev/null +++ b/platform/features/timeline/themes/espresso/res/config.rb @@ -0,0 +1,26 @@ +# Require any additional compass plugins here. +# require "compass-growl" + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "css" +sass_dir = "sass" +images_dir = "images" +javascripts_dir = "js" + +# You can select your preferred output style here (can be overridden via the command line): +# :expanded, :compressed, :nested +output_style = :nested + +# To enable relative paths to assets via compass helper functions. Uncomment: +relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass vfn_platform/static/sass scss && rm -rf sass && mv scss sass diff --git a/platform/features/timeline/themes/espresso/res/css/timeline.css b/platform/features/timeline/themes/espresso/res/css/timeline.css new file mode 100644 index 0000000000..8bd6537f8f --- /dev/null +++ b/platform/features/timeline/themes/espresso/res/css/timeline.css @@ -0,0 +1,652 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*********************************************** CONTROLS, FORM ELEMENTS */ +/* line 1, ../sass/_activities.scss */ +.l-timeline-gantt { + position: absolute; + top: 2px; + bottom: 2px; } + /* line 5, ../sass/_activities.scss */ + .l-timeline-gantt .bar { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 17px; + line-height: 19px; + padding: 0 5px; } + /* line 11, ../sass/_activities.scss */ + .l-timeline-gantt .bar span { + display: inline; } + /* line 15, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.s-activity-type.timeline:before { + content: "S"; } + /* line 20, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.s-activity-type.activity:before { + content: "A"; } + /* line 25, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.s-title { + text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } + /* line 30, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.duration { + left: auto; + opacity: 0.75; + right: 0; + text-align: right; + width: 60px; } + /* line 37, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.handle { + top: 0; + bottom: 0; + height: auto; + width: 15px; } + /* line 43, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.handle.left { + right: auto; } + /* line 46, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.handle.middle { + right: 15px; + left: 15px; + width: auto; } + /* line 51, ../sass/_activities.scss */ + .l-timeline-gantt .bar span.handle.right { + right: 0; + left: auto; } + +/* line 62, ../sass/_activities.scss */ +.s-timeline-gantt .bar { + color: #fff; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU1NTVhYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7777bb), color-stop(100%, #5555aa)); + background-image: -moz-linear-gradient(#7777bb, #5555aa); + background-image: -webkit-linear-gradient(#7777bb, #5555aa); + background-image: linear-gradient(#7777bb, #5555aa); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; + box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; } + /* line 69, ../sass/_activities.scss */ + .s-timeline-gantt .bar.expanded { + -moz-border-radius-topleft: 3px; + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -moz-border-radius-topright: 3px; + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -moz-border-radius-bottomleft: 0; + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomright: 0; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; } + /* line 73, ../sass/_activities.scss */ + .s-timeline-gantt .bar.leaf { + -moz-border-radius-topleft: 0; + -webkit-border-top-left-radius: 0; + border-top-left-radius: 0; + -moz-border-radius-topright: 0; + -webkit-border-top-right-radius: 0; + border-top-right-radius: 0; + -moz-border-radius-bottomleft: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; + -moz-border-radius-bottomright: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; } + /* line 77, ../sass/_activities.scss */ + .s-timeline-gantt .bar .s-toggle { + color: #0099cc; } + +/* line 85, ../sass/_activities.scss */ +.edit-mode .s-timeline-gantt .bar:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzk5OTljYyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #9999cc), color-stop(100%, #7777bb)); + background-image: -moz-linear-gradient(#9999cc, #7777bb); + background-image: -webkit-linear-gradient(#9999cc, #7777bb); + background-image: linear-gradient(#9999cc, #7777bb); } +/* line 90, ../sass/_activities.scss */ +.edit-mode .s-timeline-gantt .handle { + cursor: col-resize; } + /* line 95, ../sass/_activities.scss */ + .edit-mode .s-timeline-gantt .handle.mid { + cursor: ew-resize; } + +/* line 2, ../sass/_timelines.scss */ +.l-timeline-holder { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; } + /* line 6, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; } + /* line 9, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane .l-width-control { + position: relative; } + /* line 13, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane .l-swimlanes-holder { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + top: 31px; } + /* line 20, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; } + /* line 23, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-l { + right: auto; + width: 266px; } + /* line 28, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-r { + overflow-x: auto; + overflow-y: hidden; + left: 266px; } + /* line 32, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-r .l-width { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + min-width: 590px; + width: 100%; } + /* line 42, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-gantt .l-swimlanes-holder { + overflow-x: hidden; + overflow-y: scroll; } + /* line 47, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 5px 0; + white-space: nowrap; } + /* line 54, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .l-legend-items { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + overflow-x: hidden; + overflow-y: auto; + top: 25px; + color: #737373; } + /* line 61, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item { + display: block; + margin-bottom: 3px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } + /* line 69, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item .color-swatch { + vertical-align: baseline; } + /* line 72, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item .title-label { + vertical-align: baseline; } + /* line 81, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + bottom: 10px; } + /* line 86, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder .l-graphs { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + overflow-x: hidden; + overflow-y: scroll; } + /* line 91, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder .l-graph-labels-holder { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + overflow: hidden; + right: auto; + width: 400px; } + /* line 100, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-scroll-control { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + overflow-x: scroll; + overflow-y: hidden; + top: auto; + right: 10px; + height: 10px; } + /* line 106, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-scroll-control .l-width-control { + height: 10px; } + /* line 111, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph, + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-labels { + height: 80px; + margin-bottom: 3px; + position: relative; } + /* line 118, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: rgba(255, 255, 255, 0.4); + top: 5px; + left: 5px; + position: absolute; } + /* line 125, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph { + background: rgba(0, 0, 0, 0.3); + width: 100%; } + /* line 129, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph .l-graph-area canvas { + width: 100%; + height: 100%; } + /* line 136, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-labels { + z-index: 10; } + /* line 140, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + top: 20px; + bottom: 5px; } + /* line 143, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area .l-labels-holder { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + left: 5px; } + /* line 146, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area .l-labels-holder .tick-label.tick-label-y { + text-align: left; } + /* line 154, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.l-pane-l { + right: auto; + min-width: 50px; + max-width: 90%; + width: 30%; } + /* line 162, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.l-pane-r { + left: 0; } + /* line 166, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.l-pane-r:hover .l-hover-btns-holder { + -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-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; + opacity: 1; } + /* line 173, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.l-pane-top { + bottom: 30%; } + /* line 177, ../sass/_timelines.scss */ + .l-timeline-holder .l-timeline-pane.l-pane-btm { + top: auto; + min-height: 20px; + max-height: 80%; + height: 30%; } + /* line 186, ../sass/_timelines.scss */ + .l-timeline-holder .l-swimlane { + height: 21px; + position: relative; } + /* line 192, ../sass/_timelines.scss */ + .l-timeline-holder .s-timeline-tabular .l-header, + .l-timeline-holder .s-timeline-gantt .l-header { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + bottom: auto; + height: 30px; } + /* line 198, ../sass/_timelines.scss */ + .l-timeline-holder .s-timeline-tabular .l-header .l-header-elem, + .l-timeline-holder .s-timeline-gantt .l-header .l-header-elem { + overflow: visible; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + display: block; } + /* line 203, ../sass/_timelines.scss */ + .l-timeline-holder .s-timeline-tabular .l-header .l-header-elem.l-labels .l-label, + .l-timeline-holder .s-timeline-gantt .l-header .l-header-elem.l-labels .l-label { + position: absolute; + width: 140px; + margin-left: -70px; + text-align: center; } + /* line 213, ../sass/_timelines.scss */ + .l-timeline-holder .l-hover-btns-holder { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -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-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; + opacity: 0; + height: 30px; + width: 100px; + left: auto; + padding: 5px; + text-align: right; + z-index: 10; } + /* line 226, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + text-wrap: none; + white-space: nowrap; } + /* line 231, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols .l-col { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: inline-block; + height: 100%; + padding: 0 5px; + position: relative; + text-wrap: none; + white-space: nowrap; } + /* line 242, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols .l-col.l-col-icon { + width: 16px; + text-align: center; + padding: 0; } + /* line 246, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols .l-col.l-col-icon .ui-symbol { + color: #0099cc; } + /* line 251, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols .l-col.l-plot-resource { + border-left: none !important; + cursor: pointer; + padding-left: 0; } + /* line 260, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols .l-col.l-title { + width: 250px; } + /* line 264, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols .l-col.l-start, .l-timeline-holder .l-cols .l-col.l-end, .l-timeline-holder .l-cols .l-col.l-duration { + width: 110px; } + /* line 274, ../sass/_timelines.scss */ + .l-timeline-holder .l-cols .l-col.l-activity-modes { + display: none; + width: 250px; } + /* line 283, ../sass/_timelines.scss */ + .l-timeline-holder .s-timeline-tabular .l-header .l-cols { + top: 5px; + bottom: 5px; } + /* line 285, ../sass/_timelines.scss */ + .l-timeline-holder .s-timeline-tabular .l-header .l-cols .l-col { + border-left: 1px solid rgba(255, 255, 255, 0.1); } + /* line 293, ../sass/_timelines.scss */ + .l-timeline-holder .s-timeline-tabular .l-pane-l .l-cols { + left: 5px; } + /* line 295, ../sass/_timelines.scss */ + .l-timeline-holder .s-timeline-tabular .l-pane-l .l-cols .s-label .ui-symbol.icon { + color: #8594ff; } + /* line 308, ../sass/_timelines.scss */ + .l-timeline-holder .splitter { + top: 0; } + /* line 314, ../sass/_timelines.scss */ + .l-timeline-holder .l-ticks, + .l-timeline-holder .l-subticks { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; + top: auto; + bottom: 3px; } + /* line 320, ../sass/_timelines.scss */ + .l-timeline-holder .l-ticks { + height: 10px; } + /* line 324, ../sass/_timelines.scss */ + .l-timeline-holder .l-subticks { + height: 5px; } + +/* line 330, ../sass/_timelines.scss */ +.s-timeline { + font-size: 0.75rem; } + /* line 332, ../sass/_timelines.scss */ + .s-timeline .s-header { + background-color: #404040; } + /* line 335, ../sass/_timelines.scss */ + .s-timeline .s-swimlane { + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + line-height: 20px; + /* &:hover { + background: rgba(white, 0.1); + }*/ } + /* line 345, ../sass/_timelines.scss */ + .s-timeline .s-swimlane.exceeded { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMjUlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIiBzdG9wLW9wYWNpdHk9IjAuMDUiLz48c3RvcCBvZmZzZXQ9Ijc1JSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjA1Ii8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat; + background-size: 22px 22px; } + /* line 349, ../sass/_timelines.scss */ + .s-timeline .s-swimlane.selected { + background-color: #222; + color: #fff; } + /* line 355, ../sass/_timelines.scss */ + .s-timeline .s-swimlane.selected .s-timeline-gantt .bar { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2NjY2NjYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cccccc)); + background-image: -moz-linear-gradient(#e6e6e6, #cccccc); + background-image: -webkit-linear-gradient(#e6e6e6, #cccccc); + background-image: linear-gradient(#e6e6e6, #cccccc); + color: #333; } + /* line 363, ../sass/_timelines.scss */ + .s-timeline .s-swimlane.drop-into { + background-color: rgba(85, 85, 170, 0.7); } + /* line 365, ../sass/_timelines.scss */ + .s-timeline .s-swimlane.drop-into .s-timeline-gantt { + opacity: 0.7; } + /* line 369, ../sass/_timelines.scss */ + .s-timeline .s-swimlane.drop-after { + background-color: rgba(0, 0, 0, 0.2); + border-bottom-color: #5555aa; } + /* line 375, ../sass/_timelines.scss */ + .s-timeline .s-ticks { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiM1OTU5NTkiLz48c3RvcCBvZmZzZXQ9IjFweCIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(0deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(0deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(90deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat-x; } + /* line 378, ../sass/_timelines.scss */ + .s-timeline .s-hover-btns-holder { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iNzAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); + background-image: -webkit-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); + background-image: linear-gradient(-90deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); } + /* line 383, ../sass/_timelines.scss */ + .s-timeline .s-hover-btns-holder .s-btn { + background-color: #404040; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #a6a6a6; + display: inline-block; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); + background-image: -moz-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); + background-image: linear-gradient(#4d4d4d, #404040); + -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } + +/* line 389, ../sass/_timelines.scss */ +.edit-mode .s-swimlane { + cursor: pointer; } + /* line 391, ../sass/_timelines.scss */ + .edit-mode .s-swimlane .s-label { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + padding: 2px 5px; } + /* line 394, ../sass/_timelines.scss */ + .edit-mode .s-swimlane .s-label:hover { + background: rgba(255, 255, 255, 0.1); + color: #fff; } diff --git a/platform/features/timeline/themes/espresso/res/sass/_activities.scss b/platform/features/timeline/themes/espresso/res/sass/_activities.scss new file mode 100644 index 0000000000..75f3a81072 --- /dev/null +++ b/platform/features/timeline/themes/espresso/res/sass/_activities.scss @@ -0,0 +1,103 @@ +.l-timeline-gantt { + position: absolute; + top: $timelineSwimlaneGanttVM; bottom: $timelineSwimlaneGanttVM; + + .bar { + @include ellipsize(); + height: $activityBarH; + line-height: $activityBarH + 2; + padding: 0 $interiorMargin; + + span { + display: inline; + &.s-activity-type { + &.timeline { + &:before { + content:"S"; + } + } + &.activity { + &:before { + content:"A"; + } + } + } + &.s-title { + @include text-shadow(rgba(black, 0.1) 0 1px 2px); +// right: 5px; +// width: 50%; + } + &.duration { + left: auto; + opacity: 0.75; + right: 0; + text-align: right; + width: 60px; + } + &.handle { + //background: rgba(red, 0.2); + top: 0; + bottom: 0; + height: auto; + width: 15px; + &.left { + right: auto; + } + &.middle { + right: 15px; + left: 15px; + width: auto; + } + &.right { + right: 0; + left: auto; + } + } + } + } +} + +.s-timeline-gantt { + $br: $controlCr; + .bar { + color: $activityTypeFg; +// opacity: 0.9; +// @include background-image(linear-gradient(lighten($activityTypeBg, 10), $activityTypeBg)); + @include activityBg($activityTypeBg); + @include border-radius($br); + @include box-shadow(rgba(black, 0.4) 0 1px 3px); + &.expanded { + @include border-top-radius($br); + @include border-bottom-radius(0); + } + &.leaf { + @include border-top-radius(0); + @include border-bottom-radius($br); + } + .s-toggle { + color: $colorKey; + } + } +} + +.edit-mode .s-timeline-gantt { + .bar { + &:hover { + @include background-image(linear-gradient(lighten($activityTypeBg, 20), lighten($activityTypeBg, 10))); + } + } + + .handle { + cursor: col-resize; + &.start { +// @include test(red); + } + &.mid { +// @include test(green); + cursor: ew-resize; + } + &.end { +// @include test(blue); + } + } +} \ No newline at end of file diff --git a/platform/features/timeline/style/sass/_constants.scss b/platform/features/timeline/themes/espresso/res/sass/_constants.scss similarity index 91% rename from platform/features/timeline/style/sass/_constants.scss rename to platform/features/timeline/themes/espresso/res/sass/_constants.scss index 26bcd55eaf..ca7a47f7a3 100644 --- a/platform/features/timeline/style/sass/_constants.scss +++ b/platform/features/timeline/themes/espresso/res/sass/_constants.scss @@ -1,8 +1,6 @@ -$dirImgs: '../images/'; //Relative to warp.css -/*$interiorMargin: 5px; -$interiorMarginLg: $interiorMargin * 2; -$interiorMarginSm: 3px;*/ -$logoAspect: .17; +@mixin activityBg($bg, $gamma: 10) { + @include background-image(linear-gradient(lighten($bg, $gamma), $bg)); +} // Timeline constants $activityBarH: 17px; diff --git a/platform/features/timeline/themes/espresso/res/sass/_timelines.scss b/platform/features/timeline/themes/espresso/res/sass/_timelines.scss new file mode 100644 index 0000000000..bdb8211a3e --- /dev/null +++ b/platform/features/timeline/themes/espresso/res/sass/_timelines.scss @@ -0,0 +1,401 @@ +//*************************************************************** LAYOUT +.l-timeline-holder { +// @include test(); + @include absPosDefault(); + + .l-timeline-pane { + @include absPosDefault(); + + .l-width-control { + position: relative; + } + + .l-swimlanes-holder { + @include absPosDefault(); + top: $timelineTopPaneHeaderH + 1; + } + + // Overall layout + &.t-pane-h { + &.s-timeline-tabular .t-pane-v { + // Vertical panes within tabular area + @include absPosDefault(); + &.l-tabular-l { + // Tree area with item title + right: auto; // Set this to auto and uncomment width below when additional tabular columns are added + width: $timelineTabularTitleW; + } + &.l-tabular-r { + // Start, end, duration, activity modes columns + @include scrollH(); + left: $timelineTabularTitleW; + .l-width { + @include absPosDefault(0, visible); + min-width: $timelineTabularDataW; + width: 100%; + } + } + } + &.l-timeline-gantt { +// @include testObj(); + + .l-swimlanes-holder { + @include scrollV(scroll); + } + + } + &.l-timeline-resource-legend { + @include box-sizing(border-box); + padding: $interiorMargin 0; + white-space: nowrap; + .l-title { + } + + .l-legend-items { + @include absPosDefault(); + @include scrollV(); + top: 25px; + color: lighten($timelineColorAlt1, 10%); +// margin-top: $interiorMargin; + } + .legend-item { + // Inherits from /platform/commonUI/general/res/sass/plots/_plots-main.scss +// border-bottom: 1px solid $colorInteriorBorder; + display: block; + margin-bottom: $interiorMarginSm; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + .color-swatch { + vertical-align: baseline; + } + .title-label { + vertical-align: baseline; + } + } + } + + &.l-timeline-resource-graph { + $m: $interiorMargin; + + .l-graphs-holder { +// @include test(blue); + @include absPosDefault(); + bottom: $scrollbarTrackSize; + + .l-graphs { + @include absPosDefault(); + @include scrollV(scroll); + } + + .l-graph-labels-holder { +// @include test(red); + @include absPosDefault(); + overflow: hidden; + right: auto; + width: 400px; + } + } + + .l-scroll-control { + @include absPosDefault(); + overflow-x: scroll; + overflow-y: hidden; + top: auto; right: $scrollbarTrackSize; + height: $scrollbarTrackSize; + .l-width-control { + height: 10px; // Need to add height to force scrollbar to appear + } + } + + .l-graph, + .l-graph-labels { + height: 80px; //was 120px + margin-bottom: $interiorMarginSm; + position: relative; + } + + .l-title { + @include ellipsize(); + color: rgba(#fff, 0.4); + top: $m; left: $m; + position: absolute; + } + + .l-graph { + background: rgba(black, 0.3); + width: 100%; + .l-graph-area { + canvas { + width: 100%; + height: 100%; + } + } + } + + .l-graph-labels { + z-index: 10; + } + + .l-graph-area { + @include absPosDefault(); + top: 20px; bottom: 5px; + .l-labels-holder { + @include absPosDefault(); + left: $m; + .tick-label.tick-label-y { + text-align: left; + } + } + } + } + } + + &.l-pane-l { +// @include test(red); + right: auto; + min-width: 50px; + max-width: 90%; + width: $timelinePaneLeftW; + } + + &.l-pane-r { +// @include test(blue); + left: 0; + &:hover { + .l-hover-btns-holder { + @include trans-prop-nice-fade(100ms); + opacity: 1; + } + } + } + + &.l-pane-top { +// @include test(green); + bottom: $timelinePaneBtmH; + } + &.l-pane-btm { +// @include test(orange); + top: auto; + min-height: 20px; + max-height: 80%; + height: $timelinePaneBtmH; + } + } + + .l-swimlane { + height: $timelineSwimlaneH; + position: relative; + } + + // Header + .s-timeline-tabular .l-header, + .s-timeline-gantt .l-header { +// @include test(white,0.05); + @include absPosDefault(0, visible); + bottom: auto; height: $timelineTopPaneHeaderH; + + .l-header-elem { + @include absPosDefault($timelineTopPaneHeaderElemMargin, visible); +// bottom: auto; height: 15px; + display: block; + &.l-labels { + .l-label { + position: absolute; + width: 140px; + margin-left: -70px; + text-align: center; + } + } + } + } + + .l-hover-btns-holder { + @include absPosDefault(); + @include box-sizing(border-box); + @include trans-prop-nice-fade(500ms); + opacity: 0; + height: $timelineTopPaneHeaderH; + width: 100px; left: auto; + padding: $interiorMargin; + text-align: right; + z-index: 10; + } + + // Tabular Columns + .l-cols { +// @include test(#66ff66, 0.1); + @include absPosDefault(0, visible); + text-wrap: none; + white-space: nowrap; + .l-col { + @include box-sizing(border-box); + @include ellipsize(); +// @include test(red, 0.05); + display: inline-block; + height: 100%; + padding: 0 $interiorMargin; + position: relative; + text-wrap: none; + white-space: nowrap; + + &.l-col-icon { + width: $timelineColIconW; + text-align: center; + padding: 0; + .ui-symbol { + color: $colorKey; + } + } + + &.l-plot-resource { + border-left: none !important; + cursor: pointer; + padding-left: 0; +// .ui-symbol { +// color: $colorFormValid; +// } + } + + &.l-title { + width: $timelineColTitleW; + } + + &.l-start, + &.l-end, + &.l-duration { + width: $timelineColDatetimeW; + } + + //&.l-duration { + // width: $timelineColDurationW; + //} + + &.l-activity-modes { + display: none; // Temp, until modes can be displayed + width: $timelineColActivityModesW; + } + + } + } + + .s-timeline-tabular { + .l-header .l-cols { + top: $timelineTopPaneHeaderElemMargin; bottom: $timelineTopPaneHeaderElemMargin; + .l-col { + border-left: 1px solid rgba(#fff, 0.1); +// height: 100%; + } + } + + .l-pane-l { + // Left pane of the tabular area + .l-cols { + left: $timelineTopPaneHeaderElemMargin; + .s-label .ui-symbol.icon { + //color: $colorKeyFg; + color: $activityTypeTabularFgIcon; + } + } + } + + .l-pane-r { + // Right pane of the tabular area +// @include test(red, 0.05); + } + } + + .splitter { + // Top of splitter within Timelines should be 0 + top: 0; + } + + // Ticks + .l-ticks, + .l-subticks { + @include absPosDefault(); + top: auto; bottom: $interiorMarginSm; + } + + .l-ticks { + height: 10px + } + + .l-subticks { + height: 5px + } +} + +//*************************************************************** STYLING +.s-timeline { + font-size: 0.75rem; + .s-header { + background-color: $timelineHeaderColorBg; + } + .s-swimlane { + // @include transition-property(background-color); + // @include transition-duration(0.2s); + // @include transition-timing-function(ease-out); + // border-top: 1px solid rgba(black, 0.2); + border-bottom: 1px solid rgba(white, 0.1); + line-height: $activityBarH + 2 + 1; + /* &:hover { + background: rgba(white, 0.1); + }*/ + &.exceeded { + @include bgDiagonalStripes(#fff, 0.05, $timelineSwimlaneH + 1); + } + + &.selected { + $bg: $colorSwimlaneSelectedBg; + background-color: $bg; + color: #fff; +// @include background-image(linear-gradient(darken($bg, 5), $bg)); + + .s-timeline-gantt .bar { + @include activityBg($colorSwimlaneSelectedGanttBg, 10); + color: $colorSwimlaneSelectedGanttFg; +// background-color: red; +// background-image: none; + } + } + + &.drop-into { + background-color: rgba($colorDropTarg, 0.7); + .s-timeline-gantt { + opacity: 0.7; + } + } + &.drop-after { + background-color: rgba(#000, 0.2); + border-bottom-color: rgba($colorDropTarg, 1.0); + } + } + + .s-ticks { + @include bgTicks($timelineColorAlt1); + } + .s-hover-btns-holder { + $bg: $timelineHeaderColorBg; + $bga: 1; + $l: 5%; + @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); + .s-btn { + @include containerSubtle(lighten($colorBodyBg, $l), lighten($colorBodyFg, $l), true); + } + } +} + +.edit-mode .s-swimlane { + cursor: pointer; + .s-label { + @include border-radius($controlCr); + padding: 2px 5px; + &:hover { + background: rgba(#fff, 0.1); + color: #fff; + } + } +} + + diff --git a/platform/features/timeline/themes/espresso/res/sass/timeline.scss b/platform/features/timeline/themes/espresso/res/sass/timeline.scss new file mode 100644 index 0000000000..fe25a008ec --- /dev/null +++ b/platform/features/timeline/themes/espresso/res/sass/timeline.scss @@ -0,0 +1,11 @@ +@import "compass"; +@import "compass/css3"; +@import "compass/utilities"; + +@import "../../../../../../commonUI/general/res/sass/constants"; +@import "../../../../../../commonUI/general/res/sass/mixins"; +@import "../../../../../../commonUI/themes/espresso/res/sass/constants"; +@import "../../../../../../commonUI/themes/espresso/res/sass/mixins"; +@import "constants"; +@import "activities"; +@import "timelines"; \ No newline at end of file From 7cd255670e4cb2c2fd2776aba96989c94034a269 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 3 Nov 2015 14:59:41 -0800 Subject: [PATCH 03/88] [Frontend] Committing removed files open #208 --- platform/features/timeline/style/config.rb | 26 -- .../timeline/style/sass/_activities.scss | 103 ----- .../timeline/style/sass/_timelines.scss | 401 ------------------ 3 files changed, 530 deletions(-) delete mode 100755 platform/features/timeline/style/config.rb delete mode 100644 platform/features/timeline/style/sass/_activities.scss delete mode 100644 platform/features/timeline/style/sass/_timelines.scss diff --git a/platform/features/timeline/style/config.rb b/platform/features/timeline/style/config.rb deleted file mode 100755 index a5def82481..0000000000 --- a/platform/features/timeline/style/config.rb +++ /dev/null @@ -1,26 +0,0 @@ -# Require any additional compass plugins here. -# require "compass-growl" - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "css" -sass_dir = "sass" -images_dir = "images" -javascripts_dir = "js" - -# You can select your preferred output style here (can be overridden via the command line): -# :expanded, :compressed, :nested -output_style = :nested - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass vfn_platform/static/sass scss && rm -rf sass && mv scss sass diff --git a/platform/features/timeline/style/sass/_activities.scss b/platform/features/timeline/style/sass/_activities.scss deleted file mode 100644 index 75f3a81072..0000000000 --- a/platform/features/timeline/style/sass/_activities.scss +++ /dev/null @@ -1,103 +0,0 @@ -.l-timeline-gantt { - position: absolute; - top: $timelineSwimlaneGanttVM; bottom: $timelineSwimlaneGanttVM; - - .bar { - @include ellipsize(); - height: $activityBarH; - line-height: $activityBarH + 2; - padding: 0 $interiorMargin; - - span { - display: inline; - &.s-activity-type { - &.timeline { - &:before { - content:"S"; - } - } - &.activity { - &:before { - content:"A"; - } - } - } - &.s-title { - @include text-shadow(rgba(black, 0.1) 0 1px 2px); -// right: 5px; -// width: 50%; - } - &.duration { - left: auto; - opacity: 0.75; - right: 0; - text-align: right; - width: 60px; - } - &.handle { - //background: rgba(red, 0.2); - top: 0; - bottom: 0; - height: auto; - width: 15px; - &.left { - right: auto; - } - &.middle { - right: 15px; - left: 15px; - width: auto; - } - &.right { - right: 0; - left: auto; - } - } - } - } -} - -.s-timeline-gantt { - $br: $controlCr; - .bar { - color: $activityTypeFg; -// opacity: 0.9; -// @include background-image(linear-gradient(lighten($activityTypeBg, 10), $activityTypeBg)); - @include activityBg($activityTypeBg); - @include border-radius($br); - @include box-shadow(rgba(black, 0.4) 0 1px 3px); - &.expanded { - @include border-top-radius($br); - @include border-bottom-radius(0); - } - &.leaf { - @include border-top-radius(0); - @include border-bottom-radius($br); - } - .s-toggle { - color: $colorKey; - } - } -} - -.edit-mode .s-timeline-gantt { - .bar { - &:hover { - @include background-image(linear-gradient(lighten($activityTypeBg, 20), lighten($activityTypeBg, 10))); - } - } - - .handle { - cursor: col-resize; - &.start { -// @include test(red); - } - &.mid { -// @include test(green); - cursor: ew-resize; - } - &.end { -// @include test(blue); - } - } -} \ No newline at end of file diff --git a/platform/features/timeline/style/sass/_timelines.scss b/platform/features/timeline/style/sass/_timelines.scss deleted file mode 100644 index bdb8211a3e..0000000000 --- a/platform/features/timeline/style/sass/_timelines.scss +++ /dev/null @@ -1,401 +0,0 @@ -//*************************************************************** LAYOUT -.l-timeline-holder { -// @include test(); - @include absPosDefault(); - - .l-timeline-pane { - @include absPosDefault(); - - .l-width-control { - position: relative; - } - - .l-swimlanes-holder { - @include absPosDefault(); - top: $timelineTopPaneHeaderH + 1; - } - - // Overall layout - &.t-pane-h { - &.s-timeline-tabular .t-pane-v { - // Vertical panes within tabular area - @include absPosDefault(); - &.l-tabular-l { - // Tree area with item title - right: auto; // Set this to auto and uncomment width below when additional tabular columns are added - width: $timelineTabularTitleW; - } - &.l-tabular-r { - // Start, end, duration, activity modes columns - @include scrollH(); - left: $timelineTabularTitleW; - .l-width { - @include absPosDefault(0, visible); - min-width: $timelineTabularDataW; - width: 100%; - } - } - } - &.l-timeline-gantt { -// @include testObj(); - - .l-swimlanes-holder { - @include scrollV(scroll); - } - - } - &.l-timeline-resource-legend { - @include box-sizing(border-box); - padding: $interiorMargin 0; - white-space: nowrap; - .l-title { - } - - .l-legend-items { - @include absPosDefault(); - @include scrollV(); - top: 25px; - color: lighten($timelineColorAlt1, 10%); -// margin-top: $interiorMargin; - } - .legend-item { - // Inherits from /platform/commonUI/general/res/sass/plots/_plots-main.scss -// border-bottom: 1px solid $colorInteriorBorder; - display: block; - margin-bottom: $interiorMarginSm; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - .color-swatch { - vertical-align: baseline; - } - .title-label { - vertical-align: baseline; - } - } - } - - &.l-timeline-resource-graph { - $m: $interiorMargin; - - .l-graphs-holder { -// @include test(blue); - @include absPosDefault(); - bottom: $scrollbarTrackSize; - - .l-graphs { - @include absPosDefault(); - @include scrollV(scroll); - } - - .l-graph-labels-holder { -// @include test(red); - @include absPosDefault(); - overflow: hidden; - right: auto; - width: 400px; - } - } - - .l-scroll-control { - @include absPosDefault(); - overflow-x: scroll; - overflow-y: hidden; - top: auto; right: $scrollbarTrackSize; - height: $scrollbarTrackSize; - .l-width-control { - height: 10px; // Need to add height to force scrollbar to appear - } - } - - .l-graph, - .l-graph-labels { - height: 80px; //was 120px - margin-bottom: $interiorMarginSm; - position: relative; - } - - .l-title { - @include ellipsize(); - color: rgba(#fff, 0.4); - top: $m; left: $m; - position: absolute; - } - - .l-graph { - background: rgba(black, 0.3); - width: 100%; - .l-graph-area { - canvas { - width: 100%; - height: 100%; - } - } - } - - .l-graph-labels { - z-index: 10; - } - - .l-graph-area { - @include absPosDefault(); - top: 20px; bottom: 5px; - .l-labels-holder { - @include absPosDefault(); - left: $m; - .tick-label.tick-label-y { - text-align: left; - } - } - } - } - } - - &.l-pane-l { -// @include test(red); - right: auto; - min-width: 50px; - max-width: 90%; - width: $timelinePaneLeftW; - } - - &.l-pane-r { -// @include test(blue); - left: 0; - &:hover { - .l-hover-btns-holder { - @include trans-prop-nice-fade(100ms); - opacity: 1; - } - } - } - - &.l-pane-top { -// @include test(green); - bottom: $timelinePaneBtmH; - } - &.l-pane-btm { -// @include test(orange); - top: auto; - min-height: 20px; - max-height: 80%; - height: $timelinePaneBtmH; - } - } - - .l-swimlane { - height: $timelineSwimlaneH; - position: relative; - } - - // Header - .s-timeline-tabular .l-header, - .s-timeline-gantt .l-header { -// @include test(white,0.05); - @include absPosDefault(0, visible); - bottom: auto; height: $timelineTopPaneHeaderH; - - .l-header-elem { - @include absPosDefault($timelineTopPaneHeaderElemMargin, visible); -// bottom: auto; height: 15px; - display: block; - &.l-labels { - .l-label { - position: absolute; - width: 140px; - margin-left: -70px; - text-align: center; - } - } - } - } - - .l-hover-btns-holder { - @include absPosDefault(); - @include box-sizing(border-box); - @include trans-prop-nice-fade(500ms); - opacity: 0; - height: $timelineTopPaneHeaderH; - width: 100px; left: auto; - padding: $interiorMargin; - text-align: right; - z-index: 10; - } - - // Tabular Columns - .l-cols { -// @include test(#66ff66, 0.1); - @include absPosDefault(0, visible); - text-wrap: none; - white-space: nowrap; - .l-col { - @include box-sizing(border-box); - @include ellipsize(); -// @include test(red, 0.05); - display: inline-block; - height: 100%; - padding: 0 $interiorMargin; - position: relative; - text-wrap: none; - white-space: nowrap; - - &.l-col-icon { - width: $timelineColIconW; - text-align: center; - padding: 0; - .ui-symbol { - color: $colorKey; - } - } - - &.l-plot-resource { - border-left: none !important; - cursor: pointer; - padding-left: 0; -// .ui-symbol { -// color: $colorFormValid; -// } - } - - &.l-title { - width: $timelineColTitleW; - } - - &.l-start, - &.l-end, - &.l-duration { - width: $timelineColDatetimeW; - } - - //&.l-duration { - // width: $timelineColDurationW; - //} - - &.l-activity-modes { - display: none; // Temp, until modes can be displayed - width: $timelineColActivityModesW; - } - - } - } - - .s-timeline-tabular { - .l-header .l-cols { - top: $timelineTopPaneHeaderElemMargin; bottom: $timelineTopPaneHeaderElemMargin; - .l-col { - border-left: 1px solid rgba(#fff, 0.1); -// height: 100%; - } - } - - .l-pane-l { - // Left pane of the tabular area - .l-cols { - left: $timelineTopPaneHeaderElemMargin; - .s-label .ui-symbol.icon { - //color: $colorKeyFg; - color: $activityTypeTabularFgIcon; - } - } - } - - .l-pane-r { - // Right pane of the tabular area -// @include test(red, 0.05); - } - } - - .splitter { - // Top of splitter within Timelines should be 0 - top: 0; - } - - // Ticks - .l-ticks, - .l-subticks { - @include absPosDefault(); - top: auto; bottom: $interiorMarginSm; - } - - .l-ticks { - height: 10px - } - - .l-subticks { - height: 5px - } -} - -//*************************************************************** STYLING -.s-timeline { - font-size: 0.75rem; - .s-header { - background-color: $timelineHeaderColorBg; - } - .s-swimlane { - // @include transition-property(background-color); - // @include transition-duration(0.2s); - // @include transition-timing-function(ease-out); - // border-top: 1px solid rgba(black, 0.2); - border-bottom: 1px solid rgba(white, 0.1); - line-height: $activityBarH + 2 + 1; - /* &:hover { - background: rgba(white, 0.1); - }*/ - &.exceeded { - @include bgDiagonalStripes(#fff, 0.05, $timelineSwimlaneH + 1); - } - - &.selected { - $bg: $colorSwimlaneSelectedBg; - background-color: $bg; - color: #fff; -// @include background-image(linear-gradient(darken($bg, 5), $bg)); - - .s-timeline-gantt .bar { - @include activityBg($colorSwimlaneSelectedGanttBg, 10); - color: $colorSwimlaneSelectedGanttFg; -// background-color: red; -// background-image: none; - } - } - - &.drop-into { - background-color: rgba($colorDropTarg, 0.7); - .s-timeline-gantt { - opacity: 0.7; - } - } - &.drop-after { - background-color: rgba(#000, 0.2); - border-bottom-color: rgba($colorDropTarg, 1.0); - } - } - - .s-ticks { - @include bgTicks($timelineColorAlt1); - } - .s-hover-btns-holder { - $bg: $timelineHeaderColorBg; - $bga: 1; - $l: 5%; - @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); - .s-btn { - @include containerSubtle(lighten($colorBodyBg, $l), lighten($colorBodyFg, $l), true); - } - } -} - -.edit-mode .s-swimlane { - cursor: pointer; - .s-label { - @include border-radius($controlCr); - padding: 2px 5px; - &:hover { - background: rgba(#fff, 0.1); - color: #fff; - } - } -} - - From de59f191b88ad88e4cc8b79183043cd6c619c267 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 20 Nov 2015 09:14:07 -0800 Subject: [PATCH 04/88] [Frontend] Relocating files open #208 Moving initial files into new positions, based on Victor's work in #242; --- bundles.json | 1 - platform/features/timeline/bundle.json | 5 +++++ .../timeline/{themes => res}/compile-themes-sass.sh | 0 .../timeline/{themes/espresso => }/res/config.rb | 0 .../{themes/espresso => }/res/css/timeline.css | 0 .../{themes/espresso => }/res/sass/_activities.scss | 0 .../{themes/espresso => }/res/sass/_constants.scss | 0 .../{themes/espresso => }/res/sass/_timelines.scss | 0 .../{themes/espresso => }/res/sass/timeline.scss | 0 .../features/timeline/themes/espresso/bundle.json | 12 ------------ 10 files changed, 5 insertions(+), 13 deletions(-) rename platform/features/timeline/{themes => res}/compile-themes-sass.sh (100%) rename platform/features/timeline/{themes/espresso => }/res/config.rb (100%) rename platform/features/timeline/{themes/espresso => }/res/css/timeline.css (100%) rename platform/features/timeline/{themes/espresso => }/res/sass/_activities.scss (100%) rename platform/features/timeline/{themes/espresso => }/res/sass/_constants.scss (100%) rename platform/features/timeline/{themes/espresso => }/res/sass/_timelines.scss (100%) rename platform/features/timeline/{themes/espresso => }/res/sass/timeline.scss (100%) delete mode 100644 platform/features/timeline/themes/espresso/bundle.json diff --git a/bundles.json b/bundles.json index 6a5864ae57..3f7c7c16f8 100644 --- a/bundles.json +++ b/bundles.json @@ -23,7 +23,6 @@ "platform/features/plot", "platform/features/scrolling", "platform/features/timeline", - "platform/features/timeline/themes/espresso", "platform/forms", "platform/identity", "platform/persistence/local", diff --git a/platform/features/timeline/bundle.json b/platform/features/timeline/bundle.json index 4bd6c9dd7c..e44c0ca21e 100644 --- a/platform/features/timeline/bundle.json +++ b/platform/features/timeline/bundle.json @@ -217,6 +217,11 @@ } } ], + "stylesheets": [ + { + "stylesheetUrl": "css/timeline.css" + } + ], "representations": [ { "key": "gantt", diff --git a/platform/features/timeline/themes/compile-themes-sass.sh b/platform/features/timeline/res/compile-themes-sass.sh similarity index 100% rename from platform/features/timeline/themes/compile-themes-sass.sh rename to platform/features/timeline/res/compile-themes-sass.sh diff --git a/platform/features/timeline/themes/espresso/res/config.rb b/platform/features/timeline/res/config.rb similarity index 100% rename from platform/features/timeline/themes/espresso/res/config.rb rename to platform/features/timeline/res/config.rb diff --git a/platform/features/timeline/themes/espresso/res/css/timeline.css b/platform/features/timeline/res/css/timeline.css similarity index 100% rename from platform/features/timeline/themes/espresso/res/css/timeline.css rename to platform/features/timeline/res/css/timeline.css diff --git a/platform/features/timeline/themes/espresso/res/sass/_activities.scss b/platform/features/timeline/res/sass/_activities.scss similarity index 100% rename from platform/features/timeline/themes/espresso/res/sass/_activities.scss rename to platform/features/timeline/res/sass/_activities.scss diff --git a/platform/features/timeline/themes/espresso/res/sass/_constants.scss b/platform/features/timeline/res/sass/_constants.scss similarity index 100% rename from platform/features/timeline/themes/espresso/res/sass/_constants.scss rename to platform/features/timeline/res/sass/_constants.scss diff --git a/platform/features/timeline/themes/espresso/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss similarity index 100% rename from platform/features/timeline/themes/espresso/res/sass/_timelines.scss rename to platform/features/timeline/res/sass/_timelines.scss diff --git a/platform/features/timeline/themes/espresso/res/sass/timeline.scss b/platform/features/timeline/res/sass/timeline.scss similarity index 100% rename from platform/features/timeline/themes/espresso/res/sass/timeline.scss rename to platform/features/timeline/res/sass/timeline.scss diff --git a/platform/features/timeline/themes/espresso/bundle.json b/platform/features/timeline/themes/espresso/bundle.json deleted file mode 100644 index eef844096c..0000000000 --- a/platform/features/timeline/themes/espresso/bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "Timeline Styling", - "description": "CSS for Timelines. Ported from /warp", - "extensions": { - "stylesheets": [ - { - "stylesheetUrl": "css/timeline.css", - "priority": "mandatory" - } - ] - } -} From fc53dbd8a4cbbaa76a457564287760d2c17e8669 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 20 Nov 2015 15:23:08 -0800 Subject: [PATCH 05/88] [Frontend] Themes added to Timelines open #208 Espresso and Snow now supported; bulk of work done except for minor cleanups, like zoom buttons; Dragging not working currently in Timelines; --- .../themes/snow/res/sass/_mixins.scss | 2 +- platform/features/timeline/bundle.json | 8 + .../timeline/res/compile-themes-sass.sh | 7 - .../timeline/res/css/timeline-espresso.css | 299 +++++++++++++++ .../timeline/res/css/timeline-snow.css | 290 ++++++++++++++ .../features/timeline/res/css/timeline.css | 355 +++++++----------- .../features/timeline/res/sass-compile.sh | 4 + .../timeline/res/sass/_activities.scss | 29 -- .../res/sass/_constants-espresso.scss | 42 +++ .../timeline/res/sass/_constants-snow.scss | 42 +++ .../timeline/res/sass/_constants.scss | 35 +- .../timeline/res/sass/_timeline-thematic.scss | 149 ++++++++ .../timeline/res/sass/_timelines.scss | 119 ++---- .../timeline/res/sass/timeline-espresso.scss | 33 ++ .../timeline/res/sass/timeline-snow.scss | 32 ++ .../features/timeline/res/sass/timeline.scss | 29 +- 16 files changed, 1104 insertions(+), 371 deletions(-) delete mode 100644 platform/features/timeline/res/compile-themes-sass.sh create mode 100644 platform/features/timeline/res/css/timeline-espresso.css create mode 100644 platform/features/timeline/res/css/timeline-snow.css create mode 100644 platform/features/timeline/res/sass-compile.sh create mode 100644 platform/features/timeline/res/sass/_constants-espresso.scss create mode 100644 platform/features/timeline/res/sass/_constants-snow.scss create mode 100644 platform/features/timeline/res/sass/_timeline-thematic.scss create mode 100644 platform/features/timeline/res/sass/timeline-espresso.scss create mode 100644 platform/features/timeline/res/sass/timeline-snow.scss diff --git a/platform/commonUI/themes/snow/res/sass/_mixins.scss b/platform/commonUI/themes/snow/res/sass/_mixins.scss index e8ab65d5f1..05a5c4fb64 100644 --- a/platform/commonUI/themes/snow/res/sass/_mixins.scss +++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss @@ -1,4 +1,4 @@ -@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg) { +@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { @include containerBase($bg, $fg); @include boxShdw($shdwBtns); } diff --git a/platform/features/timeline/bundle.json b/platform/features/timeline/bundle.json index e44c0ca21e..e532abc971 100644 --- a/platform/features/timeline/bundle.json +++ b/platform/features/timeline/bundle.json @@ -220,6 +220,14 @@ "stylesheets": [ { "stylesheetUrl": "css/timeline.css" + }, + { + "stylesheetUrl": "css/timeline-espresso.css", + "theme": "espresso" + }, + { + "stylesheetUrl": "css/timeline-snow.css", + "theme": "snow" } ], "representations": [ diff --git a/platform/features/timeline/res/compile-themes-sass.sh b/platform/features/timeline/res/compile-themes-sass.sh deleted file mode 100644 index 6e0e18e677..0000000000 --- a/platform/features/timeline/res/compile-themes-sass.sh +++ /dev/null @@ -1,7 +0,0 @@ -echo "*** Compiling timeline-espresso" -cd espresso/res -compass compile --force - -# echo "*** Compiling timeline-snow" -# cd espresso/snow -# compass compile --force \ No newline at end of file diff --git a/platform/features/timeline/res/css/timeline-espresso.css b/platform/features/timeline/res/css/timeline-espresso.css new file mode 100644 index 0000000000..895fdb8294 --- /dev/null +++ b/platform/features/timeline/res/css/timeline-espresso.css @@ -0,0 +1,299 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/************************** FEATURES */ +/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ +/************************** RATIOS */ +/************************** LAYOUT */ +/************************** CONTROLS */ +/************************** PATHS */ +/************************** TIMINGS */ +/************************** LIMITS */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*********************************************** 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. + *****************************************************************************/ +/***************************************************************************** + * 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, ../sass/_timeline-thematic.scss */ +.l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .l-legend-items { + color: #999; } + +/* line 36, ../sass/_timeline-thematic.scss */ +.s-timeline-gantt .bar { + color: #fff; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU1NTVhYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7777bb), color-stop(100%, #5555aa)); + background-image: -moz-linear-gradient(#7777bb, #5555aa); + background-image: -webkit-linear-gradient(#7777bb, #5555aa); + background-image: linear-gradient(#7777bb, #5555aa); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; + box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; } + /* line 41, ../sass/_timeline-thematic.scss */ + .s-timeline-gantt .bar.expanded { + -moz-border-radius-topleft: 3px; + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -moz-border-radius-topright: 3px; + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -moz-border-radius-bottomleft: 0; + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomright: 0; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; } + /* line 45, ../sass/_timeline-thematic.scss */ + .s-timeline-gantt .bar.leaf { + -moz-border-radius-topleft: 0; + -webkit-border-top-left-radius: 0; + border-top-left-radius: 0; + -moz-border-radius-topright: 0; + -webkit-border-top-right-radius: 0; + border-top-right-radius: 0; + -moz-border-radius-bottomleft: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; + -moz-border-radius-bottomright: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; } + /* line 49, ../sass/_timeline-thematic.scss */ + .s-timeline-gantt .bar .s-toggle { + color: #0099cc; } + +/* line 57, ../sass/_timeline-thematic.scss */ +.s-timeline-tabular .l-header .l-cols .l-col { + border-left: 1px solid #666666; } +/* line 65, ../sass/_timeline-thematic.scss */ +.s-timeline-tabular .l-pane-l .l-cols .s-label .ui-symbol.icon { + color: #8594ff; } + +/* line 74, ../sass/_timeline-thematic.scss */ +.edit-mode .s-timeline-gantt .bar:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzk5OTljYyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #9999cc), color-stop(100%, #7777bb)); + background-image: -moz-linear-gradient(#9999cc, #7777bb); + background-image: -webkit-linear-gradient(#9999cc, #7777bb); + background-image: linear-gradient(#9999cc, #7777bb); } + +/* line 81, ../sass/_timeline-thematic.scss */ +.s-timeline { + font-size: 0.75rem; } + /* line 83, ../sass/_timeline-thematic.scss */ + .s-timeline .s-header { + background-color: #404040; } + /* line 86, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane { + border-bottom: 1px solid #4d4d4d; + line-height: 20px; } + /* line 89, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.exceeded { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMjUlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIiBzdG9wLW9wYWNpdHk9IjAuMDUiLz48c3RvcCBvZmZzZXQ9Ijc1JSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjA1Ii8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat; + background-size: 22px 22px; } + /* line 93, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.selected { + background-color: #222; + color: #ccc; } + /* line 97, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.selected .s-timeline-gantt .bar { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2NjY2NjYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cccccc)); + background-image: -moz-linear-gradient(#e6e6e6, #cccccc); + background-image: -webkit-linear-gradient(#e6e6e6, #cccccc); + background-image: linear-gradient(#e6e6e6, #cccccc); + color: #333; } + /* line 103, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.drop-into { + background-color: rgba(85, 85, 170, 0.7); } + /* line 105, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.drop-into .s-timeline-gantt { + opacity: 0.7; } + /* line 109, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.drop-after { + background-color: rgba(0, 0, 0, 0.2); + border-bottom-color: #5555aa; } + /* line 115, ../sass/_timeline-thematic.scss */ + .s-timeline .s-ticks { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiM1OTU5NTkiLz48c3RvcCBvZmZzZXQ9IjFweCIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(0deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(0deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(90deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat-x; } + /* line 118, ../sass/_timeline-thematic.scss */ + .s-timeline .s-hover-btns-holder { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iNzAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); + background-image: -webkit-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); + background-image: linear-gradient(-90deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); } + /* line 123, ../sass/_timeline-thematic.scss */ + .s-timeline .s-hover-btns-holder .s-btn { + background-color: #404040; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #a6a6a6; + display: inline-block; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); + background-image: -moz-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); + background-image: linear-gradient(#4d4d4d, #404040); + -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } + /* line 129, ../sass/_timeline-thematic.scss */ + .s-timeline .l-timeline-resource-graph .l-graph { + background: rgba(0, 0, 0, 0.2); } + /* line 132, ../sass/_timeline-thematic.scss */ + .s-timeline .l-timeline-resource-graph .l-title { + color: #999; } + +/* line 138, ../sass/_timeline-thematic.scss */ +.edit-mode .s-swimlane { + cursor: pointer; } + /* line 140, ../sass/_timeline-thematic.scss */ + .edit-mode .s-swimlane .s-label { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + padding: 2px 5px; } + /* line 143, ../sass/_timeline-thematic.scss */ + .edit-mode .s-swimlane .s-label:hover { + background: rgba(255, 255, 255, 0.1); + color: #fff; } diff --git a/platform/features/timeline/res/css/timeline-snow.css b/platform/features/timeline/res/css/timeline-snow.css new file mode 100644 index 0000000000..6d5190ae8f --- /dev/null +++ b/platform/features/timeline/res/css/timeline-snow.css @@ -0,0 +1,290 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/************************** FEATURES */ +/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ +/************************** RATIOS */ +/************************** LAYOUT */ +/************************** CONTROLS */ +/************************** PATHS */ +/************************** TIMINGS */ +/************************** LIMITS */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*********************************************** 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. + *****************************************************************************/ +/***************************************************************************** + * 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, ../sass/_timeline-thematic.scss */ +.l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .l-legend-items { + color: #666; } + +/* line 36, ../sass/_timeline-thematic.scss */ +.s-timeline-gantt .bar { + color: #fff; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU1NTVhYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7777bb), color-stop(100%, #5555aa)); + background-image: -moz-linear-gradient(#7777bb, #5555aa); + background-image: -webkit-linear-gradient(#7777bb, #5555aa); + background-image: linear-gradient(#7777bb, #5555aa); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.1) 0 1px 3px; + -webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 1px 3px; + box-shadow: rgba(0, 0, 0, 0.1) 0 1px 3px; } + /* line 41, ../sass/_timeline-thematic.scss */ + .s-timeline-gantt .bar.expanded { + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-radius-bottomleft: 0; + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomright: 0; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; } + /* line 45, ../sass/_timeline-thematic.scss */ + .s-timeline-gantt .bar.leaf { + -moz-border-radius-topleft: 0; + -webkit-border-top-left-radius: 0; + border-top-left-radius: 0; + -moz-border-radius-topright: 0; + -webkit-border-top-right-radius: 0; + border-top-right-radius: 0; + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; } + /* line 49, ../sass/_timeline-thematic.scss */ + .s-timeline-gantt .bar .s-toggle { + color: #0099cc; } + +/* line 57, ../sass/_timeline-thematic.scss */ +.s-timeline-tabular .l-header .l-cols .l-col { + border-left: 1px solid #c9c9c9; } +/* line 65, ../sass/_timeline-thematic.scss */ +.s-timeline-tabular .l-pane-l .l-cols .s-label .ui-symbol.icon { + color: #8594ff; } + +/* line 74, ../sass/_timeline-thematic.scss */ +.edit-mode .s-timeline-gantt .bar:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzk5OTljYyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #9999cc), color-stop(100%, #7777bb)); + background-image: -moz-linear-gradient(#9999cc, #7777bb); + background-image: -webkit-linear-gradient(#9999cc, #7777bb); + background-image: linear-gradient(#9999cc, #7777bb); } + +/* line 81, ../sass/_timeline-thematic.scss */ +.s-timeline { + font-size: 0.75rem; } + /* line 83, ../sass/_timeline-thematic.scss */ + .s-timeline .s-header { + background-color: #efefef; } + /* line 86, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane { + border-bottom: 1px solid #e3e3e3; + line-height: 20px; } + /* line 89, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.exceeded { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMjUlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIiBzdG9wLW9wYWNpdHk9IjAuMDUiLz48c3RvcCBvZmZzZXQ9Ijc1JSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjA1Ii8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat; + background-size: 22px 22px; } + /* line 93, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.selected { + background-color: rgba(85, 85, 170, 0.25); + color: #4d4d4d; } + /* line 97, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.selected .s-timeline-gantt .bar { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU1NTVhYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7777bb), color-stop(100%, #5555aa)); + background-image: -moz-linear-gradient(#7777bb, #5555aa); + background-image: -webkit-linear-gradient(#7777bb, #5555aa); + background-image: linear-gradient(#7777bb, #5555aa); + color: #fff; } + /* line 103, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.drop-into { + background-color: rgba(85, 85, 170, 0.7); } + /* line 105, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.drop-into .s-timeline-gantt { + opacity: 0.7; } + /* line 109, ../sass/_timeline-thematic.scss */ + .s-timeline .s-swimlane.drop-after { + background-color: rgba(0, 0, 0, 0.2); + border-bottom-color: #5555aa; } + /* line 115, ../sass/_timeline-thematic.scss */ + .s-timeline .s-ticks { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNkNmQ2ZDYiLz48c3RvcCBvZmZzZXQ9IjFweCIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(0deg, #d6d6d6 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(0deg, #d6d6d6 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(90deg, #d6d6d6 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-repeat: repeat-x; } + /* line 118, ../sass/_timeline-thematic.scss */ + .s-timeline .s-hover-btns-holder { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VmZWZlZiIvPjxzdG9wIG9mZnNldD0iNzAlIiBzdG9wLWNvbG9yPSIjZWZlZmVmIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZWZlZmVmIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(180deg, #efefef, #efefef 70%, rgba(239, 239, 239, 0) 100%); + background-image: -webkit-linear-gradient(180deg, #efefef, #efefef 70%, rgba(239, 239, 239, 0) 100%); + background-image: linear-gradient(-90deg, #efefef, #efefef 70%, rgba(239, 239, 239, 0) 100%); } + /* line 123, ../sass/_timeline-thematic.scss */ + .s-timeline .s-hover-btns-holder .s-btn { + 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: #737373; + display: inline-block; } + /* line 129, ../sass/_timeline-thematic.scss */ + .s-timeline .l-timeline-resource-graph .l-graph { + background: rgba(0, 0, 0, 0.1); } + /* line 132, ../sass/_timeline-thematic.scss */ + .s-timeline .l-timeline-resource-graph .l-title { + color: #666; } + +/* line 138, ../sass/_timeline-thematic.scss */ +.edit-mode .s-swimlane { + cursor: pointer; } + /* line 140, ../sass/_timeline-thematic.scss */ + .edit-mode .s-swimlane .s-label { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + padding: 2px 5px; } + /* line 143, ../sass/_timeline-thematic.scss */ + .edit-mode .s-swimlane .s-label:hover { + background: rgba(255, 255, 255, 0.1); + color: #fff; } diff --git a/platform/features/timeline/res/css/timeline.css b/platform/features/timeline/res/css/timeline.css index 8bd6537f8f..f7fe2d0f57 100644 --- a/platform/features/timeline/res/css/timeline.css +++ b/platform/features/timeline/res/css/timeline.css @@ -1,3 +1,24 @@ +/***************************************************************************** + * 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 @@ -26,6 +47,7 @@ /************************** CONTROLS */ /************************** PATHS */ /************************** TIMINGS */ +/************************** LIMITS */ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -48,6 +70,27 @@ * 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. + *****************************************************************************/ /* line 1, ../sass/_activities.scss */ .l-timeline-gantt { position: absolute; @@ -99,69 +142,35 @@ right: 0; left: auto; } -/* line 62, ../sass/_activities.scss */ -.s-timeline-gantt .bar { - color: #fff; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU1NTVhYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7777bb), color-stop(100%, #5555aa)); - background-image: -moz-linear-gradient(#7777bb, #5555aa); - background-image: -webkit-linear-gradient(#7777bb, #5555aa); - background-image: linear-gradient(#7777bb, #5555aa); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.4) 0 1px 3px; } - /* line 69, ../sass/_activities.scss */ - .s-timeline-gantt .bar.expanded { - -moz-border-radius-topleft: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-topright: 3px; - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -moz-border-radius-bottomleft: 0; - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomright: 0; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; } - /* line 73, ../sass/_activities.scss */ - .s-timeline-gantt .bar.leaf { - -moz-border-radius-topleft: 0; - -webkit-border-top-left-radius: 0; - border-top-left-radius: 0; - -moz-border-radius-topright: 0; - -webkit-border-top-right-radius: 0; - border-top-right-radius: 0; - -moz-border-radius-bottomleft: 3px; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -moz-border-radius-bottomright: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; } - /* line 77, ../sass/_activities.scss */ - .s-timeline-gantt .bar .s-toggle { - color: #0099cc; } - -/* line 85, ../sass/_activities.scss */ -.edit-mode .s-timeline-gantt .bar:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzk5OTljYyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzc3NzdiYiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #9999cc), color-stop(100%, #7777bb)); - background-image: -moz-linear-gradient(#9999cc, #7777bb); - background-image: -webkit-linear-gradient(#9999cc, #7777bb); - background-image: linear-gradient(#9999cc, #7777bb); } -/* line 90, ../sass/_activities.scss */ +/* line 61, ../sass/_activities.scss */ .edit-mode .s-timeline-gantt .handle { cursor: col-resize; } - /* line 95, ../sass/_activities.scss */ + /* line 66, ../sass/_activities.scss */ .edit-mode .s-timeline-gantt .handle.mid { cursor: ew-resize; } -/* line 2, ../sass/_timelines.scss */ +/***************************************************************************** + * 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, ../sass/_timelines.scss */ .l-timeline-holder { overflow: hidden; position: absolute; @@ -171,7 +180,7 @@ left: 0px; width: auto; height: auto; } - /* line 6, ../sass/_timelines.scss */ + /* line 27, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane { overflow: hidden; position: absolute; @@ -181,10 +190,10 @@ left: 0px; width: auto; height: auto; } - /* line 9, ../sass/_timelines.scss */ + /* line 30, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane .l-width-control { position: relative; } - /* line 13, ../sass/_timelines.scss */ + /* line 34, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane .l-swimlanes-holder { overflow: hidden; position: absolute; @@ -195,7 +204,7 @@ width: auto; height: auto; top: 31px; } - /* line 20, ../sass/_timelines.scss */ + /* line 41, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v { overflow: hidden; position: absolute; @@ -205,16 +214,16 @@ left: 0px; width: auto; height: auto; } - /* line 23, ../sass/_timelines.scss */ + /* line 44, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-l { right: auto; width: 266px; } - /* line 28, ../sass/_timelines.scss */ + /* line 49, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-r { overflow-x: auto; overflow-y: hidden; left: 266px; } - /* line 32, ../sass/_timelines.scss */ + /* line 53, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-r .l-width { overflow: visible; position: absolute; @@ -226,18 +235,18 @@ height: auto; min-width: 590px; width: 100%; } - /* line 42, ../sass/_timelines.scss */ + /* line 61, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-gantt .l-swimlanes-holder { overflow-x: hidden; overflow-y: scroll; } - /* line 47, ../sass/_timelines.scss */ + /* line 65, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; padding: 5px 0; white-space: nowrap; } - /* line 54, ../sass/_timelines.scss */ + /* line 70, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .l-legend-items { overflow: hidden; position: absolute; @@ -249,22 +258,21 @@ height: auto; overflow-x: hidden; overflow-y: auto; - top: 25px; - color: #737373; } - /* line 61, ../sass/_timelines.scss */ + top: 25px; } + /* line 76, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item { display: block; margin-bottom: 3px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 69, ../sass/_timelines.scss */ + /* line 84, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item .color-swatch { vertical-align: baseline; } - /* line 72, ../sass/_timelines.scss */ + /* line 87, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item .title-label { vertical-align: baseline; } - /* line 81, ../sass/_timelines.scss */ + /* line 96, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder { overflow: hidden; position: absolute; @@ -275,7 +283,7 @@ width: auto; height: auto; bottom: 10px; } - /* line 86, ../sass/_timelines.scss */ + /* line 101, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder .l-graphs { overflow: hidden; position: absolute; @@ -287,7 +295,7 @@ height: auto; overflow-x: hidden; overflow-y: scroll; } - /* line 91, ../sass/_timelines.scss */ + /* line 106, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder .l-graph-labels-holder { overflow: hidden; position: absolute; @@ -300,7 +308,7 @@ overflow: hidden; right: auto; width: 400px; } - /* line 100, ../sass/_timelines.scss */ + /* line 115, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-scroll-control { overflow: hidden; position: absolute; @@ -315,36 +323,34 @@ top: auto; right: 10px; height: 10px; } - /* line 106, ../sass/_timelines.scss */ + /* line 121, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-scroll-control .l-width-control { height: 10px; } - /* line 111, ../sass/_timelines.scss */ + /* line 126, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph, .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-labels { height: 80px; margin-bottom: 3px; position: relative; } - /* line 118, ../sass/_timelines.scss */ + /* line 133, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: rgba(255, 255, 255, 0.4); top: 5px; left: 5px; position: absolute; } - /* line 125, ../sass/_timelines.scss */ + /* line 139, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph { - background: rgba(0, 0, 0, 0.3); width: 100%; } - /* line 129, ../sass/_timelines.scss */ + /* line 143, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph .l-graph-area canvas { width: 100%; height: 100%; } - /* line 136, ../sass/_timelines.scss */ + /* line 150, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-labels { z-index: 10; } - /* line 140, ../sass/_timelines.scss */ + /* line 154, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area { overflow: hidden; position: absolute; @@ -356,7 +362,7 @@ height: auto; top: 20px; bottom: 5px; } - /* line 143, ../sass/_timelines.scss */ + /* line 157, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area .l-labels-holder { overflow: hidden; position: absolute; @@ -367,24 +373,24 @@ width: auto; height: auto; left: 5px; } - /* line 146, ../sass/_timelines.scss */ + /* line 160, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area .l-labels-holder .tick-label.tick-label-y { text-align: left; } - /* line 154, ../sass/_timelines.scss */ + /* line 168, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-l { right: auto; min-width: 50px; max-width: 90%; width: 30%; } - /* line 162, ../sass/_timelines.scss */ + /* line 176, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-r { left: 0; } - /* line 166, ../sass/_timelines.scss */ + /* line 180, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-r:hover .l-hover-btns-holder { - -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; @@ -393,21 +399,25 @@ -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 173, ../sass/_timelines.scss */ + /* line 187, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-top { bottom: 30%; } - /* line 177, ../sass/_timelines.scss */ + /* line 191, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-btm { top: auto; min-height: 20px; max-height: 80%; height: 30%; } - /* line 186, ../sass/_timelines.scss */ + /* line 200, ../sass/_timelines.scss */ .l-timeline-holder .l-swimlane { height: 21px; position: relative; } - /* line 192, ../sass/_timelines.scss */ + /* line 206, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header, .l-timeline-holder .s-timeline-gantt .l-header { overflow: visible; @@ -420,7 +430,7 @@ height: auto; bottom: auto; height: 30px; } - /* line 198, ../sass/_timelines.scss */ + /* line 212, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header .l-header-elem, .l-timeline-holder .s-timeline-gantt .l-header .l-header-elem { overflow: visible; @@ -432,14 +442,14 @@ width: auto; height: auto; display: block; } - /* line 203, ../sass/_timelines.scss */ + /* line 217, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header .l-header-elem.l-labels .l-label, .l-timeline-holder .s-timeline-gantt .l-header .l-header-elem.l-labels .l-label { position: absolute; width: 140px; margin-left: -70px; text-align: center; } - /* line 213, ../sass/_timelines.scss */ + /* line 227, ../sass/_timelines.scss */ .l-timeline-holder .l-hover-btns-holder { overflow: hidden; position: absolute; @@ -452,10 +462,10 @@ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -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; @@ -464,6 +474,10 @@ -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; height: 30px; width: 100px; @@ -471,7 +485,7 @@ padding: 5px; text-align: right; z-index: 10; } - /* line 226, ../sass/_timelines.scss */ + /* line 240, ../sass/_timelines.scss */ .l-timeline-holder .l-cols { overflow: visible; position: absolute; @@ -483,7 +497,7 @@ height: auto; text-wrap: none; white-space: nowrap; } - /* line 231, ../sass/_timelines.scss */ + /* line 245, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -497,46 +511,40 @@ position: relative; text-wrap: none; white-space: nowrap; } - /* line 242, ../sass/_timelines.scss */ + /* line 256, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-col-icon { width: 16px; text-align: center; padding: 0; } - /* line 246, ../sass/_timelines.scss */ + /* line 260, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-col-icon .ui-symbol { color: #0099cc; } - /* line 251, ../sass/_timelines.scss */ + /* line 265, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-plot-resource { border-left: none !important; cursor: pointer; padding-left: 0; } - /* line 260, ../sass/_timelines.scss */ + /* line 274, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-title { width: 250px; } - /* line 264, ../sass/_timelines.scss */ + /* line 278, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-start, .l-timeline-holder .l-cols .l-col.l-end, .l-timeline-holder .l-cols .l-col.l-duration { width: 110px; } - /* line 274, ../sass/_timelines.scss */ + /* line 288, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-activity-modes { display: none; width: 250px; } - /* line 283, ../sass/_timelines.scss */ + /* line 297, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header .l-cols { top: 5px; bottom: 5px; } - /* line 285, ../sass/_timelines.scss */ - .l-timeline-holder .s-timeline-tabular .l-header .l-cols .l-col { - border-left: 1px solid rgba(255, 255, 255, 0.1); } - /* line 293, ../sass/_timelines.scss */ + /* line 303, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-pane-l .l-cols { left: 5px; } - /* line 295, ../sass/_timelines.scss */ - .l-timeline-holder .s-timeline-tabular .l-pane-l .l-cols .s-label .ui-symbol.icon { - color: #8594ff; } - /* line 308, ../sass/_timelines.scss */ + /* line 309, ../sass/_timelines.scss */ .l-timeline-holder .splitter { top: 0; } - /* line 314, ../sass/_timelines.scss */ + /* line 315, ../sass/_timelines.scss */ .l-timeline-holder .l-ticks, .l-timeline-holder .l-subticks { overflow: hidden; @@ -549,104 +557,9 @@ height: auto; top: auto; bottom: 3px; } - /* line 320, ../sass/_timelines.scss */ + /* line 321, ../sass/_timelines.scss */ .l-timeline-holder .l-ticks { height: 10px; } - /* line 324, ../sass/_timelines.scss */ + /* line 325, ../sass/_timelines.scss */ .l-timeline-holder .l-subticks { height: 5px; } - -/* line 330, ../sass/_timelines.scss */ -.s-timeline { - font-size: 0.75rem; } - /* line 332, ../sass/_timelines.scss */ - .s-timeline .s-header { - background-color: #404040; } - /* line 335, ../sass/_timelines.scss */ - .s-timeline .s-swimlane { - border-bottom: 1px solid rgba(255, 255, 255, 0.1); - line-height: 20px; - /* &:hover { - background: rgba(white, 0.1); - }*/ } - /* line 345, ../sass/_timelines.scss */ - .s-timeline .s-swimlane.exceeded { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMjUlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIiBzdG9wLW9wYWNpdHk9IjAuMDUiLz48c3RvcCBvZmZzZXQ9Ijc1JSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjA1Ii8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); - background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.05) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 255, 0.05) 50%, rgba(255, 255, 255, 0.05) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); - background-repeat: repeat; - background-size: 22px 22px; } - /* line 349, ../sass/_timelines.scss */ - .s-timeline .s-swimlane.selected { - background-color: #222; - color: #fff; } - /* line 355, ../sass/_timelines.scss */ - .s-timeline .s-swimlane.selected .s-timeline-gantt .bar { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2NjY2NjYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cccccc)); - background-image: -moz-linear-gradient(#e6e6e6, #cccccc); - background-image: -webkit-linear-gradient(#e6e6e6, #cccccc); - background-image: linear-gradient(#e6e6e6, #cccccc); - color: #333; } - /* line 363, ../sass/_timelines.scss */ - .s-timeline .s-swimlane.drop-into { - background-color: rgba(85, 85, 170, 0.7); } - /* line 365, ../sass/_timelines.scss */ - .s-timeline .s-swimlane.drop-into .s-timeline-gantt { - opacity: 0.7; } - /* line 369, ../sass/_timelines.scss */ - .s-timeline .s-swimlane.drop-after { - background-color: rgba(0, 0, 0, 0.2); - border-bottom-color: #5555aa; } - /* line 375, ../sass/_timelines.scss */ - .s-timeline .s-ticks { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiM1OTU5NTkiLz48c3RvcCBvZmZzZXQ9IjFweCIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); - background-size: 100%; - background-image: -moz-linear-gradient(0deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-image: -webkit-linear-gradient(0deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-image: linear-gradient(90deg, #595959 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); - background-repeat: repeat-x; } - /* line 378, ../sass/_timelines.scss */ - .s-timeline .s-hover-btns-holder { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iNzAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -moz-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); - background-image: -webkit-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); - background-image: linear-gradient(-90deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); } - /* line 383, ../sass/_timelines.scss */ - .s-timeline .s-hover-btns-holder .s-btn { - background-color: #404040; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #a6a6a6; - display: inline-block; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } - -/* line 389, ../sass/_timelines.scss */ -.edit-mode .s-swimlane { - cursor: pointer; } - /* line 391, ../sass/_timelines.scss */ - .edit-mode .s-swimlane .s-label { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - padding: 2px 5px; } - /* line 394, ../sass/_timelines.scss */ - .edit-mode .s-swimlane .s-label:hover { - background: rgba(255, 255, 255, 0.1); - color: #fff; } diff --git a/platform/features/timeline/res/sass-compile.sh b/platform/features/timeline/res/sass-compile.sh new file mode 100644 index 0000000000..ee7f1cdf77 --- /dev/null +++ b/platform/features/timeline/res/sass-compile.sh @@ -0,0 +1,4 @@ +date + +echo "*** Compiling sass" +compass compile --force \ No newline at end of file diff --git a/platform/features/timeline/res/sass/_activities.scss b/platform/features/timeline/res/sass/_activities.scss index 75f3a81072..265623634f 100644 --- a/platform/features/timeline/res/sass/_activities.scss +++ b/platform/features/timeline/res/sass/_activities.scss @@ -57,36 +57,7 @@ } } -.s-timeline-gantt { - $br: $controlCr; - .bar { - color: $activityTypeFg; -// opacity: 0.9; -// @include background-image(linear-gradient(lighten($activityTypeBg, 10), $activityTypeBg)); - @include activityBg($activityTypeBg); - @include border-radius($br); - @include box-shadow(rgba(black, 0.4) 0 1px 3px); - &.expanded { - @include border-top-radius($br); - @include border-bottom-radius(0); - } - &.leaf { - @include border-top-radius(0); - @include border-bottom-radius($br); - } - .s-toggle { - color: $colorKey; - } - } -} - .edit-mode .s-timeline-gantt { - .bar { - &:hover { - @include background-image(linear-gradient(lighten($activityTypeBg, 20), lighten($activityTypeBg, 10))); - } - } - .handle { cursor: col-resize; &.start { diff --git a/platform/features/timeline/res/sass/_constants-espresso.scss b/platform/features/timeline/res/sass/_constants-espresso.scss new file mode 100644 index 0000000000..107a0eadc4 --- /dev/null +++ b/platform/features/timeline/res/sass/_constants-espresso.scss @@ -0,0 +1,42 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ + +// General +$timelineHeaderColorBg: lighten($colorBodyBg, 5%); +$timelineColorAlt1: lighten($timelineHeaderColorBg, 10%); +$colorGanttBarBg: #5555aa; +$colorGanttBarFg: #fff; +$colorGanttBarSelectedBg: #ccc; +$colorGanttBarSelectedFg: #333; +$colorGanttBarTabularFgIcon: #8594ff; + +// Swimlane colors +$colorDropTarg: rgba($colorGanttBarBg, 0.4); +$colorSwimlaneSelectedBg: #222; +$colorSwimlaneSelectedFg: #ccc; +$colorGanttToggle: $colorKey; +$shdwGanttBar: rgba(black, 0.4) 0 1px 3px; + +// Resource graphs +$timelineResourceGraphBg: rgba(black, 0.2); +$timelineResourceGraphFg: $colorBodyFg; +$timelineResourceGraphLegendFg: $colorBodyFg; \ No newline at end of file diff --git a/platform/features/timeline/res/sass/_constants-snow.scss b/platform/features/timeline/res/sass/_constants-snow.scss new file mode 100644 index 0000000000..b055cf3019 --- /dev/null +++ b/platform/features/timeline/res/sass/_constants-snow.scss @@ -0,0 +1,42 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ + +// General +$timelineHeaderColorBg: pullForward($colorBodyBg, 5%); +$timelineColorAlt1: pullForward($timelineHeaderColorBg, 10%); +$colorGanttBarBg: #5555aa; +$colorGanttBarFg: #fff; +$colorGanttBarSelectedBg: $colorGanttBarBg; +$colorGanttBarSelectedFg: $colorGanttBarFg; +$colorGanttBarTabularFgIcon: #8594ff; + +// Swimlane colors +$colorDropTarg: rgba($colorGanttBarBg, 0.4); +$colorSwimlaneSelectedBg: rgba($colorGanttBarBg, 0.25); +$colorSwimlaneSelectedFg: pullForward($colorBodyFg, 10%); +$colorGanttToggle: $colorKey; +$shdwGanttBar: rgba(black, 0.1) 0 1px 3px; + +// Resource graphs +$timelineResourceGraphBg: rgba(black, 0.1); +$timelineResourceGraphFg: $colorBodyFg; +$timelineResourceGraphLegendFg: $colorBodyFg; \ No newline at end of file diff --git a/platform/features/timeline/res/sass/_constants.scss b/platform/features/timeline/res/sass/_constants.scss index ca7a47f7a3..0b667eead4 100644 --- a/platform/features/timeline/res/sass/_constants.scss +++ b/platform/features/timeline/res/sass/_constants.scss @@ -1,3 +1,24 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ @mixin activityBg($bg, $gamma: 10) { @include background-image(linear-gradient(lighten($bg, $gamma), $bg)); } @@ -8,22 +29,10 @@ $timelinePaneLeftW: 30%; $timelinePaneBtmH: 30%; $timelineResourceGraphYLabelsMargin: 70px; $timelineTopPaneHeaderH: 30px; -$timelineHeaderColorBg: lighten($colorBodyBg, 5%); -$timelineColorAlt1: lighten($timelineHeaderColorBg, 10%); + $timelineSwimlaneGanttVM: 2px; // The vertical space above and below the gantt bars $timelineSwimlaneH: $activityBarH + ($timelineSwimlaneGanttVM * 2); $timelineTopPaneHeaderElemMargin: $interiorMargin; -$activityTypeFg: #fff; -$activityTypeBg: #5555aa; -$activityTypeTabularFgIcon: #8594ff; - - -// Swimlane colors -$colorDropTarg: rgba($activityTypeBg, 0.4); -$colorSwimlaneSelectedBg: #222; -$colorSwimlaneSelectedFg: #ccc; -$colorSwimlaneSelectedGanttBg: #ccc; -$colorSwimlaneSelectedGanttFg: #333; // Timeline Tabular constants $timelineColIconW: 16px; diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss new file mode 100644 index 0000000000..cee4021ae9 --- /dev/null +++ b/platform/features/timeline/res/sass/_timeline-thematic.scss @@ -0,0 +1,149 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +.l-timeline-holder { + .l-timeline-pane { + &.t-pane-h { + &.l-timeline-resource-legend { + .l-legend-items { + color: $timelineResourceGraphLegendFg; + } + } + } + } +} + +.s-timeline-gantt { + $br: $controlCr; + .bar { + color: $colorGanttBarFg; + @include activityBg($colorGanttBarBg); + @include border-radius($br); + @include box-shadow($shdwGanttBar); + &.expanded { + @include border-top-radius($br); + @include border-bottom-radius(0); + } + &.leaf { + @include border-top-radius(0); + @include border-bottom-radius($br); + } + .s-toggle { + color: $colorGanttToggle; + } + } +} + +.s-timeline-tabular { + .l-header .l-cols { + .l-col { + border-left: 1px solid pullForward($timelineHeaderColorBg, 15%); + } + } + + .l-pane-l { + // Left pane of the tabular area + .l-cols { + .s-label .ui-symbol.icon { + color: $colorGanttBarTabularFgIcon; + } + } + } +} + +.edit-mode .s-timeline-gantt { + .bar { + &:hover { + @include background-image(linear-gradient(lighten($colorGanttBarBg, 20), lighten($colorGanttBarBg, 10))); + } + } +} + +//*************************************************************** STYLING +.s-timeline { + font-size: 0.75rem; + .s-header { + background-color: $timelineHeaderColorBg; + } + .s-swimlane { + border-bottom: 1px solid pullForward($colorBodyBg, 10%); + line-height: $activityBarH + 2 + 1; + &.exceeded { + @include bgDiagonalStripes(#fff, 0.05, $timelineSwimlaneH + 1); + } + + &.selected { + background-color: $colorSwimlaneSelectedBg; + color: $colorSwimlaneSelectedFg; + + .s-timeline-gantt .bar { + @include activityBg($colorGanttBarSelectedBg, 10); + color: $colorGanttBarSelectedFg; + } + } + + &.drop-into { + background-color: rgba($colorDropTarg, 0.7); + .s-timeline-gantt { + opacity: 0.7; + } + } + &.drop-after { + background-color: rgba(#000, 0.2); + border-bottom-color: rgba($colorDropTarg, 1.0); + } + } + + .s-ticks { + @include bgTicks($timelineColorAlt1); + } + .s-hover-btns-holder { + $bg: $timelineHeaderColorBg; + $bga: 1; + $l: 5%; + @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); + .s-btn { + @include containerSubtle(lighten($colorBodyBg, $l), lighten($colorBodyFg, $l), true); + } + } + + .l-timeline-resource-graph { + .l-graph { + background: $timelineResourceGraphBg; + } + .l-title { + color: $timelineResourceGraphFg; + } + } +} + +.edit-mode .s-swimlane { + cursor: pointer; + .s-label { + @include border-radius($controlCr); + padding: 2px 5px; + &:hover { + // TO-DO: Convert to theming! + background: rgba(#fff, 0.1); + color: #fff; + } + } +} diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index bdb8211a3e..f4b482522a 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -1,3 +1,24 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ //*************************************************************** LAYOUT .l-timeline-holder { // @include test(); @@ -37,26 +58,20 @@ } } &.l-timeline-gantt { -// @include testObj(); - .l-swimlanes-holder { @include scrollV(scroll); } - } &.l-timeline-resource-legend { @include box-sizing(border-box); padding: $interiorMargin 0; white-space: nowrap; - .l-title { - } .l-legend-items { @include absPosDefault(); @include scrollV(); top: 25px; - color: lighten($timelineColorAlt1, 10%); -// margin-top: $interiorMargin; + //color: lighten($timelineColorAlt1, 10%); // MOVED to espresso theme } .legend-item { // Inherits from /platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -117,13 +132,12 @@ .l-title { @include ellipsize(); - color: rgba(#fff, 0.4); top: $m; left: $m; position: absolute; } .l-graph { - background: rgba(black, 0.3); + //background: rgba(black, 0.3); // MOVED width: 100%; .l-graph-area { canvas { @@ -282,27 +296,14 @@ .s-timeline-tabular { .l-header .l-cols { top: $timelineTopPaneHeaderElemMargin; bottom: $timelineTopPaneHeaderElemMargin; - .l-col { - border-left: 1px solid rgba(#fff, 0.1); -// height: 100%; - } } .l-pane-l { // Left pane of the tabular area .l-cols { left: $timelineTopPaneHeaderElemMargin; - .s-label .ui-symbol.icon { - //color: $colorKeyFg; - color: $activityTypeTabularFgIcon; - } } } - - .l-pane-r { - // Right pane of the tabular area -// @include test(red, 0.05); - } } .splitter { @@ -325,77 +326,3 @@ height: 5px } } - -//*************************************************************** STYLING -.s-timeline { - font-size: 0.75rem; - .s-header { - background-color: $timelineHeaderColorBg; - } - .s-swimlane { - // @include transition-property(background-color); - // @include transition-duration(0.2s); - // @include transition-timing-function(ease-out); - // border-top: 1px solid rgba(black, 0.2); - border-bottom: 1px solid rgba(white, 0.1); - line-height: $activityBarH + 2 + 1; - /* &:hover { - background: rgba(white, 0.1); - }*/ - &.exceeded { - @include bgDiagonalStripes(#fff, 0.05, $timelineSwimlaneH + 1); - } - - &.selected { - $bg: $colorSwimlaneSelectedBg; - background-color: $bg; - color: #fff; -// @include background-image(linear-gradient(darken($bg, 5), $bg)); - - .s-timeline-gantt .bar { - @include activityBg($colorSwimlaneSelectedGanttBg, 10); - color: $colorSwimlaneSelectedGanttFg; -// background-color: red; -// background-image: none; - } - } - - &.drop-into { - background-color: rgba($colorDropTarg, 0.7); - .s-timeline-gantt { - opacity: 0.7; - } - } - &.drop-after { - background-color: rgba(#000, 0.2); - border-bottom-color: rgba($colorDropTarg, 1.0); - } - } - - .s-ticks { - @include bgTicks($timelineColorAlt1); - } - .s-hover-btns-holder { - $bg: $timelineHeaderColorBg; - $bga: 1; - $l: 5%; - @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); - .s-btn { - @include containerSubtle(lighten($colorBodyBg, $l), lighten($colorBodyFg, $l), true); - } - } -} - -.edit-mode .s-swimlane { - cursor: pointer; - .s-label { - @include border-radius($controlCr); - padding: 2px 5px; - &:hover { - background: rgba(#fff, 0.1); - color: #fff; - } - } -} - - diff --git a/platform/features/timeline/res/sass/timeline-espresso.scss b/platform/features/timeline/res/sass/timeline-espresso.scss new file mode 100644 index 0000000000..354d565e0f --- /dev/null +++ b/platform/features/timeline/res/sass/timeline-espresso.scss @@ -0,0 +1,33 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +@import "compass"; +@import "compass/css3"; +@import "compass/utilities"; + +@import "../../../../commonUI/general/res/sass/constants"; +@import "../../../../commonUI/general/res/sass/mixins"; +@import "../../../../commonUI/themes/espresso/res/sass/constants"; +@import "../../../../commonUI/themes/espresso/res/sass/mixins"; +@import "constants"; +@import "constants-espresso"; +@import "timeline-thematic"; + diff --git a/platform/features/timeline/res/sass/timeline-snow.scss b/platform/features/timeline/res/sass/timeline-snow.scss new file mode 100644 index 0000000000..c1eb4cbd3c --- /dev/null +++ b/platform/features/timeline/res/sass/timeline-snow.scss @@ -0,0 +1,32 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +@import "compass"; +@import "compass/css3"; +@import "compass/utilities"; + +@import "../../../../commonUI/general/res/sass/constants"; +@import "../../../../commonUI/general/res/sass/mixins"; +@import "../../../../commonUI/themes/snow/res/sass/constants"; +@import "../../../../commonUI/themes/snow/res/sass/mixins"; +@import "constants"; +@import "constants-snow"; +@import "timeline-thematic"; diff --git a/platform/features/timeline/res/sass/timeline.scss b/platform/features/timeline/res/sass/timeline.scss index fe25a008ec..0fea5f0295 100644 --- a/platform/features/timeline/res/sass/timeline.scss +++ b/platform/features/timeline/res/sass/timeline.scss @@ -1,11 +1,32 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ @import "compass"; @import "compass/css3"; @import "compass/utilities"; -@import "../../../../../../commonUI/general/res/sass/constants"; -@import "../../../../../../commonUI/general/res/sass/mixins"; -@import "../../../../../../commonUI/themes/espresso/res/sass/constants"; -@import "../../../../../../commonUI/themes/espresso/res/sass/mixins"; +@import "../../../../commonUI/general/res/sass/constants"; +@import "../../../../commonUI/general/res/sass/mixins"; +@import "../../../../commonUI/themes/espresso/res/sass/constants"; +@import "../../../../commonUI/themes/espresso/res/sass/mixins"; @import "constants"; @import "activities"; @import "timelines"; \ No newline at end of file From 3854df27d8e89d3f577341416ec4e75c7f5d35d2 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 20 Nov 2015 15:42:08 -0800 Subject: [PATCH 06/88] [Frontend] Styling on Timeline zoom buttons open #208 Fixed in both themes; --- .../timeline/res/css/timeline-espresso.css | 39 +++++++------------ .../timeline/res/css/timeline-snow.css | 32 +++++++-------- .../res/sass/_constants-espresso.scss | 4 +- .../timeline/res/sass/_constants-snow.scss | 2 +- .../timeline/res/sass/_timeline-thematic.scss | 7 +++- 5 files changed, 40 insertions(+), 44 deletions(-) diff --git a/platform/features/timeline/res/css/timeline-espresso.css b/platform/features/timeline/res/css/timeline-espresso.css index 895fdb8294..eb2a6afab5 100644 --- a/platform/features/timeline/res/css/timeline-espresso.css +++ b/platform/features/timeline/res/css/timeline-espresso.css @@ -252,48 +252,39 @@ background-repeat: repeat-x; } /* line 118, ../sass/_timeline-thematic.scss */ .s-timeline .s-hover-btns-holder { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjxzdG9wIG9mZnNldD0iNzAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjNDA0MDQwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -moz-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); background-image: -webkit-linear-gradient(180deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); background-image: linear-gradient(-90deg, #404040, #404040 70%, rgba(64, 64, 64, 0) 100%); } - /* line 123, ../sass/_timeline-thematic.scss */ + /* line 124, ../sass/_timeline-thematic.scss */ .s-timeline .s-hover-btns-holder .s-btn { - background-color: #404040; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #a6a6a6; - display: inline-block; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; } - /* line 129, ../sass/_timeline-thematic.scss */ + height: 16px; + line-height: 16px; } + /* line 127, ../sass/_timeline-thematic.scss */ + .s-timeline .s-hover-btns-holder .s-btn .icon { + font-size: 0.7rem !important; } + /* line 134, ../sass/_timeline-thematic.scss */ .s-timeline .l-timeline-resource-graph .l-graph { background: rgba(0, 0, 0, 0.2); } - /* line 132, ../sass/_timeline-thematic.scss */ + /* line 137, ../sass/_timeline-thematic.scss */ .s-timeline .l-timeline-resource-graph .l-title { color: #999; } -/* line 138, ../sass/_timeline-thematic.scss */ +/* line 143, ../sass/_timeline-thematic.scss */ .edit-mode .s-swimlane { cursor: pointer; } - /* line 140, ../sass/_timeline-thematic.scss */ + /* line 145, ../sass/_timeline-thematic.scss */ .edit-mode .s-swimlane .s-label { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; padding: 2px 5px; } - /* line 143, ../sass/_timeline-thematic.scss */ + /* line 148, ../sass/_timeline-thematic.scss */ .edit-mode .s-swimlane .s-label:hover { background: rgba(255, 255, 255, 0.1); color: #fff; } diff --git a/platform/features/timeline/res/css/timeline-snow.css b/platform/features/timeline/res/css/timeline-snow.css index 6d5190ae8f..344c2beb9a 100644 --- a/platform/features/timeline/res/css/timeline-snow.css +++ b/platform/features/timeline/res/css/timeline-snow.css @@ -252,39 +252,39 @@ background-repeat: repeat-x; } /* line 118, ../sass/_timeline-thematic.scss */ .s-timeline .s-hover-btns-holder { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VmZWZlZiIvPjxzdG9wIG9mZnNldD0iNzAlIiBzdG9wLWNvbG9yPSIjZWZlZmVmIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZWZlZmVmIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -moz-linear-gradient(180deg, #efefef, #efefef 70%, rgba(239, 239, 239, 0) 100%); background-image: -webkit-linear-gradient(180deg, #efefef, #efefef 70%, rgba(239, 239, 239, 0) 100%); background-image: linear-gradient(-90deg, #efefef, #efefef 70%, rgba(239, 239, 239, 0) 100%); } - /* line 123, ../sass/_timeline-thematic.scss */ + /* line 124, ../sass/_timeline-thematic.scss */ .s-timeline .s-hover-btns-holder .s-btn { - 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: #737373; - display: inline-block; } - /* line 129, ../sass/_timeline-thematic.scss */ + height: 16px; + line-height: 16px; } + /* line 127, ../sass/_timeline-thematic.scss */ + .s-timeline .s-hover-btns-holder .s-btn .icon { + font-size: 0.7rem !important; } + /* line 134, ../sass/_timeline-thematic.scss */ .s-timeline .l-timeline-resource-graph .l-graph { - background: rgba(0, 0, 0, 0.1); } - /* line 132, ../sass/_timeline-thematic.scss */ + background: rgba(0, 0, 0, 0.05); } + /* line 137, ../sass/_timeline-thematic.scss */ .s-timeline .l-timeline-resource-graph .l-title { color: #666; } -/* line 138, ../sass/_timeline-thematic.scss */ +/* line 143, ../sass/_timeline-thematic.scss */ .edit-mode .s-swimlane { cursor: pointer; } - /* line 140, ../sass/_timeline-thematic.scss */ + /* line 145, ../sass/_timeline-thematic.scss */ .edit-mode .s-swimlane .s-label { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; padding: 2px 5px; } - /* line 143, ../sass/_timeline-thematic.scss */ + /* line 148, ../sass/_timeline-thematic.scss */ .edit-mode .s-swimlane .s-label:hover { background: rgba(255, 255, 255, 0.1); color: #fff; } diff --git a/platform/features/timeline/res/sass/_constants-espresso.scss b/platform/features/timeline/res/sass/_constants-espresso.scss index 107a0eadc4..51a671c37a 100644 --- a/platform/features/timeline/res/sass/_constants-espresso.scss +++ b/platform/features/timeline/res/sass/_constants-espresso.scss @@ -21,8 +21,8 @@ *****************************************************************************/ // General -$timelineHeaderColorBg: lighten($colorBodyBg, 5%); -$timelineColorAlt1: lighten($timelineHeaderColorBg, 10%); +$timelineHeaderColorBg: pullForward($colorBodyBg, 5%); +$timelineColorAlt1: pullForward($timelineHeaderColorBg, 10%); $colorGanttBarBg: #5555aa; $colorGanttBarFg: #fff; $colorGanttBarSelectedBg: #ccc; diff --git a/platform/features/timeline/res/sass/_constants-snow.scss b/platform/features/timeline/res/sass/_constants-snow.scss index b055cf3019..1d33a2793c 100644 --- a/platform/features/timeline/res/sass/_constants-snow.scss +++ b/platform/features/timeline/res/sass/_constants-snow.scss @@ -37,6 +37,6 @@ $colorGanttToggle: $colorKey; $shdwGanttBar: rgba(black, 0.1) 0 1px 3px; // Resource graphs -$timelineResourceGraphBg: rgba(black, 0.1); +$timelineResourceGraphBg: $colorPlotBg; $timelineResourceGraphFg: $colorBodyFg; $timelineResourceGraphLegendFg: $colorBodyFg; \ No newline at end of file diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss index cee4021ae9..4a252957f0 100644 --- a/platform/features/timeline/res/sass/_timeline-thematic.scss +++ b/platform/features/timeline/res/sass/_timeline-thematic.scss @@ -119,9 +119,14 @@ $bg: $timelineHeaderColorBg; $bga: 1; $l: 5%; + @include user-select(none); @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); .s-btn { - @include containerSubtle(lighten($colorBodyBg, $l), lighten($colorBodyFg, $l), true); + height: 16px; + line-height: 16px; + .icon { + font-size: 0.7rem !important; + } } } From 50134bbc7fbd4eb9234999002daf876aaef97f9a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 20 Nov 2015 16:19:27 -0800 Subject: [PATCH 07/88] [Frontend] Theming and cleanups in Clocks and Timers open #208 Also converted timer to use flexbox layout; --- .../res/sass/features/_time-display.scss | 52 +++----- .../espresso/res/css/theme-espresso.css | 118 ++++++++---------- .../themes/snow/res/css/theme-snow.css | 118 ++++++++---------- .../features/clock/res/templates/timer.html | 11 +- 4 files changed, 122 insertions(+), 177 deletions(-) diff --git a/platform/commonUI/general/res/sass/features/_time-display.scss b/platform/commonUI/general/res/sass/features/_time-display.scss index d792839a00..74cf628e72 100644 --- a/platform/commonUI/general/res/sass/features/_time-display.scss +++ b/platform/commonUI/general/res/sass/features/_time-display.scss @@ -1,46 +1,32 @@ .l-time-display { $transTime: 200ms; - // Layout + line-height: 140%; &:hover { .l-btn.control { opacity: 1; } } - .l-elem-wrapper { - position: relative; - } - .l-elem { - display: inline-block; - } &.l-timer { - .l-elem.l-value { - @include trans-prop-nice(left, $transTime); - position: absolute; - left: 0; - z-index: 1; - .ui-symbol.direction { - font-size: 0.8em; - } - } - &:hover .l-elem.l-value { - left: 20px; + .control { + @include trans-prop-nice((width, opacity), $transTime); + line-height: inherit; + margin-right: 0; + opacity: 0; + width: 0; + } + &:hover .control { + margin-right: $interiorMargin; + opacity: 1; + width: auto; } } - // Look-and-feel - .l-elem { - .value.active, - &.value.active { - color: $colorKeyFg; - } - } - .l-btn.control { - @include trans-prop-nice-fade($transTime); - opacity: 0; - font-size: 0.65em; - vertical-align: top; - //line-height: 1em; - } - + .value { + color: pullForward($colorBodyFg, 20%); + font-weight: 600; + .direction { + font-size: 0.8em; + } + } } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 41f35389eb..cc59fea4e1 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; } @@ -7376,63 +7376,43 @@ table { .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.t-item-icon, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .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 1, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display { + line-height: 140%; } + /* line 6, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display:hover .l-btn.control { + opacity: 1; } + /* line 18, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display.l-timer .control { + -moz-transition-property: width, opacity; + -o-transition-property: width, opacity; + -webkit-transition-property: width, opacity; + transition-property: width, 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; + line-height: inherit; + margin-right: 0; + opacity: 0; + width: 0; } + /* line 27, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display.l-timer:hover .control { + margin-right: 5px; + opacity: 1; + width: auto; } + /* line 34, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display .value { + color: #cccccc; + font-weight: 600; } + /* line 37, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display .value .direction { + font-size: 0.8em; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 474997dd53..5c0c0db08b 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; } @@ -7253,66 +7253,46 @@ table { .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.t-item-icon, .l-time-display.l-timer .l-elem.l-value .direction.s-icon-btn, .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 1, ../../../../general/res/sass/features/_time-display.scss */ +.l-time-display { + line-height: 140%; } + /* line 6, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display:hover .l-btn.control { + opacity: 1; } + /* line 18, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display.l-timer .control { + -moz-transition-property: width, opacity; + -o-transition-property: width, opacity; + -webkit-transition-property: width, opacity; + transition-property: width, 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; + line-height: inherit; + margin-right: 0; + opacity: 0; + width: 0; } + /* line 27, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display.l-timer:hover .control { + margin-right: 5px; + opacity: 1; + width: auto; } + /* line 34, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display .value { + color: #333333; + font-weight: 600; } + /* line 37, ../../../../general/res/sass/features/_time-display.scss */ + .l-time-display .value .direction { + font-size: 0.8em; } /* line 3, ../sass/_controls.scss */ .s-btn.major .title-label, .major.s-menu-btn .title-label { diff --git a/platform/features/clock/res/templates/timer.html b/platform/features/clock/res/templates/timer.html index ebd593435f..e556f096e7 100644 --- a/platform/features/clock/res/templates/timer.html +++ b/platform/features/clock/res/templates/timer.html @@ -20,15 +20,15 @@ at runtime from the About dialog for additional information. -->
-
+
- {{timer.buttonGlyph()}} + {{timer.buttonGlyph()}} - + {{timer.sign()}} {{timer.text() || "--:--:--"}} - - +
\ No newline at end of file From 5a7349117a522d7b2556f660af6f8358cf5c8620 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 20 Nov 2015 16:27:26 -0800 Subject: [PATCH 08/88] [Frontend] Cleanups to Timeline tabular label elements open #208 Colors normalized for theming; --- .../features/timeline/res/css/timeline-espresso.css | 11 ++++++----- platform/features/timeline/res/css/timeline-snow.css | 11 ++++++----- .../timeline/res/sass/_timeline-thematic.scss | 8 ++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/platform/features/timeline/res/css/timeline-espresso.css b/platform/features/timeline/res/css/timeline-espresso.css index eb2a6afab5..ae39ad66ba 100644 --- a/platform/features/timeline/res/css/timeline-espresso.css +++ b/platform/features/timeline/res/css/timeline-espresso.css @@ -279,12 +279,13 @@ .edit-mode .s-swimlane { cursor: pointer; } /* line 145, ../sass/_timeline-thematic.scss */ - .edit-mode .s-swimlane .s-label { + .edit-mode .s-swimlane .t-object-label { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; + cursor: move; padding: 2px 5px; } - /* line 148, ../sass/_timeline-thematic.scss */ - .edit-mode .s-swimlane .s-label:hover { - background: rgba(255, 255, 255, 0.1); - color: #fff; } + /* line 149, ../sass/_timeline-thematic.scss */ + .edit-mode .s-swimlane .t-object-label:hover { + background: rgba(153, 153, 153, 0.3); + color: #cccccc; } diff --git a/platform/features/timeline/res/css/timeline-snow.css b/platform/features/timeline/res/css/timeline-snow.css index 344c2beb9a..54c8fbe4b7 100644 --- a/platform/features/timeline/res/css/timeline-snow.css +++ b/platform/features/timeline/res/css/timeline-snow.css @@ -279,12 +279,13 @@ .edit-mode .s-swimlane { cursor: pointer; } /* line 145, ../sass/_timeline-thematic.scss */ - .edit-mode .s-swimlane .s-label { + .edit-mode .s-swimlane .t-object-label { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; + cursor: move; padding: 2px 5px; } - /* line 148, ../sass/_timeline-thematic.scss */ - .edit-mode .s-swimlane .s-label:hover { - background: rgba(255, 255, 255, 0.1); - color: #fff; } + /* line 149, ../sass/_timeline-thematic.scss */ + .edit-mode .s-swimlane .t-object-label:hover { + background: rgba(102, 102, 102, 0.3); + color: #333333; } diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss index 4a252957f0..62dbc27cdf 100644 --- a/platform/features/timeline/res/sass/_timeline-thematic.scss +++ b/platform/features/timeline/res/sass/_timeline-thematic.scss @@ -142,13 +142,13 @@ .edit-mode .s-swimlane { cursor: pointer; - .s-label { + .t-object-label { @include border-radius($controlCr); + cursor: move; padding: 2px 5px; &:hover { - // TO-DO: Convert to theming! - background: rgba(#fff, 0.1); - color: #fff; + background: rgba($colorBodyFg, 0.3); + color: pullForward($colorBodyFg, 20%); } } } From fd3059b38015b116fae4e87d530138c239a81bea Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 20 Nov 2015 16:47:04 -0800 Subject: [PATCH 09/88] [Frontend] Final cleanups, tweaks; Refactored s-icon-btn open #208 Unit tested in both themes; .s-icon-btn refactored slightly to focus on usage as an icon-only element, removed overlap designations with .s-btn in markup; Colors normalized for theming; Code cleanup; --- .../general/res/sass/controls/_buttons.scss | 5 +- .../general/res/sass/controls/_controls.scss | 3 +- .../res/sass/features/_time-display.scss | 6 +- .../espresso/res/css/theme-espresso.css | 199 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 199 +++++++++--------- .../features/timeline/res/css/timeline.css | 114 +++++----- .../timeline/res/sass/_activities.scss | 10 - .../timeline/res/sass/_timelines.scss | 24 +-- .../timeline/res/templates/timeline.html | 4 +- .../forms/res/templates/controls/color.html | 2 +- 10 files changed, 261 insertions(+), 305 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 5431b0f563..305d68bbcc 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -95,10 +95,7 @@ $pad: $interiorMargin * $baseRatio; .s-icon-btn { @extend .ui-symbol; - color: $colorBtnIcon; - &:hover { - color: lighten($colorBtnIcon, $ltGamma); - } + // Color and styling additionally in _controls.scss } .mini-tab { diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 72400b86c3..d97a153cff 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -187,7 +187,8 @@ label.checkbox.custom { } } -.context-available { +.context-available, +.s-icon-btn { $c: $colorKey; color: $c; &:hover { diff --git a/platform/commonUI/general/res/sass/features/_time-display.scss b/platform/commonUI/general/res/sass/features/_time-display.scss index 74cf628e72..328402b0fd 100644 --- a/platform/commonUI/general/res/sass/features/_time-display.scss +++ b/platform/commonUI/general/res/sass/features/_time-display.scss @@ -18,13 +18,13 @@ &:hover .control { margin-right: $interiorMargin; opacity: 1; - width: auto; + width: 1em; } } .value { - color: pullForward($colorBodyFg, 20%); - font-weight: 600; + color: pullForward($colorBodyFg, 50%); + font-weight: 400; .direction { font-size: 0.8em; } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index cc59fea4e1..b7acb8b674 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -1759,15 +1759,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -/* 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; } - @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 */ + /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1801,10 +1794,10 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { height: 24px; width: 9px; text-align: center; } - /* line 133, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 130, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #0099cc; } - /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 135, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed { background-color: #454545; -moz-border-radius: 3px; @@ -1844,19 +1837,19 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: #33ccff; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } - /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 139, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:after { opacity: 1; } - /* line 144, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:before { opacity: 1; } - /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:after { opacity: 0; } - /* line 150, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 147, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; @@ -1877,22 +1870,22 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { display: block; height: 100%; position: absolute; } - /* line 159, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 156, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { width: 9px; } - /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; text-align: center; opacity: 0; } - /* line 172, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left { text-align: right; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 172, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; right: 0; } - /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 177, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; @@ -1901,21 +1894,21 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; text-align: left; } - /* line 183, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 184, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } - /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right { text-align: left; } - /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 0; } - /* line 198, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 195, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; @@ -1923,17 +1916,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } - /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } - /* line 205, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 211, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #595959; cursor: pointer; @@ -1946,31 +1939,31 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { line-height: 9px; overflow: hidden; word-break: break-all; } - /* line 228, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 225, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } - /* line 233, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 230, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before, .mini-tab-icon:after { position: absolute; display: inherit; } - /* line 239, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 236, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before { content: '\78'; } - /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 240, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:hover { color: #0099cc; } } -/* line 250, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 247, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 256, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 253, ../../../../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 262, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 259, ../../../../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; @@ -1979,7 +1972,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; margin-left: 0; } - /* line 269, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 266, ../../../../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; @@ -1988,7 +1981,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 276, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 273, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -2264,13 +2257,15 @@ label.checkbox.custom { border-bottom: none; } /* line 190, ../../../../general/res/sass/controls/_controls.scss */ -.context-available { +.context-available, +.s-icon-btn { color: #0099cc; } - /* line 193, ../../../../general/res/sass/controls/_controls.scss */ - .context-available:hover { + /* line 194, ../../../../general/res/sass/controls/_controls.scss */ + .context-available:hover, + .s-icon-btn:hover { color: deepskyblue; } -/* line 198, ../../../../general/res/sass/controls/_controls.scss */ +/* line 199, ../../../../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; @@ -2290,22 +2285,22 @@ label.checkbox.custom { transition-delay: 0; } /******************************************************** OBJECT-HEADER */ -/* line 203, ../../../../general/res/sass/controls/_controls.scss */ +/* line 204, ../../../../general/res/sass/controls/_controls.scss */ .object-header { font-size: 1em; } - /* line 206, ../../../../general/res/sass/controls/_controls.scss */ + /* line 207, ../../../../general/res/sass/controls/_controls.scss */ .object-header > .type-icon { color: #cccccc; font-size: 120%; float: left; margin-right: 5px; } - /* line 214, ../../../../general/res/sass/controls/_controls.scss */ + /* line 215, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper mct-representation { min-width: 0.7em; } - /* line 222, ../../../../general/res/sass/controls/_controls.scss */ + /* line 223, ../../../../general/res/sass/controls/_controls.scss */ .object-header .action { margin-right: 5px; } - /* line 226, ../../../../general/res/sass/controls/_controls.scss */ + /* line 227, ../../../../general/res/sass/controls/_controls.scss */ .object-header .title-label { color: #999; overflow: hidden; @@ -2314,13 +2309,13 @@ label.checkbox.custom { flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } - /* line 233, ../../../../general/res/sass/controls/_controls.scss */ + /* line 234, ../../../../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 239, ../../../../general/res/sass/controls/_controls.scss */ + /* line 240, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2339,7 +2334,7 @@ label.checkbox.custom { -webkit-transition-delay: 0; transition-delay: 0; opacity: 0; } - /* line 244, ../../../../general/res/sass/controls/_controls.scss */ + /* line 245, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { opacity: 1; } } @@ -2353,12 +2348,12 @@ label.checkbox.custom { @keyframes progress { 100% { background-position: 20px center; } } -/* line 266, ../../../../general/res/sass/controls/_controls.scss */ +/* line 267, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar { display: inline-block; overflow: hidden; position: relative; } - /* line 272, ../../../../general/res/sass/controls/_controls.scss */ + /* line 273, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar .progress-amt-holder { overflow: hidden; position: absolute; @@ -2368,7 +2363,7 @@ label.checkbox.custom { left: 1px; width: auto; height: auto; } - /* line 275, ../../../../general/res/sass/controls/_controls.scss */ + /* line 276, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar .progress-amt, .l-progress-bar .progress-amt:before, .l-progress-bar .progress-amt:after { @@ -2382,14 +2377,14 @@ label.checkbox.custom { height: auto; display: block; content: ''; } - /* line 283, ../../../../general/res/sass/controls/_controls.scss */ + /* line 284, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar .progress-amt { right: auto; } - /* line 288, ../../../../general/res/sass/controls/_controls.scss */ + /* line 289, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar.indeterminate .progress-amt { width: 100% !important; } -/* line 294, ../../../../general/res/sass/controls/_controls.scss */ +/* line 295, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2398,7 +2393,7 @@ label.checkbox.custom { -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 298, ../../../../general/res/sass/controls/_controls.scss */ + /* line 299, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar .progress-amt { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2425,10 +2420,10 @@ label.checkbox.custom { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; } - /* line 303, ../../../../general/res/sass/controls/_controls.scss */ + /* line 304, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar .progress-amt:before { background-color: #0099cc; } - /* line 306, ../../../../general/res/sass/controls/_controls.scss */ + /* line 307, ../../../../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%; @@ -2436,7 +2431,7 @@ label.checkbox.custom { 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 315, ../../../../general/res/sass/controls/_controls.scss */ + /* line 316, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar:not(.indeterminate) .progress-amt:before { -moz-animation: progress 0.4s linear infinite; -webkit-animation: progress 0.4s linear infinite; @@ -2449,7 +2444,7 @@ label.checkbox.custom { background-position: 0 center; background-repeat: repeat-x; background-size: 20px 40%; } - /* line 323, ../../../../general/res/sass/controls/_controls.scss */ + /* line 324, ../../../../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; @@ -2461,12 +2456,12 @@ label.checkbox.custom { 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 328, ../../../../general/res/sass/controls/_controls.scss */ + /* line 329, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar.indeterminate .progress-amt:after { display: none; } /******************************************************** SLIDERS */ -/* line 336, ../../../../general/res/sass/controls/_controls.scss */ +/* line 337, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { width: auto; position: absolute; @@ -2474,7 +2469,7 @@ label.checkbox.custom { right: 0; bottom: 0; left: 0; } -/* line 344, ../../../../general/res/sass/controls/_controls.scss */ +/* line 345, ../../../../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; @@ -2500,10 +2495,10 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 347, ../../../../general/res/sass/controls/_controls.scss */ + /* line 348, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:hover { background-color: #0099cc; } -/* line 358, ../../../../general/res/sass/controls/_controls.scss */ +/* line 359, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-l { -moz-border-radius-topleft: 10px; -webkit-border-top-left-radius: 10px; @@ -2512,7 +2507,7 @@ label.checkbox.custom { -webkit-border-bottom-left-radius: 10px; border-bottom-left-radius: 10px; cursor: w-resize; } -/* line 362, ../../../../general/res/sass/controls/_controls.scss */ +/* line 363, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-r { -moz-border-radius-topright: 10px; -webkit-border-top-right-radius: 10px; @@ -2521,7 +2516,7 @@ label.checkbox.custom { -webkit-border-bottom-right-radius: 10px; border-bottom-right-radius: 10px; cursor: e-resize; } -/* line 366, ../../../../general/res/sass/controls/_controls.scss */ +/* line 367, ../../../../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; @@ -2548,12 +2543,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 377, ../../../../general/res/sass/controls/_controls.scss */ + /* line 378, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background-color: rgba(0, 153, 204, 0.5); } /******************************************************** DATETIME PICKER */ -/* line 384, ../../../../general/res/sass/controls/_controls.scss */ +/* line 385, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker { -moz-user-select: -moz-none; -ms-user-select: none; @@ -2562,65 +2557,65 @@ label.checkbox.custom { font-size: 0.8rem; padding: 10px !important; width: 230px; } - /* line 390, ../../../../general/res/sass/controls/_controls.scss */ + /* line 391, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager { height: 15px; margin-bottom: 5px; position: relative; } - /* line 399, ../../../../general/res/sass/controls/_controls.scss */ + /* line 400, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager { width: 20px; } - /* line 402, ../../../../general/res/sass/controls/_controls.scss */ + /* line 403, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev { right: auto; } - /* line 404, ../../../../general/res/sass/controls/_controls.scss */ + /* line 405, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev:before { content: "\3c"; } - /* line 408, ../../../../general/res/sass/controls/_controls.scss */ + /* line 409, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next { left: auto; text-align: right; } - /* line 411, ../../../../general/res/sass/controls/_controls.scss */ + /* line 412, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next:before { content: "\3e"; } - /* line 416, ../../../../general/res/sass/controls/_controls.scss */ + /* line 417, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .val { text-align: center; left: 25px; right: 25px; } - /* line 422, ../../../../general/res/sass/controls/_controls.scss */ + /* line 423, ../../../../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 426, ../../../../general/res/sass/controls/_controls.scss */ + /* line 427, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-time-selects { line-height: 22px; } /******************************************************** CALENDAR */ -/* line 434, ../../../../general/res/sass/controls/_controls.scss */ +/* line 435, ../../../../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 438, ../../../../general/res/sass/controls/_controls.scss */ + /* line 439, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row:first-child { margin-top: 0; } - /* line 441, ../../../../general/res/sass/controls/_controls.scss */ + /* line 442, ../../../../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 446, ../../../../general/res/sass/controls/_controls.scss */ + /* line 447, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row li:first-child { margin-left: 0; } - /* line 450, ../../../../general/res/sass/controls/_controls.scss */ + /* line 451, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-header li { color: #b3b3b3; } - /* line 453, ../../../../general/res/sass/controls/_controls.scss */ + /* line 454, ../../../../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; @@ -2639,31 +2634,31 @@ label.checkbox.custom { -webkit-transition-delay: 0; transition-delay: 0; cursor: pointer; } - /* line 456, ../../../../general/res/sass/controls/_controls.scss */ + /* line 457, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.in-month { background-color: #616161; } - /* line 459, ../../../../general/res/sass/controls/_controls.scss */ + /* line 460, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li .sub { color: #b3b3b3; font-size: 0.8em; } - /* line 463, ../../../../general/res/sass/controls/_controls.scss */ + /* line 464, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected { background: #006080; color: #cccccc; } - /* line 466, ../../../../general/res/sass/controls/_controls.scss */ + /* line 467, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected .sub { color: inherit; } - /* line 470, ../../../../general/res/sass/controls/_controls.scss */ + /* line 471, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li:hover { background-color: #0099cc; color: #fff; } - /* line 473, ../../../../general/res/sass/controls/_controls.scss */ + /* line 474, ../../../../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 484, ../../../../general/res/sass/controls/_controls.scss */ + /* line 485, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2678,7 +2673,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 493, ../../../../general/res/sass/controls/_controls.scss */ + /* line 494, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2692,7 +2687,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 500, ../../../../general/res/sass/controls/_controls.scss */ + /* line 501, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2701,7 +2696,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#5e5e5e, #525252 20px); background-image: linear-gradient(#5e5e5e, #525252 20px); } - /* line 505, ../../../../general/res/sass/controls/_controls.scss */ + /* line 506, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } } /***************************************************************************** @@ -7379,10 +7374,10 @@ table { /* line 1, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display { line-height: 140%; } - /* line 6, ../../../../general/res/sass/features/_time-display.scss */ + /* line 5, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display:hover .l-btn.control { opacity: 1; } - /* line 18, ../../../../general/res/sass/features/_time-display.scss */ + /* line 11, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer .control { -moz-transition-property: width, opacity; -o-transition-property: width, opacity; @@ -7404,15 +7399,15 @@ table { margin-right: 0; opacity: 0; width: 0; } - /* line 27, ../../../../general/res/sass/features/_time-display.scss */ + /* line 18, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer:hover .control { margin-right: 5px; opacity: 1; - width: auto; } - /* line 34, ../../../../general/res/sass/features/_time-display.scss */ + width: 1em; } + /* line 25, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display .value { - color: #cccccc; - font-weight: 600; } - /* line 37, ../../../../general/res/sass/features/_time-display.scss */ + color: white; + font-weight: 400; } + /* line 28, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display .value .direction { font-size: 0.8em; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 5c0c0db08b..dc48a38eab 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -1713,15 +1713,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -/* 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 */ + /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1755,10 +1748,10 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { height: 24px; width: 9px; text-align: center; } - /* line 133, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 130, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:hover { color: #0099cc; } - /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 135, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed { background-color: #969696; -moz-border-radius: 4px; @@ -1789,19 +1782,19 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: white; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } - /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 139, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:after { opacity: 1; } - /* line 144, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:before { opacity: 1; } - /* line 145, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 142, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:hover:after { opacity: 0; } - /* line 150, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 147, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before, .mini-tab:after { -moz-transition-property: left, right, opacity; -o-transition-property: left, right, opacity; @@ -1822,22 +1815,22 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { display: block; height: 100%; position: absolute; } - /* line 159, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 156, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:before { width: 9px; } - /* line 165, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 162, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab:after { width: 100%; text-align: center; opacity: 0; } - /* line 172, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 169, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left { text-align: right; } - /* line 175, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 172, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left:before { content: '\3c'; right: 0; } - /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 177, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed { -moz-border-radius-topleft: 0; -webkit-border-top-left-radius: 0; @@ -1846,21 +1839,21 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; text-align: left; } - /* line 183, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 180, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:before { content: '\3e'; left: 0; } - /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 184, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-left.collapsed:hover:before { left: 2px; } - /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 187, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right { text-align: left; } - /* line 193, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 190, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right:before { content: '\3e'; left: 0; } - /* line 198, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 195, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed { -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; @@ -1868,17 +1861,17 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; } - /* line 200, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 197, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:before { text-align: right; content: '\3c'; right: 0; } - /* line 205, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 202, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 211, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #d6d6d6; cursor: pointer; @@ -1891,31 +1884,31 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { line-height: 9px; overflow: hidden; word-break: break-all; } - /* line 228, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 225, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon.collapsed { width: 11px; font-size: 11px; } - /* line 233, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 230, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before, .mini-tab-icon:after { position: absolute; display: inherit; } - /* line 239, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 236, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:before { content: '\78'; } - /* line 243, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 240, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon:hover { color: #0099cc; } } -/* line 250, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 247, ../../../../general/res/sass/controls/_buttons.scss */ .l-btn-set { font-size: 0; } - /* line 256, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 253, ../../../../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 262, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 259, ../../../../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; @@ -1924,7 +1917,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; margin-left: 0; } - /* line 269, ../../../../general/res/sass/controls/_buttons.scss */ + /* line 266, ../../../../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; @@ -1933,7 +1926,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } -/* line 276, ../../../../general/res/sass/controls/_buttons.scss */ +/* line 273, ../../../../general/res/sass/controls/_buttons.scss */ .paused:not(.s-btn):not(.s-menu-btn) { border-color: #ff9900 !important; color: #ff9900 !important; } @@ -2209,13 +2202,15 @@ label.checkbox.custom { border-bottom: none; } /* line 190, ../../../../general/res/sass/controls/_controls.scss */ -.context-available { +.context-available, +.s-icon-btn { color: #0099cc; } - /* line 193, ../../../../general/res/sass/controls/_controls.scss */ - .context-available:hover { + /* line 194, ../../../../general/res/sass/controls/_controls.scss */ + .context-available:hover, + .s-icon-btn:hover { color: deepskyblue; } -/* line 198, ../../../../general/res/sass/controls/_controls.scss */ +/* line 199, ../../../../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; @@ -2235,22 +2230,22 @@ label.checkbox.custom { transition-delay: 0; } /******************************************************** OBJECT-HEADER */ -/* line 203, ../../../../general/res/sass/controls/_controls.scss */ +/* line 204, ../../../../general/res/sass/controls/_controls.scss */ .object-header { font-size: 1em; } - /* line 206, ../../../../general/res/sass/controls/_controls.scss */ + /* line 207, ../../../../general/res/sass/controls/_controls.scss */ .object-header > .type-icon { color: #b3b3b3; font-size: 120%; float: left; margin-right: 5px; } - /* line 214, ../../../../general/res/sass/controls/_controls.scss */ + /* line 215, ../../../../general/res/sass/controls/_controls.scss */ .object-header .l-elem-wrapper mct-representation { min-width: 0.7em; } - /* line 222, ../../../../general/res/sass/controls/_controls.scss */ + /* line 223, ../../../../general/res/sass/controls/_controls.scss */ .object-header .action { margin-right: 5px; } - /* line 226, ../../../../general/res/sass/controls/_controls.scss */ + /* line 227, ../../../../general/res/sass/controls/_controls.scss */ .object-header .title-label { color: #666; overflow: hidden; @@ -2259,13 +2254,13 @@ label.checkbox.custom { flex: 0 1 auto; -webkit-flex: 0 1 auto; padding-right: 0.35em; } - /* line 233, ../../../../general/res/sass/controls/_controls.scss */ + /* line 234, ../../../../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 239, ../../../../general/res/sass/controls/_controls.scss */ + /* line 240, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2284,7 +2279,7 @@ label.checkbox.custom { -webkit-transition-delay: 0; transition-delay: 0; opacity: 0; } - /* line 244, ../../../../general/res/sass/controls/_controls.scss */ + /* line 245, ../../../../general/res/sass/controls/_controls.scss */ .object-header:hover .context-available { opacity: 1; } } @@ -2298,12 +2293,12 @@ label.checkbox.custom { @keyframes progress { 100% { background-position: 20px center; } } -/* line 266, ../../../../general/res/sass/controls/_controls.scss */ +/* line 267, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar { display: inline-block; overflow: hidden; position: relative; } - /* line 272, ../../../../general/res/sass/controls/_controls.scss */ + /* line 273, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar .progress-amt-holder { overflow: hidden; position: absolute; @@ -2313,7 +2308,7 @@ label.checkbox.custom { left: 1px; width: auto; height: auto; } - /* line 275, ../../../../general/res/sass/controls/_controls.scss */ + /* line 276, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar .progress-amt, .l-progress-bar .progress-amt:before, .l-progress-bar .progress-amt:after { @@ -2327,14 +2322,14 @@ label.checkbox.custom { height: auto; display: block; content: ''; } - /* line 283, ../../../../general/res/sass/controls/_controls.scss */ + /* line 284, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar .progress-amt { right: auto; } - /* line 288, ../../../../general/res/sass/controls/_controls.scss */ + /* line 289, ../../../../general/res/sass/controls/_controls.scss */ .l-progress-bar.indeterminate .progress-amt { width: 100% !important; } -/* line 294, ../../../../general/res/sass/controls/_controls.scss */ +/* line 295, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -2343,7 +2338,7 @@ label.checkbox.custom { -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 298, ../../../../general/res/sass/controls/_controls.scss */ + /* line 299, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar .progress-amt { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -2370,10 +2365,10 @@ label.checkbox.custom { -o-transition-delay: 0; -webkit-transition-delay: 0; transition-delay: 0; } - /* line 303, ../../../../general/res/sass/controls/_controls.scss */ + /* line 304, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar .progress-amt:before { background-color: #0a0; } - /* line 306, ../../../../general/res/sass/controls/_controls.scss */ + /* line 307, ../../../../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%; @@ -2381,7 +2376,7 @@ label.checkbox.custom { 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 315, ../../../../general/res/sass/controls/_controls.scss */ + /* line 316, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar:not(.indeterminate) .progress-amt:before { -moz-animation: progress 0.4s linear infinite; -webkit-animation: progress 0.4s linear infinite; @@ -2394,7 +2389,7 @@ label.checkbox.custom { background-position: 0 center; background-repeat: repeat-x; background-size: 20px 40%; } - /* line 323, ../../../../general/res/sass/controls/_controls.scss */ + /* line 324, ../../../../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; @@ -2406,12 +2401,12 @@ label.checkbox.custom { 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 328, ../../../../general/res/sass/controls/_controls.scss */ + /* line 329, ../../../../general/res/sass/controls/_controls.scss */ .s-progress-bar.indeterminate .progress-amt:after { display: none; } /******************************************************** SLIDERS */ -/* line 336, ../../../../general/res/sass/controls/_controls.scss */ +/* line 337, ../../../../general/res/sass/controls/_controls.scss */ .slider .slot { width: auto; position: absolute; @@ -2419,7 +2414,7 @@ label.checkbox.custom { right: 0; bottom: 0; left: 0; } -/* line 344, ../../../../general/res/sass/controls/_controls.scss */ +/* line 345, ../../../../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; @@ -2445,10 +2440,10 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 347, ../../../../general/res/sass/controls/_controls.scss */ + /* line 348, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob:hover { background-color: rgba(0, 153, 204, 0.7); } -/* line 358, ../../../../general/res/sass/controls/_controls.scss */ +/* line 359, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-l { -moz-border-radius-topleft: 10px; -webkit-border-top-left-radius: 10px; @@ -2457,7 +2452,7 @@ label.checkbox.custom { -webkit-border-bottom-left-radius: 10px; border-bottom-left-radius: 10px; cursor: w-resize; } -/* line 362, ../../../../general/res/sass/controls/_controls.scss */ +/* line 363, ../../../../general/res/sass/controls/_controls.scss */ .slider .knob-r { -moz-border-radius-topright: 10px; -webkit-border-top-right-radius: 10px; @@ -2466,7 +2461,7 @@ label.checkbox.custom { -webkit-border-bottom-right-radius: 10px; border-bottom-right-radius: 10px; cursor: e-resize; } -/* line 366, ../../../../general/res/sass/controls/_controls.scss */ +/* line 367, ../../../../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; @@ -2493,12 +2488,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 377, ../../../../general/res/sass/controls/_controls.scss */ + /* line 378, ../../../../general/res/sass/controls/_controls.scss */ .slider .range:hover { background-color: rgba(0, 153, 204, 0.4); } /******************************************************** DATETIME PICKER */ -/* line 384, ../../../../general/res/sass/controls/_controls.scss */ +/* line 385, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker { -moz-user-select: -moz-none; -ms-user-select: none; @@ -2507,65 +2502,65 @@ label.checkbox.custom { font-size: 0.8rem; padding: 10px !important; width: 230px; } - /* line 390, ../../../../general/res/sass/controls/_controls.scss */ + /* line 391, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager { height: 15px; margin-bottom: 5px; position: relative; } - /* line 399, ../../../../general/res/sass/controls/_controls.scss */ + /* line 400, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager { width: 20px; } - /* line 402, ../../../../general/res/sass/controls/_controls.scss */ + /* line 403, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev { right: auto; } - /* line 404, ../../../../general/res/sass/controls/_controls.scss */ + /* line 405, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.prev:before { content: "\3c"; } - /* line 408, ../../../../general/res/sass/controls/_controls.scss */ + /* line 409, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next { left: auto; text-align: right; } - /* line 411, ../../../../general/res/sass/controls/_controls.scss */ + /* line 412, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .pager.next:before { content: "\3e"; } - /* line 416, ../../../../general/res/sass/controls/_controls.scss */ + /* line 417, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-month-year-pager .val { text-align: center; left: 25px; right: 25px; } - /* line 422, ../../../../general/res/sass/controls/_controls.scss */ + /* line 423, ../../../../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 426, ../../../../general/res/sass/controls/_controls.scss */ + /* line 427, ../../../../general/res/sass/controls/_controls.scss */ .l-datetime-picker .l-time-selects { line-height: 22px; } /******************************************************** CALENDAR */ -/* line 434, ../../../../general/res/sass/controls/_controls.scss */ +/* line 435, ../../../../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 438, ../../../../general/res/sass/controls/_controls.scss */ + /* line 439, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row:first-child { margin-top: 0; } - /* line 441, ../../../../general/res/sass/controls/_controls.scss */ + /* line 442, ../../../../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 446, ../../../../general/res/sass/controls/_controls.scss */ + /* line 447, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row li:first-child { margin-left: 0; } - /* line 450, ../../../../general/res/sass/controls/_controls.scss */ + /* line 451, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-header li { color: #999999; } - /* line 453, ../../../../general/res/sass/controls/_controls.scss */ + /* line 454, ../../../../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; @@ -2584,31 +2579,31 @@ label.checkbox.custom { -webkit-transition-delay: 0; transition-delay: 0; cursor: pointer; } - /* line 456, ../../../../general/res/sass/controls/_controls.scss */ + /* line 457, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.in-month { background-color: #f2f2f2; } - /* line 459, ../../../../general/res/sass/controls/_controls.scss */ + /* line 460, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li .sub { color: #999999; font-size: 0.8em; } - /* line 463, ../../../../general/res/sass/controls/_controls.scss */ + /* line 464, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected { background: #1ac6ff; color: #fcfcfc; } - /* line 466, ../../../../general/res/sass/controls/_controls.scss */ + /* line 467, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li.selected .sub { color: inherit; } - /* line 470, ../../../../general/res/sass/controls/_controls.scss */ + /* line 471, ../../../../general/res/sass/controls/_controls.scss */ .l-calendar ul.l-cal-row.l-body li:hover { background-color: #0099cc; color: #fff; } - /* line 473, ../../../../general/res/sass/controls/_controls.scss */ + /* line 474, ../../../../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 484, ../../../../general/res/sass/controls/_controls.scss */ + /* line 485, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2623,7 +2618,7 @@ label.checkbox.custom { height: 10px; width: 10px; } - /* line 493, ../../../../general/res/sass/controls/_controls.scss */ + /* line 494, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg5ODk4OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdkN2Q3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2637,7 +2632,7 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 500, ../../../../general/res/sass/controls/_controls.scss */ + /* line 501, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2646,7 +2641,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#00ace6, #0099cc 20px); background-image: linear-gradient(#00ace6, #0099cc 20px); } - /* line 505, ../../../../general/res/sass/controls/_controls.scss */ + /* line 506, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.1); } } /***************************************************************************** @@ -7256,10 +7251,10 @@ table { /* line 1, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display { line-height: 140%; } - /* line 6, ../../../../general/res/sass/features/_time-display.scss */ + /* line 5, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display:hover .l-btn.control { opacity: 1; } - /* line 18, ../../../../general/res/sass/features/_time-display.scss */ + /* line 11, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer .control { -moz-transition-property: width, opacity; -o-transition-property: width, opacity; @@ -7281,16 +7276,16 @@ table { margin-right: 0; opacity: 0; width: 0; } - /* line 27, ../../../../general/res/sass/features/_time-display.scss */ + /* line 18, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display.l-timer:hover .control { margin-right: 5px; opacity: 1; - width: auto; } - /* line 34, ../../../../general/res/sass/features/_time-display.scss */ + width: 1em; } + /* line 25, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display .value { - color: #333333; - font-weight: 600; } - /* line 37, ../../../../general/res/sass/features/_time-display.scss */ + color: black; + font-weight: 400; } + /* line 28, ../../../../general/res/sass/features/_time-display.scss */ .l-time-display .value .direction { font-size: 0.8em; } diff --git a/platform/features/timeline/res/css/timeline.css b/platform/features/timeline/res/css/timeline.css index f7fe2d0f57..4b581088c8 100644 --- a/platform/features/timeline/res/css/timeline.css +++ b/platform/features/timeline/res/css/timeline.css @@ -116,36 +116,36 @@ /* line 25, ../sass/_activities.scss */ .l-timeline-gantt .bar span.s-title { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 30, ../sass/_activities.scss */ + /* line 28, ../sass/_activities.scss */ .l-timeline-gantt .bar span.duration { left: auto; opacity: 0.75; right: 0; text-align: right; width: 60px; } - /* line 37, ../sass/_activities.scss */ + /* line 35, ../sass/_activities.scss */ .l-timeline-gantt .bar span.handle { top: 0; bottom: 0; height: auto; width: 15px; } - /* line 43, ../sass/_activities.scss */ + /* line 40, ../sass/_activities.scss */ .l-timeline-gantt .bar span.handle.left { right: auto; } - /* line 46, ../sass/_activities.scss */ + /* line 43, ../sass/_activities.scss */ .l-timeline-gantt .bar span.handle.middle { right: 15px; left: 15px; width: auto; } - /* line 51, ../sass/_activities.scss */ + /* line 48, ../sass/_activities.scss */ .l-timeline-gantt .bar span.handle.right { right: 0; left: auto; } -/* line 61, ../sass/_activities.scss */ +/* line 58, ../sass/_activities.scss */ .edit-mode .s-timeline-gantt .handle { cursor: col-resize; } - /* line 66, ../sass/_activities.scss */ + /* line 60, ../sass/_activities.scss */ .edit-mode .s-timeline-gantt .handle.mid { cursor: ew-resize; } @@ -180,7 +180,7 @@ left: 0px; width: auto; height: auto; } - /* line 27, ../sass/_timelines.scss */ + /* line 26, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane { overflow: hidden; position: absolute; @@ -190,10 +190,10 @@ left: 0px; width: auto; height: auto; } - /* line 30, ../sass/_timelines.scss */ + /* line 29, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane .l-width-control { position: relative; } - /* line 34, ../sass/_timelines.scss */ + /* line 33, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane .l-swimlanes-holder { overflow: hidden; position: absolute; @@ -204,7 +204,7 @@ width: auto; height: auto; top: 31px; } - /* line 41, ../sass/_timelines.scss */ + /* line 40, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v { overflow: hidden; position: absolute; @@ -214,16 +214,16 @@ left: 0px; width: auto; height: auto; } - /* line 44, ../sass/_timelines.scss */ + /* line 43, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-l { right: auto; width: 266px; } - /* line 49, ../sass/_timelines.scss */ + /* line 48, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-r { overflow-x: auto; overflow-y: hidden; left: 266px; } - /* line 53, ../sass/_timelines.scss */ + /* line 52, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.s-timeline-tabular .t-pane-v.l-tabular-r .l-width { overflow: visible; position: absolute; @@ -235,18 +235,18 @@ height: auto; min-width: 590px; width: 100%; } - /* line 61, ../sass/_timelines.scss */ + /* line 60, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-gantt .l-swimlanes-holder { overflow-x: hidden; overflow-y: scroll; } - /* line 65, ../sass/_timelines.scss */ + /* line 64, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; padding: 5px 0; white-space: nowrap; } - /* line 70, ../sass/_timelines.scss */ + /* line 69, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .l-legend-items { overflow: hidden; position: absolute; @@ -259,20 +259,20 @@ overflow-x: hidden; overflow-y: auto; top: 25px; } - /* line 76, ../sass/_timelines.scss */ + /* line 74, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item { display: block; margin-bottom: 3px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 84, ../sass/_timelines.scss */ + /* line 81, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item .color-swatch { vertical-align: baseline; } - /* line 87, ../sass/_timelines.scss */ + /* line 84, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-legend .legend-item .title-label { vertical-align: baseline; } - /* line 96, ../sass/_timelines.scss */ + /* line 93, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder { overflow: hidden; position: absolute; @@ -283,7 +283,7 @@ width: auto; height: auto; bottom: 10px; } - /* line 101, ../sass/_timelines.scss */ + /* line 97, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder .l-graphs { overflow: hidden; position: absolute; @@ -295,7 +295,7 @@ height: auto; overflow-x: hidden; overflow-y: scroll; } - /* line 106, ../sass/_timelines.scss */ + /* line 102, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graphs-holder .l-graph-labels-holder { overflow: hidden; position: absolute; @@ -308,7 +308,7 @@ overflow: hidden; right: auto; width: 400px; } - /* line 115, ../sass/_timelines.scss */ + /* line 110, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-scroll-control { overflow: hidden; position: absolute; @@ -323,16 +323,16 @@ top: auto; right: 10px; height: 10px; } - /* line 121, ../sass/_timelines.scss */ + /* line 116, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-scroll-control .l-width-control { height: 10px; } - /* line 126, ../sass/_timelines.scss */ + /* line 121, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph, .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-labels { height: 80px; margin-bottom: 3px; position: relative; } - /* line 133, ../sass/_timelines.scss */ + /* line 128, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-title { overflow: hidden; text-overflow: ellipsis; @@ -340,17 +340,17 @@ top: 5px; left: 5px; position: absolute; } - /* line 139, ../sass/_timelines.scss */ + /* line 134, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph { width: 100%; } - /* line 143, ../sass/_timelines.scss */ + /* line 137, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph .l-graph-area canvas { width: 100%; height: 100%; } - /* line 150, ../sass/_timelines.scss */ + /* line 144, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-labels { z-index: 10; } - /* line 154, ../sass/_timelines.scss */ + /* line 148, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area { overflow: hidden; position: absolute; @@ -362,7 +362,7 @@ height: auto; top: 20px; bottom: 5px; } - /* line 157, ../sass/_timelines.scss */ + /* line 151, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area .l-labels-holder { overflow: hidden; position: absolute; @@ -373,19 +373,19 @@ width: auto; height: auto; left: 5px; } - /* line 160, ../sass/_timelines.scss */ + /* line 154, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.t-pane-h.l-timeline-resource-graph .l-graph-area .l-labels-holder .tick-label.tick-label-y { text-align: left; } - /* line 168, ../sass/_timelines.scss */ + /* line 162, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-l { right: auto; min-width: 50px; max-width: 90%; width: 30%; } - /* line 176, ../sass/_timelines.scss */ + /* line 169, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-r { left: 0; } - /* line 180, ../sass/_timelines.scss */ + /* line 172, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-r:hover .l-hover-btns-holder { -moz-transition-property: opacity, background-color, border-color, color; -o-transition-property: opacity, background-color, border-color, color; @@ -404,20 +404,20 @@ -webkit-transition-delay: 0; transition-delay: 0; opacity: 1; } - /* line 187, ../sass/_timelines.scss */ + /* line 179, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-top { bottom: 30%; } - /* line 191, ../sass/_timelines.scss */ + /* line 182, ../sass/_timelines.scss */ .l-timeline-holder .l-timeline-pane.l-pane-btm { top: auto; min-height: 20px; max-height: 80%; height: 30%; } - /* line 200, ../sass/_timelines.scss */ + /* line 190, ../sass/_timelines.scss */ .l-timeline-holder .l-swimlane { height: 21px; position: relative; } - /* line 206, ../sass/_timelines.scss */ + /* line 196, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header, .l-timeline-holder .s-timeline-gantt .l-header { overflow: visible; @@ -430,7 +430,7 @@ height: auto; bottom: auto; height: 30px; } - /* line 212, ../sass/_timelines.scss */ + /* line 201, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header .l-header-elem, .l-timeline-holder .s-timeline-gantt .l-header .l-header-elem { overflow: visible; @@ -442,14 +442,14 @@ width: auto; height: auto; display: block; } - /* line 217, ../sass/_timelines.scss */ + /* line 205, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header .l-header-elem.l-labels .l-label, .l-timeline-holder .s-timeline-gantt .l-header .l-header-elem.l-labels .l-label { position: absolute; width: 140px; margin-left: -70px; text-align: center; } - /* line 227, ../sass/_timelines.scss */ + /* line 215, ../sass/_timelines.scss */ .l-timeline-holder .l-hover-btns-holder { overflow: hidden; position: absolute; @@ -485,7 +485,7 @@ padding: 5px; text-align: right; z-index: 10; } - /* line 240, ../sass/_timelines.scss */ + /* line 228, ../sass/_timelines.scss */ .l-timeline-holder .l-cols { overflow: visible; position: absolute; @@ -497,7 +497,7 @@ height: auto; text-wrap: none; white-space: nowrap; } - /* line 245, ../sass/_timelines.scss */ + /* line 232, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -511,40 +511,40 @@ position: relative; text-wrap: none; white-space: nowrap; } - /* line 256, ../sass/_timelines.scss */ + /* line 242, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-col-icon { width: 16px; text-align: center; padding: 0; } - /* line 260, ../sass/_timelines.scss */ + /* line 246, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-col-icon .ui-symbol { color: #0099cc; } - /* line 265, ../sass/_timelines.scss */ + /* line 251, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-plot-resource { border-left: none !important; cursor: pointer; padding-left: 0; } - /* line 274, ../sass/_timelines.scss */ + /* line 257, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-title { width: 250px; } - /* line 278, ../sass/_timelines.scss */ + /* line 261, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-start, .l-timeline-holder .l-cols .l-col.l-end, .l-timeline-holder .l-cols .l-col.l-duration { width: 110px; } - /* line 288, ../sass/_timelines.scss */ + /* line 267, ../sass/_timelines.scss */ .l-timeline-holder .l-cols .l-col.l-activity-modes { display: none; width: 250px; } - /* line 297, ../sass/_timelines.scss */ + /* line 275, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-header .l-cols { top: 5px; bottom: 5px; } - /* line 303, ../sass/_timelines.scss */ + /* line 281, ../sass/_timelines.scss */ .l-timeline-holder .s-timeline-tabular .l-pane-l .l-cols { left: 5px; } - /* line 309, ../sass/_timelines.scss */ + /* line 287, ../sass/_timelines.scss */ .l-timeline-holder .splitter { top: 0; } - /* line 315, ../sass/_timelines.scss */ + /* line 293, ../sass/_timelines.scss */ .l-timeline-holder .l-ticks, .l-timeline-holder .l-subticks { overflow: hidden; @@ -557,9 +557,9 @@ height: auto; top: auto; bottom: 3px; } - /* line 321, ../sass/_timelines.scss */ + /* line 299, ../sass/_timelines.scss */ .l-timeline-holder .l-ticks { height: 10px; } - /* line 325, ../sass/_timelines.scss */ + /* line 303, ../sass/_timelines.scss */ .l-timeline-holder .l-subticks { height: 5px; } diff --git a/platform/features/timeline/res/sass/_activities.scss b/platform/features/timeline/res/sass/_activities.scss index 265623634f..e7b27ebfb1 100644 --- a/platform/features/timeline/res/sass/_activities.scss +++ b/platform/features/timeline/res/sass/_activities.scss @@ -24,8 +24,6 @@ } &.s-title { @include text-shadow(rgba(black, 0.1) 0 1px 2px); -// right: 5px; -// width: 50%; } &.duration { left: auto; @@ -35,7 +33,6 @@ width: 60px; } &.handle { - //background: rgba(red, 0.2); top: 0; bottom: 0; height: auto; @@ -60,15 +57,8 @@ .edit-mode .s-timeline-gantt { .handle { cursor: col-resize; - &.start { -// @include test(red); - } &.mid { -// @include test(green); cursor: ew-resize; } - &.end { -// @include test(blue); - } } } \ No newline at end of file diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index f4b482522a..4d949be150 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -21,7 +21,6 @@ *****************************************************************************/ //*************************************************************** LAYOUT .l-timeline-holder { -// @include test(); @include absPosDefault(); .l-timeline-pane { @@ -71,11 +70,9 @@ @include absPosDefault(); @include scrollV(); top: 25px; - //color: lighten($timelineColorAlt1, 10%); // MOVED to espresso theme } .legend-item { // Inherits from /platform/commonUI/general/res/sass/plots/_plots-main.scss -// border-bottom: 1px solid $colorInteriorBorder; display: block; margin-bottom: $interiorMarginSm; overflow: hidden; @@ -94,7 +91,6 @@ $m: $interiorMargin; .l-graphs-holder { -// @include test(blue); @include absPosDefault(); bottom: $scrollbarTrackSize; @@ -104,7 +100,6 @@ } .l-graph-labels-holder { -// @include test(red); @include absPosDefault(); overflow: hidden; right: auto; @@ -125,7 +120,7 @@ .l-graph, .l-graph-labels { - height: 80px; //was 120px + height: 80px; margin-bottom: $interiorMarginSm; position: relative; } @@ -137,7 +132,6 @@ } .l-graph { - //background: rgba(black, 0.3); // MOVED width: 100%; .l-graph-area { canvas { @@ -166,7 +160,6 @@ } &.l-pane-l { -// @include test(red); right: auto; min-width: 50px; max-width: 90%; @@ -174,7 +167,6 @@ } &.l-pane-r { -// @include test(blue); left: 0; &:hover { .l-hover-btns-holder { @@ -185,11 +177,9 @@ } &.l-pane-top { -// @include test(green); bottom: $timelinePaneBtmH; } &.l-pane-btm { -// @include test(orange); top: auto; min-height: 20px; max-height: 80%; @@ -205,13 +195,11 @@ // Header .s-timeline-tabular .l-header, .s-timeline-gantt .l-header { -// @include test(white,0.05); @include absPosDefault(0, visible); bottom: auto; height: $timelineTopPaneHeaderH; .l-header-elem { @include absPosDefault($timelineTopPaneHeaderElemMargin, visible); -// bottom: auto; height: 15px; display: block; &.l-labels { .l-label { @@ -238,14 +226,12 @@ // Tabular Columns .l-cols { -// @include test(#66ff66, 0.1); @include absPosDefault(0, visible); text-wrap: none; white-space: nowrap; .l-col { @include box-sizing(border-box); @include ellipsize(); -// @include test(red, 0.05); display: inline-block; height: 100%; padding: 0 $interiorMargin; @@ -266,9 +252,6 @@ border-left: none !important; cursor: pointer; padding-left: 0; -// .ui-symbol { -// color: $colorFormValid; -// } } &.l-title { @@ -281,15 +264,10 @@ width: $timelineColDatetimeW; } - //&.l-duration { - // width: $timelineColDurationW; - //} - &.l-activity-modes { display: none; // Temp, until modes can be displayed width: $timelineColActivityModesW; } - } } diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html index 4a7f5455fd..3f8acf1073 100644 --- a/platform/features/timeline/res/templates/timeline.html +++ b/platform/features/timeline/res/templates/timeline.html @@ -109,14 +109,14 @@
- X - diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html index 178a3bfd75..232c1754a3 100644 --- a/platform/forms/res/templates/controls/color.html +++ b/platform/forms/res/templates/controls/color.html @@ -20,7 +20,7 @@ at runtime from the About dialog for additional information. -->
From 0635e7c38ea935563f3ec577527fcc43645be553 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 20 Nov 2015 17:26:43 -0800 Subject: [PATCH 10/88] [Timeline] Disambiguate datetime control Timeline uses a custom date-time control on creation; use a distinct key for this to avoid a naming collision with platform's datetime. Addresses abnormal behavior identified in nasa/openmctweb#208 --- platform/features/timeline/bundle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/features/timeline/bundle.json b/platform/features/timeline/bundle.json index e532abc971..e7363ab160 100644 --- a/platform/features/timeline/bundle.json +++ b/platform/features/timeline/bundle.json @@ -57,7 +57,7 @@ "properties": [ { "name": "Start date/time", - "control": "datetime", + "control": "timeline-datetime", "required": true, "property": [ "start" ], "options": [ "SET" ] @@ -83,7 +83,7 @@ "properties": [ { "name": "Start date/time", - "control": "datetime", + "control": "timeline-datetime", "required": true, "property": [ "start" ], "options": [ "SET" ] @@ -271,7 +271,7 @@ ], "controls": [ { - "key": "datetime", + "key": "timeline-datetime", "templateUrl": "templates/controls/datetime.html" }, { From 1cf23c7ad6b8d31febdd8f7d96e5fd8bf68c8381 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 24 Nov 2015 10:57:52 -0800 Subject: [PATCH 11/88] [Documentation] Rename development cycle ...as it will no longer be the index of the process category as information about testing is added. --- docs/src/process/{index.md => cycle.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/src/process/{index.md => cycle.md} (100%) diff --git a/docs/src/process/index.md b/docs/src/process/cycle.md similarity index 100% rename from docs/src/process/index.md rename to docs/src/process/cycle.md From eb942b0bf78b16ab437cd79cbe5487ff86d0938d Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 24 Nov 2015 13:08:59 -0800 Subject: [PATCH 12/88] [Documentation] Intermediary commit Begin adding test plan, procedures. WTD-1573. --- docs/src/process/index.md | 13 +++++++++++++ docs/src/process/testing/plan.md | 0 docs/src/process/testing/procedures.md | 6 ++++++ 3 files changed, 19 insertions(+) create mode 100644 docs/src/process/index.md create mode 100644 docs/src/process/testing/plan.md create mode 100644 docs/src/process/testing/procedures.md diff --git a/docs/src/process/index.md b/docs/src/process/index.md new file mode 100644 index 0000000000..61a22ed6a0 --- /dev/null +++ b/docs/src/process/index.md @@ -0,0 +1,13 @@ +# Development Process + +The process used to develop Open MCT Web is described in the following +documents: + +* [Development Cycle](cycle.md): Describes how and when specific + process points are repeated during development. +* Testing is described in two documents: + * The [Test Plan](testing/plan.md) summarizes the approaches used + to test Open MCT Web. + * The [Test Procedures](testing/procedures.md) document what + specific tests are performed to verify correctness, and how + they should be carried out. diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/src/process/testing/procedures.md b/docs/src/process/testing/procedures.md new file mode 100644 index 0000000000..b9d159a032 --- /dev/null +++ b/docs/src/process/testing/procedures.md @@ -0,0 +1,6 @@ +# Test Procedures + +## Template + +Test procedures should use the following template: + From 7a4be9e67ea06dc9bb5abcde5fbf3bcb4eb4f88d Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 24 Nov 2015 15:56:02 -0800 Subject: [PATCH 13/88] [Documentation] Add test procedure template --- docs/src/process/testing/procedures.md | 73 +++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/docs/src/process/testing/procedures.md b/docs/src/process/testing/procedures.md index b9d159a032..4bcd39d4a6 100644 --- a/docs/src/process/testing/procedures.md +++ b/docs/src/process/testing/procedures.md @@ -1,6 +1,75 @@ # Test Procedures -## Template +## Introduction -Test procedures should use the following template: +This document is intended to be used: +* By testers, to verify that Open MCT Web behaves as specified. +* By the development team, to document new test cases and to provide + guidance on how to author these. + +## Writing Procedures + +### Template + +Procedures for individual tests should use the following template, +adapted from [https://swehb.nasa.gov/display/7150/SWE-114](). + +Property | Value +---------------|--------------------------------------------------------------- +Test ID | +Relevant reqs. | +Prerequisites | +Test input | +Instructions | +Expectation | +Eval. criteria | + +For multi-line descriptions, use an asterisk or similar indicator to refer +to a longer-form description below. + +#### Example Procedure - Edit a Layout + +Property | Value +---------------|--------------------------------------------------------------- +Test ID | MCT-TEST-000X - Edit a layout +Relevant reqs. | MCT-EDIT-000Y +Prerequisites | Create a layout, as in MCT-TEST-000Z +Test input | Domain object database XYZ +Instructions | See below * +Expectation | Change to editing context † +Eval. criteria | Visual insepction + +* Follow the following steps: + +1. Verify that the created layout is currently navigated-to, + as in MCT-TEST-00ZZ. +2. Click the Edit button, identified by a pencil icon and the text "Edit" + displayed on hover. + +† Right-hand viewing area should be surrounded by a dashed +blue border when a domain object is being edited. + +### Guidelines + +Test procedures should be written assuming minimal prior knowledge of the +application: Non-standard terms should only be used when they are documented +in [the glossary](#glossary), and shorthands used for user actions should +be accompanied by useful references to test procedures describing those +actions (when available) or descriptions in user documentation. + +Test cases should be narrow in scope; if a list of steps is excessively +long (or must be written vaguely to be kept short) it should be broken +down into multiple tests which reference one another. + +All requirements satisfied by Open MCT Web should be verifiable using +one or more test procedures. + +## Glossary + +This section will contain terms used in test procedures. This may link to +a common glossary, to avoid replication of content. + +## Procedures + +This section will contain specific test procedures. From 91997ced013c99811b299f1d749337e98f0adac5 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 24 Nov 2015 17:08:59 -0800 Subject: [PATCH 14/88] [Documentation] Define test levels --- docs/src/process/testing/plan.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index e69de29bb2..8bedd01172 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -0,0 +1,19 @@ +# Test Plan + +## Test Levels + +Testing occurs regularly during development, with varying levels of +completeness. + +In order of decreasing frequency and increasing completeness, these +are: + +1. __Pre-merge testing__: Performed before changes are integrated + into the software. +2. __Partial acceptance testing__: A subset of acceptance testing + performed at regular intervals. +3. __Acceptance testing__: Performed before a new release is considered + stable. + +Each level of testing is inclusive of the levels which proceed it. + From 87a51a9eb3b7b15ad238d534a0caae1e78d7251e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 25 Nov 2015 11:02:03 -0800 Subject: [PATCH 15/88] [Time Conductor] Listen for blur, submit https://github.com/nasa/openmctweb/issues/259 --- .../res/templates/controls/datetime-field.html | 1 + .../res/templates/controls/time-controller.html | 11 +++++++---- .../general/src/controllers/TimeRangeController.js | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html index 2c0423c32b..79e326faf4 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-field.html +++ b/platform/commonUI/general/res/templates/controls/datetime-field.html @@ -2,6 +2,7 @@ ng-controller="DateTimeFieldController">
-
+
C @@ -35,13 +36,15 @@   -
+ + +
diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index cdcdb7f8d0..2e9f9dae28 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -230,6 +230,10 @@ define( $scope.rightDrag = rightDrag; $scope.middleDrag = middleDrag; + $scope.updateBoundsFromForm = function () { + // TODO: update outer bounds + }; + $scope.ticks = []; // Initialize scope to defaults From 976ecce075994c80d76b962a69312cb74753cdca Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 25 Nov 2015 11:09:11 -0800 Subject: [PATCH 16/88] [Time Conductor] Update model on submit/blur --- .../templates/controls/time-controller.html | 4 ++-- .../src/controllers/TimeRangeController.js | 22 ++++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index 58e6818ae7..f0b95983b6 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -26,7 +26,7 @@ @@ -37,7 +37,7 @@   diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index 2e9f9dae28..b036bd3fc7 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -175,6 +175,13 @@ define( updateViewFromModel($scope.ngModel); } + function updateFormModel() { + $scope.formModel = { + start: (($scope.ngModel || {}).outer || {}).start, + end: (($scope.ngModel || {}).outer || {}).end + }; + } + function updateOuterStart(t) { var ngModel = $scope.ngModel; @@ -192,6 +199,7 @@ define( ngModel.inner.end ); + updateFormModel(); updateViewForInnerSpanFromModel(ngModel); updateTicks(); } @@ -213,6 +221,7 @@ define( ngModel.inner.start ); + updateFormModel(); updateViewForInnerSpanFromModel(ngModel); updateTicks(); } @@ -223,6 +232,14 @@ define( updateTicks(); } + function updateBoundsFromForm() { + $scope.ngModel = $scope.ngModel || {}; + $scope.ngModel.outer = { + start: $scope.formModel.start, + end: $scope.formModel.end + }; + } + $scope.startLeftDrag = startLeftDrag; $scope.startRightDrag = startRightDrag; $scope.startMiddleDrag = startMiddleDrag; @@ -230,14 +247,13 @@ define( $scope.rightDrag = rightDrag; $scope.middleDrag = middleDrag; - $scope.updateBoundsFromForm = function () { - // TODO: update outer bounds - }; + $scope.updateBoundsFromForm = updateBoundsFromForm; $scope.ticks = []; // Initialize scope to defaults updateViewFromModel($scope.ngModel); + updateFormModel(); $scope.$watchCollection("ngModel", updateViewFromModel); $scope.$watch("spanWidth", updateSpanWidth); From 1ef09ffbdd1bfadc39f90f8cf3e5a6a517ff5967 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 25 Nov 2015 11:12:41 -0800 Subject: [PATCH 17/88] [Time Conductor] Restore last valid values Restore last valid values on blur, in a date-time entry field. --- .../general/res/templates/controls/datetime-field.html | 2 +- .../general/src/controllers/DateTimeFieldController.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html index 79e326faf4..51fbdc636d 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-field.html +++ b/platform/commonUI/general/res/templates/controls/datetime-field.html @@ -2,7 +2,7 @@ ng-controller="DateTimeFieldController"> Date: Wed, 25 Nov 2015 11:16:31 -0800 Subject: [PATCH 18/88] [Time Conductor] Submit immediately on picker changes --- .../general/res/templates/controls/datetime-field.html | 4 ++-- .../general/src/controllers/DateTimeFieldController.js | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html index 51fbdc636d..fba5898a51 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-field.html +++ b/platform/commonUI/general/res/templates/controls/datetime-field.html @@ -12,8 +12,8 @@
diff --git a/platform/commonUI/general/src/controllers/DateTimeFieldController.js b/platform/commonUI/general/src/controllers/DateTimeFieldController.js index bc932a7563..2084c32382 100644 --- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js +++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js @@ -55,6 +55,7 @@ define( $scope.textInvalid = false; $scope.lastValidValue = $scope.textValue; } + $scope.pickerModel = { value: value }; } function updateFromView(textValue) { @@ -66,6 +67,14 @@ define( } } + function updateFromPicker(value) { + $scope.ngModel[$scope.field] = value; + updateFromModel(value); + if ($scope.structure && $scope.structure.submit) { + $scope.structure.submit(); + } + } + function setFormat(format) { formatter = formatService.getFormat(format || defaultFormat); updateFromModel($scope.ngModel[$scope.field]); @@ -82,6 +91,7 @@ define( $scope.$watch('structure.format', setFormat); $scope.$watch('ngModel[field]', updateFromModel); + $scope.$watch('pickerModel.value', updateFromPicker); $scope.$watch('textValue', updateFromView); } From ffff13205a711b916746786c628524ba7215055c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 25 Nov 2015 11:21:51 -0800 Subject: [PATCH 19/88] [Time Conductor] Check for value changes ...on watches triggered from the picker. Only want to trigger a submit when this actually constitutes a change from the datetime field's underlying model (to avoid triggering form submission when datetime picker is initialized.) --- .../general/src/controllers/DateTimeFieldController.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/general/src/controllers/DateTimeFieldController.js b/platform/commonUI/general/src/controllers/DateTimeFieldController.js index 2084c32382..d401a8b3fc 100644 --- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js +++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js @@ -68,10 +68,12 @@ define( } function updateFromPicker(value) { - $scope.ngModel[$scope.field] = value; - updateFromModel(value); - if ($scope.structure && $scope.structure.submit) { - $scope.structure.submit(); + if (value !== $scope.ngModel[$scope.field]) { + $scope.ngModel[$scope.field] = value; + updateFromModel(value); + if ($scope.structure && $scope.structure.submit) { + $scope.structure.submit(); + } } } From 2ec906e2d4948c4b9909016606667c17a790ab3d Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 25 Nov 2015 14:10:48 -0800 Subject: [PATCH 20/88] [Build] Remove snapshot status Remove snapshot status in preparation to bump version number at end of sprint Banks. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c1ece26b4..a1b25d0df0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd open-mct-web Open MCT Web - 0.8.2-SNAPSHOT + 0.8.2 war From 434a52ded3ad3080b207e89a7aaa733794bfa3ab Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 25 Nov 2015 14:11:53 -0800 Subject: [PATCH 21/88] [Build] Bump version number ...to begin work for new sprint. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1b25d0df0..e28cbdd732 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd open-mct-web Open MCT Web - 0.8.2 + 0.8.3-SNAPSHOT war From 6d0f3c7faa23f590fd85e966e94a305b66a96fd2 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 24 Nov 2015 13:05:00 -0800 Subject: [PATCH 22/88] [Layout] Layout rebuilds after resize/reposition #32 Refactored layoutPanels method Fixed JSLint errors fixed failing tests --- platform/features/layout/bundle.json | 2 +- .../features/layout/src/LayoutController.js | 98 +++++++++++-------- .../layout/test/LayoutControllerSpec.js | 63 +++++++++--- 3 files changed, 108 insertions(+), 55 deletions(-) diff --git a/platform/features/layout/bundle.json b/platform/features/layout/bundle.json index df5bd9413c..3f710d4371 100644 --- a/platform/features/layout/bundle.json +++ b/platform/features/layout/bundle.json @@ -9,7 +9,7 @@ "glyph": "L", "type": "layout", "templateUrl": "templates/layout.html", - "uses": [ "composition" ], + "uses": [], "gestures": [ "drop" ] }, { diff --git a/platform/features/layout/src/LayoutController.js b/platform/features/layout/src/LayoutController.js index d7906dd0fa..b30de80ba3 100644 --- a/platform/features/layout/src/LayoutController.js +++ b/platform/features/layout/src/LayoutController.js @@ -47,42 +47,6 @@ define( function LayoutController($scope) { var self = this; - // Utility function to copy raw positions from configuration, - // without writing directly to configuration (to avoid triggering - // persistence from watchers during drags). - function shallowCopy(obj, keys) { - var copy = {}; - keys.forEach(function (k) { - copy[k] = obj[k]; - }); - return copy; - } - - // Compute panel positions based on the layout's object model - function lookupPanels(ids) { - var configuration = $scope.configuration || {}; - - // ids is read from model.composition and may be undefined; - // fall back to an array if that occurs - ids = ids || []; - - // Pull panel positions from configuration - self.rawPositions = - shallowCopy(configuration.panels || {}, ids); - - // Clear prior computed positions - self.positions = {}; - - // Update width/height that we are tracking - self.gridSize = - ($scope.model || {}).layoutGrid || DEFAULT_GRID_SIZE; - - // Compute positions and add defaults where needed - ids.forEach(function (id, index) { - self.populatePosition(id, index); - }); - } - // Update grid size when it changed function updateGridSize(layoutGrid) { var oldSize = self.gridSize; @@ -92,7 +56,7 @@ define( // Only update panel positions if this actually changed things if (self.gridSize[0] !== oldSize[0] || self.gridSize[1] !== oldSize[1]) { - lookupPanels(Object.keys(self.positions)); + self.layoutPanels(Object.keys(self.positions)); } } @@ -127,6 +91,25 @@ define( e.preventDefault(); } + function getComposition(domainObject){ + return domainObject.useCapability('composition'); + } + + function composeView (composition){ + $scope.composition = composition; + return composition.map(function (object) { + return object.getId(); + }) || []; + } + + //Will fetch fully contextualized composed objects, and populate + // scope with them. + function refreshComposition(ids) { + return getComposition($scope.domainObject) + .then(composeView) + .then(function(ids){self.layoutPanels(ids);}); + } + // End drag; we don't want to put $scope into this // because it triggers "cpws" (copy window or scope) // errors in Angular. @@ -156,8 +139,8 @@ define( // Watch for changes to the grid size in the model $scope.$watch("model.layoutGrid", updateGridSize); - // Position panes when the model field changes - $scope.$watch("model.composition", lookupPanels); + // Update composed objects on screen, and position panes + $scope.$watchCollection("model.composition", refreshComposition); // Position panes where they are dropped $scope.$on("mctDrop", handleDrop); @@ -263,6 +246,43 @@ define( } }; + // Utility function to copy raw positions from configuration, + // without writing directly to configuration (to avoid triggering + // persistence from watchers during drags). + function shallowCopy(obj, keys) { + var copy = {}; + keys.forEach(function (k) { + copy[k] = obj[k]; + }); + return copy; + } + + /** + * Compute panel positions based on the layout's object model. + * Defined as member function to facilitate testing. + * @private + */ + LayoutController.prototype.layoutPanels = function (ids) { + var configuration = this.$scope.configuration || {}, + self = this; + + // Pull panel positions from configuration + this.rawPositions = + shallowCopy(configuration.panels || {}, ids); + + // Clear prior computed positions + this.positions = {}; + + // Update width/height that we are tracking + this.gridSize = + (this.$scope.model || {}).layoutGrid || DEFAULT_GRID_SIZE; + + // Compute positions and add defaults where needed + ids.forEach(function (id, index) { + self.populatePosition(id, index); + }); + }; + /** * End the active drag gesture. This will update the * view configuration. diff --git a/platform/features/layout/test/LayoutControllerSpec.js b/platform/features/layout/test/LayoutControllerSpec.js index 085f7766a2..dcafefc718 100644 --- a/platform/features/layout/test/LayoutControllerSpec.js +++ b/platform/features/layout/test/LayoutControllerSpec.js @@ -19,7 +19,7 @@ * 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,jasmine*/ +/*global define,describe,it,expect,beforeEach,jasmine,spyOn*/ define( ["../src/LayoutController"], @@ -31,21 +31,42 @@ define( mockEvent, testModel, testConfiguration, - controller; + controller, + mockCompositionCapability, + mockComposition; + + function mockPromise(value){ + return { + then: function (thenFunc) { + return mockPromise(thenFunc(value)); + } + }; + } + + function mockDomainObject(id){ + return { + getId: function() { + return id; + }, + useCapability: function() { + return mockCompositionCapability; + } + }; + } beforeEach(function () { mockScope = jasmine.createSpyObj( "$scope", - [ "$watch", "$on", "commit" ] + [ "$watch", "$watchCollection", "$on", "commit" ] ); mockEvent = jasmine.createSpyObj( 'event', [ 'preventDefault' ] ); - testModel = { - composition: [ "a", "b", "c" ] - }; + testModel = {}; + + mockComposition = ["a", "b", "c"]; testConfiguration = { panels: { @@ -56,23 +77,38 @@ define( } }; + mockCompositionCapability = mockPromise(mockComposition.map(mockDomainObject)); + + mockScope.domainObject = mockDomainObject("mockDomainObject"); mockScope.model = testModel; mockScope.configuration = testConfiguration; + spyOn(mockScope.domainObject, "useCapability").andCallThrough(); controller = new LayoutController(mockScope); + spyOn(controller, "layoutPanels").andCallThrough(); }); // Model changes will indicate that panel positions // may have changed, for instance. it("watches for changes to composition", function () { - expect(mockScope.$watch).toHaveBeenCalledWith( + expect(mockScope.$watchCollection).toHaveBeenCalledWith( "model.composition", jasmine.any(Function) ); }); + it("Retrieves updated composition from composition capability", function () { + mockScope.$watchCollection.mostRecentCall.args[1](); + expect(mockScope.domainObject.useCapability).toHaveBeenCalledWith( + "composition" + ); + expect(controller.layoutPanels).toHaveBeenCalledWith( + mockComposition + ); + }); + it("provides styles for frames, from configuration", function () { - mockScope.$watch.mostRecentCall.args[1](testModel.composition); + mockScope.$watchCollection.mostRecentCall.args[1](); expect(controller.getFrameStyle("a")).toEqual({ top: "320px", left: "640px", @@ -85,7 +121,7 @@ define( var styleB, styleC; // b and c do not have configured positions - mockScope.$watch.mostRecentCall.args[1](testModel.composition); + mockScope.$watchCollection.mostRecentCall.args[1](); styleB = controller.getFrameStyle("b"); styleC = controller.getFrameStyle("c"); @@ -102,7 +138,7 @@ define( it("allows panels to be dragged", function () { // Populate scope - mockScope.$watch.mostRecentCall.args[1](testModel.composition); + mockScope.$watchCollection.mostRecentCall.args[1](); // Verify precondtion expect(testConfiguration.panels.b).not.toBeDefined(); @@ -121,7 +157,7 @@ define( it("invokes commit after drag", function () { // Populate scope - mockScope.$watch.mostRecentCall.args[1](testModel.composition); + mockScope.$watchCollection.mostRecentCall.args[1](); // Do a drag controller.startDrag("b", [1, 1], [0, 0]); @@ -147,7 +183,6 @@ define( expect(testConfiguration.panels.d).not.toBeDefined(); // Notify that a drop occurred - testModel.composition.push('d'); mockScope.$on.mostRecentCall.args[1]( mockEvent, 'd', @@ -167,7 +202,6 @@ define( mockEvent.defaultPrevented = true; // Notify that a drop occurred - testModel.composition.push('d'); mockScope.$on.mostRecentCall.args[1]( mockEvent, 'd', @@ -184,7 +218,7 @@ define( // White-boxy; we know which watch is which mockScope.$watch.calls[0].args[1](testModel.layoutGrid); - mockScope.$watch.calls[1].args[1](testModel.composition); + mockScope.$watchCollection.calls[0].args[1](testModel.composition); styleB = controller.getFrameStyle("b"); @@ -201,7 +235,6 @@ define( mockScope.$watch.calls[0].args[1](testModel.layoutGrid); // Notify that a drop occurred - testModel.composition.push('d'); mockScope.$on.mostRecentCall.args[1]( mockEvent, 'd', From db7224486c8ff6874784de2603964aa1ac80a7d7 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 25 Nov 2015 18:53:37 -0800 Subject: [PATCH 23/88] [Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32 --- .../features/layout/src/LayoutController.js | 36 ++++++++++--------- .../layout/test/LayoutControllerSpec.js | 30 ++++++++++++++-- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/platform/features/layout/src/LayoutController.js b/platform/features/layout/src/LayoutController.js index b30de80ba3..017793d2e6 100644 --- a/platform/features/layout/src/LayoutController.js +++ b/platform/features/layout/src/LayoutController.js @@ -45,7 +45,8 @@ define( * @param {Scope} $scope the controller's Angular scope */ function LayoutController($scope) { - var self = this; + var self = this, + callbackCount = 0; // Update grid size when it changed function updateGridSize(layoutGrid) { @@ -91,23 +92,26 @@ define( e.preventDefault(); } - function getComposition(domainObject){ - return domainObject.useCapability('composition'); - } - - function composeView (composition){ - $scope.composition = composition; - return composition.map(function (object) { - return object.getId(); - }) || []; - } - //Will fetch fully contextualized composed objects, and populate // scope with them. - function refreshComposition(ids) { - return getComposition($scope.domainObject) - .then(composeView) - .then(function(ids){self.layoutPanels(ids);}); + function refreshComposition() { + //Keep a track of how many composition callbacks have been made + var thisCount = ++callbackCount; + + $scope.domainObject.useCapability('composition').then(function(composition){ + var ids; + + //Is this callback for the most recent composition + // request? If not, discard it. Prevents race condition + if (thisCount === callbackCount){ + ids = composition.map(function (object) { + return object.getId(); + }) || []; + + $scope.composition = composition; + self.layoutPanels(ids); + } + }); } // End drag; we don't want to put $scope into this diff --git a/platform/features/layout/test/LayoutControllerSpec.js b/platform/features/layout/test/LayoutControllerSpec.js index dcafefc718..bbed271d2c 100644 --- a/platform/features/layout/test/LayoutControllerSpec.js +++ b/platform/features/layout/test/LayoutControllerSpec.js @@ -33,7 +33,8 @@ define( testConfiguration, controller, mockCompositionCapability, - mockComposition; + mockComposition, + mockCompositionObjects; function mockPromise(value){ return { @@ -67,6 +68,7 @@ define( testModel = {}; mockComposition = ["a", "b", "c"]; + mockCompositionObjects = mockComposition.map(mockDomainObject); testConfiguration = { panels: { @@ -77,7 +79,7 @@ define( } }; - mockCompositionCapability = mockPromise(mockComposition.map(mockDomainObject)); + mockCompositionCapability = mockPromise(mockCompositionObjects); mockScope.domainObject = mockDomainObject("mockDomainObject"); mockScope.model = testModel; @@ -107,6 +109,30 @@ define( ); }); + it("Is robust to concurrent changes to composition", function () { + var secondMockComposition = ["a", "b", "c", "d"], + secondMockCompositionObjects = secondMockComposition.map(mockDomainObject), + firstCompositionCB, + secondCompositionCB; + + spyOn(mockCompositionCapability, "then"); + mockScope.$watchCollection.mostRecentCall.args[1](); + mockScope.$watchCollection.mostRecentCall.args[1](); + + firstCompositionCB = mockCompositionCapability.then.calls[0].args[0]; + secondCompositionCB = mockCompositionCapability.then.calls[1].args[0]; + + //Resolve promises in reverse order + secondCompositionCB(secondMockCompositionObjects); + firstCompositionCB(mockCompositionObjects); + + //Expect the promise call that was initiated most recently to + // be the one used to populate scope, irrespective of order that + // it was eventually resolved + expect(mockScope.composition).toBe(secondMockCompositionObjects); + }); + + it("provides styles for frames, from configuration", function () { mockScope.$watchCollection.mostRecentCall.args[1](); expect(controller.getFrameStyle("a")).toEqual({ From 730878938e68e6f16ac30364567914ab8f9a0ec5 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 10:39:25 -0800 Subject: [PATCH 24/88] [Documentation] Document pre-merge testing --- CONTRIBUTING.md | 1 + docs/src/process/testing/plan.md | 45 ++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fcd1504ef0..7e8e15eae3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -292,6 +292,7 @@ checklist.) 2. Unit tests included and/or updated with changes? 3. Command line build passes? 4. Expect to pass code review? +5. Changes have been smoke-tested? ### Reviewer Checklist diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index 8bedd01172..5433a5829a 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -2,18 +2,41 @@ ## Test Levels -Testing occurs regularly during development, with varying levels of -completeness. +Testing for Open MCT Web includes: -In order of decreasing frequency and increasing completeness, these -are: +* _Smoke testing_: Brief, informal testing to verify that no major issues + or regressions are present in the software, or in specific features of + the software. +* _Unit testing_: Automated verification of the performance of individual + software components. +* _User testing_: Testing with a representative user base to verify + that application behaves usably and as specified. +* _Long-duration testing_: Testing which takes place over a long period + of time to detect issues which are not readily noticeable during + shorter test periods. -1. __Pre-merge testing__: Performed before changes are integrated - into the software. -2. __Partial acceptance testing__: A subset of acceptance testing - performed at regular intervals. -3. __Acceptance testing__: Performed before a new release is considered - stable. +### Smoke Testing -Each level of testing is inclusive of the levels which proceed it. +### Unit Testing +### User Testing + +## Test Performance + +Tests are performed at various levels of frequency. + +### Per-merge Testing + +Before changes are merged, the author of the changes must perform: + +* _Smoke testing_ (both generally, and for areas which interact with + the new changes.) +* _Unit testing_ (as part of the automated build step.) + +Changes are not merged until the author has affirmed that both +forms of testing have been performed successfully; this is documented +by the [Author Checklist](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#author-checklist). + +### Per-sprint Testing + +### Per-release Testing From 3ac1710d83b0540c7c492267acd6b1ee9990da5a Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 10:58:13 -0800 Subject: [PATCH 25/88] [Documentation] Document evaluation criteria ...for per-release and per-sprint testing. WTD-1573 --- docs/src/process/testing/plan.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index 5433a5829a..d46e152eaf 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -25,6 +25,11 @@ Testing for Open MCT Web includes: Tests are performed at various levels of frequency. +* _Per-merge_: Performed before any new changes are integrated into + the software. +* _Per-sprint_: Performed at the end of every [sprint](../cycle.md). +* _Per-release: Performed at the end of every [release](../cycle.md). + ### Per-merge Testing Before changes are merged, the author of the changes must perform: @@ -39,4 +44,27 @@ by the [Author Checklist](https://github.com/nasa/openmctweb/blob/master/CONTRIB ### Per-sprint Testing +Before a sprint is closed, the development team must additionally +perform: + +* _User testing_ (both generally, and for areas which interact with + changes made during the sprint.) +* _Long-duration testing_ (specifically, for 24 hours.) + +Issues are reported as a product of both forms of testing. + +A sprint is not closed until both categories have been performed on +the latest snapshot of the software, _and_ no issues labelled as +["blocker"](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting) +remain open. + ### Per-release Testing + +As [per-sprint testing](#per-sprint-testing), except that _user testing_ +should be comprehensive, with less focus on changes from the specific +sprint or release. + +A release is not closed until both categories have been performed on +the latest snapshot of the software, _and_ no issues labelled as +["blocker" or "critical"](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting) +remain open. From ab075e9ad8ffce531e0ed7f4549c842dafb4b3c6 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 11:08:47 -0800 Subject: [PATCH 26/88] [Documentation] Complete test plan --- docs/src/process/testing/plan.md | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index d46e152eaf..a1c586d5c5 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -17,10 +17,50 @@ Testing for Open MCT Web includes: ### Smoke Testing +Manual, non-rigorous testing of the software and/or specific features +of interest. Verifies that the software runs and that basic functionality +is present. + ### Unit Testing +Unit tests are automated tests which exercise individual software +components. Tests are subject to code review along with the actual +implementation, to ensure that tests are applicable and useful. + +Examples of useful tests: + +* Tests which replicate bugs (or their root causes) to verify their resolution. +* Tests which reflect details from software specifications. +* Tests which exercise edge or corner cases among inputs. +* Tests which verify expected interactions with other components in the system. + +During automated testing, code coverage metrics will be reported. +Line coverage must remain at or above 80%. + ### User Testing +User testing is performed at scheduled times involving target users +of the software or reasonable representatives, along with members of +the development team exercising known use cases. Users test the +software directly; the software should be configured as similarly to +its planned production configuration as is feasible without introducing +other risks (e.g. damage to data in a production instance.) + +User testing will focus on the following activities: + +* Verifying issues resolved since the last test session. +* Checking for regressions in areas related to recent changes. +* Using major or important features of the software, + as determined by the user. +* General "trying to break things." + +Desired outcomes of user testing are: + +* Identified software defects. +* Areas for usability improvement. +* Feature requests (particularly missed requirements.) +* Recorded issue verification. + ## Test Performance Tests are performed at various levels of frequency. From 55fc60ec8236ec73efd5bec7aa4e53898aa21e63 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 11:15:13 -0800 Subject: [PATCH 27/88] [Documentation] Describe long-duration testing --- docs/src/process/testing/plan.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index a1c586d5c5..a8ba9d5b45 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -54,6 +54,10 @@ User testing will focus on the following activities: as determined by the user. * General "trying to break things." +During user testing, users will +[report issues](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting) +as they are encountered. + Desired outcomes of user testing are: * Identified software defects. @@ -61,6 +65,21 @@ Desired outcomes of user testing are: * Feature requests (particularly missed requirements.) * Recorded issue verification. +### Long-duration Testing + +Long-duration testing occurs over a twenty-four hour period. The +software is run in one or more stressing cases representative of expected +usage. After twenty-four hours, the software is evaluated for: + +* Performance metrics: Have memory usage or CPU utilization increased + during this time period in unexpected or undesirable ways? +* Subjective usability: Does the software behave in the same way it did + at the start of the test? Is it as responsive? + +Any defects or unexpected behavior identified during testing should be +[reported as issues](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting) +and reviewed for severity. + ## Test Performance Tests are performed at various levels of frequency. From bd4590ad9da381e5615094fa0ebfbfc44b4e8cbf Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 11:22:11 -0800 Subject: [PATCH 28/88] [Documentation] Update terminology Update terminology in Development Cycle to reflect descriptions in Test Plan. --- docs/src/process/cycle.md | 25 +++++++++++++++---------- docs/src/process/testing/plan.md | 3 +++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/docs/src/process/cycle.md b/docs/src/process/cycle.md index 4a39513a91..e872044078 100644 --- a/docs/src/process/cycle.md +++ b/docs/src/process/cycle.md @@ -77,7 +77,7 @@ for the subsequent sprint. |:-----:|:-------------------------:|:------:|:---:|:----------------------------:|:-----------:| | __1__ | Sprint plan | Tag-up | | | | | __2__ | | Tag-up | | | Code freeze | -| __3__ | Sprint acceptance testing | Triage | | _Sprint acceptance testing*_ | Ship | +| __3__ | Per-sprint testing | Triage | | _Per-sprint testing*_ | Ship | * If necessary. @@ -90,8 +90,8 @@ emphasis on testing. | Week | Mon | Tue | Wed | Thu | Fri | |-------:|:-------------------------:|:------:|:---:|:----------------------------:|:-----------:| | __1__ | Sprint plan | Tag-up | | | Code freeze | -| __2__ | Acceptance testing | Triage | | | | -| __3__ | _Acceptance testing*_ | Triage | | _Acceptance testing*_ | Ship | +| __2__ | Per-release testing | Triage | | | | +| __3__ | _Per-release testing*_ | Triage | | _Per-release testing*_ | Ship | * If necessary. @@ -113,7 +113,8 @@ emphasis on testing. (and until the end of the sprint) the only changes that should be merged into the master branch should directly address issues needed to pass acceptance testing. -* __Acceptance Testing.__ Structured testing with predefined +* [__Per-release Testing.__](testing/plan.md#per-release-testing) + Structured testing with predefined success criteria. No release should ship without passing acceptance tests. Time is allocated in each sprint for subsequent rounds of acceptance testing if issues are identified during a @@ -122,23 +123,27 @@ emphasis on testing. and should be flexible enough to allow changes to plans (e.g. deferring delivery of some feature in order to ensure stability of other features.) Baseline testing includes: - * __Testathon.__ Multi-user testing, involving as many users as + * [__Testathon.__](testing/plan.md#user-testing) + Multi-user testing, involving as many users as is feasible, plus development team. Open-ended; should verify completed work from this sprint, test exploratorily for regressions, et cetera. - * __24-Hour Test.__ A test to verify that the software remains + * [__Long-Duration Test.__](testing/plan.md#long-duration-testing) A + test to verify that the software remains stable after running for longer durations. May include some combination of automated testing and user verification (e.g. checking to verify that software remains subjectively responsive at conclusion of test.) - * __Automated Testing.__ Automated testing integrated into the + * [__Unit Testing.__](testing/plan.md#unit-testing) + Automated testing integrated into the build. (These tests are verified to pass more often than once per sprint, as they run before any merge to master, but still - play an important role in acceptance testing.) -* __Sprint Acceptance Testing.__ Subset of Acceptance Testing + play an important role in per-release testing.) +* [__Per-sprint Testing.__](testing/plan.md#per-sprint-testing) + Subset of Pre-release Testing which should be performed before shipping at the end of any sprint. Time is allocated for a second round of - Sprint Acceptance Testing if the first round is not passed. + Pre-release Testing if the first round is not passed. * __Triage.__ Team reviews issues from acceptance testing and uses success criteria to determine whether or not they should block release, then formulates a plan to address these issues before diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index a8ba9d5b45..e9ddf829e1 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -123,6 +123,9 @@ As [per-sprint testing](#per-sprint-testing), except that _user testing_ should be comprehensive, with less focus on changes from the specific sprint or release. +Per-release testing should also include any acceptance testing steps +agreed upon with recipients of the software. + A release is not closed until both categories have been performed on the latest snapshot of the software, _and_ no issues labelled as ["blocker" or "critical"](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting) From 1731b985fcf76409f90d98854ccff40e7ebb25db Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 11:30:55 -0800 Subject: [PATCH 29/88] [Documentation] Fix broken markdown tag --- docs/src/process/testing/plan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index e9ddf829e1..6b13bdb8e1 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -87,7 +87,7 @@ Tests are performed at various levels of frequency. * _Per-merge_: Performed before any new changes are integrated into the software. * _Per-sprint_: Performed at the end of every [sprint](../cycle.md). -* _Per-release: Performed at the end of every [release](../cycle.md). +* _Per-release_: Performed at the end of every [release](../cycle.md). ### Per-merge Testing From 92f5d5f19056d9e5d1d17e1fe88ce39f92a61f23 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 12:00:25 -0800 Subject: [PATCH 30/88] [Documentation] Replace redundant docs with link --- docs/src/process/testing/plan.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index 6b13bdb8e1..181ba143f4 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -27,15 +27,9 @@ Unit tests are automated tests which exercise individual software components. Tests are subject to code review along with the actual implementation, to ensure that tests are applicable and useful. -Examples of useful tests: - -* Tests which replicate bugs (or their root causes) to verify their resolution. -* Tests which reflect details from software specifications. -* Tests which exercise edge or corner cases among inputs. -* Tests which verify expected interactions with other components in the system. - -During automated testing, code coverage metrics will be reported. -Line coverage must remain at or above 80%. +Unit tests should meet +[test standards](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#test-standards) +as described in the contributing guide. ### User Testing From 7d4e7a0925bec9143350fdb66b77f010e352ee9c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 12:29:53 -0800 Subject: [PATCH 31/88] [Time Conductor] Allow ng-blur on mct-controls --- platform/forms/src/MCTControl.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/forms/src/MCTControl.js b/platform/forms/src/MCTControl.js index b46ba6e7a1..78ac8c194d 100644 --- a/platform/forms/src/MCTControl.js +++ b/platform/forms/src/MCTControl.js @@ -79,6 +79,9 @@ define( // Used to choose which form control to use key: "=", + // Allow controls to trigger blur-like events + ngBlur: "&", + // The state of the form value itself ngModel: "=", From 271b5d1a73e981ced7a8bb0a930e2e0b1e011b23 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 12:36:40 -0800 Subject: [PATCH 32/88] [Time Conductor] Test choices via picker ...to ensure that they trigger blur events. Also, test changes via text entry to ensure that they don't (the template is responsible for this.) --- .../controllers/DateTimeFieldController.js | 4 +- .../DateTimeFieldControllerSpec.js | 54 +++++++++++++++---- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/platform/commonUI/general/src/controllers/DateTimeFieldController.js b/platform/commonUI/general/src/controllers/DateTimeFieldController.js index d401a8b3fc..313471f21f 100644 --- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js +++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js @@ -71,8 +71,8 @@ define( if (value !== $scope.ngModel[$scope.field]) { $scope.ngModel[$scope.field] = value; updateFromModel(value); - if ($scope.structure && $scope.structure.submit) { - $scope.structure.submit(); + if ($scope.ngBlur) { + $scope.ngBlur(); } } } diff --git a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js index 714c7d072e..b737de309a 100644 --- a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js +++ b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js @@ -67,21 +67,13 @@ define( mockScope.ngModel = { testField: 12321 }; mockScope.field = "testField"; mockScope.structure = { format: "someFormat" }; + mockScope.ngBlur = jasmine.createSpy('blur'); controller = new DateTimeFieldController( mockScope, mockFormatService ); - }); - - it("updates models from user-entered text", function () { - var newText = "1977-05-25 17:30:00"; - - mockScope.textValue = newText; - fireWatch("textValue", newText); - expect(mockScope.ngModel.testField) - .toEqual(mockFormat.parse(newText)); - expect(mockScope.textInvalid).toBeFalsy(); + fireWatch("ngModel[field]", mockScope.ngModel.testField); }); it("updates text from model values", function () { @@ -91,6 +83,44 @@ define( expect(mockScope.textValue).toEqual("1977-05-25 17:30:00"); }); + describe("when valid text is entered", function () { + var newText; + + beforeEach(function () { + newText = "1977-05-25 17:30:00"; + mockScope.textValue = newText; + fireWatch("textValue", newText); + }); + + it("updates models from user-entered text", function () { + expect(mockScope.ngModel.testField) + .toEqual(mockFormat.parse(newText)); + expect(mockScope.textInvalid).toBeFalsy(); + }); + + it("does not indicate a blur event", function () { + expect(mockScope.ngBlur).not.toHaveBeenCalled(); + }); + }); + + describe("when a date is chosen via the date picker", function () { + var newValue; + + beforeEach(function () { + newValue = 12345654321; + mockScope.pickerModel.value = newValue; + fireWatch("pickerModel.value", newValue); + }); + + it("updates models", function () { + expect(mockScope.ngModel.testField).toEqual(newValue); + }); + + it("fires a blur event", function () { + expect(mockScope.ngBlur).toHaveBeenCalled(); + }); + }); + it("exposes toggle state for date-time picker", function () { expect(mockScope.picker.active).toBe(false); }); @@ -148,6 +178,10 @@ define( }).toThrow(); }); + describe("when values are changed via the date picker", function () { + + }); + describe("using the obtained format", function () { var testValue = 1234321, testText = "some text"; From 8babfc5ca9ecab451e8603ec6de3e3d3d9db5877 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 12:37:23 -0800 Subject: [PATCH 33/88] [Time Conductor] Propogate blur from text field --- .../commonUI/general/res/templates/controls/datetime-field.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html index fba5898a51..1459a83f09 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-field.html +++ b/platform/commonUI/general/res/templates/controls/datetime-field.html @@ -2,7 +2,7 @@ ng-controller="DateTimeFieldController"> Date: Fri, 27 Nov 2015 12:37:51 -0800 Subject: [PATCH 34/88] [Time Conductor] Add missing license header --- .../templates/controls/datetime-field.html | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html index 1459a83f09..55f3cd1745 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-field.html +++ b/platform/commonUI/general/res/templates/controls/datetime-field.html @@ -1,3 +1,24 @@ + Date: Fri, 27 Nov 2015 14:02:16 -0800 Subject: [PATCH 35/88] [Time Conductor] Document ng-blur on mct-control --- docs/src/guide/index.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md index b7c999bc20..8451210d35 100644 --- a/docs/src/guide/index.md +++ b/docs/src/guide/index.md @@ -941,6 +941,12 @@ look at field (see below) to determine which field in the model should be modified. * `ngRequired`: True if input is required. * `ngPattern`: The pattern to match against (for text entry) +* `ngBlur`: A function that may be invoked to evaluate the expression + associated with the `ng-blur` attribute associated with the control. + * This should be called when the control has lost focus; for controls + which simply wrap or augment `input` elements, this should be fired + on `blur` events associated with those elements, while more complex + custom controls may fire this at the end of more specific interactions. * `options`: The options for this control, as passed from the `options` property of an individual row definition. * `field`: Name of the field in `ngModel` which will hold the value for this From 248bc68f0d30d541f9ea590e54c6cdf847420cc3 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 14:23:25 -0800 Subject: [PATCH 36/88] [Time Conductor] Test restoration of old values ...and clarify name of the function in scope which does this. --- .../general/res/templates/controls/datetime-field.html | 2 +- .../general/src/controllers/DateTimeFieldController.js | 4 ++-- .../test/controllers/DateTimeFieldControllerSpec.js | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html index 55f3cd1745..e9b394c530 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-field.html +++ b/platform/commonUI/general/res/templates/controls/datetime-field.html @@ -23,7 +23,7 @@ ng-controller="DateTimeFieldController"> Date: Fri, 27 Nov 2015 14:33:35 -0800 Subject: [PATCH 37/88] [Time Conductor] Test form isolation Verify that form inputs are ignored until some explicit trigger --- .../controllers/TimeRangeControllerSpec.js | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js b/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js index 85e77e4889..861f28ed45 100644 --- a/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js +++ b/platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js @@ -91,6 +91,39 @@ define( .toHaveBeenCalledWith("ngModel", jasmine.any(Function)); }); + describe("when changes are made via form entry", function () { + beforeEach(function () { + mockScope.ngModel = { + outer: { start: DAY * 2, end: DAY * 3 }, + inner: { start: DAY * 2.25, end: DAY * 2.75 } + }; + mockScope.formModel = { + start: DAY * 10000, + end: DAY * 11000 + }; + // These watches may not exist, but Angular would fire + // them if they did. + fireWatchCollection("formModel", mockScope.formModel); + fireWatch("formModel.start", mockScope.formModel.start); + fireWatch("formModel.end", mockScope.formModel.end); + }); + + it("does not immediately make changes to the model", function () { + expect(mockScope.ngModel.outer.start) + .not.toEqual(mockScope.formModel.start); + expect(mockScope.ngModel.outer.end) + .not.toEqual(mockScope.formModel.end); + }); + + it("updates model bounds on request", function () { + mockScope.updateBoundsFromForm(); + expect(mockScope.ngModel.outer.start) + .toEqual(mockScope.formModel.start); + expect(mockScope.ngModel.outer.end) + .toEqual(mockScope.formModel.end); + }); + }); + describe("when dragged", function () { beforeEach(function () { mockScope.ngModel = { From 3afcb5293442af5f5286b1988b79c51c34834907 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 14:35:51 -0800 Subject: [PATCH 38/88] [Time Conductor] Use ng-blur from template --- .../general/res/templates/controls/time-controller.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index f0b95983b6..09631a1f83 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -25,8 +25,9 @@ C @@ -38,6 +39,7 @@   From b5e52fce7558ffa7228179d061e772ae82966ce1 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 27 Nov 2015 14:48:48 -0800 Subject: [PATCH 39/88] [Time Conductor] Remove redundant test block --- .../general/test/controllers/DateTimeFieldControllerSpec.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js index b677e3f2d1..7d71095772 100644 --- a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js +++ b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js @@ -184,10 +184,6 @@ define( }).toThrow(); }); - describe("when values are changed via the date picker", function () { - - }); - describe("using the obtained format", function () { var testValue = 1234321, testText = "some text"; From c8d77bc2dbe168a7e7b0a505950d1088ea38d0c8 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 30 Nov 2015 15:26:00 -0800 Subject: [PATCH 40/88] [Entanglement] Allow cross-space linking Allow links across spaces; only disallow move or copy. Addresses WTD-1587 --- platform/entanglement/src/policies/CrossSpacePolicy.js | 4 +--- platform/entanglement/test/policies/CrossSpacePolicySpec.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/entanglement/src/policies/CrossSpacePolicy.js b/platform/entanglement/src/policies/CrossSpacePolicy.js index a113972815..c47e653f08 100644 --- a/platform/entanglement/src/policies/CrossSpacePolicy.js +++ b/platform/entanglement/src/policies/CrossSpacePolicy.js @@ -28,9 +28,7 @@ define( var DISALLOWED_ACTIONS = [ "move", - "copy", - "link", - "compose" + "copy" ]; /** diff --git a/platform/entanglement/test/policies/CrossSpacePolicySpec.js b/platform/entanglement/test/policies/CrossSpacePolicySpec.js index 214efc1cc3..a0b030f04f 100644 --- a/platform/entanglement/test/policies/CrossSpacePolicySpec.js +++ b/platform/entanglement/test/policies/CrossSpacePolicySpec.js @@ -72,7 +72,7 @@ define( policy = new CrossSpacePolicy(); }); - ['move', 'copy', 'link', 'compose'].forEach(function (key) { + ['move', 'copy'].forEach(function (key) { describe("for " + key + " actions", function () { beforeEach(function () { testActionMetadata.key = key; From da8fb99e82671b6f0d5bd367b5c112a3e3db84e5 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 30 Nov 2015 15:57:45 -0800 Subject: [PATCH 41/88] [Frontend] Fixing bad breakpoints for tablet vs. desktop open #169 --- .../general/res/sass/mobile/_constants.scss | 28 ++-- .../espresso/res/css/theme-espresso.css | 123 +++++++++--------- .../themes/snow/res/css/theme-snow.css | 120 ++++++++--------- 3 files changed, 136 insertions(+), 135 deletions(-) diff --git a/platform/commonUI/general/res/sass/mobile/_constants.scss b/platform/commonUI/general/res/sass/mobile/_constants.scss index c23493ca2c..b6dddbf593 100644 --- a/platform/commonUI/general/res/sass/mobile/_constants.scss +++ b/platform/commonUI/general/res/sass/mobile/_constants.scss @@ -36,29 +36,29 @@ $mobileTreeRightArrowW: 30px; /************************** DEVICE WIDTHS */ // IMPORTANT! Usage assumes that ranges are mutually exclusive and have no gaps -$phoMaxW: 514px; -$tabMinW: 515px; -$tabMaxW: 1280px; -$desktopMinW: 1281px; +$phoMaxW: 767px; +$tabMinW: 768px; +$tabMaxW: 1024px; +$desktopMinW: 1280px; /************************** MEDIA QUERIES: WINDOW CHECKS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */ -$screenPortrait: "screen and (orientation: portrait)"; -$screenLandscape: "screen and (orientation: landscape)"; +$screenPortrait: "(orientation: portrait)"; +$screenLandscape: "(orientation: landscape)"; -$mobileDevice: "(max-device-width: #{$tabMaxW})"; +//$mobileDevice: "(max-device-width: #{$tabMaxW})"; $phoneCheck: "(max-device-width: #{$phoMaxW})"; -$tabletCheck: $mobileDevice; -$desktopCheck: "(min-device-width: #{$desktopMinW})"; +$tabletCheck: "(min-device-width: #{$tabMinW}) and (max-device-width: #{$tabMaxW})"; +$desktopCheck: "(min-device-width: #{$desktopMinW}) and (-webkit-min-device-pixel-ratio: 1)"; /************************** MEDIA QUERIES: WINDOWS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */ -$phonePortrait: "#{$screenPortrait} and #{$phoneCheck} and #{$mobileDevice}"; -$phoneLandscape: "#{$screenLandscape} and #{$phoneCheck} and #{$mobileDevice}"; +$phonePortrait: "only screen and #{$screenPortrait} and #{$phoneCheck}"; +$phoneLandscape: "only screen and #{$screenLandscape} and #{$phoneCheck}"; -$tabletPortrait: "#{$screenPortrait} and #{$tabletCheck} and #{$mobileDevice}"; -$tabletLandscape: "#{$screenLandscape} and #{$tabletCheck} and #{$mobileDevice}"; +$tabletPortrait: "only screen and #{$screenPortrait} and #{$tabletCheck}"; +$tabletLandscape: "only screen and #{$screenLandscape} and #{$tabletCheck}"; -$desktop: "screen and #{$desktopCheck}"; +$desktop: "only screen and #{$desktopCheck}"; /************************** DEVICE PARAMETERS FOR MENUS/REPRESENTATIONS */ $proporMenuOnly: 90%; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 967a325f5b..13e8554832 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; } @@ -308,7 +308,7 @@ a.disabled { *****************************************************************************/ /************************** FONTS */ @font-face { - /* + /* * Use https://icomoon.io/app with /platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json */ font-family: 'symbolsfont'; @@ -990,7 +990,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { right: 100%; } - @media screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (min-device-width: 1281px) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { width: 0; @@ -998,14 +998,14 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { border-top: 6.66667px solid transparent; border-bottom: 6.66667px solid transparent; border-right: 10px solid #ddd; } } - @media screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (min-device-width: 1281px) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* 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 (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (min-device-width: 1281px) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 95, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right .l-infobubble::before { width: 0; @@ -1647,7 +1647,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } @@ -1686,7 +1686,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #0099cc; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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); } @@ -1728,7 +1728,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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); } @@ -1759,8 +1759,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -@media screen and (min-device-width: 1281px) { - /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1829,15 +1829,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { color: #0099cc; } } - @media screen and (min-device-width: 1281px) and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } /* line 304, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: #33ccff; } } -@media screen and (min-device-width: 1281px) { - /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } /* line 139, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1925,8 +1925,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } -@media screen and (min-device-width: 1281px) { - /* line 211, ../../../../general/res/sass/controls/_buttons.scss */ +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #595959; cursor: pointer; @@ -2314,8 +2314,8 @@ label.checkbox.custom { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } - @media screen and (min-device-width: 1281px) { - /* line 239, ../../../../general/res/sass/controls/_controls.scss */ + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 240, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2657,7 +2657,8 @@ label.checkbox.custom { color: inherit; } /******************************************************** BROWSER ELEMENTS */ -@media screen and (min-device-width: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 485, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -3358,7 +3359,7 @@ label.checkbox.custom { /* 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: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { @@ -3429,7 +3430,7 @@ label.checkbox.custom { .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: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 304, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } @@ -3681,7 +3682,7 @@ mct-include.l-time-controller { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 25, ../../../../general/res/sass/mobile/controls/_menus.scss */ .super-menu { width: 250px; @@ -3960,7 +3961,7 @@ textarea { /* line 297, ../../../../general/res/sass/_mixins.scss */ .select .icon, .select .t-item-icon { color: #0099cc; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } @@ -4082,15 +4083,15 @@ textarea { /* line 29, ../../../../general/res/sass/forms/_datetime.scss */ .complex.datetime { /* - .field-hints, - .fields { - } - - - .field-hints { - - } - */ } + .field-hints, + .fields { + } + + + .field-hints { + + } + */ } /* line 30, ../../../../general/res/sass/forms/_datetime.scss */ .complex.datetime span { display: inline-block; @@ -4471,7 +4472,7 @@ span.req { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { z-index: 5; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { top: 10px; @@ -4697,7 +4698,7 @@ span.req { .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } -@media screen and (min-device-width: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ .holder-all { min-width: 600px; } @@ -4769,7 +4770,7 @@ span.req { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 26, ../../../../general/res/sass/mobile/_layout.scss */ .browse-wrapper, .pane { @@ -4945,7 +4946,7 @@ span.req { -webkit-transition-delay: 0; transition-delay: 0; opacity: 1; } } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px) { /* line 146, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.left.treeview { width: 90% !important; } @@ -4959,7 +4960,7 @@ span.req { /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } } -@media screen and (min-device-width: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } @@ -5274,7 +5275,7 @@ span.req { margin-left: 50%; white-space: nowrap; } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { /* line 5, ../../../../general/res/sass/mobile/search/_search.scss */ .search .search-bar .menu-icon { display: none; } @@ -5451,7 +5452,7 @@ span.req { /* line 297, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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); } @@ -5484,7 +5485,7 @@ span.req { min-height: 225px; height: 225px; } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay .clk-icon.close { top: 20px; @@ -5502,7 +5503,7 @@ span.req { /* 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { /* line 27, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder { -moz-border-radius: 0; @@ -5573,7 +5574,7 @@ span.req { .t-dialog-sm .overlay > .holder { height: auto; max-height: 100%; } } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px) { /* line 77, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .bottom-bar { text-align: center; } } @@ -5646,7 +5647,7 @@ ul.tree { margin-left: 5px; font-size: 0.75em; width: 10px; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 56, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control:hover, .search-result-item .view-control:hover { @@ -5779,7 +5780,7 @@ ul.tree { .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { color: #cccccc; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 136, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover, .search-result-item:not(.selected):hover { @@ -5831,7 +5832,7 @@ ul.tree { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 27, ../../../../general/res/sass/mobile/_tree.scss */ ul.tree ul.tree { margin-left: 20px; } @@ -5922,7 +5923,7 @@ ul.tree { /* line 65, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { z-index: 10; } -@media screen and (min-device-width: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 71, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { opacity: 0; } @@ -5956,9 +5957,9 @@ ul.tree { *****************************************************************************/ /* line 22, ../../../../general/res/sass/user-environ/_top-bar.scss */ .top-bar { - /* .title { - color: #fff; - }*/ } + /* .title { + color: #fff; + }*/ } /* line 23, ../../../../general/res/sass/user-environ/_top-bar.scss */ .top-bar.browse, .top-bar.edit { border-bottom: 1px solid rgba(153, 153, 153, 0.1); @@ -6822,7 +6823,7 @@ table { /* line 297, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: linear-gradient(#666666, #595959); } @@ -6953,7 +6954,7 @@ table { /* line 297, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon, .items-holder .item.grid-item.selected .t-item-icon { color: #0099cc; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } @@ -6994,7 +6995,7 @@ table { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 29, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item { width: 100%; } @@ -7028,7 +7029,7 @@ table { opacity: 1; font-size: 1em; width: auto; } } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { /* line 29, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item { height: 50px; } @@ -7048,7 +7049,7 @@ table { /* line 83, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item .item-main .item-open { line-height: 50px; } } -@media screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 29, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item { height: 66px; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index ed2fe79adb..3f657f8d73 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; } @@ -308,7 +308,7 @@ a.disabled { *****************************************************************************/ /************************** FONTS */ @font-face { - /* + /* * Use https://icomoon.io/app with /platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json */ font-family: 'symbolsfont'; @@ -990,7 +990,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { right: 100%; } - @media screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (min-device-width: 1281px) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { width: 0; @@ -998,14 +998,14 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { border-top: 6.66667px solid transparent; border-bottom: 6.66667px solid transparent; border-right: 10px solid white; } } - @media screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (min-device-width: 1281px) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* 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 (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (min-device-width: 1281px) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 95, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right .l-infobubble::before { width: 0; @@ -1619,7 +1619,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: deepskyblue; } @@ -1649,7 +1649,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #eee; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: #0099cc; } @@ -1682,7 +1682,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: #ffad33; } @@ -1713,8 +1713,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -@media screen and (min-device-width: 1281px) { - /* line 104, ../../../../general/res/sass/controls/_buttons.scss */ +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1774,15 +1774,15 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { color: #eee; } } - @media screen and (min-device-width: 1281px) and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover { background: #0099cc; } /* line 304, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: white; } } -@media screen and (min-device-width: 1281px) { - /* line 141, ../../../../general/res/sass/controls/_buttons.scss */ +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } /* line 139, ../../../../general/res/sass/controls/_buttons.scss */ @@ -1870,8 +1870,8 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } -@media screen and (min-device-width: 1281px) { - /* line 211, ../../../../general/res/sass/controls/_buttons.scss */ +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #d6d6d6; cursor: pointer; @@ -2259,8 +2259,8 @@ label.checkbox.custom { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } - @media screen and (min-device-width: 1281px) { - /* line 239, ../../../../general/res/sass/controls/_controls.scss */ + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 240, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -2602,8 +2602,8 @@ label.checkbox.custom { color: inherit; } /******************************************************** BROWSER ELEMENTS */ -@media screen and (min-device-width: 1281px) { - /* line 484, ../../../../general/res/sass/controls/_controls.scss */ +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + /* line 485, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -3298,7 +3298,7 @@ label.checkbox.custom { /* 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: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { @@ -3369,7 +3369,7 @@ label.checkbox.custom { .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: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 304, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } @@ -3621,7 +3621,7 @@ mct-include.l-time-controller { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 25, ../../../../general/res/sass/mobile/controls/_menus.scss */ .super-menu { width: 250px; @@ -4005,15 +4005,15 @@ textarea { /* line 29, ../../../../general/res/sass/forms/_datetime.scss */ .complex.datetime { /* - .field-hints, - .fields { - } - - - .field-hints { - - } - */ } + .field-hints, + .fields { + } + + + .field-hints { + + } + */ } /* line 30, ../../../../general/res/sass/forms/_datetime.scss */ .complex.datetime span { display: inline-block; @@ -4394,7 +4394,7 @@ span.req { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { z-index: 5; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { top: 10px; @@ -4620,7 +4620,7 @@ span.req { .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } -@media screen and (min-device-width: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ .holder-all { min-width: 600px; } @@ -4692,7 +4692,7 @@ span.req { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 26, ../../../../general/res/sass/mobile/_layout.scss */ .browse-wrapper, .pane { @@ -4868,7 +4868,7 @@ span.req { -webkit-transition-delay: 0; transition-delay: 0; opacity: 1; } } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px) { /* line 146, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.left.treeview { width: 90% !important; } @@ -4882,7 +4882,7 @@ span.req { /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } } -@media screen and (min-device-width: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } @@ -5197,7 +5197,7 @@ span.req { margin-left: 50%; white-space: nowrap; } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { /* line 5, ../../../../general/res/sass/mobile/search/_search.scss */ .search .search-bar .menu-icon { display: none; } @@ -5356,7 +5356,7 @@ span.req { /* line 297, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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; } @@ -5389,7 +5389,7 @@ span.req { min-height: 225px; height: 225px; } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 3, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay .clk-icon.close { top: 20px; @@ -5407,7 +5407,7 @@ span.req { /* 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { /* line 27, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder { -moz-border-radius: 0; @@ -5478,7 +5478,7 @@ span.req { .t-dialog-sm .overlay > .holder { height: auto; max-height: 100%; } } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px) { /* line 77, ../../../../general/res/sass/mobile/overlay/_overlay.scss */ .overlay > .holder .contents .bottom-bar { text-align: center; } } @@ -5551,7 +5551,7 @@ ul.tree { margin-left: 5px; font-size: 0.75em; width: 10px; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 56, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control:hover, .search-result-item .view-control:hover { @@ -5682,7 +5682,7 @@ ul.tree { .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { color: #fcfcfc; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 136, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover, .search-result-item:not(.selected):hover { @@ -5734,7 +5734,7 @@ ul.tree { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 27, ../../../../general/res/sass/mobile/_tree.scss */ ul.tree ul.tree { margin-left: 20px; } @@ -5825,7 +5825,7 @@ ul.tree { /* line 65, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { z-index: 10; } -@media screen and (min-device-width: 1281px) { +@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 71, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { opacity: 0; } @@ -5859,9 +5859,9 @@ ul.tree { *****************************************************************************/ /* line 22, ../../../../general/res/sass/user-environ/_top-bar.scss */ .top-bar { - /* .title { - color: #fff; - }*/ } + /* .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); @@ -6716,7 +6716,7 @@ table { /* line 297, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } - @media screen and (min-device-width: 1281px) { + @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: #d0d0d0; } @@ -6872,7 +6872,7 @@ table { * 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-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px), only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 29, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item { width: 100%; } @@ -6906,7 +6906,7 @@ table { opacity: 1; font-size: 1em; width: auto; } } -@media screen and (orientation: portrait) and (max-device-width: 514px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 514px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (max-device-width: 767px), only screen and (orientation: landscape) and (max-device-width: 767px) { /* line 29, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item { height: 50px; } @@ -6926,7 +6926,7 @@ table { /* line 83, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item .item-main .item-open { line-height: 50px; } } -@media screen and (orientation: portrait) and (max-device-width: 1280px) and (max-device-width: 1280px), screen and (orientation: landscape) and (max-device-width: 1280px) and (max-device-width: 1280px) { +@media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px) { /* line 29, ../../../../general/res/sass/mobile/_item.scss */ .items-holder .item.grid-item { height: 66px; } From 6fe3f82fb1804c8d0e56d37c00913466005568f3 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 1 Dec 2015 15:59:37 -0800 Subject: [PATCH 42/88] [Entanglement] Add test for Set Primary Location https://github.com/nasa/openmctweb/issues/346 --- .../test/actions/SetPrimaryLocationSpec.js | 77 +++++++++++++++++++ platform/entanglement/test/suite.json | 1 + 2 files changed, 78 insertions(+) create mode 100644 platform/entanglement/test/actions/SetPrimaryLocationSpec.js diff --git a/platform/entanglement/test/actions/SetPrimaryLocationSpec.js b/platform/entanglement/test/actions/SetPrimaryLocationSpec.js new file mode 100644 index 0000000000..3b8bf32150 --- /dev/null +++ b/platform/entanglement/test/actions/SetPrimaryLocationSpec.js @@ -0,0 +1,77 @@ +/***************************************************************************** + * 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,beforeEach,it,jasmine,expect */ + +define( + [ + '../../src/actions/SetPrimaryLocation', + '../DomainObjectFactory' + ], + function (SetPrimaryLocation, domainObjectFactory) { + 'use strict'; + + describe("The 'set primary location' action", function () { + var testContext, + testModel, + testId, + mockLocationCapability, + mockContextCapability; + + beforeEach(function () { + testId = "some-id"; + testModel = { name: "some name" }; + + mockLocationCapability = jasmine.createSpyObj( + 'location', + [ 'setPrimaryLocation', 'getContextualLocation' ] + ); + + mockLocationCapability.getContextualLocation.andReturn(testId); + + testContext = { + domainObject: domainObjectFactory({ + capabilities: { + location: mockLocationCapability + }, + model: testModel + }) + }; + }); + + it("is applicable to objects with no location specified", function () { + expect(SetPrimaryLocation.appliesTo(testContext)) + .toBe(true); + testModel.location = "something"; + expect(SetPrimaryLocation.appliesTo(testContext)) + .toBe(false); + }); + + it("sets the location contextually when performed", function () { + new SetPrimaryLocation(testContext).perform(); + expect(mockLocationCapability.setPrimaryLocation) + .toHaveBeenCalledWith(testId); + }); + + }); + } +); diff --git a/platform/entanglement/test/suite.json b/platform/entanglement/test/suite.json index b954ab8ebc..243da94c39 100644 --- a/platform/entanglement/test/suite.json +++ b/platform/entanglement/test/suite.json @@ -4,6 +4,7 @@ "actions/GoToOriginalAction", "actions/LinkAction", "actions/MoveAction", + "actions/SetPrimaryLocationAction", "policies/CrossSpacePolicy", "services/CopyService", "services/LinkService", From 1292e39c46692b1e602954dd974e0388ebcd8381 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 1 Dec 2015 16:20:30 -0800 Subject: [PATCH 43/88] [Entanglement] Implement Set Primary Location --- .../src/actions/SetPrimaryLocationAction.js | 60 +++++++++++++++++++ ...pec.js => SetPrimaryLocationActionSpec.js} | 7 ++- 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 platform/entanglement/src/actions/SetPrimaryLocationAction.js rename platform/entanglement/test/actions/{SetPrimaryLocationSpec.js => SetPrimaryLocationActionSpec.js} (93%) diff --git a/platform/entanglement/src/actions/SetPrimaryLocationAction.js b/platform/entanglement/src/actions/SetPrimaryLocationAction.js new file mode 100644 index 0000000000..25ebd5ccf8 --- /dev/null +++ b/platform/entanglement/src/actions/SetPrimaryLocationAction.js @@ -0,0 +1,60 @@ +/***************************************************************************** + * 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"; + + /** + * Implements the "Set Primary Location" action, which sets a + * location property for objects to match their contextual + * location. + * + * @implements {Action} + * @constructor + * @private + * @memberof platform/entanglement + * @param {ActionContext} context the context in which the action + * will be performed + */ + function SetPrimaryLocationAction(context) { + this.domainObject = context.domainObject; + } + + SetPrimaryLocationAction.prototype.perform = function () { + var location = this.domainObject.getCapability('location'); + return location.setPrimaryLocation( + location.getContextualLocation() + ); + }; + + SetPrimaryLocationAction.appliesTo = function (context) { + var domainObject = context.domainObject; + return domainObject && domainObject.hasCapability("location") + && (domainObject.getModel().location === undefined); + }; + + return SetPrimaryLocationAction; + } +); + diff --git a/platform/entanglement/test/actions/SetPrimaryLocationSpec.js b/platform/entanglement/test/actions/SetPrimaryLocationActionSpec.js similarity index 93% rename from platform/entanglement/test/actions/SetPrimaryLocationSpec.js rename to platform/entanglement/test/actions/SetPrimaryLocationActionSpec.js index 3b8bf32150..76fb3a344b 100644 --- a/platform/entanglement/test/actions/SetPrimaryLocationSpec.js +++ b/platform/entanglement/test/actions/SetPrimaryLocationActionSpec.js @@ -24,7 +24,7 @@ define( [ - '../../src/actions/SetPrimaryLocation', + '../../src/actions/SetPrimaryLocationAction', '../DomainObjectFactory' ], function (SetPrimaryLocation, domainObjectFactory) { @@ -61,7 +61,10 @@ define( it("is applicable to objects with no location specified", function () { expect(SetPrimaryLocation.appliesTo(testContext)) .toBe(true); - testModel.location = "something"; + testContext.domainObject.getModel.andReturn({ + location: "something", + name: "some name" + }); expect(SetPrimaryLocation.appliesTo(testContext)) .toBe(false); }); From 571f6d183adf1ca2baba084797e3fedc90f92784 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 1 Dec 2015 16:26:19 -0800 Subject: [PATCH 44/88] [Entanglement] Expose Set Primary Location --- platform/entanglement/bundle.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/platform/entanglement/bundle.json b/platform/entanglement/bundle.json index fc17ef9ef2..55ceeaa487 100644 --- a/platform/entanglement/bundle.json +++ b/platform/entanglement/bundle.json @@ -39,6 +39,15 @@ "glyph": "\u00F4", "category": "contextual", "implementation": "actions/GoToOriginalAction.js" + }, + { + "key": "locate", + "name": "Set Primary Location", + "description": "Set a domain object's primary location.", + "glyph": "", + "category": "contextual", + "implementation": "actions/SetPrimaryLocationAction.js" + } ], "components": [ From 03edd26e173f3e8b3afb89fc3bd3862bfd752d2e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 1 Dec 2015 16:45:08 -0800 Subject: [PATCH 45/88] [Edit] Return promise from editable persistence https://github.com/nasa/openmctweb/issues/305 --- .../edit/src/capabilities/EditablePersistenceCapability.js | 2 +- platform/commonUI/edit/src/objects/EditableDomainObjectCache.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/edit/src/capabilities/EditablePersistenceCapability.js b/platform/commonUI/edit/src/capabilities/EditablePersistenceCapability.js index 42b08c72b1..92d29f66ad 100644 --- a/platform/commonUI/edit/src/capabilities/EditablePersistenceCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditablePersistenceCapability.js @@ -50,7 +50,7 @@ define( // Simply trigger refresh of in-view objects; do not // write anything to database. persistence.persist = function () { - cache.markDirty(editableObject); + return cache.markDirty(editableObject); }; // Delegate refresh to the original object; this avoids refreshing diff --git a/platform/commonUI/edit/src/objects/EditableDomainObjectCache.js b/platform/commonUI/edit/src/objects/EditableDomainObjectCache.js index 88a154d79b..01854cfda5 100644 --- a/platform/commonUI/edit/src/objects/EditableDomainObjectCache.js +++ b/platform/commonUI/edit/src/objects/EditableDomainObjectCache.js @@ -111,6 +111,7 @@ define( */ EditableDomainObjectCache.prototype.markDirty = function (domainObject) { this.dirtyObjects[domainObject.getId()] = domainObject; + return this.$q.when(true); }; /** From 26cf9c14f498687ffcf727087af0ffeb5ca058a3 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 1 Dec 2015 21:58:57 -0800 Subject: [PATCH 46/88] [Persistence] Errors in persistence (after creating/modifying objects) should be visible to user #58 --- platform/core/bundle.json | 3 +- .../src/capabilities/PersistenceCapability.js | 41 ++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/platform/core/bundle.json b/platform/core/bundle.json index b22e225e84..0a76948e39 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -188,7 +188,8 @@ { "key": "persistence", "implementation": "capabilities/PersistenceCapability.js", - "depends": [ "persistenceService", "identifierService" ] + "depends": [ "persistenceService", "identifierService", + "notificationService", "$q" ] }, { "key": "metadata", diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js index 8bd29c7b7c..52f2787f51 100644 --- a/platform/core/src/capabilities/PersistenceCapability.js +++ b/platform/core/src/capabilities/PersistenceCapability.js @@ -47,6 +47,8 @@ define( function PersistenceCapability( persistenceService, identifierService, + alertService, + $q, domainObject ) { // Cache modified timestamp @@ -55,6 +57,8 @@ define( this.domainObject = domainObject; this.identifierService = identifierService; this.persistenceService = persistenceService; + this.alertService = alertService; + this.$q = $q; } // Utility function for creating promise-like objects which @@ -72,6 +76,34 @@ define( return parts.length > 1 ? parts.slice(1).join(":") : id; } + /** + * Checks if the value returned is falsey, and if so returns a + * rejected promise + */ + function rejectIfFalsey(value, $q){ + if (!value){ + return $q.reject("Error persisting object") + } else { + return value; + } + } + + /** + * Display a notification message if an error has occurred during + * persistence. + */ + function notifyOnError(error, domainObject, notificationService, $q){ + var errorMessage = "Unable to persist " + domainObject.model.name + ": "; + errorMessage += typeof error === "string" ? error : error.message; + + notificationService.error({ + title: "Error persisting " + domainObject.model.name, + hint: errorMessage || "Unknown error" + }); + + return $q.reject(error); + } + /** * Persist any changes which have been made to this * domain object's model. @@ -80,7 +112,8 @@ define( * if not. */ PersistenceCapability.prototype.persist = function () { - var domainObject = this.domainObject, + var self = this, + domainObject = this.domainObject, model = domainObject.getModel(), modified = model.modified, persistenceService = this.persistenceService, @@ -98,7 +131,11 @@ define( this.getSpace(), getKey(domainObject.getId()), domainObject.getModel() - ]); + ]).then(function(result){ + return rejectIfFalsey(result, self.$q); + }).catch(function(error){ + return notifyOnError(error, domainObject, self.alertService, self.$q); + }); }; /** From 8df27a1c053f7f3dbb1ad1679401406e926c9a4f Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 1 Dec 2015 22:34:26 -0800 Subject: [PATCH 47/88] Fixing jslint errors --- platform/core/src/capabilities/PersistenceCapability.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js index 52f2787f51..3ff5a26dbf 100644 --- a/platform/core/src/capabilities/PersistenceCapability.js +++ b/platform/core/src/capabilities/PersistenceCapability.js @@ -82,7 +82,7 @@ define( */ function rejectIfFalsey(value, $q){ if (!value){ - return $q.reject("Error persisting object") + return $q.reject("Error persisting object"); } else { return value; } @@ -133,7 +133,9 @@ define( domainObject.getModel() ]).then(function(result){ return rejectIfFalsey(result, self.$q); + /*jshint es5: true */ }).catch(function(error){ + /*jshint es5: false */ return notifyOnError(error, domainObject, self.alertService, self.$q); }); }; From a39cbbd917922f7f5bf15bc438baa165d08fa7c8 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 1 Dec 2015 22:35:28 -0800 Subject: [PATCH 48/88] Fixing jslint errors --- platform/core/src/capabilities/PersistenceCapability.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js index 3ff5a26dbf..c77764fcc9 100644 --- a/platform/core/src/capabilities/PersistenceCapability.js +++ b/platform/core/src/capabilities/PersistenceCapability.js @@ -133,9 +133,9 @@ define( domainObject.getModel() ]).then(function(result){ return rejectIfFalsey(result, self.$q); - /*jshint es5: true */ + /*jslint es5: true */ }).catch(function(error){ - /*jshint es5: false */ + /*jslint es5: false */ return notifyOnError(error, domainObject, self.alertService, self.$q); }); }; From d8e319ebf8cdf1591b13930832fb6943b552574d Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 1 Dec 2015 22:36:23 -0800 Subject: [PATCH 49/88] Fixing jslint errors --- platform/core/src/capabilities/PersistenceCapability.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js index c77764fcc9..4066c17948 100644 --- a/platform/core/src/capabilities/PersistenceCapability.js +++ b/platform/core/src/capabilities/PersistenceCapability.js @@ -111,6 +111,7 @@ define( * if persistence is successful, and rejected * if not. */ + /*jslint es5: true */ PersistenceCapability.prototype.persist = function () { var self = this, domainObject = this.domainObject, @@ -133,9 +134,7 @@ define( domainObject.getModel() ]).then(function(result){ return rejectIfFalsey(result, self.$q); - /*jslint es5: true */ }).catch(function(error){ - /*jslint es5: false */ return notifyOnError(error, domainObject, self.alertService, self.$q); }); }; From 20d9c7158e909f5a3dece1112fa30ecdccf16f58 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 1 Dec 2015 22:40:50 -0800 Subject: [PATCH 50/88] Added jslint es5 mode --- platform/core/src/capabilities/PersistenceCapability.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js index 4066c17948..7ca4b28e2b 100644 --- a/platform/core/src/capabilities/PersistenceCapability.js +++ b/platform/core/src/capabilities/PersistenceCapability.js @@ -20,6 +20,7 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ /*global define*/ +/*jslint es5: true */ define( @@ -111,7 +112,6 @@ define( * if persistence is successful, and rejected * if not. */ - /*jslint es5: true */ PersistenceCapability.prototype.persist = function () { var self = this, domainObject = this.domainObject, From 2514e44083326fea644b669bb351f9af918ec737 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 2 Dec 2015 10:21:00 -0800 Subject: [PATCH 51/88] [Representation] Check full ID path ...when determining if a representation needs to be refreshed. Avoids representations becoming stale when switching or navigating among linked instances of the same domain object. https://github.com/nasa/openmctweb/issues/302 --- .../representation/src/MCTRepresentation.js | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/platform/representation/src/MCTRepresentation.js b/platform/representation/src/MCTRepresentation.js index d1937389d2..b68a6ad81e 100644 --- a/platform/representation/src/MCTRepresentation.js +++ b/platform/representation/src/MCTRepresentation.js @@ -96,7 +96,7 @@ define( toClear = [], // Properties to clear out of scope on change counter = 0, couldRepresent = false, - lastId, + lastIdPath = [], lastKey, changeTemplate = templateLinker.link($scope, element); @@ -143,11 +143,24 @@ define( }); } - function unchanged(canRepresent, id, key) { + function unchanged(canRepresent, idPath, key) { return canRepresent && couldRepresent && - id === lastId && - key === lastKey; + key === lastKey && + idPath.length === lastIdPath.length && + idPath.every(function (id, i) { + return id === lastIdPath[i]; + }); + } + + function getIdPath(domainObject) { + if (!domainObject) { + return []; + } + return domainObject.getCapability('context') + .getPath().map(function (pathObject) { + return pathObject.getId(); + }); } // General-purpose refresh mechanism; should set up the scope @@ -159,10 +172,10 @@ define( path = representation && getPath(representation), uses = ((representation || {}).uses || []), canRepresent = !!(path && domainObject), - id = domainObject && domainObject.getId(), + idPath = getIdPath(domainObject), key = $scope.key; - if (unchanged(canRepresent, id, key)) { + if (unchanged(canRepresent, idPath, key)) { return; } @@ -190,7 +203,7 @@ define( // To allow simplified change detection next time around couldRepresent = canRepresent; - lastId = id; + lastIdPath = idPath; lastKey = key; // Populate scope with fields associated with the current From 5e079518920e012f0b9a35321c398d234de4b729 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 2 Dec 2015 10:23:11 -0800 Subject: [PATCH 52/88] [Representation] Handle missing context Handle missing context when generating an ID path; this is missing in the root object. --- platform/representation/src/MCTRepresentation.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/representation/src/MCTRepresentation.js b/platform/representation/src/MCTRepresentation.js index b68a6ad81e..98b97a841c 100644 --- a/platform/representation/src/MCTRepresentation.js +++ b/platform/representation/src/MCTRepresentation.js @@ -157,6 +157,9 @@ define( if (!domainObject) { return []; } + if (!domainObject.hasCapability('context')) { + return [domainObject.getId()]; + } return domainObject.getCapability('context') .getPath().map(function (pathObject) { return pathObject.getId(); From 386f1f20ff380a5046edd33ef4578c11d989bf4b Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 2 Dec 2015 10:49:18 -0800 Subject: [PATCH 53/88] [Representation] Test switching between links Add test case to verify that representation gets refreshed when switching among two linked instances of the same domain object. --- .../test/MCTRepresentationSpec.js | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/platform/representation/test/MCTRepresentationSpec.js b/platform/representation/test/MCTRepresentationSpec.js index 30fed7c0ca..141f2227f3 100644 --- a/platform/representation/test/MCTRepresentationSpec.js +++ b/platform/representation/test/MCTRepresentationSpec.js @@ -247,6 +247,54 @@ define( mockScope.$watch.calls[0].args[1](); expect(mockScope.testCapability).toBeUndefined(); }); + + it("detects changes among linked instances", function () { + var mockContext = jasmine.createSpyObj('context', ['getPath']), + mockContext2 = jasmine.createSpyObj('context', ['getPath']), + mockLink = jasmine.createSpyObj( + 'linkedObject', + DOMAIN_OBJECT_METHODS + ), + mockParent = jasmine.createSpyObj( + 'parentObject', + DOMAIN_OBJECT_METHODS + ), + callCount; + + mockDomainObject.getCapability.andCallFake(function (c) { + return c === 'context' && mockContext; + }); + mockLink.getCapability.andCallFake(function (c) { + return c === 'context' && mockContext2; + }); + mockDomainObject.hasCapability.andCallFake(function (c) { + return c === 'context'; + }); + mockLink.hasCapability.andCallFake(function (c) { + return c === 'context'; + }); + mockLink.getModel.andReturn({}); + + mockContext.getPath.andReturn([mockDomainObject]); + mockContext2.getPath.andReturn([mockParent, mockLink]); + + mockLink.getId.andReturn('test-id'); + mockDomainObject.getId.andReturn('test-id'); + + mockParent.getId.andReturn('parent-id'); + + mockScope.key = "abc"; + mockScope.domainObject = mockDomainObject; + + mockScope.$watch.calls[0].args[1](); + callCount = mockChangeTemplate.calls.length; + + mockScope.domainObject = mockLink; + mockScope.$watch.calls[0].args[1](); + + expect(mockChangeTemplate.calls.length) + .toEqual(callCount + 1); + }); }); } ); From fe600de0f711fa17920384335f19ca405c3d97b5 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 2 Dec 2015 11:28:49 -0800 Subject: [PATCH 54/88] [Copy] #338 added CreationPolicy and appropriate tests, amended CreateActionProvider, and updated existing tests --- platform/commonUI/browse/bundle.json | 6 +++ .../src/creation/CreateActionProvider.js | 2 +- .../browse/src/creation/CreationPolicy.js | 49 +++++++++++++++++ .../test/creation/CreateActionProviderSpec.js | 29 ++++++++-- .../test/creation/CreationPolicySpec.js | 54 +++++++++++++++++++ platform/commonUI/browse/test/suite.json | 1 + 6 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 platform/commonUI/browse/src/creation/CreationPolicy.js create mode 100644 platform/commonUI/browse/test/creation/CreationPolicySpec.js diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 0d4c1eedd6..6954bba12c 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -102,6 +102,12 @@ "implementation": "navigation/NavigationService.js" } ], + "policies": [ + { + "implementation": "CreationPolicy.js", + "category": "creation" + } + ], "actions": [ { "key": "navigate", diff --git a/platform/commonUI/browse/src/creation/CreateActionProvider.js b/platform/commonUI/browse/src/creation/CreateActionProvider.js index 4ca2bce59f..4152d9a27f 100644 --- a/platform/commonUI/browse/src/creation/CreateActionProvider.js +++ b/platform/commonUI/browse/src/creation/CreateActionProvider.js @@ -69,7 +69,7 @@ define( // Introduce one create action per type return this.typeService.listTypes().filter(function (type) { - return type.hasFeature("creation"); + return self.policyService.allow("creation", type); }).map(function (type) { return new CreateAction( type, diff --git a/platform/commonUI/browse/src/creation/CreationPolicy.js b/platform/commonUI/browse/src/creation/CreationPolicy.js new file mode 100644 index 0000000000..a30a78ab8b --- /dev/null +++ b/platform/commonUI/browse/src/creation/CreationPolicy.js @@ -0,0 +1,49 @@ +/***************************************************************************** + * 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"; + + /** + * A policy for determining whether objects of a certain type can be + * created. + * @returns {{allow: Function}} + * @constructor + */ + function CreationPolicy() { + return { + /** + * Only allow creation of object types that have the + * Creation capability + */ + allow: function (action, type) { + return type.hasFeature("creation"); + } + }; + } + + return CreationPolicy; + } +); \ No newline at end of file diff --git a/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js b/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js index 431f6101c2..fdba091623 100644 --- a/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js +++ b/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js @@ -33,6 +33,9 @@ define( var mockTypeService, mockDialogService, mockCreationService, + mockPolicyService, + mockCreationPolicy, + mockPolicyMap = {}, mockTypes, provider; @@ -67,14 +70,32 @@ define( "creationService", [ "createObject" ] ); + mockPolicyService = jasmine.createSpyObj( + "policyService", + [ "allow" ] + ); + mockTypes = [ "A", "B", "C" ].map(createMockType); + mockTypes.forEach(function(type){ + mockPolicyMap[type.getName()] = true; + }); + + mockCreationPolicy = function(type){ + return mockPolicyMap[type.getName()]; + }; + + mockPolicyService.allow.andCallFake(function(category, type){ + return category === "creation" && mockCreationPolicy(type) ? true : false; + }); + mockTypeService.listTypes.andReturn(mockTypes); provider = new CreateActionProvider( mockTypeService, mockDialogService, - mockCreationService + mockCreationService, + mockPolicyService ); }); @@ -94,15 +115,15 @@ define( it("does not expose non-creatable types", function () { // One of the types won't have the creation feature... - mockTypes[1].hasFeature.andReturn(false); + mockPolicyMap[mockTypes[0].getName()] = false; // ...so it should have been filtered out. expect(provider.getActions({ key: "create", domainObject: {} }).length).toEqual(2); // Make sure it was creation which was used to check - expect(mockTypes[1].hasFeature) - .toHaveBeenCalledWith("creation"); + expect(mockPolicyService.allow) + .toHaveBeenCalledWith("creation", mockTypes[0]); }); }); } diff --git a/platform/commonUI/browse/test/creation/CreationPolicySpec.js b/platform/commonUI/browse/test/creation/CreationPolicySpec.js new file mode 100644 index 0000000000..41afee0875 --- /dev/null +++ b/platform/commonUI/browse/test/creation/CreationPolicySpec.js @@ -0,0 +1,54 @@ +/***************************************************************************** + * 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,jasmine*/ + +define( + ["../../src/creation/CreationPolicy"], + function (CreationPolicy) { + "use strict"; + + describe("The creation policy", function () { + var mockDomainObject, + mockType, + policy; + + beforeEach(function () { + mockType = jasmine.createSpyObj( + 'type', + ['hasFeature'] + ); + + policy = new CreationPolicy(); + }); + + it("allows creation of types with the creation feature", function () { + mockType.hasFeature.andReturn(true); + expect(policy.allow({}, mockType)).toBeTruthy(); + }); + + it("disallows creation of types without the creation feature", function () { + mockType.hasFeature.andReturn(false); + expect(policy.allow({}, mockType)).toBeFalsy(); + }); + }); + } +); \ No newline at end of file diff --git a/platform/commonUI/browse/test/suite.json b/platform/commonUI/browse/test/suite.json index b9292b6ef1..70e62bcfa6 100644 --- a/platform/commonUI/browse/test/suite.json +++ b/platform/commonUI/browse/test/suite.json @@ -8,6 +8,7 @@ "creation/CreateMenuController", "creation/CreateWizard", "creation/CreationService", + "creation/CreationPolicy", "creation/LocatorController", "navigation/NavigateAction", "navigation/NavigationService", From 9953e16415740b52a704aea63f6e744d1920493e Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 2 Dec 2015 14:06:22 -0800 Subject: [PATCH 55/88] #338 Copy now using target persistence space --- platform/entanglement/src/services/CopyTask.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index f484856448..719785e17b 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -44,6 +44,7 @@ define( this.$q = $q; this.deferred = undefined; this.persistenceService = persistenceService; + this.persistenceSpace = parent.getCapability("persistence") && parent.getCapability("persistence").getSpace(); this.persisted = 0; this.now = now; this.clones = []; @@ -52,6 +53,10 @@ define( function composeChild(child, parent) { //Once copied, associate each cloned // composee with its parent clone + + //Could check islink here, and not set the location if it is a + // link? Object should have been contextualized during + // composition, so isLink should work. child.model.location = parent.id; parent.model.composition = parent.model.composition || []; return parent.model.composition.push(child.id); @@ -76,7 +81,7 @@ define( return self.$q.all(self.clones.map(function(clone){ clone.model.persisted = self.now(); - return self.persistenceService.createObject(clone.persistenceSpace, clone.id, clone.model) + return self.persistenceService.createObject(self.persistenceSpace, clone.id, clone.model) .then(function(){ self.deferred.notify({phase: "copying", totalObjects: self.clones.length, processed: ++self.persisted}); }); @@ -96,7 +101,7 @@ define( } return self.persistenceService - .updateObject(parentClone.persistenceSpace, parentClone.id, parentClone.model) + .updateObject(self.persistenceSpace, parentClone.id, parentClone.model) .then(function(){return self.parent.getCapability("composition").add(parentClone.id);}) .then(function(){return self.parent.getCapability("persistence").persist();}) .then(function(){return parentClone;}); @@ -138,15 +143,16 @@ define( CopyTask.prototype.copy = function(originalObject, originalParent) { var self = this, modelClone = { - id: uuid(), - model: cloneObjectModel(originalObject.getModel()), - persistenceSpace: originalParent.hasCapability('persistence') && originalParent.getCapability('persistence').getSpace() - }; + id: uuid(), + model: cloneObjectModel(originalObject.getModel()) + }, + clone; return this.$q.when(originalObject.useCapability('composition')).then(function(composees){ self.deferred.notify({phase: "preparing"}); //Duplicate the object's children, and their children, and // so on down to the leaf nodes of the tree. + //If it is a link, don't both with children return self.copyComposees(composees, modelClone, originalObject).then(function (){ //Add the clone to the list of clones that will //be returned by this function From 11d8daf3edc291bb4cad809e9a0fb35b870f9401 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 2 Dec 2015 14:07:08 -0800 Subject: [PATCH 56/88] #338 Fixed incorrect specification of CreationPolicy in bundle.json --- platform/commonUI/browse/bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 6954bba12c..e290f296ff 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -104,7 +104,7 @@ ], "policies": [ { - "implementation": "CreationPolicy.js", + "implementation": "creation/CreationPolicy.js", "category": "creation" } ], From 8e3c5db3bfa07a0618a3e4550863b5862b540d10 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 2 Dec 2015 14:14:04 -0800 Subject: [PATCH 57/88] #338 fixed incorrect 'allow' function specification in CreationPolicy --- platform/commonUI/browse/src/creation/CreationPolicy.js | 2 +- .../commonUI/browse/test/creation/CreationPolicySpec.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/browse/src/creation/CreationPolicy.js b/platform/commonUI/browse/src/creation/CreationPolicy.js index a30a78ab8b..0ccf82d907 100644 --- a/platform/commonUI/browse/src/creation/CreationPolicy.js +++ b/platform/commonUI/browse/src/creation/CreationPolicy.js @@ -38,7 +38,7 @@ define( * Only allow creation of object types that have the * Creation capability */ - allow: function (action, type) { + allow: function (type) { return type.hasFeature("creation"); } }; diff --git a/platform/commonUI/browse/test/creation/CreationPolicySpec.js b/platform/commonUI/browse/test/creation/CreationPolicySpec.js index 41afee0875..1f88c1b149 100644 --- a/platform/commonUI/browse/test/creation/CreationPolicySpec.js +++ b/platform/commonUI/browse/test/creation/CreationPolicySpec.js @@ -27,8 +27,7 @@ define( "use strict"; describe("The creation policy", function () { - var mockDomainObject, - mockType, + var mockType, policy; beforeEach(function () { @@ -42,12 +41,12 @@ define( it("allows creation of types with the creation feature", function () { mockType.hasFeature.andReturn(true); - expect(policy.allow({}, mockType)).toBeTruthy(); + expect(policy.allow(mockType)).toBeTruthy(); }); it("disallows creation of types without the creation feature", function () { mockType.hasFeature.andReturn(false); - expect(policy.allow({}, mockType)).toBeFalsy(); + expect(policy.allow(mockType)).toBeFalsy(); }); }); } From cee0ecf0efd445a9e6225e0fe132cd14e3f75b0a Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 2 Dec 2015 19:10:10 -0800 Subject: [PATCH 58/88] Removed use of composition and mutation because they trigger the search indexer too early and it tries to retrieve objects that have not been persisted yet --- .../entanglement/src/services/CopyService.js | 2 +- .../entanglement/src/services/CopyTask.js | 101 +++++++++++------- 2 files changed, 63 insertions(+), 40 deletions(-) diff --git a/platform/entanglement/src/services/CopyService.js b/platform/entanglement/src/services/CopyService.js index 29c6be4d10..ad0617526f 100644 --- a/platform/entanglement/src/services/CopyService.js +++ b/platform/entanglement/src/services/CopyService.js @@ -71,7 +71,7 @@ define( */ CopyService.prototype.perform = function (domainObject, parent) { var $q = this.$q, - copyTask = new CopyTask(domainObject, parent, this.persistenceService, this.$q, this.now); + copyTask = new CopyTask(domainObject, parent, this.persistenceService, this.policyService, this.$q, this.now); if (this.validate(domainObject, parent)) { return copyTask.perform(); } else { diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index 719785e17b..1f2db40f3b 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -38,12 +38,13 @@ define( * @param now * @constructor */ - function CopyTask (domainObject, parent, persistenceService, $q, now){ + function CopyTask (domainObject, parent, persistenceService, policyService, $q, now){ this.domainObject = domainObject; this.parent = parent; this.$q = $q; this.deferred = undefined; this.persistenceService = persistenceService; + this.policyService = policyService; this.persistenceSpace = parent.getCapability("persistence") && parent.getCapability("persistence").getSpace(); this.persisted = 0; this.now = now; @@ -54,20 +55,30 @@ define( //Once copied, associate each cloned // composee with its parent clone - //Could check islink here, and not set the location if it is a - // link? Object should have been contextualized during - // composition, so isLink should work. - child.model.location = parent.id; - parent.model.composition = parent.model.composition || []; - return parent.model.composition.push(child.id); + parent.getModel().composition.push(child.getId()); + + //Check if the object being composed is a link + if (!child.getCapability("location").isLink()) { + child.getModel().location = parent.getId(); + } } function cloneObjectModel(objectModel) { var clone = JSON.parse(JSON.stringify(objectModel)); - delete clone.composition; + /** + * Reset certain fields. + */ + //If has a composition, set it to an empty array. Will be + // recomposed later with the ids of its cloned children. + if (clone.composition) { + //Important to set it to an empty array here, otherwise + // hasCapability("composition") returns false; + clone.composition = []; + } delete clone.persisted; delete clone.modified; + delete clone.location; return clone; } @@ -78,13 +89,10 @@ define( * result in automatic request batching by the browser. */ function persistObjects(self) { - return self.$q.all(self.clones.map(function(clone){ - clone.model.persisted = self.now(); - return self.persistenceService.createObject(self.persistenceSpace, clone.id, clone.model) - .then(function(){ - self.deferred.notify({phase: "copying", totalObjects: self.clones.length, processed: ++self.persisted}); - }); + return clone.getCapability("persistence").persist().then(function(){ + self.deferred.notify({phase: "copying", totalObjects: self.clones.length, processed: ++self.persisted}); + }); })).then(function(){ return self; }); @@ -96,15 +104,13 @@ define( function addClonesToParent(self) { var parentClone = self.clones[self.clones.length-1]; - if (!self.parent.hasCapability('composition')){ - return self.$q.reject(); - } - - return self.persistenceService - .updateObject(self.persistenceSpace, parentClone.id, parentClone.model) - .then(function(){return self.parent.getCapability("composition").add(parentClone.id);}) - .then(function(){return self.parent.getCapability("persistence").persist();}) - .then(function(){return parentClone;}); + //self.persistenceService + // .updateObject(self.persistenceSpace, + // parentClone.id, parentClone.model) + return parentClone.getCapability("persistence").persist() + .then(function(){self.parent.getCapability("composition").add(parentClone.getId())}) + .then(function(){return self.parent.getCapability("persistence").persist();}) + .then(function(){return parentClone;}); // Ensure the clone of the original domainObject is returned } @@ -123,7 +129,7 @@ define( return promise.then(function(){ // ...to recursively copy it (and its children) return self.copy(composee, originalParent).then(function(composee){ - composeChild(composee, clonedParent); + return composeChild(composee, clonedParent); }); });}, self.$q.when(undefined) ); @@ -142,24 +148,37 @@ define( */ CopyTask.prototype.copy = function(originalObject, originalParent) { var self = this, - modelClone = { - id: uuid(), - model: cloneObjectModel(originalObject.getModel()) - }, clone; - return this.$q.when(originalObject.useCapability('composition')).then(function(composees){ - self.deferred.notify({phase: "preparing"}); - //Duplicate the object's children, and their children, and - // so on down to the leaf nodes of the tree. - //If it is a link, don't both with children - return self.copyComposees(composees, modelClone, originalObject).then(function (){ - //Add the clone to the list of clones that will - //be returned by this function - self.clones.push(modelClone); - return modelClone; + //Check if the type of the object being copied allows for + // creation of new instances. If it does not, then a link to the + // original will be created instead. + if (this.policyService.allow("creation", originalObject.getCapability("type"))){ + //create a new clone of the original object. Use the + // creation capability of the targetParent to create the + // new clone. This will ensure that the correct persistence + // space is used. + clone = this.parent.hasCapability("instantiation") && originalParent.useCapability("instantiation", cloneObjectModel(originalObject.getModel())); + + //Iterate through child tree + return this.$q.when(originalObject.useCapability('composition')).then(function(composees){ + self.deferred.notify({phase: "preparing"}); + //Duplicate the object's children, and their children, and + // so on down to the leaf nodes of the tree. + //If it is a link, don't both with children + return self.copyComposees(composees, clone, originalObject).then(function (){ + //Add the clone to the list of clones that will + //be returned by this function + self.clones.push(clone); + return clone; + }); }); - }); + } else { + //Creating a link, no need to iterate children + return $q.when(originalObject); + } + + }; /** @@ -191,6 +210,10 @@ define( CopyTask.prototype.perform = function(){ this.deferred = this.$q.defer(); + if (!this.parent.hasCapability('composition')){ + return self.$q.reject(); + } + this.buildCopyPlan() .then(persistObjects) .then(addClonesToParent) From 3b427c31a29c71f4e406a46c415f4a57ef765059 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 2 Dec 2015 19:18:50 -0800 Subject: [PATCH 59/88] Fixed error with not properly referenced --- platform/entanglement/src/services/CopyTask.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index 1f2db40f3b..1a47d8d5c7 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -104,14 +104,10 @@ define( function addClonesToParent(self) { var parentClone = self.clones[self.clones.length-1]; - //self.persistenceService - // .updateObject(self.persistenceSpace, - // parentClone.id, parentClone.model) - return parentClone.getCapability("persistence").persist() - .then(function(){self.parent.getCapability("composition").add(parentClone.getId())}) - .then(function(){return self.parent.getCapability("persistence").persist();}) - .then(function(){return parentClone;}); - // Ensure the clone of the original domainObject is returned + return parentClone.getCapability("persistence").persist() + .then(function(){self.parent.getCapability("composition").add(parentClone.getId())}) + .then(function(){return self.parent.getCapability("persistence").persist();}) + .then(function(){return parentClone;}); } /** @@ -175,7 +171,7 @@ define( }); } else { //Creating a link, no need to iterate children - return $q.when(originalObject); + return self.$q.when(originalObject); } From 734e979c9427fc7cc1afd3e917bbb41ec1013819 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 12:49:54 -0800 Subject: [PATCH 60/88] #338 Fixed failing tests after refactor --- platform/entanglement/bundle.json | 3 +- .../entanglement/src/services/CopyService.js | 7 +- .../entanglement/src/services/CopyTask.js | 13 +- .../test/services/CopyServiceSpec.js | 220 ++++++++++-------- 4 files changed, 135 insertions(+), 108 deletions(-) diff --git a/platform/entanglement/bundle.json b/platform/entanglement/bundle.json index fc17ef9ef2..9679aec4db 100644 --- a/platform/entanglement/bundle.json +++ b/platform/entanglement/bundle.json @@ -89,8 +89,7 @@ "name": "Copy Service", "description": "Provides a service for copying objects", "implementation": "services/CopyService.js", - "depends": ["$q", "creationService", "policyService", - "persistenceService", "now"] + "depends": ["$q", "policyService", "now"] }, { "key": "locationService", diff --git a/platform/entanglement/src/services/CopyService.js b/platform/entanglement/src/services/CopyService.js index ad0617526f..03f32b76ce 100644 --- a/platform/entanglement/src/services/CopyService.js +++ b/platform/entanglement/src/services/CopyService.js @@ -38,12 +38,9 @@ define( * @memberof platform/entanglement * @implements {platform/entanglement.AbstractComposeService} */ - function CopyService($q, creationService, policyService, persistenceService, now) { + function CopyService($q, policyService) { this.$q = $q; - this.creationService = creationService; this.policyService = policyService; - this.persistenceService = persistenceService; - this.now = now; } CopyService.prototype.validate = function (object, parentCandidate) { @@ -71,7 +68,7 @@ define( */ CopyService.prototype.perform = function (domainObject, parent) { var $q = this.$q, - copyTask = new CopyTask(domainObject, parent, this.persistenceService, this.policyService, this.$q, this.now); + copyTask = new CopyTask(domainObject, parent, this.policyService, this.$q); if (this.validate(domainObject, parent)) { return copyTask.perform(); } else { diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index 1a47d8d5c7..d3790bf433 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -33,21 +33,16 @@ define( * * @param domainObject The object to copy * @param parent The new location of the cloned object tree - * @param persistenceService * @param $q - * @param now * @constructor */ - function CopyTask (domainObject, parent, persistenceService, policyService, $q, now){ + function CopyTask (domainObject, parent, policyService, $q){ this.domainObject = domainObject; this.parent = parent; this.$q = $q; this.deferred = undefined; - this.persistenceService = persistenceService; this.policyService = policyService; - this.persistenceSpace = parent.getCapability("persistence") && parent.getCapability("persistence").getSpace(); this.persisted = 0; - this.now = now; this.clones = []; } @@ -154,7 +149,7 @@ define( // creation capability of the targetParent to create the // new clone. This will ensure that the correct persistence // space is used. - clone = this.parent.hasCapability("instantiation") && originalParent.useCapability("instantiation", cloneObjectModel(originalObject.getModel())); + clone = this.parent.hasCapability("instantiation") && this.parent.useCapability("instantiation", cloneObjectModel(originalObject.getModel())); //Iterate through child tree return this.$q.when(originalObject.useCapability('composition')).then(function(composees){ @@ -193,7 +188,7 @@ define( var self = this; return this.copy(self.domainObject, self.parent).then(function(domainObjectClone){ - domainObjectClone.model.location = self.parent.getId(); + domainObjectClone.getModel().location = self.parent.getId(); return self; }); }; @@ -207,7 +202,7 @@ define( this.deferred = this.$q.defer(); if (!this.parent.hasCapability('composition')){ - return self.$q.reject(); + return this.$q.reject(); } this.buildCopyPlan() diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js index 391d90913c..c10efb1522 100644 --- a/platform/entanglement/test/services/CopyServiceSpec.js +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -63,7 +63,6 @@ define( beforeEach(function () { copyService = new CopyService( - null, null, policyService ); @@ -130,48 +129,52 @@ define( creationService, createObjectPromise, copyService, - mockPersistenceService, mockNow, object, newParent, copyResult, copyFinished, persistObjectPromise, - parentPersistenceCapability, + persistenceCapability, + instantiationCapability, + compositionCapability, + locationCapability, resolvedValue; beforeEach(function () { - creationService = jasmine.createSpyObj( - 'creationService', - ['createObject'] - ); createObjectPromise = synchronousPromise(undefined); - creationService.createObject.andReturn(createObjectPromise); policyService.allow.andReturn(true); - - mockPersistenceService = jasmine.createSpyObj( - 'persistenceService', - ['createObject', 'updateObject'] - ); + persistObjectPromise = synchronousPromise(undefined); - mockPersistenceService.createObject.andReturn(persistObjectPromise); - mockPersistenceService.updateObject.andReturn(persistObjectPromise); - - parentPersistenceCapability = jasmine.createSpyObj( - "persistence", + + instantiationCapability = jasmine.createSpyObj( + "instantiation", + [ "invoke" ] + ); + + persistenceCapability = jasmine.createSpyObj( + "persistenceCapability", [ "persist", "getSpace" ] ); + persistenceCapability.persist.andReturn(persistObjectPromise); - parentPersistenceCapability.persist.andReturn(persistObjectPromise); - parentPersistenceCapability.getSpace.andReturn("testSpace"); + compositionCapability = jasmine.createSpyObj( + 'compositionCapability', + ['invoke', 'add'] + ); - mockNow = jasmine.createSpyObj("mockNow", ["now"]); - mockNow.now.andCallFake(function(){ - return 1234; - }); + locationCapability = jasmine.createSpyObj( + 'locationCapability', + ['isLink'] + ); + locationCapability.isLink.andReturn(false); - mockDeferred = jasmine.createSpyObj('mockDeferred', ['notify', 'resolve']); + mockDeferred = jasmine.createSpyObj( + 'mockDeferred', + ['notify', 'resolve', 'reject'] + ); mockDeferred.notify.andCallFake(function(notification){}); + mockDeferred.reject.andCallFake(function(){}); mockDeferred.resolve.andCallFake(function(value){resolvedValue = value;}); mockDeferred.promise = { then: function(callback){ @@ -179,7 +182,11 @@ define( } }; - mockQ = jasmine.createSpyObj('mockQ', ['when', 'all', 'reject', 'defer']); + mockQ = jasmine.createSpyObj( + 'mockQ', + ['when', 'all', 'reject', 'defer'] + ); + mockQ.reject.andReturn(synchronousPromise(undefined)); mockQ.when.andCallFake(synchronousPromise); mockQ.all.andCallFake(function (promises) { var result = {}; @@ -194,6 +201,8 @@ define( describe("on domain object without composition", function () { beforeEach(function () { + var objectCopy; + newParent = domainObjectFactory({ name: 'newParent', id: '456', @@ -201,7 +210,9 @@ define( composition: [] }, capabilities: { - persistence: parentPersistenceCapability + instantiation: instantiationCapability, + persistence: persistenceCapability, + composition: compositionCapability } }); @@ -210,31 +221,46 @@ define( id: 'abc', model: { name: 'some object', - location: newParent.id, - persisted: mockNow.now() + location: '456', + someOtherAttribute: 'some other value', + embeddedObjectAttribute: { + name: 'Some embedded object' + } + }, + capabilities: { + persistence: persistenceCapability } }); - - copyService = new CopyService(mockQ, creationService, policyService, mockPersistenceService, mockNow.now); + + objectCopy = domainObjectFactory({ + name: 'object', + id: 'abc.copy.fdgdfgdf', + capabilities: { + persistence: persistenceCapability, + location: locationCapability + } + }); + + instantiationCapability.invoke.andCallFake( + function(model){ + objectCopy.model = model; + return objectCopy; + } + ); + + copyService = new CopyService(mockQ, policyService); copyResult = copyService.perform(object, newParent); copyFinished = jasmine.createSpy('copyFinished'); copyResult.then(copyFinished); }); - it("uses persistence service", function () { - expect(mockPersistenceService.createObject) - .toHaveBeenCalledWith(parentPersistenceCapability.getSpace(), jasmine.any(String), object.getModel()); - - expect(persistObjectPromise.then) - .toHaveBeenCalledWith(jasmine.any(Function)); - }); + it("uses persistence capability", function () { + expect(persistenceCapability.persist) + .toHaveBeenCalled(); + }); it("deep clones object model", function () { - //var newModel = creationService - var newModel = mockPersistenceService - .createObject - .mostRecentCall - .args[2]; + var newModel = copyFinished.calls[0].args[0].getModel(); expect(newModel).toEqual(object.model); expect(newModel).not.toBe(object.model); }); @@ -249,27 +275,57 @@ define( describe("on domainObject with composition", function () { var newObject, childObject, - compositionCapability, - locationCapability, + objectClone, + childObjectClone, compositionPromise; beforeEach(function () { + var invocationCount = 0, + objectClones; + instantiationCapability.invoke.andCallFake( + function(model){ + var cloneToReturn = objectClones[invocationCount++]; + cloneToReturn.model = model; + return cloneToReturn; + } + ); - locationCapability = jasmine.createSpyObj('locationCapability', ['isLink']); - locationCapability.isLink.andReturn(true); + newParent = domainObjectFactory({ + name: 'newParent', + id: '456', + model: { + composition: [] + }, + capabilities: { + instantiation: instantiationCapability, + persistence: persistenceCapability, + composition: compositionCapability + } + }); childObject = domainObjectFactory({ name: 'childObject', id: 'def', model: { - name: 'a child object' + name: 'a child object', + location: 'abc' + }, + capabilities: { + persistence: persistenceCapability, + location: locationCapability } }); - compositionCapability = jasmine.createSpyObj( - 'compositionCapability', - ['invoke', 'add'] - ); + + childObjectClone = domainObjectFactory({ + name: 'childObject', + id: 'def.clone', + capabilities: { + persistence: persistenceCapability, + location: locationCapability + } + }); + compositionPromise = jasmine.createSpyObj( 'compositionPromise', ['then'] @@ -280,7 +336,7 @@ define( .andReturn(synchronousPromise([childObject])); object = domainObjectFactory({ - name: 'object', + name: 'some object', id: 'abc', model: { name: 'some object', @@ -288,36 +344,27 @@ define( location: 'testLocation' }, capabilities: { + instantiation: instantiationCapability, composition: compositionCapability, - location: locationCapability - } - }); - newObject = domainObjectFactory({ - name: 'object', - id: 'abc2', - model: { - name: 'some object', - composition: [] - }, - capabilities: { - composition: compositionCapability - } - }); - newParent = domainObjectFactory({ - name: 'newParent', - id: '456', - model: { - composition: [] - }, - capabilities: { - composition: compositionCapability, - persistence: parentPersistenceCapability + location: locationCapability, + persistence: persistenceCapability } }); - createObjectPromise = synchronousPromise(newObject); - creationService.createObject.andReturn(createObjectPromise); - copyService = new CopyService(mockQ, creationService, policyService, mockPersistenceService, mockNow.now); + objectClone = domainObjectFactory({ + name: 'some object', + id: 'abc.clone', + capabilities: { + instantiation: instantiationCapability, + composition: compositionCapability, + location: locationCapability, + persistence: persistenceCapability + } + }); + + objectClones = [objectClone, childObjectClone]; + + copyService = new CopyService(mockQ, policyService); }); describe("the cloning process", function(){ @@ -327,24 +374,13 @@ define( copyResult.then(copyFinished); }); - it("copies object and children in a bottom-up" + - " fashion", function () { - expect(mockPersistenceService.createObject.calls[0].args[2].name).toEqual(childObject.model.name); - expect(mockPersistenceService.createObject.calls[1].args[2].name).toEqual(object.model.name); - }); - it("returns a promise", function () { expect(copyResult.then).toBeDefined(); expect(copyFinished).toHaveBeenCalled(); }); - it("clears modified and sets persisted", function () { - expect(copyFinished.mostRecentCall.args[0].model.modified).toBeUndefined(); - expect(copyFinished.mostRecentCall.args[0].model.persisted).toBe(mockNow.now()); - }); - it ("correctly locates cloned objects", function() { - expect(mockPersistenceService.createObject.calls[0].args[2].location).toEqual(mockPersistenceService.createObject.calls[1].args[1]); + expect(childObjectClone.getModel().location).toEqual(objectClone.getId()); }); }); @@ -368,7 +404,7 @@ define( it("throws an error", function () { var copyService = - new CopyService(mockQ, creationService, policyService, mockPersistenceService, mockNow.now); + new CopyService(mockQ, policyService); function perform() { copyService.perform(object, newParent); From 4b82893c36d7c1600bd4fa4fe4a902c6c9dbfdb5 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 3 Dec 2015 13:27:19 -0800 Subject: [PATCH 61/88] [Performance] Improve digests/sec indication Don't let past digest counts bias current rate shown; https://github.com/nasa/openmctweb/issues/369 --- example/profiling/src/DigestIndicator.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/example/profiling/src/DigestIndicator.js b/example/profiling/src/DigestIndicator.js index 02fbc7a08b..f19f28b548 100644 --- a/example/profiling/src/DigestIndicator.js +++ b/example/profiling/src/DigestIndicator.js @@ -39,8 +39,11 @@ define( start = Date.now(); function update() { - var secs = (Date.now() - start) / 1000; + var now = Date.now(), + secs = (now - start) / 1000; displayed = Math.round(digests / secs); + start = now; + digests = 0; } function increment() { From 9f0114eb390b039826018bd1abb0c3ce759dbb6f Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 3 Dec 2015 13:27:59 -0800 Subject: [PATCH 62/88] [Performance] Don't invoke apply from MCTSplitPane Don't invoke apply on every from MCTSplitPane (this had been intended behavior, but argument was misplaced.) --- platform/commonUI/general/src/directives/MCTSplitPane.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/general/src/directives/MCTSplitPane.js b/platform/commonUI/general/src/directives/MCTSplitPane.js index 9abc641ebd..b094ba785f 100644 --- a/platform/commonUI/general/src/directives/MCTSplitPane.js +++ b/platform/commonUI/general/src/directives/MCTSplitPane.js @@ -204,7 +204,7 @@ define( // And poll for position changes enforced by styles activeInterval = $interval(function () { getSetPosition(getSetPosition()); - }, POLLING_INTERVAL, false); + }, POLLING_INTERVAL, 0, false); // ...and stop polling when we're destroyed. $scope.$on('$destroy', function () { From 0f56fd25619af7995f772be2a11e4784ebfdc7a1 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 3 Dec 2015 13:28:32 -0800 Subject: [PATCH 63/88] [Performance] Only invoke apply on size changes ...as detected from mct-chart. --- platform/features/plot/src/MCTChart.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/features/plot/src/MCTChart.js b/platform/features/plot/src/MCTChart.js index e8c9db74e4..05e45a2948 100644 --- a/platform/features/plot/src/MCTChart.js +++ b/platform/features/plot/src/MCTChart.js @@ -146,6 +146,7 @@ define( if (canvas.width !== canvas.offsetWidth || canvas.height !== canvas.offsetHeight) { doDraw(scope.draw); + scope.$apply(); } } @@ -181,7 +182,7 @@ define( canvas.addEventListener("webglcontextlost", fallbackFromWebGL); // Check for resize, on a timer - activeInterval = $interval(drawIfResized, 1000); + activeInterval = $interval(drawIfResized, 1000, 0, false); // Watch "draw" for external changes to the set of // things to be drawn. From 3e7bc2f37f21c8a339c9edb37cfe9de0d34d8857 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 3 Dec 2015 13:29:54 -0800 Subject: [PATCH 64/88] [Performance] Don't invoke apply from indicator Don't invoke apply while polling from ElasticSearch indicator; let the corresponding request trigger this. --- platform/persistence/elastic/src/ElasticIndicator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/persistence/elastic/src/ElasticIndicator.js b/platform/persistence/elastic/src/ElasticIndicator.js index 78a29605c1..767c37c8cb 100644 --- a/platform/persistence/elastic/src/ElasticIndicator.js +++ b/platform/persistence/elastic/src/ElasticIndicator.js @@ -80,7 +80,7 @@ define( // Update the indicator initially, and start polling. updateIndicator(); - $interval(updateIndicator, interval, false); + $interval(updateIndicator, interval, 0, false); } ElasticIndicator.prototype.getGlyph = function () { From 49e51d0a62ce68231cea3915ac78e32959a716e9 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 3 Dec 2015 13:33:34 -0800 Subject: [PATCH 65/88] [Performance] Update mct-chart spec --- platform/features/plot/test/MCTChartSpec.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/features/plot/test/MCTChartSpec.js b/platform/features/plot/test/MCTChartSpec.js index 9c60b034a6..2277b65975 100644 --- a/platform/features/plot/test/MCTChartSpec.js +++ b/platform/features/plot/test/MCTChartSpec.js @@ -45,8 +45,10 @@ define( jasmine.createSpy("$interval"); mockLog = jasmine.createSpyObj("$log", ["warn", "info", "debug"]); - mockScope = - jasmine.createSpyObj("$scope", ["$watchCollection", "$on"]); + mockScope = jasmine.createSpyObj( + "$scope", + ["$watchCollection", "$on", "$apply"] + ); mockElement = jasmine.createSpyObj("element", ["find", "html"]); mockInterval.cancel = jasmine.createSpy("cancelInterval"); @@ -152,7 +154,9 @@ define( // Should track canvas size in an interval expect(mockInterval).toHaveBeenCalledWith( jasmine.any(Function), - jasmine.any(Number) + jasmine.any(Number), + 0, + false ); // Verify pre-condition From 1bf73935e4802bc9785f980db2c51094097e31f8 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 3 Dec 2015 13:56:57 -0800 Subject: [PATCH 66/88] [Performance] Add test case for mct-split-pane --- .../test/directives/MCTSplitPaneSpec.js | 95 +++++++++++++++++++ platform/commonUI/general/test/suite.json | 1 + 2 files changed, 96 insertions(+) create mode 100644 platform/commonUI/general/test/directives/MCTSplitPaneSpec.js diff --git a/platform/commonUI/general/test/directives/MCTSplitPaneSpec.js b/platform/commonUI/general/test/directives/MCTSplitPaneSpec.js new file mode 100644 index 0000000000..2d5d5ac5a0 --- /dev/null +++ b/platform/commonUI/general/test/directives/MCTSplitPaneSpec.js @@ -0,0 +1,95 @@ +/***************************************************************************** + * 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/directives/MCTSplitPane"], + function (MCTSplitPane) { + 'use strict'; + + var JQLITE_METHODS = [ + 'on', + 'addClass', + 'children', + 'eq' + ]; + + describe("The mct-split-pane directive", function () { + var mockParse, + mockLog, + mockInterval, + mctSplitPane; + + beforeEach(function () { + mockParse = jasmine.createSpy('$parse'); + mockLog = + jasmine.createSpyObj('$log', ['warn', 'info', 'debug']); + mockInterval = jasmine.createSpy('$interval'); + mockInterval.cancel = jasmine.createSpy('mockCancel'); + mctSplitPane = new MCTSplitPane( + mockParse, + mockLog, + mockInterval + ); + }); + + it("is only applicable as an element", function () { + expect(mctSplitPane.restrict).toEqual("E"); + }); + + describe("when its controller is applied", function () { + var mockScope, + mockElement, + testAttrs, + mockChildren, + controller; + + beforeEach(function () { + mockScope = + jasmine.createSpyObj('$scope', ['$apply', '$watch', '$on']); + mockElement = + jasmine.createSpyObj('element', JQLITE_METHODS); + testAttrs = {}; + mockChildren = + jasmine.createSpyObj('children', JQLITE_METHODS); + + mockElement.children.andReturn(mockChildren); + mockChildren.eq.andReturn(mockChildren); + mockChildren[0] = {}; + + controller = mctSplitPane.controller[3]( + mockScope, + mockElement, + testAttrs + ); + }); + + it("sets an interval which does not trigger digests", function () { + expect(mockInterval.mostRecentCall.args[3]).toBe(false); + }); + + }); + + }); + + } +); \ No newline at end of file diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json index 6b89f83d61..de57d35102 100644 --- a/platform/commonUI/general/test/suite.json +++ b/platform/commonUI/general/test/suite.json @@ -19,6 +19,7 @@ "directives/MCTPopup", "directives/MCTResize", "directives/MCTScroll", + "directives/MCTSplitPane", "services/Popup", "services/PopupService", "services/UrlService", From 6aab9f4e34a7b1399f9594f2ee655f33466c9320 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 14:47:42 -0800 Subject: [PATCH 67/88] Added test for linking --- .../test/services/CopyServiceSpec.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js index c10efb1522..a6815a314a 100644 --- a/platform/entanglement/test/services/CopyServiceSpec.js +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -379,10 +379,28 @@ define( expect(copyFinished).toHaveBeenCalled(); }); + it("returns a promise", function () { + expect(copyResult.then).toBeDefined(); + expect(copyFinished).toHaveBeenCalled(); + }); + it ("correctly locates cloned objects", function() { expect(childObjectClone.getModel().location).toEqual(objectClone.getId()); }); + }); + describe("when cloning non-creatable objects", function() { + beforeEach(function () { + policyService.allow.callFake(function(category, object){ + return category === 'creation'; + }); + copyResult = copyService.perform(object, newParent); + copyFinished = jasmine.createSpy('copyFinished'); + copyResult.then(copyFinished); + }); + it ("creates links", function() { + expect(childObjectClone.getModel().location).toEqual(objectClone.getId()); + }); }); }); From baec0f971909092edcfe1e952cd1d3582de2262c Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 15:28:07 -0800 Subject: [PATCH 68/88] #338 added new test case for creation of links when object type is not createable --- platform/entanglement/src/services/CopyTask.js | 14 ++++++++------ .../entanglement/test/services/CopyServiceSpec.js | 12 ++++++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index d3790bf433..a12bdf2f11 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -39,6 +39,7 @@ define( function CopyTask (domainObject, parent, policyService, $q){ this.domainObject = domainObject; this.parent = parent; + this.firstClone = undefined; this.$q = $q; this.deferred = undefined; this.policyService = policyService; @@ -97,12 +98,10 @@ define( * Will add a list of clones to the specified parent's composition */ function addClonesToParent(self) { - var parentClone = self.clones[self.clones.length-1]; - - return parentClone.getCapability("persistence").persist() - .then(function(){self.parent.getCapability("composition").add(parentClone.getId())}) + return self.firstClone.getCapability("persistence").persist() + .then(function(){self.parent.getCapability("composition").add(self.firstClone.getId())}) .then(function(){return self.parent.getCapability("persistence").persist();}) - .then(function(){return parentClone;}); + .then(function(){return self.firstClone;}); } /** @@ -188,7 +187,10 @@ define( var self = this; return this.copy(self.domainObject, self.parent).then(function(domainObjectClone){ - domainObjectClone.getModel().location = self.parent.getId(); + if (domainObjectClone !== self.domainObject) { + domainObjectClone.getModel().location = self.parent.getId(); + } + self.firstClone = domainObjectClone; return self; }); }; diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js index a6815a314a..d4de5aa2aa 100644 --- a/platform/entanglement/test/services/CopyServiceSpec.js +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -390,16 +390,20 @@ define( }); describe("when cloning non-creatable objects", function() { beforeEach(function () { - policyService.allow.callFake(function(category, object){ - return category === 'creation'; + policyService.allow.andCallFake(function(category){ + //Return false for 'creation' policy + return category !== 'creation'; }); copyResult = copyService.perform(object, newParent); copyFinished = jasmine.createSpy('copyFinished'); copyResult.then(copyFinished); }); - it ("creates links", function() { - expect(childObjectClone.getModel().location).toEqual(objectClone.getId()); + it ("creates link instead of clone", function() { + var copiedObject = copyFinished.calls[0].args[0]; + expect(copiedObject).toBe(object); + expect(compositionCapability.add).toHaveBeenCalledWith(copiedObject.getId()); + //expect(newParent.getModel().composition).toContain(copiedObject.getId()); }); }); }); From 6e391098a309dbdf7956b439cf063aba8c513b2b Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 15:32:26 -0800 Subject: [PATCH 69/88] Fixed jslint error --- platform/entanglement/src/services/CopyTask.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index a12bdf2f11..93b7bc6180 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -99,7 +99,7 @@ define( */ function addClonesToParent(self) { return self.firstClone.getCapability("persistence").persist() - .then(function(){self.parent.getCapability("composition").add(self.firstClone.getId())}) + .then(function(){self.parent.getCapability("composition").add(self.firstClone.getId());}) .then(function(){return self.parent.getCapability("persistence").persist();}) .then(function(){return self.firstClone;}); } From 96249e6bcc2ad16ea3ee670cf9d615808651bfdc Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 15:51:27 -0800 Subject: [PATCH 70/88] Removed redundant line in test spec --- platform/entanglement/test/services/CopyServiceSpec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js index d4de5aa2aa..f3530d37ef 100644 --- a/platform/entanglement/test/services/CopyServiceSpec.js +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -174,7 +174,6 @@ define( ['notify', 'resolve', 'reject'] ); mockDeferred.notify.andCallFake(function(notification){}); - mockDeferred.reject.andCallFake(function(){}); mockDeferred.resolve.andCallFake(function(value){resolvedValue = value;}); mockDeferred.promise = { then: function(callback){ From f8099550bd81511cd41a0ce3e4cccb11e5770a69 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 16:22:45 -0800 Subject: [PATCH 71/88] [Copy] #338 updated code style in CreationPolicy --- .../browse/src/creation/CreationPolicy.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/platform/commonUI/browse/src/creation/CreationPolicy.js b/platform/commonUI/browse/src/creation/CreationPolicy.js index 0ccf82d907..28749e711f 100644 --- a/platform/commonUI/browse/src/creation/CreationPolicy.js +++ b/platform/commonUI/browse/src/creation/CreationPolicy.js @@ -27,23 +27,19 @@ define( "use strict"; /** - * A policy for determining whether objects of a certain type can be + * A policy for determining whether objects of a given type can be * created. - * @returns {{allow: Function}} * @constructor + * @implements {Policy} + * @memberof platform/commonUI/browse */ function CreationPolicy() { - return { - /** - * Only allow creation of object types that have the - * Creation capability - */ - allow: function (type) { - return type.hasFeature("creation"); - } - }; } + CreationPolicy.prototype.allow = function (type) { + return type.hasFeature("creation"); + }; + return CreationPolicy; } ); \ No newline at end of file From 6aa77ff4687318622eb832c569acadac6608aa0b Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 16:41:06 -0800 Subject: [PATCH 72/88] #338 fixed failing test --- platform/entanglement/src/services/CopyTask.js | 4 ---- .../entanglement/test/services/CopyServiceSpec.js | 12 ++++++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index 93b7bc6180..43ec1960b4 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -203,10 +203,6 @@ define( CopyTask.prototype.perform = function(){ this.deferred = this.$q.defer(); - if (!this.parent.hasCapability('composition')){ - return this.$q.reject(); - } - this.buildCopyPlan() .then(persistObjects) .then(addClonesToParent) diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js index f3530d37ef..3d4ebf147e 100644 --- a/platform/entanglement/test/services/CopyServiceSpec.js +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -412,15 +412,23 @@ define( object = domainObjectFactory({ name: 'object', capabilities: { - type: { type: 'object' } + type: { type: 'object' }, + location: locationCapability, + persistence: persistenceCapability } }); + newParent = domainObjectFactory({ name: 'parentCandidate', capabilities: { - type: { type: 'parentCandidate' } + type: { type: 'parentCandidate' }, + instantiation: instantiationCapability, + composition: compositionCapability, + persistence: persistenceCapability } }); + + instantiationCapability.invoke.andReturn(object); }); it("throws an error", function () { From dd4dbc9326f72abae7b1ab63c33ef5f9bad3b419 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 3 Dec 2015 16:45:30 -0800 Subject: [PATCH 73/88] [Performance] Update spec for ElasticIndicator ...to reflect changes in call to reduce digest frequency. --- platform/persistence/elastic/test/ElasticIndicatorSpec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/persistence/elastic/test/ElasticIndicatorSpec.js b/platform/persistence/elastic/test/ElasticIndicatorSpec.js index 196bc77a83..63aa49f0ac 100644 --- a/platform/persistence/elastic/test/ElasticIndicatorSpec.js +++ b/platform/persistence/elastic/test/ElasticIndicatorSpec.js @@ -55,6 +55,7 @@ define( expect(mockInterval).toHaveBeenCalledWith( jasmine.any(Function), testInterval, + 0, false ); }); From 57efe4e0d13b639d3a53adbdf6a669c2c63b4868 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 17:10:28 -0800 Subject: [PATCH 74/88] Removed UUID reference --- platform/entanglement/src/services/CopyTask.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index 43ec1960b4..6ac6bcc6a8 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -23,8 +23,8 @@ /*global define */ define( - ["uuid"], - function (uuid) { + [], + function () { "use strict"; /** @@ -148,7 +148,7 @@ define( // creation capability of the targetParent to create the // new clone. This will ensure that the correct persistence // space is used. - clone = this.parent.hasCapability("instantiation") && this.parent.useCapability("instantiation", cloneObjectModel(originalObject.getModel())); + clone = this.parent.useCapability("instantiation", cloneObjectModel(originalObject.getModel())); //Iterate through child tree return this.$q.when(originalObject.useCapability('composition')).then(function(composees){ From b388c76e457bae87d0b94207a34433f0d4ce54fc Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 18:24:38 -0800 Subject: [PATCH 75/88] [copy] #338 Modified check to set object location, added setLocation flag, Removed unused parameter --- .../entanglement/src/services/CopyTask.js | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/platform/entanglement/src/services/CopyTask.js b/platform/entanglement/src/services/CopyTask.js index 6ac6bcc6a8..d20c233b42 100644 --- a/platform/entanglement/src/services/CopyTask.js +++ b/platform/entanglement/src/services/CopyTask.js @@ -47,14 +47,14 @@ define( this.clones = []; } - function composeChild(child, parent) { + function composeChild(child, parent, setLocation) { //Once copied, associate each cloned // composee with its parent clone parent.getModel().composition.push(child.getId()); - //Check if the object being composed is a link - if (!child.getCapability("location").isLink()) { + //If a location is not specified, set it. + if (setLocation && child.getModel().location === undefined) { child.getModel().location = parent.getId(); } } @@ -113,13 +113,16 @@ define( CopyTask.prototype.copyComposees = function(composees, clonedParent, originalParent){ var self = this; - return (composees || []).reduce(function(promise, composee){ + return (composees || []).reduce(function(promise, originalComposee){ //If the composee is composed of other // objects, chain a promise.. return promise.then(function(){ // ...to recursively copy it (and its children) - return self.copy(composee, originalParent).then(function(composee){ - return composeChild(composee, clonedParent); + return self.copy(originalComposee, originalParent).then(function(clonedComposee){ + //Compose the child within its parent. Cloned + // objects will need to also have their location + // set, however linked objects will not. + return composeChild(clonedComposee, clonedParent, clonedComposee !== originalComposee); }); });}, self.$q.when(undefined) ); @@ -132,11 +135,11 @@ define( * cloning objects, and composing them with their child clones * as it goes * @private - * @param originalObject - * @param originalParent - * @returns {*} + * @returns {DomainObject} If the type of the original object allows for + * duplication, then a duplicate of the object, otherwise the object + * itself (to allow linking to non duplicatable objects). */ - CopyTask.prototype.copy = function(originalObject, originalParent) { + CopyTask.prototype.copy = function(originalObject) { var self = this, clone; From fefd27162c87f52ad574a5a8392d41ad64f16785 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 30 Nov 2015 15:26:00 -0800 Subject: [PATCH 76/88] [Entanglement] Allow cross-space linking Allow links across spaces; only disallow move or copy. Addresses WTD-1587 --- platform/entanglement/src/policies/CrossSpacePolicy.js | 4 +--- platform/entanglement/test/policies/CrossSpacePolicySpec.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/entanglement/src/policies/CrossSpacePolicy.js b/platform/entanglement/src/policies/CrossSpacePolicy.js index a113972815..c47e653f08 100644 --- a/platform/entanglement/src/policies/CrossSpacePolicy.js +++ b/platform/entanglement/src/policies/CrossSpacePolicy.js @@ -28,9 +28,7 @@ define( var DISALLOWED_ACTIONS = [ "move", - "copy", - "link", - "compose" + "copy" ]; /** diff --git a/platform/entanglement/test/policies/CrossSpacePolicySpec.js b/platform/entanglement/test/policies/CrossSpacePolicySpec.js index 214efc1cc3..a0b030f04f 100644 --- a/platform/entanglement/test/policies/CrossSpacePolicySpec.js +++ b/platform/entanglement/test/policies/CrossSpacePolicySpec.js @@ -72,7 +72,7 @@ define( policy = new CrossSpacePolicy(); }); - ['move', 'copy', 'link', 'compose'].forEach(function (key) { + ['move', 'copy'].forEach(function (key) { describe("for " + key + " actions", function () { beforeEach(function () { testActionMetadata.key = key; From 00f96c314a914f0039489e069e569854cf0bea30 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 3 Dec 2015 20:25:28 -0800 Subject: [PATCH 77/88] [persistence] #58 added tests for notification on persistence error --- .../src/capabilities/PersistenceCapability.js | 18 +- .../capabilities/PersistenceCapabilitySpec.js | 163 ++++++++++++------ 2 files changed, 124 insertions(+), 57 deletions(-) diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js index 7ca4b28e2b..74e9d421ec 100644 --- a/platform/core/src/capabilities/PersistenceCapability.js +++ b/platform/core/src/capabilities/PersistenceCapability.js @@ -89,16 +89,28 @@ define( } } + function formatError(error){ + if (error && error.message) { + return error.message; + } else if (error && typeof error === "string"){ + return error; + } else { + return "unknown error"; + } + } + /** * Display a notification message if an error has occurred during * persistence. */ function notifyOnError(error, domainObject, notificationService, $q){ - var errorMessage = "Unable to persist " + domainObject.model.name + ": "; - errorMessage += typeof error === "string" ? error : error.message; + var errorMessage = "Unable to persist " + domainObject.getModel().name; + if (error) { + errorMessage += ": " + formatError(error); + } notificationService.error({ - title: "Error persisting " + domainObject.model.name, + title: "Error persisting " + domainObject.getModel().name, hint: errorMessage || "Unknown error" }); diff --git a/platform/core/test/capabilities/PersistenceCapabilitySpec.js b/platform/core/test/capabilities/PersistenceCapabilitySpec.js index 5b40e34c64..aad76c4233 100644 --- a/platform/core/test/capabilities/PersistenceCapabilitySpec.js +++ b/platform/core/test/capabilities/PersistenceCapabilitySpec.js @@ -20,6 +20,7 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ +/*jslint es5: true */ /** * PersistenceCapabilitySpec. Created by vwoeltje on 11/6/14. @@ -34,24 +35,36 @@ define( mockIdentifierService, mockDomainObject, mockIdentifier, + mockAlertService, + mockQ, id = "object id", - model = { someKey: "some value"}, + model, SPACE = "some space", - persistence; + persistence, + happyPromise; - function asPromise(value) { + function asPromise(value, doCatch) { return (value || {}).then ? value : { then: function (callback) { return asPromise(callback(value)); + }, + catch: function(callback) { + //Define a default 'happy' catch, that skips over the + // catch callback + return doCatch ? asPromise(callback(value)): asPromise(value); } }; } beforeEach(function () { + happyPromise = asPromise(true); + model = { someKey: "some value", name: "domain object"}; + mockPersistenceService = jasmine.createSpyObj( "persistenceService", [ "updateObject", "readObject", "createObject", "deleteObject" ] ); + mockIdentifierService = jasmine.createSpyObj( 'identifierService', [ 'parse', 'generate' ] @@ -60,6 +73,15 @@ define( 'identifier', [ 'getSpace', 'getKey', 'getDefinedSpace' ] ); + mockQ = jasmine.createSpyObj( + "$q", + ["reject"] + ); + mockAlertService = jasmine.createSpyObj( + "notificationService", + ["error"] + ); + mockDomainObject = { getId: function () { return id; }, getModel: function () { return model; }, @@ -76,66 +98,99 @@ define( persistence = new PersistenceCapability( mockPersistenceService, mockIdentifierService, + mockAlertService, + mockQ, mockDomainObject ); }); - it("creates unpersisted objects with the persistence service", function () { - // Verify precondition; no call made during constructor - expect(mockPersistenceService.createObject).not.toHaveBeenCalled(); + describe("successful persistence", function() { + beforeEach(function () { + mockPersistenceService.updateObject.andReturn(happyPromise); + mockPersistenceService.createObject.andReturn(happyPromise); + }); + it("creates unpersisted objects with the persistence service", function () { + // Verify precondition; no call made during constructor + expect(mockPersistenceService.createObject).not.toHaveBeenCalled(); - persistence.persist(); + persistence.persist(); - expect(mockPersistenceService.createObject).toHaveBeenCalledWith( - SPACE, - id, - model - ); + expect(mockPersistenceService.createObject).toHaveBeenCalledWith( + SPACE, + id, + model + ); + }); + + it("updates previously persisted objects with the persistence service", function () { + // Verify precondition; no call made during constructor + expect(mockPersistenceService.updateObject).not.toHaveBeenCalled(); + + model.persisted = 12321; + persistence.persist(); + + expect(mockPersistenceService.updateObject).toHaveBeenCalledWith( + SPACE, + id, + model + ); + }); + + it("reports which persistence space an object belongs to", function () { + expect(persistence.getSpace()).toEqual(SPACE); + }); + + it("updates persisted timestamp on persistence", function () { + model.modified = 12321; + persistence.persist(); + expect(model.persisted).toEqual(12321); + }); + it("refreshes the domain object model from persistence", function () { + var refreshModel = {someOtherKey: "some other value"}; + mockPersistenceService.readObject.andReturn(asPromise(refreshModel)); + persistence.refresh(); + expect(model).toEqual(refreshModel); + }); + + it("does not overwrite unpersisted changes on refresh", function () { + var refreshModel = {someOtherKey: "some other value"}, + mockCallback = jasmine.createSpy(); + model.modified = 2; + model.persisted = 1; + mockPersistenceService.readObject.andReturn(asPromise(refreshModel)); + persistence.refresh().then(mockCallback); + expect(model).not.toEqual(refreshModel); + // Should have also indicated that no changes were actually made + expect(mockCallback).toHaveBeenCalledWith(false); + }); + + it("does not trigger error notification on successful" + + " persistence", function () { + persistence.persist(); + expect(mockQ.reject).not.toHaveBeenCalled(); + expect(mockAlertService.error).not.toHaveBeenCalled(); + }); }); + describe("unsuccessful persistence", function() { + var sadPromise = { + then: function(callback){ + return asPromise(callback(0), true); + } + }; + beforeEach(function () { + mockPersistenceService.createObject.andReturn(sadPromise); + }); + it("rejects on falsey persistence result", function () { + persistence.persist(); + expect(mockQ.reject).toHaveBeenCalled(); + }); - it("updates previously persisted objects with the persistence service", function () { - // Verify precondition; no call made during constructor - expect(mockPersistenceService.updateObject).not.toHaveBeenCalled(); - - model.persisted = 12321; - persistence.persist(); - - expect(mockPersistenceService.updateObject).toHaveBeenCalledWith( - SPACE, - id, - model - ); + it("notifies user on persistence failure", function () { + persistence.persist(); + expect(mockQ.reject).toHaveBeenCalled(); + expect(mockAlertService.error).toHaveBeenCalled(); + }); }); - - it("reports which persistence space an object belongs to", function () { - expect(persistence.getSpace()).toEqual(SPACE); - }); - - it("updates persisted timestamp on persistence", function () { - model.modified = 12321; - persistence.persist(); - expect(model.persisted).toEqual(12321); - }); - - it("refreshes the domain object model from persistence", function () { - var refreshModel = { someOtherKey: "some other value" }; - mockPersistenceService.readObject.andReturn(asPromise(refreshModel)); - persistence.refresh(); - expect(model).toEqual(refreshModel); - }); - - it("does not overwrite unpersisted changes on refresh", function () { - var refreshModel = { someOtherKey: "some other value" }, - mockCallback = jasmine.createSpy(); - model.modified = 2; - model.persisted = 1; - mockPersistenceService.readObject.andReturn(asPromise(refreshModel)); - persistence.refresh().then(mockCallback); - expect(model).not.toEqual(refreshModel); - // Should have also indicated that no changes were actually made - expect(mockCallback).toHaveBeenCalledWith(false); - }); - }); } ); From eb4959cf4927403a16c0c32023165fc47c318b88 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 4 Dec 2015 10:45:49 -0800 Subject: [PATCH 78/88] [persistence] #58 renamed alertService to notificationService --- .../core/src/capabilities/PersistenceCapability.js | 6 +++--- .../test/capabilities/PersistenceCapabilitySpec.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js index 74e9d421ec..637be193c2 100644 --- a/platform/core/src/capabilities/PersistenceCapability.js +++ b/platform/core/src/capabilities/PersistenceCapability.js @@ -48,7 +48,7 @@ define( function PersistenceCapability( persistenceService, identifierService, - alertService, + notificationService, $q, domainObject ) { @@ -58,7 +58,7 @@ define( this.domainObject = domainObject; this.identifierService = identifierService; this.persistenceService = persistenceService; - this.alertService = alertService; + this.notificationService = notificationService; this.$q = $q; } @@ -147,7 +147,7 @@ define( ]).then(function(result){ return rejectIfFalsey(result, self.$q); }).catch(function(error){ - return notifyOnError(error, domainObject, self.alertService, self.$q); + return notifyOnError(error, domainObject, self.notificationService, self.$q); }); }; diff --git a/platform/core/test/capabilities/PersistenceCapabilitySpec.js b/platform/core/test/capabilities/PersistenceCapabilitySpec.js index aad76c4233..5b46ca3890 100644 --- a/platform/core/test/capabilities/PersistenceCapabilitySpec.js +++ b/platform/core/test/capabilities/PersistenceCapabilitySpec.js @@ -35,7 +35,7 @@ define( mockIdentifierService, mockDomainObject, mockIdentifier, - mockAlertService, + mockNofificationService, mockQ, id = "object id", model, @@ -77,7 +77,7 @@ define( "$q", ["reject"] ); - mockAlertService = jasmine.createSpyObj( + mockNofificationService = jasmine.createSpyObj( "notificationService", ["error"] ); @@ -98,7 +98,7 @@ define( persistence = new PersistenceCapability( mockPersistenceService, mockIdentifierService, - mockAlertService, + mockNofificationService, mockQ, mockDomainObject ); @@ -168,7 +168,7 @@ define( " persistence", function () { persistence.persist(); expect(mockQ.reject).not.toHaveBeenCalled(); - expect(mockAlertService.error).not.toHaveBeenCalled(); + expect(mockNofificationService.error).not.toHaveBeenCalled(); }); }); describe("unsuccessful persistence", function() { @@ -188,7 +188,7 @@ define( it("notifies user on persistence failure", function () { persistence.persist(); expect(mockQ.reject).toHaveBeenCalled(); - expect(mockAlertService.error).toHaveBeenCalled(); + expect(mockNofificationService.error).toHaveBeenCalled(); }); }); }); From d5f054e3287e8f15d9da31d8378df797a2990bf1 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 11:20:19 -0800 Subject: [PATCH 79/88] [Edit] Test return type ...from the edit-mode-wrapped persistence capability. --- .../test/capabilities/EditablePersistenceCapabilitySpec.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/platform/commonUI/edit/test/capabilities/EditablePersistenceCapabilitySpec.js b/platform/commonUI/edit/test/capabilities/EditablePersistenceCapabilitySpec.js index f442bf106b..7fa0ac0dd7 100644 --- a/platform/commonUI/edit/test/capabilities/EditablePersistenceCapabilitySpec.js +++ b/platform/commonUI/edit/test/capabilities/EditablePersistenceCapabilitySpec.js @@ -31,6 +31,7 @@ define( mockEditableObject, mockDomainObject, mockCache, + mockPromise, capability; beforeEach(function () { @@ -50,7 +51,9 @@ define( "cache", [ "markDirty" ] ); + mockPromise = jasmine.createSpyObj("promise", ["then"]); + mockCache.markDirty.andReturn(mockPromise); mockDomainObject.getCapability.andReturn(mockPersistence); capability = new EditablePersistenceCapability( @@ -84,6 +87,10 @@ define( expect(mockPersistence.refresh).toHaveBeenCalled(); }); + it("returns a promise from persist", function () { + expect(capability.persist().then).toEqual(jasmine.any(Function)); + }); + }); } ); \ No newline at end of file From b25576aed8d1e95607270514569e68f57b6c5311 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 12:20:05 -0800 Subject: [PATCH 80/88] [Documentation] Sketch initial test procedures Sketch initial test procedures; add explanation on the difference between sprint and release testing. --- docs/src/process/testing/plan.md | 9 +-- docs/src/process/testing/procedures.md | 98 +++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 6 deletions(-) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index 181ba143f4..fead5f5a50 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -100,9 +100,10 @@ by the [Author Checklist](https://github.com/nasa/openmctweb/blob/master/CONTRIB Before a sprint is closed, the development team must additionally perform: -* _User testing_ (both generally, and for areas which interact with - changes made during the sprint.) -* _Long-duration testing_ (specifically, for 24 hours.) +* A relevant subset of [_user testing_](procedures.md#user-test-procedures) + identified by the acting [project manager](../cycle.md#roles). +* [_Long-duration testing_](procedures.md#long-duration-testng) + (specifically, for 24 hours.) Issues are reported as a product of both forms of testing. @@ -114,7 +115,7 @@ remain open. ### Per-release Testing As [per-sprint testing](#per-sprint-testing), except that _user testing_ -should be comprehensive, with less focus on changes from the specific +should cover all test cases, with less focus on changes from the specific sprint or release. Per-release testing should also include any acceptance testing steps diff --git a/docs/src/process/testing/procedures.md b/docs/src/process/testing/procedures.md index 4bcd39d4a6..60529d4fa7 100644 --- a/docs/src/process/testing/procedures.md +++ b/docs/src/process/testing/procedures.md @@ -38,7 +38,7 @@ Prerequisites | Create a layout, as in MCT-TEST-000Z Test input | Domain object database XYZ Instructions | See below * Expectation | Change to editing context † -Eval. criteria | Visual insepction +Eval. criteria | Visual inspection * Follow the following steps: @@ -72,4 +72,98 @@ a common glossary, to avoid replication of content. ## Procedures -This section will contain specific test procedures. +This section will contain specific test procedures. Presently, procedures +are placeholders describing general patterns for setting up and conducting +testing. + +### User Testing Setup + +These procedures describes a general pattern for setting up for user +testing. Specific deployments should customize this pattern with +relevant data and any additional steps necessary. + +Property | Value +---------------|--------------------------------------------------------------- +Test ID | MCT-TEST-SETUP0 - User Testing Setup +Relevant reqs. | TBD +Prerequisites | Build of relevant components +Test input | Exemplary database; exemplary telemetry data set +Instructions | See below +Expectation | Able to load application in a web browser (Google Chrome) +Eval. criteria | Visual inspection + +Instructions: + +1. Start telemetry server. +2. Start ElasticSearch. +3. Restore database snapshot to ElasticSearch. +4. Start telemetry playback. +5. Start HTTP server for client sources. + +### User Test Procedures + +Specific user test cases have not yet been authored. In their absence, +user testing is conducted by: + +* Reviewing the text of issues from the issue tracker to understand the + desired behavior, and exercising this behavior in the running application. + (For instance, by following steps to reproduce from the original issue.) + * Issues which appear to be resolved should be marked as such with comments + on the original issue (e.g. "verified during user testing MM/DD/YYYY".) + * Issues which appear not to have been resolved should be reopened with an + explanation of what unexpected behavior has been observed. + * In cases where an issue appears resolved as-worded but other related + undesirable behavior is observed during testing, a new issue should be + opened, and linked to from a comment in the original issues. +* General usage of new features and/or existing features which have undergone + recent changes. Defects or problems with usability should be documented + by filing issues in the issue tracker. +* Open-ended testing to discover defects, identify usability issues, and + generate feature requests. + +### Long-Duration Testing + +The purpose of long-duration testing is to identify performance issues +and/or other defects which are sensitive to the amount of time the +application is kept running. (Memory leaks, for instance.) + +Property | Value +---------------|--------------------------------------------------------------- +Test ID | MCT-TEST-LDT0 - Long-duration Testing +Relevant reqs. | TBD +Prerequisites | MCT-TEST-SETUP0 +Test input | (As for test setup.) +Instructions | See "Instructions" below * +Expectation | See "Expectations" below † +Eval. criteria | Visual inspection + +* Instructions: + +1. Start `top` or a similar tool to measure CPU usage and memory utilization. +2. Open several user-created displays (as many as would be realistically + opened during actual usage in a stressing case) in some combination of + separate tabs and windows (approximately as many tabs-per-window as + total windows.) +3. Ensure that playback data is set to run continuously for at least 24 hours + (e.g. on a loop.) +4. Record CPU usage and memory utilization. +5. In at least one tab, try some general user interface gestures and make + notes about the subjective experience of using the application. (Particularly, + the degree of responsiveness.) +6. Leave client displays open for 24 hours. +7. Record CPU usage and memory utilization again. +8. Make additional notes about the subjective experience of using the + application (again, particularly responsiveness.) +9. Check logs for any unexpected warnings or errors. + +&daggers; Expectations: + +* At the end of the test, CPU usage and memory usage should both be similar + to their levels at the start of the test. +* At the end of the test, subjective usage of the application should not + be observably different from the way it was at the start of the test. + (In particular, responsiveness should not decrease.) +* Logs should not contain any unexpected warnings or errors ("expected" + warnings or errors are those that have been documented and prioritized + as known issues, or those that are explained by transient conditions + external to the software, such as network outages.) \ No newline at end of file From e0608ddee076b7bda0c8ea4a2f45fc3449f14252 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 13:25:20 -0800 Subject: [PATCH 81/88] [Documentation] Simplify Author Checklist ...as discussed in https://github.com/nasa/openmctweb/pull/349 --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7e8e15eae3..e726007800 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -291,8 +291,7 @@ checklist.) 1. Changes address original issue? 2. Unit tests included and/or updated with changes? 3. Command line build passes? -4. Expect to pass code review? -5. Changes have been smoke-tested? +4. Changes have been smoke-tested? ### Reviewer Checklist From 989c937ce1d1d5e9b9d79a8c4397688783286a20 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 13:29:19 -0800 Subject: [PATCH 82/88] [Documentation] Fix typo in HTML entity --- docs/src/process/testing/procedures.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/process/testing/procedures.md b/docs/src/process/testing/procedures.md index 60529d4fa7..b33f88c6d1 100644 --- a/docs/src/process/testing/procedures.md +++ b/docs/src/process/testing/procedures.md @@ -156,7 +156,7 @@ Eval. criteria | Visual inspection application (again, particularly responsiveness.) 9. Check logs for any unexpected warnings or errors. -&daggers; Expectations: +† Expectations: * At the end of the test, CPU usage and memory usage should both be similar to their levels at the start of the test. From a6ceae4045327797a6b1e59aeaa8989e1e9fe3e6 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 13:53:45 -0800 Subject: [PATCH 83/88] [Common UI] Show warning at startup Show a warning about unsupported browsers at startup, https://github.com/nasa/openmctweb/issues/137 --- platform/commonUI/general/bundle.json | 4 ++ .../general/src/UnsupportedBrowserWarning.js | 57 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 platform/commonUI/general/src/UnsupportedBrowserWarning.js diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 5976b912cc..dc4d844bc7 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -19,6 +19,10 @@ { "implementation": "StyleSheetLoader.js", "depends": [ "stylesheets[]", "$document", "THEME" ] + }, + { + "implementation": "UnsupportedBrowserWarning.js", + "depends": [ "notificationService" ] } ], "stylesheets": [ diff --git a/platform/commonUI/general/src/UnsupportedBrowserWarning.js b/platform/commonUI/general/src/UnsupportedBrowserWarning.js new file mode 100644 index 0000000000..a131f8c973 --- /dev/null +++ b/platform/commonUI/general/src/UnsupportedBrowserWarning.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*/ + +/** + * This bundle provides various general-purpose UI elements, including + * platform styling. + * @namespace platform/commonUI/general + */ +define( + [], + function () { + "use strict"; + + var WARNING_TITLE = "Unsupported browser", + WARNING_DESCRIPTION = [ + "This software has been developed and tested", + "using the latest Google Chrome,", + "and may be unstable in other browsers." + ].join(" "); + + /** + * Shows a warning if a user's browser is unsupported. + * @memberof platform/commonUI/general + * @constructor + * @param {NotificationService} notificationService the notification + * service + */ + function UnsupportedBrowserWarning(notificationService) { + notificationService.alert({ + title: WARNING_TITLE, + actionText: WARNING_DESCRIPTION + }); + } + + return UnsupportedBrowserWarning; + } +); From 37890280aeb3d34106869c3cb15c017099af949a Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 14:08:42 -0800 Subject: [PATCH 84/88] [Common UI] Only show warning for unsupported browsers --- platform/commonUI/general/bundle.json | 2 +- .../general/src/UnsupportedBrowserWarning.js | 19 +++++++++++++------ platform/commonUI/mobile/src/AgentService.js | 13 +++++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index dc4d844bc7..76814df12a 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -22,7 +22,7 @@ }, { "implementation": "UnsupportedBrowserWarning.js", - "depends": [ "notificationService" ] + "depends": [ "notificationService", "agentService" ] } ], "stylesheets": [ diff --git a/platform/commonUI/general/src/UnsupportedBrowserWarning.js b/platform/commonUI/general/src/UnsupportedBrowserWarning.js index a131f8c973..f2fa0c3f20 100644 --- a/platform/commonUI/general/src/UnsupportedBrowserWarning.js +++ b/platform/commonUI/general/src/UnsupportedBrowserWarning.js @@ -36,7 +36,9 @@ define( "This software has been developed and tested", "using the latest Google Chrome,", "and may be unstable in other browsers." - ].join(" "); + ].join(" "), + MOBILE_BROWSER = "Safari", + DESKTOP_BROWSER = "Chrome"; /** * Shows a warning if a user's browser is unsupported. @@ -45,11 +47,16 @@ define( * @param {NotificationService} notificationService the notification * service */ - function UnsupportedBrowserWarning(notificationService) { - notificationService.alert({ - title: WARNING_TITLE, - actionText: WARNING_DESCRIPTION - }); + function UnsupportedBrowserWarning(notificationService, agentService) { + var testToBrowser = agentService.isMobile() ? + MOBILE_BROWSER : DESKTOP_BROWSER; + + if (!agentService.isBrowser(testToBrowser)) { + notificationService.alert({ + title: WARNING_TITLE, + actionText: WARNING_DESCRIPTION + }); + } } return UnsupportedBrowserWarning; diff --git a/platform/commonUI/mobile/src/AgentService.js b/platform/commonUI/mobile/src/AgentService.js index 26bb173ee7..109520d8bd 100644 --- a/platform/commonUI/mobile/src/AgentService.js +++ b/platform/commonUI/mobile/src/AgentService.js @@ -43,6 +43,7 @@ define( var userAgent = $window.navigator.userAgent, matches = userAgent.match(/iPad|iPhone|Android/i) || []; + this.userAgent = userAgent; this.mobileName = matches[0]; this.$window = $window; } @@ -91,6 +92,18 @@ define( return !this.isPortrait(); }; + /** + * Check if the user agent matches a certain named device, + * as indicated by checking for a case-insensitive substring + * match. + * @param {string} name the name to check for + * @returns {boolean} true if the user agent includes that name + */ + AgentService.prototype.isBrowser = function (name) { + name = name.toLowerCase(); + return this.userAgent.toLowerCase().indexOf(name) !== -1; + }; + return AgentService; } ); From d2a4a85e04258ad40d7723d764d56d1ba391a15d Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 14:12:00 -0800 Subject: [PATCH 85/88] [Common UI] Test agentService.isBrowser --- platform/commonUI/mobile/test/AgentServiceSpec.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/platform/commonUI/mobile/test/AgentServiceSpec.js b/platform/commonUI/mobile/test/AgentServiceSpec.js index c0735e3f4c..573e72ddfb 100644 --- a/platform/commonUI/mobile/test/AgentServiceSpec.js +++ b/platform/commonUI/mobile/test/AgentServiceSpec.js @@ -81,6 +81,13 @@ define( expect(agentService.isPortrait()).toBeTruthy(); expect(agentService.isLandscape()).toBeFalsy(); }); + + it("allows for checking browser type", function () { + testWindow.navigator.userAgent = "Chromezilla Safarifox"; + agentService = new AgentService(testWindow); + expect(agentService.isBrowser("Chrome")).toBe(true); + expect(agentService.isBrowser("Firefox")).toBe(false); + }); }); } ); From fc729279ec73f4ba6892f5155accf3f440369859 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 15:11:40 -0800 Subject: [PATCH 86/88] [Common UI] Add spec for unsupported browser warning --- .../test/UnsupportedBrowserWarningSpec.js | 98 +++++++++++++++++++ platform/commonUI/general/test/suite.json | 3 +- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 platform/commonUI/general/test/UnsupportedBrowserWarningSpec.js diff --git a/platform/commonUI/general/test/UnsupportedBrowserWarningSpec.js b/platform/commonUI/general/test/UnsupportedBrowserWarningSpec.js new file mode 100644 index 0000000000..507a92c62f --- /dev/null +++ b/platform/commonUI/general/test/UnsupportedBrowserWarningSpec.js @@ -0,0 +1,98 @@ +/***************************************************************************** + * 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/UnsupportedBrowserWarning"], + function (UnsupportedBrowserWarning) { + "use strict"; + + var MOBILE_BROWSER = "Safari", + DESKTOP_BROWSER = "Chrome", + UNSUPPORTED_BROWSERS = [ + "Firefox", + "IE", + "Opera", + "Iceweasel" + ]; + + describe("The unsupported browser warning", function () { + var mockNotificationService, + mockAgentService, + testAgent; + + function instantiateWith(browser) { + testAgent = "Mozilla/5.0 " + browser + "/12.34.56"; + return new UnsupportedBrowserWarning( + mockNotificationService, + mockAgentService + ); + } + + beforeEach(function () { + testAgent = "chrome"; + mockNotificationService = jasmine.createSpyObj( + "notificationService", + [ "alert" ] + ); + mockAgentService = jasmine.createSpyObj( + "agentService", + [ "isMobile", "isBrowser" ] + ); + mockAgentService.isBrowser.andCallFake(function (substr) { + substr = substr.toLowerCase(); + return testAgent.toLowerCase().indexOf(substr) !== -1; + }); + }); + + [ false, true ].forEach(function (isMobile) { + var deviceType = isMobile ? "mobile" : "desktop", + goodBrowser = isMobile ? MOBILE_BROWSER : DESKTOP_BROWSER, + badBrowsers = UNSUPPORTED_BROWSERS.concat([ + isMobile ? DESKTOP_BROWSER : MOBILE_BROWSER + ]); + + describe("on " + deviceType + " devices", function () { + beforeEach(function () { + mockAgentService.isMobile.andReturn(isMobile); + }); + + it("is not shown for " + goodBrowser, function () { + instantiateWith(goodBrowser); + expect(mockNotificationService.alert) + .not.toHaveBeenCalled(); + }); + + badBrowsers.forEach(function (badBrowser) { + it("is shown for " + badBrowser, function () { + instantiateWith(badBrowser); + expect(mockNotificationService.alert) + .toHaveBeenCalled(); + }); + }); + }); + }); + + }); + } +); + diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json index 6b89f83d61..d942ef3170 100644 --- a/platform/commonUI/general/test/suite.json +++ b/platform/commonUI/general/test/suite.json @@ -22,5 +22,6 @@ "services/Popup", "services/PopupService", "services/UrlService", - "StyleSheetLoader" + "StyleSheetLoader", + "UnsupportedBrowserWarning" ] From c02f96546048287d2eda3824d9305b694c87cb9a Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Dec 2015 15:19:34 -0800 Subject: [PATCH 87/88] [Time Conductor] Remove unused property ...from structure passed into date-time field. Note in code review, https://github.com/nasa/openmctweb/pull/347 --- .../general/res/templates/controls/time-controller.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index 09631a1f83..335dee61c3 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -37,7 +37,7 @@ Date: Fri, 4 Dec 2015 15:55:32 -0800 Subject: [PATCH 88/88] [Frontend] Adjusted desktop breakpoint open #169 --- .../general/res/sass/mobile/_constants.scss | 2 +- .../espresso/res/css/theme-espresso.css | 66 +++++++++---------- .../themes/snow/res/css/theme-snow.css | 62 ++++++++--------- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/platform/commonUI/general/res/sass/mobile/_constants.scss b/platform/commonUI/general/res/sass/mobile/_constants.scss index b6dddbf593..1a794b29f6 100644 --- a/platform/commonUI/general/res/sass/mobile/_constants.scss +++ b/platform/commonUI/general/res/sass/mobile/_constants.scss @@ -39,7 +39,7 @@ $mobileTreeRightArrowW: 30px; $phoMaxW: 767px; $tabMinW: 768px; $tabMaxW: 1024px; -$desktopMinW: 1280px; +$desktopMinW: 1025px; /************************** MEDIA QUERIES: WINDOW CHECKS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */ $screenPortrait: "(orientation: portrait)"; diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 13e8554832..2493661aa8 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; } @@ -990,7 +990,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { right: 100%; } - @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { width: 0; @@ -998,14 +998,14 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { border-top: 6.66667px solid transparent; border-bottom: 6.66667px solid transparent; border-right: 10px solid #ddd; } } - @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* 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 only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 95, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right .l-infobubble::before { width: 0; @@ -1647,7 +1647,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } @@ -1686,7 +1686,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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); } @@ -1728,7 +1728,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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); } @@ -1759,7 +1759,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab { -moz-border-radius: 3px; @@ -1829,14 +1829,14 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { color: #0099cc; } } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } /* line 304, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: #33ccff; } } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } @@ -1925,7 +1925,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #595959; @@ -2314,7 +2314,7 @@ label.checkbox.custom { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 240, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; @@ -2657,7 +2657,7 @@ label.checkbox.custom { color: inherit; } /******************************************************** BROWSER ELEMENTS */ -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 485, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; @@ -3359,7 +3359,7 @@ label.checkbox.custom { /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { @@ -3430,7 +3430,7 @@ label.checkbox.custom { .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 304, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } @@ -3961,7 +3961,7 @@ textarea { /* line 297, ../../../../general/res/sass/_mixins.scss */ .select .icon, .select .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover { background: linear-gradient(#6b6b6b, #5e5e5e); } @@ -4472,7 +4472,7 @@ span.req { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { z-index: 5; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { top: 10px; @@ -4698,7 +4698,7 @@ span.req { .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ .holder-all { min-width: 600px; } @@ -4960,7 +4960,7 @@ span.req { /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } @@ -5452,7 +5452,7 @@ span.req { /* line 297, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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); } @@ -5647,7 +5647,7 @@ ul.tree { margin-left: 5px; font-size: 0.75em; width: 10px; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 56, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control:hover, .search-result-item .view-control:hover { @@ -5780,7 +5780,7 @@ ul.tree { .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { color: #cccccc; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 136, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover, .search-result-item:not(.selected):hover { @@ -5923,7 +5923,7 @@ ul.tree { /* line 65, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { z-index: 10; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 71, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { opacity: 0; } @@ -6823,7 +6823,7 @@ table { /* line 297, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: linear-gradient(#666666, #595959); } @@ -6954,7 +6954,7 @@ table { /* line 297, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected .icon, .items-holder .item.grid-item.selected .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background: linear-gradient(#1ac6ff, #00bfff); } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 3f657f8d73..0b00551ac4 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; } @@ -990,7 +990,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { right: 100%; } - @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 76, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { width: 0; @@ -998,14 +998,14 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { border-top: 6.66667px solid transparent; border-bottom: 6.66667px solid transparent; border-right: 10px solid white; } } - @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* 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 only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (orientation: portrait) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (orientation: landscape) and (min-device-width: 768px) and (max-device-width: 1024px), only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 95, ../../../../general/res/sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right .l-infobubble::before { width: 0; @@ -1619,7 +1619,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.major .icon, .major.s-menu-btn .icon, .s-btn.major .t-item-icon, .major.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.major:not(.disabled):hover, .major.s-menu-btn:not(.disabled):hover { background: deepskyblue; } @@ -1649,7 +1649,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major) .icon, .s-menu-btn:not(.major) .icon, .s-btn:not(.major) .t-item-icon, .s-menu-btn:not(.major) .t-item-icon { color: #eee; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn:not(.major):not(.disabled):hover, .s-menu-btn:not(.major):not(.disabled):hover { background: #0099cc; } @@ -1682,7 +1682,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused .icon, .pause-play.paused.s-menu-btn .icon, .s-btn.pause-play.paused .t-item-icon, .pause-play.paused.s-menu-btn .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .s-btn.pause-play.paused:not(.disabled):hover, .pause-play.paused.s-menu-btn:not(.disabled):hover { background: #ffad33; } @@ -1713,7 +1713,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .s-btn.show-thumbs .icon:before, .show-thumbs.s-menu-btn .icon:before, .s-btn.show-thumbs .t-item-icon:before, .show-thumbs.s-menu-btn .t-item-icon:before { content: "\000039"; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 101, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab { -moz-border-radius: 4px; @@ -1774,14 +1774,14 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { /* line 297, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed .icon, .mini-tab.collapsed .t-item-icon { color: #eee; } } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover { background: #0099cc; } /* line 304, ../../../../general/res/sass/_mixins.scss */ .mini-tab.collapsed:not(.disabled):hover > .icon, .mini-tab.collapsed:not(.disabled):hover > .t-item-icon { color: white; } } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 138, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab.collapsed:before { opacity: 0; } @@ -1870,7 +1870,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before { .mini-tab.anchor-right.collapsed:hover:before { right: 2px; } } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 208, ../../../../general/res/sass/controls/_buttons.scss */ .mini-tab-icon { color: #d6d6d6; @@ -2259,7 +2259,7 @@ label.checkbox.custom { font-size: 0.7em; flex: 0 0 1; -webkit-flex: 0 0 1; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 240, ../../../../general/res/sass/controls/_controls.scss */ .object-header .context-available { -moz-transition-property: opacity; @@ -2602,7 +2602,7 @@ label.checkbox.custom { color: inherit; } /******************************************************** BROWSER ELEMENTS */ -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 485, ../../../../general/res/sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; @@ -3298,7 +3298,7 @@ label.checkbox.custom { /* line 213, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .message-severity-error .type-icon.message-type:before { content: "\21"; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 259, ../../../../general/res/sass/controls/_messages.scss */ .t-message-single .l-message, .t-message-single .bottom-bar { @@ -3369,7 +3369,7 @@ label.checkbox.custom { .t-message-list .message-contents .l-message .top-bar, .t-message-list .message-contents .l-message .message-body { margin-bottom: 10px; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 304, ../../../../general/res/sass/controls/_messages.scss */ .t-message-list .message-contents .l-message { margin-right: 10px; } } @@ -4394,7 +4394,7 @@ span.req { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { z-index: 5; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 138, ../../../../general/res/sass/user-environ/_layout.scss */ .pane .mini-tab-icon.toggle-pane { top: 10px; @@ -4620,7 +4620,7 @@ span.req { .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ .holder-all { min-width: 600px; } @@ -4882,7 +4882,7 @@ span.req { /* line 152, ../../../../general/res/sass/mobile/_layout.scss */ .pane-tree-showing .pane.right.items .holder-object-and-inspector { opacity: 0; } } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 160, ../../../../general/res/sass/mobile/_layout.scss */ .desktop-hide { display: none; } } @@ -5356,7 +5356,7 @@ span.req { /* line 297, ../../../../general/res/sass/_mixins.scss */ .overlay .bottom-bar .s-btn:not(.major) .icon, .overlay .bottom-bar .s-menu-btn:not(.major) .icon, .overlay .bottom-bar .s-btn:not(.major) .t-item-icon, .overlay .bottom-bar .s-menu-btn:not(.major) .t-item-icon { color: #fff; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../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; } @@ -5551,7 +5551,7 @@ ul.tree { margin-left: 5px; font-size: 0.75em; width: 10px; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 56, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control:hover, .search-result-item .view-control:hover { @@ -5682,7 +5682,7 @@ ul.tree { .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { color: #fcfcfc; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 136, ../../../../general/res/sass/tree/_tree.scss */ .tree-item:not(.selected):hover, .search-result-item:not(.selected):hover { @@ -5825,7 +5825,7 @@ ul.tree { /* line 65, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { z-index: 10; } -@media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { +@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 71, ../../../../general/res/sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { opacity: 0; } @@ -6716,7 +6716,7 @@ table { /* line 297, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item .icon, .items-holder .item.grid-item .t-item-icon { color: #0099cc; } - @media only screen and (min-device-width: 1280px) and (-webkit-min-device-pixel-ratio: 1) { + @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { /* line 302, ../../../../general/res/sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background: #d0d0d0; }