diff --git a/package.json b/package.json index d1d675df19..a1ac01f437 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "start": "node app.js", "test": "karma start --single-run", "jshint": "jshint platform example || exit 0", + "watch": "karma start", "jsdoc": "jsdoc -c jsdoc.json -r -d target/docs/api", "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs", "docs": "npm run jsdoc ; npm run otherdoc" diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 7355a6b69c..6e166edb02 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -69,8 +69,8 @@ { "key": "grid-item", "templateUrl": "templates/items/grid-item.html", - "uses": [ "type", "action" ], - "gestures": [ "info","menu" ] + "uses": [ "type", "action", "location" ], + "gestures": [ "info", "menu" ] }, { "key": "object-header", @@ -88,12 +88,12 @@ { "key": "navigationService", "implementation": "navigation/NavigationService.js" - }, + }, { "key": "creationService", "implementation": "creation/CreationService.js", "depends": [ "persistenceService", "$q", "$log" ] - } + } ], "actions": [ { diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index e64afd4a9f..64282a9ee1 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -27,12 +27,18 @@
- +
P
-
{{type.getGlyph()}}
+
+ {{type.getGlyph()}} + +
}
@@ -44,4 +50,4 @@
- \ No newline at end of file + diff --git a/platform/commonUI/browse/src/creation/CreationService.js b/platform/commonUI/browse/src/creation/CreationService.js index 015573c8bd..17cc5ce6b3 100644 --- a/platform/commonUI/browse/src/creation/CreationService.js +++ b/platform/commonUI/browse/src/creation/CreationService.js @@ -93,6 +93,12 @@ define( }); } + // Store the location of an object relative to it's parent. + function addLocationToModel(modelId, model, parent) { + model.location = parent.getId(); + return model; + } + // Create a new domain object with the provided model as a // member of the specified parent's composition function createObject(model, parent) { @@ -112,6 +118,7 @@ define( return $q.when( uuid() ).then(function (id) { + model = addLocationToModel(id, model, parent); return doPersist(persistence.getSpace(), id, model); }).then(function (id) { return addToComposition(id, parent, persistence); diff --git a/platform/commonUI/browse/test/creation/CreationServiceSpec.js b/platform/commonUI/browse/test/creation/CreationServiceSpec.js index 277b195eaf..7f15afe061 100644 --- a/platform/commonUI/browse/test/creation/CreationServiceSpec.js +++ b/platform/commonUI/browse/test/creation/CreationServiceSpec.js @@ -38,6 +38,7 @@ define( mockMutationCapability, mockPersistenceCapability, mockCompositionCapability, + mockContextCapability, mockCapabilities, creationService; @@ -87,10 +88,15 @@ define( "composition", ["invoke"] ); + mockContextCapability = jasmine.createSpyObj( + "context", + ["getPath"] + ); mockCapabilities = { mutation: mockMutationCapability, persistence: mockPersistenceCapability, - composition: mockCompositionCapability + composition: mockCompositionCapability, + context: mockContextCapability }; mockPersistenceService.createObject.andReturn( @@ -103,6 +109,7 @@ define( mockParentObject.useCapability.andCallFake(function (key, value) { return mockCapabilities[key].invoke(value); }); + mockParentObject.getId.andReturn('parentId'); mockPersistenceCapability.persist.andReturn( mockPromise(true) @@ -194,7 +201,16 @@ define( expect(mockLog.error).toHaveBeenCalled(); }); + it("stores location on new domainObjects", function () { + var model = { name: "my model" }, + objectPromise = creationService.createObject( + model, + mockParentObject + ); + + expect(model.location).toBe('parentId'); + }); }); } -); \ No newline at end of file +); diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 2b8f63c243..33242ccdcf 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -196,7 +196,7 @@ { "key": "label", "templateUrl": "templates/label.html", - "uses": [ "type" ], + "uses": [ "type", "location" ], "gestures": [ "drag", "menu", "info" ] }, { diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index ec41844773..b7b08b89e8 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -69,6 +69,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/*********************************************** FORM ELEMENTS */ /* @mixin invokeMenu($baseColor: $colorBodyFg) { $c: $baseColor; @@ -182,27 +183,21 @@ line-height: 14px; margin-right: 5px; } /* line 89, ../sass/forms/_elems.scss */ - .form .form-row .controls input[type="text"] { - height: 22px; - line-height: 22px; - margin-top: -4px; - vertical-align: baseline; } - /* line 96, ../sass/forms/_elems.scss */ .form .form-row .controls .l-med input[type="text"] { width: 200px; } - /* line 100, ../sass/forms/_elems.scss */ + /* line 93, ../sass/forms/_elems.scss */ .form .form-row .controls .l-small input[type="text"] { width: 50px; } - /* line 104, ../sass/forms/_elems.scss */ + /* line 97, ../sass/forms/_elems.scss */ .form .form-row .controls .l-numeric input[type="text"] { text-align: right; } - /* line 108, ../sass/forms/_elems.scss */ + /* line 101, ../sass/forms/_elems.scss */ .form .form-row .controls .select { margin-right: 5px; } - /* line 113, ../sass/forms/_elems.scss */ + /* line 106, ../sass/forms/_elems.scss */ .form .form-row .field-hints { color: #666666; } - /* line 117, ../sass/forms/_elems.scss */ + /* line 110, ../sass/forms/_elems.scss */ .form .form-row .selector-list { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -215,7 +210,7 @@ position: relative; height: 150px; overflow: auto; } - /* line 128, ../sass/forms/_elems.scss */ + /* line 121, ../sass/forms/_elems.scss */ .form .form-row .selector-list .wrapper { overflow-y: auto; position: absolute; @@ -224,24 +219,24 @@ bottom: 5px; left: 5px; } -/* line 142, ../sass/forms/_elems.scss */ +/* line 135, ../sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 148, ../sass/forms/_elems.scss */ +/* line 141, ../sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 153, ../sass/forms/_elems.scss */ +/* line 146, ../sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 160, ../sass/forms/_elems.scss */ + /* line 153, ../sass/forms/_elems.scss */ .l-result div.s-hint { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -276,18 +271,17 @@ label.form-control.checkbox input { .edit-main textarea { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; background: rgba(255, 255, 255, 0.1); border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); color: #cccccc; outline: none; padding: 5px; @@ -323,18 +317,17 @@ label.form-control.checkbox input { input[type="text"] { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; background: rgba(255, 255, 255, 0.1); border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); color: #cccccc; outline: none; padding: 0 3px; } @@ -374,9 +367,9 @@ input[type="text"] { background-image: -moz-linear-gradient(#525252, #454545); background-image: -webkit-linear-gradient(#525252, #454545); background-image: linear-gradient(#525252, #454545); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -463,18 +456,17 @@ input[type="text"] { .channel-selector .treeview { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; background: rgba(255, 255, 255, 0.1); border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); color: #cccccc; outline: none; padding: 0 3px; diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index c0ba5edecf..5caa262048 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -69,6 +69,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/*********************************************** FORM ELEMENTS */ /* @mixin invokeMenu($baseColor: $colorBodyFg) { $c: $baseColor; @@ -115,9 +116,9 @@ background-image: -moz-linear-gradient(#5e5e5e, #525252); background-image: -webkit-linear-gradient(#5e5e5e, #525252); background-image: linear-gradient(#5e5e5e, #525252); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -255,9 +256,9 @@ background-image: -moz-linear-gradient(#0ac2ff, #00b4f0); background-image: -webkit-linear-gradient(#0ac2ff, #00b4f0); background-image: linear-gradient(#0ac2ff, #00b4f0); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 26d9f9c142..b6c9a43edc 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -92,7 +92,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../.rvm/gems/ruby-2.2.1/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, @@ -113,38 +113,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../.rvm/gems/ruby-2.2.1/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../.rvm/gems/ruby-2.2.1/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../.rvm/gems/ruby-2.2.1/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../.rvm/gems/ruby-2.2.1/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, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../.rvm/gems/ruby-2.2.1/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../.rvm/gems/ruby-2.2.1/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../.rvm/gems/ruby-2.2.1/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../.gem/ruby/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../.rvm/gems/ruby-2.2.1/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; } @@ -169,13 +169,14 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/*********************************************** FORM ELEMENTS */ /* @mixin invokeMenu($baseColor: $colorBodyFg) { - $c: $baseColor; - color: $c; - &:hover { - color: lighten($c, $ltGamma); - } + $c: $baseColor; + color: $c; + &:hover { + color: lighten($c, $ltGamma); + } } */ /***************************************************************************** @@ -316,10 +317,15 @@ input, textarea { font-family: Helvetica, Arial, sans-serif; } /* line 53, ../sass/_global.scss */ +input[type="text"] { + vertical-align: baseline; + padding: 3px 5px !important; } + +/* line 58, ../sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 57, ../sass/_global.scss */ +/* line 62, ../sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -327,21 +333,21 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 65, ../sass/_global.scss */ +/* line 70, ../sass/_global.scss */ p { margin-bottom: 10px; } -/* line 69, ../sass/_global.scss */ +/* line 74, ../sass/_global.scss */ span { /* 618 DEBUG box-sizing: border-box; */ } -/* line 75, ../sass/_global.scss */ +/* line 80, ../sass/_global.scss */ mct-container { display: block; } -/* line 79, ../sass/_global.scss */ +/* line 84, ../sass/_global.scss */ .abs, .btn-menu span.l-click-area { position: absolute; top: 0; @@ -351,51 +357,51 @@ mct-container { height: auto; width: auto; } -/* line 89, ../sass/_global.scss */ +/* line 94, ../sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 96, ../sass/_global.scss */ +/* line 101, ../sass/_global.scss */ .codehilite { background-color: rgba(255, 255, 255, 0.1); padding: 1em; } -/* line 102, ../sass/_global.scss */ +/* line 107, ../sass/_global.scss */ .align-right { text-align: right; } -/* line 106, ../sass/_global.scss */ +/* line 111, ../sass/_global.scss */ .centered { text-align: center; } -/* line 110, ../sass/_global.scss */ +/* line 115, ../sass/_global.scss */ .no-margin { margin: 0; } -/* line 114, ../sass/_global.scss */ +/* line 119, ../sass/_global.scss */ .colorKey { color: #0099cc; } -/* line 118, ../sass/_global.scss */ +/* line 123, ../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 122, ../sass/_global.scss */ +/* line 127, ../sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 128, ../sass/_global.scss */ +/* line 133, ../sass/_global.scss */ .paused:not(.s-btn):not(.icon-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } -/* line 134, ../sass/_global.scss */ +/* line 139, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -955,67 +961,6 @@ mct-container { .s-text h3 { margin-top: 2em; } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/* line 22, ../sass/_badges.scss */ -.badge { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZDIzMyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmYzcwMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffd233), color-stop(100%, #ffc700)); - background-image: -moz-linear-gradient(#ffd233, #ffc700); - background-image: -webkit-linear-gradient(#ffd233, #ffc700); - background-image: linear-gradient(#ffd233, #ffc700); - color: #333; - display: inline-block; - text-align: center; } - -/* line 29, ../sass/_badges.scss */ -.top-bar .badge { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - font-size: 1.4em; - height: 25px; - line-height: 25px; - margin-right: 5px; - width: 35px; - vertical-align: middle; } - -/* line 54, ../sass/_badges.scss */ -.super-menu .badge { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00bfff), color-stop(100%, #0099cc)); - background-image: -moz-linear-gradient(#00bfff, #0099cc); - background-image: -webkit-linear-gradient(#00bfff, #0099cc); - background-image: linear-gradient(#00bfff, #0099cc); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -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; - padding: 2px 7px; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1104,27 +1049,27 @@ mct-container { /*.s-limit-upr, .s-limit-lwr { - $a: 0.5; - $l: 30%; - white-space: nowrap; - &:before { - display: inline-block; - font-family: symbolsfont; - font-size: 0.85em; - font-style: normal !important; - margin-right: $interiorMarginSm; - vertical-align: middle; - } + $a: 0.5; + $l: 30%; + white-space: nowrap; + &:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.85em; + font-style: normal !important; + margin-right: $interiorMarginSm; + vertical-align: middle; + } } .s-limit-upr { - &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ed"); } - &.s-limit-red { @include limit($colorLimitRed, "\0000eb"); } + &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ed"); } + &.s-limit-red { @include limit($colorLimitRed, "\0000eb"); } } .s-limit-lwr { - &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); } - &.s-limit-red { @include limit($colorLimitRed, "\0000ee"); } + &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); } + &.s-limit-red { @include limit($colorLimitRed, "\0000ee"); } }*/ /* line 35, ../sass/_limits.scss */ [class*="s-limit"] { @@ -1206,7 +1151,8 @@ mct-container { height: 100%; } /* line 27, ../sass/lists/_tabular.scss */ -.tabular { +.tabular, +table { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1214,98 +1160,187 @@ mct-container { border-collapse: collapse; color: #fff; display: table; - font-size: 0.75em; + font-size: 0.75rem; position: relative; width: 100%; } - /* line 37, ../sass/lists/_tabular.scss */ + /* line 38, ../sass/lists/_tabular.scss */ .tabular thead, .tabular .thead, - .tabular tbody tr, .tabular .tbody .tr { + .tabular tbody tr, .tabular .tbody .tr, + table thead, + table .thead, + table tbody tr, + table .tbody .tr { width: 100%; } - /* line 45, ../sass/lists/_tabular.scss */ - .tabular thead tr, .tabular thead .tr, .tabular .thead tr, .tabular .thead .tr { - height: 18px; } - /* line 48, ../sass/lists/_tabular.scss */ - .tabular thead:before, .tabular .thead:before { - content: ""; - display: block; - z-index: 0; - position: absolute; - width: 100%; - height: 18px; - background: rgba(255, 255, 255, 0.15); } - /* line 58, ../sass/lists/_tabular.scss */ - .tabular tbody, .tabular .tbody { + /* line 44, ../sass/lists/_tabular.scss */ + .tabular thead, .tabular .thead, + table thead, + table .thead { + border-bottom: 1px solid #333; } + /* line 47, ../sass/lists/_tabular.scss */ + .tabular tbody, .tabular .tbody, + table tbody, + table .tbody { display: table-row-group; } - /* line 65, ../sass/lists/_tabular.scss */ - .tabular tbody tr:hover, .tabular tbody .tr:hover, .tabular .tbody tr:hover, .tabular .tbody .tr:hover { + /* line 54, ../sass/lists/_tabular.scss */ + .tabular tbody tr:hover, .tabular tbody .tr:hover, .tabular .tbody tr:hover, .tabular .tbody .tr:hover, + table tbody tr:hover, + table tbody .tr:hover, + table .tbody tr:hover, + table .tbody .tr:hover { background: rgba(255, 255, 255, 0.1); } - /* line 70, ../sass/lists/_tabular.scss */ - .tabular tr, .tabular .tr { + /* line 59, ../sass/lists/_tabular.scss */ + .tabular tr, .tabular .tr, + table tr, + table .tr { display: table-row; } - /* line 72, ../sass/lists/_tabular.scss */ - .tabular tr:first-child .td, .tabular .tr:first-child .td { + /* line 61, ../sass/lists/_tabular.scss */ + .tabular tr:first-child .td, .tabular .tr:first-child .td, + table tr:first-child .td, + table .tr:first-child .td { border-top: none; } - /* line 75, ../sass/lists/_tabular.scss */ - .tabular tr th, .tabular tr .th, .tabular tr td, .tabular tr .td, .tabular .tr th, .tabular .tr .th, .tabular .tr td, .tabular .tr .td { + /* line 65, ../sass/lists/_tabular.scss */ + .tabular tr.group-header td, .tabular tr.group-header .td, .tabular .tr.group-header td, .tabular .tr.group-header .td, + table tr.group-header td, + table tr.group-header .td, + table .tr.group-header td, + table .tr.group-header .td { + background-color: #404040; + color: #a6a6a6; } + /* line 71, ../sass/lists/_tabular.scss */ + .tabular tr th, .tabular tr .th, .tabular tr td, .tabular tr .td, .tabular .tr th, .tabular .tr .th, .tabular .tr td, .tabular .tr .td, + table tr th, + table tr .th, + table tr td, + table tr .td, + table .tr th, + table .tr .th, + table .tr td, + table .tr .td { display: table-cell; } - /* line 78, ../sass/lists/_tabular.scss */ - .tabular tr th, .tabular tr .th, .tabular .tr th, .tabular .tr .th { - border: none; - border-left: 1px solid rgba(255, 255, 255, 0.1); + /* line 74, ../sass/lists/_tabular.scss */ + .tabular tr th, .tabular tr .th, .tabular .tr th, .tabular .tr .th, + table tr th, + table tr .th, + table .tr th, + table .tr .th { + background-color: #4d4d4d; + border-left: 1px solid #333; color: #b3b3b3; - padding: 0 5px; + padding: 5px 5px; white-space: nowrap; vertical-align: middle; } - /* line 85, ../sass/lists/_tabular.scss */ - .tabular tr th:first-child, .tabular tr .th:first-child, .tabular .tr th:first-child, .tabular .tr .th:first-child { + /* line 81, ../sass/lists/_tabular.scss */ + .tabular tr th:first-child, .tabular tr .th:first-child, .tabular .tr th:first-child, .tabular .tr .th:first-child, + table tr th:first-child, + table tr .th:first-child, + table .tr th:first-child, + table .tr .th:first-child { border-left: none; } - /* line 89, ../sass/lists/_tabular.scss */ - .tabular tr th.sort .icon-sorting:before, .tabular tr .th.sort .icon-sorting:before, .tabular .tr th.sort .icon-sorting:before, .tabular .tr .th.sort .icon-sorting:before { + /* line 85, ../sass/lists/_tabular.scss */ + .tabular tr th.sort .icon-sorting:before, .tabular tr .th.sort .icon-sorting:before, .tabular .tr th.sort .icon-sorting:before, .tabular .tr .th.sort .icon-sorting:before, + table tr th.sort .icon-sorting:before, + table tr .th.sort .icon-sorting:before, + table .tr th.sort .icon-sorting:before, + table .tr .th.sort .icon-sorting:before { display: inline-block; font-family: symbolsfont; margin-left: 5px; } - /* line 94, ../sass/lists/_tabular.scss */ - .tabular tr th.sort.asc .icon-sorting:before, .tabular tr .th.sort.asc .icon-sorting:before, .tabular .tr th.sort.asc .icon-sorting:before, .tabular .tr .th.sort.asc .icon-sorting:before { + /* line 90, ../sass/lists/_tabular.scss */ + .tabular tr th.sort.asc .icon-sorting:before, .tabular tr .th.sort.asc .icon-sorting:before, .tabular .tr th.sort.asc .icon-sorting:before, .tabular .tr .th.sort.asc .icon-sorting:before, + table tr th.sort.asc .icon-sorting:before, + table tr .th.sort.asc .icon-sorting:before, + table .tr th.sort.asc .icon-sorting:before, + table .tr .th.sort.asc .icon-sorting:before { content: '0'; } - /* line 97, ../sass/lists/_tabular.scss */ - .tabular tr th.sort.desc .icon-sorting:before, .tabular tr .th.sort.desc .icon-sorting:before, .tabular .tr th.sort.desc .icon-sorting:before, .tabular .tr .th.sort.desc .icon-sorting:before { + /* line 93, ../sass/lists/_tabular.scss */ + .tabular tr th.sort.desc .icon-sorting:before, .tabular tr .th.sort.desc .icon-sorting:before, .tabular .tr th.sort.desc .icon-sorting:before, .tabular .tr .th.sort.desc .icon-sorting:before, + table tr th.sort.desc .icon-sorting:before, + table tr .th.sort.desc .icon-sorting:before, + table .tr th.sort.desc .icon-sorting:before, + table .tr .th.sort.desc .icon-sorting:before { content: '1'; } - /* line 102, ../sass/lists/_tabular.scss */ - .tabular tr td, .tabular tr .td, .tabular .tr td, .tabular .tr .td { - border-top: 1px solid rgba(255, 255, 255, 0.1); - min-width: 110px; + /* line 98, ../sass/lists/_tabular.scss */ + .tabular tr td, .tabular tr .td, .tabular .tr td, .tabular .tr .td, + table tr td, + table tr .td, + table .tr td, + table .tr .td { + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + min-width: 20px; color: #fff; - padding: 2px 5px; + padding: 3px 5px; + word-wrap: break-word; vertical-align: top; } + /* line 105, ../sass/lists/_tabular.scss */ + .tabular tr td.numeric, .tabular tr .td.numeric, .tabular .tr td.numeric, .tabular .tr .td.numeric, + table tr td.numeric, + table tr .td.numeric, + table .tr td.numeric, + table .tr .td.numeric { + text-align: right; } /* line 108, ../sass/lists/_tabular.scss */ - .tabular tr td.numeric, .tabular tr .td.numeric, .tabular .tr td.numeric, .tabular .tr .td.numeric { + .tabular tr td.s-cell-type-value, .tabular tr .td.s-cell-type-value, .tabular .tr td.s-cell-type-value, .tabular .tr .td.s-cell-type-value, + table tr td.s-cell-type-value, + table tr .td.s-cell-type-value, + table .tr td.s-cell-type-value, + table .tr .td.s-cell-type-value { text-align: right; } - /* line 111, ../sass/lists/_tabular.scss */ - .tabular tr td.s-cell-type-value, .tabular tr .td.s-cell-type-value, .tabular .tr td.s-cell-type-value, .tabular .tr .td.s-cell-type-value { - text-align: right; } - /* line 113, ../sass/lists/_tabular.scss */ - .tabular tr td.s-cell-type-value .l-cell-contents, .tabular tr .td.s-cell-type-value .l-cell-contents, .tabular .tr td.s-cell-type-value .l-cell-contents, .tabular .tr .td.s-cell-type-value .l-cell-contents { + /* line 110, ../sass/lists/_tabular.scss */ + .tabular tr td.s-cell-type-value .l-cell-contents, .tabular tr .td.s-cell-type-value .l-cell-contents, .tabular .tr td.s-cell-type-value .l-cell-contents, .tabular .tr .td.s-cell-type-value .l-cell-contents, + table tr td.s-cell-type-value .l-cell-contents, + table tr .td.s-cell-type-value .l-cell-contents, + table .tr td.s-cell-type-value .l-cell-contents, + table .tr .td.s-cell-type-value .l-cell-contents { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; padding-left: 5px; padding-right: 5px; } - /* line 122, ../sass/lists/_tabular.scss */ - .tabular.filterable tbody, .tabular.filterable .tbody { - top: 36px; } - /* line 127, ../sass/lists/_tabular.scss */ - .tabular.fixed-header { + /* line 126, ../sass/lists/_tabular.scss */ + .tabular.filterable tbody, .tabular.filterable .tbody, + table.filterable tbody, + table.filterable .tbody { + top: 44px; } + /* line 129, ../sass/lists/_tabular.scss */ + .tabular.filterable input[type="text"], + table.filterable input[type="text"] { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 100%; } + /* line 135, ../sass/lists/_tabular.scss */ + .tabular.fixed-header, + table.fixed-header { height: 100%; } - /* line 129, ../sass/lists/_tabular.scss */ + /* line 137, ../sass/lists/_tabular.scss */ .tabular.fixed-header thead, .tabular.fixed-header .thead, - .tabular.fixed-header tbody tr, .tabular.fixed-header .tbody .tr { + .tabular.fixed-header tbody tr, .tabular.fixed-header .tbody .tr, + table.fixed-header thead, + table.fixed-header .thead, + table.fixed-header tbody tr, + table.fixed-header .tbody .tr { display: table; table-layout: fixed; } - /* line 134, ../sass/lists/_tabular.scss */ - .tabular.fixed-header thead, .tabular.fixed-header .thead { + /* line 142, ../sass/lists/_tabular.scss */ + .tabular.fixed-header thead, .tabular.fixed-header .thead, + table.fixed-header thead, + table.fixed-header .thead { width: calc(100% - 10px); } - /* line 137, ../sass/lists/_tabular.scss */ - .tabular.fixed-header tbody, .tabular.fixed-header .tbody { + /* line 144, ../sass/lists/_tabular.scss */ + .tabular.fixed-header thead:before, .tabular.fixed-header .thead:before, + table.fixed-header thead:before, + table.fixed-header .thead:before { + content: ""; + display: block; + z-index: 0; + position: absolute; + width: 100%; + height: 22px; + background: rgba(255, 255, 255, 0.15); } + /* line 154, ../sass/lists/_tabular.scss */ + .tabular.fixed-header tbody, .tabular.fixed-header .tbody, + table.fixed-header tbody, + table.fixed-header .tbody { overflow: hidden; position: absolute; top: 0; @@ -1314,11 +1349,13 @@ mct-container { left: 0; width: auto; height: auto; - top: 18px; + top: 22px; display: block; overflow-y: scroll; } - /* line 145, ../sass/lists/_tabular.scss */ - .tabular.t-event-messages td, .tabular.t-event-messages .td { + /* line 162, ../sass/lists/_tabular.scss */ + .tabular.t-event-messages td, .tabular.t-event-messages .td, + table.t-event-messages td, + table.t-event-messages .td { min-width: 150px; } /* line 1, ../sass/controls/_breadcrumb.scss */ @@ -1418,9 +1455,9 @@ mct-container { .s-btn, .icon-btn, .s-icon-btn { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1438,9 +1475,9 @@ mct-container { background-image: -moz-linear-gradient(#0ac2ff, #00b4f0); background-image: -webkit-linear-gradient(#0ac2ff, #00b4f0); background-image: linear-gradient(#0ac2ff, #00b4f0); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1487,9 +1524,9 @@ mct-container { background-image: -moz-linear-gradient(#24c8ff, #0ac2ff); background-image: -webkit-linear-gradient(#24c8ff, #0ac2ff); background-image: linear-gradient(#24c8ff, #0ac2ff); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1541,9 +1578,9 @@ mct-container { background-image: -moz-linear-gradient(#858585, #787878); background-image: -webkit-linear-gradient(#858585, #787878); background-image: linear-gradient(#858585, #787878); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1592,9 +1629,9 @@ mct-container { background-image: -moz-linear-gradient(#525252, #454545); background-image: -webkit-linear-gradient(#525252, #454545); background-image: linear-gradient(#525252, #454545); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1652,9 +1689,9 @@ mct-container { background-image: -moz-linear-gradient(#fe9105, #e98301); background-image: -webkit-linear-gradient(#fe9105, #e98301); background-image: linear-gradient(#fe9105, #e98301); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1735,11 +1772,11 @@ mct-container { /* line 132, ../sass/controls/_buttons.scss */ .icon-btn.pause-play, .s-icon-btn.pause-play { - /* &.paused { - .icon { - @include pulse(500ms); - } - }*/ } + /* &.paused { + .icon { + @include pulse(500ms); + } + }*/ } /* line 138, ../sass/controls/_buttons.scss */ .icon-btn.pause-play .icon:before, .s-icon-btn.pause-play .icon:before { @@ -1862,32 +1899,32 @@ a.l-btn span { * at runtime from the About dialog for additional information. *****************************************************************************/ /*.control { - // UNUSED? - &.view-control { - .icon { - display: inline-block; - margin: -1px 5px 1px 2px; - vertical-align: middle; - &.triangle-down { - margin: 2px 2px -2px 0px; - } - } + // UNUSED? + &.view-control { + .icon { + display: inline-block; + margin: -1px 5px 1px 2px; + vertical-align: middle; + &.triangle-down { + margin: 2px 2px -2px 0px; + } + } - .label { - display: inline-block; - font-size: 11px; - vertical-align: middle; - } + .label { + display: inline-block; + font-size: 11px; + vertical-align: middle; + } - .toggle { - @include border-radius(3px); - display: inline-block; - padding: 1px 6px 4px 4px; - &:hover { - background: rgba(white, 0.1); - } - } - } + .toggle { + @include border-radius(3px); + display: inline-block; + padding: 1px 6px 4px 4px; + &:hover { + background: rgba(white, 0.1); + } + } + } }*/ /* line 51, ../sass/controls/_controls.scss */ .accordion { @@ -1997,21 +2034,21 @@ a.l-btn span { .btn-set .btn:first-child, .btn-set .t-btn:first-child { border-left: none; - -moz-border-radius-topleft: 2px; - -webkit-border-top-left-radius: 2px; - border-top-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - -webkit-border-bottom-left-radius: 2px; - border-bottom-left-radius: 2px; } + -moz-border-radius-topleft: 3px; + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; } /* line 169, ../sass/controls/_controls.scss */ .btn-set .btn:last-child, .btn-set .t-btn:last-child { - -moz-border-radius-topright: 2px; - -webkit-border-top-right-radius: 2px; - border-top-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - -webkit-border-bottom-right-radius: 2px; - border-bottom-right-radius: 2px; } + -moz-border-radius-topright: 3px; + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; } /* line 175, ../sass/controls/_controls.scss */ .object-browse-bar .btn, @@ -2111,9 +2148,9 @@ label.checkbox.custom { background-image: -moz-linear-gradient(#525252, #454545); background-image: -webkit-linear-gradient(#525252, #454545); background-image: linear-gradient(#525252, #454545); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -2124,23 +2161,23 @@ label.checkbox.custom { border-top: 1px solid #575757; color: #999; display: inline-block; - /* height: $h; - line-height: $h; - &.dropdown { - padding-left: $p; - padding-right: $p; - }*/ - /* &.context-available { - // An element like the invoke-menu triangle; - // Indicates that this element has a dropdown menu available; - // Currently unused - $c: $colorKey; - color: $c; - padding: 0 5px; - &:hover { - color: lighten($c, 10%); - } - }*/ } + /* height: $h; + line-height: $h; + &.dropdown { + padding-left: $p; + padding-right: $p; + }*/ + /* &.context-available { + // An element like the invoke-menu triangle; + // Indicates that this element has a dropdown menu available; + // Currently unused + $c: $colorKey; + color: $c; + padding: 0 5px; + &:hover { + color: lighten($c, 10%); + } + }*/ } /* line 162, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); @@ -2182,9 +2219,9 @@ label.checkbox.custom { padding-left: 25px; } /* line 335, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn .badge { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 4.5px; + -webkit-border-radius: 4.5px; + border-radius: 4.5px; display: block; font-size: 1em; line-height: 15px; @@ -2278,9 +2315,9 @@ label.checkbox.custom { background-image: -moz-linear-gradient(#525252, #454545); background-image: -webkit-linear-gradient(#525252, #454545); background-image: linear-gradient(#525252, #454545); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -2492,9 +2529,9 @@ label.checkbox.custom { background-image: -moz-linear-gradient(#5e5e5e, #525252); background-image: -webkit-linear-gradient(#5e5e5e, #525252); background-image: linear-gradient(#5e5e5e, #525252); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -2517,7 +2554,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 276, ../sass/_mixins.scss */ + /* line 308, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2529,7 +2566,7 @@ label.checkbox.custom { box-sizing: border-box; border-top: 1px solid #737373; color: #d9d9d9; - line-height: 1.4rem; + line-height: 1.5rem; padding: 3px 10px 3px 30px; white-space: nowrap; } /* line 46, ../sass/controls/_menus.scss */ @@ -2555,9 +2592,9 @@ label.checkbox.custom { 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; + -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; @@ -2623,9 +2660,9 @@ label.checkbox.custom { overflow-y: auto; } /* line 119, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; padding-left: 30px; border-top: none; } /* line 126, ../sass/controls/_menus.scss */ @@ -3116,27 +3153,6 @@ label.checkbox.custom { font-size: 0.65em; vertical-align: top; } -/***************************************************************************** - * 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 @@ -3220,27 +3236,21 @@ label.checkbox.custom { line-height: 14px; margin-right: 5px; } /* line 89, ../sass/forms/_elems.scss */ - .form .form-row .controls input[type="text"] { - height: 22px; - line-height: 22px; - margin-top: -4px; - vertical-align: baseline; } - /* line 96, ../sass/forms/_elems.scss */ .form .form-row .controls .l-med input[type="text"] { width: 200px; } - /* line 100, ../sass/forms/_elems.scss */ + /* line 93, ../sass/forms/_elems.scss */ .form .form-row .controls .l-small input[type="text"] { width: 50px; } - /* line 104, ../sass/forms/_elems.scss */ + /* line 97, ../sass/forms/_elems.scss */ .form .form-row .controls .l-numeric input[type="text"] { text-align: right; } - /* line 108, ../sass/forms/_elems.scss */ + /* line 101, ../sass/forms/_elems.scss */ .form .form-row .controls .select { margin-right: 5px; } - /* line 113, ../sass/forms/_elems.scss */ + /* line 106, ../sass/forms/_elems.scss */ .form .form-row .field-hints { color: #666666; } - /* line 117, ../sass/forms/_elems.scss */ + /* line 110, ../sass/forms/_elems.scss */ .form .form-row .selector-list { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -3253,7 +3263,7 @@ label.checkbox.custom { position: relative; height: 150px; overflow: auto; } - /* line 128, ../sass/forms/_elems.scss */ + /* line 121, ../sass/forms/_elems.scss */ .form .form-row .selector-list .wrapper { overflow-y: auto; position: absolute; @@ -3262,24 +3272,24 @@ label.checkbox.custom { bottom: 5px; left: 5px; } -/* line 142, ../sass/forms/_elems.scss */ +/* line 135, ../sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 148, ../sass/forms/_elems.scss */ +/* line 141, ../sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 153, ../sass/forms/_elems.scss */ +/* line 146, ../sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 160, ../sass/forms/_elems.scss */ + /* line 153, ../sass/forms/_elems.scss */ .l-result div.s-hint { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -3373,22 +3383,21 @@ span.req { input[type="text"] { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; background: rgba(255, 255, 255, 0.1); border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); color: #cccccc; outline: none; padding: 0 3px; } - /* line 33, ../sass/forms/_mixins.scss */ + /* line 274, ../sass/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } /* line 29, ../sass/forms/_text-input.scss */ @@ -3424,9 +3433,9 @@ input[type="text"] { background-image: -moz-linear-gradient(#525252, #454545); background-image: -webkit-linear-gradient(#525252, #454545); background-image: linear-gradient(#525252, #454545); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -3513,18 +3522,17 @@ input[type="text"] { .channel-selector .treeview { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; background: rgba(255, 255, 255, 0.1); border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); color: #cccccc; outline: none; padding: 0 3px; @@ -3534,7 +3542,7 @@ input[type="text"] { max-height: 400px; overflow: auto; padding: 5px; } - /* line 33, ../sass/forms/_mixins.scss */ + /* line 274, ../sass/_mixins.scss */ .channel-selector .treeview.error { background: rgba(255, 0, 0, 0.5); } /* line 36, ../sass/forms/_channel-selector.scss */ @@ -3618,24 +3626,23 @@ input[type="text"] { .t-filter input.t-filter-input { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; - box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -moz-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; + box-shadow: inset rgba(0, 0, 0, 0.65) 0 1px 4px; background: rgba(255, 255, 255, 0.1); border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); color: #cccccc; outline: none; padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 33, ../sass/forms/_mixins.scss */ + /* line 274, ../sass/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, @@ -3653,9 +3660,9 @@ input[type="text"] { /* line 42, ../sass/forms/_filter.scss */ .filter .icon.ui-symbol, .t-filter .icon.ui-symbol { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; display: inline-block; font-size: 1.3em; height: 22px; @@ -3669,9 +3676,9 @@ input[type="text"] { /* line 54, ../sass/forms/_filter.scss */ .filter .s-a-clear.ui-symbol, .t-filter .s-a-clear.ui-symbol { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -3769,9 +3776,9 @@ input[type="text"] { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; background: black; color: #e6e6e6; padding: 2px 5px; @@ -4051,9 +4058,9 @@ input[type="text"] { background-image: -moz-linear-gradient(#525252, #454545); background-image: -webkit-linear-gradient(#525252, #454545); background-image: linear-gradient(#525252, #454545); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -4746,27 +4753,34 @@ input[type="text"] { margin-top: -5%; margin-left: -5%; z-index: 2; } + /* line 53, ../sass/helpers/_wait-spinner.scss */ + .t-wait-spinner.inline, + .wait-spinner.inline { + display: inline-block !important; + margin-right: 5px; + position: relative !important; + vertical-align: middle; } -/* line 55, ../sass/helpers/_wait-spinner.scss */ +/* line 61, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder { pointer-events: none; position: absolute; } - /* line 59, ../sass/helpers/_wait-spinner.scss */ + /* line 65, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder.align-left .t-wait-spinner { left: 0; margin-left: 0; } - /* line 64, ../sass/helpers/_wait-spinner.scss */ + /* line 70, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder.full-size { display: inline-block; height: 100%; width: 100%; } - /* line 67, ../sass/helpers/_wait-spinner.scss */ + /* line 73, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder.full-size .t-wait-spinner { top: 0; margin-top: 0; padding: 30%; } -/* line 76, ../sass/helpers/_wait-spinner.scss */ +/* line 82, ../sass/helpers/_wait-spinner.scss */ .treeview .wait-spinner { display: block; position: absolute; @@ -4786,6 +4800,27 @@ input[type="text"] { top: 2px; left: 0; } +/* line 91, ../sass/helpers/_wait-spinner.scss */ +.wait-spinner.sm { + display: block; + position: absolute; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; + border-color: rgba(0, 153, 204, 0.25); + border-top-color: #0099cc; + border-style: solid; + border-width: 0.25em; + border-radius: 100%; + height: 13px; + width: 13px; + margin-left: 0 !important; + margin-top: 0 !important; + padding: 0 !important; + top: 0; + left: 0; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -4990,6 +5025,18 @@ input[type="text"] { height: 100%; width: 100%; } +/* Styles for messages */ +/* line 4, ../sass/_messages.scss */ +.message.block { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + padding: 10px; } +/* line 8, ../sass/_messages.scss */ +.message.error { + background-color: rgba(255, 60, 0, 0.3); + color: #ff8a66; } + /* line 5, ../sass/_initialization.scss */ .browse-mode .split-layout .split-pane-component.pane.left { width: 15%; } @@ -5029,3 +5076,31 @@ input[type="text"] { /* line 32, ../sass/_hide-non-functional.scss */ .browse-mode .browse-area.holder { top: 10px; } + +/* Styles for sub-dividing views generically */ +/* line 3, ../sass/_views.scss */ +.l-view-section { + overflow: hidden; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + font-size: 0.8rem; } + /* line 6, ../sass/_views.scss */ + .l-view-section h2 { + color: #fff; + margin-bottom: 5px; } + /* line 10, ../sass/_views.scss */ + .l-view-section.fixed { + font-size: 0.8em; } + /* line 13, ../sass/_views.scss */ + .l-view-section.scrolling { + overflow: auto; } + /* line 16, ../sass/_views.scss */ + .l-view-section .controls, + .l-view-section label, + .l-view-section .inline-block { + display: inline-block; } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index f45504233e..8f3ac4871a 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -69,6 +69,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/*********************************************** FORM ELEMENTS */ /* @mixin invokeMenu($baseColor: $colorBodyFg) { $c: $baseColor; @@ -103,7 +104,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 276, ../sass/_mixins.scss */ + /* line 308, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -123,8 +124,8 @@ ul.tree { transition: background-color 0.25s; display: block; font-size: 0.8em; - height: 1.4rem; - line-height: 1.4rem; + height: 1.5rem; + line-height: 1.5rem; margin-bottom: 3px; position: relative; } /* line 39, ../sass/tree/_tree.scss */ diff --git a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json similarity index 99% rename from platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json rename to platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json index e2215bed12..502ce67f79 100644 --- a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json @@ -1,19 +1,59 @@ { "metadata": { - "name": "WTD Symbols v2.", - "lastOpened": 1435765696898, - "created": 1435764071891 + "name": "WTD Symbols v2.1", + "lastOpened": 1439844340068, + "created": 1439844318831 }, "iconSets": [ { "selection": [ + { + "order": 77, + "id": 83, + "prevSize": 32, + "code": 58881, + "name": "icon-datatable", + "tempChar": "" + }, + { + "order": 78, + "id": 82, + "prevSize": 32, + "code": 58882, + "name": "icon-tabular-scrolling", + "tempChar": "" + }, + { + "order": 79, + "id": 81, + "prevSize": 32, + "code": 58884, + "name": "icon-tabular", + "tempChar": "" + }, + { + "order": 80, + "id": 80, + "prevSize": 32, + "code": 58885, + "name": "icon-calendar", + "tempChar": "" + }, + { + "order": 81, + "id": 78, + "prevSize": 32, + "code": 58886, + "name": "icon-paint-bucket", + "tempChar": "" + }, { "order": 1, "id": 75, "prevSize": 32, "code": 123, "name": "icon-pointer-left", - "tempChar": "" + "tempChar": "" }, { "order": 3, @@ -21,7 +61,7 @@ "prevSize": 32, "code": 125, "name": "icon-pointer-right", - "tempChar": "" + "tempChar": "" }, { "order": 4, @@ -29,7 +69,7 @@ "prevSize": 32, "code": 80, "name": "icon-person", - "tempChar": "" + "tempChar": "" }, { "order": 5, @@ -37,7 +77,7 @@ "prevSize": 32, "code": 232, "name": "icon-chain-links", - "tempChar": "" + "tempChar": "" }, { "order": 6, @@ -45,7 +85,7 @@ "prevSize": 32, "code": 115, "name": "icon-database-in-brackets", - "tempChar": "" + "tempChar": "" }, { "order": 7, @@ -53,7 +93,7 @@ "prevSize": 32, "code": 114, "name": "icon-refresh", - "tempChar": "" + "tempChar": "" }, { "order": 8, @@ -61,7 +101,7 @@ "prevSize": 32, "code": 108, "name": "icon-lock", - "tempChar": "" + "tempChar": "" }, { "order": 9, @@ -69,7 +109,7 @@ "prevSize": 32, "code": 51, "name": "icon-box-with-dashed-lines", - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -77,7 +117,7 @@ "prevSize": 32, "code": 58880, "name": "icon-box-with-arrow-cursor", - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -85,7 +125,7 @@ "prevSize": 32, "code": 65, "name": "icon-activity-mode", - "tempChar": "" + "tempChar": "" }, { "order": 12, @@ -93,7 +133,7 @@ "prevSize": 32, "code": 97, "name": "icon-activity", - "tempChar": "" + "tempChar": "" }, { "order": 13, @@ -101,7 +141,7 @@ "prevSize": 32, "code": 33, "name": "icon-alert-rect", - "tempChar": "" + "tempChar": "" }, { "order": 14, @@ -109,7 +149,7 @@ "prevSize": 32, "code": 58883, "name": "icon-alert-triangle", - "tempChar": "" + "tempChar": "" }, { "order": 15, @@ -117,7 +157,7 @@ "prevSize": 32, "code": 238, "name": "icon-arrow-double-down", - "tempChar": "" + "tempChar": "" }, { "order": 16, @@ -125,7 +165,7 @@ "prevSize": 32, "code": 235, "name": "icon-arrow-double-up", - "tempChar": "" + "tempChar": "" }, { "order": 2, @@ -133,7 +173,7 @@ "prevSize": 32, "code": 118, "name": "icon-arrow-down", - "tempChar": "" + "tempChar": "" }, { "order": 19, @@ -141,7 +181,7 @@ "prevSize": 32, "code": 60, "name": "icon-arrow-left", - "tempChar": "" + "tempChar": "" }, { "order": 20, @@ -149,7 +189,7 @@ "prevSize": 32, "code": 62, "name": "icon-arrow-right", - "tempChar": "" + "tempChar": "" }, { "order": 21, @@ -157,7 +197,7 @@ "prevSize": 32, "code": 236, "name": "icon-arrow-tall-down", - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -165,7 +205,7 @@ "prevSize": 32, "code": 237, "name": "icon-arrow-tall-up", - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -173,7 +213,7 @@ "prevSize": 32, "code": 94, "name": "icon-arrow-up", - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -181,7 +221,7 @@ "prevSize": 32, "code": 73, "name": "icon-arrows-out", - "tempChar": "" + "tempChar": "" }, { "order": 25, @@ -189,7 +229,7 @@ "prevSize": 32, "code": 58893, "name": "icon-arrows-right-left", - "tempChar": "" + "tempChar": "" }, { "order": 33, @@ -197,7 +237,7 @@ "prevSize": 32, "code": 53, "name": "icon-arrows-up-down", - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -205,7 +245,7 @@ "prevSize": 32, "code": 42, "name": "icon-asterisk", - "tempChar": "" + "tempChar": "" }, { "order": 27, @@ -213,7 +253,7 @@ "prevSize": 32, "code": 72, "name": "icon-autoflow-tabular", - "tempChar": "" + "tempChar": "" }, { "order": 28, @@ -221,7 +261,7 @@ "prevSize": 32, "code": 224, "name": "icon-box-round-corners", - "tempChar": "" + "tempChar": "" }, { "order": 29, @@ -229,7 +269,7 @@ "prevSize": 32, "code": 50, "name": "icon-check", - "tempChar": "" + "tempChar": "" }, { "order": 30, @@ -237,7 +277,7 @@ "prevSize": 32, "code": 67, "name": "icon-clock", - "tempChar": "" + "tempChar": "" }, { "order": 31, @@ -245,7 +285,7 @@ "prevSize": 32, "code": 46, "name": "icon-connectivity", - "tempChar": "" + "tempChar": "" }, { "order": 32, @@ -253,7 +293,7 @@ "prevSize": 32, "code": 100, "name": "icon-database-query", - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -261,7 +301,7 @@ "prevSize": 32, "code": 68, "name": "icon-database", - "tempChar": "" + "tempChar": "" }, { "order": 35, @@ -269,7 +309,7 @@ "prevSize": 32, "code": 81, "name": "icon-dictionary", - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -277,7 +317,7 @@ "prevSize": 32, "code": 242, "name": "icon-duplicate", - "tempChar": "" + "tempChar": "" }, { "order": 37, @@ -285,7 +325,7 @@ "prevSize": 32, "code": 102, "name": "icon-folder-new", - "tempChar": "" + "tempChar": "" }, { "order": 38, @@ -293,7 +333,7 @@ "prevSize": 32, "code": 70, "name": "icon-folder", - "tempChar": "" + "tempChar": "" }, { "order": 39, @@ -301,7 +341,7 @@ "prevSize": 32, "code": 95, "name": "icon-fullscreen-collapse", - "tempChar": "" + "tempChar": "" }, { "order": 40, @@ -309,7 +349,7 @@ "prevSize": 32, "code": 122, "name": "icon-fullscreen-expand", - "tempChar": "" + "tempChar": "" }, { "order": 41, @@ -317,7 +357,7 @@ "prevSize": 32, "code": 71, "name": "icon-gear", - "tempChar": "" + "tempChar": "" }, { "order": 49, @@ -325,7 +365,7 @@ "prevSize": 32, "code": 227, "name": "icon-image", - "tempChar": "" + "tempChar": "" }, { "order": 42, @@ -333,7 +373,7 @@ "prevSize": 32, "code": 225, "name": "icon-layers", - "tempChar": "" + "tempChar": "" }, { "order": 43, @@ -341,7 +381,7 @@ "prevSize": 32, "code": 76, "name": "icon-layout", - "tempChar": "" + "tempChar": "" }, { "order": 44, @@ -349,7 +389,7 @@ "prevSize": 32, "code": 226, "name": "icon-line-horz", - "tempChar": "" + "tempChar": "" }, { "order": 75, @@ -357,7 +397,7 @@ "prevSize": 32, "code": 244, "name": "icon-link", - "tempChar": "" + "tempChar": "" }, { "order": 46, @@ -365,7 +405,7 @@ "prevSize": 32, "code": 88, "name": "icon-magnify-in", - "tempChar": "" + "tempChar": "" }, { "order": 47, @@ -373,7 +413,7 @@ "prevSize": 32, "code": 89, "name": "icon-magnify-out", - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -381,7 +421,7 @@ "prevSize": 32, "code": 77, "name": "icon-magnify", - "tempChar": "" + "tempChar": "" }, { "order": 34, @@ -389,7 +429,7 @@ "prevSize": 32, "code": 109, "name": "icon-menu", - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -397,7 +437,7 @@ "prevSize": 32, "code": 243, "name": "icon-move", - "tempChar": "" + "tempChar": "" }, { "order": 51, @@ -405,7 +445,7 @@ "prevSize": 32, "code": 121, "name": "icon-new-window", - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -413,7 +453,7 @@ "prevSize": 32, "code": 111, "name": "icon-object", - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -421,7 +461,7 @@ "prevSize": 32, "code": 63, "name": "icon-object-unknown", - "tempChar": "" + "tempChar": "" }, { "order": 53, @@ -429,7 +469,7 @@ "prevSize": 32, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -437,7 +477,7 @@ "prevSize": 32, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -445,7 +485,7 @@ "prevSize": 32, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -453,7 +493,7 @@ "prevSize": 32, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { "order": 65, @@ -461,7 +501,7 @@ "prevSize": 32, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -469,7 +509,7 @@ "prevSize": 32, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -477,7 +517,7 @@ "prevSize": 32, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -485,7 +525,7 @@ "prevSize": 32, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -493,7 +533,7 @@ "prevSize": 32, "code": 45, "name": "icon-minus", - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -501,7 +541,7 @@ "prevSize": 32, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -509,7 +549,7 @@ "prevSize": 32, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -517,7 +557,7 @@ "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -525,7 +565,7 @@ "prevSize": 32, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { "order": 18, @@ -533,7 +573,7 @@ "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -541,7 +581,7 @@ "prevSize": 32, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -549,7 +589,7 @@ "prevSize": 32, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -557,7 +597,7 @@ "prevSize": 32, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -565,7 +605,7 @@ "prevSize": 32, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -573,7 +613,7 @@ "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -581,7 +621,7 @@ "prevSize": 32, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -589,7 +629,7 @@ "prevSize": 32, "code": 58946, "name": "icon-x", - "tempChar": "" + "tempChar": "" } ], "id": 2, @@ -604,6 +644,182 @@ "height": 1024, "prevSize": 32, "icons": [ + { + "id": 83, + "paths": [ + "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", + "M512 512c-282.8 0-512-86-512-192v512c0 106 229.2 192 512 192s512-86 512-192v-512c0 106-229.2 192-512 192zM896 575v256c-36.6 15.6-79.8 28.8-128 39.4v-256c48.2-10.6 91.4-23.8 128-39.4zM256 614.4v256c-48.2-10.4-91.4-23.8-128-39.4v-256c36.6 15.6 79.8 28.8 128 39.4zM384 890v-256c41 4 83.8 6 128 6s87-2.2 128-6v256c-41 4-83.8 6-128 6s-87-2.2-128-6z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-datatable" + ], + "colorPermutations": { + "125525525516161751": [ + 1, + 1 + ] + } + }, + { + "id": 82, + "paths": [ + "M64 0c-35.2 0-64 28.8-64 64v192h448v-256h-384z", + "M1024 256v-192c0-35.2-28.8-64-64-64h-384v256h448z", + "M0 384v192c0 35.2 28.8 64 64 64h384v-256h-448z", + "M960 640c35.2 0 64-28.8 64-64v-192h-448v256h384z", + "M512 1024l-256-256h512z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-tabular-scrolling" + ], + "colorPermutations": { + "125525525516161751": [ + 1, + 1, + 1, + 1, + 1 + ] + } + }, + { + "id": 81, + "paths": [ + "M0 64v192h448v-256h-384c-35.2 0-64 28.8-64 64z", + "M960 0h-384v256h448v-192c0-35.2-28.8-64-64-64z", + "M576 384h448v256h-448v-256z", + "M0 384h448v256h-448v-256z", + "M0 960c0 35.2 28.8 64 64 64h384v-256h-448v192z", + "M576 1024h384c35.2 0 64-28.8 64-64v-192h-448v256z" + ], + "attrs": [ + { + "fill": "#000", + "opacity": 1 + }, + { + "fill": "#000", + "opacity": 1 + }, + { + "fill": "#000", + "opacity": 1 + }, + { + "fill": "#000", + "opacity": 1 + }, + { + "fill": "#000", + "opacity": 1 + }, + { + "fill": "#000", + "opacity": 1 + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-tabular" + ], + "colorPermutations": { + "125525525516161751": [ + 0, + 0, + 0, + 0, + 0, + 0 + ] + } + }, + { + "id": 80, + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-calendar" + ], + "colorPermutations": { + "125525525516161751": [ + 1 + ] + } + }, + { + "id": 78, + "paths": [ + "M896 640c0 0-130 188-128 256 2 70.6 57.4 128 128 128s126-57.4 128-128c2-68-128-256-128-256z", + "M449 129l0.2-64.8c0-35.4-28.4-64-63.8-64.2 0 0-0.2 0-0.2 0-35.2 0-63.8 28.6-64 63.8l-0.6 190.8-294 292.6c-50 50-12.4 215.2 112.4 340s290 162.4 340 112.4l417-423.6-447-447zM384 640c-70.6 0-128-57.4-128-128 0-47.4 25.8-89 64.4-111l-0.4 110.8c0 35.4 28.4 64 63.8 64.2 0 0 0.2 0 0.2 0 35.2 0 63.8-28.6 64-63.8l0.4-110.8c38 22.2 63.6 63.4 63.6 110.6 0 70.6-57.4 128-128 128z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-paint-bucket" + ], + "colorPermutations": { + "125525525516161751": [ + 1, + 1 + ] + } + }, { "id": 75, "paths": [ @@ -1767,7 +1983,24 @@ ] } ], - "invisible": false + "invisible": false, + "colorThemes": [ + [ + [ + 0, + 0, + 0, + 1 + ], + [ + 6, + 161, + 75, + 1 + ] + ] + ], + "colorThemeIdx": 0 }, { "selection": [ @@ -14510,7 +14743,8 @@ "selector": "class", "classSelector": ".ui-symbol", "showMetrics": true, - "showMetadata": true + "showMetadata": true, + "embed": false }, "imagePref": { "prefix": "icon-", diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 278460b5a8..2f4f938076 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 9c9d712d2d..d31a879fc3 100755 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -6,78 +6,83 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 b113a531a4..37af03fa79 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 5989698d98..c93e44215c 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 714338637f..22518172da 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -29,7 +29,7 @@ $interiorMargin: 5px; $interiorMarginLg: $interiorMargin * 2; $interiorMarginSm: 3px; $basicCr: 2px; -$controlCr: 2px; +$controlCr: 3px; $smallCr: 2px; $badgeW: 35px; @@ -84,6 +84,7 @@ $tabularColorBodyBg: darken($colorBodyBg, 10%); $tabularColorBodyFg: lighten($tabularColorBodyBg, 40%); $tabularColorHeaderBg: lighten($colorBodyBg, 10%); $tabularColorHeaderFg: lighten($tabularColorHeaderBg, 40%); +$tabularColorHeaderBorder: $colorBodyBg; /************************** RATIOS */ $ltGamma: 20%; @@ -115,9 +116,9 @@ $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%); $colorItemTreeVCHover: $colorAlt1; // Tabular -$tabularHeaderH: 18px; +$tabularHeaderH: 22px; //18px $tabularTdPadLR: $itemPadLR; -$tabularTdPadTB: 2px; +$tabularTdPadTB: 3px; // Imagery $imageMainControlBarH: 22px; $imageThumbsD: 120px; @@ -141,12 +142,11 @@ $reqSymbolM: $interiorMargin * 2; $reqSymbolFontSize: 0.7em; /************************** CONTROLS */ -$controlCr: $basicCr; $controlDisabledOpacity: 0.3; $formLabelW: 20%; $formInputH: 22px; $formRowCtrlsH: 14px; -$menuLineH: 1.4rem; +$menuLineH: 1.5rem; $scrollbarTrackSize: 10px; $scrollbarTrackColorBg: rgba(#000, 0.4); $btnStdH: 25px; diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 3c28d54c7d..94fe8e151c 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -50,6 +50,11 @@ input, textarea { font-family: Helvetica, Arial, sans-serif; } +input[type="text"] { + vertical-align: baseline; + padding: 3px 5px !important; +} + h1, h2, h3 { margin: 0; } diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index d56c55aca5..5866aee700 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -34,7 +34,6 @@ @import "fixed-position"; @import "about"; @import "text"; -@import "badges"; @import "icons"; @import "limits"; @import "data-status"; @@ -49,7 +48,6 @@ @import "edit/editor"; @import "features/imagery"; @import "features/time-display"; -@import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; @import "forms/text-input"; @@ -70,5 +68,7 @@ @import "properties"; @import "autoflow"; @import "iframe"; +@import "messages"; @import "initialization"; @import "hide-non-functional"; +@import "views"; diff --git a/platform/commonUI/general/res/sass/_messages.scss b/platform/commonUI/general/res/sass/_messages.scss new file mode 100644 index 0000000000..db4de4c946 --- /dev/null +++ b/platform/commonUI/general/res/sass/_messages.scss @@ -0,0 +1,12 @@ +/* Styles for messages */ + +.message { + &.block { + @include border-radius($basicCr); + padding: $interiorMarginLg; + } + &.error { + background-color: rgba($colorAlert,0.3); + color: lighten($colorAlert, 20%); + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index dc37d94fb6..08dd72cd00 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -259,6 +259,38 @@ @include text-shadow(rgba(black, $sVal) 0 3px 7px); } +/*********************************************** FORM ELEMENTS */ +@mixin input-base($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include appearance(none); + @include border-radius($controlCr); + @include box-sizing(border-box); + @include box-shadow(inset rgba(black, 0.65) 0 1px 4px); + // background: lighten($bg, 20%); + background: rgba(#fff, 0.1); + border: none; + //border-bottom: 1px solid rgba(#fff, 0.1); + color: lighten($fg, 20%); + outline: none; + &.error { + background: rgba(red, 0.5); + } +} + +@mixin nice-input($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include input-base($bg, $fg); + padding: 0 $interiorMarginSm; +} + +@mixin nice-textarea($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include input-base($bg, $fg); + padding: $interiorMargin; +} + +@mixin subdued-input($bg: $colorBodyBg, $fg: $colorBodyFg) { + @include nice-input($bg, $fg); + background: lighten($bg, 3%); + border-bottom: 1px solid lighten($bg, 10%); +} /* @mixin invokeMenu($baseColor: $colorBodyFg) { diff --git a/platform/commonUI/general/res/sass/_views.scss b/platform/commonUI/general/res/sass/_views.scss new file mode 100644 index 0000000000..ef83e3c29b --- /dev/null +++ b/platform/commonUI/general/res/sass/_views.scss @@ -0,0 +1,21 @@ +/* Styles for sub-dividing views generically */ + +.l-view-section { + @include absPosDefault(0); + font-size: 0.8rem; + h2 { + color: #fff; + margin-bottom: $interiorMargin; + } + &.fixed { + font-size: 0.8em; + } + &.scrolling { + overflow: auto; + } + .controls, + label, + .inline-block { + display: inline-block; + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index a47cdc2484..9a2adab2e3 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -86,13 +86,6 @@ } } - input[type="text"] { - height: $formInputH; - line-height: $formInputH; - margin-top: -4px; - vertical-align: baseline; - } - .l-med input[type="text"] { width: 200px; } diff --git a/platform/commonUI/general/res/sass/forms/_mixins.scss b/platform/commonUI/general/res/sass/forms/_mixins.scss index fae98a588f..e80999174c 100644 --- a/platform/commonUI/general/res/sass/forms/_mixins.scss +++ b/platform/commonUI/general/res/sass/forms/_mixins.scss @@ -23,11 +23,11 @@ @include appearance(none); @include border-radius($controlCr); @include box-sizing(border-box); - @include box-shadow(inset rgba(black, 0.5) 0 1px 5px); + @include box-shadow(inset rgba(black, 0.65) 0 1px 4px); // background: lighten($bg, 20%); background: rgba(#fff, 0.1); border: none; - border-bottom: 1px solid rgba(#fff, 0.1); + //border-bottom: 1px solid rgba(#fff, 0.1); color: lighten($fg, 20%); outline: none; &.error { diff --git a/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss b/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss index fafae5e9ea..f80c1f1971 100644 --- a/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss +++ b/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss @@ -50,6 +50,12 @@ margin-top: $d / -1; margin-left: $d / -1; z-index: 2; + &.inline { + display: inline-block !important; + margin-right: $interiorMargin; + position: relative !important; + vertical-align: middle; + } } .l-wait-spinner-holder { @@ -80,4 +86,14 @@ margin: 0 !important; padding: 0 !important; top: 2px; left: 0; +} + +.wait-spinner.sm { + $d: 13px; + @include wait-spinner(0.25em, $colorKey); + height: $d; width: $d; + margin-left: 0 !important; + margin-top: 0 !important; + padding: 0 !important; + top: 0; left: 0; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index 0b449baccf..629cac9d1a 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -24,13 +24,14 @@ height: 100%; } -.tabular { +.tabular, +table { @include box-sizing(border-box); border-spacing: 0; border-collapse: collapse; color: #fff; display: table; - font-size: 0.75em; + font-size: 0.75rem; position: relative; //height: 100%; MOVED width: 100%; @@ -41,19 +42,7 @@ //table-layout: fixed; MOVED } thead, .thead { - //width: calc(100% - 10px); MOVED - tr, .tr { - height: $tabularHeaderH; - } - &:before { - content: ""; - display: block; - z-index: 0; - position: absolute; - width: 100%; - height: $tabularHeaderH; - background: rgba(#fff, 0.15); - } + border-bottom: 1px solid $tabularColorHeaderBorder; } tbody, .tbody { //@include absPosDefault(0); MOVED @@ -72,14 +61,21 @@ &:first-child .td { border-top: none; } + &.group-header { + td, .td { + $d: 5%; + background-color: darken($tabularColorHeaderBg, $d); + color: darken($tabularColorHeaderFg, $d); + } + } th, .th, td, .td { display: table-cell; } th, .th { - border: none; - border-left: 1px solid $tabularColorBorder; + background-color: $tabularColorHeaderBg; + border-left: 1px solid $tabularColorHeaderBorder; color: $tabularColorHeaderFg; - padding: 0 $tabularTdPadLR; + padding: $tabularTdPadLR $tabularTdPadLR; white-space: nowrap; vertical-align: middle; // This is crucial to hiding f**king 4px height injected by browser by default &:first-child { @@ -100,10 +96,11 @@ } } td, .td { - border-top: 1px solid $tabularColorBorder; - min-width: 110px; + border-bottom: 1px solid $tabularColorBorder; + min-width: 20px; color: $colorTelemFresh; padding: $tabularTdPadTB $tabularTdPadLR; + word-wrap: break-word; vertical-align: top; &.numeric { text-align: right; @@ -119,9 +116,20 @@ } } &.filterable { + thead, .thead { + tr.s-filters, .tr.s-filters { + th, .th { + //border-left: none; + } + } + } tbody, .tbody { top: $tabularHeaderH * 2; } + input[type="text"] { + @include box-sizing(border-box); + width: 100%; //50px; + } } &.fixed-header { @@ -133,6 +141,15 @@ } thead, .thead { width: calc(100% - 10px); + &:before { + content: ""; + display: block; + z-index: 0; + position: absolute; + width: 100%; + height: $tabularHeaderH; + background: rgba(#fff, 0.15); + } } tbody, .tbody { @include absPosDefault(0); diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index bfa7bd56ff..7ca73bb026 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -22,7 +22,13 @@ {{type.getGlyph()}} - + + + + + {{model.name}} - {{model.name}} diff --git a/platform/commonUI/general/res/templates/tree-node.html b/platform/commonUI/general/res/templates/tree-node.html index f584befb1a..1228604b2e 100644 --- a/platform/commonUI/general/res/templates/tree-node.html +++ b/platform/commonUI/general/res/templates/tree-node.html @@ -22,29 +22,29 @@ + class="tree-item menus-to-left" + ng-class="{selected: treeNode.isSelected()}" + > + class='ui-symbol view-control' + ng-click="toggle.toggle(); treeNode.trackExpansion()" + ng-if="model.composition !== undefined" + > {{toggle.isActive() ? "v" : ">"}} + key="'label'" + mct-object="domainObject" + ng-model="ngModel" + ng-click="ngModel.selectedObject = domainObject" + > + class="tree-item-subtree" + ng-show="toggle.isActive()" + ng-if="model.composition !== undefined" + > " + "", dismissExistingMenu; @@ -48,7 +48,7 @@ define( * should be performed */ function ContextMenuAction($compile, $document, $window, $rootScope, actionContext) { - + function perform() { var winDim = [$window.innerWidth, $window.innerHeight], eventCoors = [actionContext.event.pageX, actionContext.event.pageY], @@ -62,7 +62,7 @@ define( // Remove the context menu function dismiss() { menu.remove(); - body.off("click", dismiss); + body.off("mousedown", dismiss); dismissExistingMenu = undefined; } @@ -92,20 +92,21 @@ define( // Add the menu to the body body.append(menu); - + // Stop propagation so that clicks on the menu do not close the menu menu.on('mousedown', function (event) { event.stopPropagation(); }); - + // Dismiss the menu when body is clicked elsewhere // ('mousedown' because 'click' breaks left-click context menus) body.on('mousedown', dismiss); + menu.on('click', dismiss); // Don't launch browser's context menu actionContext.event.preventDefault(); } - + return { perform: perform }; @@ -113,4 +114,4 @@ define( return ContextMenuAction; } -); \ No newline at end of file +); diff --git a/platform/representation/test/actions/ContextMenuActionSpec.js b/platform/representation/test/actions/ContextMenuActionSpec.js index 73b877ddc3..03298162b4 100644 --- a/platform/representation/test/actions/ContextMenuActionSpec.js +++ b/platform/representation/test/actions/ContextMenuActionSpec.js @@ -69,7 +69,7 @@ define( mockCompiledTemplate.andReturn(mockMenu); mockDocument.find.andReturn(mockBody); mockRootScope.$new.andReturn(mockScope); - + mockActionContext = {key: 'menu', domainObject: mockDomainObject, event: mockEvent}; action = new ContextMenuAction( @@ -118,9 +118,9 @@ define( it("removes a menu when body is clicked", function () { // Show the menu action.perform(); - + // Verify precondition - expect(mockBody.off).not.toHaveBeenCalled(); + expect(mockBody.remove).not.toHaveBeenCalled(); // Find and fire body's mousedown listener mockBody.on.calls.forEach(function (call) { @@ -133,8 +133,29 @@ define( expect(mockMenu.remove).toHaveBeenCalled(); // Listener should have been detached from body - expect(mockBody.off).toHaveBeenCalled(); + expect(mockBody.off).toHaveBeenCalledWith( + 'mousedown', + jasmine.any(Function) + ); + }); + + it("removes a menu when it is clicked", function () { + // Show the menu + action.perform(); + + // Verify precondition + expect(mockMenu.remove).not.toHaveBeenCalled(); + + // Find and fire body's mousedown listener + mockMenu.on.calls.forEach(function (call) { + if (call.args[0] === 'click') { + call.args[1](); + } + }); + + // Menu should have been removed + expect(mockMenu.remove).toHaveBeenCalled(); }); }); } -); \ No newline at end of file +); diff --git a/pom.xml b/pom.xml index 8ca3cd6edb..3acfe38fa1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd open-mct-web Open MCT Web - 0.8.0-SNAPSHOT + 0.8.1-SNAPSHOT war