diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 845edff2f7..e10f3e9048 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -94,18 +94,20 @@ "key": "window", "name": "Open in a new tab", "implementation": "windowing/NewTabAction.js", - "description": "Open this object in a new tab", + "description": "Open in a new browser tab", "category": ["view-control", "contextual"], "depends": [ "urlService", "$window" ], "group": "windowing", - "glyph": "y" + "glyph": "y", + "priority": "preferred" }, { "key": "fullscreen", "implementation": "windowing/FullscreenAction.js", "category": "view-control", "group": "windowing", - "glyph": "z" + "glyph": "z", + "priority": "default" } ], "views": [ diff --git a/platform/commonUI/browse/src/windowing/FullscreenAction.js b/platform/commonUI/browse/src/windowing/FullscreenAction.js index 00fc3c0f5e..efba99520b 100644 --- a/platform/commonUI/browse/src/windowing/FullscreenAction.js +++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js @@ -29,8 +29,8 @@ define( function () { "use strict"; - var ENTER_FULLSCREEN = "Enter full screen mode.", - EXIT_FULLSCREEN = "Exit full screen mode."; + var ENTER_FULLSCREEN = "Enter full screen mode", + EXIT_FULLSCREEN = "Exit full screen mode"; /** * The fullscreen action toggles between fullscreen display diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index c0acb2a4c3..bc7cbac350 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -40,6 +40,14 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/************************** FEATURES */ +/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ +/************************** COLORS AND SHADING */ +/************************** 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 diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 0e822f901d..c40b3f7bd9 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -40,6 +40,14 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/************************** FEATURES */ +/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ +/************************** COLORS AND SHADING */ +/************************** 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 diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 3d7f1572df..7e108acdb5 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -41,6 +41,14 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/************************** FEATURES */ +/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ +/************************** COLORS AND SHADING */ +/************************** 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 @@ -84,7 +92,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 +113,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; } @@ -289,27 +297,29 @@ a { /* line 31, ../sass/_global.scss */ body, html { + -webkit-font-smoothing: subpixel-antialiased; + -moz-osx-font-smoothing: grayscale; background-color: #333; color: #999; - font-family: Helvetica, Arial, sans-serif; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; width: 100%; overflow: hidden; } -/* line 41, ../sass/_global.scss */ +/* line 44, ../sass/_global.scss */ em { font-style: normal; } -/* line 46, ../sass/_global.scss */ +/* line 49, ../sass/_global.scss */ input, textarea { font-family: Helvetica, Arial, sans-serif; } -/* line 50, ../sass/_global.scss */ +/* line 53, ../sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 54, ../sass/_global.scss */ +/* line 57, ../sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -317,21 +327,21 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 62, ../sass/_global.scss */ +/* line 65, ../sass/_global.scss */ p { margin-bottom: 10px; } -/* line 66, ../sass/_global.scss */ +/* line 69, ../sass/_global.scss */ span { /* 618 DEBUG box-sizing: border-box; */ } -/* line 72, ../sass/_global.scss */ +/* line 75, ../sass/_global.scss */ mct-container { display: block; } -/* line 76, ../sass/_global.scss */ +/* line 79, ../sass/_global.scss */ .abs, .btn-menu span.l-click-area { position: absolute; top: 0; @@ -341,51 +351,51 @@ mct-container { height: auto; width: auto; } -/* line 86, ../sass/_global.scss */ +/* line 89, ../sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 93, ../sass/_global.scss */ +/* line 96, ../sass/_global.scss */ .codehilite { background-color: rgba(255, 255, 255, 0.1); padding: 1em; } -/* line 99, ../sass/_global.scss */ +/* line 102, ../sass/_global.scss */ .align-right { text-align: right; } -/* line 103, ../sass/_global.scss */ +/* line 106, ../sass/_global.scss */ .centered { text-align: center; } -/* line 107, ../sass/_global.scss */ +/* line 110, ../sass/_global.scss */ .no-margin { margin: 0; } -/* line 111, ../sass/_global.scss */ +/* line 114, ../sass/_global.scss */ .colorKey { color: #0099cc; } -/* line 115, ../sass/_global.scss */ +/* line 118, ../sass/_global.scss */ .ds { -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; } -/* line 119, ../sass/_global.scss */ +/* line 122, ../sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 125, ../sass/_global.scss */ +/* line 128, ../sass/_global.scss */ .paused:not(.s-btn):not(.icon-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } -/* line 131, ../sass/_global.scss */ +/* line 134, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -446,10 +456,10 @@ mct-container { *****************************************************************************/ /* line 32, ../sass/user-environ/_layout.scss */ .holder-all { - top: 3px; - right: 3px; - bottom: 3px; - left: 3px; } + top: 0; + right: 0; + bottom: 0; + left: 0; } /* line 40, ../sass/user-environ/_layout.scss */ .browse-area, @@ -504,10 +514,10 @@ mct-container { .user-environ .browse-area, .user-environ .edit-area, .user-environ .editor { - top: 34px; - right: 5px; - bottom: 30px; - left: 5px; } + top: 39px; + right: 10px; + bottom: 35px; + left: 10px; } /* line 102, ../sass/user-environ/_layout.scss */ .user-environ .browse-area > .contents, .user-environ .edit-area > .contents { @@ -515,7 +525,7 @@ mct-container { right: 0; } /* line 108, ../sass/user-environ/_layout.scss */ .user-environ .edit-area { - top: 40px; } + top: 45px; } /* line 111, ../sass/user-environ/_layout.scss */ .user-environ .edit-area .tool-bar { bottom: auto; @@ -528,27 +538,28 @@ mct-container { .user-environ .bottom-bar { overflow: hidden; position: absolute; - top: 5px; - right: 5px; - bottom: 5px; - left: 5px; + top: 0; + right: 0; + bottom: 0; + left: 0; width: auto; height: auto; top: auto; - height: 20px; } - /* line 125, ../sass/user-environ/_layout.scss */ + height: 25px; } + /* line 126, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .status-holder { - right: 110px; } - /* line 128, ../sass/user-environ/_layout.scss */ + z-index: 1; } + /* line 130, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .app-logo { left: auto; - width: 105px; } + width: 105px; + z-index: 2; } -/* line 135, ../sass/user-environ/_layout.scss */ +/* line 138, ../sass/user-environ/_layout.scss */ .cols { overflow: hidden; *zoom: 1; } - /* line 137, ../sass/user-environ/_layout.scss */ + /* line 140, ../sass/user-environ/_layout.scss */ .cols .col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -559,100 +570,100 @@ mct-container { margin-left: 1.5%; padding-left: 5px; position: relative; } - /* line 145, ../sass/user-environ/_layout.scss */ + /* line 148, ../sass/user-environ/_layout.scss */ .cols .col:first-child { margin-left: 0; padding-left: 0; } - /* line 152, ../sass/user-environ/_layout.scss */ + /* line 155, ../sass/user-environ/_layout.scss */ .cols.cols-2 .col-1 { min-width: 250px; width: 48.5%; } - /* line 158, ../sass/user-environ/_layout.scss */ + /* line 161, ../sass/user-environ/_layout.scss */ .cols.cols-2-ff .col-100px { width: 100px; } - /* line 165, ../sass/user-environ/_layout.scss */ + /* line 168, ../sass/user-environ/_layout.scss */ .cols.cols-6 .col-1 { min-width: 83.33333px; width: 15.16667%; } - /* line 171, ../sass/user-environ/_layout.scss */ + /* line 174, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-1 { min-width: 31.25px; width: 4.75%; } - /* line 174, ../sass/user-environ/_layout.scss */ + /* line 177, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-2 { min-width: 62.5px; width: 11%; } - /* line 177, ../sass/user-environ/_layout.scss */ + /* line 180, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-7 { min-width: 218.75px; width: 42.25%; } - /* line 183, ../sass/user-environ/_layout.scss */ + /* line 186, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-2 { min-width: 31.25px; width: 4.75%; } - /* line 186, ../sass/user-environ/_layout.scss */ + /* line 189, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-15 { min-width: 234.375px; width: 45.375%; } - /* line 190, ../sass/user-environ/_layout.scss */ + /* line 193, ../sass/user-environ/_layout.scss */ .cols .l-row { overflow: hidden; *zoom: 1; padding: 5px 0; } -/* line 196, ../sass/user-environ/_layout.scss */ +/* line 199, ../sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 199, ../sass/user-environ/_layout.scss */ + /* line 202, ../sass/user-environ/_layout.scss */ .pane.treeview .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 202, ../sass/user-environ/_layout.scss */ + /* line 205, ../sass/user-environ/_layout.scss */ .pane.treeview .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 207, ../sass/user-environ/_layout.scss */ + /* line 210, ../sass/user-environ/_layout.scss */ .pane.treeview .tree-holder { overflow: auto; top: 34px; } - /* line 214, ../sass/user-environ/_layout.scss */ + /* line 217, ../sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .btn-menu span.left.l-click-area, .btn-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .btn-menu span.right.l-click-area, .btn-menu .pane.items .object-browse-bar span.right.l-click-area { top: auto; } - /* line 219, ../sass/user-environ/_layout.scss */ + /* line 222, ../sass/user-environ/_layout.scss */ .pane.items .object-holder { top: 34px; } - /* line 224, ../sass/user-environ/_layout.scss */ + /* line 227, ../sass/user-environ/_layout.scss */ .pane.edit-main .object-holder { top: 0; } - /* line 230, ../sass/user-environ/_layout.scss */ + /* line 233, ../sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 238, ../sass/user-environ/_layout.scss */ +/* line 241, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 241, ../sass/user-environ/_layout.scss */ + /* line 244, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 248, ../sass/user-environ/_layout.scss */ +/* line 251, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 250, ../sass/user-environ/_layout.scss */ + /* line 253, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 254, ../sass/user-environ/_layout.scss */ + /* line 257, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 256, ../sass/user-environ/_layout.scss */ + /* line 259, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 5px; } -/* line 265, ../sass/user-environ/_layout.scss */ +/* line 268, ../sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -1339,37 +1350,41 @@ mct-container { /* line 26, ../sass/controls/_buttons.scss */ .btn, .l-btn { + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; line-height: 1.5em; padding: 0 7.5px; text-decoration: none; } - /* line 31, ../sass/controls/_buttons.scss */ + /* line 32, ../sass/controls/_buttons.scss */ .btn.lg, .btn.create-btn, .l-btn.lg, .l-btn.create-btn { height: 24px; line-height: 22px; padding: 0 22.5px; } - /* line 40, ../sass/controls/_buttons.scss */ + /* line 41, ../sass/controls/_buttons.scss */ .btn.create-btn:before, .l-btn.create-btn:before { content: "+"; font-family: symbolsfont; font-size: 0.8em; } - /* line 45, ../sass/controls/_buttons.scss */ + /* line 46, ../sass/controls/_buttons.scss */ .btn.create-btn .menu, .l-btn.create-btn .menu { margin-left: -7.5px; } - /* line 52, ../sass/controls/_buttons.scss */ + /* line 53, ../sass/controls/_buttons.scss */ .btn.sm, .l-btn.sm { padding: 0 5px; } - /* line 55, ../sass/controls/_buttons.scss */ + /* line 56, ../sass/controls/_buttons.scss */ .btn.vsm, .l-btn.vsm { padding: 0 2.5px; } /*********************************** STYLE STYLES */ -/* line 61, ../sass/controls/_buttons.scss */ +/* line 62, ../sass/controls/_buttons.scss */ .btn, .s-btn, .icon-btn, @@ -1383,7 +1398,7 @@ mct-container { text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; cursor: pointer; text-decoration: none; } - /* line 70, ../sass/controls/_buttons.scss */ + /* line 71, ../sass/controls/_buttons.scss */ .btn.major, .s-btn.major, .major.icon-btn, @@ -1432,7 +1447,7 @@ mct-container { .major.btn-menu.icon-btn .invoke-menu, .major.btn-menu.s-icon-btn .invoke-menu { color: #52d4ff; } - /* line 75, ../sass/controls/_buttons.scss */ + /* line 76, ../sass/controls/_buttons.scss */ .btn.major:hover, .s-btn.major:hover, .major.icon-btn:hover, @@ -1480,13 +1495,13 @@ mct-container { .major.icon-btn:hover.btn-menu .invoke-menu, .major.s-icon-btn:hover.btn-menu .invoke-menu { color: #6bdaff; } - /* line 79, ../sass/controls/_buttons.scss */ + /* line 80, ../sass/controls/_buttons.scss */ .btn.major .invoke-menu, .s-btn.major .invoke-menu, .major.icon-btn .invoke-menu, .major.s-icon-btn .invoke-menu { color: #ccf2ff; } - /* line 83, ../sass/controls/_buttons.scss */ + /* line 84, ../sass/controls/_buttons.scss */ .btn.subtle, .s-btn.subtle, .subtle.icon-btn, @@ -1534,7 +1549,7 @@ mct-container { .subtle.btn-menu.icon-btn .invoke-menu, .subtle.btn-menu.s-icon-btn .invoke-menu { color: #a8a8a8; } - /* line 86, ../sass/controls/_buttons.scss */ + /* line 87, ../sass/controls/_buttons.scss */ .btn.very-subtle, .btn.s-very-subtle, .s-btn.very-subtle, .very-subtle.icon-btn, @@ -1594,7 +1609,7 @@ mct-container { .s-very-subtle.btn-menu.icon-btn .invoke-menu, .s-very-subtle.btn-menu.s-icon-btn .invoke-menu { color: #757575; } - /* line 89, ../sass/controls/_buttons.scss */ + /* line 90, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused, .btn.s-very-subtle.paused, .s-btn.very-subtle.paused, .very-subtle.paused.icon-btn, @@ -1654,7 +1669,7 @@ mct-container { .s-very-subtle.paused.btn-menu.icon-btn .invoke-menu, .s-very-subtle.paused.btn-menu.s-icon-btn .invoke-menu { color: #feb04d; } - /* line 91, ../sass/controls/_buttons.scss */ + /* line 92, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused .icon:before, .btn.s-very-subtle.paused .icon:before, .s-btn.very-subtle.paused .icon:before, .very-subtle.paused.icon-btn .icon:before, @@ -1664,31 +1679,31 @@ mct-container { .s-very-subtle.paused.s-icon-btn .icon:before { content: "\0000EF"; } -/* line 98, ../sass/controls/_buttons.scss */ +/* line 99, ../sass/controls/_buttons.scss */ .icon-btn, .s-icon-btn { font-size: 1em; } - /* line 102, ../sass/controls/_buttons.scss */ + /* line 103, ../sass/controls/_buttons.scss */ .icon-btn .icon, .s-icon-btn .icon { color: #0099cc; } - /* line 106, ../sass/controls/_buttons.scss */ + /* line 107, ../sass/controls/_buttons.scss */ .icon-btn.paused .icon, .s-icon-btn.paused .icon { color: #fff; } - /* line 114, ../sass/controls/_buttons.scss */ + /* line 115, ../sass/controls/_buttons.scss */ .icon-btn:not(.disabled):not(.paused):hover .icon, .s-icon-btn:not(.disabled):not(.paused):hover .icon { color: #33ccff; } - /* line 121, ../sass/controls/_buttons.scss */ + /* line 122, ../sass/controls/_buttons.scss */ .icon-btn.labeled, .s-icon-btn.labeled { padding: 0 3.75px; } - /* line 126, ../sass/controls/_buttons.scss */ + /* line 127, ../sass/controls/_buttons.scss */ .icon-btn.labeled .title-label, .s-icon-btn.labeled .title-label { margin-left: 5px; } - /* line 132, ../sass/controls/_buttons.scss */ + /* line 133, ../sass/controls/_buttons.scss */ .icon-btn.pause-play.paused, .s-icon-btn.pause-play.paused { -moz-animation-name: pulse; @@ -1706,17 +1721,17 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 135, ../sass/controls/_buttons.scss */ + /* line 136, ../sass/controls/_buttons.scss */ .icon-btn.pause-play .icon:before, .s-icon-btn.pause-play .icon:before { content: "\0000F1"; } - /* line 141, ../sass/controls/_buttons.scss */ + /* line 142, ../sass/controls/_buttons.scss */ .icon-btn.show-thumbs .icon:before, .s-icon-btn.show-thumbs .icon:before { content: "\000039"; } /*********************************** LAYOUT STYLES */ -/* line 148, ../sass/controls/_buttons.scss */ +/* line 149, ../sass/controls/_buttons.scss */ span.btn, span.btn span, span.l-btn, @@ -2458,33 +2473,35 @@ label.checkbox.custom { line-height: 1.4rem; padding: 3px 10px 3px 30px; white-space: nowrap; } - /* line 46, ../sass/controls/_menus.scss */ + /* line 45, ../sass/controls/_menus.scss */ .menu-element .menu ul li:first-child { border: none; } - /* line 49, ../sass/controls/_menus.scss */ + /* line 48, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover { background: #737373; } - /* line 51, ../sass/controls/_menus.scss */ + /* line 50, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover a { color: #fff; } - /* line 54, ../sass/controls/_menus.scss */ + /* line 53, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover .icon { color: #33ccff; } - /* line 58, ../sass/controls/_menus.scss */ + /* line 57, ../sass/controls/_menus.scss */ .menu-element .menu ul li a { color: #d9d9d9; display: block; } - /* line 62, ../sass/controls/_menus.scss */ + /* line 61, ../sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon { left: 10px; } /* line 68, ../sass/controls/_menus.scss */ + .menu-element .context-menu, .menu-element .super-menu { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwOGViZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwN2FhMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + pointer-events: auto; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzhjOGM4YyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #008ebd), color-stop(100%, #007aa3)); - background-image: -moz-linear-gradient(#008ebd, #007aa3); - background-image: -webkit-linear-gradient(#008ebd, #007aa3); - background-image: linear-gradient(#008ebd, #007aa3); + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8c8c8c), color-stop(100%, #808080)); + background-image: -moz-linear-gradient(#8c8c8c, #808080); + background-image: -webkit-linear-gradient(#8c8c8c, #808080); + background-image: linear-gradient(#8c8c8c, #808080); -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; @@ -2495,19 +2512,39 @@ label.checkbox.custom { -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; border: none; - border-top: 1px solid #0095c7; - color: #fff; - display: inline-block; - display: block; - width: 450px; - height: 430px; } + border-top: 1px solid #919191; + color: #999; + display: inline-block; } /* line 160, ../sass/_mixins.scss */ + .menu-element .context-menu.btn-menu .invoke-menu, .menu-element .super-menu.btn-menu .invoke-menu { - color: #05c1ff; } - /* line 79, ../sass/controls/_menus.scss */ - .menu-element .super-menu .icon { - color: #4dd2ff; } - /* line 84, ../sass/controls/_menus.scss */ + color: #b0b0b0; } + /* line 76, ../sass/controls/_menus.scss */ + .menu-element .context-menu ul li, + .menu-element .super-menu ul li { + padding-left: 25px; } + /* line 78, ../sass/controls/_menus.scss */ + .menu-element .context-menu ul li a, + .menu-element .super-menu ul li a { + color: white; } + /* line 79, ../sass/controls/_menus.scss */ + .menu-element .context-menu ul li .icon, + .menu-element .super-menu ul li .icon { + color: #24c8ff; } + /* line 82, ../sass/controls/_menus.scss */ + .menu-element .context-menu ul li .type-icon, + .menu-element .super-menu ul li .type-icon { + left: 5px; } + /* line 85, ../sass/controls/_menus.scss */ + .menu-element .context-menu ul li:hover .icon, + .menu-element .super-menu ul li:hover .icon { + color: #3dcfff; } + /* line 92, ../sass/controls/_menus.scss */ + .menu-element .super-menu { + display: block; + width: 500px; + height: 480px; } + /* line 102, ../sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: hidden; position: absolute; @@ -2517,12 +2554,12 @@ label.checkbox.custom { left: 5px; width: auto; height: auto; } - /* line 87, ../sass/controls/_menus.scss */ + /* line 105, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 89, ../sass/controls/_menus.scss */ + /* line 107, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid rgba(255, 255, 255, 0.2); left: 0; @@ -2531,30 +2568,23 @@ label.checkbox.custom { width: 50%; overflow-x: hidden; overflow-y: auto; } - /* line 99, ../sass/controls/_menus.scss */ + /* line 117, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - border-top: none; - color: #fff; } - /* line 106, ../sass/controls/_menus.scss */ - .menu-element .super-menu .pane.left ul li:hover { - background: #0099cc; } - /* line 108, ../sass/controls/_menus.scss */ - .menu-element .super-menu .pane.left ul li:hover .icon { - color: #ccf2ff; } - /* line 112, ../sass/controls/_menus.scss */ - .menu-element .super-menu .pane.left ul li .icon { - text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; - left: 5px; } - /* line 119, ../sass/controls/_menus.scss */ + padding-left: 30px; + border-top: none; } + /* line 124, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: auto; right: 0; padding: 25px; width: 50%; } - /* line 130, ../sass/controls/_menus.scss */ + /* line 130, ../sass/controls/_menus.scss */ + .menu-element .super-menu .pane.right .icon { + color: #fff; } + /* line 137, ../sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.icon { position: relative; font-size: 8em; @@ -2563,80 +2593,40 @@ label.checkbox.custom { line-height: 150px; margin-bottom: 25px; text-align: center; } - /* line 141, ../sass/controls/_menus.scss */ + /* line 147, ../sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.title { color: #fff; font-size: 1.2em; margin-bottom: 0.5em; } - /* line 146, ../sass/controls/_menus.scss */ + /* line 152, ../sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.description { color: #fff; font-size: 0.8em; line-height: 1.5em; } - /* line 155, ../sass/controls/_menus.scss */ + /* line 161, ../sass/controls/_menus.scss */ .menu-element .context-menu { - font-size: 0.80rem; - pointer-events: auto; } - /* line 161, ../sass/controls/_menus.scss */ - .menu-element .context-menu.menu { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkxOTE5MSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzg1ODU4NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #919191), color-stop(100%, #858585)); - background-image: -moz-linear-gradient(#919191, #858585); - background-image: -webkit-linear-gradient(#919191, #858585); - background-image: linear-gradient(#919191, #858585); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-box-shadow: 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; - border: none; - border-top: 1px solid #969696; - color: #999; - display: inline-block; } - /* line 160, ../sass/_mixins.scss */ - .menu-element .context-menu.menu.btn-menu .invoke-menu { - color: #b5b5b5; } - /* line 163, ../sass/controls/_menus.scss */ - .menu-element .context-menu.menu ul li { - padding-left: 30px; } - /* line 165, ../sass/controls/_menus.scss */ - .menu-element .context-menu.menu ul li a { - color: white; } - /* line 166, ../sass/controls/_menus.scss */ - .menu-element .context-menu.menu ul li .icon { - color: #1ac6ff; } - /* line 169, ../sass/controls/_menus.scss */ - .menu-element .context-menu.menu ul li .type-icon { - left: 5px; } - /* line 172, ../sass/controls/_menus.scss */ - .menu-element .context-menu.menu ul li:hover .icon { - color: #33ccff; } + font-size: 0.80rem; } -/* line 180, ../sass/controls/_menus.scss */ +/* line 166, ../sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 70; } - /* line 186, ../sass/controls/_menus.scss */ + /* line 172, ../sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 193, ../sass/controls/_menus.scss */ + /* line 179, ../sass/controls/_menus.scss */ .context-menu-holder.go-left .context-menu { right: 0; } - /* line 194, ../sass/controls/_menus.scss */ + /* line 180, ../sass/controls/_menus.scss */ .context-menu-holder.go-up .context-menu { bottom: 0; } -/* line 197, ../sass/controls/_menus.scss */ +/* line 183, ../sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; @@ -2898,10 +2888,6 @@ label.checkbox.custom { background-position: center; background-repeat: no-repeat; } -/* line 49, ../sass/features/_imagery.scss */ -.l-image-main { - cursor: crosshair; } - /* line 53, ../sass/features/_imagery.scss */ .l-image-main-controlbar { font-size: 0.8em; @@ -3017,13 +3003,13 @@ label.checkbox.custom { /* line 5, ../sass/features/_time-display.scss */ .l-time-display:hover .l-btn.control { opacity: 1; } -/* line 10, ../sass/features/_time-display.scss */ +/* line 9, ../sass/features/_time-display.scss */ .l-time-display .l-elem-wrapper { position: relative; } -/* line 13, ../sass/features/_time-display.scss */ +/* line 12, ../sass/features/_time-display.scss */ .l-time-display .l-elem { display: inline-block; } -/* line 18, ../sass/features/_time-display.scss */ +/* line 17, ../sass/features/_time-display.scss */ .l-time-display.l-timer .l-elem.l-value { -moz-transition-property: left; -o-transition-property: left; @@ -3040,13 +3026,16 @@ label.checkbox.custom { position: absolute; left: 0; z-index: 1; } -/* line 24, ../sass/features/_time-display.scss */ + /* line 22, ../sass/features/_time-display.scss */ + .l-time-display.l-timer .l-elem.l-value .ui-symbol.direction { + font-size: 0.8em; } +/* line 26, ../sass/features/_time-display.scss */ .l-time-display.l-timer:hover .l-elem.l-value { left: 20px; } -/* line 31, ../sass/features/_time-display.scss */ +/* line 33, ../sass/features/_time-display.scss */ .l-time-display .l-elem .value.active, .l-time-display .l-elem.value.active { color: #fff; } -/* line 36, ../sass/features/_time-display.scss */ +/* line 38, ../sass/features/_time-display.scss */ .l-time-display .l-btn.control { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; @@ -3061,8 +3050,8 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; opacity: 0; - font-size: 0.9em; - line-height: 1em; } + font-size: 0.65em; + vertical-align: top; } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government @@ -4050,13 +4039,13 @@ input[type="text"] { right: 0; bottom: 0; left: 0; - font-size: 1em; + overflow: visible; height: 40px; text-align: right; } - /* line 71, ../sass/overlay/_overlay.scss */ + /* line 72, ../sass/overlay/_overlay.scss */ .overlay .bottom-bar .btn { margin-left: 10px; } -/* line 75, ../sass/overlay/_overlay.scss */ +/* line 76, ../sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; @@ -4141,10 +4130,10 @@ input[type="text"] { /* line 27, ../sass/user-environ/_top-bar.scss */ .top-bar.browse, .top-bar.edit { border-bottom: 1px solid #4d4d4d; - top: 5px; - right: 5px; + top: 10px; + right: 10px; bottom: auto; - left: 5px; + left: 10px; height: 30px; } /* line 37, ../sass/user-environ/_top-bar.scss */ .top-bar .title { @@ -4189,54 +4178,60 @@ input[type="text"] { *****************************************************************************/ /* line 22, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar { + background: #000; color: gray; - font-size: 0.65rem; - line-height: 16px; } - /* line 26, ../sass/user-environ/_bottom-bar.scss */ + font-size: .7rem; } + /* line 28, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .status-holder { - -moz-border-radius: 3.5px; - -webkit-border-radius: 3.5px; - border-radius: 3.5px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - background: #000; - border-bottom: 1px solid #4d4d4d; - padding: 2px 5px; + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + line-height: 15px; + right: 120px; text-transform: uppercase; } - /* line 34, ../sass/user-environ/_bottom-bar.scss */ + /* line 39, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .app-logo { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - cursor: pointer; - font-size: 0.8em; - line-height: 10px; - padding-top: 1px; - text-transform: uppercase; } - /* line 41, ../sass/user-environ/_bottom-bar.scss */ + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; + left: auto; + cursor: pointer; } + /* line 48, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .app-logo.logo-openmctweb { background: url("../images/logo-openmctweb.svg") no-repeat center center; } -/* line 47, ../sass/user-environ/_bottom-bar.scss */ +/* line 54, ../sass/user-environ/_bottom-bar.scss */ .status.block { - display: inline-block; - margin-right: 20px; } - /* line 50, ../sass/user-environ/_bottom-bar.scss */ + display: inline; + margin-right: 10px; } + /* line 58, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator { - -moz-border-radius: 1.8px; - -webkit-border-radius: 1.8px; - border-radius: 1.8px; - -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; - box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; - text-shadow: rgba(0, 0, 0, 0.3) 0 0 2px; display: inline-block; - margin-right: 3px; } - /* line 58, ../sass/user-environ/_bottom-bar.scss */ + margin-right: 3px; + color: #0099cc; } + /* line 65, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator.ok { color: #009900; } - /* line 61, ../sass/user-environ/_bottom-bar.scss */ + /* line 68, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator.caution { color: #ffaa00; } @@ -4878,4 +4873,4 @@ input[type="text"] { display: none; } /* line 32, ../sass/_hide-non-functional.scss */ .browse-mode .browse-area.holder { - top: 5px; } + top: 10px; } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 2582522f39..97b7ab996a 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -40,6 +40,14 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/************************** FEATURES */ +/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ +/************************** COLORS AND SHADING */ +/************************** 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 diff --git a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json index 007c3e9014..45b1da9c33 100644 --- a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json +++ b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json @@ -1,14 +1,14 @@ { "metadata": { - "name": "WTD Symbols v2.0", - "lastOpened": 1435166748369, - "created": 1435164872664 + "name": "WTD Symbols v2.", + "lastOpened": 1435266597671, + "created": 1435266594435 }, "iconSets": [ { "selection": [ { - "order": 128, + "order": 1, "id": 75, "prevSize": 32, "code": 123, @@ -16,7 +16,7 @@ "tempChar": "" }, { - "order": 129, + "order": 3, "id": 74, "prevSize": 32, "code": 125, @@ -24,7 +24,7 @@ "tempChar": "" }, { - "order": 127, + "order": 4, "id": 73, "prevSize": 32, "code": 80, @@ -32,7 +32,7 @@ "tempChar": "" }, { - "order": 122, + "order": 5, "id": 72, "prevSize": 32, "code": 232, @@ -40,7 +40,7 @@ "tempChar": "" }, { - "order": 121, + "order": 6, "id": 71, "prevSize": 32, "code": 115, @@ -48,7 +48,7 @@ "tempChar": "" }, { - "order": 120, + "order": 7, "id": 70, "prevSize": 32, "code": 114, @@ -56,7 +56,7 @@ "tempChar": "" }, { - "order": 119, + "order": 8, "id": 69, "prevSize": 32, "code": 108, @@ -64,7 +64,7 @@ "tempChar": "" }, { - "order": 118, + "order": 9, "id": 68, "prevSize": 32, "code": 51, @@ -72,503 +72,511 @@ "tempChar": "" }, { - "order": 0, + "order": 10, "id": 67, "prevSize": 32, "code": 58880, "name": "icon-box-with-arrow-cursor", - "tempChar": "" + "tempChar": "" }, { - "order": 53, + "order": 11, "id": 66, "prevSize": 32, "code": 65, "name": "icon-activity-mode", - "tempChar": "" + "tempChar": "" }, { - "order": 54, + "order": 12, "id": 65, "prevSize": 32, "code": 97, "name": "icon-activity", - "tempChar": "" + "tempChar": "" }, { - "order": 55, + "order": 13, "id": 64, "prevSize": 32, "code": 33, "name": "icon-alert-rect", - "tempChar": "" + "tempChar": "" }, { - "order": 56, + "order": 14, "id": 63, "prevSize": 32, "code": 58883, "name": "icon-alert-triangle", - "tempChar": "" + "tempChar": "" }, { - "order": 57, + "order": 15, "id": 62, "prevSize": 32, "code": 238, "name": "icon-arrow-double-down", - "tempChar": "" + "tempChar": "" }, { - "order": 58, + "order": 16, "id": 61, "prevSize": 32, "code": 235, "name": "icon-arrow-double-up", - "tempChar": "" + "tempChar": "" }, { - "order": 59, + "order": 2, "id": 60, "prevSize": 32, "code": 118, "name": "icon-arrow-down", - "tempChar": "" + "tempChar": "" }, { - "order": 60, + "order": 19, "id": 59, "prevSize": 32, "code": 60, "name": "icon-arrow-left", - "tempChar": "" + "tempChar": "" }, { - "order": 61, + "order": 20, "id": 58, "prevSize": 32, "code": 62, "name": "icon-arrow-right", - "tempChar": "" + "tempChar": "" }, { - "order": 62, + "order": 21, "id": 57, "prevSize": 32, "code": 236, "name": "icon-arrow-tall-down", - "tempChar": "" + "tempChar": "" }, { - "order": 63, + "order": 22, "id": 56, "prevSize": 32, "code": 237, "name": "icon-arrow-tall-up", - "tempChar": "" + "tempChar": "" }, { - "order": 64, + "order": 23, "id": 55, "prevSize": 32, "code": 94, "name": "icon-arrow-up", - "tempChar": "" + "tempChar": "" }, { - "order": 65, + "order": 24, "id": 54, "prevSize": 32, "code": 73, "name": "icon-arrows-out", - "tempChar": "" + "tempChar": "" }, { - "order": 0, + "order": 25, "id": 53, "prevSize": 32, "code": 58893, "name": "icon-arrows-right-left", - "tempChar": "" + "tempChar": "" }, { - "order": 67, + "order": 33, "id": 52, "prevSize": 32, "code": 53, "name": "icon-arrows-up-down", - "tempChar": "" + "tempChar": "" }, { - "order": 24, + "order": 26, "id": 51, "prevSize": 32, "code": 42, "name": "icon-asterisk", - "tempChar": "" + "tempChar": "" }, { - "order": 25, + "order": 27, "id": 50, "prevSize": 32, "code": 72, "name": "icon-autoflow-tabular", - "tempChar": "" + "tempChar": "" }, { - "order": 68, + "order": 28, "id": 49, "prevSize": 32, "code": 224, "name": "icon-box-round-corners", - "tempChar": "" + "tempChar": "" }, { - "order": 69, + "order": 29, "id": 48, "prevSize": 32, "code": 50, "name": "icon-check", - "tempChar": "" + "tempChar": "" }, { - "order": 26, + "order": 30, "id": 47, "prevSize": 32, "code": 67, "name": "icon-clock", - "tempChar": "" + "tempChar": "" }, { - "order": 27, + "order": 31, "id": 46, "prevSize": 32, "code": 46, "name": "icon-connectivity", - "tempChar": "" + "tempChar": "" }, { - "order": 28, + "order": 32, "id": 45, "prevSize": 32, "code": 100, "name": "icon-database-query", - "tempChar": "" + "tempChar": "" }, { - "order": 29, + "order": 17, "id": 44, "prevSize": 32, "code": 68, "name": "icon-database", - "tempChar": "" + "tempChar": "" }, { - "order": 30, + "order": 35, "id": 43, "prevSize": 32, "code": 81, "name": "icon-dictionary", - "tempChar": "" + "tempChar": "" }, { - "order": 31, + "order": 36, "id": 42, "prevSize": 32, "code": 242, "name": "icon-duplicate", - "tempChar": "" + "tempChar": "" }, { - "order": 32, + "order": 37, "id": 41, "prevSize": 32, "code": 102, "name": "icon-folder-new", - "tempChar": "" + "tempChar": "" }, { - "order": 33, + "order": 38, "id": 40, "prevSize": 32, "code": 70, "name": "icon-folder", - "tempChar": "" + "tempChar": "" }, { - "order": 34, + "order": 39, "id": 39, "prevSize": 32, "code": 95, "name": "icon-fullscreen-collapse", - "tempChar": "" + "tempChar": "" }, { - "order": 35, + "order": 40, "id": 38, "prevSize": 32, "code": 122, "name": "icon-fullscreen-expand", - "tempChar": "" + "tempChar": "" }, { - "order": 36, + "order": 41, "id": 37, "prevSize": 32, "code": 71, "name": "icon-gear", - "tempChar": "" + "tempChar": "" }, { - "order": 39, + "order": 49, "id": 34, "prevSize": 32, "code": 227, "name": "icon-image", - "tempChar": "" + "tempChar": "" }, { - "order": 70, + "order": 42, "id": 33, "prevSize": 32, "code": 225, "name": "icon-layers", - "tempChar": "" + "tempChar": "" }, { - "order": 71, + "order": 43, "id": 32, "prevSize": 32, "code": 76, "name": "icon-layout", - "tempChar": "" + "tempChar": "" }, { - "order": 40, + "order": 44, "id": 31, "prevSize": 32, "code": 226, "name": "icon-line-horz", - "tempChar": "" + "tempChar": "" }, { - "order": 41, + "order": 45, "id": 30, "prevSize": 32, "code": 244, "name": "icon-link", - "tempChar": "" + "tempChar": "" }, { - "order": 42, + "order": 46, "id": 29, "prevSize": 32, "code": 88, "name": "icon-magnify-in", - "tempChar": "" + "tempChar": "" }, { - "order": 43, + "order": 47, "id": 28, "prevSize": 32, "code": 89, "name": "icon-magnify-out", - "tempChar": "" + "tempChar": "" }, { - "order": 44, + "order": 48, "id": 27, "prevSize": 32, "code": 77, "name": "icon-magnify", - "tempChar": "" + "tempChar": "" }, { - "order": 45, + "order": 34, "id": 26, "prevSize": 32, "code": 109, "name": "icon-menu", - "tempChar": "" + "tempChar": "" }, { - "order": 46, + "order": 50, "id": 25, "prevSize": 32, "code": 243, "name": "icon-move", - "tempChar": "" + "tempChar": "" }, { - "order": 47, + "order": 51, "id": 24, "prevSize": 32, "code": 121, "name": "icon-new-window", - "tempChar": "" + "tempChar": "" }, { - "order": 48, + "order": 52, "id": 23, "prevSize": 32, "code": 111, "name": "icon-object", - "tempChar": "" + "tempChar": "" }, { - "order": 49, + "order": 53, "id": 22, "prevSize": 32, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { - "order": 50, + "order": 54, "id": 21, "prevSize": 32, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { - "order": 51, + "order": 55, "id": 20, "prevSize": 32, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { - "order": 52, + "order": 56, "id": 19, "prevSize": 32, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { - "order": 87, + "order": 65, "id": 18, "prevSize": 32, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { - "order": 102, + "order": 57, "id": 17, "prevSize": 32, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { - "order": 103, + "order": 58, "id": 16, "prevSize": 32, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { - "order": 105, + "order": 59, "id": 15, "prevSize": 32, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { - "order": 109, + "order": 60, + "id": 76, + "prevSize": 32, + "code": 45, + "name": "icon-minus", + "tempChar": "" + }, + { + "order": 61, "id": 11, "prevSize": 32, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { - "order": 110, + "order": 62, "id": 10, "prevSize": 32, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { - "order": 132, + "order": 63, "id": 9, "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { - "order": 112, + "order": 64, "id": 8, "prevSize": 32, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { - "order": 113, + "order": 18, "id": 7, "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { - "order": 114, + "order": 67, "id": 6, "prevSize": 32, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { - "order": 104, + "order": 68, "id": 5, "prevSize": 32, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { - "order": 101, + "order": 69, "id": 4, "prevSize": 32, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { - "order": 86, + "order": 70, "id": 3, "prevSize": 32, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { - "order": 73, + "order": 71, "id": 2, "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { - "order": 116, + "order": 72, "id": 1, "prevSize": 32, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { - "order": 0, + "order": 66, "id": 0, "prevSize": 32, "code": 58946, @@ -580,7 +588,7 @@ "metadata": { "name": "Open MCT Web UI Symbols", "importSize": { - "width": 256, + "width": 512, "height": 512 }, "designer": "Charles Hacskaylo" @@ -1131,8 +1139,8 @@ { "id": 41, "paths": [ - "M894 188h-384v-64c0-70.4-57.6-128-128-128h-256c-70.4 0-128 57.6-128 128v320c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M894 444h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM702 764h-128v128h-128v-128h-128v-128h128v-128h128v128h128v128z" + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM704 800h-128v128h-128v-128h-128v-128h128v-128h128v128h128v128z" ], "attrs": [ {}, @@ -1147,8 +1155,8 @@ { "id": 40, "paths": [ - "M896 190h-384v-64c0-70.4-57.6-128-128-128h-256c-70.4 0-128 57.6-128 128v320c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M896 446h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128z" + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128z" ], "attrs": [ {}, @@ -1526,6 +1534,20 @@ "icon-plus" ] }, + { + "id": 76, + "paths": [ + "M960 640c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64h-896c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h896z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-minus" + ] + }, { "id": 11, "paths": [ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 40bd09f3fa..a341f741c9 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg index cd429e940e..0eef723d78 100755 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -10,6 +10,7 @@ + @@ -20,7 +21,7 @@ - + @@ -39,7 +40,7 @@ - + @@ -74,6 +75,8 @@ + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index 55ba640d74..e56f67ce32 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index 75bd6cb6ab..88de29cc85 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff and b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff differ diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index e365243046..8a8fed19d1 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -20,10 +20,10 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -// Features +/************************** FEATURES */ $enableImageryThumbs: false; // Set to true if historical imagery thumbnails are supported -// Margins, spacing, radii +/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */ $bodyMargin: 10px; $interiorMargin: 5px; $interiorMarginLg: $interiorMargin * 2; @@ -33,7 +33,7 @@ $controlCr: 2px; $smallCr: 2px; $badgeW: 35px; -// Colors and shading +/************************** COLORS AND SHADING */ $colorBodyBg: #333; $colorBodyFg: #999; $colorFooterBg: #000; @@ -44,64 +44,68 @@ $colorAlt1: #ffc700; $colorAlert: #ff3c00; $colorPausedBg: #c56f01; $colorPausedFg: #fff; -$colorCheck: $colorKey; $colorCreateBtn: $colorKey; +$colorGridLines: rgba(#fff, 0.05); +// Menu colors +$colorMenuBg: lighten($colorBodyBg, 23%); +$colorMenuFg: lighten($colorMenuBg, 70%); +$colorMenuIc: lighten($colorKey, 17%); $colorInteriorBorder: lighten($colorBodyBg, 10%); $colorObjFrameBg: darken($colorBodyBg, 5%); +// Form colors +$colorCheck: $colorKey; $colorFormRequired: #ffc700; $colorFormValid: #33cc33; $colorFormError: #cc0000; $colorFormInvalid: #ff9900; -$colorGridLines: rgba(#fff, 0.05); +// Limits and staleness colors $colorLimitYellow: #9d7500; $colorLimitRed: #aa0000; $colorTelemFresh: #fff; $colorTelemStale: #888; $styleTelemStale: italic; +// Bubble colors $colorInfoBubbleFg: #666; $colorInfoBubbleBg: #ddd; $colorThumbsBubbleFg: lighten($colorBodyFg, 10%); $colorThumbsBubbleBg: lighten($colorBodyBg, 10%); -$colorLimitYellow: #9d7500; -$colorLimitRed: #aa0000; -$colorTelemFresh: #fff; -$colorTelemStale: #888; -$styleTelemState: italic; -$colorInfoBubbleFg: #666; -$colorInfoBubbleBg: #ddd; - -// Ratios -$ltGamma: 20%; -$btnFontSizeToH: 0.45; - -// User Environment -$ueTopBarH: 24px; // Change to when breadcrumb is enabled -$ueTopBarEditH: 30px; -$ueTopBarBtnH: 35px; -$ueFooterH: 20px; -$ueColMargin: 1.5%; -$ueAppLogoW: 105px; -//$ueBrowseViewBarH: $ueTopBarH; // was 30px -$ueEditToolBarH: 25px; -$ueBrowseLeftPaneW: 25%; -$ueEditLeftPaneW: 75%; - // Overlay $colorOvrBlocker: rgba(black, 0.7); $colorOvrBg: $colorBodyBg; $colorOvrFg: $colorBodyFg; -$ovrTopBarH: 60px; -$ovrFooterH: 40px; - -//Items -$ueBrowseGridItemLg: 200px; -$ueBrowseGridItemTopBarH: 20px; -$ueBrowseGridItemBottomBarH: 30px; +// Items $colorItemBase: lighten($colorBodyBg, 5%); $colorItemFg: lighten($colorItemBase, 20%); $colorItemSelected: $colorKey; -$itemPadLR: 5px; +// Tabular +$tabularColorBorder: rgba(white, 0.1); +$tabularColorBodyBg: darken($colorBodyBg, 10%); +$tabularColorBodyFg: lighten($tabularColorBodyBg, 40%); +$tabularColorHeaderBg: lighten($colorBodyBg, 10%); +$tabularColorHeaderFg: lighten($tabularColorHeaderBg, 40%); +/************************** RATIOS */ +$ltGamma: 20%; +$btnFontSizeToH: 0.45; + +/************************** LAYOUT */ +$ueTopBarH: 24px; // Change when breadcrumb is enabled +$ueTopBarEditH: 30px; +$ueTopBarBtnH: 35px; +$ueFooterH: 25px; +$ueColMargin: 1.5%; +$ueAppLogoW: 105px; +$ueEditToolBarH: 25px; +$ueBrowseLeftPaneW: 25%; +$ueEditLeftPaneW: 75%; +// Overlay +$ovrTopBarH: 60px; +$ovrFooterH: 40px; +// Items +$ueBrowseGridItemLg: 200px; +$ueBrowseGridItemTopBarH: 20px; +$ueBrowseGridItemBottomBarH: 30px; +$itemPadLR: 5px; // Tree $treeVCW: 10px; $treeTypeIconW: 20px; @@ -109,18 +113,33 @@ $treeContextTriggerW: 20px; $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%); $colorItemTreeVCHover: $colorAlt1; - -//Tabular +// Tabular $tabularHeaderH: 18px; $tabularTdPadLR: $itemPadLR; $tabularTdPadTB: 2px; -$tabularColorBorder: rgba(white, 0.1); -$tabularColorBodyBg: darken($colorBodyBg, 10%); -$tabularColorBodyFg: lighten($tabularColorBodyBg, 40%); -$tabularColorHeaderBg: lighten($colorBodyBg, 10%); -$tabularColorHeaderFg: lighten($tabularColorHeaderBg, 40%); +// Imagery +$imageMainControlBarH: 20px; +$imageThumbsD: 120px; +$imageThumbsWrapperH: $imageThumbsD * 1.4; +$imageThumbPad: 1px; +// Ticks +$ticksH: 25px; +$tickLblVMargin: 3px; +$tickLblH: 15px; +$tickLblW: 50px; +$tickH: $ticksH - $tickLblVMargin - $tickLblH; +$tickW: 1px; +// Bubbles +$bubbleArwSize: 10px; +$bubblePad: $interiorMargin; +$bubbleMinW: 100px; +$bubbleMaxW: 300px; +// Forms +$reqSymbolW: 15px; +$reqSymbolM: $interiorMargin * 2; +$reqSymbolFontSize: 0.7em; -// Controls +/************************** CONTROLS */ $controlCr: $basicCr; $controlDisabledOpacity: 0.3; $formLabelW: 20%; @@ -132,34 +151,9 @@ $scrollbarTrackColorBg: rgba(#000, 0.4); $btnStdH: 25px; $btnToolbarH: $btnStdH; -// Paths +/************************** PATHS */ $dirImgs: '../images/'; // Relative to platform/css/ directory -// Ticks -$ticksH: 25px; -$tickLblVMargin: 3px; -$tickLblH: 15px; -$tickLblW: 50px; -$tickH: $ticksH - $tickLblVMargin - $tickLblH; -$tickW: 1px; - -// Imagery -$imageMainControlBarH: 20px; -$imageThumbsD: 120px; -$imageThumbsWrapperH: $imageThumbsD * 1.4; -$imageThumbPad: 1px; - -// Bubbles -$bubbleArwSize: 10px; -$bubblePad: $interiorMargin; -$bubbleMinW: 100px; -$bubbleMaxW: 300px; - - -// Timing +/************************** TIMINGS */ $controlFadeMs: 100ms; -// Forms -$reqSymbolW: 15px; -$reqSymbolM: $interiorMargin * 2; -$reqSymbolFontSize: 0.7em; \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index be0afc896d..3c28d54c7d 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -29,10 +29,13 @@ a { } body, html { + -webkit-font-smoothing: subpixel-antialiased; + -moz-osx-font-smoothing: grayscale; background-color: $colorBodyBg; color: $colorBodyFg; - font-family: Helvetica, Arial, sans-serif; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 100%; + //font-weight: 500; height: 100%; width: 100%; overflow: hidden; diff --git a/platform/commonUI/general/res/sass/_hide-non-functional.scss b/platform/commonUI/general/res/sass/_hide-non-functional.scss index ccc752a9bb..0f1fcd525a 100644 --- a/platform/commonUI/general/res/sass/_hide-non-functional.scss +++ b/platform/commonUI/general/res/sass/_hide-non-functional.scss @@ -31,7 +31,7 @@ .browse-area.holder { // When .browse.top-bar is hidden, set the top of the browse-area holder - top: $interiorMargin; + top: $bodyMargin; > .contents.split-layout { // Don't pad in from top and bottom //top: 0; bottom: 0; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 9ea16036d3..1534694f79 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -25,6 +25,7 @@ $pad: $interiorMargin * $baseRatio; /******* LAYOUT AND SIZING */ .btn, .l-btn { + @include user-select(none); line-height: 1.5em; // Was 1.25em padding: 0 $pad; text-decoration: none; diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 46b67dd6ef..31922238ee 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -37,7 +37,6 @@ ul { @include menuUlReset(); li { -// @include border-radius($controlCr); @include box-sizing(border-box); border-top: 1px solid lighten($bg, 20%); line-height: $menuLineH; @@ -65,20 +64,39 @@ } } } + + .context-menu, + .super-menu { + $bg: $colorMenuBg; + $fg: $colorMenuFg; + $ic: $colorMenuIc; + //font-size: 0.80rem; + pointer-events: auto; + @include containerSubtle($bg); + ul li { + padding-left: 25px; + a { color: $fg; } + .icon { + color: $ic; + } + .type-icon { + left: $interiorMargin; + } + &:hover .icon { + color: lighten($ic, 5%); + } + } + } + + .super-menu { - $w: 450px; + $w: 500px; $h: $w - 20; $plw: 50%; //$w * 0.5; $prw: 50%; //$w - $plw; - $bg: $colorKey; - $fg: $colorKeyFg; - $colorMid: lighten($bg, 25%); - $bgHover: $bg; - @include containerSubtle(darken($bg, 15%), $fg); + $fg: #fff; //lighten($colorBodyFg, 40%); + $bgHover: $colorKey; //$bg; display: block; - .icon { - color: $colorMid; - } width: $w; height: $h; .contents { @@ -98,21 +116,8 @@ ul { li { @include border-radius($controlCr); -// @include test(red); + padding-left: 30px; border-top: none; - color: $fg; -// font-size: 0.85em; -// line-height: 20px; - &:hover { - background: $bgHover; - .icon { - color: lighten($bg, 50%); - } - } - .icon { - @include txtShdwSubtle(0.4); - left: $interiorMargin; - } } } } @@ -122,13 +127,14 @@ right: 0; padding: $interiorMargin * 5; width: $prw; + .icon { + color: $fg; + } } } .menu-item-description { .desc-area { - // @include test(green); &.icon { - //@include test(red); $h: 150px; position: relative; font-size: 8em; @@ -153,27 +159,7 @@ } } .context-menu { - $bg: lighten($colorBodyBg, 25%); - $fg: lighten($bg, 70%); - $ic: lighten($colorKey, 15%); font-size: 0.80rem; - pointer-events: auto; - &.menu { - @include containerSubtle($bg); - ul li { - padding-left: 30px; - a { color: $fg; } - .icon { - color: $ic; - } - .type-icon { - left: $interiorMargin; - } - &:hover .icon { - color: lighten($ic, 5%); - } - } - } } } diff --git a/platform/commonUI/general/res/sass/features/_imagery.scss b/platform/commonUI/general/res/sass/features/_imagery.scss index 69abc1ee27..fa0b092fbf 100644 --- a/platform/commonUI/general/res/sass/features/_imagery.scss +++ b/platform/commonUI/general/res/sass/features/_imagery.scss @@ -47,7 +47,7 @@ } .l-image-main { - cursor: crosshair; + //cursor: crosshair; } .l-image-main-controlbar { diff --git a/platform/commonUI/general/res/sass/features/_time-display.scss b/platform/commonUI/general/res/sass/features/_time-display.scss index 483231a97f..d792839a00 100644 --- a/platform/commonUI/general/res/sass/features/_time-display.scss +++ b/platform/commonUI/general/res/sass/features/_time-display.scss @@ -3,7 +3,6 @@ // Layout &:hover { .l-btn.control { - //display: inline-block; opacity: 1; } } @@ -20,6 +19,9 @@ position: absolute; left: 0; z-index: 1; + .ui-symbol.direction { + font-size: 0.8em; + } } &:hover .l-elem.l-value { left: 20px; @@ -35,10 +37,10 @@ } .l-btn.control { @include trans-prop-nice-fade($transTime); - //display: none; opacity: 0; - font-size: 0.9em; - line-height: 1em; + font-size: 0.65em; + vertical-align: top; + //line-height: 1em; } } diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 153fcbf94c..692db103e1 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -65,7 +65,8 @@ .bottom-bar { top: auto; right: 0; bottom: 0; left: 0; - font-size: 1em; + overflow: visible; + //font-size: 1em; height: $ovrFooterH; text-align: right; .btn { diff --git a/platform/commonUI/general/res/sass/themes/_theme-espresso.scss b/platform/commonUI/general/res/sass/themes/_theme-espresso.scss index bcf07c33bf..d165be8929 100644 --- a/platform/commonUI/general/res/sass/themes/_theme-espresso.scss +++ b/platform/commonUI/general/res/sass/themes/_theme-espresso.scss @@ -19,5 +19,4 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* CONSTANTS */ -$bodyMargin: 5px; \ No newline at end of file +/* CONSTANTS */ \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss index 379626b5d2..957668cc1d 100644 --- a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss +++ b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss @@ -20,24 +20,31 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .ue-bottom-bar { + background: $colorFooterBg; color: lighten($colorBodyBg, 30%); - font-size: 0.65rem; - line-height: $ueFooterH - 4px; + font-size: .7rem; + //line-height: $ueFooterH - 4px; + //line-height: $ueFooterH; // New status bar design .status-holder { - @include border-radius($basicCr * 1.75); + //@include border-radius($basicCr * 1.75); // New status bar design @include box-sizing(border-box); - background: $colorFooterBg; - border-bottom: 1px solid lighten($colorBodyBg, 10%); - padding: 2px 5px; + //background: $colorFooterBg; + //border-bottom: 1px solid lighten($colorBodyBg, 10%); // New status bar design + @include absPosDefault($interiorMargin); + @include ellipsize(); + line-height: $ueFooterH - ($interiorMargin * 2); + right: 120px; text-transform: uppercase; } .app-logo { @include box-sizing(border-box); + @include absPosDefault($interiorMargin); + left: auto; cursor: pointer; - font-size: 0.8em; - line-height: $ueFooterH - 10px; - padding-top: 1px; - text-transform: uppercase; + //font-size: 0.8em; + //line-height: $ueFooterH - 10px; + //padding-top: 1px; + //text-transform: uppercase; &.logo-openmctweb { background: url($dirImgs + 'logo-openmctweb.svg') no-repeat center center; } @@ -45,16 +52,16 @@ } .status.block { - display: inline-block; - margin-right: $interiorMargin * 4; + //display: inline-block; + display: inline; // New status bar design. Inline to support ellipsis overflow + margin-right: $interiorMargin * 2; .status-indicator { - @include border-radius($controlCr * 0.9); - @include box-shadow(inset rgba(black, 0.5) 0 0 3px); - @include text-shadow(rgba(black, 0.3) 0 0 2px); + //@include border-radius($controlCr * 0.9); + //@include box-shadow(inset rgba(black, 0.5) 0 0 3px); + //@include text-shadow(rgba(black, 0.3) 0 0 2px); display: inline-block; - //font-size: 1.25em; // Normalized for new wtdsymbols font v2 - //vertical-align: middle; // Normalized for new wtdsymbols font v2 margin-right: $interiorMarginSm; + color: $colorKey; &.ok { color: #009900; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index dd0c34654e..639e53af75 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -30,7 +30,7 @@ } .holder-all { - $myM: $interiorMarginSm; + $myM: 0; // $interiorMarginSm; top: $myM; right: $myM; bottom: $myM; @@ -93,7 +93,7 @@ .editor { top: $bodyMargin + $ueTopBarH + ($interiorMargin); right: $bodyMargin; - bottom: $bodyMargin + $ueFooterH + $interiorMargin; + bottom: $ueFooterH + $bodyMargin; left: $bodyMargin; } @@ -119,15 +119,18 @@ } .bottom-bar { - @include absPosDefault($bodyMargin); + //@include absPosDefault($bodyMargin); + @include absPosDefault(0);// New status bar design top: auto; height: $ueFooterH; .status-holder { - right: $ueAppLogoW + $bodyMargin; + //right: $ueAppLogoW + $bodyMargin; New status bar design + z-index: 1; } .app-logo { left: auto; width: $ueAppLogoW; + z-index: 2; } } } diff --git a/platform/commonUI/general/res/templates/bottombar.html b/platform/commonUI/general/res/templates/bottombar.html index 53a3c3d5a3..fe275a49da 100644 --- a/platform/commonUI/general/res/templates/bottombar.html +++ b/platform/commonUI/general/res/templates/bottombar.html @@ -20,7 +20,7 @@ at runtime from the About dialog for additional information. -->
-
+