diff --git a/.gitignore b/.gitignore index e034b4100b..4c2c6ce8a0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ target # Closed source libraries closed-lib +# Node dependencies +node_modules + diff --git a/app.js b/app.js new file mode 100644 index 0000000000..4ebc9c3e94 --- /dev/null +++ b/app.js @@ -0,0 +1,62 @@ +/*global require,process,console*/ + +/** + * Usage: + * + * npm install minimist express + * node app.js [options] + */ + +(function () { + "use strict"; + + var BUNDLE_FILE = 'bundles.json', + options = require('minimist')(process.argv.slice(2)), + express = require('express'), + app = express(), + fs = require('fs'), + bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8')); + + // Defaults + options.port = options.port || options.p || 8080; + ['include', 'exclude', 'i', 'x'].forEach(function (opt) { + options[opt] = options[opt] || []; + // Make sure includes/excludes always end up as arrays + options[opt] = Array.isArray(options[opt]) ? + options[opt] : [options[opt]]; + }); + options.include = options.include.concat(options.i); + options.exclude = options.exclude.concat(options.x); + + // Show command line options + if (options.help || options.h) { + console.log("\nUsage: node app.js [options]\n"); + console.log("Options:"); + console.log(" --help, -h Show this message."); + console.log(" --port, -p Specify port."); + console.log(" --include, -i Include the specified bundle."); + console.log(" --exclude, -x Exclude the specified bundle."); + console.log(""); + process.exit(0); + } + + // Handle command line inclusions/exclusions + bundles = bundles.concat(options.include); + bundles = bundles.filter(function (bundle) { + return options.exclude.indexOf(bundle) === -1; + }); + bundles = bundles.filter(function (bundle, index) { // Uniquify + return bundles.indexOf(bundle) === index; + }); + + // Override bundles.json for HTTP requests + app.use('/' + BUNDLE_FILE, function (req, res) { + res.send(JSON.stringify(bundles)); + }); + + // Expose everything else as static files + app.use(express['static']('.')); + + // Finally, open the HTTP server + app.listen(options.port); +}()); \ No newline at end of file diff --git a/bundles.json b/bundles.json index 04515b1897..0486bdf24b 100644 --- a/bundles.json +++ b/bundles.json @@ -7,6 +7,7 @@ "platform/commonUI/edit", "platform/commonUI/dialog", "platform/commonUI/general", + "platform/commonUI/inspect", "platform/containment", "platform/telemetry", "platform/features/layout", @@ -15,8 +16,8 @@ "platform/features/scrolling", "platform/forms", "platform/persistence/queue", - "platform/persistence/elastic", "platform/policy", + "example/persistence", "example/generator" ] diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 8fed67e5e7..28d96c5ec2 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -57,7 +57,8 @@ { "key": "grid-item", "templateUrl": "templates/items/grid-item.html", - "uses": [ "type", "action" ] + "uses": [ "type", "action" ], + "gestures": [ "info", "menu" ] }, { "key": "object-header", @@ -121,6 +122,12 @@ "depends": [ "typeService", "dialogService", "creationService", "policyService" ] } ], + "runs": [ + { + "implementation": "windowing/WindowTitler.js", + "depends": [ "navigationService", "$rootScope", "$document" ] + } + ], "licenses": [ { "name": "screenfull.js", diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index dc5ed477e7..d88f32c18b 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -21,14 +21,12 @@ -->
-
-
- +
@@ -39,7 +37,6 @@ ng-model="representation">
-
diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index c6198eb0ef..eb13bb3764 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -20,9 +20,11 @@ at runtime from the About dialog for additional information. -->
- {{type.getGlyph()}} - {{parameters.mode}} - {{type.getName()}} - {{model.name}} - v + + {{type.getGlyph()}} + {{parameters.mode}} + {{type.getName()}} + {{model.name}} + +
\ No newline at end of file diff --git a/platform/commonUI/browse/res/templates/create/create-button.html b/platform/commonUI/browse/res/templates/create/create-button.html index e342a1b350..bafde4f975 100644 --- a/platform/commonUI/browse/res/templates/create/create-button.html +++ b/platform/commonUI/browse/res/templates/create/create-button.html @@ -21,7 +21,7 @@ -->
- + Create + + Create
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js index 15e979ae40..e2c2484e1b 100644 --- a/platform/commonUI/browse/src/BrowseController.js +++ b/platform/commonUI/browse/src/BrowseController.js @@ -46,6 +46,7 @@ define( function setNavigation(domainObject) { $scope.navigatedObject = domainObject; $scope.treeModel.selectedObject = domainObject; + navigationService.setNavigation(domainObject); } // Load the root object, put it in the scope. diff --git a/platform/commonUI/browse/src/creation/CreateWizard.js b/platform/commonUI/browse/src/creation/CreateWizard.js index 7f60bdd883..29fe953e18 100644 --- a/platform/commonUI/browse/src/creation/CreateWizard.js +++ b/platform/commonUI/browse/src/creation/CreateWizard.js @@ -45,8 +45,9 @@ define( properties = type.getProperties(); function validateLocation(locatingObject) { - var locatingType = locatingObject.getCapability('type'); - return policyService.allow( + var locatingType = locatingObject && + locatingObject.getCapability('type'); + return locatingType && policyService.allow( "composition", locatingType, type diff --git a/platform/commonUI/browse/src/creation/CreationService.js b/platform/commonUI/browse/src/creation/CreationService.js index 4d60e6dc9f..015573c8bd 100644 --- a/platform/commonUI/browse/src/creation/CreationService.js +++ b/platform/commonUI/browse/src/creation/CreationService.js @@ -77,7 +77,19 @@ define( return undefined; } - return parentPersistence.persist(); + return parentPersistence.persist().then(function () { + // Locate and return new Object in context of parent. + return parent + .useCapability('composition') + .then(function (children) { + var i; + for (i = 0; i < children.length; i += 1) { + if (children[i].getId() === id) { + return children[i]; + } + } + }); + }); }); } @@ -126,4 +138,4 @@ define( return CreationService; } -); \ No newline at end of file +); diff --git a/platform/commonUI/browse/src/navigation/NavigationService.js b/platform/commonUI/browse/src/navigation/NavigationService.js index 642c5f1bc4..c8c76857b8 100644 --- a/platform/commonUI/browse/src/navigation/NavigationService.js +++ b/platform/commonUI/browse/src/navigation/NavigationService.js @@ -45,10 +45,12 @@ define( // Setter for navigation; invokes callbacks function setNavigation(value) { - navigated = value; - callbacks.forEach(function (callback) { - callback(value); - }); + if (navigated !== value) { + navigated = value; + callbacks.forEach(function (callback) { + callback(value); + }); + } } // Adds a callback diff --git a/platform/commonUI/browse/src/windowing/WindowTitler.js b/platform/commonUI/browse/src/windowing/WindowTitler.js new file mode 100644 index 0000000000..9db65e5b0e --- /dev/null +++ b/platform/commonUI/browse/src/windowing/WindowTitler.js @@ -0,0 +1,52 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise*/ + +define( + [], + function () { + "use strict"; + + /** + * Updates the title of the current window to reflect the name + * of the currently navigated-to domain object. + * @constructor + */ + function WindowTitler(navigationService, $rootScope, $document) { + // Look up name of the navigated domain object... + function getNavigatedObjectName() { + var navigatedObject = navigationService.getNavigation(); + return navigatedObject && navigatedObject.getModel().name; + } + + // Set the window title... + function setTitle(name) { + $document[0].title = name; + } + + // Watch the former, and invoke the latter + $rootScope.$watch(getNavigatedObjectName, setTitle); + } + + return WindowTitler; + } +); \ No newline at end of file diff --git a/platform/commonUI/browse/test/creation/CreationServiceSpec.js b/platform/commonUI/browse/test/creation/CreationServiceSpec.js index 3280350d22..277b195eaf 100644 --- a/platform/commonUI/browse/test/creation/CreationServiceSpec.js +++ b/platform/commonUI/browse/test/creation/CreationServiceSpec.js @@ -34,8 +34,10 @@ define( mockQ, mockLog, mockParentObject, + mockNewObject, mockMutationCapability, mockPersistenceCapability, + mockCompositionCapability, mockCapabilities, creationService; @@ -69,6 +71,10 @@ define( "parentObject", [ "getId", "getCapability", "useCapability" ] ); + mockNewObject = jasmine.createSpyObj( + "newObject", + [ "getId" ] + ); mockMutationCapability = jasmine.createSpyObj( "mutation", [ "invoke" ] @@ -77,9 +83,14 @@ define( "persistence", [ "persist", "getSpace" ] ); + mockCompositionCapability = jasmine.createSpyObj( + "composition", + ["invoke"] + ); mockCapabilities = { mutation: mockMutationCapability, - persistence: mockPersistenceCapability + persistence: mockPersistenceCapability, + composition: mockCompositionCapability }; mockPersistenceService.createObject.andReturn( @@ -93,8 +104,15 @@ define( return mockCapabilities[key].invoke(value); }); + mockPersistenceCapability.persist.andReturn( + mockPromise(true) + ); + mockMutationCapability.invoke.andReturn(mockPromise(true)); mockPersistenceCapability.getSpace.andReturn("testSpace"); + mockCompositionCapability.invoke.andReturn( + mockPromise([mockNewObject]) + ); creationService = new CreationService( mockPersistenceService, diff --git a/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js b/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js index 212419ca17..6d7f3fd20d 100644 --- a/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js +++ b/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js @@ -62,6 +62,16 @@ define( expect(callback).toHaveBeenCalledWith(testObject); }); + it("does not notify listeners when no changes occur", function () { + var testObject = { someKey: 42 }, + callback = jasmine.createSpy("callback"); + + navigationService.addListener(callback); + navigationService.setNavigation(testObject); + navigationService.setNavigation(testObject); + expect(callback.calls.length).toEqual(1); + }); + it("stops notifying listeners after removal", function () { var testObject = { someKey: 42 }, callback = jasmine.createSpy("callback"); diff --git a/platform/commonUI/browse/test/suite.json b/platform/commonUI/browse/test/suite.json index 2c74311faa..21d76dae05 100644 --- a/platform/commonUI/browse/test/suite.json +++ b/platform/commonUI/browse/test/suite.json @@ -8,5 +8,6 @@ "creation/LocatorController", "navigation/NavigateAction", "navigation/NavigationService", - "windowing/FullscreenAction" + "windowing/FullscreenAction", + "windowing/WindowTitler" ] \ No newline at end of file diff --git a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js new file mode 100644 index 0000000000..d9c71a86dd --- /dev/null +++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js @@ -0,0 +1,80 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + +/** + * WindowTitlerSpec. Created by vwoeltje on 11/6/14. + */ +define( + ["../../src/windowing/WindowTitler"], + function (WindowTitler) { + "use strict"; + + describe("The window titler", function () { + var mockNavigationService, + mockRootScope, + mockDocument, + mockDomainObject, + titler; + + beforeEach(function () { + mockNavigationService = jasmine.createSpyObj( + 'navigationService', + [ 'getNavigation' ] + ); + mockRootScope = jasmine.createSpyObj( + '$rootScope', + [ '$watch' ] + ); + mockDomainObject = jasmine.createSpyObj( + 'domainObject', + ['getModel'] + ); + mockDocument = [{}]; + + mockDomainObject.getModel.andReturn({ name: 'Test name' }); + mockNavigationService.getNavigation.andReturn(mockDomainObject); + + titler = new WindowTitler( + mockNavigationService, + mockRootScope, + mockDocument + ); + }); + + it("listens for changes to the name of the navigated object", function () { + expect(mockRootScope.$watch).toHaveBeenCalledWith( + jasmine.any(Function), + jasmine.any(Function) + ); + expect(mockRootScope.$watch.mostRecentCall.args[0]()) + .toEqual('Test name'); + }); + + it("sets the title to the name of the navigated object", function () { + mockRootScope.$watch.mostRecentCall.args[1]("Some name"); + expect(mockDocument[0].title).toEqual("Some name"); + }); + + }); + } +); \ No newline at end of file diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index 199668b632..2718f9d74d 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -25,7 +25,7 @@ + class="btn normal ui-symbol close"> x
diff --git a/platform/commonUI/edit/res/templates/topbar-edit.html b/platform/commonUI/edit/res/templates/topbar-edit.html index 34083877c6..83e2d13d1e 100644 --- a/platform/commonUI/edit/res/templates/topbar-edit.html +++ b/platform/commonUI/edit/res/templates/topbar-edit.html @@ -33,8 +33,6 @@ -
\ No newline at end of file diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 2923d96c47..ead610c963 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -181,7 +181,7 @@ "key": "label", "templateUrl": "templates/label.html", "uses": [ "type" ], - "gestures": [ "drag", "menu" ] + "gestures": [ "drag", "menu", "info" ] }, { "key": "node", diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 4fee272bb9..c0acb2a4c3 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -61,6 +61,15 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/* +@mixin invokeMenu($baseColor: $colorBodyFg) { + $c: $baseColor; + color: $c; + &:hover { + color: lighten($c, $ltGamma); + } +} +*/ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -186,9 +195,9 @@ color: #666666; } /* line 116, ../sass/forms/_elems.scss */ .form .form-row .selector-list { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -225,9 +234,9 @@ label.form-control.checkbox input { vertical-align: top; } /* line 159, ../sass/forms/_elems.scss */ .l-result div.s-hint { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; background: rgba(255, 153, 0, 0.8); display: block; color: #ffd699; @@ -258,9 +267,9 @@ label.form-control.checkbox input { .edit-main textarea { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -302,13 +311,12 @@ label.form-control.checkbox input { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 22, ../sass/forms/_text-input.scss */ -input[type="text"], -input[type="date"] { +input[type="text"] { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -322,32 +330,10 @@ input[type="date"] { outline: none; padding: 0 3px; } /* line 33, ../sass/forms/_mixins.scss */ - input[type="text"].error, - input[type="date"].error { + input[type="text"].error { background: rgba(255, 0, 0, 0.5); } - /* line 61, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]:-moz-placeholder, - input[type="date"]:-moz-placeholder { - color: gray; - font-style: italic; } - /* line 64, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]::-moz-placeholder, - input[type="date"]::-moz-placeholder { - color: gray; - font-style: italic; } - /* line 67, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]:-ms-input-placeholder, - input[type="date"]:-ms-input-placeholder { - color: gray; - font-style: italic; } - /* line 56, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]::-webkit-input-placeholder, - input[type="date"]::-webkit-input-placeholder { - color: gray; - font-style: italic; } - /* line 34, ../sass/forms/_text-input.scss */ - input[type="text"].numeric, - input[type="date"].numeric { + /* line 29, ../sass/forms/_text-input.scss */ + input[type="text"].numeric { text-align: right; } /***************************************************************************** @@ -373,23 +359,23 @@ input[type="date"] { *****************************************************************************/ /* line 22, ../sass/forms/_selects.scss */ .form-control.select { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #666666; + border-top: 1px solid #575757; color: #999; display: inline-block; cursor: pointer; @@ -397,14 +383,21 @@ input[type="date"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 152, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -webkit-linear-gradient(#666666, #4d4d4d); - background-image: linear-gradient(#666666, #4d4d4d); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #636363), color-stop(100%, #575757)); + background-image: -moz-linear-gradient(#636363, #575757); + background-image: -webkit-linear-gradient(#636363, #575757); + background-image: linear-gradient(#636363, #575757); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { + color: #878787; } + /* line 160, ../sass/_mixins.scss */ + .form-control.select.btn-menu .invoke-menu { + color: #757575; } /* line 29, ../sass/forms/_selects.scss */ .form-control.select select { -moz-appearance: none; @@ -461,9 +454,9 @@ input[type="date"] { .channel-selector .treeview { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 92d6f49101..4d6abee562 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -61,6 +61,15 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/* +@mixin invokeMenu($baseColor: $colorBodyFg) { + $c: $baseColor; + color: $c; + &:hover { + color: lighten($c, $ltGamma); + } +} +*/ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -92,23 +101,23 @@ top: 0; } /* line 29, ../sass/items/_item.scss */ .items-holder .item.grid-item { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#595959, #4d4d4d); - background-image: -webkit-linear-gradient(#595959, #4d4d4d); - background-image: linear-gradient(#595959, #4d4d4d); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5e5e5e), color-stop(100%, #525252)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #737373; + border-top: 1px solid #636363; color: #999; display: inline-block; box-sizing: border-box; @@ -119,14 +128,21 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 152, ../sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzcwNzA3MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #737373), color-stop(100%, #595959)); - background-image: -moz-linear-gradient(#737373, #595959); - background-image: -webkit-linear-gradient(#737373, #595959); - background-image: linear-gradient(#737373, #595959); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #707070), color-stop(100%, #636363)); + background-image: -moz-linear-gradient(#707070, #636363); + background-image: -webkit-linear-gradient(#707070, #636363); + background-image: linear-gradient(#707070, #636363); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .items-holder .item.grid-item:not(.disabled):hover.btn-menu .invoke-menu { + color: #949494; } + /* line 160, ../sass/_mixins.scss */ + .items-holder .item.grid-item.btn-menu .invoke-menu { + color: #828282; } /* line 42, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: #0099cc !important; } @@ -184,40 +200,41 @@ font-size: 0.8em; } /* line 104, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00bfff), color-stop(100%, #00ace6)); - background-image: -moz-linear-gradient(#00bfff, #00ace6); - background-image: -webkit-linear-gradient(#00bfff, #00ace6); - background-image: linear-gradient(#00bfff, #00ace6); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0ac2ff), color-stop(100%, #00b4f0)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #33ccff; + border-top: 1px solid #14c4ff; color: #999; display: inline-block; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMzY2NmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #33ccff), color-stop(100%, #0099cc)); - background-image: -moz-linear-gradient(#33ccff, #0099cc); - background-image: -webkit-linear-gradient(#33ccff, #0099cc); - background-image: linear-gradient(#33ccff, #0099cc); color: #80dfff; } - /* line 156, ../sass/_mixins.scss */ + /* line 152, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2ZDlmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJlY2JmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzE0YzRmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #66d9ff), color-stop(100%, #00bfff)); - background-image: -moz-linear-gradient(#66d9ff, #00bfff); - background-image: -webkit-linear-gradient(#66d9ff, #00bfff); - background-image: linear-gradient(#66d9ff, #00bfff); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2ecbff), color-stop(100%, #14c4ff)); + background-image: -moz-linear-gradient(#2ecbff, #14c4ff); + background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); + background-image: linear-gradient(#2ecbff, #14c4ff); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .items-holder .item.grid-item.selected:not(.disabled):hover.btn-menu .invoke-menu { + color: #75ddff; } + /* line 160, ../sass/_mixins.scss */ + .items-holder .item.grid-item.selected.btn-menu .invoke-menu { + color: #52d4ff; } /* line 109, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { color: #80dfff; } diff --git a/platform/commonUI/general/res/css/plots.css b/platform/commonUI/general/res/css/plots.css deleted file mode 100644 index 924bef15c4..0000000000 --- a/platform/commonUI/general/res/css/plots.css +++ /dev/null @@ -1,350 +0,0 @@ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/***************************************************************************** - * 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 31, ../sass/plots/_plots-main.scss */ -.gl-plot { - color: #999; - font-size: 0.7rem; - position: relative; - width: 100%; - height: 100%; - /****************************** Limits and Out-of-Bounds data */ } - /* line 38, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-axis-area { - position: absolute; } - /* line 41, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-axis-area.gl-plot-x { - top: auto; - right: 0; - bottom: 5px; - left: 60px; - height: 32px; - width: auto; - overflow: hidden; } - /* line 50, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-axis-area.gl-plot-y { - top: 29px; - right: auto; - bottom: 37px; - left: 0; - width: 60px; } - /* line 59, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-coords { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background: black; - color: #e6e6e6; - padding: 2px 5px; - position: absolute; - top: 39px; - right: auto; - bottom: auto; - left: 70px; - z-index: 10; } - /* line 71, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-coords:empty { - display: none; } - /* line 76, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-display-area { - position: absolute; - top: 29px; - right: 0; - bottom: 37px; - left: 60px; - cursor: crosshair; - border: 1px solid #4d4d4d; } - /* line 86, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label, - .gl-plot .l-plot-label { - color: #cccccc; - position: absolute; - text-align: center; } - /* line 94, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label, - .gl-plot .l-plot-label.gl-plot-x-label, - .gl-plot .l-plot-label.l-plot-x-label { - top: auto; - right: 0; - bottom: 0; - left: 0; - height: auto; } - /* line 103, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label, - .gl-plot .l-plot-label.gl-plot-y-label, - .gl-plot .l-plot-label.l-plot-y-label { - -moz-transform-origin: 50% 0; - -ms-transform-origin: 50% 0; - -webkit-transform-origin: 50% 0; - transform-origin: 50% 0; - -moz-transform: translateX(-50%) rotate(-90deg); - -ms-transform: translateX(-50%) rotate(-90deg); - -webkit-transform: translateX(-50%) rotate(-90deg); - transform: translateX(-50%) rotate(-90deg); - display: inline-block; - margin-left: 5px; - left: 0; - top: 50%; - white-space: nowrap; } - /* line 117, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-y-options { - position: absolute; - top: 50%; - right: auto; - bottom: auto; - left: auto5px; - margin-top: -16px; - height: auto; - min-height: 32px; - width: 32px; } - /* line 131, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-hash { - position: absolute; - border: 0 rgba(255, 255, 255, 0.3) dashed; } - /* line 134, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-hash.hash-v { - border-right-width: 1px; - height: 100%; } - /* line 138, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-hash.hash-h { - border-bottom-width: 1px; - width: 100%; } - /* line 144, ../sass/plots/_plots-main.scss */ - .gl-plot .gl-plot-legend { - position: absolute; - top: 0; - right: 0; - bottom: auto; - left: 0; - height: 24px; - overflow-x: hidden; - overflow-y: auto; } - /* line 157, ../sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar, - .gl-plot .l-oob-data { - position: absolute; - left: 0; - right: 0; - width: auto; } - /* line 165, ../sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar { - height: auto; - z-index: 0; } - /* line 173, ../sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar.s-limit-yellow { - background: rgba(157, 117, 0, 0.2); } - /* line 174, ../sass/plots/_plots-main.scss */ - .gl-plot .l-limit-bar.s-limit-red { - background: rgba(170, 0, 0, 0.2); } - /* line 177, ../sass/plots/_plots-main.scss */ - .gl-plot .l-oob-data { - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - width: auto; - height: auto; - pointer-events: none; - height: 10px; - z-index: 1; } - /* line 185, ../sass/plots/_plots-main.scss */ - .gl-plot .l-oob-data.l-oob-data-up { - top: 0; - bottom: auto; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); - background-size: 100%; - background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } - /* line 190, ../sass/plots/_plots-main.scss */ - .gl-plot .l-oob-data.l-oob-data-dwn { - bottom: 0; - top: auto; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); - background-size: 100%; - background-image: -moz-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); - background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } - -/* line 200, ../sass/plots/_plots-main.scss */ -.gl-plot-legend .plot-legend-item, -.gl-plot-legend .legend-item, -.legend .plot-legend-item, -.legend .legend-item { - display: inline-block; - margin-right: 10px; } - /* line 204, ../sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item span, - .gl-plot-legend .legend-item span, - .legend .plot-legend-item span, - .legend .legend-item span { - vertical-align: middle; } - /* line 207, ../sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item .plot-color-swatch, - .gl-plot-legend .plot-legend-item .color-swatch, - .gl-plot-legend .legend-item .plot-color-swatch, - .gl-plot-legend .legend-item .color-swatch, - .legend .plot-legend-item .plot-color-swatch, - .legend .plot-legend-item .color-swatch, - .legend .legend-item .plot-color-swatch, - .legend .legend-item .color-swatch { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - display: inline-block; - height: 8px; - width: 8px; } - -/* line 220, ../sass/plots/_plots-main.scss */ -.gl-plot-legend .plot-legend-item { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - color: #fff; - line-height: 1.5em; - padding: 0px 5px; } - /* line 226, ../sass/plots/_plots-main.scss */ - .gl-plot-legend .plot-legend-item .plot-color-swatch { - border: 1px solid #333; - height: 9px; - width: 9px; } - -/* line 234, ../sass/plots/_plots-main.scss */ -.tick { - position: absolute; - border: 0 rgba(255, 255, 255, 0.3) solid; } - /* line 237, ../sass/plots/_plots-main.scss */ - .tick.tick-x { - border-right-width: 1px; - height: 100%; } - -/* line 243, ../sass/plots/_plots-main.scss */ -.gl-plot-tick, -.tick-label { - font-size: 0.7rem; - position: absolute; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; } - /* line 251, ../sass/plots/_plots-main.scss */ - .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, - .tick-label.gl-plot-x-tick-label, - .tick-label.tick-label-x { - right: auto; - bottom: auto; - left: auto; - height: auto; - width: 20%; - margin-left: -10%; - text-align: center; } - /* line 261, ../sass/plots/_plots-main.scss */ - .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, - .tick-label.gl-plot-y-tick-label, - .tick-label.tick-label-y { - top: auto; - height: 1em; - width: auto; - margin-bottom: -0.5em; - text-align: right; } - -/* line 273, ../sass/plots/_plots-main.scss */ -.gl-plot-tick.gl-plot-x-tick-label { - top: 5px; } -/* line 276, ../sass/plots/_plots-main.scss */ -.gl-plot-tick.gl-plot-y-tick-label { - right: 5px; - left: 5px; } - -/* line 283, ../sass/plots/_plots-main.scss */ -.tick-label.tick-label-x { - top: 0; } -/* line 286, ../sass/plots/_plots-main.scss */ -.tick-label.tick-label-y { - right: 0; - left: 0; } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index f080545ba4..00bb27d430 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1,4 +1,67 @@ @charset "UTF-8"; +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ /* CONSTANTS */ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government @@ -98,6 +161,15 @@ 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. *****************************************************************************/ +/* +@mixin invokeMenu($baseColor: $colorBodyFg) { + $c: $baseColor; + color: $c; + &:hover { + color: lighten($c, $ltGamma); + } +} +*/ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -154,17 +226,17 @@ a.disabled { @-moz-keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } @-webkit-keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } @keyframes pulse { 0% { - opacity: 0.2; } + opacity: 0.5; } 100% { opacity: 1; } } /* line 59, ../sass/_effects.scss */ @@ -172,9 +244,9 @@ a.disabled { -moz-animation-name: pulse; -webkit-animation-name: pulse; animation-name: pulse; - -moz-animation-duration: 1000ms; - -webkit-animation-duration: 1000ms; - animation-duration: 1000ms; + -moz-animation-duration: 750ms; + -webkit-animation-duration: 750ms; + animation-duration: 750ms; -moz-animation-direction: alternate; -webkit-animation-direction: alternate; animation-direction: alternate; @@ -256,6 +328,10 @@ span { */ } /* line 72, ../sass/_global.scss */ +mct-container { + display: block; } + +/* line 76, ../sass/_global.scss */ .abs, .btn-menu span.l-click-area { position: absolute; top: 0; @@ -265,46 +341,51 @@ span { height: auto; width: auto; } -/* line 82, ../sass/_global.scss */ +/* line 86, ../sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 89, ../sass/_global.scss */ +/* line 93, ../sass/_global.scss */ .codehilite { background-color: rgba(255, 255, 255, 0.1); padding: 1em; } -/* line 95, ../sass/_global.scss */ +/* line 99, ../sass/_global.scss */ .align-right { text-align: right; } -/* line 99, ../sass/_global.scss */ +/* line 103, ../sass/_global.scss */ .centered { text-align: center; } -/* line 103, ../sass/_global.scss */ +/* line 107, ../sass/_global.scss */ .no-margin { margin: 0; } -/* line 107, ../sass/_global.scss */ +/* line 111, ../sass/_global.scss */ .colorKey { color: #0099cc; } -/* line 111, ../sass/_global.scss */ +/* line 115, ../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 115, ../sass/_global.scss */ +/* line 119, ../sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 120, ../sass/_global.scss */ +/* line 125, ../sass/_global.scss */ +.paused:not(.s-btn):not(.icon-btn) { + border-color: #c56f01 !important; + color: #c56f01 !important; } + +/* line 131, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -378,9 +459,9 @@ span { /* line 46, ../sass/user-environ/_layout.scss */ .editor { - -moz-border-radius: 4.5px; - -webkit-border-radius: 4.5px; - border-radius: 4.5px; } + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } /* line 50, ../sass/user-environ/_layout.scss */ .contents { @@ -403,27 +484,23 @@ span { .bar.abs, .btn-menu span.bar.l-click-area { text-wrap: none; white-space: nowrap; } - /* line 73, ../sass/user-environ/_layout.scss */ - .bar.abs.left, .btn-menu span.bar.left.l-click-area, - .bar.abs .left, - .btn-menu span.bar.l-click-area .left { - width: 45%; - right: auto; } - /* line 78, ../sass/user-environ/_layout.scss */ - .bar.abs.right, .btn-menu span.bar.right.l-click-area, - .bar.abs .right, - .btn-menu span.bar.l-click-area .right { - width: 45%; - left: auto; - right: 0; - text-align: right; } - /* line 84, ../sass/user-environ/_layout.scss */ - .bar.abs.right .icon.major, .btn-menu span.bar.right.l-click-area .icon.major, - .bar.abs .right .icon.major, - .btn-menu span.bar.l-click-area .right .icon.major { - margin-left: 15px; } +/* line 74, ../sass/user-environ/_layout.scss */ +.bar.left, +.bar .left { + width: 45% !important; + right: auto !important; } +/* line 79, ../sass/user-environ/_layout.scss */ +.bar.right, +.bar .right { + width: 45% !important; + left: auto !important; + text-align: right; } + /* line 84, ../sass/user-environ/_layout.scss */ + .bar.right .icon.major, + .bar .right .icon.major { + margin-left: 15px; } -/* line 95, ../sass/user-environ/_layout.scss */ +/* line 91, ../sass/user-environ/_layout.scss */ .user-environ .browse-area, .user-environ .edit-area, .user-environ .editor { @@ -431,42 +508,42 @@ span { right: 5px; bottom: 30px; left: 5px; } -/* line 106, ../sass/user-environ/_layout.scss */ +/* line 102, ../sass/user-environ/_layout.scss */ .user-environ .browse-area > .contents, .user-environ .edit-area > .contents { left: 0; right: 0; } -/* line 112, ../sass/user-environ/_layout.scss */ +/* line 108, ../sass/user-environ/_layout.scss */ .user-environ .edit-area { top: 40px; } - /* line 115, ../sass/user-environ/_layout.scss */ + /* line 111, ../sass/user-environ/_layout.scss */ .user-environ .edit-area .tool-bar { bottom: auto; height: 30px; line-height: 25px; } - /* line 120, ../sass/user-environ/_layout.scss */ + /* line 116, ../sass/user-environ/_layout.scss */ .user-environ .edit-area .work-area { top: 40px; } -/* line 125, ../sass/user-environ/_layout.scss */ +/* line 121, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar { top: auto; right: 5px; bottom: 5px; left: 5px; height: 20px; } - /* line 131, ../sass/user-environ/_layout.scss */ + /* line 127, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .status-holder { right: 110px; } - /* line 134, ../sass/user-environ/_layout.scss */ + /* line 130, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .app-logo { left: auto; width: 105px; } -/* line 141, ../sass/user-environ/_layout.scss */ +/* line 137, ../sass/user-environ/_layout.scss */ .cols { overflow: hidden; *zoom: 1; } - /* line 143, ../sass/user-environ/_layout.scss */ + /* line 139, ../sass/user-environ/_layout.scss */ .cols .col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -477,103 +554,103 @@ span { margin-left: 1.5%; padding-left: 5px; position: relative; } - /* line 151, ../sass/user-environ/_layout.scss */ + /* line 147, ../sass/user-environ/_layout.scss */ .cols .col:first-child { margin-left: 0; padding-left: 0; } - /* line 158, ../sass/user-environ/_layout.scss */ + /* line 154, ../sass/user-environ/_layout.scss */ .cols.cols-2 .col-1 { min-width: 250px; width: 48.5%; } - /* line 164, ../sass/user-environ/_layout.scss */ + /* line 160, ../sass/user-environ/_layout.scss */ .cols.cols-2-ff .col-100px { width: 100px; } - /* line 171, ../sass/user-environ/_layout.scss */ + /* line 167, ../sass/user-environ/_layout.scss */ .cols.cols-6 .col-1 { min-width: 83.33333px; width: 15.16667%; } - /* line 177, ../sass/user-environ/_layout.scss */ + /* line 173, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-1 { min-width: 31.25px; width: 4.75%; } - /* line 180, ../sass/user-environ/_layout.scss */ + /* line 176, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-2 { min-width: 62.5px; width: 11%; } - /* line 183, ../sass/user-environ/_layout.scss */ + /* line 179, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-7 { min-width: 218.75px; width: 42.25%; } - /* line 189, ../sass/user-environ/_layout.scss */ + /* line 185, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-2 { min-width: 31.25px; width: 4.75%; } - /* line 192, ../sass/user-environ/_layout.scss */ + /* line 188, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-15 { min-width: 234.375px; width: 45.375%; } - /* line 196, ../sass/user-environ/_layout.scss */ + /* line 192, ../sass/user-environ/_layout.scss */ .cols .l-row { overflow: hidden; *zoom: 1; padding: 5px 0; } -/* line 202, ../sass/user-environ/_layout.scss */ +/* line 198, ../sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 205, ../sass/user-environ/_layout.scss */ + /* line 201, ../sass/user-environ/_layout.scss */ .pane.treeview .create-btn-holder { bottom: auto; top: 0; height: 30px; } - /* line 208, ../sass/user-environ/_layout.scss */ + /* line 204, ../sass/user-environ/_layout.scss */ .pane.treeview .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 213, ../sass/user-environ/_layout.scss */ + /* line 209, ../sass/user-environ/_layout.scss */ .pane.treeview .tree-holder { overflow: auto; top: 35px; } - /* line 221, ../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 225, ../sass/user-environ/_layout.scss */ + /* line 221, ../sass/user-environ/_layout.scss */ .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 { bottom: 5px; } - /* line 229, ../sass/user-environ/_layout.scss */ + /* line 225, ../sass/user-environ/_layout.scss */ .pane.items .object-holder { top: 35px; } - /* line 234, ../sass/user-environ/_layout.scss */ + /* line 230, ../sass/user-environ/_layout.scss */ .pane.edit-main .object-holder { top: 0; } - /* line 240, ../sass/user-environ/_layout.scss */ + /* line 236, ../sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 248, ../sass/user-environ/_layout.scss */ +/* line 244, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 251, ../sass/user-environ/_layout.scss */ + /* line 247, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 258, ../sass/user-environ/_layout.scss */ +/* line 254, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 260, ../sass/user-environ/_layout.scss */ + /* line 256, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 264, ../sass/user-environ/_layout.scss */ + /* line 260, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 266, ../sass/user-environ/_layout.scss */ + /* line 262, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 5px; } -/* line 275, ../sass/user-environ/_layout.scss */ +/* line 271, ../sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -792,7 +869,8 @@ span { .s-about .s-logo-openmctweb { background-image: url("../images/logo-openmctweb-shdw.svg"); } /* line 81, ../sass/_about.scss */ - .s-about .s-btn, .s-about .s-icon-btn { + .s-about .s-btn, .s-about .icon-btn, + .s-about .s-icon-btn { line-height: 2em; } /* line 85, ../sass/_about.scss */ .s-about .l-licenses-software .l-license-software { @@ -893,9 +971,9 @@ span { /* line 29, ../sass/_badges.scss */ .top-bar .badge { - -moz-border-radius: 4.5px; - -webkit-border-radius: 4.5px; - border-radius: 4.5px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; font-size: 1.4em; height: 25px; line-height: 25px; @@ -911,12 +989,12 @@ span { background-image: -moz-linear-gradient(#00bfff, #0099cc); background-image: -webkit-linear-gradient(#00bfff, #0099cc); background-image: linear-gradient(#00bfff, #0099cc); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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; } /***************************************************************************** @@ -969,46 +1047,40 @@ span { .ui-symbol.icon.major { font-size: 1.65em; } -/* line 54, ../sass/_icons.scss */ +/* line 48, ../sass/_icons.scss */ .bar .icon { display: inline-block; } -/* line 58, ../sass/_icons.scss */ +/* line 52, ../sass/_icons.scss */ .invoke-menu { - color: #0099cc; + text-shadow: none; display: inline-block; - font-size: 1rem; + font-size: 0.8rem; vertical-align: middle; } - /* line 200, ../sass/_mixins.scss */ - .invoke-menu:hover { - color: #33ccff; } -/* line 65, ../sass/_icons.scss */ +/* line 60, ../sass/_icons.scss */ .btn-menu .invoke-menu, .icon.major .invoke-menu { - margin-left: 5px; } + margin-left: 3px; } -/* line 70, ../sass/_icons.scss */ -.icon-buttons-main .invoke-menu { - color: #666666; } - /* line 200, ../sass/_mixins.scss */ - .icon-buttons-main .invoke-menu:hover { - color: #999999; } - -/* line 78, ../sass/_icons.scss */ +/* .object-header .type-icon { - color: #0099cc; - margin-right: 5px; } - -/* line 83, ../sass/_icons.scss */ + color: $colorKey; + margin-right: $interiorMarginSm; +} +*/ +/* line 72, ../sass/_icons.scss */ .menu .type-icon, .tree-item .type-icon, -.icon-btn .menu.dropdown .icon, -.super-menu.menu.dropdown .icon { - font-size: 1.395rem; - line-height: 1.695rem; +.super-menu.menu .type-icon { + font-size: 1.12rem; + line-height: 1.582rem; position: absolute; } +/* line 81, ../sass/_icons.scss */ +.super-menu.menu.dropdown .icon { + font-size: 1.33rem; } + /*.s-limit-upr, .s-limit-lwr { $a: 0.5; @@ -1231,9 +1303,9 @@ span { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 2.25px; - -webkit-border-radius: 2.25px; - border-radius: 2.25px; + -moz-border-radius: 1.5px; + -webkit-border-radius: 1.5px; + border-radius: 1.5px; -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; -webkit-transition: background-color 0.25s; @@ -1274,77 +1346,397 @@ span { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*********************************** TYPE STYLES */ -/* line 25, ../sass/controls/_buttons.scss */ -.t-btn { - cursor: pointer; } +/******* LAYOUT AND SIZING */ +/* line 26, ../sass/controls/_buttons.scss */ +.btn, +.l-btn { + line-height: 1.25em; + padding: 0 7.5px; + text-decoration: none; } + /* line 31, ../sass/controls/_buttons.scss */ + .btn.lg, .btn.create-btn, + .l-btn.lg, + .l-btn.create-btn { + height: 25px; + line-height: 25px; + padding: 0 22.5px; } + /* line 39, ../sass/controls/_buttons.scss */ + .btn.create-btn .menu, + .l-btn.create-btn .menu { + margin-left: -7.5px; } + /* line 42, ../sass/controls/_buttons.scss */ + .btn.create-btn > .ui-symbol, + .l-btn.create-btn > .ui-symbol { + font-size: 1.1em; } + /* line 46, ../sass/controls/_buttons.scss */ + .btn.sm, + .l-btn.sm { + padding: 0 5px; } + /* line 49, ../sass/controls/_buttons.scss */ + .btn.vsm, + .l-btn.vsm { + padding: 0 2.5px; } /*********************************** STYLE STYLES */ -/* line 31, ../sass/controls/_buttons.scss */ -.s-btn, .s-icon-btn { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; +/* line 55, ../sass/controls/_buttons.scss */ +.btn, +.s-btn, +.icon-btn, +.s-icon-btn { + -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; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; + cursor: pointer; line-height: 1.2em; - padding: 0 10px; text-decoration: none; } - /* line 39, ../sass/controls/_buttons.scss */ - .s-btn.s-very-subtle, .s-very-subtle.s-icon-btn { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + /* line 64, ../sass/controls/_buttons.scss */ + .btn.major, + .s-btn.major, + .major.icon-btn, + .major.s-icon-btn { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0ac2ff), color-stop(100%, #00b4f0)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #666666; + border-top: 1px solid #14c4ff; + color: #999; + display: inline-block; + color: #ccf2ff; } + /* line 152, ../sass/_mixins.scss */ + .btn.major:not(.disabled):hover, + .s-btn.major:not(.disabled):hover, + .major.icon-btn:not(.disabled):hover, + .major.s-icon-btn:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJlY2JmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzE0YzRmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2ecbff), color-stop(100%, #14c4ff)); + background-image: -moz-linear-gradient(#2ecbff, #14c4ff); + background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); + background-image: linear-gradient(#2ecbff, #14c4ff); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .btn.major:not(.disabled):hover.btn-menu .invoke-menu, + .s-btn.major:not(.disabled):hover.btn-menu .invoke-menu, + .major.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .major.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { + color: #75ddff; } + /* line 160, ../sass/_mixins.scss */ + .btn.major.btn-menu .invoke-menu, + .s-btn.major.btn-menu .invoke-menu, + .major.btn-menu.icon-btn .invoke-menu, + .major.btn-menu.s-icon-btn .invoke-menu { + color: #52d4ff; } + /* line 69, ../sass/controls/_buttons.scss */ + .btn.major:hover, + .s-btn.major:hover, + .major.icon-btn:hover, + .major.s-icon-btn:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzI0YzhmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #24c8ff), color-stop(100%, #0ac2ff)); + 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-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 #2ecbff; + color: #ccf2ff; + display: inline-block; } + /* line 152, ../sass/_mixins.scss */ + .btn.major:hover:not(.disabled):hover, + .s-btn.major:hover:not(.disabled):hover, + .major.icon-btn:hover:not(.disabled):hover, + .major.s-icon-btn:hover:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQ3ZDFmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzJlY2JmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #47d1ff), color-stop(100%, #2ecbff)); + background-image: -moz-linear-gradient(#47d1ff, #2ecbff); + background-image: -webkit-linear-gradient(#47d1ff, #2ecbff); + background-image: linear-gradient(#47d1ff, #2ecbff); + color: white; } + /* line 155, ../sass/_mixins.scss */ + .btn.major:hover:not(.disabled):hover.btn-menu .invoke-menu, + .s-btn.major:hover:not(.disabled):hover.btn-menu .invoke-menu, + .major.icon-btn:hover:not(.disabled):hover.btn-menu .invoke-menu, + .major.s-icon-btn:hover:not(.disabled):hover.btn-menu .invoke-menu { + color: #8fe3ff; } + /* line 160, ../sass/_mixins.scss */ + .btn.major:hover.btn-menu .invoke-menu, + .s-btn.major:hover.btn-menu .invoke-menu, + .major.icon-btn:hover.btn-menu .invoke-menu, + .major.s-icon-btn:hover.btn-menu .invoke-menu { + color: #6bdaff; } + /* line 73, ../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 77, ../sass/controls/_buttons.scss */ + .btn.subtle, + .s-btn.subtle, + .subtle.icon-btn, + .subtle.s-icon-btn { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzg1ODU4NSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzc4Nzg3OCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #858585), color-stop(100%, #787878)); + 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-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 #8a8a8a; + color: #cccccc; + display: inline-block; } + /* line 152, ../sass/_mixins.scss */ + .btn.subtle:not(.disabled):hover, + .s-btn.subtle:not(.disabled):hover, + .subtle.icon-btn:not(.disabled):hover, + .subtle.s-icon-btn:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzk2OTY5NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzhhOGE4YSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #969696), color-stop(100%, #8a8a8a)); + background-image: -moz-linear-gradient(#969696, #8a8a8a); + background-image: -webkit-linear-gradient(#969696, #8a8a8a); + background-image: linear-gradient(#969696, #8a8a8a); + color: #f0f0f0; } + /* line 155, ../sass/_mixins.scss */ + .btn.subtle:not(.disabled):hover.btn-menu .invoke-menu, + .s-btn.subtle:not(.disabled):hover.btn-menu .invoke-menu, + .subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .subtle.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { + color: #bababa; } + /* line 160, ../sass/_mixins.scss */ + .btn.subtle.btn-menu .invoke-menu, + .s-btn.subtle.btn-menu .invoke-menu, + .subtle.btn-menu.icon-btn .invoke-menu, + .subtle.btn-menu.s-icon-btn .invoke-menu { + color: #a8a8a8; } + /* line 80, ../sass/controls/_buttons.scss */ + .btn.very-subtle, .btn.s-very-subtle, + .s-btn.very-subtle, + .very-subtle.icon-btn, + .very-subtle.s-icon-btn, + .s-btn.s-very-subtle, + .s-very-subtle.icon-btn, + .s-very-subtle.s-icon-btn { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); + 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-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 #575757; color: #999; display: inline-block; } - /* line 103, ../sass/_mixins.scss */ - .s-btn.s-very-subtle:hover, .s-very-subtle.s-icon-btn:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + /* line 152, ../sass/_mixins.scss */ + .btn.very-subtle:not(.disabled):hover, .btn.s-very-subtle:not(.disabled):hover, + .s-btn.very-subtle:not(.disabled):hover, + .very-subtle.icon-btn:not(.disabled):hover, + .very-subtle.s-icon-btn:not(.disabled):hover, + .s-btn.s-very-subtle:not(.disabled):hover, + .s-very-subtle.icon-btn:not(.disabled):hover, + .s-very-subtle.s-icon-btn:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959)); - background-image: -moz-linear-gradient(#666666, #595959); - background-image: -webkit-linear-gradient(#666666, #595959); - background-image: linear-gradient(#666666, #595959); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #636363), color-stop(100%, #575757)); + background-image: -moz-linear-gradient(#636363, #575757); + background-image: -webkit-linear-gradient(#636363, #575757); + background-image: linear-gradient(#636363, #575757); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .btn.very-subtle:not(.disabled):hover.btn-menu .invoke-menu, .btn.s-very-subtle:not(.disabled):hover.btn-menu .invoke-menu, + .s-btn.very-subtle:not(.disabled):hover.btn-menu .invoke-menu, + .very-subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .very-subtle.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .s-btn.s-very-subtle:not(.disabled):hover.btn-menu .invoke-menu, + .s-very-subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .s-very-subtle.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { + color: #878787; } + /* line 160, ../sass/_mixins.scss */ + .btn.very-subtle.btn-menu .invoke-menu, .btn.s-very-subtle.btn-menu .invoke-menu, + .s-btn.very-subtle.btn-menu .invoke-menu, + .very-subtle.btn-menu.icon-btn .invoke-menu, + .very-subtle.btn-menu.s-icon-btn .invoke-menu, + .s-btn.s-very-subtle.btn-menu .invoke-menu, + .s-very-subtle.btn-menu.icon-btn .invoke-menu, + .s-very-subtle.btn-menu.s-icon-btn .invoke-menu { + color: #757575; } + /* line 83, ../sass/controls/_buttons.scss */ + .btn.very-subtle.paused, .btn.s-very-subtle.paused, + .s-btn.very-subtle.paused, + .very-subtle.paused.icon-btn, + .very-subtle.paused.s-icon-btn, + .s-btn.s-very-subtle.paused, + .s-very-subtle.paused.icon-btn, + .s-very-subtle.paused.s-icon-btn { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlOTEwNSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U5ODMwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fe9105), color-stop(100%, #e98301)); + 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-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 #fe9510; + color: #fff; + display: inline-block; } + /* line 152, ../sass/_mixins.scss */ + .btn.very-subtle.paused:not(.disabled):hover, .btn.s-very-subtle.paused:not(.disabled):hover, + .s-btn.very-subtle.paused:not(.disabled):hover, + .very-subtle.paused.icon-btn:not(.disabled):hover, + .very-subtle.paused.s-icon-btn:not(.disabled):hover, + .s-btn.s-very-subtle.paused:not(.disabled):hover, + .s-very-subtle.paused.icon-btn:not(.disabled):hover, + .s-very-subtle.paused.s-icon-btn:not(.disabled):hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlYTAyOSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZlOTUxMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fea029), color-stop(100%, #fe9510)); + background-image: -moz-linear-gradient(#fea029, #fe9510); + background-image: -webkit-linear-gradient(#fea029, #fe9510); + background-image: linear-gradient(#fea029, #fe9510); + color: white; } + /* line 155, ../sass/_mixins.scss */ + .btn.very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, .btn.s-very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, + .s-btn.very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, + .very-subtle.paused.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .very-subtle.paused.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .s-btn.s-very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, + .s-very-subtle.paused.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, + .s-very-subtle.paused.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { + color: #fec070; } + /* line 160, ../sass/_mixins.scss */ + .btn.very-subtle.paused.btn-menu .invoke-menu, .btn.s-very-subtle.paused.btn-menu .invoke-menu, + .s-btn.very-subtle.paused.btn-menu .invoke-menu, + .very-subtle.paused.btn-menu.icon-btn .invoke-menu, + .very-subtle.paused.btn-menu.s-icon-btn .invoke-menu, + .s-btn.s-very-subtle.paused.btn-menu .invoke-menu, + .s-very-subtle.paused.btn-menu.icon-btn .invoke-menu, + .s-very-subtle.paused.btn-menu.s-icon-btn .invoke-menu { + color: #feb04d; } + /* line 85, ../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, + .very-subtle.paused.s-icon-btn .icon:before, + .s-btn.s-very-subtle.paused .icon:before, + .s-very-subtle.paused.icon-btn .icon:before, + .s-very-subtle.paused.s-icon-btn .icon:before { + content: "\0000EF"; } -/* line 44, ../sass/controls/_buttons.scss */ +/* line 92, ../sass/controls/_buttons.scss */ +.icon-btn, .s-icon-btn { - font-size: 1.2em; } - /* line 47, ../sass/controls/_buttons.scss */ + font-size: 1em; } + /* line 96, ../sass/controls/_buttons.scss */ + .icon-btn .icon, .s-icon-btn .icon { color: #0099cc; } - /* line 51, ../sass/controls/_buttons.scss */ - .s-icon-btn:not(.disabled):hover .icon { + /* line 100, ../sass/controls/_buttons.scss */ + .icon-btn.paused .icon, + .s-icon-btn.paused .icon { + color: #fff; } + /* line 108, ../sass/controls/_buttons.scss */ + .icon-btn:not(.disabled):not(.paused):hover .icon, + .s-icon-btn:not(.disabled):not(.paused):hover .icon { color: #33ccff; } - /* line 55, ../sass/controls/_buttons.scss */ + /* line 115, ../sass/controls/_buttons.scss */ + .icon-btn.labeled, .s-icon-btn.labeled { - padding: 0 5px; } - /* line 57, ../sass/controls/_buttons.scss */ + padding: 0 3.75px; } + /* line 117, ../sass/controls/_buttons.scss */ + .icon-btn.labeled .icon, .s-icon-btn.labeled .icon { font-size: 1.5em; } - /* line 60, ../sass/controls/_buttons.scss */ + /* line 120, ../sass/controls/_buttons.scss */ + .icon-btn.labeled .title-label, .s-icon-btn.labeled .title-label { margin-left: 5px; } + /* line 126, ../sass/controls/_buttons.scss */ + .icon-btn.pause-play.paused, + .s-icon-btn.pause-play.paused { + -moz-animation-name: pulse; + -webkit-animation-name: pulse; + animation-name: pulse; + -moz-animation-duration: 500ms; + -webkit-animation-duration: 500ms; + animation-duration: 500ms; + -moz-animation-direction: alternate; + -webkit-animation-direction: alternate; + animation-direction: alternate; + -moz-animation-iteration-count: infinite; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + -moz-animation-timing-function: ease-in-out; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; } + /* line 129, ../sass/controls/_buttons.scss */ + .icon-btn.pause-play .icon:before, + .s-icon-btn.pause-play .icon:before { + content: "\0000F1"; } + /* line 135, ../sass/controls/_buttons.scss */ + .icon-btn.show-thumbs .icon:before, + .s-icon-btn.show-thumbs .icon:before { + content: "\000039"; } /*********************************** LAYOUT STYLES */ -/* line 68, ../sass/controls/_buttons.scss */ +/* line 142, ../sass/controls/_buttons.scss */ +span.btn, +span.btn span, span.l-btn, span.l-btn span, +a.btn, +a.btn span, a.l-btn, a.l-btn span { display: inline-block; } @@ -1449,41 +1841,45 @@ a.l-btn span { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 24, ../sass/controls/_controls.scss */ -.control.view-control .icon { - display: inline-block; - margin: -1px 5px 1px 2px; - vertical-align: middle; } - /* line 28, ../sass/controls/_controls.scss */ - .control.view-control .icon.triangle-down { - margin: 2px 2px -2px 0px; } -/* line 33, ../sass/controls/_controls.scss */ -.control.view-control .label { - display: inline-block; - font-size: 11px; - vertical-align: middle; } -/* line 39, ../sass/controls/_controls.scss */ -.control.view-control .toggle { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - display: inline-block; - padding: 1px 6px 4px 4px; } - /* line 43, ../sass/controls/_controls.scss */ - .control.view-control .toggle:hover { - background: rgba(255, 255, 255, 0.1); } +/*.control { + // UNUSED? + &.view-control { + .icon { + display: inline-block; + margin: -1px 5px 1px 2px; + vertical-align: middle; + &.triangle-down { + margin: 2px 2px -2px 0px; + } + } -/* line 50, ../sass/controls/_controls.scss */ + .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); + } + } + } +}*/ +/* line 51, ../sass/controls/_controls.scss */ .accordion { margin-top: 5px; } - /* line 53, ../sass/controls/_controls.scss */ + /* line 54, ../sass/controls/_controls.scss */ .accordion:first-child { margin-top: 0; } - /* line 56, ../sass/controls/_controls.scss */ + /* line 57, ../sass/controls/_controls.scss */ .accordion .accordion-head { - -moz-border-radius: 2.25px; - -webkit-border-radius: 2.25px; - border-radius: 2.25px; + -moz-border-radius: 1.5px; + -webkit-border-radius: 1.5px; + border-radius: 1.5px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -1501,10 +1897,10 @@ a.l-btn span { width: auto; height: 18px; text-transform: uppercase; } - /* line 70, ../sass/controls/_controls.scss */ + /* line 75, ../sass/controls/_controls.scss */ .accordion .accordion-head:hover { background: rgba(153, 153, 153, 0.4); } - /* line 73, ../sass/controls/_controls.scss */ + /* line 78, ../sass/controls/_controls.scss */ .accordion .accordion-head:after { content: "^"; display: block; @@ -1514,10 +1910,10 @@ a.l-btn span { right: 5px; text-transform: none; top: 0; } - /* line 83, ../sass/controls/_controls.scss */ + /* line 88, ../sass/controls/_controls.scss */ .accordion .accordion-head:not(.expanded):after { content: "v"; } - /* line 87, ../sass/controls/_controls.scss */ + /* line 92, ../sass/controls/_controls.scss */ .accordion .accordion-contents { position: absolute; top: 23px; @@ -1527,195 +1923,20 @@ a.l-btn span { overflow-y: auto; overflow-x: hidden; } -/* line 95, ../sass/controls/_controls.scss */ -.btn { - -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; - text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; - padding: 0 10px; - text-decoration: none; } - /* line 105, ../sass/controls/_controls.scss */ - .btn.create-btn { - height: 25px; - line-height: 25px; - padding: 0 22.5px; } - /* line 112, ../sass/controls/_controls.scss */ - .btn.create-btn .menu { - margin-left: -22.5px; } - /* line 115, ../sass/controls/_controls.scss */ - .btn.create-btn .ui-symbol.major { - font-size: 1.1em; } - /* line 119, ../sass/controls/_controls.scss */ - .btn.major { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00bfff), color-stop(100%, #00ace6)); - background-image: -moz-linear-gradient(#00bfff, #00ace6); - background-image: -webkit-linear-gradient(#00bfff, #00ace6); - background-image: linear-gradient(#00bfff, #00ace6); - -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: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - border: none; - border-top: 1px solid #33ccff; - color: #999; - display: inline-block; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMzY2NmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #33ccff), color-stop(100%, #0099cc)); - background-image: -moz-linear-gradient(#33ccff, #0099cc); - background-image: -webkit-linear-gradient(#33ccff, #0099cc); - background-image: linear-gradient(#33ccff, #0099cc); - color: #ccf2ff; } - /* line 156, ../sass/_mixins.scss */ - .btn.major:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2ZDlmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #66d9ff), color-stop(100%, #00bfff)); - background-image: -moz-linear-gradient(#66d9ff, #00bfff); - background-image: -webkit-linear-gradient(#66d9ff, #00bfff); - background-image: linear-gradient(#66d9ff, #00bfff); } - /* line 124, ../sass/controls/_controls.scss */ - .btn.major:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1ac6ff), color-stop(100%, #00bfff)); - background-image: -moz-linear-gradient(#1ac6ff, #00bfff); - background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); - background-image: linear-gradient(#1ac6ff, #00bfff); - -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: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - border: none; - border-top: 1px solid #4dd2ff; - color: #999; - display: inline-block; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkZDJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYWNlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4dd2ff), color-stop(100%, #00ace6)); - background-image: -moz-linear-gradient(#4dd2ff, #00ace6); - background-image: -webkit-linear-gradient(#4dd2ff, #00ace6); - background-image: linear-gradient(#4dd2ff, #00ace6); - color: #ccf2ff; } - /* line 156, ../sass/_mixins.scss */ - .btn.major:hover:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwZGZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80dfff), color-stop(100%, #1ac6ff)); - background-image: -moz-linear-gradient(#80dfff, #1ac6ff); - background-image: -webkit-linear-gradient(#80dfff, #1ac6ff); - background-image: linear-gradient(#80dfff, #1ac6ff); } - /* line 128, ../sass/controls/_controls.scss */ - .btn.major .invoke-menu { - color: #ccf2ff; } - /* line 132, ../sass/controls/_controls.scss */ - .btn.normal { - padding: 11.25px 15.75px; } - /* line 136, ../sass/controls/_controls.scss */ - .btn.outline:hover { - background: rgba(255, 255, 255, 0.1); } - /* line 140, ../sass/controls/_controls.scss */ - .btn.subtle { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #808080), color-stop(100%, #737373)); - background-image: -moz-linear-gradient(#808080, #737373); - background-image: -webkit-linear-gradient(#808080, #737373); - background-image: linear-gradient(#808080, #737373); - -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: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - border: none; - border-top: 1px solid #999999; - color: #cccccc; - display: inline-block; } - /* line 148, ../sass/_mixins.scss */ - .btn.subtle:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzk5OTk5OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #999999), color-stop(100%, #808080)); - background-image: -moz-linear-gradient(#999999, #808080); - background-image: -webkit-linear-gradient(#999999, #808080); - background-image: linear-gradient(#999999, #808080); } - /* line 144, ../sass/controls/_controls.scss */ - .btn.very-subtle { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-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: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - border: none; - border-top: 1px solid #666666; - color: #b3b3b3; - display: inline-block; } - /* line 148, ../sass/_mixins.scss */ - .btn.very-subtle:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); - background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -webkit-linear-gradient(#666666, #4d4d4d); - background-image: linear-gradient(#666666, #4d4d4d); } - /* line 147, ../sass/controls/_controls.scss */ - .btn.lg { - -moz-border-radius: 4.5px; - -webkit-border-radius: 4.5px; - border-radius: 4.5px; - font-size: 1.2em; - padding: 7px 25px; } - /* line 153, ../sass/controls/_controls.scss */ - .btn.icon-btn .icon { - color: #0099cc; } - /* line 157, ../sass/controls/_controls.scss */ - .btn.icon-btn:not(.disabled):hover .icon { - color: #33ccff; } - -/* line 165, ../sass/controls/_controls.scss */ +/* line 105, ../sass/controls/_controls.scss */ .btn-bar .btn, .btn-bar .btn-set, .btn-bar .t-btn { display: inline-block; } -/* line 179, ../sass/controls/_controls.scss */ +/* line 119, ../sass/controls/_controls.scss */ .l-composite-control { vertical-align: middle; } - /* line 182, ../sass/controls/_controls.scss */ + /* line 122, ../sass/controls/_controls.scss */ .l-composite-control.l-checkbox .composite-control-label { line-height: 18px; } -/* line 188, ../sass/controls/_controls.scss */ +/* line 128, ../sass/controls/_controls.scss */ .l-control-group { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -1724,16 +1945,27 @@ a.l-btn span { display: inline-block; padding: 0 5px; position: relative; } - /* line 196, ../sass/controls/_controls.scss */ + /* line 136, ../sass/controls/_controls.scss */ .l-control-group:first-child { border-left: none; padding-left: 0; } -/* line 202, ../sass/controls/_controls.scss */ +/* line 142, ../sass/controls/_controls.scss */ +.l-local-controls { + position: absolute; + top: 5px; + right: 5px; + z-index: 5; } + +/* line 152, ../sass/controls/_controls.scss */ +.s-local-controls { + font-size: 0.7rem; } + +/* line 156, ../sass/controls/_controls.scss */ .btn-set { display: inline-block; position: relative; } - /* line 206, ../sass/controls/_controls.scss */ + /* line 160, ../sass/controls/_controls.scss */ .btn-set .btn, .btn-set .t-btn { -moz-border-radius: 0; @@ -1741,27 +1973,27 @@ a.l-btn span { border-radius: 0; border-left: 1px solid #666666; margin-left: 0; } - /* line 211, ../sass/controls/_controls.scss */ + /* line 165, ../sass/controls/_controls.scss */ .btn-set .btn:first-child, .btn-set .t-btn:first-child { border-left: none; - -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 215, ../sass/controls/_controls.scss */ + -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; } + /* line 169, ../sass/controls/_controls.scss */ .btn-set .btn:last-child, .btn-set .t-btn:last-child { - -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; } + -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; } -/* line 221, ../sass/controls/_controls.scss */ +/* line 175, ../sass/controls/_controls.scss */ .object-browse-bar .btn, .object-browse-bar .t-btn, .top-bar .buttons-main .btn, @@ -1772,7 +2004,7 @@ a.l-btn span { font-size: 11.25px; height: 25px; line-height: 25px; } - /* line 232, ../sass/controls/_controls.scss */ + /* line 186, ../sass/controls/_controls.scss */ .object-browse-bar .btn .icon:not(.invoke-menu), .object-browse-bar .t-btn .icon:not(.invoke-menu), .top-bar .buttons-main .btn .icon:not(.invoke-menu), @@ -1782,7 +2014,7 @@ a.l-btn span { font-size: 150%; vertical-align: middle; } -/* line 240, ../sass/controls/_controls.scss */ +/* line 194, ../sass/controls/_controls.scss */ label.checkbox.custom { cursor: pointer; display: inline-block; @@ -1791,17 +2023,17 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: top; } - /* line 251, ../sass/controls/_controls.scss */ + /* line 205, ../sass/controls/_controls.scss */ label.checkbox.custom em { color: #999; display: inline-block; height: 14px; min-width: 14px; } - /* line 256, ../sass/controls/_controls.scss */ + /* line 210, ../sass/controls/_controls.scss */ label.checkbox.custom em:before { - -moz-border-radius: 2.25px; - -webkit-border-radius: 2.25px; - border-radius: 2.25px; + -moz-border-radius: 1.5px; + -webkit-border-radius: 1.5px; + border-radius: 1.5px; background: #666666; border-bottom: 1px solid gray; box-sizing: border-box; @@ -1816,121 +2048,132 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 274, ../sass/controls/_controls.scss */ + /* line 228, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text { overflow: hidden; margin-right: 0; padding-left: 0; height: 14px; width: 14px; } - /* line 280, ../sass/controls/_controls.scss */ + /* line 234, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 284, ../sass/controls/_controls.scss */ + /* line 238, ../sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 286, ../sass/controls/_controls.scss */ + /* line 240, ../sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 294, ../sass/controls/_controls.scss */ +/* line 248, ../sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 296, ../sass/controls/_controls.scss */ + /* line 250, ../sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 300, ../sass/controls/_controls.scss */ + /* line 254, ../sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 303, ../sass/controls/_controls.scss */ + /* line 257, ../sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 308, ../sass/controls/_controls.scss */ +/* line 262, ../sass/controls/_controls.scss */ .btn-menu label.checkbox.custom { margin-left: 5px; } -/* line 313, ../sass/controls/_controls.scss */ +/* line 267, ../sass/controls/_controls.scss */ .item .checkbox.checked label { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; border-bottom: none; } -/* line 319, ../sass/controls/_controls.scss */ +/* line 273, ../sass/controls/_controls.scss */ .btn-menu { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #666666; + border-top: 1px solid #575757; color: #999; display: inline-block; - height: 20px; - line-height: 20px; } - /* line 148, ../sass/_mixins.scss */ + /* 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 152, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -webkit-linear-gradient(#666666, #4d4d4d); - background-image: linear-gradient(#666666, #4d4d4d); } - /* line 326, ../sass/controls/_controls.scss */ - .btn-menu.dropdown { - padding-left: 10px; - padding-right: 10px; } - /* line 332, ../sass/controls/_controls.scss */ + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #636363), color-stop(100%, #575757)); + background-image: -moz-linear-gradient(#636363, #575757); + background-image: -webkit-linear-gradient(#636363, #575757); + background-image: linear-gradient(#636363, #575757); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .btn-menu:not(.disabled):hover.btn-menu .invoke-menu { + color: #878787; } + /* line 160, ../sass/_mixins.scss */ + .btn-menu.btn-menu .invoke-menu { + color: #757575; } + /* line 285, ../sass/controls/_controls.scss */ .btn-menu:not(.disabled):hover { color: #cccccc; } - /* line 336, ../sass/controls/_controls.scss */ - .btn-menu.btn-invoke-menu { - color: #0099cc; - padding: 0 5px; } - /* line 340, ../sass/controls/_controls.scss */ - .btn-menu.btn-invoke-menu:hover { - color: deepskyblue; } - /* line 350, ../sass/controls/_controls.scss */ - .btn-menu .type-icon { - margin-right: 5px; } - /* line 353, ../sass/controls/_controls.scss */ + /* line 310, ../sass/controls/_controls.scss */ + .btn-menu .name { + margin-left: 5px; } + /* line 313, ../sass/controls/_controls.scss */ .btn-menu .menu { position: absolute; left: 0; text-align: left; } - /* line 358, ../sass/controls/_controls.scss */ + /* line 318, ../sass/controls/_controls.scss */ .btn-menu .menu .ui-symbol.icon { width: 12px; } -/* line 364, ../sass/controls/_controls.scss */ +/* line 324, ../sass/controls/_controls.scss */ .top-bar .btn-menu { height: 25px; line-height: 25px; padding-right: 10px; } - /* line 372, ../sass/controls/_controls.scss */ + /* line 332, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn { margin-right: 5px; padding-left: 25px; } - /* line 375, ../sass/controls/_controls.scss */ + /* line 335, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn .badge { - -moz-border-radius: 4.5px; - -webkit-border-radius: 4.5px; - border-radius: 4.5px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; display: block; font-size: 1em; line-height: 15px; @@ -1942,56 +2185,46 @@ label.checkbox.custom { width: 15px; height: auto; } +/* line 351, ../sass/controls/_controls.scss */ +.view-switcher { + -moz-transition-property: visibility, opacity, background-color, border-color; + -o-transition-property: visibility, opacity, background-color, border-color; + -webkit-transition-property: visibility, opacity, background-color, border-color; + transition-property: visibility, opacity, background-color, border-color; + -moz-transition-duration: 100ms; + -o-transition-duration: 100ms; + -webkit-transition-duration: 100ms; + transition-duration: 100ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; } + /******************************************************** OBJECT-HEADER */ -/* line 392, ../sass/controls/_controls.scss */ +/* line 356, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 395, ../sass/controls/_controls.scss */ - .object-header .title { + /* line 360, ../sass/controls/_controls.scss */ + .object-header .label .title-label { color: white; } - /* line 398, ../sass/controls/_controls.scss */ - .object-header .type-icon { + /* line 363, ../sass/controls/_controls.scss */ + .object-header .label .type-icon { font-size: 1.5em; margin-right: 5px; vertical-align: middle; } -/* line 407, ../sass/controls/_controls.scss */ +/* line 373, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 409, ../sass/controls/_controls.scss */ + /* line 375, ../sass/controls/_controls.scss */ .top-bar .object-header span, .object-browse-bar .object-header span { display: inline-block; } -/******************************************************** VIEW-CONTROLS */ -/* line 417, ../sass/controls/_controls.scss */ -.view-controls .view-type { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - box-sizing: border-box; - display: inline-block; - margin-left: 5px; - height: 20px; - line-height: 20px; - padding-left: 5px; - padding-right: 5px; } - /* line 428, ../sass/controls/_controls.scss */ - .view-controls .view-type.cur { - background: #666666; } - -/* line 433, ../sass/controls/_controls.scss */ -.edit-mode .top-bar .control-set.edit-view-controls { - margin-right: 50px; } - /******************************************************** SLIDERS */ -/* line 439, ../sass/controls/_controls.scss */ -.wrapper-slider { - position: relative; } - -/* line 447, ../sass/controls/_controls.scss */ +/* line 387, ../sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2005,70 +2238,58 @@ label.checkbox.custom { background-color: rgba(0, 0, 0, 0.4); border-bottom: 1px solid rgba(77, 77, 77, 0.4); border-right: 1px solid rgba(77, 77, 77, 0.4); - height: auto; + height: 50%; width: auto; position: absolute; - top: 10%; + top: 25%; right: 0; - bottom: 10%; - left: 0; - z-index: 0; } - /* line 459, ../sass/controls/_controls.scss */ - .slider .slot .range { - background: rgba(0, 153, 204, 0.3); - cursor: ew-resize; - position: absolute; - top: 0; - right: auto; - bottom: 0; - left: auto; - height: auto; - width: auto; - z-index: 1; } - /* line 470, ../sass/controls/_controls.scss */ - .slider .slot .range:hover { - background: rgba(0, 153, 204, 0.5); } -/* line 475, ../sass/controls/_controls.scss */ + bottom: auto; + left: 0; } +/* line 398, ../sass/controls/_controls.scss */ .slider .knob { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-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: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - border: none; - border-top: 1px solid #666666; - color: #999; - display: inline-block; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); + 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-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 #575757; + color: #999; + display: inline-block; cursor: ew-resize; position: absolute; - height: auto; + height: 100%; width: 12px; top: 0; - bottom: 0; - left: auto; - z-index: 2; } - /* line 148, ../sass/_mixins.scss */ + auto: 0; + bottom: auto; + left: auto; } + /* line 152, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -webkit-linear-gradient(#666666, #4d4d4d); - background-image: linear-gradient(#666666, #4d4d4d); } - /* line 120, ../sass/_mixins.scss */ + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #636363), color-stop(100%, #575757)); + background-image: -moz-linear-gradient(#636363, #575757); + background-image: -webkit-linear-gradient(#636363, #575757); + background-image: linear-gradient(#636363, #575757); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .slider .knob:not(.disabled):hover.btn-menu .invoke-menu { + color: #878787; } + /* line 160, ../sass/_mixins.scss */ + .slider .knob.btn-menu .invoke-menu { + color: #757575; } + /* line 176, ../sass/_mixins.scss */ .slider .knob:before { content: ''; display: block; @@ -2079,23 +2300,31 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 197, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } - /* line 487, ../sass/controls/_controls.scss */ - .slider .knob.knob-l { - margin-left: -6px; } - /* line 488, ../sass/controls/_controls.scss */ - .slider .knob.knob-r { - margin-right: -6px; } - /* line 489, ../sass/controls/_controls.scss */ + /* line 409, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; - left: 45%; } + left: 5px; } +/* line 416, ../sass/controls/_controls.scss */ +.slider .range { + background: rgba(0, 153, 204, 0.6); + cursor: ew-resize; + position: absolute; + top: 0; + right: auto; + bottom: 0; + left: auto; + height: auto; + width: auto; } + /* line 426, ../sass/controls/_controls.scss */ + .slider .range:hover { + background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ -/* line 501, ../sass/controls/_controls.scss */ +/* line 434, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2112,7 +2341,7 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 507, ../sass/controls/_controls.scss */ +/* line 440, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2126,11 +2355,11 @@ label.checkbox.custom { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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-top: 1px solid gray; } - /* line 514, ../sass/controls/_controls.scss */ + /* line 447, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2139,7 +2368,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: linear-gradient(#808080, #737373 20px); } -/* line 519, ../sass/controls/_controls.scss */ +/* line 452, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } @@ -2204,26 +2433,26 @@ label.checkbox.custom { position: relative; } /* line 29, ../sass/controls/_menus.scss */ .menu-element .menu { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNWU1ZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#595959, #4d4d4d); - background-image: -webkit-linear-gradient(#595959, #4d4d4d); - background-image: linear-gradient(#595959, #4d4d4d); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5e5e5e), color-stop(100%, #525252)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #737373; + border-top: 1px solid #636363; color: #999; display: inline-block; text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; @@ -2231,11 +2460,14 @@ label.checkbox.custom { padding: 3px 0; position: absolute; z-index: 10; } + /* line 160, ../sass/_mixins.scss */ + .menu-element .menu.btn-menu .invoke-menu { + color: #828282; } /* line 37, ../sass/controls/_menus.scss */ .menu-element .menu ul { margin: 0; padding: 0; } - /* line 208, ../sass/_mixins.scss */ + /* line 264, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2246,8 +2478,8 @@ label.checkbox.custom { -webkit-box-sizing: border-box; box-sizing: border-box; border-top: 1px solid #737373; - line-height: 1.5rem; - padding: 3px 10px 3px 35px; + line-height: 1.4rem; + padding: 3px 10px 3px 30px; white-space: nowrap; } /* line 46, ../sass/controls/_menus.scss */ .menu-element .menu ul li:first-child { @@ -2298,9 +2530,9 @@ label.checkbox.custom { overflow-y: auto; } /* line 90, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; border-top: none; } /* line 96, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li:hover { @@ -2339,25 +2571,28 @@ label.checkbox.custom { pointer-events: auto; } /* line 147, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzhjOGM4YyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + 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%, #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: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + 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.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #a6a6a6; + 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 149, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li { padding-left: 30px; } @@ -2380,7 +2615,7 @@ label.checkbox.custom { position: absolute; height: 200px; width: 170px; - z-index: 59; } + z-index: 70; } /* line 172, ../sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; @@ -2497,6 +2732,330 @@ label.checkbox.custom { .l-time-controller .knob.knob-r .range-value { left: 14px; } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 26, ../sass/edit/_editor.scss */ +.edit-main .edit-corner, +.edit-main .edit-handle { + position: absolute; + z-index: 2; } +/* line 32, ../sass/edit/_editor.scss */ +.edit-main .edit-corner { + width: 15px; + height: 15px; } + /* line 35, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-nw { + -moz-border-radius-bottomright: 5px; + -webkit-border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; + cursor: nw-resize; + top: 0; + left: 0; } + /* line 40, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-se { + -moz-border-radius-topleft: 5px; + -webkit-border-top-left-radius: 5px; + border-top-left-radius: 5px; + cursor: se-resize; + bottom: 0; + right: 0; } + /* line 45, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-sw { + -moz-border-radius-topright: 5px; + -webkit-border-top-right-radius: 5px; + border-top-right-radius: 5px; + cursor: sw-resize; + bottom: 0; + left: 0; } +/* line 53, ../sass/edit/_editor.scss */ +.edit-main .edit-handle { + top: 15px; + right: 15px; + bottom: 15px; + left: 15px; } + /* line 55, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-move { + cursor: move; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 1; } + /* line 65, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-n { + top: 0px; + bottom: auto; + height: 15px; + cursor: n-resize; } + /* line 70, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-e { + right: 0px; + left: auto; + width: 15px; + cursor: e-resize; } + /* line 75, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-s { + bottom: 0px; + top: auto; + height: 15px; + cursor: s-resize; } + /* line 80, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-w { + left: 0px; + right: auto; + width: 15px; + cursor: w-resize; } +/* line 89, ../sass/edit/_editor.scss */ +.edit-main .frame.child-frame.panel:hover { + -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + border-color: #0099cc; + z-index: 2; } + /* line 93, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .view-switcher { + opacity: 1; } + /* line 96, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner { + background-color: rgba(0, 153, 204, 0.8); } + /* line 98, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner:hover { + background-color: #0099cc; } + +/* line 1, ../sass/features/_imagery.scss */ +.l-image-main-wrapper, +.l-image-main, +.l-image-main-controlbar, +.l-image-main-controlbar .left, +.l-image-main-controlbar .right, +.l-image-thumbs-wrapper { + overflow: false; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; } + +/*************************************** MAIN LAYOUT */ +/* line 11, ../sass/features/_imagery.scss */ +.l-image-main-wrapper { + min-height: 100px; + min-width: 150px; } + /* line 18, ../sass/features/_imagery.scss */ + .l-image-main-wrapper .l-image-main { + background-color: rgba(255, 255, 255, 0.1); + bottom: 25px; } + /* line 22, ../sass/features/_imagery.scss */ + .l-image-main-wrapper .l-image-main-controlbar { + top: auto; + height: 20px; } + +/* line 28, ../sass/features/_imagery.scss */ +.l-image-thumbs-wrapper { + top: auto; + height: 168px; } + +/* line 34, ../sass/features/_imagery.scss */ +.l-date, +.l-time, +.l-timezone { + display: inline-block; } + +/*************************************** MAIN IMAGE */ +/* line 42, ../sass/features/_imagery.scss */ +.l-image-main, +.l-image-thumb-item .l-thumb { + background-size: contain; + 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; + line-height: 20px; } + /* line 57, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .left, .l-image-main-controlbar .right { + direction: rtl; + overflow: hidden; } + /* line 61, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .left { + text-align: left; + width: 75% !important; } + /* line 66, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .right { + min-width: 40px; + width: 25% !important; + z-index: 2; } + /* line 72, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-date, + .l-image-main-controlbar .l-time { + color: #fff; } + /* line 76, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-mag { + direction: ltr; + display: inline-block; } + /* line 80, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-mag:before { + content: "\000049"; } + /* line 84, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .s-mag { + color: #666666; } + /* line 87, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-btn.show-thumbs { + display: none; } + +/* line 92, ../sass/features/_imagery.scss */ +.s-image-main { + border: 1px solid transparent; } + /* line 94, ../sass/features/_imagery.scss */ + .s-image-main.paused { + border-color: #c56f01; } + +/*************************************** THUMBS */ +/* line 101, ../sass/features/_imagery.scss */ +.l-image-thumbs-wrapper { + direction: rtl; + overflow-x: auto; + overflow-y: hidden; + padding-bottom: 5px; + white-space: nowrap; + z-index: 70; } + +/* line 111, ../sass/features/_imagery.scss */ +.l-image-thumb-item { + -moz-transition: background-color 0.25s; + -o-transition: background-color 0.25s; + -webkit-transition: background-color 0.25s; + transition: background-color 0.25s; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 1px; + position: relative; + cursor: pointer; + direction: ltr; + display: inline-block; + font-size: 0.8em; + margin-left: 3px; + text-align: left; + width: 122px; + white-space: normal; } + /* line 116, ../sass/features/_imagery.scss */ + .l-image-thumb-item .l-thumb, + .l-image-thumb-item .l-date, + .l-image-thumb-item .l-time { + display: inline-block; } + /* line 121, ../sass/features/_imagery.scss */ + .l-image-thumb-item .l-date, + .l-image-thumb-item .l-time { + padding: 2px 3px; } + /* line 133, ../sass/features/_imagery.scss */ + .l-image-thumb-item:hover { + background: rgba(255, 255, 255, 0.2); } + /* line 135, ../sass/features/_imagery.scss */ + .l-image-thumb-item:hover .l-date, + .l-image-thumb-item:hover .l-time { + color: #fff; } + /* line 140, ../sass/features/_imagery.scss */ + .l-image-thumb-item.selected { + background: #005177; } + /* line 142, ../sass/features/_imagery.scss */ + .l-image-thumb-item.selected .l-date, + .l-image-thumb-item.selected .l-time { + color: #fff; } + /* line 147, ../sass/features/_imagery.scss */ + .l-image-thumb-item .l-thumb { + background-color: rgba(255, 255, 255, 0.1); + height: 120px; + width: 120px; + margin-top: 0; } + +/*************************************** WHEN IN FRAME */ +/* line 157, ../sass/features/_imagery.scss */ +.frame .t-imagery .l-image-main-wrapper { + bottom: 0; } + /* line 159, ../sass/features/_imagery.scss */ + .frame .t-imagery .l-image-main-wrapper .l-image-main-controlbar { + font-size: 0.7em; } +/* line 168, ../sass/features/_imagery.scss */ +.frame .t-imagery .l-image-thumbs-wrapper { + display: none; } + +/* line 5, ../sass/features/_time-display.scss */ +.l-time-display:hover .l-btn.control { + opacity: 1; } +/* line 10, ../sass/features/_time-display.scss */ +.l-time-display .l-elem-wrapper { + position: relative; } +/* line 13, ../sass/features/_time-display.scss */ +.l-time-display .l-elem { + display: inline-block; } +/* line 18, ../sass/features/_time-display.scss */ +.l-time-display.l-timer .l-elem.l-value { + -moz-transition-property: left; + -o-transition-property: left; + -webkit-transition-property: left; + transition-property: left; + -moz-transition-duration: 200ms; + -o-transition-duration: 200ms; + -webkit-transition-duration: 200ms; + transition-duration: 200ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + position: absolute; + left: 0; + z-index: 1; } +/* line 24, ../sass/features/_time-display.scss */ +.l-time-display.l-timer:hover .l-elem.l-value { + left: 20px; } +/* line 31, ../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 */ +.l-time-display .l-btn.control { + -moz-transition-property: visibility, opacity, background-color, border-color; + -o-transition-property: visibility, opacity, background-color, border-color; + -webkit-transition-property: visibility, opacity, background-color, border-color; + transition-property: visibility, opacity, background-color, border-color; + -moz-transition-duration: 200ms; + -o-transition-duration: 200ms; + -webkit-transition-duration: 200ms; + transition-duration: 200ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + opacity: 0; + font-size: 0.9em; + line-height: 1em; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2622,9 +3181,9 @@ label.checkbox.custom { color: #666666; } /* line 116, ../sass/forms/_elems.scss */ .form .form-row .selector-list { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -2661,9 +3220,9 @@ label.form-control.checkbox input { vertical-align: top; } /* line 159, ../sass/forms/_elems.scss */ .l-result div.s-hint { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; background: rgba(255, 153, 0, 0.8); display: block; color: #ffd699; @@ -2746,13 +3305,12 @@ span.req { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 22, ../sass/forms/_text-input.scss */ -input[type="text"], -input[type="date"] { +input[type="text"] { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -2766,32 +3324,10 @@ input[type="date"] { outline: none; padding: 0 3px; } /* line 33, ../sass/forms/_mixins.scss */ - input[type="text"].error, - input[type="date"].error { + input[type="text"].error { background: rgba(255, 0, 0, 0.5); } - /* line 61, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]:-moz-placeholder, - input[type="date"]:-moz-placeholder { - color: gray; - font-style: italic; } - /* line 64, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]::-moz-placeholder, - input[type="date"]::-moz-placeholder { - color: gray; - font-style: italic; } - /* line 67, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]:-ms-input-placeholder, - input[type="date"]:-ms-input-placeholder { - color: gray; - font-style: italic; } - /* line 56, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_user-interface.scss */ - input[type="text"]::-webkit-input-placeholder, - input[type="date"]::-webkit-input-placeholder { - color: gray; - font-style: italic; } - /* line 34, ../sass/forms/_text-input.scss */ - input[type="text"].numeric, - input[type="date"].numeric { + /* line 29, ../sass/forms/_text-input.scss */ + input[type="text"].numeric { text-align: right; } /***************************************************************************** @@ -2817,23 +3353,23 @@ input[type="date"] { *****************************************************************************/ /* line 22, ../sass/forms/_selects.scss */ .form-control.select { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #666666; + border-top: 1px solid #575757; color: #999; display: inline-block; cursor: pointer; @@ -2841,14 +3377,21 @@ input[type="date"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 152, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); - background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -webkit-linear-gradient(#666666, #4d4d4d); - background-image: linear-gradient(#666666, #4d4d4d); } + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #636363), color-stop(100%, #575757)); + background-image: -moz-linear-gradient(#636363, #575757); + background-image: -webkit-linear-gradient(#636363, #575757); + background-image: linear-gradient(#636363, #575757); + color: #bdbdbd; } + /* line 155, ../sass/_mixins.scss */ + .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { + color: #878787; } + /* line 160, ../sass/_mixins.scss */ + .form-control.select.btn-menu .invoke-menu { + color: #757575; } /* line 29, ../sass/forms/_selects.scss */ .form-control.select select { -moz-appearance: none; @@ -2905,9 +3448,9 @@ input[type="date"] { .channel-selector .treeview { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -3010,9 +3553,9 @@ input[type="date"] { .t-filter input.t-filter-input { -moz-appearance: none; -webkit-appearance: none; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -3045,9 +3588,9 @@ input[type="date"] { /* line 42, ../sass/forms/_filter.scss */ .filter .icon.ui-symbol, .t-filter .icon.ui-symbol { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; display: inline-block; font-size: 1.3em; height: 22px; @@ -3061,9 +3604,9 @@ input[type="date"] { /* line 54, ../sass/forms/_filter.scss */ .filter .s-a-clear.ui-symbol, .t-filter .s-a-clear.ui-symbol { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -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; @@ -3161,9 +3704,9 @@ input[type="date"] { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; background: black; color: #e6e6e6; padding: 2px 5px; @@ -3423,9 +3966,9 @@ input[type="date"] { z-index: 100; } /* line 27, ../sass/overlay/_overlay.scss */ .overlay .btn.close { - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; padding: 3px 6px; position: absolute; border: none; @@ -3436,34 +3979,37 @@ input[type="date"] { z-index: 100; } /* line 38, ../sass/overlay/_overlay.scss */ .overlay > .holder { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); - background-image: linear-gradient(#4d4d4d, #404040); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #525252), color-stop(100%, #454545)); + 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-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; - box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; + -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 #666666; + border-top: 1px solid #575757; color: #999; display: inline-block; - -moz-border-radius: 9px; - -webkit-border-radius: 9px; - border-radius: 9px; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; color: #999; top: 15%; right: 15%; bottom: 15%; left: 15%; z-index: 101; } + /* line 160, ../sass/_mixins.scss */ + .overlay > .holder.btn-menu .invoke-menu { + color: #757575; } /* line 45, ../sass/overlay/_overlay.scss */ .overlay > .holder > .contents { top: 25px; @@ -3532,27 +4078,31 @@ input[type="date"] { border: 1px solid #4d4d4d; } /* line 28, ../sass/user-environ/_frame.scss */ .frame.child-frame.panel:hover { - border-color: #666666; } -/* line 35, ../sass/user-environ/_frame.scss */ + border-color: #666666; + z-index: 2; } +/* line 36, ../sass/user-environ/_frame.scss */ .frame > .object-header.abs, .btn-menu .frame > span.object-header.l-click-area { font-size: 0.75em; height: 20px; } -/* line 39, ../sass/user-environ/_frame.scss */ +/* line 40, ../sass/user-environ/_frame.scss */ .frame > .object-holder.abs, .btn-menu .frame > span.object-holder.l-click-area { top: 23px; } -/* line 42, ../sass/user-environ/_frame.scss */ +/* line 43, ../sass/user-environ/_frame.scss */ .frame .contents { top: 5px; right: 5px; bottom: 5px; left: 5px; } - -/* line 52, ../sass/user-environ/_frame.scss */ -.edit-main .frame.child-frame.panel:hover { - border-color: #0099cc; - -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; } +/* line 54, ../sass/user-environ/_frame.scss */ +.frame.frame-template .view-switcher { + opacity: 0; + z-index: 10; } +/* line 59, ../sass/user-environ/_frame.scss */ +.frame.frame-template:hover .view-switcher { + opacity: 1; } +/* line 67, ../sass/user-environ/_frame.scss */ +.frame .view-switcher .name { + display: none; } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government @@ -3631,9 +4181,9 @@ input[type="date"] { line-height: 16px; } /* line 26, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .status-holder { - -moz-border-radius: 5.25px; - -webkit-border-radius: 5.25px; - border-radius: 5.25px; + -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; @@ -3661,9 +4211,9 @@ input[type="date"] { margin-right: 20px; } /* line 50, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator { - -moz-border-radius: 2.7px; - -webkit-border-radius: 2.7px; - border-radius: 2.7px; + -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; @@ -3771,75 +4321,80 @@ input[type="date"] { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 27, ../sass/helpers/_bubbles.scss */ +/* line 24, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper { -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; - position: absolute; - z-index: 70; } - /* line 32, ../sass/helpers/_bubbles.scss */ + position: relative; + z-index: 50; } + /* line 29, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble { display: inline-block; - max-width: 250px; + min-width: 100px; + max-width: 300px; padding: 5px 10px; } - /* line 36, ../sass/helpers/_bubbles.scss */ + /* line 34, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble:before { content: ""; position: absolute; width: 0; height: 0; } - /* line 42, ../sass/helpers/_bubbles.scss */ + /* line 40, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table { width: 100%; } - /* line 45, ../sass/helpers/_bubbles.scss */ + /* line 43, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td { padding: 2px 0; vertical-align: top; } - /* line 52, ../sass/helpers/_bubbles.scss */ + /* line 50, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.label { padding-right: 10px; white-space: nowrap; } - /* line 56, ../sass/helpers/_bubbles.scss */ + /* line 54, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.value { white-space: nowrap; } - /* line 60, ../sass/helpers/_bubbles.scss */ + /* line 58, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.align-wrap { white-space: normal; } - /* line 66, ../sass/helpers/_bubbles.scss */ + /* line 64, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 5px; } - /* line 73, ../sass/helpers/_bubbles.scss */ + /* line 71, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left { - margin-left: 10px; } - /* line 75, ../sass/helpers/_bubbles.scss */ + margin-left: 20px; } + /* line 73, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { right: 100%; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 7.5px solid #ddd; } - /* line 83, ../sass/helpers/_bubbles.scss */ + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-right: 10px solid #ddd; } + /* line 79, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right { - margin-right: 10px; } - /* line 85, ../sass/helpers/_bubbles.scss */ + margin-right: 20px; } + /* line 81, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right .l-infobubble::before { left: 100%; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 7.5px solid #ddd; } - /* line 94, ../sass/helpers/_bubbles.scss */ + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-left: 10px solid #ddd; } + /* line 88, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-top .l-infobubble::before { - top: 10px; } - /* line 100, ../sass/helpers/_bubbles.scss */ + top: 20px; } + /* line 94, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-btm .l-infobubble::before { - bottom: 10px; } - /* line 105, ../sass/helpers/_bubbles.scss */ + bottom: 20px; } + /* line 99, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down { margin-bottom: 10px; } - /* line 107, ../sass/helpers/_bubbles.scss */ + /* line 101, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down .l-infobubble::before { left: 50%; top: 100%; @@ -3847,30 +4402,59 @@ input[type="date"] { border-left: 5px solid transparent; border-right: 5px solid transparent; border-top: 7.5px solid #ddd; } + /* line 110, ../sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper .arw { + z-index: 2; } + /* line 113, ../sass/helpers/_bubbles.scss */ + .l-infobubble-wrapper.arw-up .arw.arw-down, .l-infobubble-wrapper.arw-down .arw.arw-up { + display: none; } /* line 120, ../sass/helpers/_bubbles.scss */ +.l-thumbsbubble-wrapper .arw-up { + width: 0; + height: 0; + border-left: 6.66667px solid transparent; + border-right: 6.66667px solid transparent; + border-bottom: 10px solid #4d4d4d; } +/* line 123, ../sass/helpers/_bubbles.scss */ +.l-thumbsbubble-wrapper .arw-down { + width: 0; + height: 0; + border-left: 6.66667px solid transparent; + border-right: 6.66667px solid transparent; + border-top: 10px solid #4d4d4d; } + +/* line 127, ../sass/helpers/_bubbles.scss */ .s-infobubble { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; + box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; background: #ddd; color: #666; font-size: 0.8rem; } - /* line 126, ../sass/helpers/_bubbles.scss */ + /* line 134, ../sass/helpers/_bubbles.scss */ .s-infobubble .title { color: #333333; font-weight: bold; } - /* line 131, ../sass/helpers/_bubbles.scss */ + /* line 139, ../sass/helpers/_bubbles.scss */ .s-infobubble tr td { border-top: 1px solid #c4c4c4; font-size: 0.9em; } - /* line 135, ../sass/helpers/_bubbles.scss */ + /* line 143, ../sass/helpers/_bubbles.scss */ .s-infobubble tr:first-child td { border-top: none; } - /* line 139, ../sass/helpers/_bubbles.scss */ + /* line 147, ../sass/helpers/_bubbles.scss */ .s-infobubble .value { color: #333333; } +/* line 152, ../sass/helpers/_bubbles.scss */ +.s-thumbsbubble { + background: #4d4d4d; + color: #b3b3b3; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -3921,7 +4505,7 @@ input[type="date"] { right: 0; width: auto; height: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 176, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -3932,7 +4516,7 @@ input[type="date"] { top: 2px; left: 5px; right: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 197, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } /* line 63, ../sass/helpers/_splitter.scss */ @@ -3950,7 +4534,7 @@ input[type="date"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 176, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -3961,7 +4545,7 @@ input[type="date"] { left: 2px; bottom: 5px; top: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 197, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } @@ -4276,5 +4860,5 @@ input[type="date"] { .browse-mode .browse-area.holder { top: 5px; } /* line 39, ../sass/_hide-non-functional.scss */ - .browse-mode .browse-area.holder > .contents.split-layout .object-browse-bar .t-btn.key-window { + .browse-mode .browse-area.holder > .contents.split-layout .object-browse-bar .btn.key-window { display: none; } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index d39b47ef87..b40a2aec6e 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -61,6 +61,15 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/* +@mixin invokeMenu($baseColor: $colorBodyFg) { + $c: $baseColor; + color: $c; + &:hover { + color: lighten($c, $ltGamma); + } +} +*/ /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -86,7 +95,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 208, ../sass/_mixins.scss */ + /* line 264, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; @@ -97,17 +106,17 @@ ul.tree { position: relative; } /* line 27, ../sass/tree/_tree.scss */ ul.tree li span.tree-item { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; -webkit-transition: background-color 0.25s; transition: background-color 0.25s; display: block; font-size: 0.80rem; - height: 1.5rem; - line-height: 1.5rem; + height: 1.4rem; + line-height: 1.4rem; margin-bottom: 3px; position: relative; } /* line 38, ../sass/tree/_tree.scss */ @@ -168,7 +177,7 @@ ul.tree { width: auto; height: auto; display: block; - left: 25px; + left: 20px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } @@ -207,17 +216,16 @@ ul.tree { /* line 125, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.loading) { cursor: pointer; } - /* line 130, ../sass/tree/_tree.scss */ + /* line 129, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger { - display: none; top: -1px; position: absolute; right: 3px; } - /* line 136, ../sass/tree/_tree.scss */ - ul.tree li span.tree-item .context-trigger .btn-invoke-menu { + /* line 135, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .context-trigger .invoke-menu { font-size: 0.75em; height: 0.9rem; line-height: 0.9rem; } - /* line 145, ../sass/tree/_tree.scss */ + /* line 144, ../sass/tree/_tree.scss */ ul.tree ul.tree { margin-left: 15px; } diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index bf781e614b..0d7e45d06d 100644 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 2ca77321a4..0d525856b6 100644 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg @@ -2,7 +2,7 @@ -Created by FontForge 20090622 at Mon May 4 20:21:42 2015 +Created by FontForge 20090622 at Tue Jun 9 23:00:40 2015 By deploy user Copyright 2015 Adobe Systems Incorporated. All rights reserved. @@ -62,8 +62,10 @@ q52 -180 95 -231q42 53 88 212z" /> d="M193 787v-193h-193v193h193zM193 491v-195h-193v195h193zM193 193v-193h-193v193h193zM671 732v-82h-388v82h388zM671 435v-81h-388v81h388zM671 138v-82h-388v82h388z" /> - + - + @@ -232,6 +234,22 @@ d="M748 750l-375 -750l-374 750h749z" /> d="M-1 0l375 750l374 -750h-749z" /> + + + + + + + .ui-symbol { + font-size: 1.1em; + } + } + &.sm { + padding: 0 $pad / $baseRatio; + } + &.vsm { + padding: 0 ($pad / $baseRatio) / 2; + } } - /*********************************** STYLE STYLES */ +.btn, .s-btn { - $base: lighten($colorBodyBg, 20%); + $base: lighten($colorBodyBg, 20%); // Moved to s-btn @include border-radius($controlCr); @include box-sizing(border-box); @include text-shadow(rgba(black, 0.3) 0 1px 1px); + cursor: pointer; line-height: 1.2em; - padding: 0 $pad; text-decoration: none; + &.major { + $bg: $colorKey; + @include btnSubtle($bg); + $fg: lighten($bg, 50%); + color: $fg; + &:hover { + @include btnSubtle(lighten($bg, 5%), $fg); + //color: $fg; + } + .invoke-menu { + color: $fg; + } + } + &.subtle { + @include btnSubtle($base, lighten($base, 40%)); + } + &.very-subtle, &.s-very-subtle { @include containerSubtle($colorBodyBg, $colorBodyFg, true); + &.paused { + @include containerSubtle($colorPausedBg, $colorPausedFg, true); + .icon:before { + content:"\0000EF"; + } + } } } +.icon-btn, .s-icon-btn { @extend .s-btn; - font-size: 1.2em; + font-size: 1em; .icon { color: $colorKey; } + &.paused { + .icon { + color: $colorPausedFg; + } + } - &:not(.disabled):hover .icon { - color: lighten($colorKey, $ltGamma); + &:not(.disabled) { + &:not(.paused) { + &:hover { + .icon { + color: lighten($colorKey, $ltGamma); + } + } + } } &.labeled { @@ -61,12 +121,30 @@ $pad: $interiorMargin * 2; margin-left: $interiorMargin; } } + + &.pause-play { + &.paused { + @include pulse(500ms); + } + .icon:before { + content:"\0000F1"; + } + } + + &.show-thumbs { + .icon:before { + content:"\000039"; + } + } } - /*********************************** LAYOUT STYLES */ +span.btn, +span.btn span, span.l-btn, span.l-btn span, +a.btn, +a.btn span, a.l-btn, a.l-btn span { display: inline-block; diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 86544886f5..83da982937 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -19,7 +19,8 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -.control { +/*.control { + // UNUSED? &.view-control { .icon { display: inline-block; @@ -45,10 +46,10 @@ } } } -} +}*/ .accordion { - $accordionHeadH: 18px; + $accordionHeadH: 18px; margin-top: $interiorMargin; &:first-child { margin-top: 0; @@ -56,16 +57,20 @@ .accordion-head { $op: 0.2; @include border-radius($basicCr * 0.75); - @include box-sizing("border-box"); + @include box-sizing("border-box"); background: rgba($colorBodyFg, $op); cursor: pointer; font-size: 0.75em; - line-height: $accordionHeadH; + line-height: $accordionHeadH; margin-bottom: $interiorMargin; padding: 0 $interiorMargin; position: absolute; - top: 0; right: 0; bottom: auto; left: 0; - width: auto; height: $accordionHeadH; + top: 0; + right: 0; + bottom: auto; + left: 0; + width: auto; + height: $accordionHeadH; text-transform: uppercase; &:hover { background: rgba($colorBodyFg, $op * 2); @@ -84,79 +89,14 @@ content: "v"; } } - .accordion-contents { - position: absolute; - top: $accordionHeadH + $interiorMargin; right: 0; bottom: 0; left: 0; - overflow-y: auto; - overflow-x: hidden; - } -} - -.btn { - $base: lighten($colorBodyBg, 20%); // Moved to s-btn - $p: 10px; // Moved to s-btn - @include border-radius($controlCr); // Moved to s-btn - @include box-sizing(border-box); // Moved to s-btn - @include text-shadow(rgba(black, 0.3) 0 1px 1px); // Moved to s-btn -// display: inline-block; - // margin-right: 10px; - padding: 0 ($interiorMargin * 2); // Moved to s-btn - text-decoration: none; // Moved to s-btn - &.create-btn { - $h: $ueTopBarH - $interiorMargin; //$btnStdH * 1.5;; - $p: $p * 2.25; - height: $h; - line-height: $h; - //font-size: 1.1em; - padding: 0 $p; - .menu { - margin-left: $p * -1; - } - .ui-symbol.major { - font-size: 1.1em; - } - } - &.major { - $bg: $colorKey; - @include btnNoticeable($bg); - $fg: lighten($bg, 50%); - color: $fg; - &:hover { - @include btnNoticeable(lighten($bg, 5%)); - color: $fg; - } - .invoke-menu { - color: $fg; - } - } - &.normal { - padding: $p * 0.5 $p * 0.7; - } - &.outline { - &:hover { - background: rgba(#fff, 0.1); - } - } - &.subtle { - @include btnSubtle($base, lighten($base, 40%)); - } - - &.very-subtle { - @include btnSubtle($colorBodyBg, lighten($colorBodyBg, 50%)); - } - &.lg { - @include border-radius($controlCr * 1.5); - font-size: 1.2em; - padding: 7px 25px; - } - &.icon-btn { - .icon { - color: $colorKey; - } - - &:not(.disabled):hover .icon { - color: lighten($colorKey, $ltGamma); - } + .accordion-contents { + position: absolute; + top: $accordionHeadH + $interiorMargin; + right: 0; + bottom: 0; + left: 0; + overflow-y: auto; + overflow-x: hidden; } } @@ -166,12 +106,12 @@ .btn-set, .t-btn { display: inline-block; -// margin-left: $interiorMargin; + // margin-left: $interiorMargin; } .btn, .t-btn { &:first-child { -// margin-left: 0; + // margin-left: 0; } } } @@ -199,6 +139,20 @@ } } +.l-local-controls { + // Control shown when hovering over an object, like plots and imagery + // Default position is upper right + $p: $interiorMargin; + position: absolute; + top: $p; + right: $p; + z-index: 5; +} + +.s-local-controls { + font-size: 0.7rem; +} + .btn-set { // Buttons that have a very tight conceptual grouping - no internal space between them. display: inline-block; @@ -230,8 +184,8 @@ height: $h; line-height: $h; .icon:not(.invoke-menu) { -// position: relative; -// top: -0.04em; + // position: relative; + // top: -0.04em; font-size: 150%; vertical-align: middle; } @@ -318,37 +272,43 @@ label.checkbox.custom { .btn-menu { $h: 20px; - $p: $interiorMargin * 2; + $p: $interiorMarginSm * 2; $c: $colorBodyFg; @include btnSubtle($colorBodyBg); - height: $h; - line-height: $h; - &.dropdown { - // padding-left: $p; - padding-left: $p; - padding-right: $p; - } + /* height: $h; + line-height: $h; + &.dropdown { + padding-left: $p; + padding-right: $p; + }*/ &:not(.disabled):hover { color: lighten($c, 20%); } - &.btn-invoke-menu { - $c: $colorKey; - color: $c; - padding: 0 5px; - &:hover { - color: lighten($c, 10%); - } + /* &.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%); + } + }*/ + + span.l-click-area { + // In markup, this element should not enclose anything. + @extend .abs; } - span.l-click-area { - // In markup, this element should not enclose anything. - @extend .abs; - } - .type-icon { - margin-right: $interiorMargin; + //margin-right: $interiorMargin; + } + + .name { + margin-left: $interiorMargin; } .menu { // margin-left: (-1 * $p); @@ -388,17 +348,23 @@ label.checkbox.custom { } } +.view-switcher { + @include trans-prop-nice-fade($controlFadeMs); +} + /******************************************************** OBJECT-HEADER */ .object-header { display: inline-block; font-size: 1em; - .title { - color: lighten($colorBodyFg, 40%); - } - .type-icon { - font-size: 1.5em; - margin-right: $interiorMargin; - vertical-align: middle; + .label { + .title-label { + color: lighten($colorBodyFg, 40%); + } + .type-icon { + font-size: 1.5em; + margin-right: $interiorMargin; + vertical-align: middle; + } } } @@ -412,86 +378,53 @@ label.checkbox.custom { } } -/******************************************************** VIEW-CONTROLS */ - -.view-controls .view-type { - $d: 20px; - $p: 5px; - @include border-radius($controlCr); - box-sizing: border-box; - display: inline-block; - margin-left: $interiorMargin; - height: $d; - line-height: $d; - padding-left: $p; - padding-right: $p; - &.cur { - background: lighten($colorBodyBg, $ltGamma); - } -} - -.edit-mode .top-bar .control-set.edit-view-controls { - // Used in templates/edit-view-controls.html - margin-right: $interiorMargin * 10; -} - /******************************************************** SLIDERS */ -.wrapper-slider { - position: relative; -} + .slider { - //$knobH: 70%; //14px; + $knobH: 100%; //14px; $knobW: 12px; - $slotH: 80%; - $rangeO: 0.3; + $slotH: 50%; .slot { // @include border-radius($basicCr * .75); @include sliderTrack(); - height: auto; + height: $slotH; width: auto; position: absolute; - //top: ($knobH - $slotH) / 2; - top: (100% - $slotH)/2; + top: ($knobH - $slotH) / 2; right: 0; - bottom: (100% - $slotH)/2; + bottom: auto; left: 0; - z-index: 0; - .range { - background: rgba($colorKey, $rangeO); - cursor: ew-resize; - position: absolute; - top: 0; - right: auto; - bottom: 0; - left: auto; - height: auto; - width: auto; - z-index: 1; - &:hover { - background: rgba($colorKey, $rangeO + 0.2); - } - } } .knob { @include btnSubtle(); @include controlGrippy(rgba(black, 0.3), vertical, 1px, solid); - @include border-radius(2px); cursor: ew-resize; position: absolute; - height: auto; + height: $knobH; width: $knobW; top: 0; - bottom: 0; + auto: 0; + bottom: auto; left: auto; - z-index: 2; - &.knob-l { margin-left: $knobW / -2; } - &.knob-r { margin-right: $knobW / -2; } &:before { top: 1px; bottom: 3px; - //left: ($knobW / 2) - 1; - //margin-left: -1px; - left: 45%; + left: ($knobW / 2) - 1; + } + + } + .range { + background: rgba($colorKey, 0.6); + cursor: ew-resize; + position: absolute; + top: 0; + right: auto; + bottom: 0; + left: auto; + height: auto; + width: auto; + &:hover { + background: rgba($colorKey, 0.7); } } } @@ -499,23 +432,23 @@ label.checkbox.custom { /******************************************************** BROWSER ELEMENTS */ ::-webkit-scrollbar { - @include sliderTrack(); - height: $scrollbarTrackSize; - width: $scrollbarTrackSize; + @include sliderTrack(); + height: $scrollbarTrackSize; + width: $scrollbarTrackSize; } ::-webkit-scrollbar-thumb { - $bg: lighten($colorBodyBg, 10%); - @include background-image(linear-gradient(lighten($bg, 10%), lighten($bg, 5%) 20px)); - @include border-radius(1px); - @include box-sizing(border-box); - @include boxShdwSubtle(); - border-top: 1px solid lighten($bg, 20%); - &:hover { - @include background-image(linear-gradient(lighten($bg, 20%), lighten($bg, 15%) 20px)); - } + $bg: lighten($colorBodyBg, 10%); + @include background-image(linear-gradient(lighten($bg, 10%), lighten($bg, 5%) 20px)); + @include border-radius(1px); + @include box-sizing(border-box); + @include boxShdwSubtle(); + border-top: 1px solid lighten($bg, 20%); + &:hover { + @include background-image(linear-gradient(lighten($bg, 20%), lighten($bg, 15%) 20px)); + } } ::-webkit-scrollbar-corner { - background: rgba(#000, 0.4); + background: rgba(#000, 0.4); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index d225d764fe..cc6f65fb7a 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -41,7 +41,7 @@ @include box-sizing(border-box); border-top: 1px solid lighten($bg, 20%); line-height: $menuLineH; - padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 3) + $treeTypeIconW; + padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW; white-space: nowrap; &:first-child { border: none; @@ -168,7 +168,7 @@ position: absolute; height: 200px; width: 170px; - z-index: 59; + z-index: 70; .context-menu-wrapper { position: absolute; height: 100%; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 01a21c06b3..b4a4920f56 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -19,3 +19,86 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + +.edit-main { + $handleD: 15px; + $cr: 5px; + .edit-corner, + .edit-handle { + position: absolute; + z-index: 2; + } + + .edit-corner { + width: $handleD; + height: $handleD; + &.edit-resize-nw { + @include border-bottom-right-radius($cr); + cursor: nw-resize; + top: 0; left: 0; + } + &.edit-resize-se { + @include border-top-left-radius($cr); + cursor: se-resize; + bottom: 0; right: 0; + } + &.edit-resize-sw { + @include border-top-right-radius($cr); + cursor: sw-resize; + bottom: 0; left: 0; + } + + } + + .edit-handle { + top: $handleD; right: $handleD; bottom: $handleD; left: $handleD; + &.edit-move { + $m: 0; //$handleD; + cursor: move; + left: $m; + right: $m; + top: $m; + bottom: $m; + z-index: 1; + + } + &.edit-resize-n { + top: 0px; bottom: auto; + height: $handleD; + cursor: n-resize; + } + &.edit-resize-e { + right: 0px; left: auto; + width: $handleD; + cursor: e-resize; + } + &.edit-resize-s { + bottom: 0px; top: auto; + height: $handleD; + cursor: s-resize; + } + &.edit-resize-w { + left: 0px; right: auto; + width: $handleD; + cursor: w-resize; + } + } + + + .frame.child-frame.panel { + &:hover { + @include boxShdwLarge(); + border-color: $colorKey; + z-index: 2; + .view-switcher { + opacity: 1; + } + .edit-corner { + background-color: rgba($colorKey, 0.8); + &:hover { + background-color: rgba($colorKey, 1); + } + } + } + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/features/_imagery.scss b/platform/commonUI/general/res/sass/features/_imagery.scss new file mode 100644 index 0000000000..69abc1ee27 --- /dev/null +++ b/platform/commonUI/general/res/sass/features/_imagery.scss @@ -0,0 +1,171 @@ +.l-image-main-wrapper, +.l-image-main, +.l-image-main-controlbar, +.l-image-main-controlbar .left, +.l-image-main-controlbar .right, +.l-image-thumbs-wrapper { + @include absPosDefault(0, false); +} + +/*************************************** MAIN LAYOUT */ +.l-image-main-wrapper { + //@include test(); + @if $enableImageryThumbs == true { + bottom: $interiorMargin*2 + $imageThumbsWrapperH; + } + min-height: 100px; + min-width: 150px; + .l-image-main { + background-color: rgba(#fff, 0.1); + bottom: $imageMainControlBarH + $interiorMargin; + } + .l-image-main-controlbar { + top: auto; + height: $imageMainControlBarH; + } +} + +.l-image-thumbs-wrapper { + //@include test(red); + top: auto; + height: $imageThumbsWrapperH; +} + +.l-date, +.l-time, +.l-timezone { + display: inline-block; +} + +/*************************************** MAIN IMAGE */ + +.l-image-main, +.l-image-thumb-item .l-thumb { + background-size: contain; + background-position: center; + background-repeat: no-repeat; +} + +.l-image-main { + cursor: crosshair; +} + +.l-image-main-controlbar { + //@include test(); + font-size: 0.8em; + line-height: $imageMainControlBarH; + .left, .right { + direction: rtl; + overflow: hidden; + } + .left { + //@include test(red); + text-align: left; + width: 75% !important; + } + .right { + //@include test(green); + min-width: 40px; + width: 25% !important; + z-index: 2; + } + .l-date, + .l-time { + color: #fff; + } + .l-mag { + direction: ltr; + display: inline-block; + //white-space: nowrap; + &:before { + content: "\000049"; + } + } + .s-mag { + color: darken($colorBodyFg, 20%); + } + .l-btn.show-thumbs { + display: none; + } +} + +.s-image-main { + border: 1px solid transparent; + &.paused { + border-color: $colorPausedBg; + } +} + +/*************************************** THUMBS */ + +.l-image-thumbs-wrapper { + //@include test(green); + direction: rtl; + overflow-x: auto; + overflow-y: hidden; + padding-bottom: $interiorMargin; + white-space: nowrap; + z-index: 70; +} + +.l-image-thumb-item { + @include single-transition(background-color, 0.25s); + @include box-sizing(border-box); + padding: 1px; + position: relative; + .l-thumb, + .l-date, + .l-time { + display: inline-block; + } + .l-date, + .l-time { + padding: 2px 3px; + } + cursor: pointer; + direction: ltr; + display: inline-block; + font-size: 0.8em; + margin-left: $interiorMarginSm; + text-align: left; + width: $imageThumbsD + $imageThumbPad*2; + white-space: normal; + &:hover { + background: rgba(#fff, 0.2); + .l-date, + .l-time { + color: #fff; + } + } + &.selected { + background: $colorKeySelectedBg; + .l-date, + .l-time { + color: #fff; + } + } + .l-thumb { + background-color: rgba(#fff, 0.1); + height: $imageThumbsD; + width: $imageThumbsD; + margin-top: 0; + } +} + +/*************************************** WHEN IN FRAME */ +.frame .t-imagery { + .l-image-main-wrapper { + bottom: 0; + .l-image-main-controlbar { + font-size: 0.7em; + } + @if $enableImageryThumbs == true { + .l-btn.show-thumbs { + display: inline-block; + } + } + } + .l-image-thumbs-wrapper { + display: none; + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/features/_time-display.scss b/platform/commonUI/general/res/sass/features/_time-display.scss new file mode 100644 index 0000000000..483231a97f --- /dev/null +++ b/platform/commonUI/general/res/sass/features/_time-display.scss @@ -0,0 +1,44 @@ +.l-time-display { + $transTime: 200ms; + // Layout + &:hover { + .l-btn.control { + //display: inline-block; + opacity: 1; + } + } + .l-elem-wrapper { + position: relative; + } + .l-elem { + display: inline-block; + } + + &.l-timer { + .l-elem.l-value { + @include trans-prop-nice(left, $transTime); + position: absolute; + left: 0; + z-index: 1; + } + &:hover .l-elem.l-value { + left: 20px; + } + } + + // Look-and-feel + .l-elem { + .value.active, + &.value.active { + color: $colorKeyFg; + } + } + .l-btn.control { + @include trans-prop-nice-fade($transTime); + //display: none; + opacity: 0; + font-size: 0.9em; + line-height: 1em; + } + +} diff --git a/platform/commonUI/general/res/sass/forms/_text-input.scss b/platform/commonUI/general/res/sass/forms/_text-input.scss index eed6ebd42d..f445b43aa0 100644 --- a/platform/commonUI/general/res/sass/forms/_text-input.scss +++ b/platform/commonUI/general/res/sass/forms/_text-input.scss @@ -19,18 +19,13 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -input[type="text"], -input[type="date"] { +input[type="text"] { @include nice-input(); - @include input-placeholder { - color: darken($colorBodyFg, 10%); - font-style: italic; - } - &.filter { - &.ng-dirty { - // background: red; - } - } + &.filter { + &.ng-dirty { +// background: red; + } + } &.numeric { text-align: right; } diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index 61980cf554..e9648523c4 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -21,17 +21,15 @@ *****************************************************************************/ //************************************************* LAYOUT -$infoBubbleFg: #666; -$infoBubbleBg: #ddd; - .l-infobubble-wrapper { $arwSize: 5px; @include box-shadow(rgba(black, 0.4) 0 1px 5px); - position: absolute; - z-index: 70; + position: relative; + z-index: 50; .l-infobubble { display: inline-block; - max-width: 250px; + min-width: $bubbleMinW; + max-width: $bubbleMaxW; padding: 5px 10px; &:before { content:""; @@ -71,34 +69,30 @@ $infoBubbleBg: #ddd; } &.arw-left { - margin-left: $arwSize*2; + margin-left: $bubbleArwSize*2; .l-infobubble::before { right: 100%; - border-top: $arwSize solid transparent; - border-bottom: $arwSize solid transparent; - border-right: ($arwSize * 1.5) solid $infoBubbleBg; + @include triangle('left', $bubbleArwSize, 1.5, $colorInfoBubbleBg); } } &.arw-right { - margin-right: $arwSize*2; + margin-right: $bubbleArwSize*2; .l-infobubble::before { left: 100%; - border-top: $arwSize solid transparent; - border-bottom: $arwSize solid transparent; - border-left: ($arwSize * 1.5) solid $infoBubbleBg; + @include triangle('right', $bubbleArwSize, 1.5, $colorInfoBubbleBg); } } &.arw-top { .l-infobubble::before { - top: $arwSize * 2; + top: $bubbleArwSize * 2; } } &.arw-btm { .l-infobubble::before { - bottom: $arwSize * 2; + bottom: $bubbleArwSize * 2; } } @@ -110,18 +104,32 @@ $infoBubbleBg: #ddd; margin-left: -1 * $arwSize; border-left: $arwSize solid transparent; border-right: $arwSize solid transparent; - border-top: ($arwSize * 1.5) solid $infoBubbleBg; + border-top: ($arwSize * 1.5) solid $colorInfoBubbleBg; } } + .arw { + z-index: 2; + } + &.arw-up .arw.arw-down, + &.arw-down .arw.arw-up { display: none; } } //************************************************* LOOK AND FEEL +.l-thumbsbubble-wrapper { + .arw-up { + @include triangle('up', $bubbleArwSize, 1.5, $colorThumbsBubbleBg); + } + .arw-down { + @include triangle('down', $bubbleArwSize, 1.5, $colorThumbsBubbleBg); + } +} .s-infobubble { - $emFg: darken($infoBubbleFg, 20%); + $emFg: darken($colorInfoBubbleFg, 20%); @include border-radius($basicCr); - background: $infoBubbleBg; - color: $infoBubbleFg; + @include box-shadow(rgba(black, 0.4) 0 1px 5px); + background: $colorInfoBubbleBg; + color: $colorInfoBubbleFg; font-size: 0.8rem; .title { color: $emFg; @@ -129,7 +137,7 @@ $infoBubbleBg: #ddd; } tr { td { - border-top: 1px solid darken($infoBubbleBg, 10%); + border-top: 1px solid darken($colorInfoBubbleBg, 10%); font-size: 0.9em; } &:first-child td { @@ -139,5 +147,9 @@ $infoBubbleBg: #ddd; .value { color: $emFg; } +} +.s-thumbsbubble { + background: $colorThumbsBubbleBg; + color: $colorThumbsBubbleFg; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 2a72b9d392..71f465a8dc 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -104,7 +104,7 @@ &.selected { $cfg: lighten($colorItemSelected, 35%); $cfgh: lighten($cfg, 30%); - @include btnNoticeable($colorItemSelected); + @include btnSubtle($colorItemSelected); color: $cfg; .item-type, .top-bar .icon:not(.alert) { color: $cfg } .item-main .item-open { color: $cfg } diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 483bada8f0..344e5553ab 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -75,8 +75,8 @@ ul.tree { .title-label { @include absPosDefault(); display: block; - left: $runningItemW + ($interiorMargin * 2); - // right: $treeContextTriggerW + $interiorMargin; //Disabling as context trigger not being used + left: $runningItemW + ($interiorMargin); + //right: $treeContextTriggerW + $interiorMargin; overflow: hidden; text-overflow: ellipsis; // height: $menuLineH; @@ -99,7 +99,7 @@ ul.tree { &.selected { $c: #fff; - background: #005177; + background: $colorKeySelectedBg; color: $c; .view-control { color: $colorItemTreeIcon; @@ -124,16 +124,15 @@ ul.tree { &:not(.loading) { cursor: pointer; - // @include tree-item-hover(); } .context-trigger { $h: 0.9rem; - display: none; + //display: none; top: -1px; position: absolute; right: $interiorMarginSm; - .btn-invoke-menu { + .invoke-menu { font-size: 0.75em; height: $h; line-height: $h; diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index e8e704eb99..a371459cc0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -27,6 +27,7 @@ border: 1px solid $bc; &:hover { border-color: lighten($bc, 10%); + z-index: 2; } .contents { // overflow: hidden; @@ -46,12 +47,25 @@ bottom: $myM; left: $myM; } -} - -.edit-main .frame.child-frame.panel { - &:hover { - border-color: $colorKey; - @include boxShdwLarge(); + &.frame-template { + // Hide the view switcher by default when it's in an element that's in a frame context + // Frame template is used because we need to target the lowest nested frame + // This has the effect of hiding the view switcher in nested frames in edit mode, which is desirable currently (as it's non-functional) + .view-switcher { + //display: none; + opacity: 0; + z-index: 10; + } + &:hover .view-switcher { + // Show the view switcher on frame hover + //display: inline-block !important; + opacity: 1; + } + } + .view-switcher { + // Hide the name when the view switcher is in a frame context + .name { + display: none; + } } - } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index c459adfa8d..8201597ca9 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -70,23 +70,19 @@ &.abs { text-wrap: none; white-space: nowrap; - &.left, - .left { - width: 45%; - right: auto; - } - &.right, - .right { - width: 45%; - left: auto; - right: 0; - text-align: right; - .icon.major { - margin-left: $interiorMargin * 3; - } -// .icon.major { -// margin-left: $interiorMargin; -// } + } + &.left, + .left { + width: 45% !important; + right: auto !important; + } + &.right, + .right { + width: 45% !important; + left: auto !important; + text-align: right; + .icon.major { + margin-left: $interiorMargin * 3; } } } diff --git a/platform/commonUI/general/res/templates/controls/action-button.html b/platform/commonUI/general/res/templates/controls/action-button.html index 458105f102..a0d1adf3a6 100644 --- a/platform/commonUI/general/res/templates/controls/action-button.html +++ b/platform/commonUI/general/res/templates/controls/action-button.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html index 6143c638b0..59e9c87c85 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -21,25 +21,29 @@ --> -
+
- + {{ngModel.selected.glyph}} - {{ngModel.selected.name}} - v + {{ngModel.selected.name}} + v
diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json index 16f2bdf89c..07506d0983 100644 --- a/platform/commonUI/inspect/bundle.json +++ b/platform/commonUI/inspect/bundle.json @@ -1,20 +1,50 @@ { "extensions": { - "types": [ + "templates": [ { - "key": "infobubble", - "name": "Info Bubble", - "glyph": "\u00EA", - "description": "Static markup for info bubbles", - "features": [ "creation" ] + "key": "info-table", + "templateUrl": "info-table.html" + }, + { + "key": "info-bubble", + "templateUrl": "info-bubble.html" } ], - "views": [ + "containers": [ { - "templateUrl": "infobubble.html", - "name": "Info Bubble", - "type": "infobubble", - "key": "infobubble" + "key": "bubble", + "templateUrl": "bubble.html", + "attributes": [ "bubbleTitle", "bubbleLayout" ], + "alias": "bubble" + } + ], + "gestures": [ + { + "key": "info", + "implementation": "gestures/InfoGesture.js", + "depends": [ + "$timeout", + "infoService", + "INFO_HOVER_DELAY" + ] + } + ], + "services": [ + { + "key": "infoService", + "implementation": "services/InfoService.js", + "depends": [ + "$compile", + "$document", + "$window", + "$rootScope" + ] + } + ], + "constants": [ + { + "key": "INFO_HOVER_DELAY", + "value": 500 } ] } diff --git a/platform/commonUI/inspect/res/bubble.html b/platform/commonUI/inspect/res/bubble.html new file mode 100644 index 0000000000..f528d6432f --- /dev/null +++ b/platform/commonUI/inspect/res/bubble.html @@ -0,0 +1,9 @@ +
+
+
+ {{bubble.bubbleTitle}} +
+ +
+
diff --git a/platform/commonUI/inspect/res/info-bubble.html b/platform/commonUI/inspect/res/info-bubble.html new file mode 100644 index 0000000000..1deeeade15 --- /dev/null +++ b/platform/commonUI/inspect/res/info-bubble.html @@ -0,0 +1,7 @@ + + + + diff --git a/platform/commonUI/inspect/res/info-table.html b/platform/commonUI/inspect/res/info-table.html new file mode 100644 index 0000000000..0c89a498d9 --- /dev/null +++ b/platform/commonUI/inspect/res/info-table.html @@ -0,0 +1,8 @@ + + + + + +
{{property.name}} + {{property.value}} +
diff --git a/platform/commonUI/general/res/sass/plots.scss b/platform/commonUI/inspect/src/InfoConstants.js similarity index 67% rename from platform/commonUI/general/res/sass/plots.scss rename to platform/commonUI/inspect/src/InfoConstants.js index bdcd774c5a..86570911c6 100644 --- a/platform/commonUI/general/res/sass/plots.scss +++ b/platform/commonUI/inspect/src/InfoConstants.js @@ -19,12 +19,17 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@import "compass"; -@import "compass/css3"; -@import "compass/css3/border-radius"; -@import "compass/css3/opacity"; -@import "compass/utilities"; - -@import "constants"; -@import "mixins"; -@import "plots/plots-main"; \ No newline at end of file +/*global define*/ +define({ + BUBBLE_TEMPLATE: "" + + "" + + "" + + "", + // Pixel offset for bubble, to align arrow position + BUBBLE_OFFSET: [ 0, -26 ], + // Max width and margins allowed for bubbles; defined in /platform/commonUI/general/res/sass/_constants.scss + BUBBLE_MARGIN_LR: 10, + BUBBLE_MAX_WIDTH: 300 +}); \ No newline at end of file diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js new file mode 100644 index 0000000000..879cc2ac36 --- /dev/null +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -0,0 +1,121 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define*/ + +define( + [], + function () { + "use strict"; + + /** + * The `info` gesture displays domain object metadata in a + * bubble on hover. + * + * @constructor + * @param $timeout Angular's `$timeout` + * @param {InfoService} infoService a service which shows info bubbles + * @param {number} DELAY delay, in milliseconds, before bubble appears + * @param element jqLite-wrapped DOM element + * @param {DomainObject} domainObject the domain object for which to + * show information + */ + function InfoGesture($timeout, infoService, DELAY, element, domainObject) { + var dismissBubble, + pendingBubble, + mousePosition, + scopeOff; + + function trackPosition(event) { + // Record mouse position, so bubble can be shown at latest + // mouse position (not just where the mouse entered) + mousePosition = [ event.clientX, event.clientY ]; + } + + function hideBubble() { + // If a bubble is showing, dismiss it + if (dismissBubble) { + dismissBubble(); + element.off('mouseleave', hideBubble); + dismissBubble = undefined; + } + // If a bubble will be shown on a timeout, cancel that + if (pendingBubble) { + $timeout.cancel(pendingBubble); + element.off('mousemove', trackPosition); + element.off('mouseleave', hideBubble); + pendingBubble = undefined; + } + // Also clear mouse position so we don't have a ton of tiny + // arrays allocated while user mouses over things + mousePosition = undefined; + } + + function showBubble(event) { + trackPosition(event); + + // Also need to track position during hover + element.on('mousemove', trackPosition); + + // Show the bubble, after a suitable delay (if mouse has + // left before this time is up, this will be canceled.) + pendingBubble = $timeout(function () { + dismissBubble = infoService.display( + "info-table", + domainObject.getModel().name, + domainObject.useCapability('metadata'), + mousePosition + ); + element.off('mousemove', trackPosition); + pendingBubble = undefined; + }, DELAY); + + element.on('mouseleave', hideBubble); + } + + // Show bubble (on a timeout) on mouse over + element.on('mouseenter', showBubble); + + // Also make sure we dismiss bubble if representation is destroyed + // before the mouse actually leaves it + scopeOff = element.scope().$on('$destroy', hideBubble); + + return { + /** + * Detach any event handlers associated with this gesture. + * @memberof InfoGesture + * @method + */ + destroy: function () { + // Dismiss any active bubble... + hideBubble(); + // ...and detach listeners + element.off('mouseenter', showBubble); + scopeOff(); + } + }; + } + + return InfoGesture; + + } + +); diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js new file mode 100644 index 0000000000..b67192ba30 --- /dev/null +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -0,0 +1,95 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define*/ + +define( + ['../InfoConstants'], + function (InfoConstants) { + "use strict"; + + var BUBBLE_TEMPLATE = InfoConstants.BUBBLE_TEMPLATE, + OFFSET = InfoConstants.BUBBLE_OFFSET; + + /** + * Displays informative content ("info bubbles") for the user. + * @constructor + */ + function InfoService($compile, $document, $window, $rootScope) { + + function display(templateKey, title, content, position) { + var body = $document.find('body'), + scope = $rootScope.$new(), + winDim = [$window.innerWidth, $window.innerHeight], + bubbleSpaceLR = InfoConstants.BUBBLE_MARGIN_LR + InfoConstants.BUBBLE_MAX_WIDTH, + goLeft = position[0] > (winDim[0] - bubbleSpaceLR), + goUp = position[1] > (winDim[1] / 2), + bubble; + + // Pass model & container parameters into the scope + scope.bubbleModel = content; + scope.bubbleTemplate = templateKey; + scope.bubbleLayout = (goUp ? 'arw-btm' : 'arw-top') + ' ' + + (goLeft ? 'arw-right' : 'arw-left'); + scope.bubbleTitle = title; + + // Create the context menu + bubble = $compile(BUBBLE_TEMPLATE)(scope); + + // Position the bubble + bubble.css('position', 'absolute'); + if (goLeft) { + bubble.css('right', (winDim[0] - position[0] + OFFSET[0]) + 'px'); + } else { + bubble.css('left', position[0] + OFFSET[0] + 'px'); + } + if (goUp) { + bubble.css('bottom', (winDim[1] - position[1] + OFFSET[1]) + 'px'); + } else { + bubble.css('top', position[1] + OFFSET[1] + 'px'); + } + + // Add the menu to the body + body.append(bubble); + + // Return a function to dismiss the bubble + return function () { bubble.remove(); }; + } + + return { + /** + * Display an info bubble at the specified location. + * @param {string} templateKey template to place in bubble + * @param {string} title title for the bubble + * @param {*} content content to pass to the template, via + * `ng-model` + * @param {number[]} x,y position of the info bubble, in + * pixel coordinates. + * @returns {Function} a function that may be invoked to + * dismiss the info bubble + */ + display: display + }; + } + + return InfoService; + } +); diff --git a/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js new file mode 100644 index 0000000000..44f2b1e54b --- /dev/null +++ b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js @@ -0,0 +1,157 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + +define( + ['../../src/gestures/InfoGesture'], + function (InfoGesture) { + "use strict"; + + describe("The info gesture", function () { + var mockTimeout, + mockInfoService, + testDelay = 12321, + mockElement, + mockDomainObject, + mockScope, + mockOff, + testMetadata, + mockPromise, + mockHide, + gesture; + + function fireEvent(evt, value) { + mockElement.on.calls.forEach(function (call) { + if (call.args[0] === evt) { + call.args[1](value); + } + }); + } + + beforeEach(function () { + mockTimeout = jasmine.createSpy('$timeout'); + mockTimeout.cancel = jasmine.createSpy('cancel'); + mockInfoService = jasmine.createSpyObj( + 'infoService', + [ 'display' ] + ); + mockElement = jasmine.createSpyObj( + 'element', + [ 'on', 'off', 'scope', 'css' ] + ); + mockDomainObject = jasmine.createSpyObj( + 'domainObject', + [ 'getId', 'getCapability', 'useCapability', 'getModel' ] + ); + mockScope = jasmine.createSpyObj('$scope', [ '$on' ]); + mockOff = jasmine.createSpy('$off'); + testMetadata = [ { name: "Test name", value: "Test value" } ]; + mockPromise = jasmine.createSpyObj('promise', ['then']); + mockHide = jasmine.createSpy('hide'); + + mockDomainObject.getModel.andReturn({ name: "Test Object" }); + mockDomainObject.useCapability.andCallFake(function (c) { + return (c === 'metadata') ? testMetadata : undefined; + }); + mockElement.scope.andReturn(mockScope); + mockScope.$on.andReturn(mockOff); + mockTimeout.andReturn(mockPromise); + mockInfoService.display.andReturn(mockHide); + + gesture = new InfoGesture( + mockTimeout, + mockInfoService, + testDelay, + mockElement, + mockDomainObject + ); + }); + + it("listens for mouseenter on the representation", function () { + expect(mockElement.on) + .toHaveBeenCalledWith('mouseenter', jasmine.any(Function)); + }); + + it("displays an info bubble on a delay after mouseenter", function () { + fireEvent("mouseenter", { clientX: 1977, clientY: 42 }); + expect(mockTimeout) + .toHaveBeenCalledWith(jasmine.any(Function), testDelay); + mockTimeout.mostRecentCall.args[0](); + expect(mockInfoService.display).toHaveBeenCalledWith( + jasmine.any(String), + "Test Object", + testMetadata, + [ 1977, 42 ] + ); + }); + + it("does not display info bubble if mouse leaves too soon", function () { + fireEvent("mouseenter", { clientX: 1977, clientY: 42 }); + fireEvent("mouseleave", { clientX: 1977, clientY: 42 }); + expect(mockTimeout.cancel).toHaveBeenCalledWith(mockPromise); + expect(mockInfoService.display).not.toHaveBeenCalled(); + }); + + it("hides a shown bubble when mouse leaves", function () { + fireEvent("mouseenter", { clientX: 1977, clientY: 42 }); + mockTimeout.mostRecentCall.args[0](); + expect(mockHide).not.toHaveBeenCalled(); // verify precondition + fireEvent("mouseleave", {}); + expect(mockHide).toHaveBeenCalled(); + }); + + it("tracks mouse position", function () { + fireEvent("mouseenter", { clientX: 1977, clientY: 42 }); + fireEvent("mousemove", { clientX: 1999, clientY: 11 }); + fireEvent("mousemove", { clientX: 1984, clientY: 11 }); + mockTimeout.mostRecentCall.args[0](); + // Should have displayed at the latest observed mouse position + expect(mockInfoService.display).toHaveBeenCalledWith( + jasmine.any(String), + "Test Object", + testMetadata, + [ 1984, 11 ] + ); + }); + + it("hides shown bubbles when destroyed", function () { + fireEvent("mouseenter", { clientX: 1977, clientY: 42 }); + mockTimeout.mostRecentCall.args[0](); + expect(mockHide).not.toHaveBeenCalled(); // verify precondition + gesture.destroy(); + expect(mockHide).toHaveBeenCalled(); + }); + + it("detaches listeners when destroyed", function () { + fireEvent("mouseenter", { clientX: 1977, clientY: 42 }); + gesture.destroy(); + mockElement.on.calls.forEach(function (call) { + expect(mockElement.off).toHaveBeenCalledWith( + call.args[0], + call.args[1] + ); + }); + }); + + }); + } +); diff --git a/platform/commonUI/inspect/test/services/InfoServiceSpec.js b/platform/commonUI/inspect/test/services/InfoServiceSpec.js new file mode 100644 index 0000000000..858427fe84 --- /dev/null +++ b/platform/commonUI/inspect/test/services/InfoServiceSpec.js @@ -0,0 +1,131 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + +define( + ['../../src/services/InfoService', '../../src/InfoConstants'], + function (InfoService, InfoConstants) { + "use strict"; + + describe("The info service", function () { + var mockCompile, + mockDocument, + testWindow, + mockRootScope, + mockCompiledTemplate, + testScope, + mockBody, + mockElement, + service; + + beforeEach(function () { + mockCompile = jasmine.createSpy('$compile'); + mockDocument = jasmine.createSpyObj('$document', ['find']); + testWindow = { innerWidth: 1000, innerHeight: 100 }; + mockRootScope = jasmine.createSpyObj('$rootScope', ['$new']); + mockCompiledTemplate = jasmine.createSpy('template'); + testScope = {}; + mockBody = jasmine.createSpyObj('body', ['append']); + mockElement = jasmine.createSpyObj('element', ['css', 'remove']); + + mockDocument.find.andCallFake(function (tag) { + return tag === 'body' ? mockBody : undefined; + }); + mockCompile.andReturn(mockCompiledTemplate); + mockCompiledTemplate.andReturn(mockElement); + mockRootScope.$new.andReturn(testScope); + + service = new InfoService( + mockCompile, + mockDocument, + testWindow, + mockRootScope + ); + }); + + it("creates elements and appends them to the body to display", function () { + service.display('', '', {}, [0, 0]); + expect(mockBody.append).toHaveBeenCalledWith(mockElement); + }); + + it("provides a function to remove displayed info bubbles", function () { + var fn = service.display('', '', {}, [0, 0]); + expect(mockElement.remove).not.toHaveBeenCalled(); + fn(); + expect(mockElement.remove).toHaveBeenCalled(); + }); + + describe("depending on mouse position", function () { + // Positioning should vary based on quadrant in window, + // which is 1000 x 100 in this test case. + it("displays from the top-left in the top-left quadrant", function () { + service.display('', '', {}, [250, 25]); + expect(mockElement.css).toHaveBeenCalledWith( + 'left', + (250 + InfoConstants.BUBBLE_OFFSET[0]) + 'px' + ); + expect(mockElement.css).toHaveBeenCalledWith( + 'top', + (25 + InfoConstants.BUBBLE_OFFSET[1]) + 'px' + ); + }); + + it("displays from the top-right in the top-right quadrant", function () { + service.display('', '', {}, [700, 25]); + expect(mockElement.css).toHaveBeenCalledWith( + 'right', + (300 + InfoConstants.BUBBLE_OFFSET[0]) + 'px' + ); + expect(mockElement.css).toHaveBeenCalledWith( + 'top', + (25 + InfoConstants.BUBBLE_OFFSET[1]) + 'px' + ); + }); + + it("displays from the bottom-left in the bottom-left quadrant", function () { + service.display('', '', {}, [250, 70]); + expect(mockElement.css).toHaveBeenCalledWith( + 'left', + (250 + InfoConstants.BUBBLE_OFFSET[0]) + 'px' + ); + expect(mockElement.css).toHaveBeenCalledWith( + 'bottom', + (30 + InfoConstants.BUBBLE_OFFSET[1]) + 'px' + ); + }); + + it("displays from the bottom-right in the bottom-right quadrant", function () { + service.display('', '', {}, [800, 60]); + expect(mockElement.css).toHaveBeenCalledWith( + 'right', + (200 + InfoConstants.BUBBLE_OFFSET[0]) + 'px' + ); + expect(mockElement.css).toHaveBeenCalledWith( + 'bottom', + (40 + InfoConstants.BUBBLE_OFFSET[1]) + 'px' + ); + }); + }); + + }); + } +); diff --git a/platform/commonUI/inspect/test/suite.json b/platform/commonUI/inspect/test/suite.json new file mode 100644 index 0000000000..82650e2dff --- /dev/null +++ b/platform/commonUI/inspect/test/suite.json @@ -0,0 +1,4 @@ +[ + "gestures/InfoGesture", + "services/InfoService" +] diff --git a/platform/containment/bundle.json b/platform/containment/bundle.json index e61085f66f..e6e24f0f79 100644 --- a/platform/containment/bundle.json +++ b/platform/containment/bundle.json @@ -12,6 +12,11 @@ "implementation": "CompositionMutabilityPolicy.js", "message": "Objects of this type cannot be modified." }, + { + "category": "composition", + "implementation": "CompositionModelPolicy.js", + "message": "Objects of this type cannot contain other objects." + }, { "category": "action", "implementation": "ComposeActionPolicy.js", diff --git a/platform/containment/src/CompositionModelPolicy.js b/platform/containment/src/CompositionModelPolicy.js new file mode 100644 index 0000000000..74f1200530 --- /dev/null +++ b/platform/containment/src/CompositionModelPolicy.js @@ -0,0 +1,28 @@ +/*global define*/ + +define( + [], + function () { + "use strict"; + + /** + * Policy allowing composition only for domain object types which + * have a composition property. + */ + function CompositionModelPolicy() { + return { + /** + * Is the type identified by the candidate allowed to + * contain the type described by the context? + */ + allow: function (candidate, context) { + return Array.isArray( + (candidate.getInitialModel() || {}).composition + ); + } + }; + } + + return CompositionModelPolicy; + } +); \ No newline at end of file diff --git a/platform/containment/test/CompositionModelPolicySpec.js b/platform/containment/test/CompositionModelPolicySpec.js new file mode 100644 index 0000000000..bace49246d --- /dev/null +++ b/platform/containment/test/CompositionModelPolicySpec.js @@ -0,0 +1,26 @@ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + +define( + ["../src/CompositionModelPolicy"], + function (CompositionModelPolicy) { + "use strict"; + + describe("The composition model policy", function () { + var mockType, + policy; + + beforeEach(function () { + mockType = jasmine.createSpyObj('type', ['getInitialModel']); + policy = new CompositionModelPolicy(); + }); + + it("only allows composition for types which will have a composition property", function () { + mockType.getInitialModel.andReturn({}); + expect(policy.allow(mockType)).toBeFalsy(); + mockType.getInitialModel.andReturn({ composition: [] }); + expect(policy.allow(mockType)).toBeTruthy(); + }); + }); + + } +); diff --git a/platform/containment/test/CompositionMutabilityPolicySpec.js b/platform/containment/test/CompositionMutabilityPolicySpec.js index c537a5000f..1f49883939 100644 --- a/platform/containment/test/CompositionMutabilityPolicySpec.js +++ b/platform/containment/test/CompositionMutabilityPolicySpec.js @@ -35,7 +35,7 @@ define( policy = new CompositionMutabilityPolicy(); }); - it("only allows composition for types which will have a composition capability", function () { + it("only allows composition for types which can be created/modified", function () { expect(policy.allow(mockType)).toBeFalsy(); mockType.hasFeature.andReturn(true); expect(policy.allow(mockType)).toBeTruthy(); diff --git a/platform/containment/test/suite.json b/platform/containment/test/suite.json index 987ef9a86c..81218a969e 100644 --- a/platform/containment/test/suite.json +++ b/platform/containment/test/suite.json @@ -1,6 +1,7 @@ [ "CapabilityTable", "ComposeActionPolicy", + "CompositionModelPolicy", "CompositionMutabilityPolicy", "CompositionPolicy", "ContainmentTable" diff --git a/platform/core/bundle.json b/platform/core/bundle.json index 5a2727eb75..97ee2d262f 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -165,6 +165,10 @@ "implementation": "capabilities/PersistenceCapability.js", "depends": [ "persistenceService", "PERSISTENCE_SPACE" ] }, + { + "key": "metadata", + "implementation": "capabilities/MetadataCapability.js" + }, { "key": "mutation", "implementation": "capabilities/MutationCapability.js", diff --git a/platform/core/src/capabilities/MetadataCapability.js b/platform/core/src/capabilities/MetadataCapability.js new file mode 100644 index 0000000000..677dab0008 --- /dev/null +++ b/platform/core/src/capabilities/MetadataCapability.js @@ -0,0 +1,92 @@ +/*global define*/ + +define( + ['moment'], + function (moment) { + "use strict"; + + /** + * A piece of information about a domain object. + * @typedef {Object} MetadataProperty + * @property {string} name the human-readable name of this property + * @property {string} value the human-readable value of this property, + * for this specific domain object + */ + + var TIME_FORMAT = "YYYY-MM-DD HH:mm:ss"; + + /** + * Implements the `metadata` capability of a domain object, providing + * properties of that object for display. + * + * Usage: `domainObject.useCapability("metadata")` + * + * ...which will return an array of objects containing `name` and + * `value` properties describing that domain object (suitable for + * display.) + * + * @constructor + */ + function MetadataCapability(domainObject) { + var model = domainObject.getModel(); + + function hasDisplayableValue(metadataProperty) { + var t = typeof metadataProperty.value; + return (t === 'string' || t === 'number'); + } + + function formatTimestamp(timestamp) { + return typeof timestamp === 'number' ? + (moment.utc(timestamp).format(TIME_FORMAT) + " UTC") : + undefined; + } + + function getProperties() { + var type = domainObject.getCapability('type'); + + function lookupProperty(typeProperty) { + return { + name: typeProperty.getDefinition().name, + value: typeProperty.getValue(model) + }; + } + + return (type ? type.getProperties() : []).map(lookupProperty); + } + + function getCommonMetadata() { + var type = domainObject.getCapability('type'); + // Note that invalid values will be filtered out later + return [ + { + name: "Updated", + value: formatTimestamp(model.modified) + }, + { + name: "Type", + value: type && type.getName() + }, + { + name: "ID", + value: domainObject.getId() + } + ]; + } + + function getMetadata() { + return getProperties().concat(getCommonMetadata()) + .filter(hasDisplayableValue); + } + + return { + /** + * Get metadata about this object. + * @returns {MetadataProperty[]} metadata about this object + */ + invoke: getMetadata + }; + } + + return MetadataCapability; + } +); diff --git a/platform/core/src/capabilities/MutationCapability.js b/platform/core/src/capabilities/MutationCapability.js index 431c8d5d19..c20c90deab 100644 --- a/platform/core/src/capabilities/MutationCapability.js +++ b/platform/core/src/capabilities/MutationCapability.js @@ -77,7 +77,8 @@ define( // Get the object's model and clone it, so the // mutator function has a temporary copy to work with. var model = domainObject.getModel(), - clone = JSON.parse(JSON.stringify(model)); + clone = JSON.parse(JSON.stringify(model)), + useTimestamp = arguments.length > 1; // Function to handle copying values to the actual function handleMutation(mutationResult) { @@ -94,8 +95,7 @@ define( if (model !== result) { copyValues(model, result); } - model.modified = (typeof timestamp === 'number') ? - timestamp : now(); + model.modified = useTimestamp ? timestamp : now(); } // Report the result of the mutation diff --git a/platform/core/test/capabilities/MetadataCapabilitySpec.js b/platform/core/test/capabilities/MetadataCapabilitySpec.js new file mode 100644 index 0000000000..272746f037 --- /dev/null +++ b/platform/core/test/capabilities/MetadataCapabilitySpec.js @@ -0,0 +1,101 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + +define( + ['../../src/capabilities/MetadataCapability'], + function (MetadataCapability) { + "use strict"; + + describe("The metadata capability", function () { + var mockDomainObject, + mockType, + mockProperties, + testModel, + metadata; + + function getCapability(key) { + return key === 'type' ? mockType : undefined; + } + + function findValue(properties, name) { + var i; + for (i = 0; i < properties.length; i += 1) { + if (properties[i].name === name) { + return properties[i].value; + } + } + } + + beforeEach(function () { + mockDomainObject = jasmine.createSpyObj( + 'domainObject', + ['getId', 'getCapability', 'useCapability', 'getModel'] + ); + mockType = jasmine.createSpyObj( + 'type', + ['getProperties', 'getName'] + ); + mockProperties = ['a', 'b', 'c'].map(function (k) { + var mockProperty = jasmine.createSpyObj( + 'property-' + k, + ['getValue', 'getDefinition'] + ); + mockProperty.getValue.andReturn("Value " + k); + mockProperty.getDefinition.andReturn({ name: "Property " + k}); + return mockProperty; + }); + testModel = { name: "" }; + + mockDomainObject.getId.andReturn("Test id"); + mockDomainObject.getModel.andReturn(testModel); + mockDomainObject.getCapability.andCallFake(getCapability); + mockDomainObject.useCapability.andCallFake(getCapability); + mockType.getProperties.andReturn(mockProperties); + mockType.getName.andReturn("Test type"); + + metadata = new MetadataCapability(mockDomainObject); + }); + + it("reads properties from the domain object model", function () { + metadata.invoke(); + mockProperties.forEach(function (mockProperty) { + expect(mockProperty.getValue).toHaveBeenCalledWith(testModel); + }); + }); + + it("reports type-specific properties", function () { + var properties = metadata.invoke(); + expect(findValue(properties, 'Property a')).toEqual("Value a"); + expect(findValue(properties, 'Property b')).toEqual("Value b"); + expect(findValue(properties, 'Property c')).toEqual("Value c"); + }); + + it("reports generic properties", function () { + var properties = metadata.invoke(); + expect(findValue(properties, 'ID')).toEqual("Test id"); + expect(findValue(properties, 'Type')).toEqual("Test type"); + }); + + }); + } +); diff --git a/platform/core/test/suite.json b/platform/core/test/suite.json index 36f3e81980..26749fa612 100644 --- a/platform/core/test/suite.json +++ b/platform/core/test/suite.json @@ -9,6 +9,7 @@ "capabilities/ContextualDomainObject", "capabilities/CoreCapabilityProvider", "capabilities/DelegationCapability", + "capabilities/MetadataCapability", "capabilities/MutationCapability", "capabilities/PersistenceCapability", "capabilities/RelationshipCapability", diff --git a/platform/entanglement/README.md b/platform/entanglement/README.md new file mode 100644 index 0000000000..f3685bad05 --- /dev/null +++ b/platform/entanglement/README.md @@ -0,0 +1,24 @@ +# Entanglement + +Entanglement is the process of moving, copying, and linking domain objects +in such a way that their relationships are impossible to discern. + +This bundle provides move, copy, and link functionality. Acheiving a state of +entanglement is left up to the end user. + + +## Services implement logic + +Each method (move, copy, link) is implemented as a service, and each service +provides two functions: `validate` and `perform`. + +`validate(object, parentCandidate)` returns true if the `object` can be +move/copy/linked into the `parentCandidate`'s composition. + +`perform(object, parentObject)` move/copy/links the `object` into the +`parentObject`'s composition. + +## Actions implement user interactions + +Actions are used to expose move/copy/link to the user. They prompt for input +where necessary, and complete the actions. diff --git a/platform/entanglement/bundle.json b/platform/entanglement/bundle.json new file mode 100644 index 0000000000..7220669988 --- /dev/null +++ b/platform/entanglement/bundle.json @@ -0,0 +1,75 @@ +{ + "name": "Entanglement", + "description": "Tools to assist you in entangling the world of WARP.", + "configuration": {}, + "extensions": { + "actions": [ + { + "key": "move", + "name": "Move", + "description": "Move object to another location.", + "glyph": "f", + "category": "contextual", + "implementation": "actions/MoveAction.js", + "depends": ["locationService", "moveService"] + }, + { + "key": "copy", + "name": "Duplicate", + "description": "Duplicate object to another location.", + "glyph": "+", + "category": "contextual", + "implementation": "actions/CopyAction.js", + "depends": ["locationService", "copyService"] + }, + { + "key": "link", + "name": "Create Link", + "description": "Create Link to object in another location.", + "glyph": "\u00E8", + "category": "contextual", + "implementation": "actions/LinkAction.js", + "depends": ["locationService", "linkService"] + } + ], + "components": [ + ], + "controllers": [ + ], + "capabilities": [ + ], + "services": [ + { + "key": "moveService", + "name": "Move Service", + "description": "Provides a service for moving objects", + "implementation": "services/MoveService.js", + "depends": ["policyService", "linkService"] + }, + { + "key": "linkService", + "name": "Link Service", + "description": "Provides a service for linking objects", + "implementation": "services/LinkService.js", + "depends": ["policyService"] + }, + { + "key": "copyService", + "name": "Copy Service", + "description": "Provides a service for copying objects", + "implementation": "services/CopyService.js", + "depends": ["$q", "creationService", "policyService"] + }, + { + "key": "locationService", + "name": "Location Service", + "description": "Provides a service for prompting a user for locations.", + "implementation": "services/LocationService.js", + "depends": ["dialogService"] + } + + ], + "licenses": [ + ] + } +} diff --git a/platform/entanglement/src/actions/CopyAction.js b/platform/entanglement/src/actions/CopyAction.js new file mode 100644 index 0000000000..aff8b94fb5 --- /dev/null +++ b/platform/entanglement/src/actions/CopyAction.js @@ -0,0 +1,92 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define */ +define( + function () { + "use strict"; + + + /** + * The CopyAction is available from context menus and allows a user to + * deep copy an object to another location of their choosing. + * + * @implements Action + */ + function CopyAction(locationService, copyService, context) { + + var object, + newParent, + currentParent; + + if (context.selectedObject) { + newParent = context.domainObject; + object = context.selectedObject; + } else { + object = context.domainObject; + } + + currentParent = object + .getCapability('context') + .getParent(); + + return { + perform: function () { + + if (newParent) { + return copyService + .perform(object, newParent); + } + + var dialogTitle, + label, + validateLocation; + + dialogTitle = [ + "Duplicate ", + object.getModel().name, + " to a location" + ].join(""); + + label = "Duplicate To"; + + validateLocation = function (newParent) { + return copyService + .validate(object, newParent); + }; + + return locationService.getLocationFromUser( + dialogTitle, + label, + validateLocation, + currentParent + ).then(function (newParent) { + return copyService + .perform(object, newParent); + }); + } + }; + } + + return CopyAction; + } +); diff --git a/platform/entanglement/src/actions/LinkAction.js b/platform/entanglement/src/actions/LinkAction.js new file mode 100644 index 0000000000..c6b4be100f --- /dev/null +++ b/platform/entanglement/src/actions/LinkAction.js @@ -0,0 +1,89 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define */ +define( + function () { + "use strict"; + + /** + * The LinkAction is available from context menus and allows a user to + * link an object to another location of their choosing. + * + * @implements Action + */ + function LinkAction(locationService, linkService, context) { + + var object, + newParent, + currentParent; + + if (context.selectedObject) { + newParent = context.domainObject; + object = context.selectedObject; + } else { + object = context.domainObject; + } + + currentParent = object + .getCapability('context') + .getParent(); + + return { + perform: function () { + if (newParent) { + return linkService + .perform(object, newParent); + } + var dialogTitle, + label, + validateLocation; + + dialogTitle = [ + "Link ", + object.getModel().name, + " to a new location" + ].join(""); + + label = "Link To"; + + validateLocation = function (newParent) { + return linkService + .validate(object, newParent); + }; + + return locationService.getLocationFromUser( + dialogTitle, + label, + validateLocation, + currentParent + ).then(function (newParent) { + return linkService + .perform(object, newParent); + }); + } + }; + } + + return LinkAction; + } +); diff --git a/platform/entanglement/src/actions/MoveAction.js b/platform/entanglement/src/actions/MoveAction.js new file mode 100644 index 0000000000..63f1517c56 --- /dev/null +++ b/platform/entanglement/src/actions/MoveAction.js @@ -0,0 +1,90 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define */ +define( + function () { + "use strict"; + + /** + * The MoveAction is available from context menus and allows a user to + * move an object to another location of their choosing. + * + * @implements Action + */ + function MoveAction(locationService, moveService, context) { + + var object, + newParent, + currentParent; + + if (context.selectedObject) { + newParent = context.domainObject; + object = context.selectedObject; + } else { + object = context.domainObject; + } + + currentParent = object + .getCapability('context') + .getParent(); + + return { + perform: function () { + if (newParent) { + return moveService + .perform(object, newParent); + } + + var dialogTitle, + label, + validateLocation; + + dialogTitle = [ + "Move ", + object.getModel().name, + " to a new location" + ].join(""); + + label = "Move To"; + + validateLocation = function (newParent) { + return moveService + .validate(object, newParent); + }; + + return locationService.getLocationFromUser( + dialogTitle, + label, + validateLocation, + currentParent + ).then(function (newParent) { + return moveService + .perform(object, newParent); + }); + } + }; + } + + return MoveAction; + } +); diff --git a/platform/entanglement/src/services/CopyService.js b/platform/entanglement/src/services/CopyService.js new file mode 100644 index 0000000000..487568c475 --- /dev/null +++ b/platform/entanglement/src/services/CopyService.js @@ -0,0 +1,106 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define */ + +define( + function () { + "use strict"; + + /** + * CopyService provides an interface for deep copying objects from one + * location to another. It also provides a method for determining if + * an object can be copied to a specific location. + */ + function CopyService($q, creationService, policyService) { + + /** + * duplicateObject duplicates a `domainObject` into the composition + * of `parent`, and then duplicates the composition of + * `domainObject` into the new object. + * + * This function is a recursive deep copy. + * + * @param {DomainObject} domainObject - the domain object to + * duplicate. + * @param {DomainObject} parent - the parent domain object to + * create the duplicate in. + * @returns {Promise} A promise that is fulfilled when the + * duplicate operation has completed. + */ + function duplicateObject(domainObject, parent) { + var model = JSON.parse(JSON.stringify(domainObject.getModel())); + if (domainObject.hasCapability('composition')) { + model.composition = []; + } + + return creationService + .createObject(model, parent) + .then(function (newObject) { + if (!domainObject.hasCapability('composition')) { + return; + } + + return domainObject + .useCapability('composition') + .then(function (composees) { + // Duplicate composition serially to prevent + // write conflicts. + return composees.reduce(function (promise, composee) { + return promise.then(function () { + return duplicateObject(composee, newObject); + }); + }, $q.when(undefined)); + }); + }); + } + + return { + /** + * Returns true if `object` can be copied into + * `parentCandidate`'s composition. + */ + validate: function (object, parentCandidate) { + if (!parentCandidate || !parentCandidate.getId) { + return false; + } + if (parentCandidate.getId() === object.getId()) { + return false; + } + return policyService.allow( + "composition", + parentCandidate.getCapability('type'), + object.getCapability('type') + ); + }, + /** + * Wrapper, @see {@link duplicateObject} for implementation. + */ + perform: function (object, parentObject) { + return duplicateObject(object, parentObject); + } + }; + } + + return CopyService; + } +); diff --git a/platform/entanglement/src/services/LinkService.js b/platform/entanglement/src/services/LinkService.js new file mode 100644 index 0000000000..acecab3b8d --- /dev/null +++ b/platform/entanglement/src/services/LinkService.js @@ -0,0 +1,76 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define */ + +define( + function () { + "use strict"; + + /** + * LinkService provides an interface for linking objects to additional + * locations. It also provides a method for determining if an object + * can be copied to a specific location. + */ + function LinkService(policyService) { + return { + /** + * Returns `true` if `object` can be linked into + * `parentCandidate`'s composition. + */ + validate: function (object, parentCandidate) { + if (!parentCandidate || !parentCandidate.getId) { + return false; + } + if (parentCandidate.getId() === object.getId()) { + return false; + } + if (parentCandidate.getModel().composition.indexOf(object.getId()) !== -1) { + return false; + } + return policyService.allow( + "composition", + parentCandidate.getCapability('type'), + object.getCapability('type') + ); + }, + /** + * Link `object` into `parentObject`'s composition. + * + * @returns {Promise} A promise that is fulfilled when the + * linking operation has completed. + */ + perform: function (object, parentObject) { + return parentObject.useCapability('mutation', function (model) { + if (model.composition.indexOf(object.getId()) === -1) { + model.composition.push(object.getId()); + } + }).then(function () { + return parentObject.getCapability('persistence').persist(); + }); + } + }; + } + + return LinkService; + } +); diff --git a/platform/entanglement/src/services/LocationService.js b/platform/entanglement/src/services/LocationService.js new file mode 100644 index 0000000000..3e71011503 --- /dev/null +++ b/platform/entanglement/src/services/LocationService.js @@ -0,0 +1,83 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define */ + +define( + function () { + "use strict"; + + /** + * The LocationService allows for easily prompting the user for a + * location in the root tree. + */ + function LocationService(dialogService) { + return { + /** Prompt the user to select a location. Returns a promise + * that is resolved with a domainObject representing the + * location selected by the user. + * + * @param {string} title - title of location dialog + * @param {string} label - label for location input field + * @param {function} validate - function that validates + * selections. + * @param {domainObject} initialLocation - tree location to + * display at start + * @returns {Promise} promise for a domain object. + */ + getLocationFromUser: function (title, label, validate, initialLocation) { + var formStructure, + formState; + + formStructure = { + sections: [ + { + name: 'Location', + rows: [ + { + name: label, + control: "locator", + validate: validate, + key: 'location' + } + ] + } + ], + name: title + }; + + formState = { + location: initialLocation + }; + + return dialogService + .getUserInput(formStructure, formState) + .then(function (formState) { + return formState.location; + }); + } + }; + } + + return LocationService; + } +); diff --git a/platform/entanglement/src/services/MoveService.js b/platform/entanglement/src/services/MoveService.js new file mode 100644 index 0000000000..e91d381453 --- /dev/null +++ b/platform/entanglement/src/services/MoveService.js @@ -0,0 +1,83 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define */ + +define( + function () { + "use strict"; + + /** + * MoveService provides an interface for moving objects from one + * location to another. It also provides a method for determining if + * an object can be copied to a specific location. + */ + function MoveService(policyService, linkService) { + return { + /** + * Returns `true` if `object` can be moved into + * `parentCandidate`'s composition. + */ + validate: function (object, parentCandidate) { + var currentParent = object + .getCapability('context') + .getParent(); + + if (!parentCandidate || !parentCandidate.getId) { + return false; + } + if (parentCandidate.getId() === currentParent.getId()) { + return false; + } + if (parentCandidate.getId() === object.getId()) { + return false; + } + if (parentCandidate.getModel().composition.indexOf(object.getId()) !== -1) { + return false; + } + return policyService.allow( + "composition", + parentCandidate.getCapability('type'), + object.getCapability('type') + ); + }, + /** + * Move `object` into `parentObject`'s composition. + * + * @returns {Promise} A promise that is fulfilled when the + * move operation has completed. + */ + perform: function (object, parentObject) { + return linkService + .perform(object, parentObject) + .then(function () { + return object + .getCapability('action') + .perform('remove'); + }); + } + }; + } + + return MoveService; + } +); diff --git a/platform/entanglement/test/DomainObjectFactory.js b/platform/entanglement/test/DomainObjectFactory.js new file mode 100644 index 0000000000..3f62841e42 --- /dev/null +++ b/platform/entanglement/test/DomainObjectFactory.js @@ -0,0 +1,158 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define, jasmine, */ + +define( + function () { + "use strict"; + + /** + * @typedef DomainObjectConfig + * @type {object} + * @property {string} [name] a name for the underlying jasmine spy + * object mockDomainObject. Used as + * @property {string} [id] initial id value for the domainOBject. + * @property {object} [model] initial values for the object's model. + * @property {object} [capabilities] an object containing + * capability definitions. + */ + + var configObjectProps = ['model', 'capabilities']; + + /** + * Internal function for ensuring an object is an instance of a + * DomainObjectConfig. + */ + function ensureValidConfigObject(config) { + if (!config || !config.hasOwnProperty) { + config = {}; + } + if (!config.name) { + config.name = 'domainObject'; + } + configObjectProps.forEach(function (prop) { + if (!config[prop] || !config[prop].hasOwnProperty) { + config[prop] = {}; + } + }); + return config; + } + + /** + * Defines a factory function which takes a `config` object and returns + * a mock domainObject. The config object is an easy way to provide + * initial properties for the domainObject-- they can be changed at any + * time by directly modifying the domainObject's properties. + * + * @param {Object} [config] initial configuration for a domain object. + * @returns {Object} mockDomainObject + */ + function domainObjectFactory(config) { + config = ensureValidConfigObject(config); + + var domainObject = jasmine.createSpyObj(config.name, [ + 'getId', + 'getModel', + 'getCapability', + 'hasCapability', + 'useCapability' + ]); + + domainObject.model = JSON.parse(JSON.stringify(config.model)); + domainObject.capabilities = config.capabilities; + domainObject.id = config.id; + + /** + * getId: Returns `domainObject.id`. + * + * @returns {string} id + */ + domainObject.getId.andCallFake(function () { + return domainObject.id; + }); + + /** + * getModel: Returns `domainObject.model`. + * + * @returns {object} model + */ + domainObject.getModel.andCallFake(function () { + return domainObject.model; + }); + + /** + * getCapability: returns a `capability` object defined in + * domainObject.capabilities. Returns undefined if capability + * does not exist. + * + * @param {string} capability name of the capability to return. + * @returns {*} capability object + */ + domainObject.getCapability.andCallFake(function (capability) { + if (config.capabilities.hasOwnProperty(capability)) { + return config.capabilities[capability]; + } + }); + + /** + * hasCapability: return true if domainObject.capabilities has a + * property named `capability`, otherwise returns false. + * + * @param {string} capability name of the capability to test for + * existence of. + * @returns {boolean} + */ + domainObject.hasCapability.andCallFake(function (capability) { + return config.capabilities.hasOwnProperty(capability); + }); + + /** + * useCapability: find a capability in domainObject.capabilities + * and call that capabilities' invoke method. If the capability + * does not have an invoke method, will throw an error. + * + * @param {string} capability name of a capability to invoke. + * @param {...*} params to pass to the capability's `invoke` method. + * @returns {*} result whatever was returned by `invoke`. + */ + domainObject.useCapability.andCallFake(function (capability) { + if (config.capabilities.hasOwnProperty(capability)) { + if (!config.capabilities[capability].invoke) { + throw new Error( + capability + ' missing invoke function.' + ); + } + var passThroughArgs = [].slice.call(arguments, 1); + return config + .capabilities[capability] + .invoke + .apply(null, passThroughArgs); + } + }); + + return domainObject; + } + + return domainObjectFactory; + } +); \ No newline at end of file diff --git a/platform/entanglement/test/actions/CopyActionSpec.js b/platform/entanglement/test/actions/CopyActionSpec.js new file mode 100644 index 0000000000..4284a22e59 --- /dev/null +++ b/platform/entanglement/test/actions/CopyActionSpec.js @@ -0,0 +1,174 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,describe,beforeEach,it,jasmine,expect */ + +define( + [ + '../../src/actions/CopyAction', + '../services/MockCopyService', + '../DomainObjectFactory' + ], + function (CopyAction, MockCopyService, domainObjectFactory) { + "use strict"; + + describe("Copy Action", function () { + + var copyAction, + locationService, + locationServicePromise, + copyService, + context, + selectedObject, + selectedObjectContextCapability, + currentParent, + newParent; + + beforeEach(function () { + selectedObjectContextCapability = jasmine.createSpyObj( + 'selectedObjectContextCapability', + [ + 'getParent' + ] + ); + + selectedObject = domainObjectFactory({ + name: 'selectedObject', + model: { + name: 'selectedObject' + }, + capabilities: { + context: selectedObjectContextCapability + } + }); + + currentParent = domainObjectFactory({ + name: 'currentParent' + }); + + selectedObjectContextCapability + .getParent + .andReturn(currentParent); + + newParent = domainObjectFactory({ + name: 'newParent' + }); + + locationService = jasmine.createSpyObj( + 'locationService', + [ + 'getLocationFromUser' + ] + ); + + locationServicePromise = jasmine.createSpyObj( + 'locationServicePromise', + [ + 'then' + ] + ); + + locationService + .getLocationFromUser + .andReturn(locationServicePromise); + + copyService = new MockCopyService(); + }); + + + describe("with context from context-action", function () { + beforeEach(function () { + context = { + domainObject: selectedObject + }; + + copyAction = new CopyAction( + locationService, + copyService, + context + ); + }); + + it("initializes happily", function () { + expect(copyAction).toBeDefined(); + }); + + describe("when performed it", function () { + beforeEach(function () { + copyAction.perform(); + }); + + it("prompts for location", function () { + expect(locationService.getLocationFromUser) + .toHaveBeenCalledWith( + "Duplicate selectedObject to a location", + "Duplicate To", + jasmine.any(Function), + currentParent + ); + }); + + it("waits for location from user", function () { + expect(locationServicePromise.then) + .toHaveBeenCalledWith(jasmine.any(Function)); + }); + + it("copys object to selected location", function () { + locationServicePromise + .then + .mostRecentCall + .args[0](newParent); + + expect(copyService.perform) + .toHaveBeenCalledWith(selectedObject, newParent); + }); + }); + }); + + describe("with context from drag-drop", function () { + beforeEach(function () { + context = { + selectedObject: selectedObject, + domainObject: newParent + }; + + copyAction = new CopyAction( + locationService, + copyService, + context + ); + }); + + it("initializes happily", function () { + expect(copyAction).toBeDefined(); + }); + + + it("performs copy immediately", function () { + copyAction.perform(); + expect(copyService.perform) + .toHaveBeenCalledWith(selectedObject, newParent); + }); + }); + }); + } +); diff --git a/platform/entanglement/test/actions/LinkActionSpec.js b/platform/entanglement/test/actions/LinkActionSpec.js new file mode 100644 index 0000000000..03967a6672 --- /dev/null +++ b/platform/entanglement/test/actions/LinkActionSpec.js @@ -0,0 +1,174 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,describe,beforeEach,it,jasmine,expect */ + +define( + [ + '../../src/actions/LinkAction', + '../services/MockLinkService', + '../DomainObjectFactory' + ], + function (LinkAction, MockLinkService, domainObjectFactory) { + "use strict"; + + describe("Link Action", function () { + + var linkAction, + locationService, + locationServicePromise, + linkService, + context, + selectedObject, + selectedObjectContextCapability, + currentParent, + newParent; + + beforeEach(function () { + selectedObjectContextCapability = jasmine.createSpyObj( + 'selectedObjectContextCapability', + [ + 'getParent' + ] + ); + + selectedObject = domainObjectFactory({ + name: 'selectedObject', + model: { + name: 'selectedObject' + }, + capabilities: { + context: selectedObjectContextCapability + } + }); + + currentParent = domainObjectFactory({ + name: 'currentParent' + }); + + selectedObjectContextCapability + .getParent + .andReturn(currentParent); + + newParent = domainObjectFactory({ + name: 'newParent' + }); + + locationService = jasmine.createSpyObj( + 'locationService', + [ + 'getLocationFromUser' + ] + ); + + locationServicePromise = jasmine.createSpyObj( + 'locationServicePromise', + [ + 'then' + ] + ); + + locationService + .getLocationFromUser + .andReturn(locationServicePromise); + + linkService = new MockLinkService(); + }); + + + describe("with context from context-action", function () { + beforeEach(function () { + context = { + domainObject: selectedObject + }; + + linkAction = new LinkAction( + locationService, + linkService, + context + ); + }); + + it("initializes happily", function () { + expect(linkAction).toBeDefined(); + }); + + describe("when performed it", function () { + beforeEach(function () { + linkAction.perform(); + }); + + it("prompts for location", function () { + expect(locationService.getLocationFromUser) + .toHaveBeenCalledWith( + "Link selectedObject to a new location", + "Link To", + jasmine.any(Function), + currentParent + ); + }); + + it("waits for location from user", function () { + expect(locationServicePromise.then) + .toHaveBeenCalledWith(jasmine.any(Function)); + }); + + it("links object to selected location", function () { + locationServicePromise + .then + .mostRecentCall + .args[0](newParent); + + expect(linkService.perform) + .toHaveBeenCalledWith(selectedObject, newParent); + }); + }); + }); + + describe("with context from drag-drop", function () { + beforeEach(function () { + context = { + selectedObject: selectedObject, + domainObject: newParent + }; + + linkAction = new LinkAction( + locationService, + linkService, + context + ); + }); + + it("initializes happily", function () { + expect(linkAction).toBeDefined(); + }); + + + it("performs link immediately", function () { + linkAction.perform(); + expect(linkService.perform) + .toHaveBeenCalledWith(selectedObject, newParent); + }); + }); + }); + } +); diff --git a/platform/entanglement/test/actions/MoveActionSpec.js b/platform/entanglement/test/actions/MoveActionSpec.js new file mode 100644 index 0000000000..52a7c6e301 --- /dev/null +++ b/platform/entanglement/test/actions/MoveActionSpec.js @@ -0,0 +1,174 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,describe,beforeEach,it,jasmine,expect */ + +define( + [ + '../../src/actions/MoveAction', + '../services/MockMoveService', + '../DomainObjectFactory' + ], + function (MoveAction, MockMoveService, domainObjectFactory) { + "use strict"; + + describe("Move Action", function () { + + var moveAction, + locationService, + locationServicePromise, + moveService, + context, + selectedObject, + selectedObjectContextCapability, + currentParent, + newParent; + + beforeEach(function () { + selectedObjectContextCapability = jasmine.createSpyObj( + 'selectedObjectContextCapability', + [ + 'getParent' + ] + ); + + selectedObject = domainObjectFactory({ + name: 'selectedObject', + model: { + name: 'selectedObject' + }, + capabilities: { + context: selectedObjectContextCapability + } + }); + + currentParent = domainObjectFactory({ + name: 'currentParent' + }); + + selectedObjectContextCapability + .getParent + .andReturn(currentParent); + + newParent = domainObjectFactory({ + name: 'newParent' + }); + + locationService = jasmine.createSpyObj( + 'locationService', + [ + 'getLocationFromUser' + ] + ); + + locationServicePromise = jasmine.createSpyObj( + 'locationServicePromise', + [ + 'then' + ] + ); + + locationService + .getLocationFromUser + .andReturn(locationServicePromise); + + moveService = new MockMoveService(); + }); + + + describe("with context from context-action", function () { + beforeEach(function () { + context = { + domainObject: selectedObject + }; + + moveAction = new MoveAction( + locationService, + moveService, + context + ); + }); + + it("initializes happily", function () { + expect(moveAction).toBeDefined(); + }); + + describe("when performed it", function () { + beforeEach(function () { + moveAction.perform(); + }); + + it("prompts for location", function () { + expect(locationService.getLocationFromUser) + .toHaveBeenCalledWith( + "Move selectedObject to a new location", + "Move To", + jasmine.any(Function), + currentParent + ); + }); + + it("waits for location from user", function () { + expect(locationServicePromise.then) + .toHaveBeenCalledWith(jasmine.any(Function)); + }); + + it("moves object to selected location", function () { + locationServicePromise + .then + .mostRecentCall + .args[0](newParent); + + expect(moveService.perform) + .toHaveBeenCalledWith(selectedObject, newParent); + }); + }); + }); + + describe("with context from drag-drop", function () { + beforeEach(function () { + context = { + selectedObject: selectedObject, + domainObject: newParent + }; + + moveAction = new MoveAction( + locationService, + moveService, + context + ); + }); + + it("initializes happily", function () { + expect(moveAction).toBeDefined(); + }); + + + it("performs move immediately", function () { + moveAction.perform(); + expect(moveService.perform) + .toHaveBeenCalledWith(selectedObject, newParent); + }); + }); + }); + } +); diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js new file mode 100644 index 0000000000..6d7b1d5069 --- /dev/null +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -0,0 +1,272 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,describe,beforeEach,it,jasmine,expect,spyOn */ + +define( + [ + '../../src/services/CopyService', + '../DomainObjectFactory' + ], + function (CopyService, domainObjectFactory) { + "use strict"; + + function synchronousPromise(value) { + var promise = { + then: function (callback) { + return synchronousPromise(callback(value)); + } + }; + spyOn(promise, 'then').andCallThrough(); + return promise; + } + + describe("CopyService", function () { + describe("validate", function () { + + var policyService, + copyService, + object, + parentCandidate, + validate; + + beforeEach(function () { + policyService = jasmine.createSpyObj( + 'policyService', + ['allow'] + ); + copyService = new CopyService( + null, + null, + policyService + ); + object = domainObjectFactory({ + name: 'object', + capabilities: { + type: { type: 'object' } + } + }); + parentCandidate = domainObjectFactory({ + name: 'parentCandidate', + capabilities: { + type: { type: 'parentCandidate' } + } + }); + validate = function () { + return copyService.validate(object, parentCandidate); + }; + }); + + it("does not allow invalid parentCandidate", function () { + parentCandidate = undefined; + expect(validate()).toBe(false); + parentCandidate = {}; + expect(validate()).toBe(false); + }); + + it("does not allow copying into source object", function () { + object.id = parentCandidate.id = 'abc'; + expect(validate()).toBe(false); + }); + + describe("defers to policyService", function () { + beforeEach(function () { + object.id = 'a'; + parentCandidate.id = 'b'; + }); + + it("calls policy service with correct args", function () { + validate(); + expect(policyService.allow).toHaveBeenCalledWith( + "composition", + parentCandidate.capabilities.type, + object.capabilities.type + ); + }); + + it("and returns false", function () { + policyService.allow.andReturn(false); + expect(validate()).toBe(false); + }); + + it("and returns true", function () { + policyService.allow.andReturn(true); + expect(validate()).toBe(true); + }); + }); + }); + + describe("perform", function () { + + var mockQ, + creationService, + createObjectPromise, + copyService, + object, + newParent, + copyResult, + copyFinished; + + describe("on domain object without composition", function () { + beforeEach(function () { + object = domainObjectFactory({ + name: 'object', + id: 'abc', + model: { + name: 'some object' + } + }); + newParent = domainObjectFactory({ + name: 'newParent', + id: '456', + model: { + composition: [] + } + }); + creationService = jasmine.createSpyObj( + 'creationService', + ['createObject'] + ); + createObjectPromise = synchronousPromise(undefined); + creationService.createObject.andReturn(createObjectPromise); + copyService = new CopyService(null, creationService); + copyResult = copyService.perform(object, newParent); + copyFinished = jasmine.createSpy('copyFinished'); + copyResult.then(copyFinished); + }); + + it("uses creation service", function () { + expect(creationService.createObject) + .toHaveBeenCalledWith(jasmine.any(Object), newParent); + + expect(createObjectPromise.then) + .toHaveBeenCalledWith(jasmine.any(Function)); + }); + + it("deep clones object model", function () { + var newModel = creationService + .createObject + .mostRecentCall + .args[0]; + + expect(newModel).toEqual(object.model); + expect(newModel).not.toBe(object.model); + }); + + it("returns a promise", function () { + expect(copyResult).toBeDefined(); + expect(copyFinished).toHaveBeenCalled(); + }); + + }); + + describe("on domainObject with composition", function () { + var childObject, + compositionCapability, + compositionPromise; + + beforeEach(function () { + mockQ = jasmine.createSpyObj('mockQ', ['when']); + mockQ.when.andCallFake(synchronousPromise); + childObject = domainObjectFactory({ + name: 'childObject', + id: 'def', + model: { + name: 'a child object' + } + }); + compositionCapability = jasmine.createSpyObj( + 'compositionCapability', + ['invoke'] + ); + compositionPromise = jasmine.createSpyObj( + 'compositionPromise', + ['then'] + ); + compositionCapability + .invoke + .andReturn(compositionPromise); + object = domainObjectFactory({ + name: 'object', + id: 'abc', + model: { + name: 'some object', + composition: ['def'] + }, + capabilities: { + composition: compositionCapability + } + }); + newParent = domainObjectFactory({ + name: 'newParent', + id: '456', + model: { + composition: [] + } + }); + creationService = jasmine.createSpyObj( + 'creationService', + ['createObject'] + ); + createObjectPromise = synchronousPromise(undefined); + creationService.createObject.andReturn(createObjectPromise); + copyService = new CopyService(mockQ, creationService); + copyResult = copyService.perform(object, newParent); + copyFinished = jasmine.createSpy('copyFinished'); + copyResult.then(copyFinished); + }); + + it("uses creation service", function () { + expect(creationService.createObject) + .toHaveBeenCalledWith(jasmine.any(Object), newParent); + + expect(createObjectPromise.then) + .toHaveBeenCalledWith(jasmine.any(Function)); + }); + + it("clears model composition", function () { + var newModel = creationService + .createObject + .mostRecentCall + .args[0]; + + expect(newModel.composition.length).toBe(0); + expect(newModel.name).toBe('some object'); + }); + + it("recursively clones it's children", function () { + expect(creationService.createObject.calls.length).toBe(1); + expect(compositionCapability.invoke).toHaveBeenCalled(); + compositionPromise.then.mostRecentCall.args[0]([childObject]); + expect(creationService.createObject.calls.length).toBe(2); + }); + + it("returns a promise", function () { + expect(copyResult.then).toBeDefined(); + expect(copyFinished).toHaveBeenCalled(); + }); + }); + + }); + }); + } +); diff --git a/platform/entanglement/test/services/LinkServiceSpec.js b/platform/entanglement/test/services/LinkServiceSpec.js new file mode 100644 index 0000000000..0551256277 --- /dev/null +++ b/platform/entanglement/test/services/LinkServiceSpec.js @@ -0,0 +1,183 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,describe,beforeEach,it,jasmine,expect */ + +define( + [ + '../../src/services/LinkService', + '../DomainObjectFactory' + ], + function (LinkService, domainObjectFactory) { + "use strict"; + + describe("LinkService", function () { + + var linkService, + mockPolicyService; + + beforeEach(function () { + mockPolicyService = jasmine.createSpyObj( + 'policyService', + ['allow'] + ); + linkService = new LinkService(mockPolicyService); + }); + + describe("validate", function () { + + var object, + parentCandidate, + validate; + + beforeEach(function () { + + object = domainObjectFactory({ + name: 'object' + }); + parentCandidate = domainObjectFactory({ + name: 'parentCandidate' + }); + validate = function () { + return linkService.validate(object, parentCandidate); + }; + }); + + it("does not allow invalid parentCandidate", function () { + parentCandidate = undefined; + expect(validate()).toBe(false); + parentCandidate = {}; + expect(validate()).toBe(false); + }); + + it("does not allow parent to be object", function () { + parentCandidate.id = object.id = 'abc'; + expect(validate()).toBe(false); + }); + + it("does not allow parent that contains object", function () { + object.id = 'abc'; + parentCandidate.id = 'xyz'; + parentCandidate.model.composition = ['abc']; + expect(validate()).toBe(false); + }); + + describe("defers to policyService", function () { + beforeEach(function () { + object.id = 'abc'; + object.capabilities.type = { type: 'object' }; + parentCandidate.id = 'xyz'; + parentCandidate.capabilities.type = { + type: 'parentCandidate' + }; + parentCandidate.model.composition = []; + }); + + it("calls policy service with correct args", function () { + validate(); + expect(mockPolicyService.allow).toHaveBeenCalledWith( + "composition", + parentCandidate.capabilities.type, + object.capabilities.type + ); + }); + + it("and returns false", function () { + mockPolicyService.allow.andReturn(true); + expect(validate()).toBe(true); + expect(mockPolicyService.allow).toHaveBeenCalled(); + }); + + it("and returns true", function () { + mockPolicyService.allow.andReturn(false); + expect(validate()).toBe(false); + expect(mockPolicyService.allow).toHaveBeenCalled(); + }); + }); + }); + + describe("perform", function () { + + var object, + parentModel, + parentObject, + mutationPromise, + persistenceCapability; + + beforeEach(function () { + mutationPromise = jasmine.createSpyObj( + 'promise', + ['then'] + ); + persistenceCapability = jasmine.createSpyObj( + 'persistenceCapability', + ['persist'] + ); + parentModel = { + composition: [] + }; + parentObject = domainObjectFactory({ + name: 'parentObject', + model: parentModel, + capabilities: { + mutation: { + invoke: function (mutator) { + mutator(parentModel); + return mutationPromise; + } + }, + persistence: persistenceCapability + } + }); + + object = domainObjectFactory({ + name: 'object', + id: 'xyz' + }); + + parentObject.getCapability.andReturn(persistenceCapability); + }); + + + it("modifies parent model composition", function () { + expect(parentModel.composition.length).toBe(0); + linkService.perform(object, parentObject); + expect(parentObject.useCapability).toHaveBeenCalledWith( + 'mutation', + jasmine.any(Function) + ); + expect(parentModel.composition).toContain('xyz'); + }); + + it("persists parent", function () { + linkService.perform(object, parentObject); + expect(mutationPromise.then).toHaveBeenCalled(); + mutationPromise.then.calls[0].args[0](); + expect(parentObject.getCapability) + .toHaveBeenCalledWith('persistence'); + + expect(persistenceCapability.persist).toHaveBeenCalled(); + }); + }); + }); + } +); diff --git a/platform/entanglement/test/services/LocationServiceSpec.js b/platform/entanglement/test/services/LocationServiceSpec.js new file mode 100644 index 0000000000..c469392f23 --- /dev/null +++ b/platform/entanglement/test/services/LocationServiceSpec.js @@ -0,0 +1,151 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,describe,beforeEach,it,jasmine,expect */ + +define( + [ + '../../src/services/LocationService' + ], + function (LocationService) { + "use strict"; + + describe("LocationService", function () { + var dialogService, + locationService, + dialogServicePromise, + chainedPromise; + + beforeEach(function () { + dialogService = jasmine.createSpyObj( + 'dialogService', + ['getUserInput'] + ); + dialogServicePromise = jasmine.createSpyObj( + 'dialogServicePromise', + ['then'] + ); + chainedPromise = jasmine.createSpyObj( + 'chainedPromise', + ['then'] + ); + dialogServicePromise.then.andReturn(chainedPromise); + dialogService.getUserInput.andReturn(dialogServicePromise); + locationService = new LocationService(dialogService); + }); + + describe("getLocationFromUser", function () { + var title, + label, + validate, + initialLocation, + locationResult, + formStructure, + formState; + + beforeEach(function () { + title = "Get a location to do something"; + label = "a location"; + validate = function () { return true; }; + initialLocation = { key: "a key" }; + locationResult = locationService.getLocationFromUser( + title, + label, + validate, + initialLocation + ); + formStructure = dialogService + .getUserInput + .mostRecentCall + .args[0]; + formState = dialogService + .getUserInput + .mostRecentCall + .args[1]; + }); + + it("calls through to dialogService", function () { + expect(dialogService.getUserInput).toHaveBeenCalledWith( + jasmine.any(Object), + jasmine.any(Object) + ); + expect(formStructure.name).toBe(title); + }); + + it("returns a promise", function () { + expect(locationResult.then).toBeDefined(); + }); + + describe("formStructure", function () { + var locationSection, + inputRow; + + beforeEach(function () { + locationSection = formStructure.sections[0]; + inputRow = locationSection.rows[0]; + }); + + it("has a location section", function () { + expect(locationSection).toBeDefined(); + expect(locationSection.name).toBe('Location'); + }); + + it("has a input row", function () { + expect(inputRow.control).toBe('locator'); + expect(inputRow.key).toBe('location'); + expect(inputRow.name).toBe(label); + expect(inputRow.validate).toBe(validate); + }); + }); + + describe("formState", function () { + it("has an initial location", function () { + expect(formState.location).toBe(initialLocation); + }); + }); + + describe("resolution of dialog service promise", function () { + var resolution, + resolver, + dialogResult, + selectedLocation; + + beforeEach(function () { + resolver = + dialogServicePromise.then.mostRecentCall.args[0]; + + selectedLocation = { key: "i'm a location key" }; + dialogResult = { + location: selectedLocation + }; + + resolution = resolver(dialogResult); + }); + + it("returns selectedLocation", function () { + expect(resolution).toBe(selectedLocation); + }); + }); + }); + }); + } +); diff --git a/platform/entanglement/test/services/MockCopyService.js b/platform/entanglement/test/services/MockCopyService.js new file mode 100644 index 0000000000..0e7e3517f3 --- /dev/null +++ b/platform/entanglement/test/services/MockCopyService.js @@ -0,0 +1,99 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,jasmine */ + +define( + function () { + "use strict"; + + /** + * MockCopyService provides the same interface as the copyService, + * returning promises where it would normally do so. At it's core, + * it is a jasmine spy object, but it also tracks the promises it + * returns and provides shortcut methods for resolving those promises + * synchronously. + * + * Usage: + * + * ```javascript + * var copyService = new MockCopyService(); + * + * // validate is a standard jasmine spy. + * copyService.validate.andReturn(true); + * var isValid = copyService.validate(object, parentCandidate); + * expect(isValid).toBe(true); + * + * // perform returns promises and tracks them. + * var whenCopied = jasmine.createSpy('whenCopied'); + * copyService.perform(object, parentObject).then(whenCopied); + * expect(whenCopied).not.toHaveBeenCalled(); + * copyService.perform.mostRecentCall.resolve('someArg'); + * expect(whenCopied).toHaveBeenCalledWith('someArg'); + * ``` + */ + function MockCopyService() { + // track most recent call of a function, + // perform automatically returns + var mockCopyService = jasmine.createSpyObj( + 'MockCopyService', + [ + 'validate', + 'perform' + ] + ); + + mockCopyService.perform.andCallFake(function () { + var performPromise, + callExtensions, + spy; + + performPromise = jasmine.createSpyObj( + 'performPromise', + ['then'] + ); + + callExtensions = { + promise: performPromise, + resolve: function (resolveWith) { + performPromise.then.calls.forEach(function (call) { + call.args[0](resolveWith); + }); + } + }; + + spy = this.perform; + + Object.keys(callExtensions).forEach(function (key) { + spy.mostRecentCall[key] = callExtensions[key]; + spy.calls[spy.calls.length - 1][key] = callExtensions[key]; + }); + + return performPromise; + }); + + return mockCopyService; + } + + return MockCopyService; + } +); diff --git a/platform/entanglement/test/services/MockLinkService.js b/platform/entanglement/test/services/MockLinkService.js new file mode 100644 index 0000000000..58a82333d3 --- /dev/null +++ b/platform/entanglement/test/services/MockLinkService.js @@ -0,0 +1,99 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,jasmine */ + +define( + function () { + "use strict"; + + /** + * MockLinkService provides the same interface as the linkService, + * returning promises where it would normally do so. At it's core, + * it is a jasmine spy object, but it also tracks the promises it + * returns and provides shortcut methods for resolving those promises + * synchronously. + * + * Usage: + * + * ```javascript + * var linkService = new MockLinkService(); + * + * // validate is a standard jasmine spy. + * linkService.validate.andReturn(true); + * var isValid = linkService.validate(object, parentObject); + * expect(isValid).toBe(true); + * + * // perform returns promises and tracks them. + * var whenLinked = jasmine.createSpy('whenLinked'); + * linkService.perform(object, parentObject).then(whenLinked); + * expect(whenLinked).not.toHaveBeenCalled(); + * linkService.perform.mostRecentCall.resolve('someArg'); + * expect(whenLinked).toHaveBeenCalledWith('someArg'); + * ``` + */ + function MockLinkService() { + // track most recent call of a function, + // perform automatically returns + var mockLinkService = jasmine.createSpyObj( + 'MockLinkService', + [ + 'validate', + 'perform' + ] + ); + + mockLinkService.perform.andCallFake(function () { + var performPromise, + callExtensions, + spy; + + performPromise = jasmine.createSpyObj( + 'performPromise', + ['then'] + ); + + callExtensions = { + promise: performPromise, + resolve: function (resolveWith) { + performPromise.then.calls.forEach(function (call) { + call.args[0](resolveWith); + }); + } + }; + + spy = this.perform; + + Object.keys(callExtensions).forEach(function (key) { + spy.mostRecentCall[key] = callExtensions[key]; + spy.calls[spy.calls.length - 1][key] = callExtensions[key]; + }); + + return performPromise; + }); + + return mockLinkService; + } + + return MockLinkService; + } +); diff --git a/platform/entanglement/test/services/MockMoveService.js b/platform/entanglement/test/services/MockMoveService.js new file mode 100644 index 0000000000..52278a49d5 --- /dev/null +++ b/platform/entanglement/test/services/MockMoveService.js @@ -0,0 +1,99 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,jasmine */ + +define( + function () { + "use strict"; + + /** + * MockMoveService provides the same interface as the moveService, + * returning promises where it would normally do so. At it's core, + * it is a jasmine spy object, but it also tracks the promises it + * returns and provides shortcut methods for resolving those promises + * synchronously. + * + * Usage: + * + * ```javascript + * var moveService = new MockMoveService(); + * + * // validate is a standard jasmine spy. + * moveService.validate.andReturn(true); + * var isValid = moveService.validate(object, parentCandidate); + * expect(isValid).toBe(true); + * + * // perform returns promises and tracks them. + * var whenCopied = jasmine.createSpy('whenCopied'); + * moveService.perform(object, parentObject).then(whenCopied); + * expect(whenCopied).not.toHaveBeenCalled(); + * moveService.perform.mostRecentCall.resolve('someArg'); + * expect(whenCopied).toHaveBeenCalledWith('someArg'); + * ``` + */ + function MockMoveService() { + // track most recent call of a function, + // perform automatically returns + var mockMoveService = jasmine.createSpyObj( + 'MockMoveService', + [ + 'validate', + 'perform' + ] + ); + + mockMoveService.perform.andCallFake(function () { + var performPromise, + callExtensions, + spy; + + performPromise = jasmine.createSpyObj( + 'performPromise', + ['then'] + ); + + callExtensions = { + promise: performPromise, + resolve: function (resolveWith) { + performPromise.then.calls.forEach(function (call) { + call.args[0](resolveWith); + }); + } + }; + + spy = this.perform; + + Object.keys(callExtensions).forEach(function (key) { + spy.mostRecentCall[key] = callExtensions[key]; + spy.calls[spy.calls.length - 1][key] = callExtensions[key]; + }); + + return performPromise; + }); + + return mockMoveService; + } + + return MockMoveService; + } +); diff --git a/platform/entanglement/test/services/MoveServiceSpec.js b/platform/entanglement/test/services/MoveServiceSpec.js new file mode 100644 index 0000000000..d1ffb52bc1 --- /dev/null +++ b/platform/entanglement/test/services/MoveServiceSpec.js @@ -0,0 +1,189 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/*global define,describe,beforeEach,it,jasmine,expect */ +define( + [ + '../../src/services/MoveService', + '../services/MockLinkService', + '../DomainObjectFactory' + ], + function (MoveService, MockLinkService, domainObjectFactory) { + "use strict"; + + describe("MoveService", function () { + + var moveService, + policyService, + linkService; + + beforeEach(function () { + policyService = jasmine.createSpyObj( + 'policyService', + ['allow'] + ); + linkService = new MockLinkService(); + moveService = new MoveService(policyService, linkService); + }); + + describe("validate", function () { + var object, + objectContextCapability, + currentParent, + parentCandidate, + validate; + + beforeEach(function () { + + objectContextCapability = jasmine.createSpyObj( + 'objectContextCapability', + [ + 'getParent' + ] + ); + + object = domainObjectFactory({ + name: 'object', + id: 'a', + capabilities: { + context: objectContextCapability, + type: { type: 'object' } + } + }); + + currentParent = domainObjectFactory({ + name: 'currentParent', + id: 'b' + }); + + objectContextCapability.getParent.andReturn(currentParent); + + parentCandidate = domainObjectFactory({ + name: 'parentCandidate', + model: { composition: [] }, + id: 'c', + capabilities: { + type: { type: 'parentCandidate' } + } + }); + + validate = function () { + return moveService.validate(object, parentCandidate); + }; + }); + + it("does not allow an invalid parent", function () { + parentCandidate = undefined; + expect(validate()).toBe(false); + parentCandidate = {}; + expect(validate()).toBe(false); + }); + + it("does not allow moving to current parent", function () { + parentCandidate.id = currentParent.id = 'xyz'; + expect(validate()).toBe(false); + }); + + it("does not allow moving to self", function () { + object.id = parentCandidate.id = 'xyz'; + expect(validate()).toBe(false); + }); + + it("does not allow moving to the same location", function () { + object.id = 'abc'; + parentCandidate.model.composition = ['abc']; + expect(validate()).toBe(false); + }); + + describe("defers to policyService", function () { + + it("calls policy service with correct args", function () { + validate(); + expect(policyService.allow).toHaveBeenCalledWith( + "composition", + parentCandidate.capabilities.type, + object.capabilities.type + ); + }); + + it("and returns false", function () { + policyService.allow.andReturn(false); + expect(validate()).toBe(false); + }); + + it("and returns true", function () { + policyService.allow.andReturn(true); + expect(validate()).toBe(true); + }); + }); + }); + + describe("perform", function () { + + var object, + parentObject, + actionCapability; + + beforeEach(function () { + actionCapability = jasmine.createSpyObj( + 'actionCapability', + ['perform'] + ); + + object = domainObjectFactory({ + name: 'object', + capabilities: { + action: actionCapability + } + }); + + parentObject = domainObjectFactory({ + name: 'parentObject' + }); + + moveService.perform(object, parentObject); + }); + + it("links object to parentObject", function () { + expect(linkService.perform).toHaveBeenCalledWith( + object, + parentObject + ); + }); + + it("waits for result of link", function () { + expect(linkService.perform.mostRecentCall.promise.then) + .toHaveBeenCalledWith(jasmine.any(Function)); + }); + + it("removes object when link is completed", function () { + linkService.perform.mostRecentCall.resolve(); + expect(object.getCapability) + .toHaveBeenCalledWith('action'); + expect(actionCapability.perform) + .toHaveBeenCalledWith('remove'); + }); + + }); + }); + } +); diff --git a/platform/entanglement/test/suite.json b/platform/entanglement/test/suite.json new file mode 100644 index 0000000000..40c300e213 --- /dev/null +++ b/platform/entanglement/test/suite.json @@ -0,0 +1,9 @@ +[ + "actions/CopyAction", + "actions/LinkAction", + "actions/MoveAction", + "services/CopyService", + "services/LinkService", + "services/MoveService", + "services/LocationService" +] diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html index 3a4f78f6e0..0a42ba30fe 100644 --- a/platform/features/layout/res/templates/layout.html +++ b/platform/features/layout/res/templates/layout.html @@ -34,50 +34,62 @@ - - - - - - + --> - - - - + - diff --git a/platform/features/plot/bundle.json b/platform/features/plot/bundle.json index ab8cf89b7c..71479685e1 100644 --- a/platform/features/plot/bundle.json +++ b/platform/features/plot/bundle.json @@ -8,6 +8,7 @@ "glyph": "6", "templateUrl": "templates/plot.html", "needs": [ "telemetry" ], + "priority": "preferred", "delegation": true } ], diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 19e6f451a9..eb18ad5745 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -22,16 +22,16 @@ -
- + + > @@ -40,9 +40,9 @@
+ class="gl-plot-coords" + ng-if="subplot.isHovering() && subplot.getHoverCoordinates()" + > {{subplot.getHoverCoordinates()}}
@@ -75,8 +75,8 @@ ng-mouseenter="subplot.isHovering(true); representation.showControls = true;" ng-mouseleave="subplot.isHovering(false)"> - - + +
@@ -98,7 +98,7 @@ -
@@ -119,7 +119,7 @@ I -
@@ -127,7 +127,7 @@ {{plot.getMode().glyph}} {{plot.getMode().name}} - v + v
    diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html index 98e20c33f9..9a6f00510f 100644 --- a/platform/forms/res/templates/controls/color.html +++ b/platform/forms/res/templates/controls/color.html @@ -30,7 +30,7 @@ {{structure.text}} - v + v
    + ng-required='ngRequired || partiallyComplete'/> + ng-required='ngRequired || partiallyComplete'/> + ng-required='ngRequired || partiallyComplete'/> + ng-required='ngRequired || partiallyComplete'/> UTC diff --git a/platform/forms/res/templates/controls/menu-button.html b/platform/forms/res/templates/controls/menu-button.html index 0c829a039f..575084f35c 100644 --- a/platform/forms/res/templates/controls/menu-button.html +++ b/platform/forms/res/templates/controls/menu-button.html @@ -28,7 +28,7 @@ {{structure.text}} - v diff --git a/platform/forms/src/controllers/DateTimeController.js b/platform/forms/src/controllers/DateTimeController.js index bf122c3f9c..c026e98935 100644 --- a/platform/forms/src/controllers/DateTimeController.js +++ b/platform/forms/src/controllers/DateTimeController.js @@ -52,15 +52,51 @@ define( if (fullDateTime.isValid()) { $scope.ngModel[$scope.field] = fullDateTime.valueOf(); } + + // If anything is complete, say so in scope; there are + // ng-required usages that will update off of this (to + // allow datetime to be optional while still permitting + // incomplete input) + $scope.partiallyComplete = + Object.keys($scope.datetime).some(function (key) { + return $scope.datetime[key]; + }); + + // Treat empty input as an undefined value + if (!$scope.partiallyComplete) { + $scope.ngModel[$scope.field] = undefined; + } } + function updateDateTime(value) { + var m; + if (value !== undefined) { + m = moment.utc(value); + $scope.datetime = { + date: m.format(DATE_FORMAT), + hour: m.format("H"), + min: m.format("m"), + sec: m.format("s") + }; + } else { + $scope.datetime = {}; + } + } + + // ...and update form values when actual field in model changes + $scope.$watch("ngModel[field]", updateDateTime); + // Update value whenever any field changes. $scope.$watch("datetime.date", update); $scope.$watch("datetime.hour", update); $scope.$watch("datetime.min", update); $scope.$watch("datetime.sec", update); - $scope.datetime = {}; + // Initialize forms values + updateDateTime( + ($scope.ngModel && $scope.field) ? + $scope.ngModel[$scope.field] : undefined + ); } return DateTimeController; diff --git a/platform/forms/test/controllers/DateTimeControllerSpec.js b/platform/forms/test/controllers/DateTimeControllerSpec.js index e3e5c7b693..230d6a7a33 100644 --- a/platform/forms/test/controllers/DateTimeControllerSpec.js +++ b/platform/forms/test/controllers/DateTimeControllerSpec.js @@ -57,6 +57,49 @@ define( expect(mockScope.ngModel.test).toEqual(1417215313000); }); + it("reports when form input is partially complete", function () { + // This is needed to flag the control's state as invalid + // when it is partially complete without having it treated + // as required. + mockScope.ngModel = {}; + mockScope.field = "test"; + mockScope.datetime.date = "2014-332"; + mockScope.datetime.hour = 22; + mockScope.datetime.min = 55; + // mockScope.datetime.sec = 13; + + mockScope.$watch.mostRecentCall.args[1](); + + expect(mockScope.partiallyComplete).toBeTruthy(); + }); + + it("reports 'undefined' for empty input", function () { + mockScope.ngModel = { test: 12345 }; + mockScope.field = "test"; + mockScope.$watch.mostRecentCall.args[1](); + // Clear all inputs + mockScope.datetime = {}; + mockScope.$watch.mostRecentCall.args[1](); + + // Should have cleared out the time stamp + expect(mockScope.ngModel.test).toBeUndefined(); + }); + + it("initializes form fields with values from ng-model", function () { + mockScope.ngModel = { test: 1417215313000 }; + mockScope.field = "test"; + mockScope.$watch.calls.forEach(function (call) { + if (call.args[0] === 'ngModel[field]') { + call.args[1](mockScope.ngModel.test); + } + }); + expect(mockScope.datetime).toEqual({ + date: "2014-332", + hour: "22", + min: "55", + sec: "13" + }); + }); }); } -); \ No newline at end of file +); diff --git a/platform/persistence/elastic/bundle.json b/platform/persistence/elastic/bundle.json index 53f8571e1a..371b8aa17a 100644 --- a/platform/persistence/elastic/bundle.json +++ b/platform/persistence/elastic/bundle.json @@ -17,15 +17,18 @@ }, { "key": "ELASTIC_ROOT", - "value": "/elastic" + "value": "/elastic", + "priority": "fallback" }, { "key": "ELASTIC_PATH", - "value": "mct/domain_object" + "value": "mct/domain_object", + "priority": "fallback" }, { "key": "ELASTIC_INDICATOR_INTERVAL", - "value": 15000 + "value": 15000, + "priority": "fallback" } ], "indicators": [ diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index 3ff94ba974..25bee716cf 100644 --- a/platform/representation/src/gestures/DropGesture.js +++ b/platform/representation/src/gestures/DropGesture.js @@ -43,7 +43,7 @@ define( function DropGesture(dndService, $q, element, domainObject) { var actionCapability = domainObject.getCapability('action'), action; // Action for the drop, when it occurs - + function broadcastDrop(id, event) { // Find the relevant scope... var scope = element && element.scope && element.scope(), @@ -92,17 +92,24 @@ define( function drop(e) { var event = (e || {}).originalEvent || e, - id = event.dataTransfer.getData(GestureConstants.MCT_DRAG_TYPE); - - // Handle the drop; add the dropped identifier to the - // destination domain object's composition, and persist - // the change. - if (id) { - $q.when(action && action.perform()).then(function (result) { - broadcastDrop(id, event); - }); + id = event.dataTransfer.getData(GestureConstants.MCT_DRAG_TYPE), + domainObjectType = domainObject.getModel().type; + + // If currently in edit mode allow drag and drop gestures to the + // domain object. An exception to this is folders which have drop + // gestures in browse mode. + if (domainObjectType === 'folder' || domainObject.hasCapability('editor')) { + + // Handle the drop; add the dropped identifier to the + // destination domain object's composition, and persist + // the change. + if (id) { + $q.when(action && action.perform()).then(function (result) { + broadcastDrop(id, event); + }); + } } - + // TODO: Alert user if drag and drop is not allowed } // We can only handle drops if we have access to actions... diff --git a/platform/representation/test/gestures/DropGestureSpec.js b/platform/representation/test/gestures/DropGestureSpec.js index 023c37c86f..6481eefa32 100644 --- a/platform/representation/test/gestures/DropGestureSpec.js +++ b/platform/representation/test/gestures/DropGestureSpec.js @@ -131,8 +131,11 @@ define( expect(mockEvent.preventDefault).toHaveBeenCalled(); expect(mockEvent.dataTransfer.dropEffect).toBeDefined(); }); - - it("invokes compose on drop", function () { + + it("invokes compose on drop in edit mode", function () { + // Set the mockDomainObject to have the editor capability + mockDomainObject.hasCapability.andReturn(true); + callbacks.dragover(mockEvent); expect(mockAction.getActions).toHaveBeenCalledWith({ key: 'compose', @@ -141,9 +144,43 @@ define( callbacks.drop(mockEvent); expect(mockCompose.perform).toHaveBeenCalled(); }); + + + it("does not invoke compose on drop in browse mode for non-folders", function () { + // Set the mockDomainObject to not have the editor capability + mockDomainObject.hasCapability.andReturn(false); + // Set the mockDomainObject to not have a type of folder + mockDomainObject.getModel.andReturn({type: 'notAFolder'}); + + callbacks.dragover(mockEvent); + expect(mockAction.getActions).toHaveBeenCalledWith({ + key: 'compose', + selectedObject: mockDraggedObject + }); + callbacks.drop(mockEvent); + expect(mockCompose.perform).not.toHaveBeenCalled(); + }); + + + it("invokes compose on drop in browse mode for folders", function () { + // Set the mockDomainObject to not have the editor capability + mockDomainObject.hasCapability.andReturn(false); + // Set the mockDomainObject to have a type of folder + mockDomainObject.getModel.andReturn({type: 'folder'}); - - it("broadcasts drop position", function () { + callbacks.dragover(mockEvent); + expect(mockAction.getActions).toHaveBeenCalledWith({ + key: 'compose', + selectedObject: mockDraggedObject + }); + callbacks.drop(mockEvent); + expect(mockCompose.perform).toHaveBeenCalled(); + }); + + it("broadcasts drop position (in edit mode)", function () { + // Set the mockDomainObject to have the editor capability + mockDomainObject.hasCapability.andReturn(true); + testRect.left = 42; testRect.top = 36; mockEvent.pageX = 52; diff --git a/platform/telemetry/src/TelemetryFormatter.js b/platform/telemetry/src/TelemetryFormatter.js index 0bb13fbf6d..853db642d7 100644 --- a/platform/telemetry/src/TelemetryFormatter.js +++ b/platform/telemetry/src/TelemetryFormatter.js @@ -22,8 +22,8 @@ /*global define,moment*/ define( - ['../lib/moment.min.js'], - function () { + ['moment'], + function (moment) { "use strict"; // Date format to use for domain values; in particular, diff --git a/pom.xml b/pom.xml index 783cc8ce45..194594d6e6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd open-mct-web Open MCT Web - 0.7.0-SNAPSHOT + 0.7.1-SNAPSHOT war @@ -160,6 +160,8 @@ ${basedir} **/lib/** + app.js + node_modules/**/*