diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5e1f434a1b..dbc2ce6eac 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2641,6 +2641,75 @@ label.checkbox.custom { right: 0; width: auto; } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 26, ../sass/edit/_editor.scss */ +.edit-main .edit-handle { + position: absolute; + top: 40px; + right: 40px; + bottom: 40px; + left: 40px; } + /* line 33, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-move { + cursor: move; + left: 30%; + right: 30%; + top: 30%; + bottom: 30%; } + /* line 42, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-n { + top: 0px; + bottom: auto; + height: 15px; + cursor: n-resize; } + /* line 47, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-e { + right: 0px; + left: auto; + width: 15px; + cursor: e-resize; } + /* line 52, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-s { + bottom: 0px; + top: auto; + height: 15px; + cursor: s-resize; } + /* line 57, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-w { + left: 0px; + right: auto; + width: 15px; + cursor: w-resize; } +/* line 66, ../sass/edit/_editor.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; } + /* line 69, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-handle { + background-color: rgba(0, 153, 204, 0.3); } + /* line 1, ../sass/features/_imagery.scss */ .l-image-main-wrapper, .l-image-main, @@ -4000,13 +4069,6 @@ input[type="text"] { .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 fac4ebb85c..0091db24b6 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -45,6 +45,7 @@ @import "controls/controls"; @import "controls/lists"; @import "controls/menus"; +@import "edit/editor"; @import "features/imagery"; @import "features/time-display"; @import "controls/time-controller"; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 01a21c06b3..8b0895369b 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -19,3 +19,56 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + +.edit-main { + + + .edit-handle { + $edgeHandleD: 15px; + $cornerM: 50px; + //@include border-radius(0.5em); + //display: none; + position: absolute; + top: $cornerM; right: $cornerM; bottom: $cornerM; left: $cornerM; + &.edit-move { + $m: 30%; + cursor: move; + left: $m; + right: $m; + top: $m; + bottom: $m; + + } + &.edit-resize-n { + top: 0px; bottom: auto; + height: $edgeHandleD; + cursor: n-resize; + } + &.edit-resize-e { + right: 0px; left: auto; + width: $edgeHandleD; + cursor: e-resize; + } + &.edit-resize-s { + bottom: 0px; top: auto; + height: $edgeHandleD; + cursor: s-resize; + } + &.edit-resize-w { + left: 0px; right: auto; + width: $edgeHandleD; + cursor: w-resize; + } + } + + + .frame.child-frame.panel { + &:hover { + border-color: $colorKey; + @include boxShdwLarge(); + .edit-handle { + background-color: rgba($colorKey, 0.3); + } + } + } +} \ 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..f19da8b43a 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -68,10 +68,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..b44b1f9d28 100644 --- a/platform/features/layout/res/templates/layout.html +++ b/platform/features/layout/res/templates/layout.html @@ -34,29 +34,34 @@ - - - - -