diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5a8bcac07a..00bb27d430 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -84,7 +84,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, @@ -105,38 +105,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; } @@ -2732,6 +2732,115 @@ label.checkbox.custom { .l-time-controller .knob.knob-r .range-value { left: 14px; } +/***************************************************************************** + * 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/edit/_editor.scss */ +.edit-main .edit-corner, +.edit-main .edit-handle { + position: absolute; + z-index: 2; } +/* line 32, ../sass/edit/_editor.scss */ +.edit-main .edit-corner { + width: 15px; + height: 15px; } + /* line 35, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-nw { + -moz-border-radius-bottomright: 5px; + -webkit-border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; + cursor: nw-resize; + top: 0; + left: 0; } + /* line 40, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-se { + -moz-border-radius-topleft: 5px; + -webkit-border-top-left-radius: 5px; + border-top-left-radius: 5px; + cursor: se-resize; + bottom: 0; + right: 0; } + /* line 45, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-sw { + -moz-border-radius-topright: 5px; + -webkit-border-top-right-radius: 5px; + border-top-right-radius: 5px; + cursor: sw-resize; + bottom: 0; + left: 0; } +/* line 53, ../sass/edit/_editor.scss */ +.edit-main .edit-handle { + top: 15px; + right: 15px; + bottom: 15px; + left: 15px; } + /* line 55, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-move { + cursor: move; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 1; } + /* line 65, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-n { + top: 0px; + bottom: auto; + height: 15px; + cursor: n-resize; } + /* line 70, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-e { + right: 0px; + left: auto; + width: 15px; + cursor: e-resize; } + /* line 75, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-s { + bottom: 0px; + top: auto; + height: 15px; + cursor: s-resize; } + /* line 80, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-w { + left: 0px; + right: auto; + width: 15px; + cursor: w-resize; } +/* line 89, ../sass/edit/_editor.scss */ +.edit-main .frame.child-frame.panel:hover { + -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + border-color: #0099cc; + z-index: 2; } + /* line 93, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .view-switcher { + opacity: 1; } + /* line 96, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner { + background-color: rgba(0, 153, 204, 0.8); } + /* line 98, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner:hover { + background-color: #0099cc; } + /* line 1, ../sass/features/_imagery.scss */ .l-image-main-wrapper, .l-image-main, @@ -3986,21 +4095,15 @@ input[type="text"] { left: 5px; } /* line 54, ../sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { - opacity: 0; } -/* line 58, ../sass/user-environ/_frame.scss */ + opacity: 0; + z-index: 10; } +/* line 59, ../sass/user-environ/_frame.scss */ .frame.frame-template:hover .view-switcher { opacity: 1; } -/* line 66, ../sass/user-environ/_frame.scss */ +/* line 67, ../sass/user-environ/_frame.scss */ .frame .view-switcher .name { display: none; } -/* line 73, ../sass/user-environ/_frame.scss */ -.edit-main .frame.child-frame.panel:hover { - border-color: #0099cc; - -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 010d590669..07fec4ed79 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -46,6 +46,7 @@ @import "controls/lists"; @import "controls/menus"; @import "controls/time-controller"; +@import "edit/editor"; @import "features/imagery"; @import "features/time-display"; @import "forms/mixins"; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 01a21c06b3..b4a4920f56 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -19,3 +19,86 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + +.edit-main { + $handleD: 15px; + $cr: 5px; + .edit-corner, + .edit-handle { + position: absolute; + z-index: 2; + } + + .edit-corner { + width: $handleD; + height: $handleD; + &.edit-resize-nw { + @include border-bottom-right-radius($cr); + cursor: nw-resize; + top: 0; left: 0; + } + &.edit-resize-se { + @include border-top-left-radius($cr); + cursor: se-resize; + bottom: 0; right: 0; + } + &.edit-resize-sw { + @include border-top-right-radius($cr); + cursor: sw-resize; + bottom: 0; left: 0; + } + + } + + .edit-handle { + top: $handleD; right: $handleD; bottom: $handleD; left: $handleD; + &.edit-move { + $m: 0; //$handleD; + cursor: move; + left: $m; + right: $m; + top: $m; + bottom: $m; + z-index: 1; + + } + &.edit-resize-n { + top: 0px; bottom: auto; + height: $handleD; + cursor: n-resize; + } + &.edit-resize-e { + right: 0px; left: auto; + width: $handleD; + cursor: e-resize; + } + &.edit-resize-s { + bottom: 0px; top: auto; + height: $handleD; + cursor: s-resize; + } + &.edit-resize-w { + left: 0px; right: auto; + width: $handleD; + cursor: w-resize; + } + } + + + .frame.child-frame.panel { + &:hover { + @include boxShdwLarge(); + border-color: $colorKey; + z-index: 2; + .view-switcher { + opacity: 1; + } + .edit-corner { + background-color: rgba($colorKey, 0.8); + &:hover { + background-color: rgba($colorKey, 1); + } + } + } + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index caeb3157e4..a371459cc0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -54,6 +54,7 @@ .view-switcher { //display: none; opacity: 0; + z-index: 10; } &:hover .view-switcher { // Show the view switcher on frame hover @@ -68,10 +69,3 @@ } } } - -.edit-main .frame.child-frame.panel { - &:hover { - border-color: $colorKey; - @include boxShdwLarge(); - } -} diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html index 3a4f78f6e0..0a42ba30fe 100644 --- a/platform/features/layout/res/templates/layout.html +++ b/platform/features/layout/res/templates/layout.html @@ -34,50 +34,62 @@ - - - - - - + --> - - - - + -