From c7b13b70d1e201c2beef6a502c9ef040e9cb3eab Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 11 May 2015 10:02:37 -0700 Subject: [PATCH 01/74] [Inspection] Begin decomposing bubble template WTD-884. --- platform/commonUI/inspect/bundle.json | 8 ++++++++ platform/commonUI/inspect/res/bubble.html | 9 +++++++++ platform/commonUI/inspect/res/table.html | 8 ++++++++ 3 files changed, 25 insertions(+) create mode 100644 platform/commonUI/inspect/res/bubble.html create mode 100644 platform/commonUI/inspect/res/table.html diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json index 16f2bdf89c..3f68d65311 100644 --- a/platform/commonUI/inspect/bundle.json +++ b/platform/commonUI/inspect/bundle.json @@ -16,6 +16,14 @@ "type": "infobubble", "key": "infobubble" } + ], + "containers": [ + { + "key": "bubble", + "templateUrl": "bubble.html", + "attributes": [ "bubbleTitle", "bubbleLayout" ], + "alias": "bubble" + } ] } } \ No newline at end of file diff --git a/platform/commonUI/inspect/res/bubble.html b/platform/commonUI/inspect/res/bubble.html new file mode 100644 index 0000000000..89a25054cf --- /dev/null +++ b/platform/commonUI/inspect/res/bubble.html @@ -0,0 +1,9 @@ +
+
+
+ {{bubble.bubbleTitle}} +
+ +
+
\ No newline at end of file diff --git a/platform/commonUI/inspect/res/table.html b/platform/commonUI/inspect/res/table.html new file mode 100644 index 0000000000..d498b41c85 --- /dev/null +++ b/platform/commonUI/inspect/res/table.html @@ -0,0 +1,8 @@ + + + + + +
{{property.name}} + {{property.value}} +
\ No newline at end of file From 2797af43e921250a446178a885557618a6532693 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 20 May 2015 09:00:16 -0700 Subject: [PATCH 02/74] [Configuration] Add server app Add server app which provides the ability to include/exclude bundles. WTD-1199. --- .gitignore | 3 +++ app.js | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 app.js 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..1361d637f0 --- /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 From 3ace850d31ffd539a514987e7ca627110d416694 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 19 May 2015 13:04:12 -0700 Subject: [PATCH 03/74] [Configuration] Use example persistence Use example persistence in open source friendly branch to avoid need for set up of ElasticSearch when running, WTD-1199. --- bundles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles.json b/bundles.json index 04515b1897..666e520854 100644 --- a/bundles.json +++ b/bundles.json @@ -15,8 +15,8 @@ "platform/features/scrolling", "platform/forms", "platform/persistence/queue", - "platform/persistence/elastic", "platform/policy", + "example/persistence", "example/generator" ] From 6ed14ed3a94b2bfab56d5ecbc569c2c16c793542 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 19 May 2015 13:06:34 -0700 Subject: [PATCH 04/74] [Configuration] Deprioritize default constants Mark ElasticSearch configuration constants as priority=fallback; these are intended to be specified/overridden on a per-deployment basis. WTD-1199. --- platform/persistence/elastic/bundle.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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": [ From a937a3193b494cb1542852633cf0bd0468a56e94 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 20 May 2015 09:57:04 -0700 Subject: [PATCH 05/74] [Windowing] Show title of navigated object Show title of navigated object in window, WTD-1200. --- platform/commonUI/browse/bundle.json | 6 ++ .../commonUI/browse/src/BrowseController.js | 1 + .../src/navigation/NavigationService.js | 10 ++-- .../browse/src/windowing/WindowTitler.js | 30 ++++++++++ .../test/navigation/NavigationServiceSpec.js | 10 ++++ platform/commonUI/browse/test/suite.json | 3 +- .../browse/test/windowing/WindowTitlerSpec.js | 59 +++++++++++++++++++ 7 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 platform/commonUI/browse/src/windowing/WindowTitler.js create mode 100644 platform/commonUI/browse/test/windowing/WindowTitlerSpec.js diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index ca7a4a41e3..ca3e4e8052 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -121,6 +121,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/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js index 0d0e07781c..822444a8d4 100644 --- a/platform/commonUI/browse/src/BrowseController.js +++ b/platform/commonUI/browse/src/BrowseController.js @@ -25,6 +25,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/navigation/NavigationService.js b/platform/commonUI/browse/src/navigation/NavigationService.js index 3f8e9f41ab..ba8d6fb439 100644 --- a/platform/commonUI/browse/src/navigation/NavigationService.js +++ b/platform/commonUI/browse/src/navigation/NavigationService.js @@ -24,10 +24,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..e1381c2f14 --- /dev/null +++ b/platform/commonUI/browse/src/windowing/WindowTitler.js @@ -0,0 +1,30 @@ +/*global define,Promise*/ + +define( + [], + function () { + "use strict"; + + /** + * + * @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/navigation/NavigationServiceSpec.js b/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js index ae757158b0..1bef7411a7 100644 --- a/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js +++ b/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js @@ -41,6 +41,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..cc08be51f8 --- /dev/null +++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js @@ -0,0 +1,59 @@ +/*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 From ce2b48981a65573dca42dead534a6fc3ae08859c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 20 May 2015 10:06:59 -0700 Subject: [PATCH 06/74] [Windowing] Add in-line documentation WTD-1200. --- platform/commonUI/browse/src/windowing/WindowTitler.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/browse/src/windowing/WindowTitler.js b/platform/commonUI/browse/src/windowing/WindowTitler.js index e1381c2f14..49a121df90 100644 --- a/platform/commonUI/browse/src/windowing/WindowTitler.js +++ b/platform/commonUI/browse/src/windowing/WindowTitler.js @@ -6,7 +6,8 @@ define( "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) { From 11ab4df159282e98ce0d871a04b8a27d4eed85f4 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 21 May 2015 20:47:49 -0700 Subject: [PATCH 07/74] [Configuration] Ignore node modules in build Ignore node modules and the top-level app.js when running JSLint for a Maven build; scope of this testing is client code. WTD-1199. --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 783cc8ce45..b8cc32ca06 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,8 @@ ${basedir} **/lib/** + app.js + node_modules/**/* From ac8fbb289eee94e9767d810504911d0d83c983f9 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 21 May 2015 21:25:50 -0700 Subject: [PATCH 08/74] [Info Bubble] Continue breaking down templates WTD-884. --- platform/commonUI/inspect/bundle.json | 10 ++++++++++ platform/commonUI/inspect/res/info-bubble.html | 7 +++++++ .../inspect/res/{table.html => info-table.html} | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 platform/commonUI/inspect/res/info-bubble.html rename platform/commonUI/inspect/res/{table.html => info-table.html} (78%) diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json index 3f68d65311..55e1c76767 100644 --- a/platform/commonUI/inspect/bundle.json +++ b/platform/commonUI/inspect/bundle.json @@ -17,6 +17,16 @@ "key": "infobubble" } ], + "templates": [ + { + "key": "info-table", + "templateUrl": "info-table.html" + }, + { + "key": "info-bubble", + "templateUrl": "info-bubble.html" + } + ], "containers": [ { "key": "bubble", 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/table.html b/platform/commonUI/inspect/res/info-table.html similarity index 78% rename from platform/commonUI/inspect/res/table.html rename to platform/commonUI/inspect/res/info-table.html index d498b41c85..ef737dd130 100644 --- a/platform/commonUI/inspect/res/table.html +++ b/platform/commonUI/inspect/res/info-table.html @@ -1,5 +1,5 @@ - + -
{{property.name}} {{property.value}} From 179b0b46e5cc8c83a0f9285b02d99b444f521fe4 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 11:49:02 -0700 Subject: [PATCH 09/74] [Info Bubble] Add info service Add service for showing informational bubbles, WTD-884. --- .../inspect/src/services/InfoService.js | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 platform/commonUI/inspect/src/services/InfoService.js diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js new file mode 100644 index 0000000000..f3ef365f7d --- /dev/null +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -0,0 +1,78 @@ +/*global define*/ + +define( + [], + function () { + "use strict"; + + var BUBBLE_TEMPLATE = "" + + "" + + ""; + + /** + * Displays informative content ("info bubbles") for the user. + * @constructor + */ + function InfoService($compile, $document, $window, $rootScope) { + var template = $compile(BUBBLE_TEMPLATE); + + function display(templateKey, title, content, position) { + var body = $document.find('body'), + scope = $rootScope.$new(), + winDim = [$window.innerWidth, $window.innerHeight], + goLeft = position[0] > (window[0] / 2), + goUp = position[1] > (window[1] / 2), + bubble; + + // Pass model & container parameters into the scope + scope.bubbleModel = content; + scope.bubbleLayout = (goUp ? 'arw-btm' : 'arw-top') + ' ' + + (goLeft ? 'arw-right' : 'arw-left'); + scope.bubbleTitle = title; + + // Create the context menu + bubble = template(scope); + + // Position the bubble + bubble.css('position', 'absolute'); + if (goLeft) { + bubble.css('right', (winDim[0] - position[0]) + 'px'); + } else { + bubble.css('left', position[0] + 'px'); + } + if (goUp) { + bubble.css('bottom', (winDim[1] - position[1]) + 'px'); + } else { + bubble.css('top', position[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; + } +); \ No newline at end of file From 05a78f70e390770cb77d7304d3750421a015f999 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 12:03:58 -0700 Subject: [PATCH 10/74] [Info Bubble] Begin adding info gesture Begin adding info gesture, which will attach info bubbles to representations of domain objects. WTD-884. --- platform/commonUI/inspect/bundle.json | 19 ++++++++ .../inspect/src/gestures/InfoGesture.js | 45 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 platform/commonUI/inspect/src/gestures/InfoGesture.js diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json index 55e1c76767..74fb65260e 100644 --- a/platform/commonUI/inspect/bundle.json +++ b/platform/commonUI/inspect/bundle.json @@ -34,6 +34,25 @@ "attributes": [ "bubbleTitle", "bubbleLayout" ], "alias": "bubble" } + ], + "gestures": [ + { + "key": "info", + "implementation": "gestures/InfoGesture.js", + "depends": [ "infoService" ] + } + ], + "services": [ + { + "key": "infoService", + "implementation": "services/InfoService.js", + "depends": [ + "$compile", + "$document", + "$window", + "$rootScope" + ] + } ] } } \ 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..dadd81e93d --- /dev/null +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -0,0 +1,45 @@ +/*global define*/ + +define( + [], + function () { + "use strict"; + + function InfoGesture(infoService, element, domainObject) { + var dismissBubble; + + function hideBubble() { + if (dismissBubble) { + dismissBubble(); + element.off('mouseleave', hideBubble); + dismissBubble = undefined; + } + } + + function showBubble(event) { + dismissBubble = infoService.display( + "info-table", + domainObject.getName(), + [ + { name: "ID", value: domainObject.getId() } + ], + [ event.clientX, event.clientY ] + ); + element.on('mouseleave', hideBubble); + } + + element.on('mouseenter', showBubble); + + return { + destroy: function () { + hideBubble(); + element.off('mouseenter', showBubble); + } + }; + } + + return InfoGesture; + + } + +); \ No newline at end of file From 35f4032ae8afdb4ddaef9a0e95a807799e99262d Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 12:28:58 -0700 Subject: [PATCH 11/74] [Info Bubble] Fix display issues Intermediary commit; fix some display issues with info bubbles, add some delay. WTD-884. --- platform/commonUI/inspect/bundle.json | 12 +++++- platform/commonUI/inspect/res/bubble.html | 4 +- .../inspect/src/gestures/InfoGesture.js | 38 ++++++++++++++----- .../inspect/src/services/InfoService.js | 15 +++++--- 4 files changed, 50 insertions(+), 19 deletions(-) diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json index 74fb65260e..08e7d75cb2 100644 --- a/platform/commonUI/inspect/bundle.json +++ b/platform/commonUI/inspect/bundle.json @@ -39,7 +39,11 @@ { "key": "info", "implementation": "gestures/InfoGesture.js", - "depends": [ "infoService" ] + "depends": [ + "$timeout", + "infoService", + "INFO_HOVER_DELAY" + ] } ], "services": [ @@ -53,6 +57,12 @@ "$rootScope" ] } + ], + "constants": [ + { + "key": "INFO_HOVER_DELAY", + "value": 500 + } ] } } \ No newline at end of file diff --git a/platform/commonUI/inspect/res/bubble.html b/platform/commonUI/inspect/res/bubble.html index 89a25054cf..07395447b1 100644 --- a/platform/commonUI/inspect/res/bubble.html +++ b/platform/commonUI/inspect/res/bubble.html @@ -1,9 +1,9 @@
-
{{bubble.bubbleTitle}}
- +
\ No newline at end of file diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index dadd81e93d..a1a83b92d8 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -5,8 +5,10 @@ define( function () { "use strict"; - function InfoGesture(infoService, element, domainObject) { - var dismissBubble; + function InfoGesture($timeout, infoService, DELAY, element, domainObject) { + var dismissBubble, + pendingBubble, + mousePosition; function hideBubble() { if (dismissBubble) { @@ -14,20 +16,36 @@ define( element.off('mouseleave', hideBubble); dismissBubble = undefined; } + if (pendingBubble) { + $timeout.cancel(pendingBubble); + pendingBubble = undefined; + } + mousePosition = undefined; + } + + function trackPosition(event) { + mousePosition = [ event.clientX, event.clientY ]; } function showBubble(event) { - dismissBubble = infoService.display( - "info-table", - domainObject.getName(), - [ - { name: "ID", value: domainObject.getId() } - ], - [ event.clientX, event.clientY ] - ); + trackPosition(event); + + pendingBubble = $timeout(function () { + dismissBubble = infoService.display( + "info-table", + domainObject.getModel().name, + [ + { name: "ID", value: domainObject.getId() } + ], + mousePosition + ); + pendingBubble = undefined; + }, DELAY); + element.on('mouseleave', hideBubble); } + element.on('mousemove', trackPosition); element.on('mouseenter', showBubble); return { diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js index f3ef365f7d..c2c0f996a7 100644 --- a/platform/commonUI/inspect/src/services/InfoService.js +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -5,20 +5,19 @@ define( function () { "use strict"; - var BUBBLE_TEMPLATE = "" + + "bubble-layout=\"{{bubbleLayout}}\">" + + "" + "" + - ""; + ""; /** * Displays informative content ("info bubbles") for the user. * @constructor */ function InfoService($compile, $document, $window, $rootScope) { - var template = $compile(BUBBLE_TEMPLATE); + var template; function display(templateKey, title, content, position) { var body = $document.find('body'), @@ -28,8 +27,12 @@ define( goUp = position[1] > (window[1] / 2), bubble; + // Lazily initialize template + template = template || $compile(BUBBLE_TEMPLATE); + // 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; From ab6a5afe93df81b2b8c0d384a27b81d862991430 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 12:50:09 -0700 Subject: [PATCH 12/74] [Info Bubble] Tweak positioning Tweak positioning of info bubbles, WTD-884. --- .../inspect/src/services/InfoService.js | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js index c2c0f996a7..ccba01b711 100644 --- a/platform/commonUI/inspect/src/services/InfoService.js +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -5,31 +5,28 @@ define( function () { "use strict"; - var BUBBLE_TEMPLATE = "
" + "" + "" + - "
"; + "", + OFFSET = [ 0, 16 ]; // Pixel offset for bubble, to align arrow position /** * Displays informative content ("info bubbles") for the user. * @constructor */ function InfoService($compile, $document, $window, $rootScope) { - var template; function display(templateKey, title, content, position) { var body = $document.find('body'), scope = $rootScope.$new(), winDim = [$window.innerWidth, $window.innerHeight], - goLeft = position[0] > (window[0] / 2), - goUp = position[1] > (window[1] / 2), + goLeft = position[0] > (winDim[0] / 2), + goUp = position[1] > (winDim[1] / 2), bubble; - // Lazily initialize template - template = template || $compile(BUBBLE_TEMPLATE); - // Pass model & container parameters into the scope scope.bubbleModel = content; scope.bubbleTemplate = templateKey; @@ -38,19 +35,19 @@ define( scope.bubbleTitle = title; // Create the context menu - bubble = template(scope); + bubble = $compile(BUBBLE_TEMPLATE)(scope); // Position the bubble bubble.css('position', 'absolute'); if (goLeft) { - bubble.css('right', (winDim[0] - position[0]) + 'px'); + bubble.css('right', (winDim[0] - position[0] + OFFSET[0]) + 'px'); } else { - bubble.css('left', position[0] + 'px'); + bubble.css('left', position[0] - OFFSET[0] + 'px'); } if (goUp) { - bubble.css('bottom', (winDim[1] - position[1]) + 'px'); + bubble.css('bottom', (winDim[1] - position[1] + OFFSET[1]) + 'px'); } else { - bubble.css('top', position[1] + 'px'); + bubble.css('top', position[1] - OFFSET[1] + 'px'); } // Add the menu to the body From eafaa04c063814b284b7b25b30706c7ad70e262f Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 12:51:42 -0700 Subject: [PATCH 13/74] [Info Bubble] Add info gestures Add info gestures to labels and grid items, WTD-884. --- platform/commonUI/browse/bundle.json | 3 ++- platform/commonUI/general/bundle.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index ca7a4a41e3..f95f908922 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", diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 70c80ad199..c367a73261 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -177,7 +177,7 @@ "key": "label", "templateUrl": "templates/label.html", "uses": [ "type" ], - "gestures": [ "drag", "menu" ] + "gestures": [ "drag", "menu", "info" ] }, { "key": "node", From d9a2a7f4c3d04a4d6b0ab3a16af3560391199a01 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 13:19:37 -0700 Subject: [PATCH 14/74] [Info Bubble] Refine positioning, add comments Refine positioning to behave correctly when mouse is on right and/or lower part of screen; listen for scope destruction to avoid cases where an element is removed before mouseleave is ever called. WTD-884. --- platform/commonUI/inspect/res/bubble.html | 2 +- .../inspect/src/gestures/InfoGesture.js | 23 +++++++++++++++++-- .../inspect/src/services/InfoService.js | 4 ++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/inspect/res/bubble.html b/platform/commonUI/inspect/res/bubble.html index 07395447b1..5090eb1199 100644 --- a/platform/commonUI/inspect/res/bubble.html +++ b/platform/commonUI/inspect/res/bubble.html @@ -1,4 +1,4 @@ -
+
diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index a1a83b92d8..584d45d40c 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -8,28 +8,37 @@ define( function InfoGesture($timeout, infoService, DELAY, element, domainObject) { var dismissBubble, pendingBubble, - mousePosition; + mousePosition, + scopeOff; 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); 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 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 showBubble(event) { trackPosition(event); + // 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", @@ -45,13 +54,23 @@ define( element.on('mouseleave', hideBubble); } - element.on('mousemove', trackPosition); + // Show bubble (on a timeout) on mouse over element.on('mouseenter', showBubble); + // Also need to track position during hover + element.on('mousemove', trackPosition); + + // Also make sure we dismiss bubble if representation is destroyed + // before the mouse actually leaves it + scopeOff = element.scope().$on('$destroy', hideBubble); + return { destroy: function () { + // Dismiss any active bubble... hideBubble(); + // ...and detach listeners element.off('mouseenter', showBubble); + scopeOff(); } }; } diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js index ccba01b711..f071bacad5 100644 --- a/platform/commonUI/inspect/src/services/InfoService.js +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -40,12 +40,12 @@ define( // Position the bubble bubble.css('position', 'absolute'); if (goLeft) { - bubble.css('right', (winDim[0] - position[0] + OFFSET[0]) + 'px'); + 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'); + bubble.css('bottom', (winDim[1] - position[1] - OFFSET[1]) + 'px'); } else { bubble.css('top', position[1] - OFFSET[1] + 'px'); } From 69dce9f88d412d60a136b77084a5ea43bb416a0b Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 13:25:39 -0700 Subject: [PATCH 15/74] [Info Bubble] Add clarifying comments Add clarifying comments for the info gesture, WTD-884. --- .../inspect/src/gestures/InfoGesture.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index 584d45d40c..e79c0b6c75 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -5,6 +5,18 @@ 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, @@ -65,6 +77,11 @@ define( 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(); From 219a6086d87f186ed2329fb3abe83bb3169aaaf3 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 22 May 2015 13:27:04 -0700 Subject: [PATCH 16/74] [Info Bubble] Remove placeholder type/view Remove Info Bubble as a type and view, which had been present for purposes of example during development. WTD-884. --- platform/commonUI/inspect/bundle.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json index 08e7d75cb2..07506d0983 100644 --- a/platform/commonUI/inspect/bundle.json +++ b/platform/commonUI/inspect/bundle.json @@ -1,22 +1,5 @@ { "extensions": { - "types": [ - { - "key": "infobubble", - "name": "Info Bubble", - "glyph": "\u00EA", - "description": "Static markup for info bubbles", - "features": [ "creation" ] - } - ], - "views": [ - { - "templateUrl": "infobubble.html", - "name": "Info Bubble", - "type": "infobubble", - "key": "infobubble" - } - ], "templates": [ { "key": "info-table", From b022babedbfdda965d78c9ef1c8f220a77069227 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 3 Jun 2015 10:23:49 -0700 Subject: [PATCH 17/74] Adding static-markup bundle. --- platform/features/static-markup/bundle.json | 21 ++++++++++++++++ .../features/static-markup/res/markup.html | 24 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 platform/features/static-markup/bundle.json create mode 100644 platform/features/static-markup/res/markup.html diff --git a/platform/features/static-markup/bundle.json b/platform/features/static-markup/bundle.json new file mode 100644 index 0000000000..e474df4888 --- /dev/null +++ b/platform/features/static-markup/bundle.json @@ -0,0 +1,21 @@ +{ + "extensions": { + "types": [ + { + "key": "static.markup", + "name": "Static Markup", + "glyph": "\u0070", + "description": "Static markup sandbox", + "features": [ "creation" ] + } + ], + "views": [ + { + "templateUrl": "markup.html", + "name": "Static Markup", + "type": "static.markup", + "key": "static.markup" + } + ] + } +} \ No newline at end of file diff --git a/platform/features/static-markup/res/markup.html b/platform/features/static-markup/res/markup.html new file mode 100644 index 0000000000..afd63850cd --- /dev/null +++ b/platform/features/static-markup/res/markup.html @@ -0,0 +1,24 @@ +

Static Markup Sandbox

+ +

Plot limits

+
+
+
+
+
+
+
+
+ +

Animation

+
This should pulse
\ No newline at end of file From 6fe6aacc388ee06c142c0348f77d4a703b449dcf Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 3 Jun 2015 10:25:37 -0700 Subject: [PATCH 18/74] Added open source comment --- .../features/static-markup/res/markup.html | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/platform/features/static-markup/res/markup.html b/platform/features/static-markup/res/markup.html index afd63850cd..3aad99ac01 100644 --- a/platform/features/static-markup/res/markup.html +++ b/platform/features/static-markup/res/markup.html @@ -1,3 +1,24 @@ +

Static Markup Sandbox

Plot limits

From 45568ecb215fc48d6e496a2690462e4f09d9b6db Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 2 Jun 2015 13:43:35 -0700 Subject: [PATCH 19/74] [Forms] Allow date-time controls to be optional Don't force date-time inputs to act as if they are required; allow them to be treated as optional, but enforce that this only occurs when left completely empty (as opposed to partially complete.) Supports WTD-1221. --- .../forms/res/templates/controls/datetime.html | 8 ++++---- .../forms/src/controllers/DateTimeController.js | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/platform/forms/res/templates/controls/datetime.html b/platform/forms/res/templates/controls/datetime.html index e2accf7c8f..6dae89eb8a 100644 --- a/platform/forms/res/templates/controls/datetime.html +++ b/platform/forms/res/templates/controls/datetime.html @@ -38,7 +38,7 @@ placeholder="YYYY-DDD" ng-pattern="/\d\d\d\d-\d\d\d/" ng-model='datetime.date' - ng-required='true'/> + ng-required='ngRequired || partiallyComplete'/> + ng-required='ngRequired || partiallyComplete'/> + ng-required='ngRequired || partiallyComplete'/> + ng-required='ngRequired || partiallyComplete'/> UTC diff --git a/platform/forms/src/controllers/DateTimeController.js b/platform/forms/src/controllers/DateTimeController.js index bf122c3f9c..530c966380 100644 --- a/platform/forms/src/controllers/DateTimeController.js +++ b/platform/forms/src/controllers/DateTimeController.js @@ -52,6 +52,20 @@ 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; + } } // Update value whenever any field changes. From 28805cd55c9d8e0ba35225d07b2151cad6110462 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 3 Jun 2015 10:05:39 -0700 Subject: [PATCH 20/74] [Forms] Add test cases to DateTimeController Add test cases for behavioral changes to DateTimeController, added for WTD-1221. --- .../controllers/DateTimeControllerSpec.js | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/platform/forms/test/controllers/DateTimeControllerSpec.js b/platform/forms/test/controllers/DateTimeControllerSpec.js index e3e5c7b693..11c97ada07 100644 --- a/platform/forms/test/controllers/DateTimeControllerSpec.js +++ b/platform/forms/test/controllers/DateTimeControllerSpec.js @@ -57,6 +57,33 @@ 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(); + }); }); } ); \ No newline at end of file From e45292172955b48ba7fd033039840ee0296b9982 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 3 Jun 2015 13:09:23 -0700 Subject: [PATCH 21/74] [Core] Revise explicit setting of modified timestamp Allow undefined as an explicit value for a domain object's modification timestamp (as set via the mutation capability.) Avoids a bug in minimal auto-refresh, being added for WTD-1221. --- platform/core/src/capabilities/MutationCapability.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 2648f0196635c6b9d306d63a92ff0ab266defe55 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 3 Jun 2015 13:46:25 -0700 Subject: [PATCH 22/74] [Composition] Disallow composition for leaf types Disallow composition for domain object types which will not have a composition property; WTD-1221. --- .../browse/src/creation/CreateWizard.js | 5 ++-- platform/containment/bundle.json | 5 ++++ .../containment/src/CompositionModelPolicy.js | 28 +++++++++++++++++++ .../test/CompositionModelPolicySpec.js | 26 +++++++++++++++++ .../test/CompositionMutabilityPolicySpec.js | 2 +- platform/containment/test/suite.json | 1 + 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 platform/containment/src/CompositionModelPolicy.js create mode 100644 platform/containment/test/CompositionModelPolicySpec.js 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/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" From fcd214ed60491f3b58741960e1c545c5d10cbf49 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 3 Jun 2015 14:20:45 -0700 Subject: [PATCH 23/74] [Forms] Show initial value in datetime control Initialize value for datetime control based on available data, and keep up-to-date with changes from UI. Supports clocks/timers, which use datetime as an entry field, WTD-1221. --- .../src/controllers/DateTimeController.js | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/platform/forms/src/controllers/DateTimeController.js b/platform/forms/src/controllers/DateTimeController.js index 530c966380..c026e98935 100644 --- a/platform/forms/src/controllers/DateTimeController.js +++ b/platform/forms/src/controllers/DateTimeController.js @@ -68,13 +68,35 @@ define( } } + 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; From 5f64e499f4a1985203db251dfc0bed07f67644c5 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 10:47:04 -0700 Subject: [PATCH 24/74] [Example] Work around JSLint JSLint doesn't like Express's use of static (a reserved word) as a method name, so change the way it's accessed. WTD-1199. --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 1361d637f0..4ebc9c3e94 100644 --- a/app.js +++ b/app.js @@ -55,7 +55,7 @@ }); // Expose everything else as static files - app.use(express.static('.')); + app.use(express['static']('.')); // Finally, open the HTTP server app.listen(options.port); From cd26d1284e68499604add2d6500b3450b7888512 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 12:09:30 -0700 Subject: [PATCH 25/74] [Info Bubble] Add metadata capability Add metadata capability, which will be used to populate contents of an info bubble. WTD-884. --- platform/core/bundle.json | 4 ++ .../src/capabilities/MetadataCapability.js | 62 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 platform/core/src/capabilities/MetadataCapability.js 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..680e8b9fb1 --- /dev/null +++ b/platform/core/src/capabilities/MetadataCapability.js @@ -0,0 +1,62 @@ +/*global define*/ + +define( + function () { + "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 + */ + + /** + * 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) { + return { + /** + * Get metadata about this object. + * @returns {MetadataProperty[]} metadata about this object + */ + invoke: function () { + var type = domainObject.getCapability('type'), + model = domainObject.getModel(), + metadata = [{ + name: "ID", + value: domainObject.getId() + }]; + + function addProperty(typeProperty) { + var name = typeProperty.getDefinition().name, + value = typeProperty.getValue(model); + if (typeof value === 'string' || + typeof value === 'number') { + metadata.push({ + name: name, + value: value + }); + } + } + + (type ? type.getProperties() : []).forEach(addProperty); + + return metadata; + } + }; + } + + return MetadataCapability; + } +); From 6622ca70316dd7af0ad5d4a8deaf1ff561723734 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 12:26:57 -0700 Subject: [PATCH 26/74] [Info Bubble] Add common properties to metadata Expose common properties (like time updated) from the metadata capability, to appear in the Info bubble. WTD-884. --- .../src/capabilities/MetadataCapability.js | 74 ++++++++++++------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/platform/core/src/capabilities/MetadataCapability.js b/platform/core/src/capabilities/MetadataCapability.js index 680e8b9fb1..f4b9061b8c 100644 --- a/platform/core/src/capabilities/MetadataCapability.js +++ b/platform/core/src/capabilities/MetadataCapability.js @@ -1,7 +1,8 @@ /*global define*/ define( - function () { + ['moment'], + function (moment) { "use strict"; /** @@ -12,6 +13,8 @@ define( * 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. @@ -25,35 +28,56 @@ define( * @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() { + return [ + { + name: "Updated", + value: formatTimestamp(model.modified) + }, + { + 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: function () { - var type = domainObject.getCapability('type'), - model = domainObject.getModel(), - metadata = [{ - name: "ID", - value: domainObject.getId() - }]; - - function addProperty(typeProperty) { - var name = typeProperty.getDefinition().name, - value = typeProperty.getValue(model); - if (typeof value === 'string' || - typeof value === 'number') { - metadata.push({ - name: name, - value: value - }); - } - } - - (type ? type.getProperties() : []).forEach(addProperty); - - return metadata; - } + invoke: getMetadata }; } From 11dc5f380cc153c6379139dd007aecc6cf746d7c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 12:30:18 -0700 Subject: [PATCH 27/74] [Info Bubble] Use domain object metadata Use domain object metadata to populate the info bubble from the info gesture, WTD-884. --- platform/commonUI/inspect/src/gestures/InfoGesture.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index e79c0b6c75..4ad39fb4e6 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -55,9 +55,7 @@ define( dismissBubble = infoService.display( "info-table", domainObject.getModel().name, - [ - { name: "ID", value: domainObject.getId() } - ], + domainObject.useCapability('metadata'), mousePosition ); pendingBubble = undefined; From c9e33b1d3188499342dd119aee91bfcc08901f83 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 12:32:37 -0700 Subject: [PATCH 28/74] [Info Bubble] Change moment import Change the path used to import moment for the telemetryFormatter. Previously, a relative path was used; since telemetryFormatter was initially implemented, however, moment has been made available as simply moment by require configuration changes elsewhere. Inconsistent usage of moment here can result in load timeouts under certain script load orderings. Changed in the context of WTD-884 (which does use moment elsewhere.) --- platform/telemetry/src/TelemetryFormatter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, From cae8372d340ba44924f10c2ea17c85a97c575735 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 12:34:56 -0700 Subject: [PATCH 29/74] [Info Bubble] Include type in common metadata Include type in common domain object metadata to display in an info bubble, WTD-884. --- platform/core/src/capabilities/MetadataCapability.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/core/src/capabilities/MetadataCapability.js b/platform/core/src/capabilities/MetadataCapability.js index f4b9061b8c..677dab0008 100644 --- a/platform/core/src/capabilities/MetadataCapability.js +++ b/platform/core/src/capabilities/MetadataCapability.js @@ -55,11 +55,17 @@ define( } 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() From 87e80e763c7c0fb29eda496e18f0a580977ea5ab Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 12:35:42 -0700 Subject: [PATCH 30/74] [Info Bubble] Include in set of active bundles Include the info bubble in the set of active bundles, WTD-884. --- bundles.json | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles.json b/bundles.json index 04515b1897..486d4cda5b 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", From 90ba93e3962da5ea795b2c31fb99c3c00fb331e8 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 14:16:23 -0700 Subject: [PATCH 31/74] [Info Bubble] Test metadata capability Test metadata capability, introduced to support info bubbles for domain objects, WTD-884. --- .../capabilities/MetadataCapabilitySpec.js | 101 ++++++++++++++++++ platform/core/test/suite.json | 1 + 2 files changed, 102 insertions(+) create mode 100644 platform/core/test/capabilities/MetadataCapabilitySpec.js diff --git a/platform/core/test/capabilities/MetadataCapabilitySpec.js b/platform/core/test/capabilities/MetadataCapabilitySpec.js new file mode 100644 index 0000000000..02316f609d --- /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"); + }); + + }); + } +); \ No newline at end of file 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", From 640b39e3a0988422e8468271fdca3c959c171346 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 16:27:41 -0700 Subject: [PATCH 32/74] [Info Bubble] Begin adding tests Begin adding tests for info bubble, WTD-884. --- .../inspect/src/gestures/InfoGesture.js | 20 ++--- .../inspect/test/gestures/InfoGestureSpec.js | 76 ++++++++++++++++++ .../inspect/test/services/InfoServiceSpec.js | 80 +++++++++++++++++++ platform/commonUI/inspect/test/suite.json | 4 + 4 files changed, 171 insertions(+), 9 deletions(-) create mode 100644 platform/commonUI/inspect/test/gestures/InfoGestureSpec.js create mode 100644 platform/commonUI/inspect/test/services/InfoServiceSpec.js create mode 100644 platform/commonUI/inspect/test/suite.json diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index 4ad39fb4e6..d39e59745c 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -23,6 +23,12 @@ define( 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) { @@ -33,6 +39,7 @@ define( // If a bubble will be shown on a timeout, cancel that if (pendingBubble) { $timeout.cancel(pendingBubble); + element.off('mousemove', trackPosition); pendingBubble = undefined; } // Also clear mouse position so we don't have a ton of tiny @@ -40,15 +47,12 @@ define( mousePosition = undefined; } - 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 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 () { @@ -58,6 +62,7 @@ define( domainObject.useCapability('metadata'), mousePosition ); + element.off('mousemove', trackPosition); pendingBubble = undefined; }, DELAY); @@ -67,9 +72,6 @@ define( // Show bubble (on a timeout) on mouse over element.on('mouseenter', showBubble); - // Also need to track position during hover - element.on('mousemove', trackPosition); - // Also make sure we dismiss bubble if representation is destroyed // before the mouse actually leaves it scopeOff = element.scope().$on('$destroy', hideBubble); diff --git a/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js new file mode 100644 index 0000000000..4b72d6ba6b --- /dev/null +++ b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.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,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, + gesture; + + beforeEach(function () { + mockTimeout = jasmine.createSpy('$timeout'); + 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'); + + mockElement.scope.andReturn(mockScope); + mockScope.$on.andReturn(mockOff); + + gesture = new InfoGesture( + mockTimeout, + mockInfoService, + testDelay, + mockElement, + mockDomainObject + ); + }); + + it("listens for mouseenter on the representation", function () { + expect(mockElement.on) + .toHaveBeenCalledWith('mouseenter', jasmine.any(Function)); + }); + + + }); + } +); \ No newline at end of file diff --git a/platform/commonUI/inspect/test/services/InfoServiceSpec.js b/platform/commonUI/inspect/test/services/InfoServiceSpec.js new file mode 100644 index 0000000000..68d34e7fe8 --- /dev/null +++ b/platform/commonUI/inspect/test/services/InfoServiceSpec.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*/ + +define( + ['../../src/services/InfoService'], + function (InfoService) { + "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(); + }); + + + }); + } +); \ No newline at end of file diff --git a/platform/commonUI/inspect/test/suite.json b/platform/commonUI/inspect/test/suite.json new file mode 100644 index 0000000000..1d0805c9a9 --- /dev/null +++ b/platform/commonUI/inspect/test/suite.json @@ -0,0 +1,4 @@ +[ + "gestures/InfoGesture", + "services/InfoService" +] \ No newline at end of file From 21c066e10fa3143345003b784e9d052cd20b94e6 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 16:38:55 -0700 Subject: [PATCH 33/74] [Info Bubble] Add test cases for infoService WTD-884. --- .../commonUI/inspect/src/InfoConstants.js | 32 +++++++++++ .../inspect/src/services/InfoService.js | 21 +++---- .../inspect/test/services/InfoServiceSpec.js | 55 ++++++++++++++++++- 3 files changed, 93 insertions(+), 15 deletions(-) create mode 100644 platform/commonUI/inspect/src/InfoConstants.js diff --git a/platform/commonUI/inspect/src/InfoConstants.js b/platform/commonUI/inspect/src/InfoConstants.js new file mode 100644 index 0000000000..c550c1a6c3 --- /dev/null +++ b/platform/commonUI/inspect/src/InfoConstants.js @@ -0,0 +1,32 @@ +/***************************************************************************** + * 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({ + BUBBLE_TEMPLATE: "" + + "" + + "" + + "", + // Pixel offset for bubble, to align arrow position + BUBBLE_OFFSET: [ 0, -16 ] +}); \ No newline at end of file diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js index f071bacad5..bbd23ed134 100644 --- a/platform/commonUI/inspect/src/services/InfoService.js +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -1,17 +1,12 @@ /*global define*/ define( - [], - function () { + ['../InfoConstants'], + function (InfoConstants) { "use strict"; - var BUBBLE_TEMPLATE = "" + - "" + - "" + - "", - OFFSET = [ 0, 16 ]; // Pixel offset for bubble, to align arrow position + var BUBBLE_TEMPLATE = InfoConstants.BUBBLE_TEMPLATE, + OFFSET = InfoConstants.BUBBLE_OFFSET; /** * Displays informative content ("info bubbles") for the user. @@ -40,14 +35,14 @@ define( // Position the bubble bubble.css('position', 'absolute'); if (goLeft) { - bubble.css('right', (winDim[0] - position[0] - OFFSET[0]) + 'px'); + bubble.css('right', (winDim[0] - position[0] + OFFSET[0]) + 'px'); } else { - bubble.css('left', position[0] - OFFSET[0] + 'px'); + bubble.css('left', position[0] + OFFSET[0] + 'px'); } if (goUp) { - bubble.css('bottom', (winDim[1] - position[1] - OFFSET[1]) + 'px'); + bubble.css('bottom', (winDim[1] - position[1] + OFFSET[1]) + 'px'); } else { - bubble.css('top', position[1] - OFFSET[1] + 'px'); + bubble.css('top', position[1] + OFFSET[1] + 'px'); } // Add the menu to the body diff --git a/platform/commonUI/inspect/test/services/InfoServiceSpec.js b/platform/commonUI/inspect/test/services/InfoServiceSpec.js index 68d34e7fe8..7cb3d62a1e 100644 --- a/platform/commonUI/inspect/test/services/InfoServiceSpec.js +++ b/platform/commonUI/inspect/test/services/InfoServiceSpec.js @@ -22,8 +22,8 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ['../../src/services/InfoService'], - function (InfoService) { + ['../../src/services/InfoService', '../../src/InfoConstants'], + function (InfoService, InfoConstants) { "use strict"; describe("The info service", function () { @@ -74,6 +74,57 @@ define( 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' + ); + }); + }); }); } From 1567c32993f8fb883372a73eaa2ce5fbbf7888df Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 4 Jun 2015 16:41:34 -0700 Subject: [PATCH 34/74] [Info Bubble] Add license headers Add license headers to scripts for info bubbles, WTD-884. --- .../inspect/src/gestures/InfoGesture.js | 21 +++++++++++++++++++ .../inspect/src/services/InfoService.js | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index d39e59745c..4ac4627bad 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -1,3 +1,24 @@ +/***************************************************************************** + * 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( diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js index bbd23ed134..3dd2d4985e 100644 --- a/platform/commonUI/inspect/src/services/InfoService.js +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -1,3 +1,24 @@ +/***************************************************************************** + * 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( From d2a75c43386958e21ff26d91e316bbd97616ea72 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 5 Jun 2015 06:31:23 -0700 Subject: [PATCH 35/74] [Info Bubble] Add test cases for gesture Add test cases for the info gesture, WTD-884. --- .../inspect/src/gestures/InfoGesture.js | 1 + .../inspect/test/gestures/InfoGestureSpec.js | 81 +++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index 4ac4627bad..44534c4b6d 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -61,6 +61,7 @@ define( 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 diff --git a/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js index 4b72d6ba6b..0cead9a4b3 100644 --- a/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js +++ b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js @@ -34,10 +34,22 @@ define( 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' ] @@ -52,9 +64,18 @@ define( ); 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, @@ -70,6 +91,66 @@ define( .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] + ); + }); + }); }); } From e21696172778523c41a035787dfd923977bf2b81 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 5 Jun 2015 16:48:58 -0700 Subject: [PATCH 36/74] Pulling in all sass, css, etc. and static-markup work from warp1222 so far --- platform/commonUI/general/res/css/forms.css | 2 +- platform/commonUI/general/res/css/items.css | 4 +- .../general/res/css/theme-espresso.css | 599 +++++++++++++----- platform/commonUI/general/res/css/tree.css | 2 +- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 10128 -> 10676 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 25 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 9964 -> 10512 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 7036 -> 7308 bytes .../commonUI/general/res/sass/_constants.scss | 19 +- .../commonUI/general/res/sass/_effects.scss | 4 +- .../commonUI/general/res/sass/_global.scss | 7 + platform/commonUI/general/res/sass/_main.scss | 1 + .../commonUI/general/res/sass/_mixins.scss | 25 + .../general/res/sass/controls/_buttons.scss | 52 +- .../general/res/sass/features/_imagery.scss | 166 +++++ .../general/res/sass/helpers/_bubbles.scss | 104 ++- .../commonUI/general/res/sass/tree/_tree.scss | 2 +- .../res/sass/user-environ/_layout.scss | 30 +- .../features/static-markup/res/markup.html | 136 +++- 19 files changed, 942 insertions(+), 236 deletions(-) create mode 100644 platform/commonUI/general/res/sass/features/_imagery.scss diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 113a906725..903a2694f0 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -374,7 +374,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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-size: 100%; diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 92d6f49101..875fe8488f 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -119,7 +119,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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-size: 100%; @@ -210,7 +210,7 @@ background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #80dfff; } - /* line 156, ../sass/_mixins.scss */ + /* line 181, ../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-size: 100%; diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index c3dd06eed9..0a8a992ab4 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -217,17 +217,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 */ @@ -235,9 +235,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; @@ -367,7 +367,12 @@ span { .hidden { display: none !important; } -/* line 120, ../sass/_global.scss */ +/* line 121, ../sass/_global.scss */ +.paused:not(.s-btn):not(.s-icon-btn) { + border-color: #c56f01 !important; + color: #c56f01 !important; } + +/* line 127, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -466,27 +471,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 { @@ -494,42 +495,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; @@ -540,103 +541,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; } @@ -1042,7 +1043,7 @@ span { display: inline-block; font-size: 1rem; vertical-align: middle; } - /* line 200, ../sass/_mixins.scss */ + /* line 225, ../sass/_mixins.scss */ .invoke-menu:hover { color: #33ccff; } @@ -1054,7 +1055,7 @@ span { /* line 70, ../sass/_icons.scss */ .icon-buttons-main .invoke-menu { color: #666666; } - /* line 200, ../sass/_mixins.scss */ + /* line 225, ../sass/_mixins.scss */ .icon-buttons-main .invoke-menu:hover { color: #999999; } @@ -1343,7 +1344,7 @@ span { cursor: pointer; } /*********************************** STYLE STYLES */ -/* line 31, ../sass/controls/_buttons.scss */ +/* line 30, ../sass/controls/_buttons.scss */ .s-btn, .s-icon-btn { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1353,9 +1354,8 @@ span { box-sizing: border-box; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; line-height: 1.2em; - padding: 0 10px; text-decoration: none; } - /* line 39, ../sass/controls/_buttons.scss */ + /* line 36, ../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=='); background-size: 100%; @@ -1376,7 +1376,7 @@ span { border-top: 1px solid #666666; color: #999; display: inline-block; } - /* line 103, ../sass/_mixins.scss */ + /* line 128, ../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=='); background-size: 100%; @@ -1384,34 +1384,102 @@ span { background-image: -moz-linear-gradient(#666666, #595959); background-image: -webkit-linear-gradient(#666666, #595959); background-image: linear-gradient(#666666, #595959); } + /* line 38, ../sass/controls/_buttons.scss */ + .s-btn.s-very-subtle.paused, .s-very-subtle.paused.s-icon-btn { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y4OGMwMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2RlN2QwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f88c01), color-stop(100%, #de7d01)); + background-image: -moz-linear-gradient(#f88c01, #de7d01); + background-image: -webkit-linear-gradient(#f88c01, #de7d01); + background-image: linear-gradient(#f88c01, #de7d01); + -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 #fea32e; + color: #fff; + display: inline-block; } + /* line 128, ../sass/_mixins.scss */ + .s-btn.s-very-subtle.paused:hover, .s-very-subtle.paused.s-icon-btn:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlYTMyZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fea32e), color-stop(100%, #fe9815)); + background-image: -moz-linear-gradient(#fea32e, #fe9815); + background-image: -webkit-linear-gradient(#fea32e, #fe9815); + background-image: linear-gradient(#fea32e, #fe9815); } + /* line 40, ../sass/controls/_buttons.scss */ + .s-btn.s-very-subtle.paused .icon:before, .s-very-subtle.paused.s-icon-btn .icon:before { + content: "\0000EF"; } -/* line 44, ../sass/controls/_buttons.scss */ +/* line 47, ../sass/controls/_buttons.scss */ .s-icon-btn { font-size: 1.2em; } - /* line 47, ../sass/controls/_buttons.scss */ + /* line 50, ../sass/controls/_buttons.scss */ .s-icon-btn .icon { color: #0099cc; } - /* line 51, ../sass/controls/_buttons.scss */ - .s-icon-btn:not(.disabled):hover .icon { + /* line 54, ../sass/controls/_buttons.scss */ + .s-icon-btn.paused .icon { + color: #fff; } + /* line 62, ../sass/controls/_buttons.scss */ + .s-icon-btn:not(.disabled):not(.paused):hover .icon { color: #33ccff; } - /* line 55, ../sass/controls/_buttons.scss */ + /* line 69, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled { - padding: 0 5px; } - /* line 57, ../sass/controls/_buttons.scss */ + padding: 0 3.75px; } + /* line 71, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled .icon { font-size: 1.5em; } - /* line 60, ../sass/controls/_buttons.scss */ + /* line 74, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled .title-label { margin-left: 5px; } + /* line 80, ../sass/controls/_buttons.scss */ + .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 83, ../sass/controls/_buttons.scss */ + .s-icon-btn.pause-play .icon:before { + content: "\0000F1"; } + /* line 89, ../sass/controls/_buttons.scss */ + .s-icon-btn.show-thumbs .icon:before { + content: "\000039"; } /*********************************** LAYOUT STYLES */ -/* line 68, ../sass/controls/_buttons.scss */ +/* line 96, ../sass/controls/_buttons.scss */ span.l-btn, span.l-btn span, a.l-btn, a.l-btn span { display: inline-block; } +/* line 103, ../sass/controls/_buttons.scss */ +.l-btn { + padding: 0 7.5px; } + /* line 105, ../sass/controls/_buttons.scss */ + .l-btn.sm { + padding: 0 5px; } + /* line 108, ../sass/controls/_buttons.scss */ + .l-btn.vsm { + padding: 0 2.5px; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1640,7 +1708,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #ccf2ff; } - /* line 156, ../sass/_mixins.scss */ + /* line 181, ../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%; @@ -1676,7 +1744,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#4dd2ff, #00ace6); background-image: linear-gradient(#4dd2ff, #00ace6); color: #ccf2ff; } - /* line 156, ../sass/_mixins.scss */ + /* line 181, ../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%; @@ -1714,7 +1782,7 @@ a.l-btn span { border-top: 1px solid #999999; color: #cccccc; display: inline-block; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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%; @@ -1743,7 +1811,7 @@ a.l-btn span { border-top: 1px solid #666666; color: #b3b3b3; display: inline-block; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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%; @@ -1946,7 +2014,7 @@ label.checkbox.custom { display: inline-block; height: 20px; line-height: 20px; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2100,7 +2168,7 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2108,7 +2176,7 @@ label.checkbox.custom { 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 */ + /* line 145, ../sass/_mixins.scss */ .slider .knob:before { content: ''; display: block; @@ -2119,7 +2187,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 166, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } /* line 466, ../sass/controls/_controls.scss */ @@ -2283,7 +2351,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 208, ../sass/_mixins.scss */ + /* line 233, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2448,6 +2516,171 @@ label.checkbox.custom { right: 0; width: auto; } +/* 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 { + bottom: 178px; + min-height: 100px; + min-width: 150px; } + /* line 16, ../sass/features/_imagery.scss */ + .l-image-main-wrapper .l-image-main { + background-color: rgba(255, 255, 255, 0.1); + bottom: 25px; } + /* line 20, ../sass/features/_imagery.scss */ + .l-image-main-wrapper .l-image-main-controlbar { + top: auto; + height: 20px; } + +/* line 26, ../sass/features/_imagery.scss */ +.l-image-thumbs-wrapper { + top: auto; + height: 168px; } + +/* line 32, ../sass/features/_imagery.scss */ +.l-date, +.l-time, +.l-timezone { + display: inline-block; } + +/*************************************** MAIN IMAGE */ +/* line 40, ../sass/features/_imagery.scss */ +.l-image-main, +.l-image-thumb-item .l-thumb { + background-size: contain; + background-position: center; + background-repeat: no-repeat; } + +/* line 47, ../sass/features/_imagery.scss */ +.l-image-main-controlbar { + font-size: 0.8em; + line-height: 20px; } + /* line 51, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .left, .l-image-main-controlbar .right { + direction: rtl; + overflow: hidden; } + /* line 55, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .left { + text-align: left; + width: 75% !important; } + /* line 60, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .right { + min-width: 40px; + width: 25% !important; + z-index: 2; } + /* line 66, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-date, + .l-image-main-controlbar .l-time { + color: #fff; } + /* line 70, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-mag { + direction: ltr; + display: inline-block; } + /* line 74, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-mag:before { + content: "\000058"; } + /* line 78, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .s-mag { + color: #666666; } + /* line 81, ../sass/features/_imagery.scss */ + .l-image-main-controlbar .l-btn.show-thumbs { + display: none; } + +/* line 86, ../sass/features/_imagery.scss */ +.s-image-main { + border: 1px solid transparent; } + /* line 88, ../sass/features/_imagery.scss */ + .s-image-main.paused { + border-color: #c56f01; } + +/*************************************** THUMBS */ +/* line 98, ../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 108, ../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 113, ../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 118, ../sass/features/_imagery.scss */ + .l-image-thumb-item .l-date, + .l-image-thumb-item .l-time { + padding: 2px 3px; } + /* line 130, ../sass/features/_imagery.scss */ + .l-image-thumb-item:hover { + background: rgba(255, 255, 255, 0.2); } + /* line 132, ../sass/features/_imagery.scss */ + .l-image-thumb-item:hover .l-date, + .l-image-thumb-item:hover .l-time { + color: #fff; } + /* line 137, ../sass/features/_imagery.scss */ + .l-image-thumb-item.selected { + background: #005177; } + /* line 139, ../sass/features/_imagery.scss */ + .l-image-thumb-item.selected .l-date, + .l-image-thumb-item.selected .l-time { + color: #fff; } + /* line 144, ../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 154, ../sass/features/_imagery.scss */ +.frame .t-imagery .l-image-main-wrapper { + bottom: 0; } + /* line 156, ../sass/features/_imagery.scss */ + .frame .t-imagery .l-image-main-wrapper .l-image-main-controlbar { + font-size: 0.7em; } + /* line 159, ../sass/features/_imagery.scss */ + .frame .t-imagery .l-image-main-wrapper .l-btn.show-thumbs { + display: inline-block; } +/* line 163, ../sass/features/_imagery.scss */ +.frame .t-imagery .l-image-thumbs-wrapper { + display: none; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2769,7 +3002,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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-size: 100%; @@ -3699,106 +3932,168 @@ input[type="text"] { * 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 */ -.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; +/* line 24, ../sass/helpers/_bubbles.scss */ +.l-bubble-wrapper { position: absolute; z-index: 70; } - /* line 32, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble { - display: inline-block; - max-width: 250px; + /* line 27, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-bubble { padding: 5px 10px; } - /* line 36, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble:before { + /* line 29, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-bubble .l-btn.close { + padding: 0 2px; + position: absolute; + right: 5px; + top: 5px; } + /* line 36, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .arw { + position: absolute; } + /* line 38, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .arw.arw-up { + bottom: 100%; } + /* line 42, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .arw.arw-down { + top: 100%; } + /* line 47, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble { + display: inline-block; + max-width: 250px; } + /* line 51, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble:before { content: ""; position: absolute; width: 0; height: 0; } - /* line 42, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table { + /* line 57, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table { width: 100%; } - /* line 45, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td { + /* line 60, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td { padding: 2px 0; vertical-align: top; } - /* line 52, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td.label { + /* line 67, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td.label { padding-right: 10px; white-space: nowrap; } - /* line 56, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td.value { + /* line 71, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td.value { white-space: nowrap; } - /* line 60, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td.align-wrap { + /* line 75, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td.align-wrap { white-space: normal; } - /* line 66, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble .title { + /* line 81, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 5px; } - /* line 73, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-left { - margin-left: 10px; } - /* line 75, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-left .l-infobubble::before { + /* line 88, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper.arw-left { + margin-left: 20px; } + /* line 90, ../sass/helpers/_bubbles.scss */ + .l-bubble-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 */ - .l-infobubble-wrapper.arw-right { - margin-right: 10px; } - /* line 85, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-right .l-infobubble::before { + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-right: 10px solid #ddd; } + /* line 96, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper.arw-right { + margin-right: 20px; } + /* line 98, ../sass/helpers/_bubbles.scss */ + .l-bubble-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 */ - .l-infobubble-wrapper.arw-top .l-infobubble::before { - top: 10px; } - /* line 100, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-btm .l-infobubble::before { - bottom: 10px; } + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-left: 10px solid #ddd; } /* line 105, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-down { - margin-bottom: 10px; } - /* line 107, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-down .l-infobubble::before { - left: 50%; - top: 100%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 7.5px solid #ddd; } + .l-bubble-wrapper.arw-top .l-infobubble::before { + top: 20px; } + /* line 111, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper.arw-btm .l-infobubble::before { + bottom: 20px; } -/* line 120, ../sass/helpers/_bubbles.scss */ -.s-infobubble { +/* line 121, ../sass/helpers/_bubbles.scss */ +.l-thumbsbubble-wrapper { + position: absolute; + height: 183px; + width: 100%; } + /* line 126, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper .l-thumbsbubble { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; } + /* line 128, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper .l-thumbsbubble .l-image-thumbs-wrapper { + height: auto; + top: 5px !important; + right: 25px; + bottom: 5px !important; + left: 5px; } + /* line 133, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper .arw { + z-index: 2; } + /* line 138, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper.arw-up .arw.arw-down, .l-thumbsbubble-wrapper.arw-down .arw.arw-up { + display: none; } + +/* line 148, ../sass/helpers/_bubbles.scss */ +.s-bubble { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; + -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; } + +/* line 154, ../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 157, ../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 161, ../sass/helpers/_bubbles.scss */ +.s-infobubble { background: #ddd; color: #666; font-size: 0.8rem; } - /* line 126, ../sass/helpers/_bubbles.scss */ + /* line 166, ../sass/helpers/_bubbles.scss */ .s-infobubble .title { color: #333333; font-weight: bold; } - /* line 131, ../sass/helpers/_bubbles.scss */ + /* line 171, ../sass/helpers/_bubbles.scss */ .s-infobubble tr td { border-top: 1px solid #c4c4c4; font-size: 0.9em; } - /* line 135, ../sass/helpers/_bubbles.scss */ + /* line 175, ../sass/helpers/_bubbles.scss */ .s-infobubble tr:first-child td { border-top: none; } - /* line 139, ../sass/helpers/_bubbles.scss */ + /* line 179, ../sass/helpers/_bubbles.scss */ .s-infobubble .value { color: #333333; } +/* line 184, ../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 @@ -3849,7 +4144,7 @@ input[type="text"] { right: 0; width: auto; height: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 145, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -3860,7 +4155,7 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 166, ../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 */ @@ -3878,7 +4173,7 @@ input[type="text"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 145, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -3889,7 +4184,7 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 166, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index d39b47ef87..90e1957f25 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -86,7 +86,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 208, ../sass/_mixins.scss */ + /* line 233, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index bf781e614b96301d24eab919599f4d9f837a127b..8d889083969641eaa461262406f3449d9ba29a29 100644 GIT binary patch delta 1265 zcmah{Z)j6j6hHUAKl$_07h__xnye;Go7hIIOKlVSXI61DbTFmaq|4THiET}twW&H& zbrO^z>jpaeWU?{FR!SJc_9e0v5~TP+M%N2U+vfN zq39q#)A$4W3W&Bi5}E__3GTI^T^}DkJ&`h>hXo{N5g#2NI}$zf-ib$;Ue6VcJ3ZyoeU+h$;*xjTLoK~%0=G4W&Q<0<+LDM`~bO=(%` zVUpGo29{uemT_GNa?%{L&H4npq8!E!EGVUSf&(>CT45TvGAzT2WM_A<@HZ+!wnJ2ZDcVH4>0vrZPtq@Go~|&pOdpeGZZid@ z!18Q6JItopJO|v%+-2@2m*@5TKK>H_J^xTst*O_9HRm*QT3+kZPHFGxw7Q+T{kpjB zL)~57@A}R99{p$fWuaQA7Y2pvLS85cB||6veTFlJD~8*KLY0fJYO0#4dL)8aE!K-Z zF(@7ukBMK2d2z|8H3p1_jE6EY{yQdB!k!pm8#KcnY@&ttk~()6+1=JbeAQdH=j{LW z2W^(3#b!67AZb-cVYbU*bx{eDR^3na`6i2P!=-X|^J-!(#j_rO%p3Yk;x1ao;W3~A z0gvl!b(+>d%d4gh(3YI+&C1>!WcZp-bSY)FIDNXPycLs<(9-H=x+qV|A0rI|D5loZ z0x`KvP6V;#Fv~_t^_Ahv!8j8*vAC;_e-VYd)wH{<#fjarB1{(E4b@&ncSxhuiOW)0UB*VZWPfRj8cbBQGe55~Q9}6-pr^yZ~Uft|wHAm^>U_xrO*i z>w~O(Pu-Wq1pC4^6&BuNFC kD|P=eBqm*UXM`k7z&SVz=ivh>;CYEerDGl!b7NEIesnj@U9Txw)ULD(M= z?M6(HVIgHwFj!E=KA6;(K1j)kEK7rteXs~g@Plj}C5i6kchC9#&OPUzbDviCRmgqY z02Z?Q5^j`qv81mXWkIQ>0 zNi+j6J8B;rU9H}D92njo!MM`cbn#3oxqK5q8pm>BcY~{5t~@k_u^B{x8wFE2{ernk z$Zc+qucM1RgzG3gM|hiB>RiPGyRn$W@xlv_tHTS!a0Fx6Bv_kWo`w-CeFl)(iB0VH zwzT@Z_Ld2NtZ|Hg1A-@k;`y=e@Tr8oOQ5musK7hVwWI4cJ{$kR+u0`M3Q!OsV$X7} zB|4#Mb#`17LDsaQRf>zz&$sD4(kbrK2b9^wLDnv&S$awYr(b3M@JmKcKd@dP?I49+aH+%r?E)nDgIgXw~e3DYT$TBskjXG!%Jxl%c6o32wnPxL?XR7Uy(If$&e&_RhYbJoLksFvBcIvm z^xs-Qk~4O$gV|PQ)Epq1e|zAQVWwWez>E{bs}|0``zNnUhaWh~Av7%#%6w E2kJP(d;kCd diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg index 2ca77321a4..36a0c4856f 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 Fri Jun 5 15:37:46 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,19 @@ d="M748 750l-375 -750l-374 750h749z" /> d="M-1 0l375 750l374 -750h-749z" /> + + + + + + NxM16>`Gx;S{*g6smafg%L7kWj`xl#%&C!O9q6$|zQXOJ=F_Q(ryrwXGH&l^_@=Km?A-KOg$Ns_LCjtSLqnJLdud%GL%-N3{Be00JIDPw1WFXLrikAo%Thn zSLvY>G@yt!fD1iQ>S1+U1y~XOvO$ezMEEkL+z}BY~=|++*?o@|_M_$>wlcaUmJi$HnTD z!|J92B%{*n{zARYu}P_z)4H12ka&~<$bPH8C_Y6iI7S9q5b(L~X18U-Xl2#1X|yRX z`*X5C582qZ5Awz?>}VDn?{RNnWMQ~#B;svt^`=R+FPK+6`FC$H=%q~~ zUBf{y*{(qOpif>>9OaOjId3_qCIS4kO>VQDZbLL!EOi99q(=037eIno(9#>V^j(AsJA3Y+>yCH-F931@d0o9<58O=QEdb1k zwU3Q@TVQJooxm}Qy1B9W#?^Fk>mh(Rg?5uZuihY4o|#8&5mD&#dAoE|8U2jSDOj-k z{J{?L4DKU;g$Oja*6YRnN6}0aP=D>$I|48a=TXBU!PcVty`whz5+JJ+hd3Q*Z3_mR ztcH9FGryG+r+)e%L&KVKw;mp4s-tQn!k~D*E}IbCQtmPho2z($S3Y0Pe~^? z$OvV2K0>b-{6_O^d~|iYX?wpoGU81D5oFuHm;nOd*pLf0%w*oga>!5K$MX0L%N3SW zf$%vYk2{2ZjE8ulkW4OO=Hf+SdKX!z8nsgwJw=;nh|bUz=3qhA!^ZGL1ha5h2nr!# zR#e4mu|o`rAEZR7QtFgOrKl7$IZfrJ$EJuG%ys5o^Lz8ACD~GFsj~E0#x2Won%p2y z%TYO|xRfhONEuTmRT+;%Em1vck2i9(?Hv!xwTrYHXIXQu+nzA zggcr*fdu@8q|BuMpcrceLECrYlJSO|G(5&za*PcB%fsdJT`iy4>B5c|kkrhAT`>FR s;x6dIzG<#W zIlq_B%(-UfzUI2mJ!j6$tLt7c3<0>S%F2RJK*$CO1L6NSvl0F`{{Nb+tcEgD=ZM^c z{D-YYm2A1!GP20!TVza!1U)DcgsG~|%?ARZv;cw7dq5ykVi1TnlhT2{!^+&)44K4()CeFUh?&b) zZ-pe09Fj*C1%aSga;RHYb}k-B?hi8FL(U<@-k@Du2UDaD?H+z9IZ>@Ia*0D9FnH?OXgD zk1atF2TVNij{YC@{#UCtswBym-!=S_WO@t?!9d72mH?;L2okoQcXsH_xr))=@-~~C z9^~kJQ%$(C4_BGF z_D1h-(FqzYBN=3;73b#WJbGz1Ig_NvZI1w*pJ>rlV|O-3O?&tWvwOjgmX3v>-Sd2<%J+jD6tOakAjF5EoXo<_FX*q@4#oXH{YCNHX=yW5GPPok{V`V`pE z(zBU1eE;USY?@``RZ~cyd{BynGGmn%VFF7?j(pF*e`Oo%uSEw%(zpIX9SrF~0OiE* zslZP^3FrpelJl&r`Hi}=-KgCl7d&Apo@Cl4;rR9Q#*uRAp4-aKp@pembk1f8+QP;4 zm0o;)PH<>jUFN~9+H&pLlpxX+N8JR(b2Rh5A<%)y)Bt#UfUfl3h#vK4*Y?+a6^7EpIn;qtt} z2qsD5>}Ad~*BmM;EG;h2sxNQLnwT{!XzHC<{8H1J6I*USJ??XGcuWVOpmHM*4~qzI zW@Ra`$hX|R&e#EDTG4p!)ZWD&p+NyucGOp>ny6-|pHNd#hfpukXwkIM^3mGRmeH2c zG0}z5EztAPhcG}G;uv2riZO;TpJ7U224I$BE@F{kL9ukPys$d3F|qluW3an$uyMF> zUgKEd1mX1IY&;`+_U2jqvkP1@Tqv#??ho7{+-2MoJW*uV#&g4qz-z->#s@I*+3|Dn zSHU1K85j!Y1IvRo!Pek(@DTW%0GmLF;4Q)1{~mL&4vvRS_eXmZzdL0@~YAZBti|^fJ9WWFn!*}Gmm&xdp=u&=_bsv_t@)X+UYNLY5 zsidr81v#SvJfT@^;eiamunkeNm4{_HG=PBf>9-+6o_6|pPv6eg73EpZM)^qV`n zjrBVb3Mk6P_H8?Qb@iRg%i|?@`>fac59;H0hQQ)CW1+>Wztq>r>@q9hwe^BN(Ojho zlXZu|7fL1jeuK$eFp|NhSuf#~x~|xNWmR$qwI5AZ=zVXUdGr91{n$kThziY#Z9xPKef=5@kn}3;BIo} z_-WVP1I*`-$)}XK~lk(Hv8vR#?yaaMCiX{OD!>M@;*UVs&Tl|O6z5SP_ zd|D-Q3sM~Sf zOa7tb`v<>6=WFHmY8o&n8y3D5c;-F=`s5t zYAU)C?2)u8N8SaV2R{?T8IlV5^)l9`w<&e=S)wmC)uj`{Jo0t|yIeTr#WfBFr^P>F zhLy-XvV<*QvBf_#H9=ih#x zpdxD+*!vWHuR5~eaK(eRW-6YAmMD4EiTt06_BK=gYIb_B>5Kz=9=25r+mD3WicZ+S z2E38SW~(0FkP0fnNNl^izgZdna1Ng)lW6{D<#0MtHhz0R<-;9avgwgMUu^2W)u14F2&xr(B_k3zc+XEYpg>-IB#wY+?jVro}yEG z0feIM7#o>#=&%mG+_UO{=RKaORXC4rbS`zS7bOp>6BP%9KUq!=_vYs$$I?YBpSGy6 zz^P#mMW$Un5fR^riOyMKDt>VjI>{8su7@iS*PsL#(~_aDf?&xnOgMwMJo|G;>yy1k zFDvZ)YjxTtYkNPMez#IlD|!@v@StmI29{+$Y}(h-2rSsbiZ~qzhpy^b-KA;cs$kawp{qlu#%nTgU=2pfw$unv? zZZ|sSu38eASnIs|>|O5XWD$vG_}od-EMaues0o{quVylS^*bgSXW{@-O*7hQ8%VN_X3SXtpIE(cR3=PyJ&7%pm zs%;Ff?q!IAySR)eaQCycegc1XO%L;6x}>TV|BEN~CxcZ5+Q%;Wch)HhFHXBu)<+Ik zBkpv71#A&LA^T@aLQr-v{)^x(8(>xokNVj+o5&QpRu$zkM$@DbD4_p}I90%eV2J>6ms7Td;xls5##+I&Uk zAOG%L+FkfEzg5j99VO-{Ndff69Gb8G&7H1Td@L`t{#aC;c;$F^SV532rgDu?Z!{M@A##yuG8ga{L`L}6%XA5_IOJ8$PHZZFTPmZs-9`m#NE z{qAbTC0mzB2(d{RgaZ)0t_Svr3PCd?4Q01^h7A}7CEX1@RZvO%ix8f2T}&9699xIT z?<}*($BXWzCtJTFGb;nlOQUMO-t%%E562;PlQD(w)7DoMDiY^^K8igw<+}};9?aCWF0OrZ`ISJrC>0pC-;WC6XJM{4EWqF@9H5a0AabpYv~pI4h86s3uIA z*VT7PQ7_p1^C}yV=FRWb53YyTOI5gr&xrV`WkjhqN`|aMWZR(`ZUuqVnw`b*?7A8V z98F#mT;21*ei!NOT!pwwcCWql&PE_gb+Eun&aFIzmz(?(zLpRPSRu-B$Z?q?>3Ko% z`shaZAfDw?HgJtqk`t+tT2p1WGg2R(vS`6x>u{efv)Rw7n_IsrVL<1rk+e|HwrW21 zx@=L{{yrP(uF=1X;NMl^X$M|%JwydP{mZm_8uw$v@dhGmoWNscw`E%gTFD$fxF0Pc z)c9&W=<*!bU1z;+!UHEM>oq`Lwu>Xi+id(dwt!LLOE&@BOzH5P% zdiYjREbg6{bv=Aq_W~5hHobK8Nnp?DYW)_VAU!^MkQBP6{&DkpRVprKO8Dnw^}W%& zjGY~+FL6r8ht1EfboMQ0&t^RgPS9tgDp~t-Wcr>%xWvKOp^$2xx35UOcvxh31kciU zAK8Qx0uip06S)XbA$Vu;j z{_7!)S!Q4Z(}{L-Qa5%Lor%Tiw=C08%u+U2dnE!(`N~W8-I~PeyNEMHj-Z)H}A zjdW&JtXHMAuhyK`)1NV@xF%DEH|-{gSCOI{45`_!R_`4?5@ly%cZ91*)d#r{qN)5oA1dM~Df)gTr->0)<8on~0U#I|^W zTS|Bru30hH#a8EIn37)3+*^A8Vz_Pk(5=#8WKV*~H4)#a_v;qZ#l_^-zFrhlx<}^w z%~F#I=r3)hpN3te#y64UmZFAcrBuAYUHWq-IdF4B)j{W2dD^ZwyJ7%JM*k)*y5jOy zj#{1u&mkS%;}ipvT!aw9C%1VR!HzwrC^tbMnoa~{_H45CH9{KZ+y|ONM0WIUvO*ed zJFuZkDB@J~As-ker^Vo>H*b5nfve%rU(Q=Au~=6bqD@chgY)q-$DKn%Mt8tLZX0XN zVMwt``QuXJ2F+_;ctEPYaT0M84U01TlbGASUoBUmkG6oIUA@7reD#F&5-fw;PHj<} zZuB4NA$dVKTfi7en!OH6#Y}iS`qigcBLz68JF(=P8APK}pJ>1=H?D$dRMe<`X;gYB zB>=+(kbI#5nh02DF8ds;=>X^&Q*m<6?dNS19bk;(`|$ReK7Tmgp(c_rk*2ARC*0p1 z-!l2EpdfCLy!OLYgCx=dz713~RaZB~=wIyi8;)^v4&1;jT}~_!_PV+{+8R1KTgvOl z@UXy-16xuJ=`64q9P;p=Qp!E2CSBVPSG;@1RIscGS)=WfbXw8;3joFoPyX}7?RBg% zRTE?Aezns0tkUM+R`TLw&q+EwJZAdE#Kmvjhc)GVW8DYAR<}mBaAl^Gez$-244*f) zUn6YQpoXI|VYjkjm^QPe`}>_2Ooh3uMrX;#He9xmt$rWGma;6iXRXky_O+S(Cj^Se?w~8zmhw=)%ukwtX3#}pf1sgKKhs1fryl^T+N~v5_Uv&{Tm5aH!P4amC{7 z9M9eGi36An`Y&w8Q|}BHYY&QJM#f5K3$#74{9f?p> zOzT%FY66C--aOny7=1Eim=2_z(A}{<+uAVFeKp3Oga<`~jJ?~yavyj_;VjcfCAE`$ zV6-T?L&a6W?7EJRPlJ<3 zOoVrZBrisH8C&WkO<-%ip*jzncODTFsUH=A0D!U`LLX69>8Pt^Zlk7Vvwcq^vhxI6 zRj0|!Sh|EZatd891uo~fP-f)BEX^y$*Cywo#lI0hMuO=FIu)py)iem_zd=x5PCAQ!#-v*a_&EI0K zmv*F-!K#*ta$1}d`HHc3{>s!8^hPA34V|@MqGU=k*Efw{culM1E8pxHS&}5FrWk%t z&#Jfm@0aeClxN^R>1RLD!b?osPa!*}z-ndIl0<22kmgIwsI`$U1s;{ai?3kXb>W9y zi4#Tz%L4vra)TBRr|Fp7y3^fMPHtm3de&20RqthtLwNHX~QgA3%-05!#H z$qjlN!Fn^17I++rTzO5VADn)>t~-D(vaC8Grc2a(I`XBa1^%p6*}LPe{?p zHS?lMT$om{IkK`NNDtNpnuEU{0rN4260LX(k3ESzq58qyFs}6lE^(@eWAZZ1Xj@Z6 zShZK_^&0TCd=*|Ll<2(cz;x87S^I))&=|T>ojp+1prbNm;^2S?u!Pa=Qy0d@X=B;= zOVEYOdK+uJ!?NXMlqRC?E+rC@Zg;M0c*E4W6x18vv;Aje zb%5hVf9HEgVjY;dhhIEvBK!%YmJv~I%F9ZfXd|yw_+D6EhAa*nnBkE$YURvqj zvT-Gc*4-*z25%+A?MA%@j_7u-_U3DVYiuui))||Dkza@Z3uOBSZ+R>PMxy+key&f_H1h}6S@g!y9)@EEl8?MR9P1gY2<31(Gd0EwFBHI+LVGzLO=Z*$Sr9K6l#OTiH#aBJmXdMxyeyvu-nEk5av2pez((ZW=J; zTE2n!RrvVD5qF1SvMeBu^Zm5e%(6a44nvBe#pm;?TaTZ`!G?Wv4$JF)`jV7qYbG6? zV7II82j1tc-?mHk0NF{om%LA%ZTi{V>CFSAE_KRV)-YTf`;X51g!yN7vwbTFS?i6_ zw(GkQ2OXS~T}+?s$U)wNSELngW`}m&N73jFn~7q@iRs=XMa!TH#UqSOKUuQyS2Jyg zEIw7s_6r3|DLXP^q@=V1eZEE*w=W~JJ>;zn)tfi`A)2llK=l5$S%H5IH8pGC%GCGx z6yA{+1&rHx{;0p*BY&wMcyp);9XMNaw=Re7)t-kicE540RhJXqn|@&?x4*rrxAkT% zRG4g4*`n%B?m)fsOu)CQj$AXw1`XcWDo#O~N4N~4|*72fBJtr6+!;+86E(l zKj6}!nqL&{D8Psow=@dq)$h~Q*&LSaLfz<)g-?1WJ!Dy=dZiS+=|{@p?c1Y3&VEg7 z>R*o__WRGncab&K{%@7^>w>82Vh*Nlq9$LIDb$daE!H0XDpG8qZM`)!!w=aSI+c|E z5>5fPSPoK9&mT>MTdoGkV8|%Omuc5otb9?{t3RHvv(#DhmzIl26LLM74CZ)QzVh?$ z`f3goFu}hLVy|&1wdETGBY!? za{JWT5Tq*FHL8p5vP&XK5FXQ7WzGeEd3tfxANm^h*$5Y%F_8(72f)?*UrxYXe%$BJ z#hVDp2-^-wk^szsj{-<(LTCM-AkrMu!pstY#7J#p1&9&~c>n>x{s1@t@L$}fZ8)U@ zNgQI{1v*4r#&1b`qRXLM4cvc`V#K`3!bAZhs(N85yATo~cSE;O+K)P%?u@9GW-bs}5budMMe{bufedsZFG7`KL!$>A+G2 zH%)TLRP-f%eBcCpOu`X-LZ(}MC~@`w8mvlG$%o(*^t#mcQewPe z=I;y4Nz?UDvh`1v_fITa8P0{Q48<7@rx^`}_UMR6BFvOZc#YE*r^+L@=9YX`5X`%U{Wuh&h znLrq@9fXZojG*@*BTy^|27=6h?r}VDDsjeews9_T0l37ta=0eACjY(8Fnz2~ zn%Zq$Ypu>MQziD(+l-ALrx@)$vP+z&iUv=l$=hnR=ZG`a?S>fZvA{!f@EP28^ZbH! zrpOSdG1oUi@$kTgNT90Rdt0wQQYm}?vVB41s%7%D$v1y}U6P5dc02y&Ks?9A{ymKS zcOz4ptb7Ru*ZtFm95lixl` zL4pDsKX#;BN>0RT8MAASV2_A=IQf=u#|bi=cGp-OqK`ESQ!UBYJO8MC0N}srL?g z{}`_t8%OL%sJT@FWBQXljj2flOFeK`8is(h!*5Ov-0CZ7jZkRP>ufHM*cyZ?)^eKI zhgT$wLbDw;dpAE}O~4ud+xuEj)Yg9O+rzI8;!46rha@MD?`Io-NKojt!QE!cRXh zg?LXDMQvI7(HJ^NuT6t)h#ujrZoybx-_IED1}`|;b@N^c%Gq@o`!A4}Oq!l^zy*~{ z6H+|61%%{ZFoT7mkR3tg;#lvL=bi=Sv0q=^(I+Y4rS<`z7}Ndk+`e8@2}-W5b>#=U ztpmy_I2vAUJQDirey1s=p}{#P>`37VTdf6J1(0nQ$C==jhk`2sxLXM>BB zZD^!+IuZsgLd3)2cnnr}VX|}de@XVSB76G(ByI2*-Yo$R*3sBD9yIt8VZNL7UPQ;= z=<>OK;Vzg*F1oXGO!}hLMBmLi{wl^hG#5Du&B$NZ_98mrO?-(L3il(l*%IulAq!c& zrXC63soe~8CYxY&9^QX)N)qIJ`3mw7a$hZsOa_AnAW}3;N-7Pnnp7!%RR#qG{S(f= zY>NWrEx)*#zWjaKE7Q&35*vKVIFz4IRew{E5zCI{}mydT@llWpDuH?Z^`Fr{{fEq>-YG+U`7 zc=o~M^(KIiewRNGAkbpf#Pjibb4+ckN+s?Ehs^$oQ0;$S;kI^=@1J3gdMHVDO|(@f zCws&4dA@&^YWh=I*<~H|xv*K53IB}Ld4a7oTr}n)dGNMsHeY<+FuhYW$bx&6on!iM zdG0a84;{gS;gzOaI=PBjy$r`Je72$lVQCtSMiTUh193@o!KkYZQZ=p7FGWMBZ=+$< zgAfHc{t%2l`wszTLFJGQ(vR;J5%02)t;{|zy>`hwXx?es0k_!9MZ_J30nxaPB&M|! zr_*gc$DJ@^y1yt@<+8Kqa&i2X2NQGjn9tvF!${bEnGY$)2piS~YEZ!jE{eq2SdYi#<}6sxZv4$llJm=_^}uiA1-N2&vI@ibX7t%FB`emVcRf&9F?q zbg-AW_*arP&Y3$9yyhI&6@tYr!b@Qv*=PR~&`^_9+R%c$0;FTpgc3y`Hhc~drG>QS z;vy}Ey3=0dXZ>^7p1XM$d=5>A{B-Q|n~u7?tPfYHEuz;F!EUb^^{=w(i>(P3wCuYV zQ2LS-UVnL+TmtuiSezZS_#)kaJPO2}c#ei8C24q%R#}jo%zTt8Ofkbu^l&1!_jGIg z#g$b@m)O{a6c{lJA7>0G3BCK1E-E5O3db0C%bf*- z+ss~qtdV2A`BQK7?i~y3+OWW+%cRC@NymOCx@zs% z1tydmJ@IO$@AOB|f_I%pIFQI{L4zx4rZRa)aD5DNiI%eC-dSDCYPuLbooe#s?cZRL zTwszXS3buVW-BZroi_IEIZ^wa56qmmnY|r^)zw979L51=gM^RnSlL(H58!#?i_Q<5 zr8tMLW0Q~hF-3+XyH&+QKpT~GJPxmIDKyz^0!e=vepk2Zx;^>l^8}H__>rWZbeuzA zfMu?O@))Yhy>S_0stT&&A#G!|AWKd!6KFh1uFZs4?&^F^>7iK>VGc&&4 zPoi^wpw3SjPfBny;+BzB=|LJ(;{t<~EJ@P( zWv%U+ju1W{)BHjOETO-D5*r&@6w09eQQ#SAH#UJ2lC@!K^&W*$Qtvm(M~=El-fZ9K z`CISK@-eG_eYE!n~1Kfikc%%Yt#LlYhnGnH(U*y7kw53h5wSV&W7Xno+u9f zT=D#5%Cr_YLr;OI1AMF`(J;;R#01@T>Qga-Ymd`97n6!@uXG6L$Q|R7UNOYWLG2INBXjU*yF7dZ6EsaD>Ct;z<13 z#cB{Ab+4mo$V4o;*r(067IkdKV8P@9+%)|G)5NQ?J`*7Fu4Q<-HZ75z2w-@)!$z0Qi)C*>bQk# zZ27VX`Rim{~0!N>~QURda!uxdR*XAximA~FeuQ* zT2AGNKQ0FK!7iR*7V%z36Vn7rVNr%AU2iv>b%lF$48_FxcCbfFn83EFs4`|ZwEgYTdf-|Sn+(N2h)UtCgF>|MmMCjaaK)U%?0K8U zsiv(}nIaae#IO3ArmWTDIMS!U0^A03;|qcZRE7?=15%*I0);?hbZ*)xER>(0UY3(4 zdg5Wab0i}AX4Z0dRov!yp+tnN;_UQraeCfVo9sMr)ul#4?T|JsSe9F0xB{!&Z7xrMg9=gaHP$7 zOnklsjsQlzhvBuCdY*e;|Gn!ZnNn3MVGrTvprz1;)Y8}V8iny&_l{lSaa1zJ9z&V3m0uGbwygcWpGIH8TgD+N?5-C8m;$k!}YbnoL zh&yz{&&Tt32fMa5yY}{%8tPkVDSh)(lGd%O&H?YqdRW0G3}&G!y%rqp!$px~bS~%G z%|>=Hp}<=7UQ~q;_BuN4TWEQ0s4{tY(?9sX$&Ux7=1#nuXU0`<{w>V{9nYgGKkVA_ zrftpQr;VVe)wqHMrm5IThm*C~KE@^=NU4t4Qs!7QL55}a=3Re>`WSWCNc{k7D^gV_ zWtEh#uP;QRBwvz93~l(QuXp|$Q6RDD)6Z`{$9e%i#|wh4KQ8$1#m0)w4WdWQ`bgWh z=$2ETrRMl(Fk;+{s|ujdeK+*21;xgg+m>7!4VmNL17pj3Cq)wB*HIojR`&!Q5c1$g zzhKw1$KDv$w<;gb4QSv`gPA?vf8Uwj8$)=KeD6*QsVGGUXwk80c-P{MK)*FAr?Cwt@4!ol7eJMSjzCV5X{E_W+tLL=9W4-Om^C4DsY;~o5VpCV!*R+x~pQF`3 zqAe5`fImgOMrfB~-hMOXkO*>o<{E%iNfyzI;F}B?w%j$xq?Nf2;DDjOtSl&x_<^^> zb=8z!#bC0|eviucq|?$|K0+j;QGb;pHE}1I!AEd@6{!*WtXw0$!NlsB!&S0d<-l}B zw16@ggqDQMI5S768<7{2tB%B7VK) zMOmBlDa2*UNK-&g(B|&nwf>AAzpw;3Al_A}Zkv=neYc94SShP78RP9fvAMGIs@_Is zVY^XH1Zy$QL%^}n#_g&I2}KN^ra`>+C>u-GqUNlQ(TYx!-`#1iM8cgG@$2s9CoCtR z&+|XIQ>3=&aqVBu5GUMWef;oi68)c*lz29>(W^mm0*P|`*)fZdws3)V^dq9|%H5f5 zkkGJTk2Oz0w~qqZNM>{@-+DaYG910(6Bm}`See$A)?#_;lq1ZE4F=ff%f&saMWrV? z@)8bkCcPz1hzr$7bNJ-Y&aD}tor?UM#h9^J#z!k^!}?t%WCxpBMU&^36G=`0lwy)r zq2;8)_+#+WfveNCjQ;#9l8tL+VL>3s>zkv`{J#%3OyR$Xg8^Vh5-nGQ{!xwhfgt1Cf zA-TQ3c%#z3B}C-?$hGGqz`-Sr75|Z&zOJQr`S7VukN1Ng8|Wl1?xWmT*AIcDFm?R} z@6!4@0loMN6I$pXCt>2Y-7yYfWa*K8#llmzDkN~riT=D}(1LaI>O6LBAVx4Dw_>}5 z$8hKx$s^B9qZbI`=VoL5`R4;tcXDE-?u5ykd+8Qwj|NrGse_RoV{;V$$-Nl3d|iE&H;2Sq2I1`$72jD#P_wK8P`{2E{hoc*NbmajCJ}3r|JEnfL4Z>(1D|eN2Hl z#~a~X4CVRhv4Kb3#jlu;nWWNm*vim#w{0OK;IV{pliTCB;+G97aj*gXV1F@JrAX%T z57)lD=rE1UN1bF&f%vug`4wuV289+oVn}RR_M_WNXn?*$N->k+EAWb7WbikWsQI;T zS8CH$(59-{8N<~n4V*2Sh~Sa!?fT0HA8*#D*Ab>a`;c0{c=o)gBKzzvRDI^-M)~k+ zcz%-ID#XS55*pO{-t_wC01>#U%8DyJj!&Rbh_9@~o!4>8#e|NJ+k;v>Z;+k!cNV1R z}EkLIe*n>bkX}0*;WZmlIlx<4aiKU6H8w-3GA!xD2&!7Z`C&op0i| zy|y+IF+7v{vfC%mF;U^?Np!VGA|E%2D(+QqcBg95I9}BskrPGK;1zAvC;noZs5vC* zw-lGu;Xp104jUgzmNi0swPG8s#oTa8T8;!6Q{20e% zX57P$qg%b&;(ay-eVdTi;dgbo8o`<0$p__9Xw&U&DXwqGP@HL}{tr`GYytoP diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 725c0c29b9..c966431b1f 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -34,9 +34,12 @@ $colorBodyBg: #333; $colorBodyFg: #999; $colorFooterBg: #000; $colorKey: #0099cc; +$colorKeySelectedBg: #005177; $colorKeyFg: #fff; $colorAlt1: #ffc700; $colorAlert: #ff3c00; +$colorPausedBg: #c56f01; +$colorPausedFg: #fff; $colorCheck: $colorKey; $colorCreateBtn: $colorKey; $colorInteriorBorder: lighten($colorBodyBg, 10%); @@ -50,7 +53,11 @@ $colorLimitYellow: #9d7500; $colorLimitRed: #aa0000; $colorTelemFresh: #fff; $colorTelemStale: #888; -$styleTelemState: italic; +$styleTelemStale: italic; +$colorInfoBubbleFg: #666; +$colorInfoBubbleBg: #ddd; +$colorThumbsBubbleFg: lighten($colorBodyFg, 10%); +$colorThumbsBubbleBg: lighten($colorBodyBg, 10%); // Ratios $ltGamma: 20%; @@ -124,3 +131,13 @@ $tickLblH: 15px; $tickLblW: 50px; $tickH: $ticksH - $tickLblVMargin - $tickLblH; $tickW: 1px; + +// Imagery +$imageMainControlBarH: 20px; +$imageThumbsD: 120px; +$imageThumbsWrapperH: $imageThumbsD * 1.4; +$imageThumbPad: 1px; + +// Bubbles +$bubbleArwSize: 10px; +$bubblePad: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index 40a1a24414..c90a035c82 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -44,7 +44,7 @@ a.disabled { } @include keyframes(pulse) { - 0% { opacity: 0.2; } + 0% { opacity: 0.5; } 100% { opacity: 1; } } @@ -57,5 +57,5 @@ a.disabled { } .pulse { - @include pulse(1000ms); + @include pulse(750ms); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 5a7293e4f2..0ada165ec9 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -117,6 +117,13 @@ span { display: none !important; } +.paused { + &:not(.s-btn) { + border-color: $colorPausedBg !important; + color: $colorPausedBg !important; + } +} + .sep { color: rgba(#fff, 0.2); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 3eb4397f91..ec2160048b 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -45,6 +45,7 @@ @import "controls/controls"; @import "controls/lists"; @import "controls/menus"; +@import "features/imagery"; @import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 3a99d6115c..107726e992 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -62,6 +62,31 @@ border-right: $size/$ratio solid transparent; } +@mixin triangle($dir: "left", $size: 5px, $ratio: 1, $color: red) { + //$size: $size*2; + width: 0; + height: 0; + $slopedB: $size/$ratio solid transparent; + $straightB: $size solid $color; + @if $dir == "up" { + border-left: $slopedB; + border-right: $slopedB; + border-bottom: $straightB; + } @else if $dir == "right" { + border-top: $slopedB; + border-bottom: $slopedB; + border-left: $straightB; + } @else if $dir == "down" { + border-left: $slopedB; + border-right: $slopedB; + border-top: $straightB; + } @else { + border-top: $slopedB; + border-bottom: $slopedB; + border-right: $straightB; + } +} + @mixin bgDiagonalStripes($c: yellow, $a: 0.1, $d: 40px) { @include background-image(linear-gradient(-45deg, rgba($c, $a) 25%, transparent 25%, diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index abbe655810..f8328dcdb5 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -19,25 +19,28 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -$pad: $interiorMargin * 2; +$pad: $interiorMargin * 1.5; /*********************************** TYPE STYLES */ .t-btn { cursor: pointer; } - /*********************************** STYLE STYLES */ .s-btn { - $base: lighten($colorBodyBg, 20%); @include border-radius($controlCr); @include box-sizing(border-box); @include text-shadow(rgba(black, 0.3) 0 1px 1px); line-height: 1.2em; - padding: 0 $pad; text-decoration: none; &.s-very-subtle { @include containerSubtle($colorBodyBg, $colorBodyFg, true); + &.paused { + @include containerSubtle($colorPausedBg, $colorPausedFg, true); + .icon:before { + content:"\0000EF"; + } + } } } @@ -47,9 +50,20 @@ $pad: $interiorMargin * 2; .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,8 +75,22 @@ $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.l-btn, @@ -70,4 +98,14 @@ span.l-btn span, a.l-btn, a.l-btn span { display: inline-block; +} + +.l-btn { + padding: 0 $pad; + &.sm { + padding: 0 $interiorMargin; + } + &.vsm { + padding: 0 $interiorMargin/2; + } } \ 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..d31b296868 --- /dev/null +++ b/platform/commonUI/general/res/sass/features/_imagery.scss @@ -0,0 +1,166 @@ +.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(); + 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-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: "\000058"; + } + } + .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-thumb-item { +} + +.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; + } + .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/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index 61980cf554..2a499339ce 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -21,18 +21,33 @@ *****************************************************************************/ //************************************************* LAYOUT -$infoBubbleFg: #666; -$infoBubbleBg: #ddd; - -.l-infobubble-wrapper { - $arwSize: 5px; - @include box-shadow(rgba(black, 0.4) 0 1px 5px); +.l-bubble-wrapper { position: absolute; z-index: 70; + .l-bubble { + padding: $bubblePad $bubblePad*2; + .l-btn.close { + padding: 0 2px; + position: absolute; + right: $interiorMargin; + top: $interiorMargin; + } + } + .arw { + position: absolute; + &.arw-up { + bottom: 100%; + + } + &.arw-down { + top: 100%; + } + } + .l-infobubble { display: inline-block; max-width: 250px; - padding: 5px 10px; + //padding: 5px 10px; &:before { content:""; position: absolute; @@ -71,57 +86,82 @@ $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; } } &.arw-down { - margin-bottom: $arwSize*2; - .l-infobubble::before { - left: 50%; - top: 100%; - margin-left: -1 * $arwSize; - border-left: $arwSize solid transparent; - border-right: $arwSize solid transparent; - border-top: ($arwSize * 1.5) solid $infoBubbleBg; + + } +} + +.l-thumbsbubble-wrapper { + $closeBtnD: 15px; + position: absolute; + height: $imageThumbsWrapperH + $bubblePad*2 + $interiorMargin; + width: 100%; + .l-thumbsbubble { + @include absPosDefault(); + .l-image-thumbs-wrapper { + height: auto; + top: $bubblePad !important; right: $closeBtnD + ($interiorMargin*2); bottom: $bubblePad !important; left: $bubblePad; } } + .arw { + //left: 50%; + //margin-left: $bubbleArwSize / -2; + z-index: 2; + } + &.arw-up .arw.arw-down, + &.arw-down .arw.arw-up { display: none; } } //************************************************* LOOK AND FEEL -.s-infobubble { - $emFg: darken($infoBubbleFg, 20%); +.s-bubble-wrapper { + //@include box-shadow(rgba(black, 0.4) 0 1px 5px); +} + +.s-bubble { @include border-radius($basicCr); - background: $infoBubbleBg; - color: $infoBubbleFg; + @include box-shadow(rgba(black, 0.4) 0 1px 5px); +} + +.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($colorInfoBubbleFg, 20%); + background: $colorInfoBubbleBg; + color: $colorInfoBubbleFg; font-size: 0.8rem; .title { color: $emFg; @@ -129,7 +169,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 +179,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/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 483bada8f0..7df73f3bd8 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -99,7 +99,7 @@ ul.tree { &.selected { $c: #fff; - background: #005177; + background: $colorKeySelectedBg; color: $c; .view-control { color: $colorItemTreeIcon; 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/features/static-markup/res/markup.html b/platform/features/static-markup/res/markup.html index 3aad99ac01..2a73186b31 100644 --- a/platform/features/static-markup/res/markup.html +++ b/platform/features/static-markup/res/markup.html @@ -19,27 +19,129 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -

Static Markup Sandbox

+
-

Plot limits

-
+ +
+
+
+
+ + UTC + 16:03:43 + 2020/04/27 +
+
+ + +
+
+
+ +
+
+
+
{{thumb.date}}
+
{{thumb.time}}
UTC +
+
+
+ + +
+
+
+ x +
+
+
+
{{thumb.date}}
+
{{thumb.time}}
+
+
+
+
+
+ + + \ No newline at end of file From 9f90c6b8d81a23c646d35ee72c9c3d1cecab6b03 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 8 Jun 2015 11:14:58 -0700 Subject: [PATCH 37/74] [Frontend] Updated CSS; removed position: relative WTD-884 --- platform/commonUI/general/res/css/forms.css | 353 +- platform/commonUI/general/res/css/items.css | 152 +- platform/commonUI/general/res/css/plots.css | 205 +- .../general/res/css/theme-espresso.css | 2934 +++++++++++------ platform/commonUI/general/res/css/tree.css | 121 +- .../commonUI/general/res/sass/_autoflow.scss | 19 +- .../commonUI/general/res/sass/_badges.scss | 2 +- .../commonUI/general/res/sass/_constants.scss | 25 +- .../general/res/sass/_data-status.scss | 7 + .../commonUI/general/res/sass/_effects.scss | 17 + .../general/res/sass/_fixed-position.scss | 42 +- .../commonUI/general/res/sass/_icons.scss | 2 +- .../commonUI/general/res/sass/_limits.scss | 52 + platform/commonUI/general/res/sass/_main.scss | 4 + .../commonUI/general/res/sass/_mixins.scss | 17 +- .../res/sass/controls/_breadcrumb.scss | 31 + .../general/res/sass/controls/_controls.scss | 12 +- .../general/res/sass/controls/_menus.scss | 4 +- .../general/res/sass/helpers/_bubbles.scss | 22 +- .../general/res/sass/helpers/_splitter.scss | 2 +- .../general/res/sass/lists/_tabular.scss | 149 +- .../general/res/sass/plots/_plots-main.scss | 82 +- .../res/sass/user-environ/_layout.scss | 23 +- .../res/sass/user-environ/_object-browse.scss | 4 +- .../res/sass/user-environ/_tool-bar.scss | 8 +- .../res/sass/user-environ/_top-bar.scss | 4 +- platform/commonUI/inspect/res/bubble.html | 2 +- 27 files changed, 2983 insertions(+), 1312 deletions(-) create mode 100644 platform/commonUI/general/res/sass/_data-status.scss create mode 100644 platform/commonUI/general/res/sass/_limits.scss create mode 100644 platform/commonUI/general/res/sass/controls/_breadcrumb.scss diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index ae5386ca7c..113a906725 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -19,27 +19,109 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 3, ../sass/forms/_elems.scss */ +/***************************************************************************** + * 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 24, ../sass/forms/_elems.scss */ .form .section-header { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; background: rgba(255, 255, 255, 0.1); font-size: 0.8em; margin-top: 5px; padding: 5px; } - /* line 9, ../sass/forms/_elems.scss */ + /* line 30, ../sass/forms/_elems.scss */ .form .section-header:first-child { margin-top: 0; } -/* line 13, ../sass/forms/_elems.scss */ +/* line 34, ../sass/forms/_elems.scss */ .form .form-section { position: relative; } -/* line 17, ../sass/forms/_elems.scss */ +/* line 38, ../sass/forms/_elems.scss */ .form .form-row { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; *zoom: 1; @@ -47,14 +129,14 @@ margin-top: 5px; padding: 5px; position: relative; } - /* line 24, ../sass/forms/_elems.scss */ + /* line 45, ../sass/forms/_elems.scss */ .form .form-row.first { border-top: none; } - /* line 29, ../sass/forms/_elems.scss */ + /* line 49, ../sass/forms/_elems.scss */ .form .form-row .label, .form .form-row .controls { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; *zoom: 1; @@ -62,62 +144,60 @@ font-size: 0.75rem; line-height: 22px; min-height: 22px; } - /* line 39, ../sass/forms/_elems.scss */ + /* line 60, ../sass/forms/_elems.scss */ .form .form-row > .label { float: left; position: relative; white-space: nowrap; width: 20%; } - /* line 47, ../sass/forms/_elems.scss */ + /* line 68, ../sass/forms/_elems.scss */ .form .form-row .value { color: #cccccc; } - /* line 51, ../sass/forms/_elems.scss */ + /* line 72, ../sass/forms/_elems.scss */ .form .form-row .controls { float: left; position: relative; width: 79.9%; } - /* line 58, ../sass/forms/_elems.scss */ + /* line 79, ../sass/forms/_elems.scss */ .form .form-row .controls .l-composite-control.l-checkbox { display: inline-block; line-height: 14px; margin-right: 5px; } - /* line 67, ../sass/forms/_elems.scss */ + /* line 88, ../sass/forms/_elems.scss */ .form .form-row .controls input[type="text"] { height: 22px; line-height: 22px; margin-top: -4px; vertical-align: baseline; } - /* line 74, ../sass/forms/_elems.scss */ + /* line 95, ../sass/forms/_elems.scss */ .form .form-row .controls .l-med input[type="text"] { width: 200px; } - /* line 78, ../sass/forms/_elems.scss */ + /* line 99, ../sass/forms/_elems.scss */ .form .form-row .controls .l-small input[type="text"] { width: 50px; } - /* line 82, ../sass/forms/_elems.scss */ + /* line 103, ../sass/forms/_elems.scss */ .form .form-row .controls .l-numeric input[type="text"] { text-align: right; } - /* line 86, ../sass/forms/_elems.scss */ + /* line 107, ../sass/forms/_elems.scss */ .form .form-row .controls .select { margin-right: 5px; } - /* line 91, ../sass/forms/_elems.scss */ + /* line 112, ../sass/forms/_elems.scss */ .form .form-row .field-hints { color: #666666; } - /* line 95, ../sass/forms/_elems.scss */ + /* line 116, ../sass/forms/_elems.scss */ .form .form-row .selector-list { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; background: rgba(0, 0, 0, 0.2); padding: 5px; position: relative; height: 150px; overflow: auto; } - /* line 106, ../sass/forms/_elems.scss */ + /* line 127, ../sass/forms/_elems.scss */ .form .form-row .selector-list .wrapper { overflow-y: auto; position: absolute; @@ -126,50 +206,66 @@ bottom: 5px; left: 5px; } -/* line 120, ../sass/forms/_elems.scss */ +/* line 141, ../sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 127, ../sass/forms/_elems.scss */ +/* line 147, ../sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 131, ../sass/forms/_elems.scss */ +/* line 152, ../sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 138, ../sass/forms/_elems.scss */ + /* line 159, ../sass/forms/_elems.scss */ .l-result div.s-hint { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; background: rgba(255, 153, 0, 0.8); display: block; color: #ffd699; padding: 5px; } -/* line 1, ../sass/forms/_textarea.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/forms/_textarea.scss */ .edit-main textarea { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-border-radius: 3px; + -webkit-appearance: none; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; background: rgba(255, 255, 255, 0.1); border: none; @@ -180,25 +276,43 @@ label.form-control.checkbox input { position: absolute; height: 100%; width: 100%; } - /* line 12, ../sass/forms/_mixins.scss */ + /* line 33, ../sass/forms/_mixins.scss */ .edit-main textarea.error { background: rgba(255, 0, 0, 0.5); } -/* line 1, ../sass/forms/_text-input.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/forms/_text-input.scss */ input[type="text"] { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-border-radius: 3px; + -webkit-appearance: none; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; background: rgba(255, 255, 255, 0.1); border: none; @@ -206,65 +320,85 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 12, ../sass/forms/_mixins.scss */ + /* line 33, ../sass/forms/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } - /* line 8, ../sass/forms/_text-input.scss */ + /* line 29, ../sass/forms/_text-input.scss */ input[type="text"].numeric { text-align: right; } -/* line 1, ../sass/forms/_selects.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/forms/_selects.scss */ .form-control.select { + 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: -webkit-linear-gradient(#4d4d4d, #404040); background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -o-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: linear-gradient(#4d4d4d, #404040); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #666666; - color: #999999; + color: #999; display: inline-block; cursor: pointer; display: inline-block; margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 127, ../sass/_mixins.scss */ + /* line 148, ../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-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); - background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -o-linear-gradient(#666666, #4d4d4d); + background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 8, ../sass/forms/_selects.scss */ + /* line 29, ../sass/forms/_selects.scss */ .form-control.select select { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-box-sizing: border-box; + -webkit-appearance: none; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; background: none; - color: #999999; + color: #999; border: none !important; cursor: pointer; padding: 4px 25px 2px 5px; width: 120%; } - /* line 17, ../sass/forms/_selects.scss */ + /* line 38, ../sass/forms/_selects.scss */ .form-control.select select option { margin: 5px 0; } - /* line 21, ../sass/forms/_selects.scss */ + /* line 42, ../sass/forms/_selects.scss */ .form-control.select:after { color: #0099cc; content: "v"; @@ -275,25 +409,43 @@ input[type="text"] { right: 5px; top: 0; } -/* line 2, ../sass/forms/_channel-selector.scss */ +/***************************************************************************** + * 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 23, ../sass/forms/_channel-selector.scss */ .channel-selector .line { margin-bottom: 5px; min-height: 22px; } -/* line 6, ../sass/forms/_channel-selector.scss */ +/* line 27, ../sass/forms/_channel-selector.scss */ .channel-selector .treeview { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-border-radius: 3px; + -webkit-appearance: none; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; background: rgba(255, 255, 255, 0.1); border: none; @@ -307,13 +459,13 @@ input[type="text"] { max-height: 400px; overflow: auto; padding: 5px; } - /* line 12, ../sass/forms/_mixins.scss */ + /* line 33, ../sass/forms/_mixins.scss */ .channel-selector .treeview.error { background: rgba(255, 0, 0, 0.5); } -/* line 15, ../sass/forms/_channel-selector.scss */ +/* line 36, ../sass/forms/_channel-selector.scss */ .channel-selector .btns-add-remove { margin-top: 150px; } - /* line 18, ../sass/forms/_channel-selector.scss */ + /* line 39, ../sass/forms/_channel-selector.scss */ .channel-selector .btns-add-remove .btn { display: block; font-size: 1.5em; @@ -321,23 +473,44 @@ input[type="text"] { padding: 10px; text-align: center; } -/* line 2, ../sass/forms/_datetime.scss */ +/***************************************************************************** + * 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 23, ../sass/forms/_datetime.scss */ .complex.datetime span { display: inline-block; margin-right: 5px; } -/* line 15, ../sass/forms/_datetime.scss */ +/* line 36, ../sass/forms/_datetime.scss */ .complex.datetime .fields { margin-top: 3px 0; padding: 3px 0; } -/* line 20, ../sass/forms/_datetime.scss */ +/* line 41, ../sass/forms/_datetime.scss */ .complex.datetime .date { width: 85px; } - /* line 23, ../sass/forms/_datetime.scss */ + /* line 44, ../sass/forms/_datetime.scss */ .complex.datetime .date input { width: 80px; } -/* line 29, ../sass/forms/_datetime.scss */ +/* line 50, ../sass/forms/_datetime.scss */ .complex.datetime .time.sm { width: 45px; } - /* line 32, ../sass/forms/_datetime.scss */ + /* line 53, ../sass/forms/_datetime.scss */ .complex.datetime .time.sm input { width: 40px; } diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 3d491867d8..92d6f49101 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -19,35 +19,97 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 1, ../sass/items/_item.scss */ +/***************************************************************************** + * 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 22, ../sass/items/_item.scss */ .items-holder { overflow: hidden; *zoom: 1; overflow-y: auto; } - /* line 4, ../sass/items/_item.scss */ + /* line 25, ../sass/items/_item.scss */ .items-holder .contents { top: 0; } - /* line 8, ../sass/items/_item.scss */ + /* 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-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); - background-image: -webkit-linear-gradient(#595959, #4d4d4d); background-image: -moz-linear-gradient(#595959, #4d4d4d); - background-image: -o-linear-gradient(#595959, #4d4d4d); + background-image: -webkit-linear-gradient(#595959, #4d4d4d); background-image: linear-gradient(#595959, #4d4d4d); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #737373; - color: #999999; + color: #999; display: inline-block; box-sizing: border-box; cursor: pointer; @@ -57,112 +119,114 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 127, ../sass/_mixins.scss */ + /* line 148, ../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-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #737373), color-stop(100%, #595959)); - background-image: -webkit-linear-gradient(#737373, #595959); background-image: -moz-linear-gradient(#737373, #595959); - background-image: -o-linear-gradient(#737373, #595959); + background-image: -webkit-linear-gradient(#737373, #595959); background-image: linear-gradient(#737373, #595959); } - /* line 21, ../sass/items/_item.scss */ + /* line 42, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: #0099cc !important; } - /* line 24, ../sass/items/_item.scss */ + /* line 45, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-open { display: block; } - /* line 28, ../sass/items/_item.scss */ + /* line 49, ../sass/items/_item.scss */ .items-holder .item.grid-item .contents { top: 5px; right: 5px; bottom: 5px; left: 5px; } - /* line 32, ../sass/items/_item.scss */ + /* line 53, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs { bottom: auto; height: 20px; line-height: 20px; z-index: 5; } - /* line 37, ../sass/items/_item.scss */ + /* line 58, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs .left, .items-holder .item.grid-item .bar.top-bar.abs .right { width: auto; } - /* line 39, ../sass/items/_item.scss */ + /* line 60, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon { margin-left: 5px; } - /* line 44, ../sass/items/_item.scss */ + /* line 65, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar.abs { top: auto; height: 40px; padding: 5px; } - /* line 50, ../sass/items/_item.scss */ + /* line 71, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main { z-index: 1; } - /* line 58, ../sass/items/_item.scss */ + /* line 79, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type { color: #737373; text-align: center; font-size: 7em; line-height: 180px; } - /* line 64, ../sass/items/_item.scss */ + /* line 85, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { display: none; font-size: 5em; line-height: 180px; left: auto; width: 30px; } - /* line 72, ../sass/items/_item.scss */ + /* line 93, ../sass/items/_item.scss */ .items-holder .item.grid-item .title { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #cccccc; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 80, ../sass/items/_item.scss */ + /* line 101, ../sass/items/_item.scss */ .items-holder .item.grid-item .details { font-size: 0.8em; } - /* line 83, ../sass/items/_item.scss */ + /* 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-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00bfff), color-stop(100%, #00ace6)); - background-image: -webkit-linear-gradient(#00bfff, #00ace6); background-image: -moz-linear-gradient(#00bfff, #00ace6); - background-image: -o-linear-gradient(#00bfff, #00ace6); + background-image: -webkit-linear-gradient(#00bfff, #00ace6); background-image: linear-gradient(#00bfff, #00ace6); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #33ccff; - color: #999999; + 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: -webkit-linear-gradient(#33ccff, #0099cc); background-image: -moz-linear-gradient(#33ccff, #0099cc); - background-image: -o-linear-gradient(#33ccff, #0099cc); + background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #80dfff; } - /* line 135, ../sass/_mixins.scss */ + /* line 156, ../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-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #66d9ff), color-stop(100%, #00bfff)); - background-image: -webkit-linear-gradient(#66d9ff, #00bfff); background-image: -moz-linear-gradient(#66d9ff, #00bfff); - background-image: -o-linear-gradient(#66d9ff, #00bfff); + background-image: -webkit-linear-gradient(#66d9ff, #00bfff); background-image: linear-gradient(#66d9ff, #00bfff); } - /* line 88, ../sass/items/_item.scss */ + /* 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; } - /* line 89, ../sass/items/_item.scss */ + /* line 110, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-main .item-open { color: #80dfff; } - /* line 90, ../sass/items/_item.scss */ + /* line 111, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .title { color: white; } - /* line 92, ../sass/items/_item.scss */ + /* line 113, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected:hover .item-main .item-type { color: white !important; } diff --git a/platform/commonUI/general/res/css/plots.css b/platform/commonUI/general/res/css/plots.css index a0428afe39..924bef15c4 100644 --- a/platform/commonUI/general/res/css/plots.css +++ b/platform/commonUI/general/res/css/plots.css @@ -19,17 +19,81 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 10, ../sass/plots/_plots-main.scss */ +/***************************************************************************** + * 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: #999999; + color: #999; font-size: 0.7rem; position: relative; width: 100%; - height: 100%; } - /* line 17, ../sass/plots/_plots-main.scss */ + height: 100%; + /****************************** Limits and Out-of-Bounds data */ } + /* line 38, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area { position: absolute; } - /* line 20, ../sass/plots/_plots-main.scss */ + /* line 41, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area.gl-plot-x { top: auto; right: 0; @@ -38,24 +102,22 @@ height: 32px; width: auto; overflow: hidden; } - /* line 29, ../sass/plots/_plots-main.scss */ + /* 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 38, ../sass/plots/_plots-main.scss */ + /* line 59, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - background: rgba(255, 199, 0, 0.5); + background: black; color: #e6e6e6; padding: 2px 5px; position: absolute; @@ -64,10 +126,10 @@ bottom: auto; left: 70px; z-index: 10; } - /* line 50, ../sass/plots/_plots-main.scss */ + /* line 71, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords:empty { display: none; } - /* line 55, ../sass/plots/_plots-main.scss */ + /* line 76, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-display-area { position: absolute; top: 29px; @@ -76,13 +138,13 @@ left: 60px; cursor: crosshair; border: 1px solid #4d4d4d; } - /* line 66, ../sass/plots/_plots-main.scss */ + /* 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 74, ../sass/plots/_plots-main.scss */ + /* 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 { @@ -91,26 +153,24 @@ bottom: 0; left: 0; height: auto; } - /* line 83, ../sass/plots/_plots-main.scss */ + /* 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 { - -webkit-transform-origin: 50% 0; -moz-transform-origin: 50% 0; -ms-transform-origin: 50% 0; - -o-transform-origin: 50% 0; + -webkit-transform-origin: 50% 0; transform-origin: 50% 0; - -webkit-transform: translateX(-50%) rotate(-90deg); -moz-transform: translateX(-50%) rotate(-90deg); -ms-transform: translateX(-50%) rotate(-90deg); - -o-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 96, ../sass/plots/_plots-main.scss */ + /* line 117, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-y-options { position: absolute; top: 50%; @@ -121,19 +181,19 @@ height: auto; min-height: 32px; width: 32px; } - /* line 110, ../sass/plots/_plots-main.scss */ + /* line 131, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; border: 0 rgba(255, 255, 255, 0.3) dashed; } - /* line 113, ../sass/plots/_plots-main.scss */ + /* line 134, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; height: 100%; } - /* line 117, ../sass/plots/_plots-main.scss */ + /* line 138, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-h { border-bottom-width: 1px; width: 100%; } - /* line 123, ../sass/plots/_plots-main.scss */ + /* line 144, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-legend { position: absolute; top: 0; @@ -143,21 +203,69 @@ 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 151, ../sass/plots/_plots-main.scss */ +/* 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 154, ../sass/plots/_plots-main.scss */ + /* 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 158, ../sass/plots/_plots-main.scss */ + /* 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, @@ -166,26 +274,37 @@ .legend .plot-legend-item .color-swatch, .legend .legend-item .plot-color-swatch, .legend .legend-item .color-swatch { - -webkit-border-radius: 2px; -moz-border-radius: 2px; - -ms-border-radius: 2px; - -o-border-radius: 2px; + -webkit-border-radius: 2px; border-radius: 2px; display: inline-block; height: 8px; - width: 8px; - margin-right: 3px; } + width: 8px; } -/* line 172, ../sass/plots/_plots-main.scss */ +/* 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 175, ../sass/plots/_plots-main.scss */ + /* line 237, ../sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; height: 100%; } -/* line 183, ../sass/plots/_plots-main.scss */ +/* line 243, ../sass/plots/_plots-main.scss */ .gl-plot-tick, .tick-label { font-size: 0.7rem; @@ -193,7 +312,7 @@ overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 191, ../sass/plots/_plots-main.scss */ + /* 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 { @@ -204,7 +323,7 @@ width: 20%; margin-left: -10%; text-align: center; } - /* line 201, ../sass/plots/_plots-main.scss */ + /* 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 { @@ -214,18 +333,18 @@ margin-bottom: -0.5em; text-align: right; } -/* line 212, ../sass/plots/_plots-main.scss */ +/* line 273, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label { top: 5px; } -/* line 215, ../sass/plots/_plots-main.scss */ +/* line 276, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label { right: 5px; left: 5px; } -/* line 222, ../sass/plots/_plots-main.scss */ +/* line 283, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-x { top: 0; } -/* line 225, ../sass/plots/_plots-main.scss */ +/* 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 c20c2e84a8..eeda438f84 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1,3 +1,46 @@ +@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 @@ -20,7 +63,28 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ /* CONSTANTS */ -/* line 17, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/***************************************************************************** + * 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 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,42 +105,84 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ -article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { +/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } -/* line 2, ../sass/_effects.scss */ +/***************************************************************************** + * 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 22, ../sass/_effects.scss */ .disabled, a.disabled { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=30); @@ -84,62 +190,117 @@ a.disabled { pointer-events: none !important; cursor: default !important; } -/* line 8, ../sass/_effects.scss */ +/* line 29, ../sass/_effects.scss */ .incised { - -webkit-box-shadow: inset rgba(0, 0, 0, 0.8) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.8) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.8) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.8) 0 1px 5px; border-bottom: 1px solid rgba(255, 255, 255, 0.3); } -/* line 13, ../sass/_effects.scss */ +/* line 34, ../sass/_effects.scss */ .outline { border: 1px solid #666666; } -/* line 17, ../sass/_effects.scss */ +/* line 38, ../sass/_effects.scss */ .test-stripes { - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); - background-image: linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, transparent 75%, transparent 0%); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjEuMCIgeDI9IjAuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiNmZmZmMDAiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PHN0b3Agb2Zmc2V0PSIyNSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiNmZmZmMDAiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiNmZmZmMDAiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PHN0b3Agb2Zmc2V0PSI3NSUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -moz-linear-gradient(135deg, rgba(255, 255, 0, 0.1) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 0, 0.1) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(-45deg, rgba(255, 255, 0, 0.1) 25%, rgba(0, 0, 0, 0) 25%, rgba(0, 0, 0, 0) 50%, rgba(255, 255, 0, 0.1) 50%, rgba(255, 255, 0, 0.1) 75%, rgba(0, 0, 0, 0) 75%, rgba(0, 0, 0, 0) 100%); background-repeat: repeat; background-size: 40px 40px; } -/* line 21, ../sass/_effects.scss */ +/* line 42, ../sass/_effects.scss */ .test { background-color: rgba(255, 204, 0, 0.2); } -/* line 1, ../sass/_global.scss */ +@-moz-keyframes pulse { + 0% { + opacity: 0.2; } + 100% { + opacity: 1; } } +@-webkit-keyframes pulse { + 0% { + opacity: 0.2; } + 100% { + opacity: 1; } } +@keyframes pulse { + 0% { + opacity: 0.2; } + 100% { + opacity: 1; } } +/* line 59, ../sass/_effects.scss */ +.pulse { + -moz-animation-name: pulse; + -webkit-animation-name: pulse; + animation-name: pulse; + -moz-animation-duration: 1000ms; + -webkit-animation-duration: 1000ms; + animation-duration: 1000ms; + -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; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/_global.scss */ a { color: #ccc; cursor: pointer; text-decoration: none; } - /* line 5, ../sass/_global.scss */ + /* line 26, ../sass/_global.scss */ a:hover { color: #fff; } -/* line 10, ../sass/_global.scss */ +/* line 31, ../sass/_global.scss */ body, html { - background-color: #333333; - color: #999999; + background-color: #333; + color: #999; font-family: Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; width: 100%; overflow: hidden; } -/* line 20, ../sass/_global.scss */ +/* line 41, ../sass/_global.scss */ em { font-style: normal; } -/* line 25, ../sass/_global.scss */ +/* line 46, ../sass/_global.scss */ input, textarea { font-family: Helvetica, Arial, sans-serif; } -/* line 29, ../sass/_global.scss */ +/* line 50, ../sass/_global.scss */ h1, h2, h3 { margin: 0; } -/* line 33, ../sass/_global.scss */ +/* line 54, ../sass/_global.scss */ h1 { font-size: 1.7em; font-weight: normal !important; @@ -147,17 +308,17 @@ h1 { margin-bottom: 20px; margin-top: 0; } -/* line 41, ../sass/_global.scss */ +/* line 62, ../sass/_global.scss */ p { margin-bottom: 10px; } -/* line 45, ../sass/_global.scss */ +/* line 66, ../sass/_global.scss */ span { /* 618 DEBUG box-sizing: border-box; */ } -/* line 51, ../sass/_global.scss */ +/* line 72, ../sass/_global.scss */ .abs, .btn-menu span.l-click-area { position: absolute; top: 0; @@ -167,49 +328,70 @@ span { height: auto; width: auto; } -/* line 61, ../sass/_global.scss */ +/* line 82, ../sass/_global.scss */ .code, .codehilite { font-family: "Lucida Console", monospace; font-size: 0.7em; line-height: 150%; white-space: pre; } -/* line 68, ../sass/_global.scss */ +/* line 89, ../sass/_global.scss */ .codehilite { background-color: rgba(255, 255, 255, 0.1); padding: 1em; } -/* line 74, ../sass/_global.scss */ +/* line 95, ../sass/_global.scss */ .align-right { text-align: right; } -/* line 78, ../sass/_global.scss */ +/* line 99, ../sass/_global.scss */ .centered { text-align: center; } -/* line 82, ../sass/_global.scss */ +/* line 103, ../sass/_global.scss */ .no-margin { margin: 0; } -/* line 86, ../sass/_global.scss */ +/* line 107, ../sass/_global.scss */ .colorKey { color: #0099cc; } -/* line 90, ../sass/_global.scss */ +/* line 111, ../sass/_global.scss */ .ds { - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; -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 95, ../sass/_global.scss */ +/* line 115, ../sass/_global.scss */ .hide, .hidden { display: none !important; } -/* line 99, ../sass/_global.scss */ +/* line 120, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } +/***************************************************************************** + * 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. + *****************************************************************************/ @font-face { /* * Use https://www.web-font-generator.com/ to gen fonts @@ -219,33 +401,51 @@ span { src: url("../fonts/symbols/wtdsymbols.eot?#iefix") format("embedded-opentype"), url("../fonts/symbols/wtdsymbols.woff") format("woff"), url("../fonts/symbols/wtdsymbols.ttf") format("truetype"), url("../fonts/symbols/wtdsymbols.svg#armataregular") format("svg"); font-weight: normal; font-style: normal; } - -/* line 15, ../sass/_fonts.scss */ +/* line 36, ../sass/_fonts.scss */ .ui-symbol { font-family: 'symbolsfont'; } -/* line 11, ../sass/user-environ/_layout.scss */ +/***************************************************************************** + * 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 32, ../sass/user-environ/_layout.scss */ .holder-all { top: 3px; right: 3px; bottom: 3px; left: 3px; } -/* line 21, ../sass/user-environ/_layout.scss */ +/* line 40, ../sass/user-environ/_layout.scss */ .browse-area, .edit-area, .editor { position: absolute; } -/* line 25, ../sass/user-environ/_layout.scss */ +/* line 46, ../sass/user-environ/_layout.scss */ .editor { - -webkit-border-radius: 4.5px; -moz-border-radius: 4.5px; - -ms-border-radius: 4.5px; - -o-border-radius: 4.5px; + -webkit-border-radius: 4.5px; border-radius: 4.5px; } -/* line 29, ../sass/user-environ/_layout.scss */ +/* line 50, ../sass/user-environ/_layout.scss */ .contents { box-sizing: border-box; position: absolute; @@ -253,26 +453,26 @@ span { right: 0; bottom: 0; left: 0; } - /* line 37, ../sass/user-environ/_layout.scss */ + /* line 58, ../sass/user-environ/_layout.scss */ .contents.nomargin { right: 0px; bottom: 0px; left: 0px; } -/* line 46, ../sass/user-environ/_layout.scss */ +/* line 67, ../sass/user-environ/_layout.scss */ .bar .icon.major { margin-right: 5px; } -/* line 49, ../sass/user-environ/_layout.scss */ +/* line 70, ../sass/user-environ/_layout.scss */ .bar.abs, .btn-menu span.bar.l-click-area { text-wrap: none; white-space: nowrap; } - /* line 53, ../sass/user-environ/_layout.scss */ + /* 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 58, ../sass/user-environ/_layout.scss */ + /* 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 { @@ -280,56 +480,59 @@ span { left: auto; right: 0; text-align: right; } - /* line 63, ../sass/user-environ/_layout.scss */ + /* 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 76, ../sass/user-environ/_layout.scss */ +/* line 95, ../sass/user-environ/_layout.scss */ .user-environ .browse-area, .user-environ .edit-area, .user-environ .editor { - top: 45px; + top: 40px; right: 5px; bottom: 30px; left: 5px; } -/* line 85, ../sass/user-environ/_layout.scss */ +/* line 106, ../sass/user-environ/_layout.scss */ .user-environ .browse-area > .contents, .user-environ .edit-area > .contents { left: 0; right: 0; } -/* line 93, ../sass/user-environ/_layout.scss */ -.user-environ .edit-area .tool-bar { - bottom: auto; - height: 35px; - line-height: 28px; } -/* line 98, ../sass/user-environ/_layout.scss */ -.user-environ .edit-area .work-area { - top: 45px; } -/* line 103, ../sass/user-environ/_layout.scss */ +/* line 112, ../sass/user-environ/_layout.scss */ +.user-environ .edit-area { + top: 40px; } + /* line 115, ../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 */ + .user-environ .edit-area .work-area { + top: 40px; } +/* line 125, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar { top: auto; right: 5px; bottom: 5px; left: 5px; height: 20px; } - /* line 109, ../sass/user-environ/_layout.scss */ + /* line 131, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .status-holder { right: 110px; } - /* line 112, ../sass/user-environ/_layout.scss */ + /* line 134, ../sass/user-environ/_layout.scss */ .user-environ .bottom-bar .app-logo { left: auto; width: 105px; } -/* line 119, ../sass/user-environ/_layout.scss */ +/* line 141, ../sass/user-environ/_layout.scss */ .cols { overflow: hidden; *zoom: 1; } - /* line 121, ../sass/user-environ/_layout.scss */ + /* line 143, ../sass/user-environ/_layout.scss */ .cols .col { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; *zoom: 1; @@ -337,93 +540,128 @@ span { margin-left: 1.5%; padding-left: 5px; position: relative; } - /* line 129, ../sass/user-environ/_layout.scss */ + /* line 151, ../sass/user-environ/_layout.scss */ .cols .col:first-child { margin-left: 0; padding-left: 0; } - /* line 136, ../sass/user-environ/_layout.scss */ + /* line 158, ../sass/user-environ/_layout.scss */ .cols.cols-2 .col-1 { min-width: 250px; width: 48.5%; } - /* line 142, ../sass/user-environ/_layout.scss */ + /* line 164, ../sass/user-environ/_layout.scss */ .cols.cols-2-ff .col-100px { width: 100px; } - /* line 149, ../sass/user-environ/_layout.scss */ + /* line 171, ../sass/user-environ/_layout.scss */ .cols.cols-6 .col-1 { min-width: 83.33333px; width: 15.16667%; } - /* line 155, ../sass/user-environ/_layout.scss */ + /* line 177, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-1 { min-width: 31.25px; width: 4.75%; } - /* line 158, ../sass/user-environ/_layout.scss */ + /* line 180, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-2 { min-width: 62.5px; width: 11%; } - /* line 161, ../sass/user-environ/_layout.scss */ + /* line 183, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-7 { min-width: 218.75px; width: 42.25%; } - /* line 167, ../sass/user-environ/_layout.scss */ + /* line 189, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-2 { min-width: 31.25px; width: 4.75%; } - /* line 170, ../sass/user-environ/_layout.scss */ + /* line 192, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-15 { min-width: 234.375px; width: 45.375%; } - /* line 174, ../sass/user-environ/_layout.scss */ + /* line 196, ../sass/user-environ/_layout.scss */ .cols .l-row { overflow: hidden; *zoom: 1; padding: 5px 0; } -/* line 180, ../sass/user-environ/_layout.scss */ +/* line 202, ../sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 183, ../sass/user-environ/_layout.scss */ + /* line 205, ../sass/user-environ/_layout.scss */ .pane.treeview .create-btn-holder { bottom: auto; - height: 35px; } - /* line 186, ../sass/user-environ/_layout.scss */ + top: 0; + height: 30px; } + /* line 208, ../sass/user-environ/_layout.scss */ + .pane.treeview .create-btn-holder .wrapper.menu-element { + position: absolute; + bottom: 5px; } + /* line 213, ../sass/user-environ/_layout.scss */ .pane.treeview .tree-holder { overflow: auto; - top: 40px; } - /* line 195, ../sass/user-environ/_layout.scss */ + top: 35px; } + /* line 221, ../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 */ + .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 */ .pane.items .object-holder { - top: 40px; } - /* line 200, ../sass/user-environ/_layout.scss */ + top: 35px; } + /* line 234, ../sass/user-environ/_layout.scss */ .pane.edit-main .object-holder { top: 0; } - /* line 206, ../sass/user-environ/_layout.scss */ + /* line 240, ../sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 214, ../sass/user-environ/_layout.scss */ +/* line 248, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 217, ../sass/user-environ/_layout.scss */ + /* line 251, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 224, ../sass/user-environ/_layout.scss */ +/* line 258, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 226, ../sass/user-environ/_layout.scss */ + /* line 260, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 230, ../sass/user-environ/_layout.scss */ + /* line 264, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 232, ../sass/user-environ/_layout.scss */ + /* line 266, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 5px; } -/* line 241, ../sass/user-environ/_layout.scss */ +/* line 275, ../sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } -/* line 2, ../sass/_fixed-position.scss */ +/***************************************************************************** + * 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 23, ../sass/_fixed-position.scss */ .t-fixed-position.l-fixed-position { position: absolute; top: 0; @@ -432,126 +670,157 @@ span { left: 0; width: auto; height: auto; } - /* line 12, ../sass/_fixed-position.scss */ + /* line 29, ../sass/_fixed-position.scss */ .t-fixed-position.l-fixed-position .l-grid-holder { position: relative; height: 100%; width: 100%; } - /* line 16, ../sass/_fixed-position.scss */ + /* line 32, ../sass/_fixed-position.scss */ .t-fixed-position.l-fixed-position .l-grid-holder .l-grid { position: absolute; height: 100%; width: 100%; pointer-events: none; z-index: 0; } -/* line 27, ../sass/_fixed-position.scss */ +/* line 42, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item { position: absolute; border: 1px solid transparent; } - /* line 31, ../sass/_fixed-position.scss */ + /* line 46, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item.s-selected { - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -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; cursor: move; } - /* line 36, ../sass/_fixed-position.scss */ + /* line 51, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item.s-not-selected { opacity: 0.8; } - /* line 42, ../sass/_fixed-position.scss */ + /* line 55, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-box, .t-fixed-position .l-fixed-position-item .l-fixed-position-image, .t-fixed-position .l-fixed-position-item .l-fixed-position-text { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; height: 100%; width: 100%; } - /* line 51, ../sass/_fixed-position.scss */ + /* line 65, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-image { background-size: cover; background-repeat: no-repeat; background-position: center; } - /* line 57, ../sass/_fixed-position.scss */ + /* line 71, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; border: 1px solid transparent; - font-size: 0.8rem; } - /* line 62, ../sass/_fixed-position.scss */ + font-size: 0.8rem; + line-height: 100%; } + /* line 77, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text { - padding: 3px; } - /* line 67, ../sass/_fixed-position.scss */ + padding: 1px; } + /* line 82, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem { overflow: hidden; position: absolute; - top: 3px; - right: 3px; - bottom: 3px; - left: 3px; + top: 0; + right: 0; + bottom: 0; + left: 0; width: auto; height: auto; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; + padding: 2px; width: 50%; } - /* line 71, ../sass/_fixed-position.scss */ + /* line 88, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title { right: auto; - left: 3px; } - /* line 75, ../sass/_fixed-position.scss */ + left: 1px; } + /* line 92, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { - right: 3px; + right: 1px; left: auto; text-align: right; } - /* line 80, ../sass/_fixed-position.scss */ + /* line 97, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { - left: 3px; + left: 1px; width: auto; } -/* line 91, ../sass/_fixed-position.scss */ + /* line 102, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value .l-value-bg { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + padding: 0 4px; } +/* line 112, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item-handle { background: rgba(0, 153, 204, 0.5); cursor: crosshair; border: 1px solid #0099cc; position: absolute; } -/* line 105, ../sass/_fixed-position.scss */ +/* line 126, ../sass/_fixed-position.scss */ .edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-x { - background-image: -webkit-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); - background-image: -moz-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); - background-image: -o-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); - background-image: linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); + background-size: 100%; + background-image: -moz-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); background-repeat: repeat-x; } -/* line 109, ../sass/_fixed-position.scss */ +/* line 130, ../sass/_fixed-position.scss */ .edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-y { - background-image: -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); - background-image: -moz-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); - background-image: -o-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); - background-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxcHgiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4wNSIvPjxzdG9wIG9mZnNldD0iMXB4IiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBzdG9wLW9wYWNpdHk9IjAuMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); + background-size: 100%; + background-image: -moz-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: -webkit-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); + background-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, rgba(0, 0, 0, 0) 1px, rgba(0, 0, 0, 0) 100%); background-repeat: repeat-y; } -/* line 117, ../sass/_fixed-position.scss */ +/* line 138, ../sass/_fixed-position.scss */ .edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected) { border: 1px dotted rgba(0, 153, 204, 0.75); } - /* line 119, ../sass/_fixed-position.scss */ + /* line 140, ../sass/_fixed-position.scss */ .edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover { border: 1px dotted #0099cc; } -/* line 5, ../sass/_about.scss */ +/***************************************************************************** + * 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/_about.scss */ .l-about.abs, .btn-menu span.l-about.l-click-area { overflow: auto; } -/* line 10, ../sass/_about.scss */ +/* line 31, ../sass/_about.scss */ .l-about .l-logo-holder { position: relative; height: 45%; } - /* line 13, ../sass/_about.scss */ + /* line 34, ../sass/_about.scss */ .l-about .l-logo-holder .l-logo { position: absolute; } - /* line 16, ../sass/_about.scss */ + /* line 37, ../sass/_about.scss */ .l-about .l-logo-holder .l-logo.l-logo-app { top: 0; right: 15%; bottom: 0; left: 15%; } - /* line 20, ../sass/_about.scss */ + /* line 41, ../sass/_about.scss */ .l-about .l-logo-holder .l-logo.s-logo-nasa { background-image: url("../images/logo-nasa.svg"); top: 10px; @@ -562,125 +831,186 @@ span { height: auto; padding-bottom: 5%; padding-top: 5%; } -/* line 29, ../sass/_about.scss */ +/* line 50, ../sass/_about.scss */ .l-about .l-content { position: relative; margin-top: 10px; } -/* line 36, ../sass/_about.scss */ +/* line 57, ../sass/_about.scss */ .s-about { line-height: 120%; } - /* line 40, ../sass/_about.scss */ + /* line 61, ../sass/_about.scss */ .s-about a { color: #84b3ff; } - /* line 47, ../sass/_about.scss */ + /* line 68, ../sass/_about.scss */ .s-about .s-logo-holder { background: url("../images/bg-about-openmctweb.jpg") no-repeat center; background-size: cover; } - /* line 51, ../sass/_about.scss */ + /* line 72, ../sass/_about.scss */ .s-about .s-logo { background-position: center; background-repeat: no-repeat; background-size: contain; } - /* line 57, ../sass/_about.scss */ + /* line 78, ../sass/_about.scss */ .s-about .s-logo-openmctweb { background-image: url("../images/logo-openmctweb-shdw.svg"); } - /* line 60, ../sass/_about.scss */ + /* line 81, ../sass/_about.scss */ .s-about .s-btn, .s-about .s-icon-btn { line-height: 2em; } - /* line 64, ../sass/_about.scss */ + /* line 85, ../sass/_about.scss */ .s-about .l-licenses-software .l-license-software { border-top: 1px solid #4d4d4d; padding: 0.5em 0; } - /* line 67, ../sass/_about.scss */ + /* line 88, ../sass/_about.scss */ .s-about .l-licenses-software .l-license-software:first-child { border-top: none; } - /* line 70, ../sass/_about.scss */ + /* line 91, ../sass/_about.scss */ .s-about .l-licenses-software .l-license-software em { color: #666666; } - /* line 77, ../sass/_about.scss */ + /* line 98, ../sass/_about.scss */ .s-about .l-licenses-software .l-license-software h3 { font-size: 1.25em; } - /* line 80, ../sass/_about.scss */ + /* line 101, ../sass/_about.scss */ .s-about .l-licenses-software .l-license-software .s-license-text { font-size: 0.9em; } -/* line 3, ../sass/_text.scss */ +/***************************************************************************** + * 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 24, ../sass/_text.scss */ .abs.l-standalone, .btn-menu span.l-standalone.l-click-area { padding: 5% 20%; } -/* line 8, ../sass/_text.scss */ +/* line 29, ../sass/_text.scss */ .s-text { font-size: 0.8em; } - /* line 10, ../sass/_text.scss */ + /* line 31, ../sass/_text.scss */ .s-text ol, .s-text ul { list-style: square; margin-left: 1.5em; } - /* line 18, ../sass/_text.scss */ + /* line 39, ../sass/_text.scss */ .s-text h1, .s-text h2, .s-text h3 { color: #fff; font-weight: normal !important; margin-bottom: 1em; } - /* line 24, ../sass/_text.scss */ + /* line 45, ../sass/_text.scss */ .s-text h2 { border-top: 1px solid #4d4d4d; font-size: 1.5em; margin-top: 2em; padding-top: 1em; } - /* line 31, ../sass/_text.scss */ + /* line 52, ../sass/_text.scss */ .s-text h3 { margin-top: 2em; } -/* line 1, ../sass/_badges.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/_badges.scss */ .badge { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZDIzMyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmYzcwMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffd233), color-stop(100%, #ffc700)); - background-image: -webkit-linear-gradient(#ffd233, #ffc700); background-image: -moz-linear-gradient(#ffd233, #ffc700); - background-image: -o-linear-gradient(#ffd233, #ffc700); + background-image: -webkit-linear-gradient(#ffd233, #ffc700); background-image: linear-gradient(#ffd233, #ffc700); - color: #333333; + color: #333; display: inline-block; text-align: center; } -/* line 8, ../sass/_badges.scss */ +/* line 29, ../sass/_badges.scss */ .top-bar .badge { - -webkit-border-radius: 4.5px; -moz-border-radius: 4.5px; - -ms-border-radius: 4.5px; - -o-border-radius: 4.5px; + -webkit-border-radius: 4.5px; border-radius: 4.5px; font-size: 1.4em; - height: 35px; - line-height: 35px; + height: 25px; + line-height: 25px; margin-right: 5px; width: 35px; vertical-align: middle; } -/* line 33, ../sass/_badges.scss */ +/* line 54, ../sass/_badges.scss */ .super-menu .badge { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwOTljYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00bfff), color-stop(100%, #0099cc)); - background-image: -webkit-linear-gradient(#00bfff, #0099cc); background-image: -moz-linear-gradient(#00bfff, #0099cc); - background-image: -o-linear-gradient(#00bfff, #0099cc); + background-image: -webkit-linear-gradient(#00bfff, #0099cc); background-image: linear-gradient(#00bfff, #0099cc); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; padding: 2px 7px; } -/* line 1, ../sass/_icons.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/_icons.scss */ .triangle { width: 0; height: 0; border-top: 5px solid transparent; border-left: 5px solid #0099cc; border-bottom: 5px solid transparent; } - /* line 5, ../sass/_icons.scss */ + /* line 26, ../sass/_icons.scss */ .triangle.triangle-down { width: 0; height: 0; @@ -688,52 +1018,52 @@ span { border-top: 5px solid #0099cc; border-right: 5px solid transparent; } -/* line 12, ../sass/_icons.scss */ +/* line 33, ../sass/_icons.scss */ .ui-symbol.icon { color: #0099cc; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; } - /* line 15, ../sass/_icons.scss */ + /* line 36, ../sass/_icons.scss */ .ui-symbol.icon.alert { color: #ff3c00; } - /* line 17, ../sass/_icons.scss */ + /* line 38, ../sass/_icons.scss */ .ui-symbol.icon.alert:hover { color: #ff8a66; } - /* line 21, ../sass/_icons.scss */ + /* line 42, ../sass/_icons.scss */ .ui-symbol.icon.major { font-size: 1.65em; } -/* line 33, ../sass/_icons.scss */ +/* line 54, ../sass/_icons.scss */ .bar .icon { display: inline-block; } -/* line 37, ../sass/_icons.scss */ +/* line 58, ../sass/_icons.scss */ .invoke-menu { color: #0099cc; display: inline-block; font-size: 1rem; vertical-align: middle; } - /* line 171, ../sass/_mixins.scss */ + /* line 200, ../sass/_mixins.scss */ .invoke-menu:hover { color: #33ccff; } -/* line 45, ../sass/_icons.scss */ +/* line 65, ../sass/_icons.scss */ .btn-menu .invoke-menu, .icon.major .invoke-menu { margin-left: 5px; } -/* line 49, ../sass/_icons.scss */ +/* line 70, ../sass/_icons.scss */ .icon-buttons-main .invoke-menu { color: #666666; } - /* line 171, ../sass/_mixins.scss */ + /* line 200, ../sass/_mixins.scss */ .icon-buttons-main .invoke-menu:hover { color: #999999; } -/* line 57, ../sass/_icons.scss */ +/* line 78, ../sass/_icons.scss */ .object-header .type-icon { - color: #ffc700; + color: #0099cc; margin-right: 5px; } -/* line 65, ../sass/_icons.scss */ +/* line 83, ../sass/_icons.scss */ .menu .type-icon, .tree-item .type-icon, .icon-btn .menu.dropdown .icon, @@ -742,200 +1072,399 @@ span { line-height: 1.695rem; position: absolute; } -/* line 1, ../sass/lists/_tabular.scss */ -.w1 { - background: #4d4d4d; - padding-top: 20px; - position: relative; } +/*.s-limit-upr, +.s-limit-lwr { + $a: 0.5; + $l: 30%; + white-space: nowrap; + &:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.85em; + font-style: normal !important; + margin-right: $interiorMarginSm; + vertical-align: middle; + } +} -/* line 6, ../sass/lists/_tabular.scss */ -.w2 { - background: #1a1a1a; - overflow-y: auto; } +.s-limit-upr { + &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ed"); } + &.s-limit-red { @include limit($colorLimitRed, "\0000eb"); } +} -/* line 11, ../sass/lists/_tabular.scss */ +.s-limit-lwr { + &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); } + &.s-limit-red { @include limit($colorLimitRed, "\0000ee"); } +}*/ +/* line 35, ../sass/_limits.scss */ +[class*="s-limit"] { + white-space: nowrap; } + /* line 39, ../sass/_limits.scss */ + [class*="s-limit"]:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.85em; + font-style: normal !important; + margin-right: 3px; + vertical-align: middle; } + +/* line 49, ../sass/_limits.scss */ +.s-limit-upr-red { + background: #aa0000; } + /* line 3, ../sass/_limits.scss */ + .s-limit-upr-red:before { + color: #ff4444; + content: "ë"; } + +/* line 50, ../sass/_limits.scss */ +.s-limit-upr-yellow { + background: #9d7500; } + /* line 3, ../sass/_limits.scss */ + .s-limit-upr-yellow:before { + color: #ffcc37; + content: "í"; } + +/* line 51, ../sass/_limits.scss */ +.s-limit-lwr-yellow { + background: #9d7500; } + /* line 3, ../sass/_limits.scss */ + .s-limit-lwr-yellow:before { + color: #ffcc37; + content: "ì"; } + +/* line 52, ../sass/_limits.scss */ +.s-limit-lwr-red { + background: #aa0000; } + /* line 3, ../sass/_limits.scss */ + .s-limit-lwr-red:before { + color: #ff4444; + content: "î"; } + +/* line 1, ../sass/_data-status.scss */ +.s-stale { + color: rgba(255, 255, 255, 0.5) !important; + font-style: italic; } + /* line 3, ../sass/_data-status.scss */ + .s-stale .td { + color: rgba(255, 255, 255, 0.5) !important; + font-style: italic; } + +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/lists/_tabular.scss */ +.w1, .w2 { + position: relative; + height: 100%; } + +/* line 27, ../sass/lists/_tabular.scss */ .tabular { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; border-spacing: 0; border-collapse: collapse; + color: #fff; display: table; font-size: 0.8em; + position: relative; + height: 100%; width: 100%; } - /* line 18, ../sass/lists/_tabular.scss */ - .tabular .tr { - display: table-row; } - /* line 20, ../sass/lists/_tabular.scss */ - .tabular .tr:first-child .td { - border-top: none; } - /* line 23, ../sass/lists/_tabular.scss */ - .tabular .tr:hover { + /* line 37, ../sass/lists/_tabular.scss */ + .tabular thead, .tabular .thead, + .tabular tbody tr, .tabular .tbody .tr { + display: table; + width: 100%; + table-layout: fixed; } + /* line 43, ../sass/lists/_tabular.scss */ + .tabular thead, .tabular .thead { + width: calc(100% - 10px); } + /* line 45, ../sass/lists/_tabular.scss */ + .tabular thead tr, .tabular thead .tr, .tabular .thead tr, .tabular .thead .tr { + height: 18px; } + /* line 48, ../sass/lists/_tabular.scss */ + .tabular thead:before, .tabular .thead:before { + content: ""; + display: block; + z-index: 0; + position: absolute; + width: 100%; + height: 18px; + background: rgba(255, 255, 255, 0.15); } + /* line 58, ../sass/lists/_tabular.scss */ + .tabular tbody, .tabular .tbody { + overflow: hidden; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; + top: 18px; + display: block; + overflow-y: scroll; } + /* line 66, ../sass/lists/_tabular.scss */ + .tabular tbody tr:hover, .tabular tbody .tr:hover, .tabular .tbody tr:hover, .tabular .tbody .tr:hover { background: rgba(255, 255, 255, 0.1); } - /* line 26, ../sass/lists/_tabular.scss */ - .tabular .tr.header { - display: table-header-group; } - /* line 28, ../sass/lists/_tabular.scss */ - .tabular .tr.header .th { - border: none; - color: transparent; - height: 0px; - line-height: 0; - padding: 0 5px; - white-space: nowrap; - vertical-align: middle; } - /* line 36, ../sass/lists/_tabular.scss */ - .tabular .tr.header .th:first-child em { - border-left: none; } - /* line 40, ../sass/lists/_tabular.scss */ - .tabular .tr.header .th.sort em:after { - display: inline-block; - font-family: symbolsfont; - margin-left: 5px; } - /* line 45, ../sass/lists/_tabular.scss */ - .tabular .tr.header .th.sort.asc em:after { - content: '0'; } - /* line 46, ../sass/lists/_tabular.scss */ - .tabular .tr.header .th.sort.desc em:after { - content: '1'; } - /* line 48, ../sass/lists/_tabular.scss */ - .tabular .tr.header .th em { - border-left: 1px solid rgba(255, 255, 255, 0.1); - color: #b3b3b3; - cursor: pointer; - display: block; - font-style: normal; - font-weight: bold; - height: 20px; - line-height: 20px; - margin-left: -5px; - padding: 0 5px; - position: absolute; - top: 0; - vertical-align: middle; } - /* line 63, ../sass/lists/_tabular.scss */ - .tabular .tr.header .th em:hover { - color: #e6e6e6; } - /* line 69, ../sass/lists/_tabular.scss */ - .tabular .tr .th, .tabular .tr .td { - display: table-cell; } - /* line 72, ../sass/lists/_tabular.scss */ - .tabular .tr .td { - border-top: 1px solid rgba(255, 255, 255, 0.1); - padding: 2px 5px; } - /* line 75, ../sass/lists/_tabular.scss */ - .tabular .tr .td.numeric { - text-align: right; } + /* line 74, ../sass/lists/_tabular.scss */ + .tabular tr:first-child .td, .tabular .tr:first-child .td { + border-top: none; } + /* line 77, ../sass/lists/_tabular.scss */ + .tabular tr th, .tabular tr .th, .tabular tr td, .tabular tr .td, .tabular .tr th, .tabular .tr .th, .tabular .tr td, .tabular .tr .td { + display: table-cell; } + /* line 80, ../sass/lists/_tabular.scss */ + .tabular tr th, .tabular tr .th, .tabular .tr th, .tabular .tr .th { + border: none; + border-left: 1px solid rgba(255, 255, 255, 0.1); + color: #b3b3b3; + padding: 0 5px; + white-space: nowrap; + vertical-align: middle; + /* em { + //background: rgba(green, 0.2); + border-left: 1px solid $tabularColorBorder; + color: $tabularColorHeaderFg; + cursor: pointer; + display: block; + font-style: normal; + font-weight: bold; + height: $tabularHeaderH; + line-height: $tabularHeaderH; + margin-left: - $tabularTdPadLR; + padding: 0 $tabularTdPadLR; + position: absolute; + top: 0; + vertical-align: middle; + &:hover { + color: lighten($tabularColorHeaderFg, 20%); + } + }*/ } + /* line 87, ../sass/lists/_tabular.scss */ + .tabular tr th:first-child, .tabular tr .th:first-child, .tabular .tr th:first-child, .tabular .tr .th:first-child { + border-left: none; } + /* line 91, ../sass/lists/_tabular.scss */ + .tabular tr th.sort .icon-sorting:before, .tabular tr .th.sort .icon-sorting:before, .tabular .tr th.sort .icon-sorting:before, .tabular .tr .th.sort .icon-sorting:before { + display: inline-block; + font-family: symbolsfont; + margin-left: 5px; } + /* line 96, ../sass/lists/_tabular.scss */ + .tabular tr th.sort.asc .icon-sorting:before, .tabular tr .th.sort.asc .icon-sorting:before, .tabular .tr th.sort.asc .icon-sorting:before, .tabular .tr .th.sort.asc .icon-sorting:before { + content: '0'; } + /* line 99, ../sass/lists/_tabular.scss */ + .tabular tr th.sort.desc .icon-sorting:before, .tabular tr .th.sort.desc .icon-sorting:before, .tabular .tr th.sort.desc .icon-sorting:before, .tabular .tr .th.sort.desc .icon-sorting:before { + content: '1'; } + /* line 123, ../sass/lists/_tabular.scss */ + .tabular tr td, .tabular tr .td, .tabular .tr td, .tabular .tr .td { + border-top: 1px solid rgba(255, 255, 255, 0.1); + padding: 2px 5px; } + /* line 126, ../sass/lists/_tabular.scss */ + .tabular tr td.numeric, .tabular tr .td.numeric, .tabular .tr td.numeric, .tabular .tr .td.numeric { + text-align: right; } + /* line 132, ../sass/lists/_tabular.scss */ + .tabular.filterable tbody, .tabular.filterable .tbody { + top: 36px; } +/* line 1, ../sass/controls/_breadcrumb.scss */ +.l-breadcrumb { + font-size: 0.7rem; + line-height: 1em; + margin-bottom: 5px; + margin-left: -4px; } + /* line 10, ../sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a { + -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-transition: background-color 0.25s; + -o-transition: background-color 0.25s; + -webkit-transition: background-color 0.25s; + transition: background-color 0.25s; + color: #737373; + display: inline-block; + padding: 2px 4px; } + /* line 18, ../sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a .icon { + color: #0099cc; + margin-right: 5px; } + /* line 22, ../sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a:hover { + background: #4d4d4d; + color: #b3b3b3; } + /* line 25, ../sass/controls/_breadcrumb.scss */ + .l-breadcrumb .l-breadcrumb-item a:hover .icon { + color: #33ccff; } + +/***************************************************************************** + * 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. + *****************************************************************************/ /*********************************** TYPE STYLES */ -/* line 4, ../sass/controls/_buttons.scss */ +/* line 25, ../sass/controls/_buttons.scss */ .t-btn { cursor: pointer; } /*********************************** STYLE STYLES */ -/* line 10, ../sass/controls/_buttons.scss */ +/* line 31, ../sass/controls/_buttons.scss */ .s-btn, .s-icon-btn { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -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; line-height: 1.2em; padding: 0 10px; text-decoration: none; } - /* line 18, ../sass/controls/_buttons.scss */ + /* 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=='); + background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); - background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -o-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: linear-gradient(#4d4d4d, #404040); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #666666; - color: #999999; + color: #999; display: inline-block; } - /* line 82, ../sass/_mixins.scss */ + /* 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=='); + background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959)); - background-image: -webkit-linear-gradient(#666666, #595959); background-image: -moz-linear-gradient(#666666, #595959); - background-image: -o-linear-gradient(#666666, #595959); + background-image: -webkit-linear-gradient(#666666, #595959); background-image: linear-gradient(#666666, #595959); } -/* line 23, ../sass/controls/_buttons.scss */ +/* line 44, ../sass/controls/_buttons.scss */ .s-icon-btn { font-size: 1.2em; } - /* line 26, ../sass/controls/_buttons.scss */ + /* line 47, ../sass/controls/_buttons.scss */ .s-icon-btn .icon { color: #0099cc; } - /* line 30, ../sass/controls/_buttons.scss */ + /* line 51, ../sass/controls/_buttons.scss */ .s-icon-btn:not(.disabled):hover .icon { color: #33ccff; } - /* line 34, ../sass/controls/_buttons.scss */ + /* line 55, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled { padding: 0 5px; } - /* line 36, ../sass/controls/_buttons.scss */ + /* line 57, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled .icon { font-size: 1.5em; } - /* line 39, ../sass/controls/_buttons.scss */ + /* line 60, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled .title-label { margin-left: 5px; } /*********************************** LAYOUT STYLES */ -/* line 50, ../sass/controls/_buttons.scss */ +/* line 68, ../sass/controls/_buttons.scss */ span.l-btn, span.l-btn span, a.l-btn, a.l-btn span { display: inline-block; } -/* line 1, ../sass/controls/_color-palette.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/controls/_color-palette.scss */ .l-color-palette { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; padding: 5px !important; } - /* line 10, ../sass/controls/_color-palette.scss */ + /* line 31, ../sass/controls/_color-palette.scss */ .l-color-palette .l-palette-row { overflow: hidden; *zoom: 1; line-height: 16px; width: 170px; } - /* line 15, ../sass/controls/_color-palette.scss */ + /* line 36, ../sass/controls/_color-palette.scss */ .l-color-palette .l-palette-row .l-palette-item { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; text-shadow: rgba(0, 0, 0, 0.8) 0 1px 2px; - -webkit-transition-property: visibility, opacity, background-color, border-color; -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; - -webkit-transition-duration: 0.25s; -moz-transition-duration: 0.25s; -o-transition-duration: 0.25s; + -webkit-transition-duration: 0.25s; transition-duration: 0.25s; - -webkit-transition-timing-function: ease-in-out; -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; border: 1px solid transparent; - color: white; + color: #fff; display: block; font-family: 'symbolsfont'; float: left; @@ -945,64 +1474,81 @@ a.l-btn span { margin: 0 1px 1px 0; text-align: center; vertical-align: middle; } - /* line 32, ../sass/controls/_color-palette.scss */ + /* line 53, ../sass/controls/_color-palette.scss */ .l-color-palette .l-palette-row .s-palette-item:hover { - -webkit-transition-property: none; -moz-transition-property: none; -o-transition-property: none; + -webkit-transition-property: none; transition-property: none; - border-color: white !important; } - /* line 38, ../sass/controls/_color-palette.scss */ + border-color: #fff !important; } + /* line 59, ../sass/controls/_color-palette.scss */ .l-color-palette .l-palette-row .l-palette-item-label { margin-left: 5px; } - /* line 42, ../sass/controls/_color-palette.scss */ + /* line 63, ../sass/controls/_color-palette.scss */ .l-color-palette .l-palette-row.l-option-row { margin-bottom: 5px; } - /* line 44, ../sass/controls/_color-palette.scss */ + /* line 65, ../sass/controls/_color-palette.scss */ .l-color-palette .l-palette-row.l-option-row .s-palette-item { - border-color: #999999; } + border-color: #999; } -/* line 3, ../sass/controls/_controls.scss */ +/***************************************************************************** + * 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 24, ../sass/controls/_controls.scss */ .control.view-control .icon { display: inline-block; margin: -1px 5px 1px 2px; vertical-align: middle; } - /* line 7, ../sass/controls/_controls.scss */ + /* line 28, ../sass/controls/_controls.scss */ .control.view-control .icon.triangle-down { margin: 2px 2px -2px 0px; } -/* line 12, ../sass/controls/_controls.scss */ +/* line 33, ../sass/controls/_controls.scss */ .control.view-control .label { display: inline-block; font-size: 11px; vertical-align: middle; } -/* line 18, ../sass/controls/_controls.scss */ +/* line 39, ../sass/controls/_controls.scss */ .control.view-control .toggle { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; display: inline-block; padding: 1px 6px 4px 4px; } - /* line 22, ../sass/controls/_controls.scss */ + /* line 43, ../sass/controls/_controls.scss */ .control.view-control .toggle:hover { background: rgba(255, 255, 255, 0.1); } -/* line 29, ../sass/controls/_controls.scss */ +/* line 50, ../sass/controls/_controls.scss */ .accordion { margin-top: 5px; } - /* line 32, ../sass/controls/_controls.scss */ + /* line 53, ../sass/controls/_controls.scss */ .accordion:first-child { margin-top: 0; } - /* line 35, ../sass/controls/_controls.scss */ + /* line 56, ../sass/controls/_controls.scss */ .accordion .accordion-head { - -webkit-border-radius: 2.25px; -moz-border-radius: 2.25px; - -ms-border-radius: 2.25px; - -o-border-radius: 2.25px; + -webkit-border-radius: 2.25px; border-radius: 2.25px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; background: rgba(153, 153, 153, 0.2); cursor: pointer; @@ -1018,10 +1564,10 @@ a.l-btn span { width: auto; height: 18px; text-transform: uppercase; } - /* line 49, ../sass/controls/_controls.scss */ + /* line 70, ../sass/controls/_controls.scss */ .accordion .accordion-head:hover { background: rgba(153, 153, 153, 0.4); } - /* line 52, ../sass/controls/_controls.scss */ + /* line 73, ../sass/controls/_controls.scss */ .accordion .accordion-head:after { content: "^"; display: block; @@ -1031,10 +1577,10 @@ a.l-btn span { right: 5px; text-transform: none; top: 0; } - /* line 62, ../sass/controls/_controls.scss */ + /* line 83, ../sass/controls/_controls.scss */ .accordion .accordion-head:not(.expanded):after { content: "v"; } - /* line 66, ../sass/controls/_controls.scss */ + /* line 87, ../sass/controls/_controls.scss */ .accordion .accordion-contents { position: absolute; top: 23px; @@ -1044,226 +1590,221 @@ a.l-btn span { overflow-y: auto; overflow-x: hidden; } -/* line 74, ../sass/controls/_controls.scss */ +/* line 95, ../sass/controls/_controls.scss */ .btn { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -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 84, ../sass/controls/_controls.scss */ + /* line 105, ../sass/controls/_controls.scss */ .btn.create-btn { - height: 35px; - line-height: 35px; - font-size: 1.1em; - padding: 0 15px 0 10px; } - /* line 90, ../sass/controls/_controls.scss */ + height: 25px; + line-height: 25px; + padding: 0 22.5px; } + /* line 112, ../sass/controls/_controls.scss */ .btn.create-btn .menu { - margin-left: -10px; } - /* line 93, ../sass/controls/_controls.scss */ + margin-left: -22.5px; } + /* line 115, ../sass/controls/_controls.scss */ .btn.create-btn .ui-symbol.major { font-size: 1.1em; } - /* line 97, ../sass/controls/_controls.scss */ + /* 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: -webkit-linear-gradient(#00bfff, #00ace6); background-image: -moz-linear-gradient(#00bfff, #00ace6); - background-image: -o-linear-gradient(#00bfff, #00ace6); + background-image: -webkit-linear-gradient(#00bfff, #00ace6); background-image: linear-gradient(#00bfff, #00ace6); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #33ccff; - color: #999999; + 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: -webkit-linear-gradient(#33ccff, #0099cc); background-image: -moz-linear-gradient(#33ccff, #0099cc); - background-image: -o-linear-gradient(#33ccff, #0099cc); + background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #ccf2ff; } - /* line 135, ../sass/_mixins.scss */ + /* 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: -webkit-linear-gradient(#66d9ff, #00bfff); background-image: -moz-linear-gradient(#66d9ff, #00bfff); - background-image: -o-linear-gradient(#66d9ff, #00bfff); + background-image: -webkit-linear-gradient(#66d9ff, #00bfff); background-image: linear-gradient(#66d9ff, #00bfff); } - /* line 102, ../sass/controls/_controls.scss */ + /* 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: -webkit-linear-gradient(#1ac6ff, #00bfff); background-image: -moz-linear-gradient(#1ac6ff, #00bfff); - background-image: -o-linear-gradient(#1ac6ff, #00bfff); + background-image: -webkit-linear-gradient(#1ac6ff, #00bfff); background-image: linear-gradient(#1ac6ff, #00bfff); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #4dd2ff; - color: #999999; + 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: -webkit-linear-gradient(#4dd2ff, #00ace6); background-image: -moz-linear-gradient(#4dd2ff, #00ace6); - background-image: -o-linear-gradient(#4dd2ff, #00ace6); + background-image: -webkit-linear-gradient(#4dd2ff, #00ace6); background-image: linear-gradient(#4dd2ff, #00ace6); color: #ccf2ff; } - /* line 135, ../sass/_mixins.scss */ + /* 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: -webkit-linear-gradient(#80dfff, #1ac6ff); background-image: -moz-linear-gradient(#80dfff, #1ac6ff); - background-image: -o-linear-gradient(#80dfff, #1ac6ff); + background-image: -webkit-linear-gradient(#80dfff, #1ac6ff); background-image: linear-gradient(#80dfff, #1ac6ff); } - /* line 106, ../sass/controls/_controls.scss */ + /* line 128, ../sass/controls/_controls.scss */ .btn.major .invoke-menu { color: #ccf2ff; } - /* line 110, ../sass/controls/_controls.scss */ + /* line 132, ../sass/controls/_controls.scss */ .btn.normal { - padding: 5px 7px; } - /* line 114, ../sass/controls/_controls.scss */ + padding: 11.25px 15.75px; } + /* line 136, ../sass/controls/_controls.scss */ .btn.outline:hover { background: rgba(255, 255, 255, 0.1); } - /* line 118, ../sass/controls/_controls.scss */ + /* 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: -webkit-linear-gradient(#808080, #737373); background-image: -moz-linear-gradient(#808080, #737373); - background-image: -o-linear-gradient(#808080, #737373); + background-image: -webkit-linear-gradient(#808080, #737373); background-image: linear-gradient(#808080, #737373); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #999999; color: #cccccc; display: inline-block; } - /* line 127, ../sass/_mixins.scss */ + /* 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: -webkit-linear-gradient(#999999, #808080); background-image: -moz-linear-gradient(#999999, #808080); - background-image: -o-linear-gradient(#999999, #808080); + background-image: -webkit-linear-gradient(#999999, #808080); background-image: linear-gradient(#999999, #808080); } - /* line 122, ../sass/controls/_controls.scss */ + /* 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: -webkit-linear-gradient(#4d4d4d, #404040); background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -o-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: linear-gradient(#4d4d4d, #404040); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #666666; color: #b3b3b3; display: inline-block; } - /* line 127, ../sass/_mixins.scss */ + /* 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: -webkit-linear-gradient(#666666, #4d4d4d); background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -o-linear-gradient(#666666, #4d4d4d); + background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 125, ../sass/controls/_controls.scss */ + /* line 147, ../sass/controls/_controls.scss */ .btn.lg { - -webkit-border-radius: 4.5px; -moz-border-radius: 4.5px; - -ms-border-radius: 4.5px; - -o-border-radius: 4.5px; + -webkit-border-radius: 4.5px; border-radius: 4.5px; font-size: 1.2em; padding: 7px 25px; } - /* line 131, ../sass/controls/_controls.scss */ + /* line 153, ../sass/controls/_controls.scss */ .btn.icon-btn .icon { color: #0099cc; } - /* line 135, ../sass/controls/_controls.scss */ + /* line 157, ../sass/controls/_controls.scss */ .btn.icon-btn:not(.disabled):hover .icon { color: #33ccff; } -/* line 145, ../sass/controls/_controls.scss */ +/* line 165, ../sass/controls/_controls.scss */ .btn-bar .btn, .btn-bar .btn-set, .btn-bar .t-btn { display: inline-block; } -/* line 157, ../sass/controls/_controls.scss */ +/* line 179, ../sass/controls/_controls.scss */ .l-composite-control { vertical-align: middle; } - /* line 160, ../sass/controls/_controls.scss */ + /* line 182, ../sass/controls/_controls.scss */ .l-composite-control.l-checkbox .composite-control-label { line-height: 18px; } -/* line 166, ../sass/controls/_controls.scss */ +/* line 188, ../sass/controls/_controls.scss */ .l-control-group { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; border-left: 1px solid #4d4d4d; display: inline-block; padding: 0 5px; position: relative; } - /* line 174, ../sass/controls/_controls.scss */ + /* line 196, ../sass/controls/_controls.scss */ .l-control-group:first-child { border-left: none; padding-left: 0; } -/* line 180, ../sass/controls/_controls.scss */ +/* line 202, ../sass/controls/_controls.scss */ .btn-set { display: inline-block; position: relative; } - /* line 185, ../sass/controls/_controls.scss */ + /* line 206, ../sass/controls/_controls.scss */ .btn-set .btn, .btn-set .t-btn { - -webkit-border-radius: 0; -moz-border-radius: 0; - -ms-border-radius: 0; - -o-border-radius: 0; + -webkit-border-radius: 0; border-radius: 0; border-left: 1px solid #666666; margin-left: 0; } - /* line 189, ../sass/controls/_controls.scss */ + /* line 211, ../sass/controls/_controls.scss */ .btn-set .btn:first-child, .btn-set .t-btn:first-child { border-left: none; @@ -1273,7 +1814,7 @@ a.l-btn span { -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; } - /* line 193, ../sass/controls/_controls.scss */ + /* line 215, ../sass/controls/_controls.scss */ .btn-set .btn:last-child, .btn-set .t-btn:last-child { -moz-border-radius-topright: 3px; @@ -1283,7 +1824,7 @@ a.l-btn span { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 204, ../sass/controls/_controls.scss */ +/* line 221, ../sass/controls/_controls.scss */ .object-browse-bar .btn, .object-browse-bar .t-btn, .top-bar .buttons-main .btn, @@ -1291,10 +1832,10 @@ a.l-btn span { .tool-bar .btn, .tool-bar .t-btn { display: inline-block; - font-size: 12.6px; - height: 28px; - line-height: 28px; } - /* line 210, ../sass/controls/_controls.scss */ + font-size: 11.25px; + height: 25px; + line-height: 25px; } + /* line 232, ../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), @@ -1304,7 +1845,7 @@ a.l-btn span { font-size: 150%; vertical-align: middle; } -/* line 218, ../sass/controls/_controls.scss */ +/* line 240, ../sass/controls/_controls.scss */ label.checkbox.custom { cursor: pointer; display: inline-block; @@ -1313,18 +1854,16 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: top; } - /* line 229, ../sass/controls/_controls.scss */ + /* line 251, ../sass/controls/_controls.scss */ label.checkbox.custom em { - color: #999999; + color: #999; display: inline-block; height: 14px; min-width: 14px; } - /* line 234, ../sass/controls/_controls.scss */ + /* line 256, ../sass/controls/_controls.scss */ label.checkbox.custom em:before { - -webkit-border-radius: 2.25px; -moz-border-radius: 2.25px; - -ms-border-radius: 2.25px; - -o-border-radius: 2.25px; + -webkit-border-radius: 2.25px; border-radius: 2.25px; background: #666666; border-bottom: 1px solid gray; @@ -1340,164 +1879,160 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 252, ../sass/controls/_controls.scss */ + /* line 274, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text { overflow: hidden; margin-right: 0; padding-left: 0; height: 14px; width: 14px; } - /* line 258, ../sass/controls/_controls.scss */ + /* line 280, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 262, ../sass/controls/_controls.scss */ + /* line 284, ../sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 264, ../sass/controls/_controls.scss */ + /* line 286, ../sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 272, ../sass/controls/_controls.scss */ +/* line 294, ../sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 274, ../sass/controls/_controls.scss */ + /* line 296, ../sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 278, ../sass/controls/_controls.scss */ + /* line 300, ../sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 281, ../sass/controls/_controls.scss */ + /* line 303, ../sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 286, ../sass/controls/_controls.scss */ +/* line 308, ../sass/controls/_controls.scss */ .btn-menu label.checkbox.custom { margin-left: 5px; } -/* line 291, ../sass/controls/_controls.scss */ +/* line 313, ../sass/controls/_controls.scss */ .item .checkbox.checked label { - -webkit-box-shadow: none; -moz-box-shadow: none; + -webkit-box-shadow: none; box-shadow: none; border-bottom: none; } -/* line 297, ../sass/controls/_controls.scss */ +/* line 319, ../sass/controls/_controls.scss */ .btn-menu { + 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: -webkit-linear-gradient(#4d4d4d, #404040); background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -o-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: linear-gradient(#4d4d4d, #404040); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #666666; - color: #999999; + color: #999; display: inline-block; height: 20px; line-height: 20px; } - /* line 127, ../sass/_mixins.scss */ + /* line 148, ../sass/_mixins.scss */ .btn-menu: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: -webkit-linear-gradient(#666666, #4d4d4d); background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -o-linear-gradient(#666666, #4d4d4d); + background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 304, ../sass/controls/_controls.scss */ + /* line 326, ../sass/controls/_controls.scss */ .btn-menu.dropdown { padding-left: 10px; padding-right: 10px; } - /* line 310, ../sass/controls/_controls.scss */ + /* line 332, ../sass/controls/_controls.scss */ .btn-menu:not(.disabled):hover { color: #cccccc; } - /* line 314, ../sass/controls/_controls.scss */ + /* line 336, ../sass/controls/_controls.scss */ .btn-menu.btn-invoke-menu { color: #0099cc; padding: 0 5px; } - /* line 318, ../sass/controls/_controls.scss */ + /* line 340, ../sass/controls/_controls.scss */ .btn-menu.btn-invoke-menu:hover { color: deepskyblue; } - /* line 328, ../sass/controls/_controls.scss */ + /* line 350, ../sass/controls/_controls.scss */ .btn-menu .type-icon { margin-right: 5px; } - /* line 331, ../sass/controls/_controls.scss */ + /* line 353, ../sass/controls/_controls.scss */ .btn-menu .menu { position: absolute; left: 0; text-align: left; } - /* line 336, ../sass/controls/_controls.scss */ + /* line 358, ../sass/controls/_controls.scss */ .btn-menu .menu .ui-symbol.icon { width: 12px; } -/* line 342, ../sass/controls/_controls.scss */ +/* line 364, ../sass/controls/_controls.scss */ .top-bar .btn-menu { - height: 35px; - line-height: 35px; + height: 25px; + line-height: 25px; padding-right: 10px; } - /* line 350, ../sass/controls/_controls.scss */ + /* line 372, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn { margin-right: 5px; - padding-left: 35px; } - /* line 353, ../sass/controls/_controls.scss */ + padding-left: 25px; } + /* line 375, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn .badge { - -webkit-border-radius: 4.5px; -moz-border-radius: 4.5px; - -ms-border-radius: 4.5px; - -o-border-radius: 4.5px; + -webkit-border-radius: 4.5px; border-radius: 4.5px; display: block; font-size: 1em; - line-height: 25px; + line-height: 15px; position: absolute; top: 5px; left: 5px; bottom: 5px; right: auto; - width: 25px; + width: 15px; height: auto; } /******************************************************** OBJECT-HEADER */ -/* line 370, ../sass/controls/_controls.scss */ +/* line 392, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 373, ../sass/controls/_controls.scss */ + /* line 395, ../sass/controls/_controls.scss */ .object-header .title { color: white; } - /* line 376, ../sass/controls/_controls.scss */ + /* line 398, ../sass/controls/_controls.scss */ .object-header .type-icon { font-size: 1.5em; margin-right: 5px; vertical-align: middle; } -/* line 385, ../sass/controls/_controls.scss */ +/* line 407, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 387, ../sass/controls/_controls.scss */ + /* line 409, ../sass/controls/_controls.scss */ .top-bar .object-header span, .object-browse-bar .object-header span { display: inline-block; } /******************************************************** VIEW-CONTROLS */ -/* line 396, ../sass/controls/_controls.scss */ +/* line 417, ../sass/controls/_controls.scss */ .view-controls .view-type { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; box-sizing: border-box; display: inline-block; @@ -1506,27 +2041,25 @@ label.checkbox.custom { line-height: 20px; padding-left: 5px; padding-right: 5px; } - /* line 407, ../sass/controls/_controls.scss */ + /* line 428, ../sass/controls/_controls.scss */ .view-controls .view-type.cur { background: #666666; } -/* line 412, ../sass/controls/_controls.scss */ +/* line 433, ../sass/controls/_controls.scss */ .edit-mode .top-bar .control-set.edit-view-controls { margin-right: 50px; } /******************************************************** SLIDERS */ -/* line 423, ../sass/controls/_controls.scss */ +/* line 444, ../sass/controls/_controls.scss */ .slider .slot { - -webkit-border-radius: 2px; -moz-border-radius: 2px; - -ms-border-radius: 2px; - -o-border-radius: 2px; + -webkit-border-radius: 2px; border-radius: 2px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; background-color: rgba(0, 0, 0, 0.4); border-bottom: 1px solid rgba(77, 77, 77, 0.4); @@ -1538,27 +2071,26 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 434, ../sass/controls/_controls.scss */ +/* line 455, ../sass/controls/_controls.scss */ .slider .knob { + 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: -webkit-linear-gradient(#4d4d4d, #404040); background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -o-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: linear-gradient(#4d4d4d, #404040); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #666666; - color: #999999; + color: #999; display: inline-block; cursor: ew-resize; position: absolute; @@ -1568,14 +2100,15 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 127, ../sass/_mixins.scss */ + /* line 148, ../sass/_mixins.scss */ .slider .knob: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: -webkit-linear-gradient(#666666, #4d4d4d); background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -o-linear-gradient(#666666, #4d4d4d); + background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 99, ../sass/_mixins.scss */ + /* line 120, ../sass/_mixins.scss */ .slider .knob:before { content: ''; display: block; @@ -1586,15 +2119,15 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 141, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } - /* line 445, ../sass/controls/_controls.scss */ + /* line 466, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 452, ../sass/controls/_controls.scss */ +/* line 473, ../sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -1605,23 +2138,21 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 462, ../sass/controls/_controls.scss */ + /* line 483, ../sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ -/* line 470, ../sass/controls/_controls.scss */ +/* line 491, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { - -webkit-border-radius: 2px; -moz-border-radius: 2px; - -ms-border-radius: 2px; - -o-border-radius: 2px; + -webkit-border-radius: 2px; border-radius: 2px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.7) 0 1px 5px; background-color: rgba(0, 0, 0, 0.4); border-bottom: 1px solid rgba(77, 77, 77, 0.4); @@ -1629,136 +2160,182 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 476, ../sass/controls/_controls.scss */ +/* line 497, ../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%; background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #666666), color-stop(100%, #595959)); - background-image: -webkit-linear-gradient(#666666, #595959 20px); background-image: -moz-linear-gradient(#666666, #595959 20px); - background-image: -o-linear-gradient(#666666, #595959 20px); + background-image: -webkit-linear-gradient(#666666, #595959 20px); background-image: linear-gradient(#666666, #595959 20px); - -webkit-border-radius: 1px; -moz-border-radius: 1px; - -ms-border-radius: 1px; - -o-border-radius: 1px; + -webkit-border-radius: 1px; border-radius: 1px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border-top: 1px solid gray; } - /* line 483, ../sass/controls/_controls.scss */ + /* line 504, ../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%; background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #808080), color-stop(100%, #737373)); - background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: -moz-linear-gradient(#808080, #737373 20px); - background-image: -o-linear-gradient(#808080, #737373 20px); + background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: linear-gradient(#808080, #737373 20px); } -/* line 488, ../sass/controls/_controls.scss */ +/* line 509, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } -/* line 2, ../sass/controls/_lists.scss */ +/***************************************************************************** + * 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 23, ../sass/controls/_lists.scss */ .checkbox-list label.checkbox.custom { display: block; margin-bottom: 5px; } -/* line 6, ../sass/controls/_lists.scss */ +/* line 27, ../sass/controls/_lists.scss */ .checkbox-list li { margin-bottom: 5px; } -/* line 14, ../sass/controls/_lists.scss */ +/* line 35, ../sass/controls/_lists.scss */ .l-tree-item-flat-list .tree-item .label { left: 5px !important; } +/***************************************************************************** + * 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. + *****************************************************************************/ /******************************************************** MENUS */ -/* line 2, ../sass/controls/_menus.scss */ +/* line 23, ../sass/controls/_menus.scss */ .menu-element { cursor: pointer; position: relative; } - /* line 8, ../sass/controls/_menus.scss */ + /* line 29, ../sass/controls/_menus.scss */ .menu-element .menu { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-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=='); + background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); - background-image: -webkit-linear-gradient(#595959, #4d4d4d); background-image: -moz-linear-gradient(#595959, #4d4d4d); - background-image: -o-linear-gradient(#595959, #4d4d4d); + background-image: -webkit-linear-gradient(#595959, #4d4d4d); background-image: linear-gradient(#595959, #4d4d4d); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #737373; - color: #999999; + color: #999; display: inline-block; text-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; display: block; padding: 3px 0; position: absolute; z-index: 10; } - /* line 16, ../sass/controls/_menus.scss */ + /* line 37, ../sass/controls/_menus.scss */ .menu-element .menu ul { margin: 0; padding: 0; } - /* line 179, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; padding: 0; } - /* line 18, ../sass/controls/_menus.scss */ + /* line 39, ../sass/controls/_menus.scss */ .menu-element .menu ul li { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; border-top: 1px solid #737373; line-height: 1.5rem; padding: 3px 10px 3px 35px; white-space: nowrap; } - /* line 25, ../sass/controls/_menus.scss */ + /* line 46, ../sass/controls/_menus.scss */ .menu-element .menu ul li:first-child { border: none; } - /* line 28, ../sass/controls/_menus.scss */ + /* line 49, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover { background: #737373; } - /* line 30, ../sass/controls/_menus.scss */ + /* line 51, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover a { - color: white; } - /* line 33, ../sass/controls/_menus.scss */ + color: #fff; } + /* line 54, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover .icon { color: #33ccff; } - /* line 37, ../sass/controls/_menus.scss */ + /* line 58, ../sass/controls/_menus.scss */ .menu-element .menu ul li a { color: #d9d9d9; display: block; } - /* line 41, ../sass/controls/_menus.scss */ + /* line 62, ../sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon { left: 10px; } - /* line 47, ../sass/controls/_menus.scss */ + /* line 68, ../sass/controls/_menus.scss */ .menu-element .super-menu { width: 450px; height: 430px; } - /* line 54, ../sass/controls/_menus.scss */ + /* line 75, ../sass/controls/_menus.scss */ .menu-element .super-menu .contents { - overflow: none; } - /* line 55, ../sass/controls/_menus.scss */ + overflow: hidden; + position: absolute; + top: 5px; + right: 5px; + bottom: 5px; + left: 5px; + width: auto; + height: auto; } + /* line 78, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 57, ../sass/controls/_menus.scss */ + /* line 80, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid rgba(255, 255, 255, 0.2); left: 0; @@ -1767,28 +2344,26 @@ label.checkbox.custom { width: 225px !important; overflow-x: hidden; overflow-y: auto; } - /* line 67, ../sass/controls/_menus.scss */ + /* line 90, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; border-top: none; } - /* line 73, ../sass/controls/_menus.scss */ + /* line 96, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li:hover { background: #737373; } - /* line 76, ../sass/controls/_menus.scss */ + /* line 99, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li .icon { text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; left: 5px; } - /* line 83, ../sass/controls/_menus.scss */ + /* line 106, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: 225px; right: 0; padding: 25px; width: 225px !important; } - /* line 94, ../sass/controls/_menus.scss */ + /* line 117, ../sass/controls/_menus.scss */ .menu-element .menu-item-description .desc-area.icon { position: relative; color: #8c8c8c; @@ -1797,104 +2372,143 @@ label.checkbox.custom { height: 150px; line-height: 150px; text-align: center; } - /* line 107, ../sass/controls/_menus.scss */ + /* line 130, ../sass/controls/_menus.scss */ .menu-element .menu-item-description .desc-area.description { color: #8c8c8c; font-size: 0.8em; } - /* line 111, ../sass/controls/_menus.scss */ + /* line 134, ../sass/controls/_menus.scss */ .menu-element .menu-item-description .desc-area.title { color: #d9d9d9; font-size: 1.2em; margin-bottom: 1rem; } - /* line 118, ../sass/controls/_menus.scss */ + /* line 141, ../sass/controls/_menus.scss */ .menu-element .context-menu { font-size: 0.80rem; pointer-events: auto; } - /* line 124, ../sass/controls/_menus.scss */ + /* 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-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8c8c8c), color-stop(100%, #808080)); - background-image: -webkit-linear-gradient(#8c8c8c, #808080); background-image: -moz-linear-gradient(#8c8c8c, #808080); - background-image: -o-linear-gradient(#8c8c8c, #808080); + background-image: -webkit-linear-gradient(#8c8c8c, #808080); background-image: linear-gradient(#8c8c8c, #808080); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #a6a6a6; - color: #999999; + color: #999; display: inline-block; } - /* line 126, ../sass/controls/_menus.scss */ + /* line 149, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li { padding-left: 30px; } - /* line 128, ../sass/controls/_menus.scss */ + /* line 151, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li a { color: white; } - /* line 129, ../sass/controls/_menus.scss */ + /* line 152, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li .icon { color: #1ac6ff; } - /* line 132, ../sass/controls/_menus.scss */ + /* line 155, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li .type-icon { left: 5px; } - /* line 135, ../sass/controls/_menus.scss */ + /* line 158, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li:hover .icon { color: #33ccff; } -/* line 143, ../sass/controls/_menus.scss */ +/* line 166, ../sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 59; } - /* line 149, ../sass/controls/_menus.scss */ + /* line 172, ../sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 156, ../sass/controls/_menus.scss */ + /* line 179, ../sass/controls/_menus.scss */ .context-menu-holder.go-left .context-menu { right: 0; } - /* line 157, ../sass/controls/_menus.scss */ + /* line 180, ../sass/controls/_menus.scss */ .context-menu-holder.go-up .context-menu { bottom: 0; } -/* line 161, ../sass/controls/_menus.scss */ +/* line 183, ../sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; right: 0; width: auto; } -/* line 3, ../sass/forms/_elems.scss */ +/***************************************************************************** + * 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 24, ../sass/forms/_elems.scss */ .form .section-header { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; background: rgba(255, 255, 255, 0.1); font-size: 0.8em; margin-top: 5px; padding: 5px; } - /* line 9, ../sass/forms/_elems.scss */ + /* line 30, ../sass/forms/_elems.scss */ .form .section-header:first-child { margin-top: 0; } -/* line 13, ../sass/forms/_elems.scss */ +/* line 34, ../sass/forms/_elems.scss */ .form .form-section { position: relative; } -/* line 17, ../sass/forms/_elems.scss */ +/* line 38, ../sass/forms/_elems.scss */ .form .form-row { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; *zoom: 1; @@ -1902,14 +2516,14 @@ label.checkbox.custom { margin-top: 5px; padding: 5px; position: relative; } - /* line 24, ../sass/forms/_elems.scss */ + /* line 45, ../sass/forms/_elems.scss */ .form .form-row.first { border-top: none; } - /* line 29, ../sass/forms/_elems.scss */ + /* line 49, ../sass/forms/_elems.scss */ .form .form-row .label, .form .form-row .controls { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; *zoom: 1; @@ -1917,62 +2531,60 @@ label.checkbox.custom { font-size: 0.75rem; line-height: 22px; min-height: 22px; } - /* line 39, ../sass/forms/_elems.scss */ + /* line 60, ../sass/forms/_elems.scss */ .form .form-row > .label { float: left; position: relative; white-space: nowrap; width: 20%; } - /* line 47, ../sass/forms/_elems.scss */ + /* line 68, ../sass/forms/_elems.scss */ .form .form-row .value { color: #cccccc; } - /* line 51, ../sass/forms/_elems.scss */ + /* line 72, ../sass/forms/_elems.scss */ .form .form-row .controls { float: left; position: relative; width: 79.9%; } - /* line 58, ../sass/forms/_elems.scss */ + /* line 79, ../sass/forms/_elems.scss */ .form .form-row .controls .l-composite-control.l-checkbox { display: inline-block; line-height: 14px; margin-right: 5px; } - /* line 67, ../sass/forms/_elems.scss */ + /* line 88, ../sass/forms/_elems.scss */ .form .form-row .controls input[type="text"] { height: 22px; line-height: 22px; margin-top: -4px; vertical-align: baseline; } - /* line 74, ../sass/forms/_elems.scss */ + /* line 95, ../sass/forms/_elems.scss */ .form .form-row .controls .l-med input[type="text"] { width: 200px; } - /* line 78, ../sass/forms/_elems.scss */ + /* line 99, ../sass/forms/_elems.scss */ .form .form-row .controls .l-small input[type="text"] { width: 50px; } - /* line 82, ../sass/forms/_elems.scss */ + /* line 103, ../sass/forms/_elems.scss */ .form .form-row .controls .l-numeric input[type="text"] { text-align: right; } - /* line 86, ../sass/forms/_elems.scss */ + /* line 107, ../sass/forms/_elems.scss */ .form .form-row .controls .select { margin-right: 5px; } - /* line 91, ../sass/forms/_elems.scss */ + /* line 112, ../sass/forms/_elems.scss */ .form .form-row .field-hints { color: #666666; } - /* line 95, ../sass/forms/_elems.scss */ + /* line 116, ../sass/forms/_elems.scss */ .form .form-row .selector-list { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; background: rgba(0, 0, 0, 0.2); padding: 5px; position: relative; height: 150px; overflow: auto; } - /* line 106, ../sass/forms/_elems.scss */ + /* line 127, ../sass/forms/_elems.scss */ .form .form-row .selector-list .wrapper { overflow-y: auto; position: absolute; @@ -1981,39 +2593,58 @@ label.checkbox.custom { bottom: 5px; left: 5px; } -/* line 120, ../sass/forms/_elems.scss */ +/* line 141, ../sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 127, ../sass/forms/_elems.scss */ +/* line 147, ../sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 131, ../sass/forms/_elems.scss */ +/* line 152, ../sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 138, ../sass/forms/_elems.scss */ + /* line 159, ../sass/forms/_elems.scss */ .l-result div.s-hint { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; background: rgba(255, 153, 0, 0.8); display: block; color: #ffd699; padding: 5px; } -/* line 4, ../sass/forms/_validation.scss */ +/***************************************************************************** + * 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 25, ../sass/forms/_validation.scss */ .validates > .label { padding-right: 25px; } - /* line 7, ../sass/forms/_validation.scss */ + /* line 28, ../sass/forms/_validation.scss */ .validates > .label::after { display: block; position: absolute; @@ -2027,38 +2658,56 @@ label.form-control.checkbox input { font-size: 1.1em; text-align: right; vertical-align: middle; } -/* line 25, ../sass/forms/_validation.scss */ +/* line 46, ../sass/forms/_validation.scss */ .validates.invalid > .label::after, .validates.invalid.req > .label::after { color: #ff9900; content: "x"; } -/* line 32, ../sass/forms/_validation.scss */ +/* line 53, ../sass/forms/_validation.scss */ .validates.valid > .label::after, .validates.valid.req > .label::after { color: #33cc33; content: "2"; } -/* line 38, ../sass/forms/_validation.scss */ +/* line 59, ../sass/forms/_validation.scss */ .validates.req > .label::after { color: #ffc700; content: "*"; } -/* line 45, ../sass/forms/_validation.scss */ +/* line 66, ../sass/forms/_validation.scss */ span.req { color: #ffc700; } -/* line 1, ../sass/forms/_text-input.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/forms/_text-input.scss */ input[type="text"] { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-border-radius: 3px; + -webkit-appearance: none; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; background: rgba(255, 255, 255, 0.1); border: none; @@ -2066,65 +2715,85 @@ input[type="text"] { color: #cccccc; outline: none; padding: 0 3px; } - /* line 12, ../sass/forms/_mixins.scss */ + /* line 33, ../sass/forms/_mixins.scss */ input[type="text"].error { background: rgba(255, 0, 0, 0.5); } - /* line 8, ../sass/forms/_text-input.scss */ + /* line 29, ../sass/forms/_text-input.scss */ input[type="text"].numeric { text-align: right; } -/* line 1, ../sass/forms/_selects.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/forms/_selects.scss */ .form-control.select { + 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: -webkit-linear-gradient(#4d4d4d, #404040); background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -o-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: linear-gradient(#4d4d4d, #404040); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #666666; - color: #999999; + color: #999; display: inline-block; cursor: pointer; display: inline-block; margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 127, ../sass/_mixins.scss */ + /* line 148, ../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-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d)); - background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: -moz-linear-gradient(#666666, #4d4d4d); - background-image: -o-linear-gradient(#666666, #4d4d4d); + background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 8, ../sass/forms/_selects.scss */ + /* line 29, ../sass/forms/_selects.scss */ .form-control.select select { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-box-sizing: border-box; + -webkit-appearance: none; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; background: none; - color: #999999; + color: #999; border: none !important; cursor: pointer; padding: 4px 25px 2px 5px; width: 120%; } - /* line 17, ../sass/forms/_selects.scss */ + /* line 38, ../sass/forms/_selects.scss */ .form-control.select select option { margin: 5px 0; } - /* line 21, ../sass/forms/_selects.scss */ + /* line 42, ../sass/forms/_selects.scss */ .form-control.select:after { color: #0099cc; content: "v"; @@ -2135,25 +2804,43 @@ input[type="text"] { right: 5px; top: 0; } -/* line 2, ../sass/forms/_channel-selector.scss */ +/***************************************************************************** + * 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 23, ../sass/forms/_channel-selector.scss */ .channel-selector .line { margin-bottom: 5px; min-height: 22px; } -/* line 6, ../sass/forms/_channel-selector.scss */ +/* line 27, ../sass/forms/_channel-selector.scss */ .channel-selector .treeview { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-border-radius: 3px; + -webkit-appearance: none; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; background: rgba(255, 255, 255, 0.1); border: none; @@ -2167,13 +2854,13 @@ input[type="text"] { max-height: 400px; overflow: auto; padding: 5px; } - /* line 12, ../sass/forms/_mixins.scss */ + /* line 33, ../sass/forms/_mixins.scss */ .channel-selector .treeview.error { background: rgba(255, 0, 0, 0.5); } -/* line 15, ../sass/forms/_channel-selector.scss */ +/* line 36, ../sass/forms/_channel-selector.scss */ .channel-selector .btns-add-remove { margin-top: 150px; } - /* line 18, ../sass/forms/_channel-selector.scss */ + /* line 39, ../sass/forms/_channel-selector.scss */ .channel-selector .btns-add-remove .btn { display: block; font-size: 1.5em; @@ -2181,45 +2868,84 @@ input[type="text"] { padding: 10px; text-align: center; } -/* line 2, ../sass/forms/_datetime.scss */ +/***************************************************************************** + * 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 23, ../sass/forms/_datetime.scss */ .complex.datetime span { display: inline-block; margin-right: 5px; } -/* line 15, ../sass/forms/_datetime.scss */ +/* line 36, ../sass/forms/_datetime.scss */ .complex.datetime .fields { margin-top: 3px 0; padding: 3px 0; } -/* line 20, ../sass/forms/_datetime.scss */ +/* line 41, ../sass/forms/_datetime.scss */ .complex.datetime .date { width: 85px; } - /* line 23, ../sass/forms/_datetime.scss */ + /* line 44, ../sass/forms/_datetime.scss */ .complex.datetime .date input { width: 80px; } -/* line 29, ../sass/forms/_datetime.scss */ +/* line 50, ../sass/forms/_datetime.scss */ .complex.datetime .time.sm { width: 45px; } - /* line 32, ../sass/forms/_datetime.scss */ + /* line 53, ../sass/forms/_datetime.scss */ .complex.datetime .time.sm input { width: 40px; } -/* line 4, ../sass/forms/_filter.scss */ +/***************************************************************************** + * 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 24, ../sass/forms/_filter.scss */ .filter input.filter, .filter input.t-filter-input, .t-filter input.filter, .t-filter input.t-filter-input { - -webkit-appearance: none; -moz-appearance: none; - appearance: none; - -webkit-border-radius: 3px; + -webkit-appearance: none; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px; background: rgba(255, 255, 255, 0.1); border: none; @@ -2229,28 +2955,26 @@ input[type="text"] { padding: 0 3px; background: #3b3b3b; border-bottom: 1px solid #4d4d4d; } - /* line 12, ../sass/forms/_mixins.scss */ + /* line 33, ../sass/forms/_mixins.scss */ .filter input.filter.error, .filter input.t-filter-input.error, .t-filter input.filter.error, .t-filter input.t-filter-input.error { background: rgba(255, 0, 0, 0.5); } -/* line 7, ../sass/forms/_filter.scss */ +/* line 28, ../sass/forms/_filter.scss */ .filter input.t-filter-input, .t-filter input.t-filter-input { height: 22px; width: 200px; } - /* line 17, ../sass/forms/_filter.scss */ + /* line 38, ../sass/forms/_filter.scss */ .filter input.t-filter-input:not(.ng-dirty) + .t-a-clear, .t-filter input.t-filter-input:not(.ng-dirty) + .t-a-clear { display: none; } -/* line 21, ../sass/forms/_filter.scss */ +/* line 42, ../sass/forms/_filter.scss */ .filter .icon.ui-symbol, .t-filter .icon.ui-symbol { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; display: inline-block; font-size: 1.3em; @@ -2258,25 +2982,23 @@ input[type="text"] { line-height: 22px; padding: 0px 5px; vertical-align: middle; } - /* line 29, ../sass/forms/_filter.scss */ + /* line 50, ../sass/forms/_filter.scss */ .filter .icon.ui-symbol:hover, .t-filter .icon.ui-symbol:hover { background: rgba(255, 255, 255, 0.1); } -/* line 33, ../sass/forms/_filter.scss */ +/* line 54, ../sass/forms/_filter.scss */ .filter .s-a-clear.ui-symbol, .t-filter .s-a-clear.ui-symbol { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20); opacity: 0.2; - background: white; - color: #333333; + background: #fff; + color: #333; display: block; position: absolute; height: 13px; @@ -2289,42 +3011,64 @@ input[type="text"] { top: 50%; text-align: center; z-index: 5; } - /* line 53, ../sass/forms/_filter.scss */ + /* line 74, ../sass/forms/_filter.scss */ .filter .s-a-clear.ui-symbol:hover, .t-filter .s-a-clear.ui-symbol:hover { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60); opacity: 0.6; background-color: #0099cc; } -/* line 61, ../sass/forms/_filter.scss */ +/* line 82, ../sass/forms/_filter.scss */ .l-filter { display: inline-block; position: relative; } -/* line 68, ../sass/forms/_filter.scss */ +/* line 89, ../sass/forms/_filter.scss */ .top-bar input.filter { font-size: .9em; - height: 35px; - line-height: 35px; + height: 30px; + line-height: 30px; margin-right: 5px; padding-left: 10px; padding-right: 10px; vertical-align: top; } -/* line 79, ../sass/forms/_filter.scss */ +/* line 100, ../sass/forms/_filter.scss */ .top-bar .icon-filter { font-size: 1.4em; } -/* line 10, ../sass/plots/_plots-main.scss */ +/***************************************************************************** + * 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: #999999; + color: #999; font-size: 0.7rem; position: relative; width: 100%; - height: 100%; } - /* line 17, ../sass/plots/_plots-main.scss */ + height: 100%; + /****************************** Limits and Out-of-Bounds data */ } + /* line 38, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area { position: absolute; } - /* line 20, ../sass/plots/_plots-main.scss */ + /* line 41, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area.gl-plot-x { top: auto; right: 0; @@ -2333,24 +3077,22 @@ input[type="text"] { height: 32px; width: auto; overflow: hidden; } - /* line 29, ../sass/plots/_plots-main.scss */ + /* 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 38, ../sass/plots/_plots-main.scss */ + /* line 59, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - background: rgba(255, 199, 0, 0.5); + background: black; color: #e6e6e6; padding: 2px 5px; position: absolute; @@ -2359,10 +3101,10 @@ input[type="text"] { bottom: auto; left: 70px; z-index: 10; } - /* line 50, ../sass/plots/_plots-main.scss */ + /* line 71, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords:empty { display: none; } - /* line 55, ../sass/plots/_plots-main.scss */ + /* line 76, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-display-area { position: absolute; top: 29px; @@ -2371,13 +3113,13 @@ input[type="text"] { left: 60px; cursor: crosshair; border: 1px solid #4d4d4d; } - /* line 66, ../sass/plots/_plots-main.scss */ + /* 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 74, ../sass/plots/_plots-main.scss */ + /* 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 { @@ -2386,26 +3128,24 @@ input[type="text"] { bottom: 0; left: 0; height: auto; } - /* line 83, ../sass/plots/_plots-main.scss */ + /* 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 { - -webkit-transform-origin: 50% 0; -moz-transform-origin: 50% 0; -ms-transform-origin: 50% 0; - -o-transform-origin: 50% 0; + -webkit-transform-origin: 50% 0; transform-origin: 50% 0; - -webkit-transform: translateX(-50%) rotate(-90deg); -moz-transform: translateX(-50%) rotate(-90deg); -ms-transform: translateX(-50%) rotate(-90deg); - -o-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 96, ../sass/plots/_plots-main.scss */ + /* line 117, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-y-options { position: absolute; top: 50%; @@ -2416,19 +3156,19 @@ input[type="text"] { height: auto; min-height: 32px; width: 32px; } - /* line 110, ../sass/plots/_plots-main.scss */ + /* line 131, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; border: 0 rgba(255, 255, 255, 0.3) dashed; } - /* line 113, ../sass/plots/_plots-main.scss */ + /* line 134, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; height: 100%; } - /* line 117, ../sass/plots/_plots-main.scss */ + /* line 138, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-h { border-bottom-width: 1px; width: 100%; } - /* line 123, ../sass/plots/_plots-main.scss */ + /* line 144, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-legend { position: absolute; top: 0; @@ -2438,21 +3178,69 @@ input[type="text"] { 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 151, ../sass/plots/_plots-main.scss */ +/* 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 154, ../sass/plots/_plots-main.scss */ + /* 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 158, ../sass/plots/_plots-main.scss */ + /* 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, @@ -2461,26 +3249,37 @@ input[type="text"] { .legend .plot-legend-item .color-swatch, .legend .legend-item .plot-color-swatch, .legend .legend-item .color-swatch { - -webkit-border-radius: 2px; -moz-border-radius: 2px; - -ms-border-radius: 2px; - -o-border-radius: 2px; + -webkit-border-radius: 2px; border-radius: 2px; display: inline-block; height: 8px; - width: 8px; - margin-right: 3px; } + width: 8px; } -/* line 172, ../sass/plots/_plots-main.scss */ +/* 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 175, ../sass/plots/_plots-main.scss */ + /* line 237, ../sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; height: 100%; } -/* line 183, ../sass/plots/_plots-main.scss */ +/* line 243, ../sass/plots/_plots-main.scss */ .gl-plot-tick, .tick-label { font-size: 0.7rem; @@ -2488,7 +3287,7 @@ input[type="text"] { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 191, ../sass/plots/_plots-main.scss */ + /* 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 { @@ -2499,7 +3298,7 @@ input[type="text"] { width: 20%; margin-left: -10%; text-align: center; } - /* line 201, ../sass/plots/_plots-main.scss */ + /* 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 { @@ -2509,32 +3308,51 @@ input[type="text"] { margin-bottom: -0.5em; text-align: right; } -/* line 212, ../sass/plots/_plots-main.scss */ +/* line 273, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label { top: 5px; } -/* line 215, ../sass/plots/_plots-main.scss */ +/* line 276, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label { right: 5px; left: 5px; } -/* line 222, ../sass/plots/_plots-main.scss */ +/* line 283, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-x { top: 0; } -/* line 225, ../sass/plots/_plots-main.scss */ +/* line 286, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-y { right: 0; left: 0; } -/* line 2, ../sass/overlay/_overlay.scss */ +/***************************************************************************** + * 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 23, ../sass/overlay/_overlay.scss */ .overlay .blocker { background: rgba(0, 0, 0, 0.7); z-index: 100; } -/* line 6, ../sass/overlay/_overlay.scss */ +/* line 27, ../sass/overlay/_overlay.scss */ .overlay .btn.close { - -webkit-border-radius: 6px; -moz-border-radius: 6px; - -ms-border-radius: 6px; - -o-border-radius: 6px; + -webkit-border-radius: 6px; border-radius: 6px; padding: 3px 6px; position: absolute; @@ -2544,61 +3362,58 @@ input[type="text"] { bottom: auto; left: auto; z-index: 100; } -/* line 17, ../sass/overlay/_overlay.scss */ +/* line 38, ../sass/overlay/_overlay.scss */ .overlay > .holder { + 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: -webkit-linear-gradient(#4d4d4d, #404040); background-image: -moz-linear-gradient(#4d4d4d, #404040); - background-image: -o-linear-gradient(#4d4d4d, #404040); + background-image: -webkit-linear-gradient(#4d4d4d, #404040); background-image: linear-gradient(#4d4d4d, #404040); - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 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; border: none; border-top: 1px solid #666666; - color: #999999; + color: #999; display: inline-block; - -webkit-border-radius: 9px; -moz-border-radius: 9px; - -ms-border-radius: 9px; - -o-border-radius: 9px; + -webkit-border-radius: 9px; border-radius: 9px; - color: #999999; + color: #999; top: 15%; right: 15%; bottom: 15%; left: 15%; z-index: 101; } - /* line 24, ../sass/overlay/_overlay.scss */ + /* line 45, ../sass/overlay/_overlay.scss */ .overlay > .holder > .contents { top: 25px; right: 25px; bottom: 25px; left: 25px; } -/* line 29, ../sass/overlay/_overlay.scss */ +/* line 50, ../sass/overlay/_overlay.scss */ .overlay .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 1.3em; } -/* line 34, ../sass/overlay/_overlay.scss */ +/* line 55, ../sass/overlay/_overlay.scss */ .overlay .top-bar { height: 60px; } -/* line 38, ../sass/overlay/_overlay.scss */ +/* line 59, ../sass/overlay/_overlay.scss */ .overlay .editor { top: 70px; bottom: 50px; left: 0; right: 0; } -/* line 44, ../sass/overlay/_overlay.scss */ +/* line 65, ../sass/overlay/_overlay.scss */ .overlay .bottom-bar { top: auto; right: 0; @@ -2607,10 +3422,10 @@ input[type="text"] { font-size: 1em; height: 40px; text-align: right; } - /* line 49, ../sass/overlay/_overlay.scss */ + /* line 70, ../sass/overlay/_overlay.scss */ .overlay .bottom-bar .btn { margin-left: 10px; } -/* line 53, ../sass/overlay/_overlay.scss */ +/* line 74, ../sass/overlay/_overlay.scss */ .overlay .contents.l-dialog { top: 5px; right: 5px; @@ -2618,286 +3433,420 @@ input[type="text"] { left: 5px; overflow: auto; } -/* line 4, ../sass/user-environ/_frame.scss */ +/***************************************************************************** + * 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 25, ../sass/user-environ/_frame.scss */ .frame.child-frame.panel { - background: #333333; + background: #333; border: 1px solid #4d4d4d; } - /* line 7, ../sass/user-environ/_frame.scss */ + /* line 28, ../sass/user-environ/_frame.scss */ .frame.child-frame.panel:hover { border-color: #666666; } -/* line 14, ../sass/user-environ/_frame.scss */ +/* line 35, ../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 18, ../sass/user-environ/_frame.scss */ +/* line 39, ../sass/user-environ/_frame.scss */ .frame > .object-holder.abs, .btn-menu .frame > span.object-holder.l-click-area { top: 23px; } -/* line 21, ../sass/user-environ/_frame.scss */ +/* line 42, ../sass/user-environ/_frame.scss */ .frame .contents { top: 5px; right: 5px; bottom: 5px; left: 5px; } -/* line 31, ../sass/user-environ/_frame.scss */ +/* line 52, ../sass/user-environ/_frame.scss */ .edit-main .frame.child-frame.panel:hover { border-color: #0099cc; - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -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 1, ../sass/user-environ/_top-bar.scss */ -.top-bar { - line-height: 35px; } - /* line 7, ../sass/user-environ/_top-bar.scss */ - .top-bar.browse, .top-bar.edit { - border-bottom: 1px solid #4d4d4d; - top: 5px; - right: 5px; - bottom: auto; - left: 5px; - height: 35px; } - /* line 16, ../sass/user-environ/_top-bar.scss */ - .top-bar .title { - color: #fff; } - /* line 21, ../sass/user-environ/_top-bar.scss */ - .top-bar .buttons-main { - font-size: 0.8em; - left: auto; - text-align: right; } - /* line 26, ../sass/user-environ/_top-bar.scss */ - .top-bar .buttons-main .btn { - margin-left: 5px; } +/***************************************************************************** + * 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 27, ../sass/user-environ/_top-bar.scss */ +.top-bar.browse, .top-bar.edit { + border-bottom: 1px solid #4d4d4d; + top: 5px; + right: 5px; + bottom: auto; + left: 5px; + height: 30px; } +/* line 37, ../sass/user-environ/_top-bar.scss */ +.top-bar .title { + color: #fff; } +/* line 42, ../sass/user-environ/_top-bar.scss */ +.top-bar .buttons-main { + font-size: 0.8em; + left: auto; + text-align: right; } + /* line 47, ../sass/user-environ/_top-bar.scss */ + .top-bar .buttons-main .btn { + margin-left: 5px; } -/* line 34, ../sass/user-environ/_top-bar.scss */ +/* line 55, ../sass/user-environ/_top-bar.scss */ .edit-mode .top-bar .buttons-main { white-space: nowrap; } - /* line 38, ../sass/user-environ/_top-bar.scss */ + /* line 59, ../sass/user-environ/_top-bar.scss */ .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .btn-menu span.buttons-main.l-click-area, .btn-menu .edit-mode .top-bar span.buttons-main.l-click-area { bottom: auto; left: auto; } -/* line 1, ../sass/user-environ/_bottom-bar.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar { color: gray; font-size: 0.7em; line-height: 16px; } - /* line 5, ../sass/user-environ/_bottom-bar.scss */ + /* line 26, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .status-holder { - -webkit-border-radius: 5.25px; -moz-border-radius: 5.25px; - -ms-border-radius: 5.25px; - -o-border-radius: 5.25px; + -webkit-border-radius: 5.25px; border-radius: 5.25px; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; - background: black; + background: #000; border-bottom: 1px solid #4d4d4d; padding: 2px 5px; text-transform: uppercase; } - /* line 13, ../sass/user-environ/_bottom-bar.scss */ + /* line 34, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .app-logo { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; cursor: pointer; font-size: 0.8em; line-height: 10px; padding-top: 1px; text-transform: uppercase; } - /* line 20, ../sass/user-environ/_bottom-bar.scss */ + /* line 41, ../sass/user-environ/_bottom-bar.scss */ .ue-bottom-bar .app-logo.logo-openmctweb { background: url("../images/logo-openmctweb.svg") no-repeat center center; } -/* line 26, ../sass/user-environ/_bottom-bar.scss */ +/* line 47, ../sass/user-environ/_bottom-bar.scss */ .status.block { display: inline-block; margin-right: 20px; } - /* line 29, ../sass/user-environ/_bottom-bar.scss */ + /* line 50, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator { - -webkit-border-radius: 2.7px; -moz-border-radius: 2.7px; - -ms-border-radius: 2.7px; - -o-border-radius: 2.7px; + -webkit-border-radius: 2.7px; border-radius: 2.7px; - -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; + -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; box-shadow: inset rgba(0, 0, 0, 0.5) 0 0 3px; text-shadow: rgba(0, 0, 0, 0.3) 0 0 2px; display: inline-block; font-size: 1.25em; vertical-align: middle; margin-right: 5px; } - /* line 37, ../sass/user-environ/_bottom-bar.scss */ + /* line 58, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator.ok { color: #009900; } - /* line 40, ../sass/user-environ/_bottom-bar.scss */ + /* line 61, ../sass/user-environ/_bottom-bar.scss */ .status.block .status-indicator.caution { color: #ffaa00; } -/* line 1, ../sass/user-environ/_object-browse.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/user-environ/_object-browse.scss */ .object-browse-bar { - height: 35px; - line-height: 35px; } - /* line 5, ../sass/user-environ/_object-browse.scss */ + height: 30px; } + /* line 26, ../sass/user-environ/_object-browse.scss */ .object-browse-bar .items-select .btn-menu { margin-right: 15px; } -/* line 1, ../sass/user-environ/_tool-bar.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/user-environ/_tool-bar.scss */ .tool-bar { border-bottom: 1px solid #4d4d4d; } - /* line 3, ../sass/user-environ/_tool-bar.scss */ + /* line 24, ../sass/user-environ/_tool-bar.scss */ .tool-bar .l-control-group { - height: 28px; } - /* line 6, ../sass/user-environ/_tool-bar.scss */ + height: 25px; } + /* line 27, ../sass/user-environ/_tool-bar.scss */ .tool-bar input[type="text"] { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; font-size: .9em; - height: 28px; + height: 25px; margin-bottom: 1px; position: relative; } - /* line 12, ../sass/user-environ/_tool-bar.scss */ + /* line 33, ../sass/user-environ/_tool-bar.scss */ .tool-bar input[type="text"].sm { - width: 28px; } - /* line 16, ../sass/user-environ/_tool-bar.scss */ + width: 25px; } + /* line 37, ../sass/user-environ/_tool-bar.scss */ .tool-bar .input-labeled label { - font-size: 12.6px; } + font-size: 11.25px; } -/* line 6, ../sass/helpers/_bubbles.scss */ +/***************************************************************************** + * 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 24, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper { - -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; -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 11, ../sass/helpers/_bubbles.scss */ + /* line 29, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble { display: inline-block; - max-width: 250px; + max-width: 300px; padding: 5px 10px; } - /* line 15, ../sass/helpers/_bubbles.scss */ + /* line 33, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble:before { content: ""; position: absolute; width: 0; height: 0; } - /* line 21, ../sass/helpers/_bubbles.scss */ + /* line 39, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table { width: 100%; } - /* line 24, ../sass/helpers/_bubbles.scss */ + /* line 42, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td { padding: 2px 0; vertical-align: top; } - /* line 31, ../sass/helpers/_bubbles.scss */ + /* line 49, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.label { padding-right: 10px; white-space: nowrap; } - /* line 35, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td.value { - white-space: nowrap; } - /* line 39, ../sass/helpers/_bubbles.scss */ + /* line 58, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.align-wrap { white-space: normal; } - /* line 45, ../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 52, ../sass/helpers/_bubbles.scss */ + /* line 71, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left { margin-left: 10px; } - /* line 54, ../sass/helpers/_bubbles.scss */ + /* 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 #dddddd; } - /* line 62, ../sass/helpers/_bubbles.scss */ + border-right: 7.5px solid #ddd; } + /* line 81, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right { margin-right: 10px; } - /* line 64, ../sass/helpers/_bubbles.scss */ + /* line 83, ../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 #dddddd; } - /* line 73, ../sass/helpers/_bubbles.scss */ + border-left: 7.5px solid #ddd; } + /* line 92, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-top .l-infobubble::before { top: 10px; } - /* line 79, ../sass/helpers/_bubbles.scss */ + /* line 98, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-btm .l-infobubble::before { bottom: 10px; } - /* line 84, ../sass/helpers/_bubbles.scss */ + /* line 103, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down { margin-bottom: 10px; } - /* line 86, ../sass/helpers/_bubbles.scss */ + /* line 105, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down .l-infobubble::before { left: 50%; top: 100%; margin-left: -5px; border-left: 5px solid transparent; border-right: 5px solid transparent; - border-top: 7.5px solid #dddddd; } + border-top: 7.5px solid #ddd; } -/* line 99, ../sass/helpers/_bubbles.scss */ +/* line 118, ../sass/helpers/_bubbles.scss */ .s-infobubble { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - background: #dddddd; - color: #666666; + background: #ddd; + color: #666; font-size: 0.8rem; } - /* line 105, ../sass/helpers/_bubbles.scss */ + /* line 124, ../sass/helpers/_bubbles.scss */ .s-infobubble .title { color: #333333; font-weight: bold; } - /* line 110, ../sass/helpers/_bubbles.scss */ + /* line 129, ../sass/helpers/_bubbles.scss */ .s-infobubble tr td { border-top: 1px solid #c4c4c4; font-size: 0.9em; } - /* line 114, ../sass/helpers/_bubbles.scss */ + /* line 133, ../sass/helpers/_bubbles.scss */ .s-infobubble tr:first-child td { border-top: none; } - /* line 118, ../sass/helpers/_bubbles.scss */ + /* line 137, ../sass/helpers/_bubbles.scss */ .s-infobubble .value { color: #333333; } -/* line 8, ../sass/helpers/_splitter.scss */ +/***************************************************************************** + * 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 29, ../sass/helpers/_splitter.scss */ .split-layout .splitter { background-color: #404040; - -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px; overflow: hidden; position: absolute; z-index: 1; } -/* line 15, ../sass/helpers/_splitter.scss */ +/* line 36, ../sass/helpers/_splitter.scss */ .split-layout.horizontal { overflow: hidden; } - /* line 18, ../sass/helpers/_splitter.scss */ + /* line 39, ../sass/helpers/_splitter.scss */ .split-layout.horizontal .pane { left: 0; right: 0; } - /* line 21, ../sass/helpers/_splitter.scss */ + /* line 42, ../sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.top { bottom: auto; } - /* line 25, ../sass/helpers/_splitter.scss */ + /* line 46, ../sass/helpers/_splitter.scss */ .split-layout.horizontal .pane.bottom { top: auto; } - /* line 30, ../sass/helpers/_splitter.scss */ + /* line 51, ../sass/helpers/_splitter.scss */ .split-layout.horizontal > .splitter { cursor: row-resize; left: 0; right: 0; width: auto; height: 5px; } - /* line 99, ../sass/_mixins.scss */ + /* line 120, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -2908,25 +3857,25 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 141, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } -/* line 42, ../sass/helpers/_splitter.scss */ +/* line 63, ../sass/helpers/_splitter.scss */ .split-layout.vertical .pane { top: 0; bottom: 0; } - /* line 45, ../sass/helpers/_splitter.scss */ + /* line 66, ../sass/helpers/_splitter.scss */ .split-layout.vertical .pane.left { right: auto; } - /* line 49, ../sass/helpers/_splitter.scss */ + /* line 70, ../sass/helpers/_splitter.scss */ .split-layout.vertical .pane.right { left: auto; } -/* line 54, ../sass/helpers/_splitter.scss */ +/* line 75, ../sass/helpers/_splitter.scss */ .split-layout.vertical > .splitter { bottom: 0; cursor: col-resize; width: 5px; } - /* line 99, ../sass/_mixins.scss */ + /* line 120, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -2937,63 +3886,68 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 141, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } -/* line 65, ../sass/helpers/_splitter.scss */ +/* line 86, ../sass/helpers/_splitter.scss */ .browse-area .splitter { - top: 40px; } + top: 35px; } -/* line 69, ../sass/helpers/_splitter.scss */ +/* line 90, ../sass/helpers/_splitter.scss */ .edit-area .splitter { top: 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. + *****************************************************************************/ @-webkit-keyframes rotation { - /* line 2, ../sass/helpers/_wait-spinner.scss */ from { -webkit-transform: rotate(0deg); } - - /* line 3, ../sass/helpers/_wait-spinner.scss */ to { -webkit-transform: rotate(359deg); } } - @-moz-keyframes rotation { - /* line 7, ../sass/helpers/_wait-spinner.scss */ from { -moz-transform: rotate(0deg); } - - /* line 8, ../sass/helpers/_wait-spinner.scss */ to { -moz-transform: rotate(359deg); } } - @-o-keyframes rotation { - /* line 12, ../sass/helpers/_wait-spinner.scss */ from { -o-transform: rotate(0deg); } - - /* line 13, ../sass/helpers/_wait-spinner.scss */ to { -o-transform: rotate(359deg); } } - @keyframes rotation { - /* line 17, ../sass/helpers/_wait-spinner.scss */ from { transform: rotate(0deg); } - - /* line 18, ../sass/helpers/_wait-spinner.scss */ to { transform: rotate(359deg); } } - -/* line 22, ../sass/helpers/_wait-spinner.scss */ +/* line 42, ../sass/helpers/_wait-spinner.scss */ .t-wait-spinner, .wait-spinner { display: block; position: absolute; - -webkit-animation: rotation 0.6s infinite linear; - -moz-animation: rotation 0.6s infinite linear; - -o-animation: rotation 0.6s infinite linear; - animation: rotation 0.6s infinite linear; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; border-style: solid; @@ -3009,33 +3963,33 @@ input[type="text"] { margin-left: -5%; z-index: 2; } -/* line 34, ../sass/helpers/_wait-spinner.scss */ +/* line 55, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder { pointer-events: none; position: absolute; } - /* line 38, ../sass/helpers/_wait-spinner.scss */ + /* line 59, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder.align-left .t-wait-spinner { left: 0; margin-left: 0; } - /* line 43, ../sass/helpers/_wait-spinner.scss */ + /* line 64, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder.full-size { display: inline-block; height: 100%; width: 100%; } - /* line 46, ../sass/helpers/_wait-spinner.scss */ + /* line 67, ../sass/helpers/_wait-spinner.scss */ .l-wait-spinner-holder.full-size .t-wait-spinner { top: 0; margin-top: 0; padding: 30%; } -/* line 55, ../sass/helpers/_wait-spinner.scss */ +/* line 76, ../sass/helpers/_wait-spinner.scss */ .treeview .wait-spinner { display: block; position: absolute; - -webkit-animation: rotation 0.6s infinite linear; - -moz-animation: rotation 0.6s infinite linear; - -o-animation: rotation 0.6s infinite linear; - animation: rotation 0.6s infinite linear; + -webkit-animation: rotation .6s infinite linear; + -moz-animation: rotation .6s infinite linear; + -o-animation: rotation .6s infinite linear; + animation: rotation .6s infinite linear; border-color: rgba(0, 153, 204, 0.25); border-top-color: #0099cc; border-style: solid; @@ -3048,42 +4002,84 @@ input[type="text"] { top: 2px; left: 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. + *****************************************************************************/ /* Classes to be used for lists of properties and values */ -/* line 4, ../sass/_properties.scss */ +/* line 25, ../sass/_properties.scss */ .properties .s-row { border-top: 1px solid #4d4d4d; font-size: 0.8em; } - /* line 7, ../sass/_properties.scss */ + /* line 28, ../sass/_properties.scss */ .properties .s-row:first-child { border: none; } - /* line 10, ../sass/_properties.scss */ + /* line 31, ../sass/_properties.scss */ .properties .s-row .s-value { color: #fff; } -/* line 1, ../sass/_autoflow.scss */ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 22, ../sass/_autoflow.scss */ .autoflow { font-size: 0.75rem; } - /* line 9, ../sass/_autoflow.scss */ + /* line 30, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header { bottom: auto; height: 22px; line-height: 22px; } - /* line 13, ../sass/_autoflow.scss */ + /* line 34, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header span { vertical-align: middle; } - /* line 16, ../sass/_autoflow.scss */ + /* line 37, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header .l-filter { margin-left: 5px; } - /* line 21, ../sass/_autoflow.scss */ + /* line 42, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items { overflow-x: scroll; overflow-y: hidden; top: 32px; white-space: nowrap; } - /* line 27, ../sass/_autoflow.scss */ + /* line 48, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; border-left: 1px solid #4d4d4d; display: inline-block; @@ -3091,10 +4087,10 @@ input[type="text"] { padding-right: 5px; vertical-align: top; width: 225px; } - /* line 37, ../sass/_autoflow.scss */ + /* line 58, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row { - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; box-sizing: border-box; border-bottom: 1px solid rgba(255, 255, 255, 0.05); display: block; @@ -3103,65 +4099,107 @@ input[type="text"] { margin-bottom: 1px; margin-top: 1px; position: relative; } - /* line 46, ../sass/_autoflow.scss */ + /* line 67, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:first-child { border-top: none; } - /* line 49, ../sass/_autoflow.scss */ + /* line 70, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover { background: rgba(255, 255, 255, 0.1); } - /* line 52, ../sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.stale { - color: #666666; } - /* line 56, ../sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.stale) .l-autoflow-item.r { - color: #cccccc; } - /* line 61, ../sass/_autoflow.scss */ - .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.alert .l-autoflow-item.r { - background: #cc0000; } - /* line 65, ../sass/_autoflow.scss */ + /* line 75, ../sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.l { + color: rgba(255, 255, 255, 0.3) !important; + font-style: italic; } + /* line 76, ../sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.r { + color: rgba(255, 255, 255, 0.5) !important; + font-style: italic; } + /* line 79, ../sass/_autoflow.scss */ + .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.s-stale) .l-autoflow-item.r { + color: #b3b3b3; } + /* line 83, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { border-top: 1px solid gray; } - /* line 68, ../sass/_autoflow.scss */ + /* line 86, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { display: block; } - /* line 70, ../sass/_autoflow.scss */ + /* line 88, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.l { float: none; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; width: auto; } - /* line 78, ../sass/_autoflow.scss */ + /* line 95, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.r { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; float: right; margin-left: 5px; padding-left: 2px; padding-right: 2px; text-align: right; } - /* line 90, ../sass/_autoflow.scss */ + /* line 106, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col:first-child { border-left: none; padding-left: 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. + *****************************************************************************/ /* Styles for the iframe EmbeddedPageController element */ -/* line 4, ../sass/_iframe.scss */ +/* line 25, ../sass/_iframe.scss */ .l-iframe iframe { display: block; height: 100%; width: 100%; } +/***************************************************************************** + * 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. + *****************************************************************************/ /******************************** BROWSE */ -/* line 6, ../sass/_hide-non-functional.scss */ +/* line 27, ../sass/_hide-non-functional.scss */ .browse-mode .browse.top-bar { display: none; } -/* line 11, ../sass/_hide-non-functional.scss */ +/* line 32, ../sass/_hide-non-functional.scss */ .browse-mode .browse-area.holder { top: 5px; } - /* line 18, ../sass/_hide-non-functional.scss */ + /* line 39, ../sass/_hide-non-functional.scss */ .browse-mode .browse-area.holder > .contents.split-layout .object-browse-bar .t-btn.key-window { display: none; } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index f6ce343b1a..d39b47ef87 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -19,29 +19,90 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 1, ../sass/tree/_tree.scss */ +/***************************************************************************** + * 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 22, ../sass/tree/_tree.scss */ ul.tree { margin: 0; padding: 0; } - /* line 179, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; padding: 0; } - /* line 3, ../sass/tree/_tree.scss */ + /* line 24, ../sass/tree/_tree.scss */ ul.tree li { display: block; position: relative; } - /* line 6, ../sass/tree/_tree.scss */ + /* line 27, ../sass/tree/_tree.scss */ ul.tree li span.tree-item { - -webkit-border-radius: 3px; -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; - -webkit-transition: background-color 0.25s; -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; @@ -49,15 +110,15 @@ ul.tree { line-height: 1.5rem; margin-bottom: 3px; position: relative; } - /* line 17, ../sass/tree/_tree.scss */ + /* line 38, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .view-control { display: inline-block; margin-left: 5px; width: 10px; } - /* line 23, ../sass/tree/_tree.scss */ + /* line 44, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .view-control:hover { color: #ffc700; } - /* line 28, ../sass/tree/_tree.scss */ + /* line 49, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label { display: block; overflow: hidden; @@ -69,7 +130,7 @@ ul.tree { width: auto; height: auto; left: 20px; } - /* line 34, ../sass/tree/_tree.scss */ + /* line 55, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon { overflow: hidden; position: absolute; @@ -81,10 +142,10 @@ ul.tree { height: auto; text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px; color: #0099cc; } - /* line 38, ../sass/tree/_tree.scss */ + /* line 59, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon .alert { text-shadow: rgba(0, 0, 0, 0.3) 0 1px 2px; - background: #333333; + background: #333; color: #ff3c00; font-size: 0.7em; margin-top: -3px; @@ -96,7 +157,7 @@ ul.tree { width: auto; position: absolute; z-index: 2; } - /* line 54, ../sass/tree/_tree.scss */ + /* line 75, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .title-label { overflow: hidden; position: absolute; @@ -111,52 +172,52 @@ ul.tree { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 66, ../sass/tree/_tree.scss */ + /* line 87, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading { pointer-events: none; } - /* line 68, ../sass/tree/_tree.scss */ + /* line 89, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label { opacity: 0.5; } - /* line 70, ../sass/tree/_tree.scss */ + /* line 91, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label .title-label { font-style: italic; } - /* line 74, ../sass/tree/_tree.scss */ + /* line 95, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .wait-spinner { margin-left: 14px; } - /* line 79, ../sass/tree/_tree.scss */ + /* line 100, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected { background: #005177; - color: white; } - /* line 83, ../sass/tree/_tree.scss */ + color: #fff; } + /* line 104, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .view-control { color: #0099cc; } - /* line 86, ../sass/tree/_tree.scss */ + /* line 107, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .label .type-icon { color: #fff; } - /* line 92, ../sass/tree/_tree.scss */ + /* line 113, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover { background: #404040; color: #cccccc; } - /* line 95, ../sass/tree/_tree.scss */ + /* line 116, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .context-trigger { display: block; } - /* line 98, ../sass/tree/_tree.scss */ + /* line 119, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .icon { color: #33ccff; } - /* line 104, ../sass/tree/_tree.scss */ + /* line 125, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.loading) { cursor: pointer; } - /* line 109, ../sass/tree/_tree.scss */ + /* line 130, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger { display: none; top: -1px; position: absolute; right: 3px; } - /* line 115, ../sass/tree/_tree.scss */ + /* line 136, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger .btn-invoke-menu { font-size: 0.75em; height: 0.9rem; line-height: 0.9rem; } - /* line 124, ../sass/tree/_tree.scss */ + /* line 145, ../sass/tree/_tree.scss */ ul.tree ul.tree { margin-left: 15px; } diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index e3fc915021..448a4203be 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -70,17 +70,14 @@ &:hover { background: rgba(#fff, 0.1); } - &.stale { - color: darken($colorBodyFg, 20%); + &.s-stale { + //color: darken($colorBodyFg, 20%); + .l-autoflow-item.l { @include s-stale(0.3); }; + .l-autoflow-item.r { @include s-stale(); }; } - &:not(.stale) { + &:not(.s-stale) { .l-autoflow-item.r { - color: lighten($colorBodyFg, 20%); - } - } - &.alert { - .l-autoflow-item.r { - background: $colorFormError; + color: lighten($colorBodyFg, 10%); } } &.first-in-group { @@ -89,7 +86,6 @@ .l-autoflow-item { display: block; &.l { - // @include test(orange); float: none; overflow: hidden; text-overflow: ellipsis; @@ -97,8 +93,7 @@ width: auto; } &.r { - // @include test(blue); - @include border-radius($controlCr); + @include border-radius($smallCr); float: right; margin-left: $interiorMargin; padding-left: $valPad; diff --git a/platform/commonUI/general/res/sass/_badges.scss b/platform/commonUI/general/res/sass/_badges.scss index e7e00acfda..921c4f272e 100644 --- a/platform/commonUI/general/res/sass/_badges.scss +++ b/platform/commonUI/general/res/sass/_badges.scss @@ -28,7 +28,7 @@ .top-bar .badge { @include border-radius($controlCr * 1.5); - $h: $ueTopBarH; // - 5px; + $h: $btnStdH; //$ueTopBarBtnH; // - 5px; font-size: 1.4em; height: $h; line-height: $h; diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 875fa378b2..45731c8d7e 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -26,6 +26,7 @@ $interiorMarginLg: $interiorMargin * 2; $interiorMarginSm: 3px; $basicCr: 3px; $controlCr: $basicCr; +$smallCr: 2px; $badgeW: 35px; // Colors and shading @@ -45,20 +46,27 @@ $colorFormValid: #33cc33; $colorFormError: #cc0000; $colorFormInvalid: #ff9900; $colorGridLines: rgba(#fff, 0.05); - +$colorLimitYellow: #9d7500; +$colorLimitRed: #aa0000; +$colorTelemFresh: #fff; +$colorTelemStale: #888; +$styleTelemState: italic; +$colorInfoBubbleFg: #666; +$colorInfoBubbleBg: #ddd; // Ratios $ltGamma: 20%; $btnFontSizeToH: 0.45; // User Environment -$ueTopBarH: 35px; +$ueTopBarH: 30px; // Change to 45px when breadcrumb is enabled +$ueTopBarEditH: 30px; +$ueTopBarBtnH: 35px; $ueFooterH: 20px; $ueColMargin: 1.5%; $ueAppLogoW: 105px; -$ueBrowseViewBarH: $ueTopBarH; // was 30px -$ueEditToolBarH: $ueBrowseViewBarH; -$ueEditToolBarButtonH: $ueEditToolBarH * 0.8; +//$ueBrowseViewBarH: $ueTopBarH; // was 30px +$ueEditToolBarH: 25px; $ueBrowseLeftPaneW: 25%; $ueEditLeftPaneW: 75%; @@ -76,6 +84,7 @@ $ueBrowseGridItemBottomBarH: 40px; $colorItemBase: lighten($colorBodyBg, 5%); $colorItemFg: lighten($colorItemBase, 20%); $colorItemSelected: $colorKey; +$itemPadLR: 5px; // Tree $treeVCW: 10px; @@ -86,8 +95,8 @@ $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%); $colorItemTreeVCHover: $colorAlt1; //Tabular -$tabularHeaderH: 20px; -$tabularTdPadLR: 5px; +$tabularHeaderH: 18px; +$tabularTdPadLR: $itemPadLR; $tabularTdPadTB: 2px; $tabularColorBorder: rgba(white, 0.1); $tabularColorBodyBg: darken($colorBodyBg, 10%); @@ -104,6 +113,8 @@ $formRowCtrlsH: 14px; $menuLineH: 1.5rem; $scrollbarTrackSize: 10px; $scrollbarTrackColorBg: rgba(#000, 0.4); +$btnStdH: 25px; +$btnToolbarH: $btnStdH; // Paths $dirImgs: '../images/'; // Relative to platform/css/ directory diff --git a/platform/commonUI/general/res/sass/_data-status.scss b/platform/commonUI/general/res/sass/_data-status.scss new file mode 100644 index 0000000000..24a15db794 --- /dev/null +++ b/platform/commonUI/general/res/sass/_data-status.scss @@ -0,0 +1,7 @@ +.s-stale { + @include s-stale(); + .td { + @include s-stale(); + } +} + diff --git a/platform/commonUI/general/res/sass/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index 6ae194e53c..40a1a24414 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -41,4 +41,21 @@ a.disabled { .test { @include test(); +} + +@include keyframes(pulse) { + 0% { opacity: 0.2; } + 100% { opacity: 1; } +} + +@mixin pulse($dur: 500ms) { + @include animation-name(pulse); + @include animation-duration($dur); + @include animation-direction(alternate); + @include animation-iteration-count(infinite); + @include animation-timing-function(ease-in-out); +} + +.pulse { + @include pulse(1000ms); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss index 3bd0c13836..22694aea72 100644 --- a/platform/commonUI/general/res/sass/_fixed-position.scss +++ b/platform/commonUI/general/res/sass/_fixed-position.scss @@ -21,24 +21,18 @@ *****************************************************************************/ .t-fixed-position { &.l-fixed-position { - // @include test(red); +// @include test(red); position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; + top: 0; right: 0; bottom: 0; left: 0; + width: auto; height: auto; .l-grid-holder { position: relative; - height: 100%; - width: 100%; + height: 100%; width: 100%; .l-grid { - // @include test(orange); +// @include test(orange); position: absolute; - height: 100%; - width: 100%; + height: 100%; width: 100%; pointer-events: none; z-index: 0; } @@ -62,13 +56,12 @@ .l-fixed-position-image, .l-fixed-position-text { @include box-sizing(border-box); - height: 100%; - width: 100%; + height: 100%; width: 100%; } .l-fixed-position-box { } - + .l-fixed-position-image { background-size: cover; background-repeat: no-repeat; @@ -77,32 +70,39 @@ .l-fixed-position-text { @include txtShdwSubtle(); - border: 1px solid transparent; + border:1px solid transparent; font-size: 0.8rem; - $p: $interiorMarginSm; + $p: 1px; //$interiorMarginSm; + line-height: 100%; &.l-static-text { - // overflow: auto; +// overflow: auto; padding: $p; } &.l-telemetry { .l-elem { - @include absPosDefault($p); + //@include absPosDefault($p); + @include absPosDefault(0); @include box-sizing(border-box); + padding: 2px; width: 50%; &.l-title { right: auto; left: $p; } &.l-value { - // @include test(blue); +// @include test(blue); right: $p; left: auto; text-align: right; &.telem-only { - // @include test(red); +// @include test(red); left: $p; width: auto; } + .l-value-bg { + @include border-radius($smallCr); + padding: 0 4px; + } } } } diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 8aa10683a7..fda57e977d 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -76,7 +76,7 @@ } .object-header .type-icon { - color: $colorAlt1; + color: $colorKey; margin-right: $interiorMargin; } diff --git a/platform/commonUI/general/res/sass/_limits.scss b/platform/commonUI/general/res/sass/_limits.scss new file mode 100644 index 0000000000..4a9971edba --- /dev/null +++ b/platform/commonUI/general/res/sass/_limits.scss @@ -0,0 +1,52 @@ +@mixin limit($c, $glyph) { + background: $c; + &:before { + //@include pulse(500ms); + color: lighten($c, 30%); + content: $glyph; + } +} + +/*.s-limit-upr, +.s-limit-lwr { + $a: 0.5; + $l: 30%; + white-space: nowrap; + &:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.85em; + font-style: normal !important; + margin-right: $interiorMarginSm; + vertical-align: middle; + } +} + +.s-limit-upr { + &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ed"); } + &.s-limit-red { @include limit($colorLimitRed, "\0000eb"); } +} + +.s-limit-lwr { + &.s-limit-yellow { @include limit($colorLimitYellow, "\0000ec"); } + &.s-limit-red { @include limit($colorLimitRed, "\0000ee"); } +}*/ + +[class*="s-limit"] { + $a: 0.5; + $l: 30%; + white-space: nowrap; + &:before { + display: inline-block; + font-family: symbolsfont; + font-size: 0.85em; + font-style: normal !important; + margin-right: $interiorMarginSm; + vertical-align: middle; + } +} + +.s-limit-upr-red { @include limit($colorLimitRed, "\0000eb"); }; +.s-limit-upr-yellow { @include limit($colorLimitYellow, "\0000ed"); }; +.s-limit-lwr-yellow { @include limit($colorLimitYellow, "\0000ec"); }; +.s-limit-lwr-red { @include limit($colorLimitRed, "\0000ee"); }; \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index f82c85a0dc..3eb4397f91 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -22,6 +22,7 @@ @import "compass"; @import "compass/reset"; @import "compass/css3"; +@import "compass/css3/animation"; @import "compass/css3/user-interface"; @import "compass/utilities"; @@ -35,7 +36,10 @@ @import "text"; @import "badges"; @import "icons"; +@import "limits"; +@import "data-status"; @import "lists/tabular"; +@import "controls/breadcrumb"; @import "controls/buttons"; @import "controls/color-palette"; @import "controls/controls"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 1ac8f4bbcf..3a99d6115c 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -67,7 +67,7 @@ rgba($c, $a) 25%, transparent 25%, transparent 50%, rgba($c, $a) 50%, rgba($c, $a) 75%, transparent 75%, - transparent 0 + transparent 100% )); background-repeat: repeat; background-size: $d $d; @@ -178,6 +178,14 @@ @include box-shadow(rgba($color, $sVal) 0 0 30px); } +@mixin linearGlow($deg: 0, $c: red, $a: 0.4) { + @include background-image(linear-gradient($deg, rgba($c,0), rgba($c, $a) 100%)); +} + +@mixin subtleGrad($deg: 0, $c: red, $a0: 0.2, $a1: 0.3) { + @include background-image(linear-gradient($deg, rgba($c,$a0), rgba($c, $a1) 100%)); +} + @mixin txtShdwSubtle($sVal: 0.1) { @include text-shadow(rgba(black, $sVal) 0 1px 2px); } @@ -247,8 +255,6 @@ background-color: rgba($c, $a); } - - @mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) { &:after { @include box-sizing(border-box); @@ -264,4 +270,9 @@ transform: scaleX(1) scaleY(1) scaleZ(1); transform-origin: 50% 50% 0; } +} + +@mixin s-stale($a: 0.5) { + color: rgba($colorTelemFresh, $a) !important; + font-style: italic; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_breadcrumb.scss b/platform/commonUI/general/res/sass/controls/_breadcrumb.scss new file mode 100644 index 0000000000..35f0a21005 --- /dev/null +++ b/platform/commonUI/general/res/sass/controls/_breadcrumb.scss @@ -0,0 +1,31 @@ +.l-breadcrumb { + $c: darken($colorBodyFg, 15%); + $p: 4px; + font-size: 0.7rem; + line-height: 1em; + margin-bottom: $interiorMargin; + margin-left: -1 * $p; + .l-breadcrumb-item { + //@include test(); + a { + @include box-sizing(border-box); + @include border-radius($basicCr*.75); + @include single-transition(background-color, 0.25s); + color: darken($colorBodyFg, 15%); + display: inline-block; + //margin-right: $interiorMargin; + padding: $p/2 $p; + .icon { + color: $colorItemTreeIcon; + margin-right: $interiorMargin; + } + &:hover { + background: lighten($colorBodyBg, 10%); + color: lighten($colorBodyFg, 10%); + .icon { + color: $colorItemTreeIconHover; + } + } + } + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index deebb146f1..721a557a32 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -103,11 +103,12 @@ padding: 0 ($interiorMargin * 2); // Moved to s-btn text-decoration: none; // Moved to s-btn &.create-btn { - $h: $ueBrowseViewBarH; + $h: $ueTopBarH - $interiorMargin; //$btnStdH * 1.5;; + $p: $p * 2.25; height: $h; line-height: $h; - font-size: 1.1em; - padding: 0 ($p * 1.5) 0 $p; + //font-size: 1.1em; + padding: 0 $p; .menu { margin-left: $p * -1; } @@ -223,7 +224,7 @@ .top-bar .buttons-main .t-btn, .tool-bar .btn, .tool-bar .t-btn { - $h: $ueEditToolBarButtonH; + $h: $btnToolbarH; display: inline-block; font-size: $h * $btnFontSizeToH; height: $h; @@ -361,7 +362,7 @@ label.checkbox.custom { } .top-bar .btn-menu { - $h: $ueTopBarH; // 35px + $h: $btnStdH; //$ueTopBarBtnH; // 35px $p: 10px; $badgeM: $interiorMargin; $badgeD: $h - ($badgeM * 2); @@ -407,7 +408,6 @@ label.checkbox.custom { font-size: 1.1em; span { display: inline-block; -// margin-right: $interiorMargin; } } } diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 0f46692698..d225d764fe 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -72,7 +72,9 @@ $prw: $w - $plw; width: $w; height: $h; - .contents { overflow: none; } + .contents { + @include absPosDefault($interiorMargin); + } .pane { @include box-sizing(border-box); &.left { diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index 61980cf554..ca228ef02a 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -21,9 +21,6 @@ *****************************************************************************/ //************************************************* LAYOUT -$infoBubbleFg: #666; -$infoBubbleBg: #ddd; - .l-infobubble-wrapper { $arwSize: 5px; @include box-shadow(rgba(black, 0.4) 0 1px 5px); @@ -31,7 +28,7 @@ $infoBubbleBg: #ddd; z-index: 70; .l-infobubble { display: inline-block; - max-width: 250px; + max-width: 300px; padding: 5px 10px; &:before { content:""; @@ -54,7 +51,8 @@ $infoBubbleBg: #ddd; white-space: nowrap; } &.value { - white-space: nowrap; + //@include test(red); + //white-space: nowrap; //width: 90%; } &.align-wrap { @@ -76,7 +74,7 @@ $infoBubbleBg: #ddd; right: 100%; border-top: $arwSize solid transparent; border-bottom: $arwSize solid transparent; - border-right: ($arwSize * 1.5) solid $infoBubbleBg; + border-right: ($arwSize * 1.5) solid $colorInfoBubbleBg; } } @@ -86,7 +84,7 @@ $infoBubbleBg: #ddd; left: 100%; border-top: $arwSize solid transparent; border-bottom: $arwSize solid transparent; - border-left: ($arwSize * 1.5) solid $infoBubbleBg; + border-left: ($arwSize * 1.5) solid $colorInfoBubbleBg; } } @@ -110,7 +108,7 @@ $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; } } } @@ -118,10 +116,10 @@ $infoBubbleBg: #ddd; //************************************************* LOOK AND FEEL .s-infobubble { - $emFg: darken($infoBubbleFg, 20%); + $emFg: darken($colorInfoBubbleFg, 20%); @include border-radius($basicCr); - background: $infoBubbleBg; - color: $infoBubbleFg; + background: $colorInfoBubbleBg; + color: $colorInfoBubbleFg; font-size: 0.8rem; .title { color: $emFg; @@ -129,7 +127,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 { diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss index 3cdc036d87..4ca7470fdc 100644 --- a/platform/commonUI/general/res/sass/helpers/_splitter.scss +++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss @@ -84,7 +84,7 @@ } .browse-area .splitter { - top: $ueBrowseViewBarH + $interiorMargin; + top: $ueTopBarH + $interiorMargin; } .edit-area .splitter { diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index 95bda6f673..213b79ce5b 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -19,78 +19,108 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -.w1 { - background: $tabularColorHeaderBg; - padding-top: $tabularHeaderH; +.w1, .w2 { position: relative; + height: 100%; } -.w2 { - background: $tabularColorBodyBg; - overflow-y: auto; -} .tabular { @include box-sizing(border-box); border-spacing: 0; border-collapse: collapse; + color: #fff; display: table; font-size: 0.8em; + position: relative; + height: 100%; width: 100%; - .tr { - display: table-row; + thead, .thead, + tbody tr, .tbody .tr { + display: table; + width: 100%; + table-layout: fixed; + } + thead, .thead { + width: calc(100% - 10px); + tr, .tr { + height: $tabularHeaderH; + } + &:before { + content: ""; + display: block; + z-index: 0; + position: absolute; + width: 100%; + height: $tabularHeaderH; + background: rgba(#fff, 0.15); + } + } + tbody, .tbody { + @include absPosDefault(0); + top: $tabularHeaderH; + //display: table-row-group; + display: block; + //width: 100%; + overflow-y: scroll; + tr, .tr { + &:hover { + background: rgba(white, 0.1); + } + } + } + tr, .tr { + //display: table-row; + //width: 100%; &:first-child .td { border-top: none; } - &:hover { - background: rgba(white, 0.1); - } - &.header { - display: table-header-group; - .th { - border: none; - color: transparent; - height: 0px; - line-height: 0; - padding: 0 $tabularTdPadLR; - white-space: nowrap; - vertical-align: middle; // This is crucial to hiding f**king 4px height injected by browser by default - &:first-child em { - border-left: none; - } - &.sort { - em:after { - display: inline-block; - font-family: symbolsfont; - margin-left: 5px; - } - &.asc em:after { content: '0'; } - &.desc em:after { content: '1'; } - } - em { -// background: rgba(green, 0.2); - border-left: 1px solid $tabularColorBorder; - color: $tabularColorHeaderFg; - cursor: pointer; - display: block; - font-style: normal; - font-weight: bold; - height: $tabularHeaderH; - line-height: $tabularHeaderH; - margin-left: - $tabularTdPadLR; - padding: 0 $tabularTdPadLR; - position: absolute; - top: 0; - vertical-align: middle; - &:hover { - color: lighten($tabularColorHeaderFg, 20%); - } - } - } - } - .th, .td { + th, .th, td, .td { display: table-cell; } - .td { + th, .th { + border: none; + border-left: 1px solid $tabularColorBorder; + color: $tabularColorHeaderFg; + padding: 0 $tabularTdPadLR; + white-space: nowrap; + vertical-align: middle; // This is crucial to hiding f**king 4px height injected by browser by default + &:first-child { + border-left: none; + } + &.sort { + .icon-sorting:before { + display: inline-block; + font-family: symbolsfont; + margin-left: 5px; + } + &.asc .icon-sorting:before { + content: '0'; + } + &.desc .icon-sorting:before { + content: '1'; + } + } + /* em { + //background: rgba(green, 0.2); + border-left: 1px solid $tabularColorBorder; + color: $tabularColorHeaderFg; + cursor: pointer; + display: block; + font-style: normal; + font-weight: bold; + height: $tabularHeaderH; + line-height: $tabularHeaderH; + margin-left: - $tabularTdPadLR; + padding: 0 $tabularTdPadLR; + position: absolute; + top: 0; + vertical-align: middle; + &:hover { + color: lighten($tabularColorHeaderFg, 20%); + } + }*/ + } + td, .td { border-top: 1px solid $tabularColorBorder; padding: $tabularTdPadTB $tabularTdPadLR; &.numeric { @@ -98,4 +128,9 @@ } } } + &.filterable { + tbody, .tbody { + top: $tabularHeaderH * 2; + } + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 8537b35756..5681f0d0cc 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -20,7 +20,7 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ $yBarW: 60px; -$yLabelW: auto; //10px; +$yLabelW: auto; $xBarH: 32px; $legendH: 24px; $colorHash: rgba(white, 0.3); @@ -59,7 +59,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .gl-plot-coords { @include box-sizing(border-box); @include border-radius($controlCr); - background: rgba($colorAlt1, 0.5); + background: black; //rgba($colorKey, 0.5); color: lighten($colorBodyFg, 30%); padding: 2px 5px; position: absolute; @@ -101,7 +101,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa } &.gl-plot-y-label, - &.l-plot-y-label { + &.l-plot-y-label { $x: -50%; $r: -90deg; @include transform-origin(50%, 0); @@ -150,22 +150,51 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa height: $legendH; overflow-x: hidden; overflow-y: auto; -// .plot-legend-item { -// display: inline-block; -// margin-right: $interiorMarginLg; -// span { -// vertical-align: middle; -// } -// .plot-color-swatch { -// @include border-radius(2px); -// display: inline-block; -// height: $swatchD; -// width: $swatchD; -// margin-right: $interiorMarginSm; -// } -// } + } + + /****************************** Limits and Out-of-Bounds data */ + + .l-limit-bar, + .l-oob-data { + position: absolute; + left: 0; + right: 0; + width: auto; + } + + .l-limit-bar { + // Limits in plot display area + @mixin limitBg($c) { + background: rgba($c, 0.2); + } + + height: auto; + z-index: 0; + &.s-limit-yellow { @include limitBg($colorLimitYellow); } + &.s-limit-red { @include limitBg($colorLimitRed); } + } + + .l-oob-data { + $c: #7748d6; + $a: 0.5; + $h: 10px; + @include absPosDefault(); + pointer-events: none; + height: $h; + z-index: 1; + &.l-oob-data-up { + top: 0; + bottom: auto; + @include linearGlow(0deg, $c, $a); + } + &.l-oob-data-dwn { + bottom: 0; + top: auto; + @include linearGlow(180deg, $c, $a); + } } } + .gl-plot-legend, .legend { .plot-legend-item, @@ -181,11 +210,23 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa display: inline-block; height: $swatchD; width: $swatchD; - margin-right: $interiorMarginSm; - + //margin-right: $interiorMarginSm; } - .title-label { + .title-label {} + } +} +.gl-plot-legend { + .plot-legend-item { + //@include test(); + @include border-radius($smallCr); + color: #fff; + line-height: 1.5em; + padding: 0px $itemPadLR; + .plot-color-swatch { + border: 1px solid $colorBodyBg; + height: $swatchD + 1; + width: $swatchD + 1; } } } @@ -199,7 +240,6 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa } } - .gl-plot-tick, .tick-label { // @include test(red); diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 0ffa58b561..c459adfa8d 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -110,11 +110,12 @@ } .edit-area { - $tbH: $ueEditToolBarH; + $tbH: $btnToolbarH + $interiorMargin; + top: $bodyMargin + $ueTopBarEditH + ($interiorMargin); .tool-bar { bottom: auto; height: $tbH; - line-height: $ueEditToolBarButtonH; + line-height: $btnToolbarH; } .work-area { top: $tbH + $interiorMargin * 2; @@ -202,19 +203,31 @@ position: absolute; &.treeview { .create-btn-holder { - bottom: auto; height: $ueBrowseViewBarH; + bottom: auto; top: 0; + height: $ueTopBarH; + .wrapper.menu-element { + position: absolute; + bottom: $interiorMargin; + } } .tree-holder { overflow: auto; - top: $ueBrowseViewBarH + $interiorMargin; + top: $ueTopBarH + $interiorMargin; } } &.items { .object-browse-bar { // bottom: auto; + .left.abs, + .right.abs { + top: auto; + } + .right.abs { + bottom: $interiorMargin; + } } .object-holder { - top: $ueBrowseViewBarH + $interiorMargin; + top: $ueTopBarH + $interiorMargin; } } &.edit-main { diff --git a/platform/commonUI/general/res/sass/user-environ/_object-browse.scss b/platform/commonUI/general/res/sass/user-environ/_object-browse.scss index 56929f58af..3ebbebecf4 100644 --- a/platform/commonUI/general/res/sass/user-environ/_object-browse.scss +++ b/platform/commonUI/general/res/sass/user-environ/_object-browse.scss @@ -20,8 +20,8 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .object-browse-bar { - height: $ueBrowseViewBarH; - line-height: $ueBrowseViewBarH; + height: $ueTopBarH; + //line-height: $ueTopBarBtnH; .items-select { .btn-menu { margin-right: $interiorMargin * 3; diff --git a/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss b/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss index c528903f24..1ad9389ae5 100644 --- a/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss +++ b/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss @@ -22,19 +22,19 @@ .tool-bar { border-bottom: 1px solid $colorInteriorBorder; .l-control-group { - height: $ueEditToolBarButtonH; + height: $btnToolbarH; } input[type="text"] { @include box-sizing(border-box); font-size: .9em; - height: $ueEditToolBarButtonH; + height: $btnToolbarH; margin-bottom: 1px; position: relative; &.sm { - width: $ueEditToolBarButtonH; + width: $btnToolbarH; } } .input-labeled label { - font-size: $ueEditToolBarButtonH * $btnFontSizeToH; + font-size: $btnToolbarH * $btnFontSizeToH; } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/user-environ/_top-bar.scss b/platform/commonUI/general/res/sass/user-environ/_top-bar.scss index 2e817a948c..e2ee1f105c 100644 --- a/platform/commonUI/general/res/sass/user-environ/_top-bar.scss +++ b/platform/commonUI/general/res/sass/user-environ/_top-bar.scss @@ -22,13 +22,13 @@ .top-bar { // $h: $ueTopBarH - 5px; // background: rgba(#ff0000, 0.2); - line-height: $ueTopBarH; +// line-height: $ueTopBarBtnH; &.browse, &.edit { border-bottom: 1px solid $colorInteriorBorder; top: $bodyMargin; right: $bodyMargin; bottom: auto; left: $bodyMargin; - height: $ueTopBarH; + height: $ueTopBarEditH; } .action { diff --git a/platform/commonUI/inspect/res/bubble.html b/platform/commonUI/inspect/res/bubble.html index 5090eb1199..07395447b1 100644 --- a/platform/commonUI/inspect/res/bubble.html +++ b/platform/commonUI/inspect/res/bubble.html @@ -1,4 +1,4 @@ -
+
From 689701b37f0b2835868ef419aa65878ba562623b Mon Sep 17 00:00:00 2001 From: larkin Date: Mon, 8 Jun 2015 11:23:25 -0700 Subject: [PATCH 38/74] [Licenses] Add License Header --- .../browse/src/windowing/WindowTitler.js | 21 +++++++++++++++++++ .../browse/test/windowing/WindowTitlerSpec.js | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/platform/commonUI/browse/src/windowing/WindowTitler.js b/platform/commonUI/browse/src/windowing/WindowTitler.js index 49a121df90..9db65e5b0e 100644 --- a/platform/commonUI/browse/src/windowing/WindowTitler.js +++ b/platform/commonUI/browse/src/windowing/WindowTitler.js @@ -1,3 +1,24 @@ +/***************************************************************************** + * 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( diff --git a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js index cc08be51f8..d9c71a86dd 100644 --- a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js +++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js @@ -1,3 +1,24 @@ +/***************************************************************************** + * 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*/ /** From 7a93b7d77a679155e656e4a15951541428a73ad8 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 9 Jun 2015 09:32:28 -0700 Subject: [PATCH 39/74] Pulled in final sanding on bubbles.scss from open1222 --- .../general/res/css/theme-espresso.css | 48 ++++++++++--------- .../general/res/sass/helpers/_bubbles.scss | 4 +- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 2958023973..6f511d129d 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -84,7 +84,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -105,38 +105,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -4030,9 +4030,11 @@ input[type="text"] { /* line 121, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper { position: absolute; + left: 10px; + right: 10px; height: 183px; - width: 100%; } - /* line 126, ../sass/helpers/_bubbles.scss */ + width: auto; } + /* line 128, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper .l-thumbsbubble { overflow: hidden; position: absolute; @@ -4042,21 +4044,21 @@ input[type="text"] { left: 0px; width: auto; height: auto; } - /* line 128, ../sass/helpers/_bubbles.scss */ + /* line 130, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper .l-thumbsbubble .l-image-thumbs-wrapper { height: auto; top: 5px !important; right: 25px; bottom: 5px !important; left: 5px; } - /* line 133, ../sass/helpers/_bubbles.scss */ + /* line 135, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper .arw { z-index: 2; } - /* line 138, ../sass/helpers/_bubbles.scss */ + /* line 140, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper.arw-up .arw.arw-down, .l-thumbsbubble-wrapper.arw-down .arw.arw-up { display: none; } -/* line 148, ../sass/helpers/_bubbles.scss */ +/* line 150, ../sass/helpers/_bubbles.scss */ .s-bubble { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -4065,14 +4067,14 @@ input[type="text"] { -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; } -/* line 154, ../sass/helpers/_bubbles.scss */ +/* line 156, ../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 157, ../sass/helpers/_bubbles.scss */ +/* line 159, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper .arw-down { width: 0; height: 0; @@ -4080,27 +4082,27 @@ input[type="text"] { border-right: 6.66667px solid transparent; border-top: 10px solid #4d4d4d; } -/* line 161, ../sass/helpers/_bubbles.scss */ +/* line 163, ../sass/helpers/_bubbles.scss */ .s-infobubble { background: #ddd; color: #666; font-size: 0.8rem; } - /* line 166, ../sass/helpers/_bubbles.scss */ + /* line 168, ../sass/helpers/_bubbles.scss */ .s-infobubble .title { color: #333333; font-weight: bold; } - /* line 171, ../sass/helpers/_bubbles.scss */ + /* line 173, ../sass/helpers/_bubbles.scss */ .s-infobubble tr td { border-top: 1px solid #c4c4c4; font-size: 0.9em; } - /* line 175, ../sass/helpers/_bubbles.scss */ + /* line 177, ../sass/helpers/_bubbles.scss */ .s-infobubble tr:first-child td { border-top: none; } - /* line 179, ../sass/helpers/_bubbles.scss */ + /* line 181, ../sass/helpers/_bubbles.scss */ .s-infobubble .value { color: #333333; } -/* line 184, ../sass/helpers/_bubbles.scss */ +/* line 186, ../sass/helpers/_bubbles.scss */ .s-thumbsbubble { background: #4d4d4d; color: #b3b3b3; } diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index 2a499339ce..0dad9e115b 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -121,8 +121,10 @@ .l-thumbsbubble-wrapper { $closeBtnD: 15px; position: absolute; + left: $interiorMarginLg; + right: $interiorMarginLg; height: $imageThumbsWrapperH + $bubblePad*2 + $interiorMargin; - width: 100%; + width: auto; .l-thumbsbubble { @include absPosDefault(); .l-image-thumbs-wrapper { From 1795dc55498ed7a20c8e71a089a6c9ba89a03fa0 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 9 Jun 2015 16:44:18 -0700 Subject: [PATCH 40/74] Merging in /platform specific changes from warp1220 --- platform/commonUI/general/res/css/forms.css | 2 +- platform/commonUI/general/res/css/items.css | 4 +- .../general/res/css/theme-espresso.css | 86 ++++++++++++++---- platform/commonUI/general/res/css/tree.css | 2 +- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 10676 -> 10760 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 5 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 10512 -> 10596 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 7308 -> 7384 bytes platform/commonUI/general/res/sass/_main.scss | 1 + .../commonUI/general/res/sass/_mixins.scss | 16 ++++ .../res/sass/features/_time-display.scss | 44 +++++++++ 11 files changed, 137 insertions(+), 23 deletions(-) create mode 100644 platform/commonUI/general/res/sass/features/_time-display.scss diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 903a2694f0..3636789add 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -374,7 +374,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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-size: 100%; diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 875fe8488f..e7c55093d5 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -119,7 +119,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 173, ../sass/_mixins.scss */ + /* line 190, ../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-size: 100%; @@ -210,7 +210,7 @@ background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #80dfff; } - /* line 181, ../sass/_mixins.scss */ + /* line 198, ../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-size: 100%; diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 6f511d129d..e846ba557c 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1043,7 +1043,7 @@ span { display: inline-block; font-size: 1rem; vertical-align: middle; } - /* line 225, ../sass/_mixins.scss */ + /* line 241, ../sass/_mixins.scss */ .invoke-menu:hover { color: #33ccff; } @@ -1055,7 +1055,7 @@ span { /* line 70, ../sass/_icons.scss */ .icon-buttons-main .invoke-menu { color: #666666; } - /* line 225, ../sass/_mixins.scss */ + /* line 241, ../sass/_mixins.scss */ .icon-buttons-main .invoke-menu:hover { color: #999999; } @@ -1376,7 +1376,7 @@ span { border-top: 1px solid #666666; color: #999; display: inline-block; } - /* line 128, ../sass/_mixins.scss */ + /* line 144, ../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=='); background-size: 100%; @@ -1405,7 +1405,7 @@ span { border-top: 1px solid #fea32e; color: #fff; display: inline-block; } - /* line 128, ../sass/_mixins.scss */ + /* line 144, ../sass/_mixins.scss */ .s-btn.s-very-subtle.paused:hover, .s-very-subtle.paused.s-icon-btn:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlYTMyZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -1708,7 +1708,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #ccf2ff; } - /* line 181, ../sass/_mixins.scss */ + /* line 197, ../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%; @@ -1744,7 +1744,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#4dd2ff, #00ace6); background-image: linear-gradient(#4dd2ff, #00ace6); color: #ccf2ff; } - /* line 181, ../sass/_mixins.scss */ + /* line 197, ../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%; @@ -1782,7 +1782,7 @@ a.l-btn span { border-top: 1px solid #999999; color: #cccccc; display: inline-block; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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%; @@ -1811,7 +1811,7 @@ a.l-btn span { border-top: 1px solid #666666; color: #b3b3b3; display: inline-block; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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%; @@ -2025,7 +2025,7 @@ label.checkbox.custom { display: inline-block; height: 20px; line-height: 20px; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2179,7 +2179,7 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2187,7 +2187,7 @@ label.checkbox.custom { background-image: -moz-linear-gradient(#666666, #4d4d4d); background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 145, ../sass/_mixins.scss */ + /* line 161, ../sass/_mixins.scss */ .slider .knob:before { content: ''; display: block; @@ -2198,7 +2198,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 166, ../sass/_mixins.scss */ + /* line 182, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } /* line 479, ../sass/controls/_controls.scss */ @@ -2362,7 +2362,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 233, ../sass/_mixins.scss */ + /* line 249, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2692,6 +2692,56 @@ label.checkbox.custom { .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 @@ -3013,7 +3063,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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-size: 100%; @@ -4157,7 +4207,7 @@ input[type="text"] { right: 0; width: auto; height: 5px; } - /* line 145, ../sass/_mixins.scss */ + /* line 161, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -4168,7 +4218,7 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 166, ../sass/_mixins.scss */ + /* line 182, ../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 */ @@ -4186,7 +4236,7 @@ input[type="text"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 145, ../sass/_mixins.scss */ + /* line 161, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -4197,7 +4247,7 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 166, ../sass/_mixins.scss */ + /* line 182, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 90e1957f25..705bc6506d 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -86,7 +86,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 233, ../sass/_mixins.scss */ + /* line 249, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 8d889083969641eaa461262406f3449d9ba29a29..0d7e45d06d68d1ff88b65b3c9209f299945b3af5 100644 GIT binary patch delta 549 zcmXv~O=uHQ5dPlVw@Hf86kRL0X;_oAZZsq{q>WGyRjQ3bDOmqNv|W?5IW#t*jaG>k zK_P`AhIi>fdloz>rl1Fv?M=KXc(NK1iXIdzsP&-6Nx*^m`R1E>GxL^)%g0pLE+Ab| z6T&sPUaa&LXKTO5fKU>EccA~^A>4w4uu0e$8ji-UWqjWNc8c(5Dre>Y^hN`K(oeY$ zU2Jx=(iA!T*zIGW<*8tzIY{p7E?%y~;+zM$=mJ-eZzDm6s;b1m5Ju}

e zF!A5P$TI9Nt`E9KJo|oNgFuW#~g}-~qUo%#buau5$D|B;XlotXv`7jKM+;WrHDH9?pvmz|sd%(^b delta 471 zcmeAO*%HjUMU#O+U?QtI3q!5#wTTX;^|$;MF)(O+VPIg8ad&ZbW9VmK1M;r``3nBQ z`bLeZa-SF&7$boEgyh`B0;@wGmM}0dI{?LAr6(2_{Qu9u3{-yxD9@3eQ<)~2uW*2Y zffZ<;+=7hM#1ytAn%jVKcYxR|11P}m&h!MRR|Lpc$;d6Ks28qgcn%cU0mL0S`N@f8 z*?ISX2Iv449Lr6tC}3E{5DJvD0P+>`5_3~mC@^gY>YV~~gi}F&aY^B zPYjGel99pjnr$sZJipCX25#mTKoN$E(~C~P=>PZszhxC)Z)Vg`O#*97 zVh95H9SE3!m=P@I0OA4xGt>P|Ojj8v-(*%2e**L|$RZgA76y>9dJGCc7T;tc7Inri zlPy>bm>9lI&S24D`=9YZnt^e0A*;dUV=VI+llG9NSypgQ<-_X GfDHh+5Of#- diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg index 36a0c4856f..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 Fri Jun 5 15:37:46 2015 +Created by FontForge 20090622 at Tue Jun 9 23:00:40 2015 By deploy user Copyright 2015 Adobe Systems Incorporated. All rights reserved. @@ -245,6 +245,9 @@ z" /> d="M216 375l187 -187h-309q-38 0 -66 27.5t-28 66.5v375q0 38 28 66t66 28h375q39 0 66.5 -28t27.5 -66v-309l-188 187zM751 422v-422h-422v94h234l-281 281l93 94l282 -281v234h94z" /> + !*d{i2N3t<SV zO|EMJ8US*@iQL4B0*2KLp+GqcAYUObF*kLE0@HS&))zoWI2Gg)yfra4!kk(;P0J3-{XECc!p3JO2`3SQP%L5q(#>p31^d_sZ%wvj= z12T;#3$SoACIDGRlg(MTaLVzU@Tc(C@Yihq!unJ;92h_h3``T5-ZO9lgI@ O(&Sef%FJ{2F#rJnKY+&o delta 418 zcmaD7G$E*-fsuiMftR6yftew|%`L?D$t}M{3=A4yfTA+)F0O72{S0hC{uLl!!9Q5v zs4-RU69WTd1dyMQoSRr+b?Czq1_ovapxCSQ#NvYg|A8hkXq*AcbEM}~rb*^29AIEz z1)3+fAR{#~g>8xEHlW-cAU4a$NUcv~cV~J6)GPuNP|3(GsSvJacn;+60OF3E{N%*4 z?7VwG19X7$$8r-Z3K&)~gaYL(fP96##N5;s3QXI9TBiUV;Z%@cTv9lzP@jQ8{RU9} z6WDW%435`qYZ>DCZN4&aGrs_eGhCcrbOJ&%6`h#GXwIGlR+%)}j!~BJ{^l6QtBjLP znU%z!0Q~|A9~lM~29O3l1_dCCZ*m^9I^&ngQ2<`;;Ww8yxT`zCd z_w#nunVvp7%(lWA7)6A!s<_WZ*co61ibxs}-2qph1R(OI*fCcrjxxJ|q2!y))#M3&pG4UI;qeiKW@YDP2?C)HfIvigAQ1Hxdi0vNwT0(dPd=I$7qnyNX#S)_f1*H7dx8esll+72O+BB^ zMF|Fh01)*PNee0kX*!tNTYy013{Qz>5D4vK5iM$?lcS3(2t={|q^WztnX|t0zUQL3 z3E0HM1nk6qe=z)V-0?IyAmbWCHFyJV5JJXv^LYR0s5_Jv5@3Lj$rR55atOpz`rjJw z%bb{ifCBiFWQ2VS_rpuVck#HOq&7^R{|V$RvCT}(K`2bLmS9kX(6?(`5D`BL3JCOH z-m;}XsT4&5pv3+AREy`L=0xjPR7t|V<62(HUM*F2KE(;oXP!RzI8pID3a{l!S_wOX z@|BXbk2u&ll)Ky|RVCrx-AprAIavy{I1(MTE|xnr-3oB#-2gp2Zb=r%v7%){w~jQl z-ByG2_UM!z_XtK#;FSAM0XhNJ178_UU*Hht{ui}@)gg46P7pE$1Hum zGBO%AT5%+PNsK$TpURj$BFwmNRcXAB`O!T4`oGA%AmFxS(>q|6R5qzMm7#iLhUy z99XOukg;VexhPR9H_ZE5`3j4b#Q8;p(<#s_xWI-T#zYqjhu_@k6$h!mUPHtgW8UrKZdzh;+S*l(zPqJ_z$j>Z$+GCa4u$JZ z&eHzt3JDXEsoXRV6T>I`x05vv;;1}f2R@&$5I{IRAZ!8<4s8f43FMs>$w=B`^;0lzrMq&qMXfC zx53wq(T<~mL20hWPAP@mkaNC|zqIEonmuUv1GXtnH#>^5(H9cEi*)oU^pD@F>W!BW z1qvN=b@Av%)~^!zZKhFKQ{_^A@nK4(XeZHP5CW$;kI{nJJrXA%p&koo{IPN87d%R` zNqzrZz3BTQt#zU`Jnz?Qf(8xHeipH7ttT;*e4dz|ptjAgUb{jzKNDqI{A>tEOD;%2oYexuDI_$T7G6szvepx0P= z1=>#8aZoQ0w2^q3y)=CGL$F0zT3f1pHTY7eM!-Vf8#B^LUnO^-m)CEmu$0HfHT zN3CE&?GN-pvg=tsp*InXt0JmQVm=oW1n!5wXbu*nzG4m8$*>qR0cvgod-Bp)ZOVrQ zIHn?YXd&4ki#O7H8O8N*gE6O&5pi_9+a|*r?R#r<4>4(?yI?8e+M9^PgZ?Qc#d3FJ zE{2_*WFqaWDAc%ufKEQnH4>IfV4)nvIHZ%5SRt+v^F)+de=on^U!8mziYB6`WFHdZ z6);Q18BA}W`1Bk(SIe-}AaY;!WW^}e9|x#!KxHZnMxyS~9hb<`Gs0PYeZAeih}V02 zDa1@#$twXq1K`ruo>zO}9;JJt_l`w*(|e9TLzUETjhLX$nAZm1O8XxG*1S)tHQ)V* zPdn{tEZ(1|m+`;k70gfJer@ksa#Nty^`>4(O+0Ns9yzoc!}&?EshY96;jdqQ5J^?A zu=1Q_%VdmFo{}jJ)kz(;zDX3R2YgZ8kK{C6+Bgqiw6E$V|Fp#sa=I<_UBR&QiG;Iu z=SmN*Z(Ppz11xpNe#*LFViwzdXF{?%6psqf6ktX=o$<6)`MwzoF^n z1`_n^P}s+Pt_FG+BeBP638O=do8AF6lB!+wMd| zldw!xLT73#yTDH15Y5m~?EdST`dO)Wa7BcVi13Ab{512$p~!LH!#y(`K&En4=b6KU z^V=d2Y@#ILO}R?+M}6NT7ErpmXmC&+LE9>X)%Y-)>pt+Z1@Cz}mGM##S?!$#*`-A^ z$1ktn7B@cUoA-#Z=K_Aot*icB;KmH($%r{DdDH-pbQ3Zz`;VHoE8r z(%GHpDY0t;OX6s$2O=5u2uyp?e$%b<@!2^uxrCpMPNwI^Ot<0N>N^Bj=}G;`&l1s& z&&8V-#b~zI3iHr2*Lbyk*6_~OMi(>hl^=uYfr0P8K5?dhnL=0TZ*5jeZ4TcNAD?cvrj!)b_Uf=v3tX7%C;a&$fxu=x4iczbml@yL>r=U<$7qX-8{VSFV)4i8?B`1C6eDXud}1Q zWIj-u@J_$@XxmKj^5UO5ESn1ap^P48P2};S&t!MQYmG@G$MpjKvz3oNh ze`%(aiyU@jj0N8Ca%GGKJp-c|Y@e(k}OodFl3-A143=KP8*~h6iGAR+x90Ij5ksQIILR|NSi9_HP_B zRWWpS2Z7JTHpPDUEC{QxoMF2y+B(aiFP#3F&LEIWukA z=;*C^&S!kza4jM1e1^erE=8RMJ(Z|Zrfx-9J4q$+cKJDN zm2?dZHghZjO8HEJ6S8aEe*@h_yxUu{6&ta^^rp`e!*~(}lSjg*HIFPG`oN*n|G4jh zG^^#9$5toAT`X@yWB&0HEeZhslex#6#2jCij&mxa#7ai&)>3zQd~&tysRaDhB1K9z zPcze87}M4|DWLw!bdTN>7mrq5b@}a`;|oH}J8I+Qhy(3(5y)#BD@qDHwO(|2wyWG@ zMttFcjhuB4-!#VxUXc#S)uye!zOjQnhB;gDzg+!&Mt>~!e~>G`k#gYb?pSbfw?YGU z4}p6FN@H;EG-E>c=QK6n78pSKJhY&Xgek@ct*&Yff!z*;Ia@^6WoNvlL^XEcuf}T@ zO>?pmjWLak$gQhr1?|mXfEN;(WX-erlxr&U8y>5*oiX~J*q!3 z(;Gz3B17D>{$Nxttes<5nzi3)fLi#~-mao4a#5kckFl0I#;4(OhH2ZLf~PsZ60x_4 zfFPNY;W&8Cagj<&UN7Gjz>{ODHZsJUq~{7QRQu|`a=#r?2k5yJVwzxy%w)rE-}(AJ; zc5y_RgVl6PPWPg~s4>gWT=p@ctj7+-CeDif_*d21_Ag|YOsP%)hvzpzKfe%MgEh#AMsE7U9$g0p z66inS((LU)VxD)`*QlLIRW|ayU_bX(n&4#KKQ}y~hR0r8`m@lzqnJP&#Q*jg6B`bd zf8q9d)JNRldU)-=hUbpb>##S#kNMNSh!b6h*G#6Wrl$2+$@dQCMBDI^cNH5;sc?H~ zZn4Nrz`!&OrZ4I91;?{&3#RTw2fgh#ffWmaMNVl9@q_Yg#!~6cYx_>AVH$j4&-XfDPE9Y& zLVm{8-E8T#+cewM)hQQ3Qxu9wqA9Lko%PdY1C11p@~Gi>=L34M{2Ym-Q;dQF3|9q7 zm$8>>qKVT6N9`#kB`I$q;;Juz<{xETho^0mv*V|tb!8<*O(iAs(B37sT`b=C!4St- zCicW&xD z-N>F{J~iA2d);UBMY)wdex;4&;*A^+sQ%}6L5m6WdwU7=uNzkSMAki6l=@X86{>y& z&qN3;{dq8*eeZ?8z0u@N6x2hC8}@ox0e~ou1?RkhnBP_3lzXhzCqKO4>3f^Jxp8|Y zdG&C&u(DFSGhRt4a)4?0>p(2?W&ZC7>5ASMw20t1)kjmLL}Cl)WD>z(Skty>UjV3) zmaRNHPH&{`7082QK-VO}D=z z>A}Fz$?DdG{@QIIBkw+tdGjH?4|roqu}cjO53(aq-SZ8t$oA1&GEf+b%D~(rPZGWo zYtEh^ISF-*<8CLMGR0q(@|eiF%94DP>|~gWo2tl@+xQ7>boD5N3uoU|3VYx$@an~( zAGmU(3i_$SYG|AutgkvDH?_M`z{1%e){kL*T{#?n3k!^zzS%_MW~S}u*LpV-XinPv zu0+J!{lFIy;-wmXXM{KB5I}v&l;K5D=d)0*vy3kqeoo3@EiGj5D_c!BqQ*9ri}FDD zm$3_S~8rvaDQb67%k)TLS_-* z&#zk|(4v!wU5Knj1dh}iUpkoOw<*Sx@s%Ds^Eu;JyE+uATr7Hwy*bp2iX;`|c)r`R z=9e!|-q>WmGAm)Xi038cvQ$@JIJ%<*3D&TVTE1Vf8>N`GYmgMqAc~#DgM}})B*5Ni zdo@pDLlr4bW9D5(R+bvaM812f*b8aAFE6sz)7I2?cGjP{`?s_MJhD%!Q~k(Ux?pJL z5WLpUTF!H2%_&S=x>8Q5RU(~I2Orkm`lb>U`(LUUF{mh~hg}2S5}X~+N;PuIw(1as zLZj@x=KOC=TESG7xKAGyo_|s7rNVT@Q!!`@`O?+WGhG$;+*I(1--FIty1%*UpeDw; zVWPEnVBbdf$$l&bWO;?fCQ~iC-YN!|B)^H8@|P%CeZ9?9u@zAysg8WL#M%^-`+9+H zK=7Y!R!^X-ZdEZWwnf%w0G;{QZ3L#k^(p8K2*amd7rsBH@yG_(>?$K< z1UR#eTitKc-!mi`>)E?oKv;AEDp=K{Iy{M+1wz{1s!I9jogCWr1cO++(YmJMs@%eJ~9Je$AGdQpL2k zK9Q@QVMs_BfWlgdMttXKSDzP6xW$&|-}dvZRh6u55|UWlUry7%`a|St@?@Mt>^3fO z2|3n5m2UL+kXE-%t&IhyoQ6LW@br`vazV}M8b(d);^yPk7%S4^%^2#sw;=|@JQ9- zJ=c3@vih$xriwy;GFOM8Fu`>=lCFQvRERaMv-X;+Pse{sK$V&87=IQO5PubQ4lDYO zKd&bp%HSTzO)b0nDfH_rVM>UQyC*M)q?*oibkt){c3DsMvvCe*=FFz7P78-ut+Ez# z75Xy~K>H|!vL0&iNh~40tQYQ>q)N9^q(5`G*0GpTkTAgkgGarFcv?Clh`w(k-Zn>! zKzT$z48I;pmkyX@>a!qn)ZqA_LHy}nj!&5X9> z$uZA(qUhx3#V)8rq7w)U-1-|-{Y{r-_k+T597IgK-Cxx-lpsVSW5iN0*qBM(u8QRE zxol83);5KkmDzDA{FBk04yhFVTa}=ru2Gjd;`vIOdM9vY`A)>4ICUB`n;e3rY&pXN zaG(25MdY%@avf7~D;W!2^}i)geMq$9R~ zDK*`SqRynA%KZ!n#|#%aWDmpr)4P&5=2HDV4Bz`3H~ay{?+I5Nn3?QVtuzO5QJ(2K z9f=OKey;Q)67x`{i{DLA2C%$_1cTTez+_a#-hm3n*D<=-wA3&Exnlw9nUkfj6?oem zz&qKGAa(l@sV!1--e7(qpSa{aLanLXNG^!s2>W;lk_^80iG011^0 z81M<((?|NSsR|-pzH+utgznbCtLS>3yVW(~drTB_55!F3v;X z4BS+>G1KQPqt(Xz>g03J^;TBkjHw!K`n^y}HbgK*-DK=jFv;FasA_mcBp07_lqlwc zTwKMP6QS(d3a)o)F?*N)v<+_p5EeJ}IgVU%m9@fZ4N>WA*;19wa06BA#l8rSQ_;HoWOZUv z6LL8XNBf;&tMkrmJJx4vF`r}PN(OA@B6c_d);T9b>3aGurL_lp)M~ELIa@|I1EJa-_A+=-}C>s@yd+};$`hdztqtSIe? zcKpqOo4Nof2v$UyaQ@TdBM1X-=Vb)~VRnH)5mW?v?_g?g2?A07_l6Cq2AKjz^g1U;7grF7_9x0yiPEWak~5#@yt#>m ziHV7YQ-ak6(4I~B!7!qQ$M?MGn-Vl=fugCi` z9T5KUIR#6b4L8!9d7&_CV+6a5B!WclMZ#Im%H!ini-K zo|JK%B<=3fis&RB=87>kzHm5m{olW-Fu|cw?AB<%cAkPMQi>2cHTr(R6f@qe{be@Z zo#DG1Orm;t1e5%v^32SPXE)tCPonIo-GLtP3nQvxYfvX2-kwP}x9IpX7 z2DX#N@829EC)w9tHG~8yeo2;6WvB*Nnvp;u%8%nvG4VsML>Keq>k@` zT-$xWxq45XNuiwww(*hX>=4UzcCavKMP7Jl6A2~(*Q(sWnj^}5Ci zCQIb$X3MqI9w;m*DJspZEp5pho3_Yr=pLK@TGgB#Q|d4|>btjp$N;9IaYs;ug(Dg{ z*z>LO;M-T}TYy|M2LG+byJ*Z-0Eb9~=q=IP|9+QXJzP)C-kKJ8DU#b%uh!R%%}%+J zP48Enr9q{|u6Mg|tsb2=tu=@&)s)wRODQM@Jb z<2C!iXDY?J{{2b35VHP;X>ZZwnvR%rWQD?B^+&TMM!y>uegm@In0X1E#`(t0U`V169z?$SuM3VRIuA9~3c3*$Rdlf4g@Y3*)#p9~d+_1mtx zDL=IR_~5_qas|Ct{*(qj?(y4%1(=5li%t^VepNc7Y)XCrvrnYQxCjuz6dplnqQRS2 zN%DR(vfd=eR!#sjTpBl;RhpfHG ziKucy&%|W~$_~O=!lx3r12Q4MU&h#WH>9jTP4L5^xp0PAM%;|yl!}Htzrw}hu{tMZ zT8hY}h~JoR3dl%_*VNZK;y#m#LvM*r5ie^UvK>748T13>$`!qvy3^O)4V2j>E|R0$ z9w4)G@633f_np)o_%e}gMSC;)c%5iVghX?vsJz_&lW?POG5*BFNc?22!u)J$#yA^Z zE?L)*n3gIMm1gf?W%hoKuKt@!?JqG%RJd+k67TrqSAEgc2a2KwvYO-fpUB~nz1Iz* z2kAn4^_`!0OKV#}e|+^I#M3(1{y?Ze~MIYe0-D?QAWNk|+V zzLy=!GwiNnK{5$7-6CyV|BUavn0@n2oTo#3ma7L`e_^r0*2KO%Q-Dz?VDW{=71nei zRF*lo^C{|1eQ3_{k{@HmTrv|QLHe>CUl(85!FD15(6Bdn&0reTb-$@z(0U-!Qh3Dm zE%1#Z4rk@yn#`ACtb~@^yX&RF52w&c3aQ3(Yscd;2#QO8VF?xBhJmo^KkBKxza!j0&8YLwf zO4Mxw-~UN8UZiA8%BJz-zkB+cMFI+A<6UUG?OPGScu8fcK!&;D`^8+4G{0c;RIw$o zNrL^~@fqANHrV#VRT*CMS)%PsMg!%=Hr3Ae(8i-8|2MacD;xt~aNk@Td9ZB{Jw~N; z!<6ktI4M*^2lW^go>m4v>+(vez72g41y#*H{(!exT$|)Q zd{Jf}P_5T8UfuoC{D-xgM&X0xy(dFMDgkDbseYE1s`gp{y+f81B$8%~RAXymV+=>(S06(pk7UqIjqzSt}=V!xKIiVqme z6KwEJ!PA5U&3_^{K4i>5^wGy_z7jNzQ$**mYS!?$+~ZuiR{IBt^IKM5>+0!!lr<`- z7cmqh^K~5Yt@0fB$=4!gIj~drL)MKT*V3}Pb8is+dqe)8MXc9C)vwLF>;&Qh{ne}m zyoJzb+t;FWn!tpuP3RZge8~F8TpU0`z%QuDgn^m`pWv;5UMeUxAQQa?*UfUn?8eWW z-LlI$I{lTTylPV9u;=@fgNUKPB1#Bl0d&Yb<~=LqEpPJW#C z-hVop@hDcM;zMlX`=MZij(e`~GGPl7EmikfrZor_HN!O{&6nc1=OF-psXjJ@LV>eQ z>`$ge#KT$V!lRvkp@p@P_Jv91i|*4>eov(|n zMtF>_81LI7OOgnEnkKl5^St(JM<2&d)}@l_SOVb2lURQ$sra6)KNH*taZ#d7SC5~t ztf}pgp`Eim_eS=~3giLZhQYPaTA4C8#FUu7MtY=ry>!SbSiY4t-90~uR=d3@j!Rz) zhN~@LhNpkp-|H&7nWGe2&gH$c+FlPts`uwxE4Y`22=GyUBG3^bBUFlX8gN?VPJEVM zv^uJ2E5tb6Mjl0lv_RQu1df(%|Tf@CnY4G$YnD^l>VlM$bjG%{zQ(E??l(TY)Z2wmpGt$v*F5mXl*qmtn%uZ`# zJ?|oq1{Rq(2^qvYd1&i93Qr_r4VxC}sHUkKE4>qdg*?@TyH0IV&21;(QvL<9N}xQm z*j6^9BF4Mi#!qL)`|x=4KME$`o}f{?0@KT#~kaflCYT739ffy0Jg7DCF`Ap-jh0sm~mJ81KL#MG8WGH zGrSVwTZDGmOb2I;uW@o(DO-2R-Sfeg$$j^7$Dti561M~blkRUDEN5rq8@mRPENPw@ z@7GJr##n#rs{AtUAUC~^7=?=)Ta?fU+@?KaQ6OxrtJrHFDNWt>;ZhDnOYdFB!&F|} z0J1f5wfOfL7#=2=SQNrVV7@txgD@_f8D)hrBJng5Afs!Yv!@>fsS1jfPRv2-}SHNE%4P961J~3x>2kgvsr+o^Vw_6 z>oN?VlkZdJBRB&`$Wk5j(8{I|ahR8%Voa2vJRYRdGZtX2azm0ni=5apmSJ&|+J#}+ zf#g6eS3vr?7HBMRl@0khSldzGl!k|AW;b_}WDjeUz*nHh{Mr5C7A=XCnJgVp8ArUk zJ-T7`SxHIKC~4)Vn-*Dw6?79QYpASjh&DXi?lm6aj+4LBBCdskDdL|zh6n(~Jc2+*I{$Si1%YaZ|l&7YFN#-lu5S zpqZ3T5#m(}i=4@mXFn2k?pBM?U>J}W$8kdRb0NO07=11Q(&_&=<9kRR1gi!wu>YzV zg=~n$-4mnJ@=jvA*8l{<(I1{j=*^FMy*Mi4yxTU*3pkSdD$-XJkQff%Nos)CsFLTD z6ga=F703))iJ^7&V{%kcJ=1lb~J!?G0@lFd7QZvY`@Jex%Z-jC+w#V?u#I+b6@cHTc$YPgUSK=g;MuZ zH3w6s?EK)*Mwem{WN+5vTuW9iz8#7kr7n#9>1RR;t3P40sIWuO^_{qa4l|^nHW4so z<%hbdeyaSTW24b5rTtjmyuSnaSF7*Mr`8N!g|PWn2Qwi+6?n|E|#TaS=s zO}dQq1>l0Uo=4?{6VB>nbb<4bd#|7Tiym+ zt*jHZ+>=VVNay((v2R#Ar?1S-L2ty;TQE8D$BHMUbNo^TMOSo+zrC0~p-7Y_*OnmY z>RR@3`18`Eoce^YNA~G23`DVc>oIuic)2`tL8>I?i}p+G$d#cEC4RM_vu}j-tD^VY zQos?j56{=0^QyG{D7z z{z%E6smR-n>ue=8jwF7f?MU5l537ho$uMJn%sLjw%fdEb!iKMqj4WNSH#lE0RYUno zdX3RmxYk0f2^x#0P+FDY4`tk}=?r9u0FagO(H-KJlMyeqtq7*Ak?#&WdXI~SxJeW> z(q7z*@kEuh%UE`{(Fu#OSgtxOHND?i*ofJ((brm9G$eo*CD*az4NtvXX*|Jaacdew zXy-;2yRt0daA#(PlkcqxH3ok>n2k1;YQ~>?=t|%ZH4N^A@UG7BO45WMQX;jZ06TM7 zSfzK#)e7*fbQxM9lHjuK$a2u5UHzP*-;{N!GOMqmPET#X%+V1R2!}B2(iX(T>OQdz zkYYf{`hoh$#D=c{Nb+Tt*8ASG%-rtzORvsmvDKxf?hQ-(!k6y2uFbzg z%YEF>d)wbTk?KJ#J^kZ25}+sO*{WfKTxlWt{vi<7{r9z$94*A0@e&7P(c-RFt0m3757@f_MNN6)LUMKq10mIhi&TJKMh2zc0F=g8~^n3r@IB1Ftn#fuVs0PYLTNJ&J ztI}-#*i#~8w_als)5je^U^&)ik_vD>#rtWG^ZMQ@wH1S{o7b|j+50{tP>Ano;fus! zC#qJJyd4vw>3sxt5arOz{gJMbvQTd46LV91M1c^2493gRC>oR2ys5S^zv(oNmRnEH zv=VSEOS#R5k?SQ*_qfqmfMw%l<*D=f&eC==4VjndcQUna?KSJ^JJgzGeaKL-rFr0h zTj?6?cfrF~C%i4Dab#dD&-+Q8sYOGqY^G#mtIwwuH=e(Wf{lA-92Zyp4W+41R?OPk z3EeL{?**PUf8Q+LksnuhDe&0dVwlC3*4RhxTBEvQ1HrR(_~^1r4CI~IPxmar^ElDFg}$jRyZdi+eVZeB)Yc`8~PYc{S0fVJJUqINee@&l@9X*q(HCVs>v z3k*HaXWqmQK>ykbsYhDc9sXh&1?tJ4`t*IcoGx^*?VRv)cVB^h7 zs3^sKZVpe=l!U8kOp>XlU>SK{Jj98evJ{`lj&z0Uib}sQOMhTE z`3aS+Vxeh61BP_?WYIvc{v0n)XR~J&=tqUjeKIiXqR1pSD4`NaJ5WWmZVm(4yHznM z|2)5N-F+Usji{;&c&lPq^M$4+dT-J;a{M_`sfq$QU%mgkP`Qr2`NqP6AY^0USX%Zg zf(mN2_(e%GZ#V%8Uk;SRl2eXD>eg5-eN{E6J)Et9>#YRHDukzsxE+lLbH6NI`t@&h zIh%tot=U`i^v_a0pOiFJSJBgZjh|&gmrvN;=%P@O04ljaB`E0s%Mw;G%y6-ZP0UbX ag_R;^G{l4+1B4R+ii>Fk(_q9Ci~k?8c)V-? diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index ec2160048b..1583d19906 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -46,6 +46,7 @@ @import "controls/lists"; @import "controls/menus"; @import "features/imagery"; +@import "features/time-display"; @import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 107726e992..414437d2d3 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -26,6 +26,16 @@ width: auto; height: auto; } +@mixin trans-prop-nice($props, $t) { + @if $t == 0 { + @include transition-property(none); + } @else { + @include transition-property($props); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); + } +} + @mixin trans-prop-nice-fade($t: 0.5s) { @if $t == 0 { @include transition-property(none); @@ -42,6 +52,12 @@ @include transition-timing-function(ease-in-out); } +@mixin trans-prop-nice-resize-w($t: 0.5s) { + @include transition-property(width, left, right); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); +} + @mixin triangle-right($size, $color) { $size: $size/2; $ratio: 1; 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; + } + +} From fd63aa30ea15b5546a16b4c5802ea8cb84527027 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 10 Jun 2015 14:31:34 -0700 Subject: [PATCH 41/74] [Forms] Add test for date-time controller Add test case to complete coverage of date-time controller; done in the context of WTD-884 (albeit unrelated) to improve code coverage. --- .../test/controllers/DateTimeControllerSpec.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/platform/forms/test/controllers/DateTimeControllerSpec.js b/platform/forms/test/controllers/DateTimeControllerSpec.js index 11c97ada07..230d6a7a33 100644 --- a/platform/forms/test/controllers/DateTimeControllerSpec.js +++ b/platform/forms/test/controllers/DateTimeControllerSpec.js @@ -84,6 +84,22 @@ define( // 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 +); From 52191058871782f70db1d86c71fd7224e2768736 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 10 Jun 2015 15:31:37 -0700 Subject: [PATCH 42/74] [Config] Modified priority to make plot the default view WTD-949 Plot is now the default view when browsing objects, or in-frame in Display Layouts; --- platform/features/plot/bundle.json | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/features/plot/bundle.json b/platform/features/plot/bundle.json index ab8cf89b7c..c2d35725c9 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": "mandatory", "delegation": true } ], From 732c0abf1081f3555bc6848e4cad8053c321c872 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 10 Jun 2015 16:38:49 -0700 Subject: [PATCH 43/74] [Info Bubble] Add newlines Add newlines to end of files added for WTD-884. --- platform/commonUI/inspect/res/bubble.html | 16 ++++++++-------- platform/commonUI/inspect/res/info-table.html | 2 +- platform/commonUI/inspect/src/InfoConstants.js | 2 +- .../commonUI/inspect/src/gestures/InfoGesture.js | 2 +- .../commonUI/inspect/src/services/InfoService.js | 2 +- .../inspect/test/gestures/InfoGestureSpec.js | 2 +- .../inspect/test/services/InfoServiceSpec.js | 2 +- platform/commonUI/inspect/test/suite.json | 2 +- .../test/capabilities/MetadataCapabilitySpec.js | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/platform/commonUI/inspect/res/bubble.html b/platform/commonUI/inspect/res/bubble.html index 07395447b1..f528d6432f 100644 --- a/platform/commonUI/inspect/res/bubble.html +++ b/platform/commonUI/inspect/res/bubble.html @@ -1,9 +1,9 @@ -

-
-
+
+
+
{{bubble.bubbleTitle}} -
- -
-
\ No newline at end of file +
+ +
+
diff --git a/platform/commonUI/inspect/res/info-table.html b/platform/commonUI/inspect/res/info-table.html index ef737dd130..0c89a498d9 100644 --- a/platform/commonUI/inspect/res/info-table.html +++ b/platform/commonUI/inspect/res/info-table.html @@ -5,4 +5,4 @@ {{property.value}}
\ No newline at end of file + diff --git a/platform/commonUI/inspect/src/InfoConstants.js b/platform/commonUI/inspect/src/InfoConstants.js index c550c1a6c3..121a71c235 100644 --- a/platform/commonUI/inspect/src/InfoConstants.js +++ b/platform/commonUI/inspect/src/InfoConstants.js @@ -29,4 +29,4 @@ define({ "", // Pixel offset for bubble, to align arrow position BUBBLE_OFFSET: [ 0, -16 ] -}); \ No newline at end of file +}); diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js index 44534c4b6d..879cc2ac36 100644 --- a/platform/commonUI/inspect/src/gestures/InfoGesture.js +++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js @@ -118,4 +118,4 @@ define( } -); \ No newline at end of file +); diff --git a/platform/commonUI/inspect/src/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js index 3dd2d4985e..c038fe61e9 100644 --- a/platform/commonUI/inspect/src/services/InfoService.js +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -91,4 +91,4 @@ define( return InfoService; } -); \ No newline at end of file +); diff --git a/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js index 0cead9a4b3..44f2b1e54b 100644 --- a/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js +++ b/platform/commonUI/inspect/test/gestures/InfoGestureSpec.js @@ -154,4 +154,4 @@ define( }); } -); \ No newline at end of file +); diff --git a/platform/commonUI/inspect/test/services/InfoServiceSpec.js b/platform/commonUI/inspect/test/services/InfoServiceSpec.js index 7cb3d62a1e..858427fe84 100644 --- a/platform/commonUI/inspect/test/services/InfoServiceSpec.js +++ b/platform/commonUI/inspect/test/services/InfoServiceSpec.js @@ -128,4 +128,4 @@ define( }); } -); \ No newline at end of file +); diff --git a/platform/commonUI/inspect/test/suite.json b/platform/commonUI/inspect/test/suite.json index 1d0805c9a9..82650e2dff 100644 --- a/platform/commonUI/inspect/test/suite.json +++ b/platform/commonUI/inspect/test/suite.json @@ -1,4 +1,4 @@ [ "gestures/InfoGesture", "services/InfoService" -] \ No newline at end of file +] diff --git a/platform/core/test/capabilities/MetadataCapabilitySpec.js b/platform/core/test/capabilities/MetadataCapabilitySpec.js index 02316f609d..272746f037 100644 --- a/platform/core/test/capabilities/MetadataCapabilitySpec.js +++ b/platform/core/test/capabilities/MetadataCapabilitySpec.js @@ -98,4 +98,4 @@ define( }); } -); \ No newline at end of file +); From 0b8d5ceb8630a4a60d20fc7e3a090152a41d7eb2 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 10 Jun 2015 17:23:08 -0700 Subject: [PATCH 44/74] [Fronted] Significant refactoring of btn classes WTD-839 Refactoring in advance of style mods to switcher when in frame; Moved btn styles from _controls.scss to _buttons.scss; Markup cleaned up with css classing simplified; --- .../browse/res/templates/browse-object.html | 3 - .../res/templates/browse/object-header.html | 2 +- .../res/templates/create/create-button.html | 2 +- .../dialog/res/templates/overlay.html | 2 +- .../edit/res/templates/topbar-edit.html | 2 - .../general/res/css/theme-espresso.css | 550 +++++++++--------- .../general/res/sass/controls/_buttons.scss | 71 ++- .../general/res/sass/controls/_controls.scss | 68 --- .../res/templates/controls/action-button.html | 2 +- .../res/templates/controls/switcher.html | 20 +- .../features/plot/res/templates/plot.html | 2 +- 11 files changed, 356 insertions(+), 368 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index dc5ed477e7..33998dbbbe 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..eb84dafbbd 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -24,5 +24,5 @@ {{parameters.mode}} {{type.getName()}} {{model.name}} - v +
\ 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/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/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index e846ba557c..544b432ed3 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -368,7 +368,7 @@ span { display: none !important; } /* line 121, ../sass/_global.scss */ -.paused:not(.s-btn):not(.s-icon-btn) { +.paused:not(.s-btn):not(.icon-btn) { border-color: #c56f01 !important; color: #c56f01 !important; } @@ -856,7 +856,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 { @@ -1338,14 +1339,43 @@ 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.2em; + 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 30, ../sass/controls/_buttons.scss */ -.s-btn, .s-icon-btn { +/* line 55, ../sass/controls/_buttons.scss */ +.btn, +.s-btn, +.icon-btn, +.s-icon-btn { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -1353,10 +1383,141 @@ span { -webkit-box-sizing: border-box; box-sizing: border-box; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; - line-height: 1.2em; + cursor: pointer; text-decoration: none; } - /* line 36, ../sass/controls/_buttons.scss */ - .s-btn.s-very-subtle, .s-very-subtle.s-icon-btn { + /* line 63, ../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+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 197, ../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+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 68, ../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+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 197, ../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+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 72, ../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 76, ../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+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 189, ../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+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 79, ../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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040)); @@ -1377,15 +1538,27 @@ span { color: #999; display: inline-block; } /* line 144, ../sass/_mixins.scss */ - .s-btn.s-very-subtle:hover, .s-very-subtle.s-icon-btn:hover { + .btn.very-subtle:hover, .btn.s-very-subtle:hover, + .s-btn.very-subtle:hover, + .very-subtle.icon-btn:hover, + .very-subtle.s-icon-btn:hover, + .s-btn.s-very-subtle:hover, + .s-very-subtle.icon-btn:hover, + .s-very-subtle.s-icon-btn:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+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); } - /* line 38, ../sass/controls/_buttons.scss */ - .s-btn.s-very-subtle.paused, .s-very-subtle.paused.s-icon-btn { + /* line 82, ../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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y4OGMwMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2RlN2QwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f88c01), color-stop(100%, #de7d01)); @@ -1406,39 +1579,59 @@ span { color: #fff; display: inline-block; } /* line 144, ../sass/_mixins.scss */ - .s-btn.s-very-subtle.paused:hover, .s-very-subtle.paused.s-icon-btn:hover { + .btn.very-subtle.paused:hover, .btn.s-very-subtle.paused:hover, + .s-btn.very-subtle.paused:hover, + .very-subtle.paused.icon-btn:hover, + .very-subtle.paused.s-icon-btn:hover, + .s-btn.s-very-subtle.paused:hover, + .s-very-subtle.paused.icon-btn:hover, + .s-very-subtle.paused.s-icon-btn:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlYTMyZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fea32e), color-stop(100%, #fe9815)); background-image: -moz-linear-gradient(#fea32e, #fe9815); background-image: -webkit-linear-gradient(#fea32e, #fe9815); background-image: linear-gradient(#fea32e, #fe9815); } - /* line 40, ../sass/controls/_buttons.scss */ - .s-btn.s-very-subtle.paused .icon:before, .s-very-subtle.paused.s-icon-btn .icon:before { + /* line 84, ../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 47, ../sass/controls/_buttons.scss */ +/* line 91, ../sass/controls/_buttons.scss */ +.icon-btn, .s-icon-btn { - font-size: 1.2em; } - /* line 50, ../sass/controls/_buttons.scss */ + font-size: 1em; } + /* line 95, ../sass/controls/_buttons.scss */ + .icon-btn .icon, .s-icon-btn .icon { color: #0099cc; } - /* line 54, ../sass/controls/_buttons.scss */ + /* line 99, ../sass/controls/_buttons.scss */ + .icon-btn.paused .icon, .s-icon-btn.paused .icon { color: #fff; } - /* line 62, ../sass/controls/_buttons.scss */ + /* line 107, ../sass/controls/_buttons.scss */ + .icon-btn:not(.disabled):not(.paused):hover .icon, .s-icon-btn:not(.disabled):not(.paused):hover .icon { color: #33ccff; } - /* line 69, ../sass/controls/_buttons.scss */ + /* line 114, ../sass/controls/_buttons.scss */ + .icon-btn.labeled, .s-icon-btn.labeled { padding: 0 3.75px; } - /* line 71, ../sass/controls/_buttons.scss */ + /* line 116, ../sass/controls/_buttons.scss */ + .icon-btn.labeled .icon, .s-icon-btn.labeled .icon { font-size: 1.5em; } - /* line 74, ../sass/controls/_buttons.scss */ + /* line 119, ../sass/controls/_buttons.scss */ + .icon-btn.labeled .title-label, .s-icon-btn.labeled .title-label { margin-left: 5px; } - /* line 80, ../sass/controls/_buttons.scss */ + /* line 125, ../sass/controls/_buttons.scss */ + .icon-btn.pause-play.paused, .s-icon-btn.pause-play.paused { -moz-animation-name: pulse; -webkit-animation-name: pulse; @@ -1455,31 +1648,27 @@ span { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 83, ../sass/controls/_buttons.scss */ + /* line 128, ../sass/controls/_buttons.scss */ + .icon-btn.pause-play .icon:before, .s-icon-btn.pause-play .icon:before { content: "\0000F1"; } - /* line 89, ../sass/controls/_buttons.scss */ + /* line 134, ../sass/controls/_buttons.scss */ + .icon-btn.show-thumbs .icon:before, .s-icon-btn.show-thumbs .icon:before { content: "\000039"; } /*********************************** LAYOUT STYLES */ -/* line 96, ../sass/controls/_buttons.scss */ +/* line 141, ../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; } -/* line 103, ../sass/controls/_buttons.scss */ -.l-btn { - padding: 0 7.5px; } - /* line 105, ../sass/controls/_buttons.scss */ - .l-btn.sm { - padding: 0 5px; } - /* line 108, ../sass/controls/_buttons.scss */ - .l-btn.vsm { - padding: 0 2.5px; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1658,195 +1847,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 197, ../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 197, ../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 189, ../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 189, ../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 97, ../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 111, ../sass/controls/_controls.scss */ .l-composite-control { vertical-align: middle; } - /* line 182, ../sass/controls/_controls.scss */ + /* line 114, ../sass/controls/_controls.scss */ .l-composite-control.l-checkbox .composite-control-label { line-height: 18px; } -/* line 188, ../sass/controls/_controls.scss */ +/* line 120, ../sass/controls/_controls.scss */ .l-control-group { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -1855,27 +1869,27 @@ a.l-btn span { display: inline-block; padding: 0 5px; position: relative; } - /* line 196, ../sass/controls/_controls.scss */ + /* line 128, ../sass/controls/_controls.scss */ .l-control-group:first-child { border-left: none; padding-left: 0; } -/* line 202, ../sass/controls/_controls.scss */ +/* line 134, ../sass/controls/_controls.scss */ .l-local-controls { position: absolute; top: 5px; right: 5px; z-index: 5; } -/* line 211, ../sass/controls/_controls.scss */ +/* line 143, ../sass/controls/_controls.scss */ .s-local-controls { font-size: 0.7rem; } -/* line 215, ../sass/controls/_controls.scss */ +/* line 147, ../sass/controls/_controls.scss */ .btn-set { display: inline-block; position: relative; } - /* line 219, ../sass/controls/_controls.scss */ + /* line 151, ../sass/controls/_controls.scss */ .btn-set .btn, .btn-set .t-btn { -moz-border-radius: 0; @@ -1883,7 +1897,7 @@ a.l-btn span { border-radius: 0; border-left: 1px solid #666666; margin-left: 0; } - /* line 224, ../sass/controls/_controls.scss */ + /* line 156, ../sass/controls/_controls.scss */ .btn-set .btn:first-child, .btn-set .t-btn:first-child { border-left: none; @@ -1893,7 +1907,7 @@ a.l-btn span { -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; } - /* line 228, ../sass/controls/_controls.scss */ + /* line 160, ../sass/controls/_controls.scss */ .btn-set .btn:last-child, .btn-set .t-btn:last-child { -moz-border-radius-topright: 3px; @@ -1903,7 +1917,7 @@ a.l-btn span { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 234, ../sass/controls/_controls.scss */ +/* line 166, ../sass/controls/_controls.scss */ .object-browse-bar .btn, .object-browse-bar .t-btn, .top-bar .buttons-main .btn, @@ -1914,7 +1928,7 @@ a.l-btn span { font-size: 11.25px; height: 25px; line-height: 25px; } - /* line 245, ../sass/controls/_controls.scss */ + /* line 177, ../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), @@ -1924,7 +1938,7 @@ a.l-btn span { font-size: 150%; vertical-align: middle; } -/* line 253, ../sass/controls/_controls.scss */ +/* line 185, ../sass/controls/_controls.scss */ label.checkbox.custom { cursor: pointer; display: inline-block; @@ -1933,13 +1947,13 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: top; } - /* line 264, ../sass/controls/_controls.scss */ + /* line 196, ../sass/controls/_controls.scss */ label.checkbox.custom em { color: #999; display: inline-block; height: 14px; min-width: 14px; } - /* line 269, ../sass/controls/_controls.scss */ + /* line 201, ../sass/controls/_controls.scss */ label.checkbox.custom em:before { -moz-border-radius: 2.25px; -webkit-border-radius: 2.25px; @@ -1958,51 +1972,51 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 287, ../sass/controls/_controls.scss */ + /* line 219, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text { overflow: hidden; margin-right: 0; padding-left: 0; height: 14px; width: 14px; } - /* line 293, ../sass/controls/_controls.scss */ + /* line 225, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 297, ../sass/controls/_controls.scss */ + /* line 229, ../sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 299, ../sass/controls/_controls.scss */ + /* line 231, ../sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 307, ../sass/controls/_controls.scss */ +/* line 239, ../sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 309, ../sass/controls/_controls.scss */ + /* line 241, ../sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 313, ../sass/controls/_controls.scss */ + /* line 245, ../sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 316, ../sass/controls/_controls.scss */ + /* line 248, ../sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 321, ../sass/controls/_controls.scss */ +/* line 253, ../sass/controls/_controls.scss */ .btn-menu label.checkbox.custom { margin-left: 5px; } -/* line 326, ../sass/controls/_controls.scss */ +/* line 258, ../sass/controls/_controls.scss */ .item .checkbox.checked label { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; border-bottom: none; } -/* line 332, ../sass/controls/_controls.scss */ +/* line 264, ../sass/controls/_controls.scss */ .btn-menu { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2033,42 +2047,42 @@ label.checkbox.custom { background-image: -moz-linear-gradient(#666666, #4d4d4d); background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 339, ../sass/controls/_controls.scss */ + /* line 271, ../sass/controls/_controls.scss */ .btn-menu.dropdown { padding-left: 10px; padding-right: 10px; } - /* line 345, ../sass/controls/_controls.scss */ + /* line 277, ../sass/controls/_controls.scss */ .btn-menu:not(.disabled):hover { color: #cccccc; } - /* line 349, ../sass/controls/_controls.scss */ + /* line 281, ../sass/controls/_controls.scss */ .btn-menu.btn-invoke-menu { color: #0099cc; padding: 0 5px; } - /* line 353, ../sass/controls/_controls.scss */ + /* line 285, ../sass/controls/_controls.scss */ .btn-menu.btn-invoke-menu:hover { color: deepskyblue; } - /* line 363, ../sass/controls/_controls.scss */ + /* line 295, ../sass/controls/_controls.scss */ .btn-menu .type-icon { margin-right: 5px; } - /* line 366, ../sass/controls/_controls.scss */ + /* line 298, ../sass/controls/_controls.scss */ .btn-menu .menu { position: absolute; left: 0; text-align: left; } - /* line 371, ../sass/controls/_controls.scss */ + /* line 303, ../sass/controls/_controls.scss */ .btn-menu .menu .ui-symbol.icon { width: 12px; } -/* line 377, ../sass/controls/_controls.scss */ +/* line 309, ../sass/controls/_controls.scss */ .top-bar .btn-menu { height: 25px; line-height: 25px; padding-right: 10px; } - /* line 385, ../sass/controls/_controls.scss */ + /* line 317, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn { margin-right: 5px; padding-left: 25px; } - /* line 388, ../sass/controls/_controls.scss */ + /* line 320, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn .badge { -moz-border-radius: 4.5px; -webkit-border-radius: 4.5px; @@ -2085,30 +2099,30 @@ label.checkbox.custom { height: auto; } /******************************************************** OBJECT-HEADER */ -/* line 405, ../sass/controls/_controls.scss */ +/* line 337, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 408, ../sass/controls/_controls.scss */ + /* line 340, ../sass/controls/_controls.scss */ .object-header .title { color: white; } - /* line 411, ../sass/controls/_controls.scss */ + /* line 343, ../sass/controls/_controls.scss */ .object-header .type-icon { font-size: 1.5em; margin-right: 5px; vertical-align: middle; } -/* line 420, ../sass/controls/_controls.scss */ +/* line 352, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 422, ../sass/controls/_controls.scss */ + /* line 354, ../sass/controls/_controls.scss */ .top-bar .object-header span, .object-browse-bar .object-header span { display: inline-block; } /******************************************************** VIEW-CONTROLS */ -/* line 430, ../sass/controls/_controls.scss */ +/* line 362, ../sass/controls/_controls.scss */ .view-controls .view-type { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2120,16 +2134,16 @@ label.checkbox.custom { line-height: 20px; padding-left: 5px; padding-right: 5px; } - /* line 441, ../sass/controls/_controls.scss */ + /* line 373, ../sass/controls/_controls.scss */ .view-controls .view-type.cur { background: #666666; } -/* line 446, ../sass/controls/_controls.scss */ +/* line 378, ../sass/controls/_controls.scss */ .edit-mode .top-bar .control-set.edit-view-controls { margin-right: 50px; } /******************************************************** SLIDERS */ -/* line 457, ../sass/controls/_controls.scss */ +/* line 389, ../sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2150,7 +2164,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 468, ../sass/controls/_controls.scss */ +/* line 400, ../sass/controls/_controls.scss */ .slider .knob { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2201,12 +2215,12 @@ label.checkbox.custom { /* line 182, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } - /* line 479, ../sass/controls/_controls.scss */ + /* line 411, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 486, ../sass/controls/_controls.scss */ +/* line 418, ../sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -2217,12 +2231,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 496, ../sass/controls/_controls.scss */ + /* line 428, ../sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ -/* line 504, ../sass/controls/_controls.scss */ +/* line 436, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2239,7 +2253,7 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 510, ../sass/controls/_controls.scss */ +/* line 442, ../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%; @@ -2257,7 +2271,7 @@ label.checkbox.custom { -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; border-top: 1px solid gray; } - /* line 517, ../sass/controls/_controls.scss */ + /* line 449, ../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%; @@ -2266,7 +2280,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: linear-gradient(#808080, #737373 20px); } -/* line 522, ../sass/controls/_controls.scss */ +/* line 454, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index f8328dcdb5..d31314299e 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -19,20 +19,64 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -$pad: $interiorMargin * 1.5; +$baseRatio: 1.5; +$pad: $interiorMargin * $baseRatio; -/*********************************** TYPE STYLES */ -.t-btn { - cursor: pointer; +/******* LAYOUT AND SIZING */ +.btn, +.l-btn { + line-height: 1.2em; + padding: 0 $pad; + text-decoration: none; + &.lg, + &.create-btn { + $h: $ueTopBarH - $interiorMargin; + height: $h; + line-height: $h; + padding: 0 $pad * 3; + } + &.create-btn { + .menu { + margin-left: $pad * -1; + } + >.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%); // Moved to s-btn @include border-radius($controlCr); @include box-sizing(border-box); @include text-shadow(rgba(black, 0.3) 0 1px 1px); - line-height: 1.2em; + cursor: pointer; text-decoration: none; + &.major { + $bg: $colorKey; + @include btnNoticeable($bg); + $fg: lighten($bg, 50%); + color: $fg; + &:hover { + @include btnNoticeable(lighten($bg, 5%)); + color: $fg; + } + .invoke-menu { + color: $fg; + } + } + &.subtle { + @include btnSubtle($base, lighten($base, 40%)); + } + &.very-subtle, &.s-very-subtle { @include containerSubtle($colorBodyBg, $colorBodyFg, true); &.paused { @@ -44,9 +88,10 @@ $pad: $interiorMargin * 1.5; } } +.icon-btn, .s-icon-btn { @extend .s-btn; - font-size: 1.2em; + font-size: 1em; .icon { color: $colorKey; } @@ -93,19 +138,13 @@ $pad: $interiorMargin * 1.5; } /*********************************** 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; -} - -.l-btn { - padding: 0 $pad; - &.sm { - padding: 0 $interiorMargin; - } - &.vsm { - padding: 0 $interiorMargin/2; - } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 20ac37b2cc..892f60274e 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -92,74 +92,6 @@ } } -.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); - } - } -} - .btn-bar { // position: relative; .btn, 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..43a41fb1c7 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -21,14 +21,22 @@ --> -
+
- + - {{ngModel.selected.glyph}} - {{ngModel.selected.name}} + + {{ngModel.selected.glyph}} + + {{ngModel.selected.name}} v diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 1bb1de0e9c..c1b93c8c5b 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -108,7 +108,7 @@ I -
From 8811f2a53e32626f5e856dfd8beba2fd0741b399 Mon Sep 17 00:00:00 2001 From: larkin Date: Thu, 11 Jun 2015 11:56:46 -0700 Subject: [PATCH 45/74] [Creation] createObject returns newObject createObject returns a promise which is resolved when the object has been persisted. The promise is resolved with an instance of the new domainObject. --- .../browse/src/creation/CreationService.js | 16 +++++++++++++-- .../test/creation/CreationServiceSpec.js | 20 ++++++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) 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/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, From 9123078293ed6b90af0429ce41b963dd326ecaa4 Mon Sep 17 00:00:00 2001 From: larkin Date: Thu, 11 Jun 2015 11:58:53 -0700 Subject: [PATCH 46/74] [Entanglement] Add entanglement bundle The entanglement bundle defines move, copy, and link actions, and exposes them as context menu actions. * The Move action moves an object from it's current parent to a new parent object. * The Copy action deep-copies an object to a new parent object. * The Link action links an object to a new parent object. These actions are implemented by three new services: moveService, copyService, and linkService. Mocks are provided for each service for easy testing of components that depend on them. Additionally, this bundle provides a DomainObjectFactory that simplifies the construction of mockDomainObjects for tests. These actions are exposed to the user as context menu options. --- platform/entanglement/README.md | 24 ++ platform/entanglement/bundle.json | 75 ++++++ .../entanglement/src/actions/CopyAction.js | 63 +++++ .../entanglement/src/actions/LinkAction.js | 61 +++++ .../entanglement/src/actions/MoveAction.js | 62 +++++ .../entanglement/src/services/CopyService.js | 79 ++++++ .../entanglement/src/services/LinkService.js | 49 ++++ .../src/services/LocationService.js | 61 +++++ .../entanglement/src/services/MoveService.js | 56 +++++ .../entanglement/test/DomainObjectFactory.js | 136 ++++++++++ .../test/actions/CopyActionSpec.js | 152 +++++++++++ .../test/actions/LinkActionSpec.js | 152 +++++++++++ .../test/actions/MoveActionSpec.js | 152 +++++++++++ .../test/services/CopyServiceSpec.js | 235 ++++++++++++++++++ .../test/services/LinkServiceSpec.js | 148 +++++++++++ .../test/services/LocationServiceSpec.js | 133 ++++++++++ .../test/services/MockCopyService.js | 78 ++++++ .../test/services/MockLinkService.js | 78 ++++++ .../test/services/MockMoveService.js | 78 ++++++ .../test/services/MoveServiceSpec.js | 154 ++++++++++++ platform/entanglement/test/suite.json | 9 + 21 files changed, 2035 insertions(+) create mode 100644 platform/entanglement/README.md create mode 100644 platform/entanglement/bundle.json create mode 100644 platform/entanglement/src/actions/CopyAction.js create mode 100644 platform/entanglement/src/actions/LinkAction.js create mode 100644 platform/entanglement/src/actions/MoveAction.js create mode 100644 platform/entanglement/src/services/CopyService.js create mode 100644 platform/entanglement/src/services/LinkService.js create mode 100644 platform/entanglement/src/services/LocationService.js create mode 100644 platform/entanglement/src/services/MoveService.js create mode 100644 platform/entanglement/test/DomainObjectFactory.js create mode 100644 platform/entanglement/test/actions/CopyActionSpec.js create mode 100644 platform/entanglement/test/actions/LinkActionSpec.js create mode 100644 platform/entanglement/test/actions/MoveActionSpec.js create mode 100644 platform/entanglement/test/services/CopyServiceSpec.js create mode 100644 platform/entanglement/test/services/LinkServiceSpec.js create mode 100644 platform/entanglement/test/services/LocationServiceSpec.js create mode 100644 platform/entanglement/test/services/MockCopyService.js create mode 100644 platform/entanglement/test/services/MockLinkService.js create mode 100644 platform/entanglement/test/services/MockMoveService.js create mode 100644 platform/entanglement/test/services/MoveServiceSpec.js create mode 100644 platform/entanglement/test/suite.json 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..83057c62f1 --- /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": "m", + "category": "contextual", + "implementation": "actions/MoveAction.js", + "depends": ["locationService", "moveService"] + }, + { + "key": "copy", + "name": "Duplicate", + "description": "Duplicate object to another location.", + "glyph": "c", + "category": "contextual", + "implementation": "actions/CopyAction.js", + "depends": ["locationService", "copyService"] + }, + { + "key": "link", + "name": "Create Link", + "description": "Create Link to object in another location.", + "glyph": "l", + "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..1fbeda1a73 --- /dev/null +++ b/platform/entanglement/src/actions/CopyAction.js @@ -0,0 +1,63 @@ +/*global define */ +define( + function () { + "use strict"; + + 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..ed830c21a7 --- /dev/null +++ b/platform/entanglement/src/actions/LinkAction.js @@ -0,0 +1,61 @@ +/*global define */ +define( + function () { + "use strict"; + + 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..a7b8c9771c --- /dev/null +++ b/platform/entanglement/src/actions/MoveAction.js @@ -0,0 +1,62 @@ +/*global define */ +define( + function () { + "use strict"; + + 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..d7a9baa868 --- /dev/null +++ b/platform/entanglement/src/services/CopyService.js @@ -0,0 +1,79 @@ +/*global define */ + +define( + function () { + "use strict"; + + 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", + object.getCapability('type'), + parentCandidate.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..8c87f106b4 --- /dev/null +++ b/platform/entanglement/src/services/LinkService.js @@ -0,0 +1,49 @@ +/*global define */ + +define( + function () { + "use strict"; + + 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", + object.getCapability('type'), + parentCandidate.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..59f557acfc --- /dev/null +++ b/platform/entanglement/src/services/LocationService.js @@ -0,0 +1,61 @@ +/*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..4ca1dc8742 --- /dev/null +++ b/platform/entanglement/src/services/MoveService.js @@ -0,0 +1,56 @@ +/*global define */ + +define( + function () { + "use strict"; + + 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", + object.getCapability('type'), + parentCandidate.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..e1f681b26c --- /dev/null +++ b/platform/entanglement/test/DomainObjectFactory.js @@ -0,0 +1,136 @@ +/*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..c382e58507 --- /dev/null +++ b/platform/entanglement/test/actions/CopyActionSpec.js @@ -0,0 +1,152 @@ +/*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..e86964186d --- /dev/null +++ b/platform/entanglement/test/actions/LinkActionSpec.js @@ -0,0 +1,152 @@ +/*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..deb5514fa6 --- /dev/null +++ b/platform/entanglement/test/actions/MoveActionSpec.js @@ -0,0 +1,152 @@ +/*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..e8f2528b12 --- /dev/null +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -0,0 +1,235 @@ +/*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' + }); + parentCandidate = domainObjectFactory({ + name: '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("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..64c284cc49 --- /dev/null +++ b/platform/entanglement/test/services/LinkServiceSpec.js @@ -0,0 +1,148 @@ +/*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'; + parentCandidate.id = 'xyz'; + parentCandidate.model.composition = []; + }); + + 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..0fe194edff --- /dev/null +++ b/platform/entanglement/test/services/LocationServiceSpec.js @@ -0,0 +1,133 @@ +/*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'] + ); + // TODO: replace the dialogServicePromise with a deferred and + // get rid of chainedPromise. + 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 () { + // This test is testing that chainedPromise is returned. + // TODO: have better assumptions with deferred objects. + 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..cdd52920dd --- /dev/null +++ b/platform/entanglement/test/services/MockCopyService.js @@ -0,0 +1,78 @@ +/*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; + + // TODO: return a proper deferred to support composing. + 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..cb406464a3 --- /dev/null +++ b/platform/entanglement/test/services/MockLinkService.js @@ -0,0 +1,78 @@ +/*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; + + // TODO: return a proper deferred to support composing. + 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..375da8874f --- /dev/null +++ b/platform/entanglement/test/services/MockMoveService.js @@ -0,0 +1,78 @@ +/*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; + + // TODO: return a proper deferred to support composing. + 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..7a3e330a4c --- /dev/null +++ b/platform/entanglement/test/services/MoveServiceSpec.js @@ -0,0 +1,154 @@ +/*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 + } + }); + + currentParent = domainObjectFactory({ + name: 'currentParent', + id: 'b' + }); + + objectContextCapability.getParent.andReturn(currentParent); + + parentCandidate = domainObjectFactory({ + name: 'parentCandidate', + model: {composition: []}, + id: 'c' + }); + + 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("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..03d59f8d6c --- /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" +] \ No newline at end of file From 1525657ac2caab381707bd382556b6772c6ec358 Mon Sep 17 00:00:00 2001 From: larkin Date: Thu, 11 Jun 2015 12:50:03 -0700 Subject: [PATCH 47/74] [Task] Remove TODOS --- platform/entanglement/test/services/LocationServiceSpec.js | 4 ---- platform/entanglement/test/services/MockCopyService.js | 1 - platform/entanglement/test/services/MockLinkService.js | 1 - platform/entanglement/test/services/MockMoveService.js | 1 - 4 files changed, 7 deletions(-) diff --git a/platform/entanglement/test/services/LocationServiceSpec.js b/platform/entanglement/test/services/LocationServiceSpec.js index 0fe194edff..0d565f9a9d 100644 --- a/platform/entanglement/test/services/LocationServiceSpec.js +++ b/platform/entanglement/test/services/LocationServiceSpec.js @@ -18,8 +18,6 @@ define( 'dialogService', ['getUserInput'] ); - // TODO: replace the dialogServicePromise with a deferred and - // get rid of chainedPromise. dialogServicePromise = jasmine.createSpyObj( 'dialogServicePromise', ['then'] @@ -72,8 +70,6 @@ define( }); it("returns a promise", function () { - // This test is testing that chainedPromise is returned. - // TODO: have better assumptions with deferred objects. expect(locationResult.then).toBeDefined(); }); diff --git a/platform/entanglement/test/services/MockCopyService.js b/platform/entanglement/test/services/MockCopyService.js index cdd52920dd..3d020a9c48 100644 --- a/platform/entanglement/test/services/MockCopyService.js +++ b/platform/entanglement/test/services/MockCopyService.js @@ -45,7 +45,6 @@ define( callExtensions, spy; - // TODO: return a proper deferred to support composing. performPromise = jasmine.createSpyObj( 'performPromise', ['then'] diff --git a/platform/entanglement/test/services/MockLinkService.js b/platform/entanglement/test/services/MockLinkService.js index cb406464a3..0609ccbec3 100644 --- a/platform/entanglement/test/services/MockLinkService.js +++ b/platform/entanglement/test/services/MockLinkService.js @@ -45,7 +45,6 @@ define( callExtensions, spy; - // TODO: return a proper deferred to support composing. performPromise = jasmine.createSpyObj( 'performPromise', ['then'] diff --git a/platform/entanglement/test/services/MockMoveService.js b/platform/entanglement/test/services/MockMoveService.js index 375da8874f..e24401e96f 100644 --- a/platform/entanglement/test/services/MockMoveService.js +++ b/platform/entanglement/test/services/MockMoveService.js @@ -45,7 +45,6 @@ define( callExtensions, spy; - // TODO: return a proper deferred to support composing. performPromise = jasmine.createSpyObj( 'performPromise', ['then'] From d35e4d3691014ad5efc74c685781cbcf93c62e45 Mon Sep 17 00:00:00 2001 From: larkin Date: Thu, 11 Jun 2015 12:56:08 -0700 Subject: [PATCH 48/74] [Config] Add entanglement to app config --- bundles.json | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles.json b/bundles.json index 666e520854..de005c5961 100644 --- a/bundles.json +++ b/bundles.json @@ -16,6 +16,7 @@ "platform/forms", "platform/persistence/queue", "platform/policy", + "platform/entanglement", "example/persistence", "example/generator" From d04165554698d0e73e7c82def13ab707fef7f074 Mon Sep 17 00:00:00 2001 From: larkin Date: Thu, 11 Jun 2015 14:22:18 -0700 Subject: [PATCH 49/74] [Licenses] Add License Headers --- .../entanglement/src/actions/CopyAction.js | 22 +++++++++++++++++++ .../entanglement/src/actions/LinkAction.js | 22 +++++++++++++++++++ .../entanglement/src/actions/MoveAction.js | 22 +++++++++++++++++++ .../entanglement/src/services/CopyService.js | 22 +++++++++++++++++++ .../entanglement/src/services/LinkService.js | 22 +++++++++++++++++++ .../src/services/LocationService.js | 22 +++++++++++++++++++ .../entanglement/src/services/MoveService.js | 22 +++++++++++++++++++ .../entanglement/test/DomainObjectFactory.js | 22 +++++++++++++++++++ .../test/actions/CopyActionSpec.js | 22 +++++++++++++++++++ .../test/actions/LinkActionSpec.js | 22 +++++++++++++++++++ .../test/actions/MoveActionSpec.js | 22 +++++++++++++++++++ .../test/services/CopyServiceSpec.js | 22 +++++++++++++++++++ .../test/services/LinkServiceSpec.js | 22 +++++++++++++++++++ .../test/services/LocationServiceSpec.js | 22 +++++++++++++++++++ .../test/services/MockCopyService.js | 22 +++++++++++++++++++ .../test/services/MockLinkService.js | 22 +++++++++++++++++++ .../test/services/MockMoveService.js | 22 +++++++++++++++++++ .../test/services/MoveServiceSpec.js | 22 +++++++++++++++++++ 18 files changed, 396 insertions(+) diff --git a/platform/entanglement/src/actions/CopyAction.js b/platform/entanglement/src/actions/CopyAction.js index 1fbeda1a73..b691c4ae03 100644 --- a/platform/entanglement/src/actions/CopyAction.js +++ b/platform/entanglement/src/actions/CopyAction.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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 () { diff --git a/platform/entanglement/src/actions/LinkAction.js b/platform/entanglement/src/actions/LinkAction.js index ed830c21a7..69dfd5df62 100644 --- a/platform/entanglement/src/actions/LinkAction.js +++ b/platform/entanglement/src/actions/LinkAction.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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 () { diff --git a/platform/entanglement/src/actions/MoveAction.js b/platform/entanglement/src/actions/MoveAction.js index a7b8c9771c..2d8bea706a 100644 --- a/platform/entanglement/src/actions/MoveAction.js +++ b/platform/entanglement/src/actions/MoveAction.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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 () { diff --git a/platform/entanglement/src/services/CopyService.js b/platform/entanglement/src/services/CopyService.js index d7a9baa868..07fa85741e 100644 --- a/platform/entanglement/src/services/CopyService.js +++ b/platform/entanglement/src/services/CopyService.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/src/services/LinkService.js b/platform/entanglement/src/services/LinkService.js index 8c87f106b4..e48f0df623 100644 --- a/platform/entanglement/src/services/LinkService.js +++ b/platform/entanglement/src/services/LinkService.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/src/services/LocationService.js b/platform/entanglement/src/services/LocationService.js index 59f557acfc..2fec2bd181 100644 --- a/platform/entanglement/src/services/LocationService.js +++ b/platform/entanglement/src/services/LocationService.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/src/services/MoveService.js b/platform/entanglement/src/services/MoveService.js index 4ca1dc8742..ad0bb817e9 100644 --- a/platform/entanglement/src/services/MoveService.js +++ b/platform/entanglement/src/services/MoveService.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/DomainObjectFactory.js b/platform/entanglement/test/DomainObjectFactory.js index e1f681b26c..3f62841e42 100644 --- a/platform/entanglement/test/DomainObjectFactory.js +++ b/platform/entanglement/test/DomainObjectFactory.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/actions/CopyActionSpec.js b/platform/entanglement/test/actions/CopyActionSpec.js index c382e58507..4284a22e59 100644 --- a/platform/entanglement/test/actions/CopyActionSpec.js +++ b/platform/entanglement/test/actions/CopyActionSpec.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/actions/LinkActionSpec.js b/platform/entanglement/test/actions/LinkActionSpec.js index e86964186d..03967a6672 100644 --- a/platform/entanglement/test/actions/LinkActionSpec.js +++ b/platform/entanglement/test/actions/LinkActionSpec.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/actions/MoveActionSpec.js b/platform/entanglement/test/actions/MoveActionSpec.js index deb5514fa6..52a7c6e301 100644 --- a/platform/entanglement/test/actions/MoveActionSpec.js +++ b/platform/entanglement/test/actions/MoveActionSpec.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js index e8f2528b12..cc7780e473 100644 --- a/platform/entanglement/test/services/CopyServiceSpec.js +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/services/LinkServiceSpec.js b/platform/entanglement/test/services/LinkServiceSpec.js index 64c284cc49..fc1983585d 100644 --- a/platform/entanglement/test/services/LinkServiceSpec.js +++ b/platform/entanglement/test/services/LinkServiceSpec.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/services/LocationServiceSpec.js b/platform/entanglement/test/services/LocationServiceSpec.js index 0d565f9a9d..c469392f23 100644 --- a/platform/entanglement/test/services/LocationServiceSpec.js +++ b/platform/entanglement/test/services/LocationServiceSpec.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/services/MockCopyService.js b/platform/entanglement/test/services/MockCopyService.js index 3d020a9c48..0e7e3517f3 100644 --- a/platform/entanglement/test/services/MockCopyService.js +++ b/platform/entanglement/test/services/MockCopyService.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/services/MockLinkService.js b/platform/entanglement/test/services/MockLinkService.js index 0609ccbec3..58a82333d3 100644 --- a/platform/entanglement/test/services/MockLinkService.js +++ b/platform/entanglement/test/services/MockLinkService.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/services/MockMoveService.js b/platform/entanglement/test/services/MockMoveService.js index e24401e96f..52278a49d5 100644 --- a/platform/entanglement/test/services/MockMoveService.js +++ b/platform/entanglement/test/services/MockMoveService.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( diff --git a/platform/entanglement/test/services/MoveServiceSpec.js b/platform/entanglement/test/services/MoveServiceSpec.js index 7a3e330a4c..6d05aa1bab 100644 --- a/platform/entanglement/test/services/MoveServiceSpec.js +++ b/platform/entanglement/test/services/MoveServiceSpec.js @@ -1,3 +1,25 @@ +/***************************************************************************** + * 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( [ From c6186ae186d791c3c4bf6f920d0956481ec59e80 Mon Sep 17 00:00:00 2001 From: larkin Date: Fri, 12 Jun 2015 09:39:24 -0700 Subject: [PATCH 50/74] [Entanglement] Correctly Call Policy Service Move, Copy, and Link services correctly call the policy service to check whether composition is allowed. Fixes open-1254. --- .../entanglement/src/services/CopyService.js | 4 ++-- .../entanglement/src/services/LinkService.js | 4 ++-- .../entanglement/src/services/MoveService.js | 4 ++-- .../test/services/CopyServiceSpec.js | 19 +++++++++++++++++-- .../test/services/LinkServiceSpec.js | 13 +++++++++++++ .../test/services/MoveServiceSpec.js | 19 ++++++++++++++++--- 6 files changed, 52 insertions(+), 11 deletions(-) diff --git a/platform/entanglement/src/services/CopyService.js b/platform/entanglement/src/services/CopyService.js index 07fa85741e..b7e10ba9ab 100644 --- a/platform/entanglement/src/services/CopyService.js +++ b/platform/entanglement/src/services/CopyService.js @@ -83,8 +83,8 @@ define( } return policyService.allow( "composition", - object.getCapability('type'), - parentCandidate.getCapability('type') + parentCandidate.getCapability('type'), + object.getCapability('type') ); }, /** diff --git a/platform/entanglement/src/services/LinkService.js b/platform/entanglement/src/services/LinkService.js index e48f0df623..9e570a9e4e 100644 --- a/platform/entanglement/src/services/LinkService.js +++ b/platform/entanglement/src/services/LinkService.js @@ -44,8 +44,8 @@ define( } return policyService.allow( "composition", - object.getCapability('type'), - parentCandidate.getCapability('type') + parentCandidate.getCapability('type'), + object.getCapability('type') ); }, /** diff --git a/platform/entanglement/src/services/MoveService.js b/platform/entanglement/src/services/MoveService.js index ad0bb817e9..206b5916af 100644 --- a/platform/entanglement/src/services/MoveService.js +++ b/platform/entanglement/src/services/MoveService.js @@ -51,8 +51,8 @@ define( } return policyService.allow( "composition", - object.getCapability('type'), - parentCandidate.getCapability('type') + parentCandidate.getCapability('type'), + object.getCapability('type') ); }, /** diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js index cc7780e473..6d7b1d5069 100644 --- a/platform/entanglement/test/services/CopyServiceSpec.js +++ b/platform/entanglement/test/services/CopyServiceSpec.js @@ -60,10 +60,16 @@ define( policyService ); object = domainObjectFactory({ - name: 'object' + name: 'object', + capabilities: { + type: { type: 'object' } + } }); parentCandidate = domainObjectFactory({ - name: 'parentCandidate' + name: 'parentCandidate', + capabilities: { + type: { type: 'parentCandidate' } + } }); validate = function () { return copyService.validate(object, parentCandidate); @@ -88,6 +94,15 @@ define( 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); diff --git a/platform/entanglement/test/services/LinkServiceSpec.js b/platform/entanglement/test/services/LinkServiceSpec.js index fc1983585d..0551256277 100644 --- a/platform/entanglement/test/services/LinkServiceSpec.js +++ b/platform/entanglement/test/services/LinkServiceSpec.js @@ -84,10 +84,23 @@ define( 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); diff --git a/platform/entanglement/test/services/MoveServiceSpec.js b/platform/entanglement/test/services/MoveServiceSpec.js index 6d05aa1bab..d1ffb52bc1 100644 --- a/platform/entanglement/test/services/MoveServiceSpec.js +++ b/platform/entanglement/test/services/MoveServiceSpec.js @@ -65,7 +65,8 @@ define( name: 'object', id: 'a', capabilities: { - context: objectContextCapability + context: objectContextCapability, + type: { type: 'object' } } }); @@ -78,8 +79,11 @@ define( parentCandidate = domainObjectFactory({ name: 'parentCandidate', - model: {composition: []}, - id: 'c' + model: { composition: [] }, + id: 'c', + capabilities: { + type: { type: 'parentCandidate' } + } }); validate = function () { @@ -112,6 +116,15 @@ define( 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); From 11beea9dfd96c35e4a5544e48217a12503975193 Mon Sep 17 00:00:00 2001 From: larkin Date: Fri, 12 Jun 2015 09:56:22 -0700 Subject: [PATCH 51/74] [Glyphs] New Glyphs for Actions --- platform/entanglement/bundle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/entanglement/bundle.json b/platform/entanglement/bundle.json index 83057c62f1..f0d6fffaab 100644 --- a/platform/entanglement/bundle.json +++ b/platform/entanglement/bundle.json @@ -8,7 +8,7 @@ "key": "move", "name": "Move", "description": "Move object to another location.", - "glyph": "m", + "glyph": "\u00F3", "category": "contextual", "implementation": "actions/MoveAction.js", "depends": ["locationService", "moveService"] @@ -17,7 +17,7 @@ "key": "copy", "name": "Duplicate", "description": "Duplicate object to another location.", - "glyph": "c", + "glyph": "\u00F2", "category": "contextual", "implementation": "actions/CopyAction.js", "depends": ["locationService", "copyService"] @@ -26,7 +26,7 @@ "key": "link", "name": "Create Link", "description": "Create Link to object in another location.", - "glyph": "l", + "glyph": "\u00F4", "category": "contextual", "implementation": "actions/LinkAction.js", "depends": ["locationService", "linkService"] From d32c05a3138bb0dab608cc15a5fcd1d19649a83a Mon Sep 17 00:00:00 2001 From: larkin Date: Fri, 12 Jun 2015 09:57:28 -0700 Subject: [PATCH 52/74] [Style] Add newline at end of file --- platform/entanglement/test/suite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/entanglement/test/suite.json b/platform/entanglement/test/suite.json index 03d59f8d6c..40c300e213 100644 --- a/platform/entanglement/test/suite.json +++ b/platform/entanglement/test/suite.json @@ -6,4 +6,4 @@ "services/LinkService", "services/MoveService", "services/LocationService" -] \ No newline at end of file +] From af0c2e7827df59e41b82f727a77484fac873ed65 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 12 Jun 2015 10:00:51 -0700 Subject: [PATCH 53/74] [Fronted] Significant refactoring of mixins for containers and buttons WTD-839 Refactoring in advance of style mods to switcher when in frame; Cleanup of markup to remove 'icon' class from invoke-menu elements; --- .../commonUI/general/res/sass/_constants.scss | 6 +-- .../commonUI/general/res/sass/_icons.scss | 23 ++------- .../commonUI/general/res/sass/_mixins.scss | 47 ++++++++++++------- .../general/res/sass/controls/_buttons.scss | 6 +-- .../general/res/sass/controls/_controls.scss | 11 +++-- .../general/res/sass/items/_item.scss | 2 +- .../res/templates/controls/switcher.html | 4 +- .../features/plot/res/templates/plot.html | 2 +- .../forms/res/templates/controls/color.html | 2 +- .../res/templates/controls/menu-button.html | 2 +- 10 files changed, 56 insertions(+), 49 deletions(-) diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 47b9a70493..f7f359feff 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -28,8 +28,8 @@ $bodyMargin: 10px; $interiorMargin: 5px; $interiorMarginLg: $interiorMargin * 2; $interiorMarginSm: 3px; -$basicCr: 3px; -$controlCr: $basicCr; +$basicCr: 2px; +$controlCr: 2px; $smallCr: 2px; $badgeW: 35px; @@ -119,7 +119,7 @@ $controlDisabledOpacity: 0.3; $formLabelW: 20%; $formInputH: 22px; $formRowCtrlsH: 14px; -$menuLineH: 1.5rem; +$menuLineH: 1.4rem; $scrollbarTrackSize: 10px; $scrollbarTrackColorBg: rgba(#000, 0.4); $btnStdH: 25px; diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index fda57e977d..5de9294efc 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -42,12 +42,6 @@ &.major { font-size: 1.65em; } - &:hover { - // color: lighten($c, $ltGamma); - .invoke-menu { - // color: lighten($colorBodyBg, $ltGamma * 2); - } - } } } @@ -56,28 +50,21 @@ } .invoke-menu { - @include invokeMenu($colorKey); + //@include invokeMenu(); // $colorKey + text-shadow: none; display: inline-block; - font-size: 1rem; + font-size: 0.8rem; vertical-align: middle; } .btn-menu .invoke-menu, .icon.major .invoke-menu { - margin-left: $interiorMargin; -} - -.icon-buttons-main .invoke-menu { - @include invokeMenu(lighten($colorBodyBg, $ltGamma)); -} - -.menu-element .invoke-menu { - + margin-left: $interiorMarginSm; } .object-header .type-icon { color: $colorKey; - margin-right: $interiorMargin; + margin-right: $interiorMarginSm; } .menu .type-icon, diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 414437d2d3..8fe4f731c0 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -131,20 +131,35 @@ } @mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { - @include background-image(linear-gradient(lighten($bg, 10%), lighten($bg, 5%))); + $ltnRatio: 7%; + $gradRatio: 5%; + $hovRatio: 7%; + $bgBase: lighten($bg, $ltnRatio); + $fgBase: lighten($fg, $ltnRatio); + $gradC1: lighten($bgBase, $gradRatio); + $gradC2: $bgBase; + $cInvokeBase: lighten($gradC1, $ltnRatio*2); + + @include background-image(linear-gradient($gradC1, $gradC2)); @include border-radius($controlCr); @include box-sizing(border-box); -// @include box-shadow(rgba(black, 0.3) 0 1px 2px); @include boxShdwSubtle(); border: none; - border-top: 1px solid lighten($bg, 20%); + border-top: 1px solid lighten($gradC1, 2%); color: $fg; display: inline-block; @if $hover == true { - &:hover { - @include background-image(linear-gradient(lighten($bg, 20%), lighten($bg, 15%))); + &:not(.disabled):hover { + @include background-image(linear-gradient(lighten($gradC1, $hovRatio), lighten($gradC2, $hovRatio))); + color: lighten($fgBase, $hovRatio); + &.btn-menu .invoke-menu { + color: lighten($cInvokeBase, $hovRatio); + } } } + &.btn-menu .invoke-menu { + color: $cInvokeBase; + } } @mixin sliderTrack($bg: $scrollbarTrackColorBg) { @@ -185,18 +200,16 @@ } @mixin btnSubtle($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include containerSubtle($bg, $fg); - &:not(.disabled):hover { - @include background-image(linear-gradient(lighten($bg, 20%), lighten($bg, 10%))); - } + @include containerSubtle($bg, $fg, true); } @mixin btnNoticeable($bg: $colorBodyBg, $fg: $colorBodyFg) { - @include containerSubtle($bg, $fg); - @include background-image(linear-gradient(lighten($bg, 20%), $bg)); - &:not(.disabled):hover { + // No longer should be used; use btnSubtle instead + //@include containerSubtle($bg, $fg, true); + //@include background-image(linear-gradient(lighten($bg, 20%), $bg)); +/* &:not(.disabled):hover { @include background-image(linear-gradient(lighten($bg, 30%), lighten($bg, 10%))); - } + }*/ } @mixin boxIncised($sVal: 0.6) { @@ -207,8 +220,8 @@ border: 1px solid $c; } -@mixin boxShdwSubtle($sVal: 0.3) { - @include box-shadow(rgba(black, $sVal) 0 1px 3px); +@mixin boxShdwSubtle($sVal: 0.2) { + @include box-shadow(rgba(black, $sVal) 0 1px 2px); } @mixin boxShdwLarge($sVal: 0.7) { @@ -235,13 +248,15 @@ } -@mixin invokeMenu($baseColor) { +/* +@mixin invokeMenu($baseColor: $colorBodyFg) { $c: $baseColor; color: $c; &:hover { color: lighten($c, $ltGamma); } } +*/ @mixin menuUlReset() { margin: 0; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index d31314299e..b1cde49ae9 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -62,12 +62,12 @@ $pad: $interiorMargin * $baseRatio; text-decoration: none; &.major { $bg: $colorKey; - @include btnNoticeable($bg); + @include btnSubtle($bg); $fg: lighten($bg, 50%); color: $fg; &:hover { - @include btnNoticeable(lighten($bg, 5%)); - color: $fg; + @include btnSubtle(lighten($bg, 5%), $fg); + //color: $fg; } .invoke-menu { color: $fg; diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 892f60274e..25f5668c77 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -263,7 +263,7 @@ label.checkbox.custom { .btn-menu { $h: 20px; - $p: $interiorMargin * 2; + $p: $interiorMarginSm * 2; $c: $colorBodyFg; @include btnSubtle($colorBodyBg); height: $h; @@ -359,7 +359,8 @@ label.checkbox.custom { /******************************************************** VIEW-CONTROLS */ -.view-controls .view-type { +/*.view-controls .view-type { +// UNUSED? $d: 20px; $p: 5px; @include border-radius($controlCr); @@ -373,13 +374,17 @@ label.checkbox.custom { &.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; } +.frame .t-view-switcher { + // Style the view switcher when in a frame +} + /******************************************************** SLIDERS */ .slider { 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/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html index 43a41fb1c7..31ce2b05cf 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -22,7 +22,7 @@
@@ -37,7 +37,7 @@ {{ngModel.selected.glyph}} {{ngModel.selected.name}} - v + v
diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index c1b93c8c5b..e78a6464ba 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -116,7 +116,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
    {{structure.text}} - v From bff272e3264ab50df5fc691726366bb074ff0645 Mon Sep 17 00:00:00 2001 From: larkin Date: Fri, 12 Jun 2015 10:08:34 -0700 Subject: [PATCH 54/74] [JSDoc] Add class-level documentation --- platform/entanglement/src/actions/CopyAction.js | 7 +++++++ platform/entanglement/src/actions/LinkAction.js | 6 ++++++ platform/entanglement/src/actions/MoveAction.js | 6 ++++++ platform/entanglement/src/services/CopyService.js | 5 +++++ platform/entanglement/src/services/LinkService.js | 5 +++++ platform/entanglement/src/services/LocationService.js | 2 +- platform/entanglement/src/services/MoveService.js | 5 +++++ 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/platform/entanglement/src/actions/CopyAction.js b/platform/entanglement/src/actions/CopyAction.js index b691c4ae03..aff8b94fb5 100644 --- a/platform/entanglement/src/actions/CopyAction.js +++ b/platform/entanglement/src/actions/CopyAction.js @@ -25,6 +25,13 @@ 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, diff --git a/platform/entanglement/src/actions/LinkAction.js b/platform/entanglement/src/actions/LinkAction.js index 69dfd5df62..c6b4be100f 100644 --- a/platform/entanglement/src/actions/LinkAction.js +++ b/platform/entanglement/src/actions/LinkAction.js @@ -25,6 +25,12 @@ 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, diff --git a/platform/entanglement/src/actions/MoveAction.js b/platform/entanglement/src/actions/MoveAction.js index 2d8bea706a..63f1517c56 100644 --- a/platform/entanglement/src/actions/MoveAction.js +++ b/platform/entanglement/src/actions/MoveAction.js @@ -25,6 +25,12 @@ 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, diff --git a/platform/entanglement/src/services/CopyService.js b/platform/entanglement/src/services/CopyService.js index b7e10ba9ab..487568c475 100644 --- a/platform/entanglement/src/services/CopyService.js +++ b/platform/entanglement/src/services/CopyService.js @@ -26,6 +26,11 @@ 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) { /** diff --git a/platform/entanglement/src/services/LinkService.js b/platform/entanglement/src/services/LinkService.js index 9e570a9e4e..acecab3b8d 100644 --- a/platform/entanglement/src/services/LinkService.js +++ b/platform/entanglement/src/services/LinkService.js @@ -26,6 +26,11 @@ 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 { /** diff --git a/platform/entanglement/src/services/LocationService.js b/platform/entanglement/src/services/LocationService.js index 2fec2bd181..3e71011503 100644 --- a/platform/entanglement/src/services/LocationService.js +++ b/platform/entanglement/src/services/LocationService.js @@ -29,7 +29,7 @@ define( /** * 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 diff --git a/platform/entanglement/src/services/MoveService.js b/platform/entanglement/src/services/MoveService.js index 206b5916af..e91d381453 100644 --- a/platform/entanglement/src/services/MoveService.js +++ b/platform/entanglement/src/services/MoveService.js @@ -26,6 +26,11 @@ 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 { /** From 3a79801579678f131771c796d153b84e4345d37a Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 12 Jun 2015 10:27:35 -0700 Subject: [PATCH 55/74] [Glyphs] Use placeholder glyphs for actions Use placeholder glyphs for move, copy, link; completing integration of #6. --- platform/entanglement/bundle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/entanglement/bundle.json b/platform/entanglement/bundle.json index f0d6fffaab..7220669988 100644 --- a/platform/entanglement/bundle.json +++ b/platform/entanglement/bundle.json @@ -8,7 +8,7 @@ "key": "move", "name": "Move", "description": "Move object to another location.", - "glyph": "\u00F3", + "glyph": "f", "category": "contextual", "implementation": "actions/MoveAction.js", "depends": ["locationService", "moveService"] @@ -17,7 +17,7 @@ "key": "copy", "name": "Duplicate", "description": "Duplicate object to another location.", - "glyph": "\u00F2", + "glyph": "+", "category": "contextual", "implementation": "actions/CopyAction.js", "depends": ["locationService", "copyService"] @@ -26,7 +26,7 @@ "key": "link", "name": "Create Link", "description": "Create Link to object in another location.", - "glyph": "\u00F4", + "glyph": "\u00E8", "category": "contextual", "implementation": "actions/LinkAction.js", "depends": ["locationService", "linkService"] From 8f153d4e757ab9c6c25f68c9eccc6a47beb653f9 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 12 Jun 2015 11:44:09 -0700 Subject: [PATCH 56/74] [Fronted] Significant refactoring of mixins for containers and buttons WTD-839 Removal of 'icon-btn' class from *.html; Cleanup of markup in switcher.html; 'name' span is now hidden when switcher is within frame; Commented out unused css classes in _controls.scss, Normalization of markup in object header when in main view and framed objects; Icon sizing fixed in menus and switcher control; Tightened up spacing in menus; --- .../res/templates/browse/object-header.html | 12 +- platform/commonUI/general/res/css/forms.css | 82 +- platform/commonUI/general/res/css/items.css | 101 +- .../general/res/css/theme-espresso.css | 993 ++++++++++-------- platform/commonUI/general/res/css/tree.css | 32 +- .../commonUI/general/res/sass/_icons.scss | 12 +- .../general/res/sass/controls/_buttons.scss | 2 +- .../general/res/sass/controls/_controls.scss | 126 ++- .../general/res/sass/controls/_menus.scss | 2 +- .../commonUI/general/res/sass/tree/_tree.scss | 9 +- .../res/templates/controls/switcher.html | 14 +- .../features/plot/res/templates/plot.html | 2 +- 12 files changed, 780 insertions(+), 607 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index eb84dafbbd..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}} - + + {{type.getGlyph()}} + {{parameters.mode}} + {{type.getName()}} + {{model.name}} + +
    \ No newline at end of file diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 3636789add..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; @@ -305,9 +314,9 @@ label.form-control.checkbox input { 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; @@ -350,23 +359,23 @@ input[type="text"] { *****************************************************************************/ /* 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; @@ -374,14 +383,21 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 189, ../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; @@ -438,9 +454,9 @@ input[type="text"] { .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 1c57bbd7ae..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 189, ../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 197, ../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/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 544b432ed3..933d046842 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -161,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 @@ -446,9 +455,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 { @@ -958,9 +967,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; @@ -976,12 +985,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; } /***************************************************************************** @@ -1034,46 +1043,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 241, ../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 241, ../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; @@ -1296,9 +1299,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; @@ -1343,7 +1346,7 @@ span { /* line 26, ../sass/controls/_buttons.scss */ .btn, .l-btn { - line-height: 1.2em; + line-height: 1.25em; padding: 0 7.5px; text-decoration: none; } /* line 31, ../sass/controls/_buttons.scss */ @@ -1376,9 +1379,9 @@ span { .s-btn, .icon-btn, .s-icon-btn { - -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; @@ -1390,85 +1393,98 @@ span { .s-btn.major, .major.icon-btn, .major.s-icon-btn { - 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: #ccf2ff; } - /* line 197, ../sass/_mixins.scss */ + /* 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+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 */ + .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 68, ../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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + 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%, #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; + 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.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 #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 197, ../sass/_mixins.scss */ + 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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwZGZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzFhYzZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + 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%, #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); } + 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 72, ../sass/controls/_buttons.scss */ .btn.major .invoke-menu, .s-btn.major .invoke-menu, @@ -1480,36 +1496,49 @@ span { .s-btn.subtle, .subtle.icon-btn, .subtle.s-icon-btn { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + 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%, #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; + 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.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 #999999; + border-top: 1px solid #8a8a8a; color: #cccccc; display: inline-block; } - /* line 189, ../sass/_mixins.scss */ + /* 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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzk5OTk5OSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + 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%, #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); } + 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 79, ../sass/controls/_buttons.scss */ .btn.very-subtle, .btn.s-very-subtle, .s-btn.very-subtle, @@ -1518,39 +1547,58 @@ span { .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+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; } - /* line 144, ../sass/_mixins.scss */ - .btn.very-subtle:hover, .btn.s-very-subtle:hover, - .s-btn.very-subtle:hover, - .very-subtle.icon-btn:hover, - .very-subtle.s-icon-btn:hover, - .s-btn.s-very-subtle:hover, - .s-very-subtle.icon-btn: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 82, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused, .btn.s-very-subtle.paused, .s-btn.very-subtle.paused, @@ -1559,39 +1607,58 @@ span { .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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y4OGMwMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2RlN2QwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + 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%, #f88c01), color-stop(100%, #de7d01)); - background-image: -moz-linear-gradient(#f88c01, #de7d01); - background-image: -webkit-linear-gradient(#f88c01, #de7d01); - background-image: linear-gradient(#f88c01, #de7d01); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + 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.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 #fea32e; + border-top: 1px solid #fe9510; color: #fff; display: inline-block; } - /* line 144, ../sass/_mixins.scss */ - .btn.very-subtle.paused:hover, .btn.s-very-subtle.paused:hover, - .s-btn.very-subtle.paused:hover, - .very-subtle.paused.icon-btn:hover, - .very-subtle.paused.s-icon-btn:hover, - .s-btn.s-very-subtle.paused:hover, - .s-very-subtle.paused.icon-btn:hover, - .s-very-subtle.paused.s-icon-btn:hover { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlYTMyZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + /* 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%, #fea32e), color-stop(100%, #fe9815)); - background-image: -moz-linear-gradient(#fea32e, #fe9815); - background-image: -webkit-linear-gradient(#fea32e, #fe9815); - background-image: linear-gradient(#fea32e, #fe9815); } + 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 84, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused .icon:before, .btn.s-very-subtle.paused .icon:before, .s-btn.very-subtle.paused .icon:before, @@ -1769,41 +1836,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; @@ -1821,10 +1892,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; @@ -1834,10 +1905,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; @@ -1847,20 +1918,20 @@ a.l-btn span { overflow-y: auto; overflow-x: hidden; } -/* line 97, ../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 111, ../sass/controls/_controls.scss */ +/* line 119, ../sass/controls/_controls.scss */ .l-composite-control { vertical-align: middle; } - /* line 114, ../sass/controls/_controls.scss */ + /* line 122, ../sass/controls/_controls.scss */ .l-composite-control.l-checkbox .composite-control-label { line-height: 18px; } -/* line 120, ../sass/controls/_controls.scss */ +/* line 128, ../sass/controls/_controls.scss */ .l-control-group { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -1869,27 +1940,27 @@ a.l-btn span { display: inline-block; padding: 0 5px; position: relative; } - /* line 128, ../sass/controls/_controls.scss */ + /* line 136, ../sass/controls/_controls.scss */ .l-control-group:first-child { border-left: none; padding-left: 0; } -/* line 134, ../sass/controls/_controls.scss */ +/* line 142, ../sass/controls/_controls.scss */ .l-local-controls { position: absolute; top: 5px; right: 5px; z-index: 5; } -/* line 143, ../sass/controls/_controls.scss */ +/* line 152, ../sass/controls/_controls.scss */ .s-local-controls { font-size: 0.7rem; } -/* line 147, ../sass/controls/_controls.scss */ +/* line 156, ../sass/controls/_controls.scss */ .btn-set { display: inline-block; position: relative; } - /* line 151, ../sass/controls/_controls.scss */ + /* line 160, ../sass/controls/_controls.scss */ .btn-set .btn, .btn-set .t-btn { -moz-border-radius: 0; @@ -1897,27 +1968,27 @@ a.l-btn span { border-radius: 0; border-left: 1px solid #666666; margin-left: 0; } - /* line 156, ../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 160, ../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 166, ../sass/controls/_controls.scss */ +/* line 175, ../sass/controls/_controls.scss */ .object-browse-bar .btn, .object-browse-bar .t-btn, .top-bar .buttons-main .btn, @@ -1928,7 +1999,7 @@ a.l-btn span { font-size: 11.25px; height: 25px; line-height: 25px; } - /* line 177, ../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), @@ -1938,7 +2009,7 @@ a.l-btn span { font-size: 150%; vertical-align: middle; } -/* line 185, ../sass/controls/_controls.scss */ +/* line 194, ../sass/controls/_controls.scss */ label.checkbox.custom { cursor: pointer; display: inline-block; @@ -1947,17 +2018,17 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: top; } - /* line 196, ../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 201, ../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; @@ -1972,121 +2043,132 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 219, ../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 225, ../sass/controls/_controls.scss */ + /* line 234, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 229, ../sass/controls/_controls.scss */ + /* line 238, ../sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 231, ../sass/controls/_controls.scss */ + /* line 240, ../sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 239, ../sass/controls/_controls.scss */ +/* line 248, ../sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 241, ../sass/controls/_controls.scss */ + /* line 250, ../sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 245, ../sass/controls/_controls.scss */ + /* line 254, ../sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 248, ../sass/controls/_controls.scss */ + /* line 257, ../sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 253, ../sass/controls/_controls.scss */ +/* line 262, ../sass/controls/_controls.scss */ .btn-menu label.checkbox.custom { margin-left: 5px; } -/* line 258, ../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 264, ../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 189, ../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 271, ../sass/controls/_controls.scss */ - .btn-menu.dropdown { - padding-left: 10px; - padding-right: 10px; } - /* line 277, ../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 281, ../sass/controls/_controls.scss */ - .btn-menu.btn-invoke-menu { - color: #0099cc; - padding: 0 5px; } - /* line 285, ../sass/controls/_controls.scss */ - .btn-menu.btn-invoke-menu:hover { - color: deepskyblue; } - /* line 295, ../sass/controls/_controls.scss */ - .btn-menu .type-icon { - margin-right: 5px; } - /* line 298, ../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 303, ../sass/controls/_controls.scss */ + /* line 318, ../sass/controls/_controls.scss */ .btn-menu .menu .ui-symbol.icon { width: 12px; } -/* line 309, ../sass/controls/_controls.scss */ +/* line 324, ../sass/controls/_controls.scss */ .top-bar .btn-menu { height: 25px; line-height: 25px; padding-right: 10px; } - /* line 317, ../sass/controls/_controls.scss */ + /* line 332, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn { margin-right: 5px; padding-left: 25px; } - /* line 320, ../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; @@ -2099,51 +2181,55 @@ label.checkbox.custom { height: auto; } /******************************************************** OBJECT-HEADER */ -/* line 337, ../sass/controls/_controls.scss */ +/* line 352, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 340, ../sass/controls/_controls.scss */ - .object-header .title { + /* line 356, ../sass/controls/_controls.scss */ + .object-header .label .title-label { color: white; } - /* line 343, ../sass/controls/_controls.scss */ - .object-header .type-icon { + /* line 359, ../sass/controls/_controls.scss */ + .object-header .label .type-icon { font-size: 1.5em; margin-right: 5px; vertical-align: middle; } -/* line 352, ../sass/controls/_controls.scss */ +/* line 369, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 354, ../sass/controls/_controls.scss */ + /* line 371, ../sass/controls/_controls.scss */ .top-bar .object-header span, .object-browse-bar .object-header span { display: inline-block; } /******************************************************** VIEW-CONTROLS */ -/* line 362, ../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 373, ../sass/controls/_controls.scss */ - .view-controls .view-type.cur { - background: #666666; } +/*.view-controls .view-type { +// UNUSED? + $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); + } +}*/ +/* line 398, ../sass/controls/_controls.scss */ +.frame .t-view-switcher .name { + display: none; } -/* line 378, ../sass/controls/_controls.scss */ +/* line 403, ../sass/controls/_controls.scss */ .edit-mode .top-bar .control-set.edit-view-controls { margin-right: 50px; } /******************************************************** SLIDERS */ -/* line 389, ../sass/controls/_controls.scss */ +/* line 414, ../sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2164,25 +2250,25 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 400, ../sass/controls/_controls.scss */ +/* line 425, ../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; + 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: ew-resize; @@ -2193,15 +2279,22 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 189, ../sass/_mixins.scss */ + /* 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 161, ../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; @@ -2212,15 +2305,15 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 182, ../sass/_mixins.scss */ + /* line 197, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } - /* line 411, ../sass/controls/_controls.scss */ + /* line 436, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 418, ../sass/controls/_controls.scss */ +/* line 443, ../sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -2231,12 +2324,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 428, ../sass/controls/_controls.scss */ + /* line 453, ../sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ -/* line 436, ../sass/controls/_controls.scss */ +/* line 461, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2253,7 +2346,7 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 442, ../sass/controls/_controls.scss */ +/* line 467, ../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%; @@ -2267,11 +2360,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 449, ../sass/controls/_controls.scss */ + /* line 474, ../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%; @@ -2280,7 +2373,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: linear-gradient(#808080, #737373 20px); } -/* line 454, ../sass/controls/_controls.scss */ +/* line 479, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } @@ -2345,26 +2438,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; @@ -2372,11 +2465,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 249, ../sass/_mixins.scss */ + /* line 264, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2387,8 +2483,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 { @@ -2439,9 +2535,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 { @@ -2480,25 +2576,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; } @@ -2881,9 +2980,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; @@ -2920,9 +3019,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; @@ -3008,9 +3107,9 @@ span.req { 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; @@ -3053,23 +3152,23 @@ input[type="text"] { *****************************************************************************/ /* 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; @@ -3077,14 +3176,21 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 189, ../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; @@ -3141,9 +3247,9 @@ input[type="text"] { .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; @@ -3246,9 +3352,9 @@ input[type="text"] { .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; @@ -3281,9 +3387,9 @@ input[type="text"] { /* 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; @@ -3297,9 +3403,9 @@ input[type="text"] { /* line 54, ../sass/forms/_filter.scss */ .filter .s-a-clear.ui-symbol, .t-filter .s-a-clear.ui-symbol { - -moz-border-radius: 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; @@ -3397,9 +3503,9 @@ input[type="text"] { -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; @@ -3659,9 +3765,9 @@ input[type="text"] { 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; @@ -3672,34 +3778,37 @@ input[type="text"] { 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; @@ -3867,9 +3976,9 @@ input[type="text"] { 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; @@ -3897,9 +4006,9 @@ input[type="text"] { 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; @@ -4124,9 +4233,9 @@ input[type="text"] { /* line 150, ../sass/helpers/_bubbles.scss */ .s-bubble { - -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; } @@ -4221,7 +4330,7 @@ input[type="text"] { right: 0; width: auto; height: 5px; } - /* line 161, ../sass/_mixins.scss */ + /* line 176, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -4232,7 +4341,7 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 182, ../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 */ @@ -4250,7 +4359,7 @@ input[type="text"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 161, ../sass/_mixins.scss */ + /* line 176, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -4261,7 +4370,7 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 182, ../sass/_mixins.scss */ + /* line 197, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 705bc6506d..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 249, ../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/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 5de9294efc..1b90e6f0d3 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -62,17 +62,23 @@ margin-left: $interiorMarginSm; } +/* .object-header .type-icon { color: $colorKey; margin-right: $interiorMarginSm; } +*/ .menu .type-icon, .tree-item .type-icon, -.icon-btn .menu.dropdown .icon, -.super-menu.menu.dropdown .icon { - font-size: $menuLineH * 0.93; +.super-menu.menu .type-icon { + font-size: $menuLineH * 0.8; //.93 line-height: $menuLineH * 1.13; position: absolute; } + +.super-menu.menu.dropdown .icon { + font-size: $menuLineH * 0.95 +} + diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index b1cde49ae9..e411ccafdb 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -25,7 +25,7 @@ $pad: $interiorMargin * $baseRatio; /******* LAYOUT AND SIZING */ .btn, .l-btn { - line-height: 1.2em; + line-height: 1.25em; padding: 0 $pad; text-decoration: none; &.lg, diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 25f5668c77..6e96c35524 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,12 +89,15 @@ content: "v"; } } - .accordion-contents { - position: absolute; - top: $accordionHeadH + $interiorMargin; right: 0; bottom: 0; left: 0; - overflow-y: auto; - overflow-x: hidden; - } + .accordion-contents { + position: absolute; + top: $accordionHeadH + $interiorMargin; + right: 0; + bottom: 0; + left: 0; + overflow-y: auto; + overflow-x: hidden; + } } .btn-bar { @@ -98,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; } } } @@ -136,7 +144,8 @@ // Default position is upper right $p: $interiorMargin; position: absolute; - top: $p; right: $p; + top: $p; + right: $p; z-index: 5; } @@ -175,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; } @@ -266,34 +275,40 @@ label.checkbox.custom { $p: $interiorMarginSm * 2; $c: $colorBodyFg; @include btnSubtle($colorBodyBg); - height: $h; +/* height: $h; line-height: $h; &.dropdown { - // padding-left: $p; padding-left: $p; padding-right: $p; - } + }*/ &:not(.disabled):hover { color: lighten($c, 20%); } - &.btn-invoke-menu { +/* &.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); @@ -337,13 +352,15 @@ label.checkbox.custom { .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; + } } } @@ -376,15 +393,18 @@ label.checkbox.custom { } }*/ +.frame .t-view-switcher { + // Hide the name when the view switcher is in a frame context + .name { + display: none; + } +} + .edit-mode .top-bar .control-set.edit-view-controls { // Used in templates/edit-view-controls.html margin-right: $interiorMargin * 10; } -.frame .t-view-switcher { - // Style the view switcher when in a frame -} - /******************************************************** SLIDERS */ .slider { @@ -392,7 +412,7 @@ label.checkbox.custom { $knobW: 12px; $slotH: 50%; .slot { -// @include border-radius($basicCr * .75); + // @include border-radius($basicCr * .75); @include sliderTrack(); height: $slotH; width: auto; @@ -439,23 +459,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..01606d0c6d 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; diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 7df73f3bd8..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; @@ -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/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html index 31ce2b05cf..7377614b18 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -22,7 +22,7 @@
    @@ -33,9 +33,7 @@ title="{{ngModel.selected.name}}" > - - {{ngModel.selected.glyph}} - + {{ngModel.selected.glyph}} {{ngModel.selected.name}} v @@ -43,11 +41,9 @@
    diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index e78a6464ba..390ead60c7 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -108,7 +108,7 @@ I -
    From 39531a0a9fe600f13f30e1394b4875ec52528105 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 12 Jun 2015 14:17:19 -0700 Subject: [PATCH 57/74] [Fronted] Minor final sanding and polishing WTD-839 .t-view-switcher > .view-switcher; Added CSS transition to hide/show of view-switcher; Moved .view-switcher hide/show to _frame.scss; Tweaked .frame:hover to raise z-index to show complete border; --- .../browse/res/templates/browse-object.html | 2 +- .../general/res/css/theme-espresso.css | 90 +++++++++---------- .../commonUI/general/res/sass/_constants.scss | 3 + .../res/sass/_hide-non-functional.scss | 2 +- .../general/res/sass/controls/_controls.scss | 69 +++++--------- .../general/res/sass/user-environ/_frame.scss | 22 ++++- .../res/templates/controls/switcher.html | 2 +- 7 files changed, 93 insertions(+), 97 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 33998dbbbe..d88f32c18b 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -26,7 +26,7 @@
    -
    +
    diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 933d046842..7938262bbd 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2180,56 +2180,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 352, ../sass/controls/_controls.scss */ +/* line 356, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 356, ../sass/controls/_controls.scss */ + /* line 360, ../sass/controls/_controls.scss */ .object-header .label .title-label { color: white; } - /* line 359, ../sass/controls/_controls.scss */ + /* line 363, ../sass/controls/_controls.scss */ .object-header .label .type-icon { font-size: 1.5em; margin-right: 5px; vertical-align: middle; } -/* line 369, ../sass/controls/_controls.scss */ +/* line 373, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 371, ../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 */ -/*.view-controls .view-type { -// UNUSED? - $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); - } -}*/ -/* line 398, ../sass/controls/_controls.scss */ -.frame .t-view-switcher .name { - display: none; } - -/* line 403, ../sass/controls/_controls.scss */ -.edit-mode .top-bar .control-set.edit-view-controls { - margin-right: 50px; } - /******************************************************** SLIDERS */ -/* line 414, ../sass/controls/_controls.scss */ +/* line 387, ../sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2250,7 +2240,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 425, ../sass/controls/_controls.scss */ +/* line 398, ../sass/controls/_controls.scss */ .slider .knob { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2308,12 +2298,12 @@ label.checkbox.custom { /* line 197, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } - /* line 436, ../sass/controls/_controls.scss */ + /* line 409, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 443, ../sass/controls/_controls.scss */ +/* line 416, ../sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -2324,12 +2314,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 453, ../sass/controls/_controls.scss */ + /* line 426, ../sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ -/* line 461, ../sass/controls/_controls.scss */ +/* line 434, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2346,7 +2336,7 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 467, ../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%; @@ -2364,7 +2354,7 @@ label.checkbox.custom { -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; border-top: 1px solid gray; } - /* line 474, ../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%; @@ -2373,7 +2363,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: linear-gradient(#808080, #737373 20px); } -/* line 479, ../sass/controls/_controls.scss */ +/* line 452, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } @@ -3877,22 +3867,32 @@ input[type="text"] { 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 54, ../sass/user-environ/_frame.scss */ +.frame.frame-template .view-switcher { + opacity: 0; } +/* line 58, ../sass/user-environ/_frame.scss */ +.frame.frame-template:hover .view-switcher { + opacity: 1; } +/* line 66, ../sass/user-environ/_frame.scss */ +.frame .view-switcher .name { + display: none; } -/* line 52, ../sass/user-environ/_frame.scss */ +/* line 73, ../sass/user-environ/_frame.scss */ .edit-main .frame.child-frame.panel:hover { border-color: #0099cc; -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; @@ -4685,5 +4685,5 @@ input[type="text"] { .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/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index f7f359feff..666021fc7a 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -145,3 +145,6 @@ $imageThumbPad: 1px; // Bubbles $bubbleArwSize: 10px; $bubblePad: $interiorMargin; + +// Timing +$controlFadeMs: 100ms; diff --git a/platform/commonUI/general/res/sass/_hide-non-functional.scss b/platform/commonUI/general/res/sass/_hide-non-functional.scss index 55cf5047f4..1f029674c9 100644 --- a/platform/commonUI/general/res/sass/_hide-non-functional.scss +++ b/platform/commonUI/general/res/sass/_hide-non-functional.scss @@ -36,7 +36,7 @@ // Don't pad in from top and bottom //top: 0; bottom: 0; .object-browse-bar { - .t-btn.key-window { + .btn.key-window { // Hide the Open in New Window button display: none; } diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 6e96c35524..83da982937 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -275,28 +275,28 @@ label.checkbox.custom { $p: $interiorMarginSm * 2; $c: $colorBodyFg; @include btnSubtle($colorBodyBg); -/* height: $h; - line-height: $h; - &.dropdown { - 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%); } -/* &.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%); - } - }*/ + /* &.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. @@ -348,6 +348,10 @@ label.checkbox.custom { } } +.view-switcher { + @include trans-prop-nice-fade($controlFadeMs); +} + /******************************************************** OBJECT-HEADER */ .object-header { display: inline-block; @@ -374,37 +378,6 @@ label.checkbox.custom { } } -/******************************************************** VIEW-CONTROLS */ - -/*.view-controls .view-type { -// UNUSED? - $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); - } -}*/ - -.frame .t-view-switcher { - // Hide the name when the view switcher is in a frame context - .name { - display: none; - } -} - -.edit-mode .top-bar .control-set.edit-view-controls { - // Used in templates/edit-view-controls.html - margin-right: $interiorMargin * 10; -} - /******************************************************** SLIDERS */ .slider { diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index e8e704eb99..caeb3157e4 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,6 +47,26 @@ bottom: $myM; left: $myM; } + &.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; + } + &: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; + } + } } .edit-main .frame.child-frame.panel { @@ -53,5 +74,4 @@ border-color: $colorKey; @include boxShdwLarge(); } - } diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html index 7377614b18..59e9c87c85 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -22,7 +22,7 @@
    From 0b46050e049f6e1e90885b13376ec11f3a78228b Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 12 Jun 2015 15:46:31 -0700 Subject: [PATCH 58/74] [Fronted] Tweaks to bubbles and context menus scss WTD-1248 WTD-884 Changed z-index of context menus and bubbles to put the menus above; Changed text wrapping of 'value' td to no-wrap; Changed min and max-width of .l-infobubble; --- .../general/res/css/theme-espresso.css | 46 ++++++++++--------- .../general/res/sass/controls/_menus.scss | 2 +- .../general/res/sass/helpers/_bubbles.scss | 6 ++- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 64aa7e083a..3a9b6abe54 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2443,7 +2443,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; @@ -3840,66 +3840,70 @@ input[type="date"] { -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; } + z-index: 50; } /* line 29, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble { display: inline-block; + min-width: 100px; max-width: 300px; padding: 5px 10px; } - /* line 33, ../sass/helpers/_bubbles.scss */ + /* line 34, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble:before { content: ""; position: absolute; width: 0; height: 0; } - /* line 39, ../sass/helpers/_bubbles.scss */ + /* line 40, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table { width: 100%; } - /* line 42, ../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 49, ../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 58, ../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 */ .l-infobubble-wrapper .l-infobubble table tr td.align-wrap { white-space: normal; } - /* line 64, ../sass/helpers/_bubbles.scss */ + /* line 66, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 5px; } - /* line 71, ../sass/helpers/_bubbles.scss */ + /* line 73, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left { margin-left: 10px; } - /* line 73, ../sass/helpers/_bubbles.scss */ + /* line 75, ../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 81, ../sass/helpers/_bubbles.scss */ + /* line 83, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right { margin-right: 10px; } - /* line 83, ../sass/helpers/_bubbles.scss */ + /* line 85, ../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 92, ../sass/helpers/_bubbles.scss */ + /* line 94, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-top .l-infobubble::before { top: 10px; } - /* line 98, ../sass/helpers/_bubbles.scss */ + /* line 100, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-btm .l-infobubble::before { bottom: 10px; } - /* line 103, ../sass/helpers/_bubbles.scss */ + /* line 105, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down { margin-bottom: 10px; } - /* line 105, ../sass/helpers/_bubbles.scss */ + /* line 107, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down .l-infobubble::before { left: 50%; top: 100%; @@ -3908,7 +3912,7 @@ input[type="date"] { border-right: 5px solid transparent; border-top: 7.5px solid #ddd; } -/* line 118, ../sass/helpers/_bubbles.scss */ +/* line 120, ../sass/helpers/_bubbles.scss */ .s-infobubble { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -3916,18 +3920,18 @@ input[type="date"] { background: #ddd; color: #666; font-size: 0.8rem; } - /* line 124, ../sass/helpers/_bubbles.scss */ + /* line 126, ../sass/helpers/_bubbles.scss */ .s-infobubble .title { color: #333333; font-weight: bold; } - /* line 129, ../sass/helpers/_bubbles.scss */ + /* line 131, ../sass/helpers/_bubbles.scss */ .s-infobubble tr td { border-top: 1px solid #c4c4c4; font-size: 0.9em; } - /* line 133, ../sass/helpers/_bubbles.scss */ + /* line 135, ../sass/helpers/_bubbles.scss */ .s-infobubble tr:first-child td { border-top: none; } - /* line 137, ../sass/helpers/_bubbles.scss */ + /* line 139, ../sass/helpers/_bubbles.scss */ .s-infobubble .value { color: #333333; } diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index d225d764fe..9c462fe8bb 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -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/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index ca228ef02a..88731c2527 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -25,9 +25,10 @@ $arwSize: 5px; @include box-shadow(rgba(black, 0.4) 0 1px 5px); position: absolute; - z-index: 70; + z-index: 50; .l-infobubble { display: inline-block; + min-width: 100px; max-width: 300px; padding: 5px 10px; &:before { @@ -51,8 +52,9 @@ white-space: nowrap; } &.value { + //@include ellipsize(); //@include test(red); - //white-space: nowrap; + white-space: nowrap; //width: 90%; } &.align-wrap { From c6c4fa71821a958fd119c5f393500f993faf7090 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 12 Jun 2015 16:24:25 -0700 Subject: [PATCH 59/74] [Fronted] Fixes for misaligned bubbles WTD-1247 WTD-884 Changed CSS .l-infobubble-wrapper abs > relative; Added display: block class for mct-container; Tweaked bubble evaluation JS for 'goLeft' behavior; Added constants for bubble max width and left/right margin; --- .../general/res/css/theme-espresso.css | 24 +++++++++++-------- .../commonUI/general/res/sass/_constants.scss | 4 ++++ .../commonUI/general/res/sass/_global.scss | 4 ++++ .../general/res/sass/helpers/_bubbles.scss | 6 ++--- .../commonUI/inspect/src/InfoConstants.js | 5 +++- .../inspect/src/services/InfoService.js | 3 ++- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 3a9b6abe54..8106878a87 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -319,6 +319,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; @@ -328,46 +332,46 @@ 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 124, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -3839,7 +3843,7 @@ input[type="date"] { -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; + position: relative; z-index: 50; } /* line 29, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble { diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 45731c8d7e..740f04b43d 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -126,3 +126,7 @@ $tickLblH: 15px; $tickLblW: 50px; $tickH: $ticksH - $tickLblVMargin - $tickLblH; $tickW: 1px; + +// Bubbles +$bubbleMinW: 100px; +$bubbleMaxW: 300px; diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 5a7293e4f2..0f12f4f4e4 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -69,6 +69,10 @@ span { */ } +mct-container { + display: block; +} + .abs { position: absolute; top: 0; diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index 88731c2527..ab273f091a 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -24,12 +24,12 @@ .l-infobubble-wrapper { $arwSize: 5px; @include box-shadow(rgba(black, 0.4) 0 1px 5px); - position: absolute; + position: relative; z-index: 50; .l-infobubble { display: inline-block; - min-width: 100px; - max-width: 300px; + min-width: $bubbleMinW; + max-width: $bubbleMaxW; padding: 5px 10px; &:before { content:""; diff --git a/platform/commonUI/inspect/src/InfoConstants.js b/platform/commonUI/inspect/src/InfoConstants.js index c550c1a6c3..5d073c7d24 100644 --- a/platform/commonUI/inspect/src/InfoConstants.js +++ b/platform/commonUI/inspect/src/InfoConstants.js @@ -28,5 +28,8 @@ define({ "" + "", // Pixel offset for bubble, to align arrow position - BUBBLE_OFFSET: [ 0, -16 ] + BUBBLE_OFFSET: [ 0, -16 ], + // 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/services/InfoService.js b/platform/commonUI/inspect/src/services/InfoService.js index 3dd2d4985e..ddb3a3e1e1 100644 --- a/platform/commonUI/inspect/src/services/InfoService.js +++ b/platform/commonUI/inspect/src/services/InfoService.js @@ -39,7 +39,8 @@ define( var body = $document.find('body'), scope = $rootScope.$new(), winDim = [$window.innerWidth, $window.innerHeight], - goLeft = position[0] > (winDim[0] / 2), + bubbleSpaceLR = InfoConstants.BUBBLE_MARGIN_LR + InfoConstants.BUBBLE_MAX_WIDTH, + goLeft = position[0] > (winDim[0] - bubbleSpaceLR), goUp = position[1] > (winDim[1] / 2), bubble; From 7c7b79e15115adc4b142fb25c00edb0bec1bda4f Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 12 Jun 2015 19:00:55 -0700 Subject: [PATCH 60/74] [Config] Changed priority from mandatory to preferred WTD-949 --- platform/features/plot/bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/plot/bundle.json b/platform/features/plot/bundle.json index c2d35725c9..71479685e1 100644 --- a/platform/features/plot/bundle.json +++ b/platform/features/plot/bundle.json @@ -8,7 +8,7 @@ "glyph": "6", "templateUrl": "templates/plot.html", "needs": [ "telemetry" ], - "priority": "mandatory", + "priority": "preferred", "delegation": true } ], From cad64b28fd0b807d181ada871594f5609c77a40a Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 15 Jun 2015 13:15:33 -0700 Subject: [PATCH 61/74] [Version] Remove snapshot status Remove snapshot status to close out sprint Tethys, WTD-822. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8cc32ca06..9dd47f2deb 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.0 war From b131e8348f8a380aa1f55dd25cd291dac125f509 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 15 Jun 2015 13:20:16 -0700 Subject: [PATCH 62/74] [Version] Add snapshot status Restore snapshot status to version number to begin sprint Thebe, WTD-822. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9dd47f2deb..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 + 0.7.1-SNAPSHOT war From 5193c62233eecdea1c707b2b633112ec91888cd4 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 9 Jun 2015 16:39:17 -0700 Subject: [PATCH 63/74] [Merge] Cherrypick 1 from warp1220 WTD-1220 --- platform/commonUI/general/res/css/forms.css | 10 +- platform/commonUI/general/res/css/items.css | 4 +- platform/commonUI/general/res/css/plots.css | 350 -------- .../general/res/css/theme-espresso.css | 799 +++++++++++++----- platform/commonUI/general/res/css/tree.css | 2 +- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 10128 -> 10760 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 28 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 9964 -> 10596 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 7036 -> 7384 bytes .../commonUI/general/res/sass/_constants.scss | 24 +- .../commonUI/general/res/sass/_effects.scss | 4 +- .../commonUI/general/res/sass/_global.scss | 7 + platform/commonUI/general/res/sass/_main.scss | 1 + .../commonUI/general/res/sass/_mixins.scss | 25 + .../general/res/sass/controls/_buttons.scss | 52 +- .../general/res/sass/controls/_controls.scss | 13 + .../general/res/sass/features/_imagery.scss | 171 ++++ .../res/sass/features/_time-display.scss | 0 .../general/res/sass/helpers/_bubbles.scss | 106 ++- platform/commonUI/general/res/sass/plots.scss | 30 - .../commonUI/general/res/sass/tree/_tree.scss | 2 +- .../res/sass/user-environ/_layout.scss | 30 +- .../features/plot/res/templates/plot.html | 4 +- platform/features/static-markup/bundle.json | 21 + .../features/static-markup/res/markup.html | 179 ++++ 25 files changed, 1195 insertions(+), 667 deletions(-) delete mode 100644 platform/commonUI/general/res/css/plots.css create mode 100644 platform/commonUI/general/res/sass/features/_imagery.scss create mode 100644 platform/commonUI/general/res/sass/features/_time-display.scss delete mode 100644 platform/commonUI/general/res/sass/plots.scss create mode 100644 platform/features/static-markup/bundle.json create mode 100644 platform/features/static-markup/res/markup.html diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 4fee272bb9..1f5ac947c5 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -325,22 +325,22 @@ input[type="date"] { input[type="text"].error, input[type="date"].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 */ + /* 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 */ + /* 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 */ + /* 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 */ + /* 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; @@ -397,7 +397,7 @@ input[type="date"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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-size: 100%; diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 92d6f49101..875fe8488f 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -119,7 +119,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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-size: 100%; @@ -210,7 +210,7 @@ background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #80dfff; } - /* line 156, ../sass/_mixins.scss */ + /* line 181, ../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-size: 100%; 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..ec08d1a95d 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 @@ -21,7 +84,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -42,38 +105,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -154,17 +217,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 +235,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; @@ -304,7 +367,12 @@ span { .hidden { display: none !important; } -/* line 120, ../sass/_global.scss */ +/* line 121, ../sass/_global.scss */ +.paused:not(.s-btn):not(.s-icon-btn) { + border-color: #c56f01 !important; + color: #c56f01 !important; } + +/* line 127, ../sass/_global.scss */ .sep { color: rgba(255, 255, 255, 0.2); } @@ -403,27 +471,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 +495,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 +541,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; } @@ -979,7 +1043,7 @@ span { display: inline-block; font-size: 1rem; vertical-align: middle; } - /* line 200, ../sass/_mixins.scss */ + /* line 225, ../sass/_mixins.scss */ .invoke-menu:hover { color: #33ccff; } @@ -991,7 +1055,7 @@ span { /* line 70, ../sass/_icons.scss */ .icon-buttons-main .invoke-menu { color: #666666; } - /* line 200, ../sass/_mixins.scss */ + /* line 225, ../sass/_mixins.scss */ .icon-buttons-main .invoke-menu:hover { color: #999999; } @@ -1280,7 +1344,7 @@ span { cursor: pointer; } /*********************************** STYLE STYLES */ -/* line 31, ../sass/controls/_buttons.scss */ +/* line 30, ../sass/controls/_buttons.scss */ .s-btn, .s-icon-btn { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1290,9 +1354,8 @@ span { box-sizing: border-box; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; line-height: 1.2em; - padding: 0 10px; text-decoration: none; } - /* line 39, ../sass/controls/_buttons.scss */ + /* line 36, ../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=='); background-size: 100%; @@ -1313,7 +1376,7 @@ span { border-top: 1px solid #666666; color: #999; display: inline-block; } - /* line 103, ../sass/_mixins.scss */ + /* line 128, ../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=='); background-size: 100%; @@ -1321,34 +1384,102 @@ span { background-image: -moz-linear-gradient(#666666, #595959); background-image: -webkit-linear-gradient(#666666, #595959); background-image: linear-gradient(#666666, #595959); } + /* line 38, ../sass/controls/_buttons.scss */ + .s-btn.s-very-subtle.paused, .s-very-subtle.paused.s-icon-btn { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y4OGMwMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2RlN2QwMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f88c01), color-stop(100%, #de7d01)); + background-image: -moz-linear-gradient(#f88c01, #de7d01); + background-image: -webkit-linear-gradient(#f88c01, #de7d01); + background-image: linear-gradient(#f88c01, #de7d01); + -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 #fea32e; + color: #fff; + display: inline-block; } + /* line 128, ../sass/_mixins.scss */ + .s-btn.s-very-subtle.paused:hover, .s-very-subtle.paused.s-icon-btn:hover { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlYTMyZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fea32e), color-stop(100%, #fe9815)); + background-image: -moz-linear-gradient(#fea32e, #fe9815); + background-image: -webkit-linear-gradient(#fea32e, #fe9815); + background-image: linear-gradient(#fea32e, #fe9815); } + /* line 40, ../sass/controls/_buttons.scss */ + .s-btn.s-very-subtle.paused .icon:before, .s-very-subtle.paused.s-icon-btn .icon:before { + content: "\0000EF"; } -/* line 44, ../sass/controls/_buttons.scss */ +/* line 47, ../sass/controls/_buttons.scss */ .s-icon-btn { font-size: 1.2em; } - /* line 47, ../sass/controls/_buttons.scss */ + /* line 50, ../sass/controls/_buttons.scss */ .s-icon-btn .icon { color: #0099cc; } - /* line 51, ../sass/controls/_buttons.scss */ - .s-icon-btn:not(.disabled):hover .icon { + /* line 54, ../sass/controls/_buttons.scss */ + .s-icon-btn.paused .icon { + color: #fff; } + /* line 62, ../sass/controls/_buttons.scss */ + .s-icon-btn:not(.disabled):not(.paused):hover .icon { color: #33ccff; } - /* line 55, ../sass/controls/_buttons.scss */ + /* line 69, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled { - padding: 0 5px; } - /* line 57, ../sass/controls/_buttons.scss */ + padding: 0 3.75px; } + /* line 71, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled .icon { font-size: 1.5em; } - /* line 60, ../sass/controls/_buttons.scss */ + /* line 74, ../sass/controls/_buttons.scss */ .s-icon-btn.labeled .title-label { margin-left: 5px; } + /* line 80, ../sass/controls/_buttons.scss */ + .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 83, ../sass/controls/_buttons.scss */ + .s-icon-btn.pause-play .icon:before { + content: "\0000F1"; } + /* line 89, ../sass/controls/_buttons.scss */ + .s-icon-btn.show-thumbs .icon:before { + content: "\000039"; } /*********************************** LAYOUT STYLES */ -/* line 68, ../sass/controls/_buttons.scss */ +/* line 96, ../sass/controls/_buttons.scss */ span.l-btn, span.l-btn span, a.l-btn, a.l-btn span { display: inline-block; } +/* line 103, ../sass/controls/_buttons.scss */ +.l-btn { + padding: 0 7.5px; } + /* line 105, ../sass/controls/_buttons.scss */ + .l-btn.sm { + padding: 0 5px; } + /* line 108, ../sass/controls/_buttons.scss */ + .l-btn.vsm { + padding: 0 2.5px; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -1577,7 +1708,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #ccf2ff; } - /* line 156, ../sass/_mixins.scss */ + /* line 181, ../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%; @@ -1613,7 +1744,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#4dd2ff, #00ace6); background-image: linear-gradient(#4dd2ff, #00ace6); color: #ccf2ff; } - /* line 156, ../sass/_mixins.scss */ + /* line 181, ../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%; @@ -1651,7 +1782,7 @@ a.l-btn span { border-top: 1px solid #999999; color: #cccccc; display: inline-block; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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%; @@ -1680,7 +1811,7 @@ a.l-btn span { border-top: 1px solid #666666; color: #b3b3b3; display: inline-block; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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%; @@ -1730,10 +1861,21 @@ a.l-btn span { padding-left: 0; } /* line 202, ../sass/controls/_controls.scss */ +.l-local-controls { + position: absolute; + top: 5px; + right: 5px; + z-index: 5; } + +/* line 211, ../sass/controls/_controls.scss */ +.s-local-controls { + font-size: 0.7rem; } + +/* line 215, ../sass/controls/_controls.scss */ .btn-set { display: inline-block; position: relative; } - /* line 206, ../sass/controls/_controls.scss */ + /* line 219, ../sass/controls/_controls.scss */ .btn-set .btn, .btn-set .t-btn { -moz-border-radius: 0; @@ -1741,7 +1883,7 @@ a.l-btn span { border-radius: 0; border-left: 1px solid #666666; margin-left: 0; } - /* line 211, ../sass/controls/_controls.scss */ + /* line 224, ../sass/controls/_controls.scss */ .btn-set .btn:first-child, .btn-set .t-btn:first-child { border-left: none; @@ -1751,7 +1893,7 @@ a.l-btn span { -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; } - /* line 215, ../sass/controls/_controls.scss */ + /* line 228, ../sass/controls/_controls.scss */ .btn-set .btn:last-child, .btn-set .t-btn:last-child { -moz-border-radius-topright: 3px; @@ -1761,7 +1903,7 @@ a.l-btn span { -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; } -/* line 221, ../sass/controls/_controls.scss */ +/* line 234, ../sass/controls/_controls.scss */ .object-browse-bar .btn, .object-browse-bar .t-btn, .top-bar .buttons-main .btn, @@ -1772,7 +1914,7 @@ a.l-btn span { font-size: 11.25px; height: 25px; line-height: 25px; } - /* line 232, ../sass/controls/_controls.scss */ + /* line 245, ../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 +1924,7 @@ a.l-btn span { font-size: 150%; vertical-align: middle; } -/* line 240, ../sass/controls/_controls.scss */ +/* line 253, ../sass/controls/_controls.scss */ label.checkbox.custom { cursor: pointer; display: inline-block; @@ -1791,13 +1933,13 @@ label.checkbox.custom { padding-left: 19px; position: relative; vertical-align: top; } - /* line 251, ../sass/controls/_controls.scss */ + /* line 264, ../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 269, ../sass/controls/_controls.scss */ label.checkbox.custom em:before { -moz-border-radius: 2.25px; -webkit-border-radius: 2.25px; @@ -1816,51 +1958,51 @@ label.checkbox.custom { top: 0; position: absolute; text-align: center; } - /* line 274, ../sass/controls/_controls.scss */ + /* line 287, ../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 293, ../sass/controls/_controls.scss */ label.checkbox.custom.no-text em { overflow: hidden; } - /* line 284, ../sass/controls/_controls.scss */ + /* line 297, ../sass/controls/_controls.scss */ label.checkbox.custom input { display: none; } - /* line 286, ../sass/controls/_controls.scss */ + /* line 299, ../sass/controls/_controls.scss */ label.checkbox.custom input:checked ~ em:before { background: #0099cc; color: #ccf2ff; content: "2"; } -/* line 294, ../sass/controls/_controls.scss */ +/* line 307, ../sass/controls/_controls.scss */ .input-labeled { margin-left: 5px; } - /* line 296, ../sass/controls/_controls.scss */ + /* line 309, ../sass/controls/_controls.scss */ .input-labeled label { display: inline-block; margin-right: 3px; } - /* line 300, ../sass/controls/_controls.scss */ + /* line 313, ../sass/controls/_controls.scss */ .input-labeled.inline { display: inline-block; } - /* line 303, ../sass/controls/_controls.scss */ + /* line 316, ../sass/controls/_controls.scss */ .input-labeled:first-child { margin-left: 0; } -/* line 308, ../sass/controls/_controls.scss */ +/* line 321, ../sass/controls/_controls.scss */ .btn-menu label.checkbox.custom { margin-left: 5px; } -/* line 313, ../sass/controls/_controls.scss */ +/* line 326, ../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 332, ../sass/controls/_controls.scss */ .btn-menu { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -1883,7 +2025,7 @@ label.checkbox.custom { display: inline-block; height: 20px; line-height: 20px; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -1891,42 +2033,42 @@ label.checkbox.custom { 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 */ + /* line 339, ../sass/controls/_controls.scss */ .btn-menu.dropdown { padding-left: 10px; padding-right: 10px; } - /* line 332, ../sass/controls/_controls.scss */ + /* line 345, ../sass/controls/_controls.scss */ .btn-menu:not(.disabled):hover { color: #cccccc; } - /* line 336, ../sass/controls/_controls.scss */ + /* line 349, ../sass/controls/_controls.scss */ .btn-menu.btn-invoke-menu { color: #0099cc; padding: 0 5px; } - /* line 340, ../sass/controls/_controls.scss */ + /* line 353, ../sass/controls/_controls.scss */ .btn-menu.btn-invoke-menu:hover { color: deepskyblue; } - /* line 350, ../sass/controls/_controls.scss */ + /* line 363, ../sass/controls/_controls.scss */ .btn-menu .type-icon { margin-right: 5px; } - /* line 353, ../sass/controls/_controls.scss */ + /* line 366, ../sass/controls/_controls.scss */ .btn-menu .menu { position: absolute; left: 0; text-align: left; } - /* line 358, ../sass/controls/_controls.scss */ + /* line 371, ../sass/controls/_controls.scss */ .btn-menu .menu .ui-symbol.icon { width: 12px; } -/* line 364, ../sass/controls/_controls.scss */ +/* line 377, ../sass/controls/_controls.scss */ .top-bar .btn-menu { height: 25px; line-height: 25px; padding-right: 10px; } - /* line 372, ../sass/controls/_controls.scss */ + /* line 385, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn { margin-right: 5px; padding-left: 25px; } - /* line 375, ../sass/controls/_controls.scss */ + /* line 388, ../sass/controls/_controls.scss */ .top-bar .btn-menu.browse-btn .badge { -moz-border-radius: 4.5px; -webkit-border-radius: 4.5px; @@ -1943,30 +2085,30 @@ label.checkbox.custom { height: auto; } /******************************************************** OBJECT-HEADER */ -/* line 392, ../sass/controls/_controls.scss */ +/* line 405, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 395, ../sass/controls/_controls.scss */ + /* line 408, ../sass/controls/_controls.scss */ .object-header .title { color: white; } - /* line 398, ../sass/controls/_controls.scss */ + /* line 411, ../sass/controls/_controls.scss */ .object-header .type-icon { font-size: 1.5em; margin-right: 5px; vertical-align: middle; } -/* line 407, ../sass/controls/_controls.scss */ +/* line 420, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 409, ../sass/controls/_controls.scss */ + /* line 422, ../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 */ +/* line 430, ../sass/controls/_controls.scss */ .view-controls .view-type { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1978,20 +2120,20 @@ label.checkbox.custom { line-height: 20px; padding-left: 5px; padding-right: 5px; } - /* line 428, ../sass/controls/_controls.scss */ + /* line 441, ../sass/controls/_controls.scss */ .view-controls .view-type.cur { background: #666666; } -/* line 433, ../sass/controls/_controls.scss */ +/* line 446, ../sass/controls/_controls.scss */ .edit-mode .top-bar .control-set.edit-view-controls { margin-right: 50px; } /******************************************************** SLIDERS */ -/* line 439, ../sass/controls/_controls.scss */ +/* line 452, ../sass/controls/_controls.scss */ .wrapper-slider { position: relative; } -/* line 447, ../sass/controls/_controls.scss */ +/* line 460, ../sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2013,7 +2155,7 @@ label.checkbox.custom { bottom: 10%; left: 0; z-index: 0; } - /* line 459, ../sass/controls/_controls.scss */ + /* line 472, ../sass/controls/_controls.scss */ .slider .slot .range { background: rgba(0, 153, 204, 0.3); cursor: ew-resize; @@ -2025,10 +2167,10 @@ label.checkbox.custom { height: auto; width: auto; z-index: 1; } - /* line 470, ../sass/controls/_controls.scss */ + /* line 483, ../sass/controls/_controls.scss */ .slider .slot .range:hover { background: rgba(0, 153, 204, 0.5); } -/* line 475, ../sass/controls/_controls.scss */ +/* line 488, ../sass/controls/_controls.scss */ .slider .knob { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2060,7 +2202,7 @@ label.checkbox.custom { bottom: 0; left: auto; z-index: 2; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2068,7 +2210,7 @@ label.checkbox.custom { 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 */ + /* line 145, ../sass/_mixins.scss */ .slider .knob:before { content: ''; display: block; @@ -2079,23 +2221,23 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 166, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } - /* line 487, ../sass/controls/_controls.scss */ + /* line 500, ../sass/controls/_controls.scss */ .slider .knob.knob-l { margin-left: -6px; } - /* line 488, ../sass/controls/_controls.scss */ + /* line 501, ../sass/controls/_controls.scss */ .slider .knob.knob-r { margin-right: -6px; } - /* line 489, ../sass/controls/_controls.scss */ + /* line 502, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 45%; } /******************************************************** BROWSER ELEMENTS */ -/* line 501, ../sass/controls/_controls.scss */ +/* line 514, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2112,7 +2254,7 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 507, ../sass/controls/_controls.scss */ +/* line 520, ../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%; @@ -2130,7 +2272,7 @@ label.checkbox.custom { -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px; border-top: 1px solid gray; } - /* line 514, ../sass/controls/_controls.scss */ + /* line 527, ../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 +2281,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 532, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } @@ -2235,7 +2377,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 208, ../sass/_mixins.scss */ + /* line 233, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2497,6 +2639,171 @@ label.checkbox.custom { .l-time-controller .knob.knob-r .range-value { left: 14px; } +/* 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; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2769,22 +3076,22 @@ input[type="date"] { input[type="text"].error, input[type="date"].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 */ + /* 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 */ + /* 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 */ + /* 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 */ + /* 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; @@ -2841,7 +3148,7 @@ input[type="date"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 148, ../sass/_mixins.scss */ + /* line 173, ../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-size: 100%; @@ -3771,106 +4078,170 @@ 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 */ -.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; +/* line 24, ../sass/helpers/_bubbles.scss */ +.l-bubble-wrapper { position: absolute; z-index: 70; } - /* line 32, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble { - display: inline-block; - max-width: 250px; + /* line 27, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-bubble { padding: 5px 10px; } - /* line 36, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble:before { + /* line 29, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-bubble .l-btn.close { + padding: 0 2px; + position: absolute; + right: 5px; + top: 5px; } + /* line 36, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .arw { + position: absolute; } + /* line 38, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .arw.arw-up { + bottom: 100%; } + /* line 42, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .arw.arw-down { + top: 100%; } + /* line 47, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble { + display: inline-block; + max-width: 250px; } + /* line 51, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble:before { content: ""; position: absolute; width: 0; height: 0; } - /* line 42, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table { + /* line 57, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table { width: 100%; } - /* line 45, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td { + /* line 60, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td { padding: 2px 0; vertical-align: top; } - /* line 52, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td.label { + /* line 67, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td.label { padding-right: 10px; white-space: nowrap; } - /* line 56, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td.value { + /* line 71, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td.value { white-space: nowrap; } - /* line 60, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble table tr td.align-wrap { + /* line 75, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble table tr td.align-wrap { white-space: normal; } - /* line 66, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper .l-infobubble .title { + /* line 81, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper .l-infobubble .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 5px; } - /* line 73, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-left { - margin-left: 10px; } - /* line 75, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-left .l-infobubble::before { + /* line 88, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper.arw-left { + margin-left: 20px; } + /* line 90, ../sass/helpers/_bubbles.scss */ + .l-bubble-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 */ - .l-infobubble-wrapper.arw-right { - margin-right: 10px; } - /* line 85, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-right .l-infobubble::before { + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-right: 10px solid #ddd; } + /* line 96, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper.arw-right { + margin-right: 20px; } + /* line 98, ../sass/helpers/_bubbles.scss */ + .l-bubble-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 */ - .l-infobubble-wrapper.arw-top .l-infobubble::before { - top: 10px; } - /* line 100, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-btm .l-infobubble::before { - bottom: 10px; } + width: 0; + height: 0; + border-top: 6.66667px solid transparent; + border-bottom: 6.66667px solid transparent; + border-left: 10px solid #ddd; } /* line 105, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-down { - margin-bottom: 10px; } - /* line 107, ../sass/helpers/_bubbles.scss */ - .l-infobubble-wrapper.arw-down .l-infobubble::before { - left: 50%; - top: 100%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 7.5px solid #ddd; } + .l-bubble-wrapper.arw-top .l-infobubble::before { + top: 20px; } + /* line 111, ../sass/helpers/_bubbles.scss */ + .l-bubble-wrapper.arw-btm .l-infobubble::before { + bottom: 20px; } -/* line 120, ../sass/helpers/_bubbles.scss */ -.s-infobubble { +/* line 121, ../sass/helpers/_bubbles.scss */ +.l-thumbsbubble-wrapper { + position: absolute; + left: 10px; + right: 10px; + height: 183px; + width: auto; } + /* line 128, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper .l-thumbsbubble { + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + width: auto; + height: auto; } + /* line 130, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper .l-thumbsbubble .l-image-thumbs-wrapper { + height: auto; + top: 5px !important; + right: 25px; + bottom: 5px !important; + left: 5px; } + /* line 135, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper .arw { + z-index: 2; } + /* line 140, ../sass/helpers/_bubbles.scss */ + .l-thumbsbubble-wrapper.arw-up .arw.arw-down, .l-thumbsbubble-wrapper.arw-down .arw.arw-up { + display: none; } + +/* line 150, ../sass/helpers/_bubbles.scss */ +.s-bubble { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; + -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; } + +/* line 156, ../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 159, ../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 163, ../sass/helpers/_bubbles.scss */ +.s-infobubble { background: #ddd; color: #666; font-size: 0.8rem; } - /* line 126, ../sass/helpers/_bubbles.scss */ + /* line 168, ../sass/helpers/_bubbles.scss */ .s-infobubble .title { color: #333333; font-weight: bold; } - /* line 131, ../sass/helpers/_bubbles.scss */ + /* line 173, ../sass/helpers/_bubbles.scss */ .s-infobubble tr td { border-top: 1px solid #c4c4c4; font-size: 0.9em; } - /* line 135, ../sass/helpers/_bubbles.scss */ + /* line 177, ../sass/helpers/_bubbles.scss */ .s-infobubble tr:first-child td { border-top: none; } - /* line 139, ../sass/helpers/_bubbles.scss */ + /* line 181, ../sass/helpers/_bubbles.scss */ .s-infobubble .value { color: #333333; } +/* line 186, ../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 +4292,7 @@ input[type="date"] { right: 0; width: auto; height: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 145, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -3932,7 +4303,7 @@ input[type="date"] { top: 2px; left: 5px; right: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 166, ../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 +4321,7 @@ input[type="date"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 120, ../sass/_mixins.scss */ + /* line 145, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -3961,7 +4332,7 @@ input[type="date"] { left: 2px; bottom: 5px; top: 5px; } - /* line 141, ../sass/_mixins.scss */ + /* line 166, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index d39b47ef87..90e1957f25 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -86,7 +86,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 208, ../sass/_mixins.scss */ + /* line 233, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index bf781e614b96301d24eab919599f4d9f837a127b..0d7e45d06d68d1ff88b65b3c9209f299945b3af5 100644 GIT binary patch delta 1375 zcmah}Z%kWN6hHUg_g??OeFSQ(jd6*7=m$w?NaqJ**e5@b7*mH?q8K9WW+wPS9-jAvuds@G zHU7&3#g70;H|i(*hr=VAEj4Zc)`r}J)8X?YTU)?zzZ31+(`PS5x$Dal0Q^IM;=cz6 z!V%%?ce~J*K{O5`p*cc-#j{q_%La!pjK^(8SV3YAasBMM{_sWVovY|T3E=zT@c0Pa zfmhMigu3&M@bJJFPWla={T+iiJaX>*h0znEe*jceq5UxslmrfqZ5-A1nGXB~28R0p ze)z=s(ayZJytT%~m<4q$P>_> zi`lcdF$;Y(hw~0*R1TyxD=EleW|V*&z(E@4DsbY;D6O+{mVibO%cCCzT)x)%@RjsnTlSHL0A#vN^Kt;zNsQ)pndVN}M}ocb^s4eJ!OYEIpgPEdB7l6SZI7U&q@Hgm z)s$iP&{7ZfQaAD6C4188sp&L%X`r1L?bhlVrSd&iI+Koi#9$mI;1awAZ^I;{2qlaUR@c`0 URr##+igzD5C7toQ*{ucm7i~;aq5uE@ delta 766 zcmY*XUr19?82`>W_uk#zdv{IKav(Bot|d~sO2UFP{6`NdW>GZErRE5yE0-D>QV?26 zXxE1sA|_H|Jq-3x#vV+nM=2SVp=mMF2a6a9KG@c`p+x8KJKy*Fedm1VeCM2=>b?r0 zZ#TfIrC-SB0^O6#{e@S%e2zl^mUjS>IJwVuvmyN#06Bxaw$9~n zUr*MW0hkrF&y9{&cQgtN=Z|AtY;3xA(MWFG1>mPJUBKDks23_v%wlXFk?%x7S4O|! z+GONrr_0mPMV>$p3NH}urj|NK(O>~4<2ju0(&gxI!x)^x7#r`8OkWEo}AY1qdaKFW;M+ hYm1M0vBv>|zmUe?K}D7t*J7N(Iqln?UCfm^`xjCS$Tk1~ 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" /> + + + + + + + Z6-^WW^sv{^n)aANau&eurK<7#F)AnGQ~7oyP3)SFdm-w#$?$S^YT0Q zoZq?UoO{o?dAGZ6bw_{zKn}bQ3|{Hzc(v=+&4;4^yM4&o_qV^;0iOYnb|u=5mwW0w z9|Vi<0gyhl4+X~k6B})HWdN)lxz)q|V-uU3m|QMYiKVb&Kx-!@Sl+0JB0X2)yw2gD%~WY0uwaV7L$9 zrwfj=k5=k9yFk3!fVwjv?IlIzhIEizBpFF2QA)E?l!k2?0Gfdzn#J`o=2Z?PJ1fag z;hmK}+Cc+JTx-CAno;Uz#Ugdu_#+&DVEaknpVxICaPKHfZNM`#C^pr z^LlC%+>pZ#z-S>h{s1@3UkZ@YKCamgn^_}`J^!E)`gUc{t z_}s8;NEtH5J^1w*PZ&QnE*Vof<$O+6&ZV3iB8XPeC3-}k*ekvvekm@Cf0>F+jiwRP zjA4vI9_vo-Df@r@KARY@@Ps=6QPD^(WTwoB#gc^ea3DW3EI#J&|yiS;y#BV?cj10L7eF2n7U5yK4axx|Nr{%Q) zQb@vaZv_df)vm`U<^DkuDHxR3(ofvL1UvBtPoLN9%xC3vxV5LJRjzL9?rtM1^5Q_6 zglTr0Y3-4#iEmJzODlg0?8rQJM8JPgAwaIfx`S6*(#SQHYF+qxXsH|DQXlbLB|DPI z*|{WnDcDJjHcM@tGWh`uolnYluO{baXV-ndR@!WpHYFz_j^pyElg5$YnDHY%d68xi z9(j(06~xlc2aE)y)$&+L7^YwvPQp9zF3doJP{KH0ZGF8*mCs0*-9=c%CtGANZBa+#4>aWp@~@}4f9QxBb<&LW@K1_^d%A9 zhzTMFVq*Oe_M;E>!^Hkd%7_e0gHipE5Xta|ymm4r;_}>c&hy;+aL$QWFI02^0RSsp z2L@FhPfbO9)YuQ;e1~j$SxKn}?tp~#DAx89CwIAT_%as($Qi8b8v;h~YBFyDU@qi7 zHW_WfwKa4C=P>G)rsgXb(#W;D0OAo2{$h-8pY+)JL2PHvJR z${c)%Ugif_=JpuQ^=DVC^eDYZ!*qf!FeeMK9yWp}CRl_$LP!V;lcFxxh#g{B{2*qZhdK0q}|AS^O z69jGFh;!x}a>VqSZ^1ynv)+?cD@(tj=zN&h+(}@qq#JOMidl sSL!__QtSB1h?iHoB1us~2@}hA78JPG@7)00o|{3=@}k@wERa3@8+vHGD*ylh diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff index c028a58cffb499ec586ad2eccfaddae58c96ab46..6d4330ac6232249c14925d9e3528e33d41886556 100644 GIT binary patch delta 6889 zcmZu$Wl&sA(_P$`gy0r}YtY~l+!F}ywpeg?Zg30kp5X58EChD~!DVqmaMy32s`uwN zQ)lM(=`%BZtL8`7^ds+r0O0XiMh1icf;aL75YB%y6Xd_~|7$Wb>dJ6k2i!;gAGX&Y zEo7ynW#FG#aQiJBRG>Hz>Sr}}E)WQz0B*~}VH{vid1hv3;s^pEuE2R}IABjg>@=1p zE&!Y)PlAik|HI1*2+7jc%K`*K9s+>~bU`4>TjcNS-d5%&@SqSl;2It{cu}iEG_Bwy zock|WDmZA-WD$3)>|8zJ+$r2XgwNjzu|a#b4rXv2GMoaz_XG{OC;A85nRvp_MF<9g z01zddqym+LH0(|6%t0VhTDYSX1VWN1p+anSbZ~J6fyg%Cng%#7o%EcJJeSOjA;!kW z5J%RhU@McZIv zIf5u)N{;;(9*pOb##H-PL~;CqvwCjveoYlt9)&4S3{M|0R#Y69{2MuwnF zQ#MvMr5<;26>*q%Fa6wYZniuXmRMK4i^X1DuRM%lKR_3UQ=HNHOu-_)S6eEz(?*^6 z;q-zA`xHuw>sj#Zyww&!a^K-FjBGzXa10bKzw(-4T0e=?;3@qBiC@{;n6U8qN=IkV zY{~KSxTSuf6V|GD{>GyvK5Hr73x8iE$fL0*sg`zaTqbtt{a3l!OvRbC@r0@A)aP~b zM*|v<)b1rg1(u0y!rrn#Ww)`d8Grvk?hGY+>r0YN{dFW*FUzBw+yEfBwY`T>6Hq8C+3I(QzT;#Pp!>jSLNUIY4W$s-jLc)ZvVbK z8e4gU&cNzCLICRztcPUw1)n~F68|F60f@|q9}zVXA&Ab1S%@Qu*GQB|+DJu6T}UfP zE6AwGg2)!gMaUy4AQVxQP?R#15mZc63DiK;D%2%3LNr=5T{LgB9&}W6F7yO+C9;O0j3g#siAr>tb1S<(^1ZxHB7+VqckG z)zHtK?g^^ty-uxf53(w2Rmnw_GwDX8XcYW!e0 zjz2G-zT_rh(KOz$4jIKKjNDezL+XrbgeKzHoyi_Hl9)bG`R%$mrUHyJ42>lGS%S|_ z&N19D$uuq2bgH2|J^bx2Dy+uKkOMOL>HvgP&rCR|}H51;=SY+jMxk!Dv5xzVoUGuQJ*jdavg&Kv6I z_M0oNr1EeKRBE?M%5 z*S{OoI4WH{dMRm|cG1@nn>z_QLaB)HyQK&Ro52mMgG*TpDdI0bMX$SWu&cPUx1e>? zhy&$X)zB!d-Y1mDjAyzJpJQ$|y3VtDIHk$555xTWXz#JsBmn@NcrZDf-jbU26Zl4z z4R!Wa&hPq5Co=3&&mUj^19_O_Zk|WrT?E~lkP5ws&-E0p`$^H;<3-7@Xd|}Lj7Ic; zs@u?koD^Dz(n%qfiI6Q)NDj#Sozy{QX(LR3!ZBn_6dC8C#h^~>$qLy+M2g@sSdy^* zJ|f|Ga7Iy~5^y)-pxxU`CeXT#LX0g8=;mQxCt|!=tVA#h=_V$Wk8MUh7pBxZC>Zot zBV9>F64F()3kmTGn5SS5rqNe`Ur+Y63N%$`*)In&BIIf>LzMTR3T0YDVfXJ{H;3hy z`15*ty88zaZw?Mp2m`JdA2lKe+6y6xVYf4Iu1;C;=_Uy#E2#?H0uzEHF0U88`iX!=py;mBGv`zM8# zTDsb%zkUTlL^Z*JN`J)LrlS?}6-}@x&KuD6jH8G>U`uL#L>C!SM)_djftuI6v*xFV zvmK%D3xQFob1^5a?$thQ-`H#niXQAXB8wisn%fj!3gWpY>C4x=an?{Y(O$hVEvM^&l9Gt*38Oa~$J6uTp{+(6AgDhd3i|IN|X0*2qH|C)^> z(PIGelKos!U1l|o_2O2QD(bR>*>DN%5=QdtJdY7#{yD-q^is-Y68ObwkfK!J0-!B+ z0w(Y>T{5H-cijm_rlDCX_)e6Twt?LzNCpNXPhZ#7F3Y`xt0H`a1h3uWW*M$egw6(@ zpBP}kVH!tmz8NgIpd(_NMVKhOB~Ov&bRa2W5uumkEf%5!Xjd7(77TrRHvm~N=f29I zFj@{Gsed#lxiSCFR^;`|{NCqk>uGxez~u8wZeR27fi!0xo{yP9LoS)LXkmfZ(9>^g z4{~oAw&XWJn?2M+8LW;pg4xF-Ebzo<8Ocx;{MUBWNNr!(@RXFI?) zdiDX9x{|*OvW2wb@^EH_QCjUZ!#s4&)bVyNo8H@4>!9Z2`O%sj>-+v25T*YIWC`46 zFk7$HX&&W3^>G9epexQi=GUqmoi*fQ+j73din5zz83Tm|C!Nm%V(EM({3RNyOQqp5 zQG<+nS%^ByvNyhW&b~7&mK$1@!{L0eYKdj;$*HH8yZgVxwF=W6Zu-2Ebi3uR*QXIR zc7$9a5_KRI7>Jj#%A9qrwb}jvs?NXYg051w!!-Q`=WF)D4J)6t?QiyKzexUCBJi!EKr+0gW+wmBYnp8KB^J^18Jo>Rm(u&jj z10sJ9EIGBCJffq6{F;fKt^1{r(a-PR+pE`*ONN-V;QHJfK`=-XxP&o6%y zQj}eqW^j{?ks>sjlq$*qYip7AtDHZE?Uv<*g>`L>jcv|reJ+MRc0;~eKh}9And#G> ze=VH;y$&sE(%zaP@kxCf-t8Cn-6l)4vh=6lz#p{KYTd?1W3h=dX$;CO3~7R|8=6M=)jboe_CC@tqbuOj|UDaZ8>zl+MGng)~kWLuNlrZXukK9hQWw zbdaVwwq|nSZ6_pGq>)l7bkdbM5qQtdkvS2B0YM;0@wD6iRNeuJu#JA{-!(w|lQLCJ z^nRt@7~$DPzS}(j(C@9KTd7Xy|JsKtGY2U~%B$jvJB!EtDc`W%B;uKDFvZ} zj6}ix?`P4Df0L+b3Ze6R+hBT@8P*ewAhhC2+TD)tR@v^&o7*(FxxZ&~Z4Qfsd5a%z z&yMew4}I-4=4MTr9lSNJc#NK!?!*NBA7w9^7|zDR+Nkuwz!se;)GRa`!1Py7cvKvQ&R1>KE^+>le$OhJw!S$wdK%J=Mv|?PIMBA?G*N zmgHnOs{P1vEVp@QbYQ`u&D;$S-*ks6ZlNyc+btVCK+nkD4#kY6^k1Id5uHC8>p$mP zzp={O$20z={VH|nlQYa4P@I5yryJq3V!o~Wwnz)o)3XOOvUKD0R4!du`ivAFTLLH zllxE(SlOpliCwMGM=iYK&SI)!VJbz+rk~%a13KCLyo35gf;4^#oc@XbeY)k?g{one zMP06j9d_=NiX1hVkmU`cVU#B9+just6x7PKEzdsc)<-PJ!{b)x^QFU2So)FtmR*X;|tX64^QT_WPObm$=Iw##IGE>!JMa|QJ@D85%hJ9N+(UE~@1;DD2ZpCR}G z5FS3Cf7tf&&Z2yo(gI%u{(4*R=!zhaygkeOMF?%84I-a&qfW7Mt~A2cc;?{h-5FD0 z%{^Hw@yMs!X^7=ex>LV2ro_f%vLmZ=U1->x?Pn(Q5?|403t|za&)tw`SCn24B)_63 zuROFQh@y`eFg@I-i=}3LI9se3jEbHEXpY-_`iJ8Cj;+i5YwB$V7jw#HRHja@?t^}Q z!M%g1lMsyE4~D(C4h_ZAe8PTvaNrz`+1psBdMR1m%=3!%%3E=Yo#E)p;G7Z`b7$et zNd2B{3TYVp?K3JmELHB6+vjl~QT@Bo^`|D?}zl$ z7k2M|>a+C;h8}y_Etrm0SKEr zS0$)nJ5mCssVVLO2czPkN~Cy63Jueb)7leab>F2!%39~W0w>-Q$B$%T$l4T_FMvR)Vbijb=6k4B0Jj#YUvITTB1 zW1mjM9S&>R6&?rxHB+%v=EUlbb>M+K*oJhB>m309fGrz|Rj>teawd z?f)D=Co>`P0WJr)?^>Sq4IC{WjA`!NhBEV?0vWcRGX{Wn7G(RBknkW|(zFBL(5f6C z-DQ3Gk*G}69nwU>TanhBDWdaG*I3R@{23GQiloO>_HDNKi+DHfpV*nIeA&&Psm-n) z#W2B~$7(?j@FKS^5Q}{5%8AJDrvj~e>-cPS+wFW`zc0CXIgIvWR8L11i`U#7rEXw8 z!Kjsf7xPZ{ehSG^i`SKaaCZ>+B1E`c$LqB1%{~H9-q2@yku~@%R%)++g~P9iX|1FL z^ow#-bt39)(m2SE1&fSa4##e|issZ)Ej)G`M1GA()^v;j{6P~L$+f$w2JIeNv1br> zi_d{at8?QOJYI*{xZs5ii*2OuiG(f$RziHIs?D$MO$#~{;z)SP&zyLiz_qUS#md)9 z9ux0QbfY4PMc6R++t&RGJ8G;Z->(RQ3{*0xDp zFq0r=8V4G_)D{nYr{&c;jh?DNb`ibcGPb(hJRt-mc`DlpsDG#|vC`Gj&~tLqn|u7X zy!XO7tw!-9clnyOm5u*SFMB25l_|G4Vfj`mrCyPEMh$Y(@Zg(9Q0jl9Y)GrDlo56Z zc#E-jVU(-qR_ruv;|q+l_M7p(Gj4}aSYX57R6PG8*hz-zh^C=X74u}MW@Nc49Jnci z2|oa!%eLNcZrX?mF>a_xon7b;-v?wQN@chOMW)ltdzcjhjFaC*&G?Izt-aahsM?7r z5m!6JTV`sB&U>>+J;eXdCc7`tRi~zu3Ee#VGl0xcG(9>iUf`F_Ehwf^9>z6)#+xoq zpecgWzrE(;0OM<}B{}0Aki={cQZ9#epO6ED`-a_JLL3!|!CD_s;@8KZ@*JOnF2lf- z8-h<~Z#{A#b^A)&(tPYWM(ytR86Rj94f9`+anPUqE-OB_4uwhkk7roh{4vcBeNKFK zp^6zB6v5z<(y0Cv^4vbl1#>4^c#6>L{HT#PjHQl7T8T#&Ys=)iNM5KB2=mx!<%|S= zlQagur3KgRm?~DyYUvTU>KcTER3I=_BN0A&+BW8Y$KPSe_wV@0Y*`~?lXyrd>MyI| zU;8ogB6&L2K4ur2u#6P#xJKuDQb@bomgeRneQwk5DOg5I3Ms$FY#p73RcY(lTC^o` z=~gsl19OOe5!pVfHbU}Mg$gdiBAYOW^U7-fzY4{;^?E zsxEnlV`R5+6L_I$^ZwKSXuS5XJGzEUZ#qw#wm9B(G?IF7-9&&Xw!8k0V?f(~hEIio z=>IOZ4VW*1MK63*)EQps=Vn z&Yl(y+XP8l+sv&IW2s!iA4lJeWk>}~(+`*vIHmuD>My-JCylv(DbWvGq;CA6 zO)pcfU2!!Ew9{Y3BosG9 zJ#);0KiG&~&9;W<@0CnYFWN4do2BVlIqZ|+qc*W54YP94Y0tPz1K|QtZQbYysjl3M zI1!~xXJC=tW~^Ar^l<-^L_y%P!*~~6p>Ipt`PbGZpZYVyblw3+i~Zvp5i?T!R^@mz zTP2m&3G?qr(T5J`d?u9Cs|woFy2?*;Y;1EJq|OH@?w{V5#WIxZ9iaF=-MfK@=#t`Z z*-*1sYueu)$3}T(Xm=$5_EdhZG(utvsfyRXTB7u!`AzZqF?+`2%69e?P@b;wrIzJE zxzAmTsh+vndYXX`tpVKAgWJSzKO(h+>aLp1uH_PzoyI6Nl$t5UnfZGDCiwL7|A_aZ zQE5EsLNH=&*1aAU7{4%G8&P22hKbf7K4ogDcF+n}d&R&)gf-m&srZ8s_2Phq=;*{> z#|P4*(Zm)>v+>TM;sHZGVF!ALJ}fHyhb~{)JEubT8(=lmeVA?y&0vqIQqH01X{=7Z z;p8p?H`b1@G1Hsa-_?Oz^7p2C>=jg6s9zm@o;a9g_%7*dVJ1n%k}@IuDQdU-{Ugo5rR~ z)fy8`GrHHlrg^P(y>?ZxSEM;B>IGG5?3;YE2COp|Mvf%DJtr`N9rt)u~+|L ztHx49>8*kyl9NIDv`Ekaq5zm0+C2OK07@a!S3$z!vn|b;wX3BE0DwA<&Y^jDCl2TBPb(#72xsYCm(sn-7>`&F#e)iMBC7bO$` zfB&n5(zEQzduTmXUg|8jzE^Wr{# zF4{m!hB>!^GQ=QmA~Zm9BPPfH1d*25Ru?YA$eHbUt6HOrb$VY&ik{#$PX6&=Rxf=={s;clbf zz}pM;8SVKC_$^)Hloxxs{jaz7z)8$raTvZNFWU93>!6gAS0T)fCw7tUWgj2h<$_C; zJ+!GHlhGGU@xkMWQE6w;F{OUdf%N77Yp^m=g$Mcp6rNY@1P?5&y>pt?64Zdqz-LY5 zQ{kzRVHS*J48(p<$`DU{n4!rZl!niy#|kR_PNFagSR~4-M8U zHlg0&>{R_gn0;W9Qea}~@=y+Bc`(joDAi;zEPE*GsNZk+q1`xXa`Fz}0docjLAkcw zOi{}?ODNbmt6)V1E5~$2 zvi<6s5J=Dxz7n9=Rv`6Yz4<~-{kt1T-@?u>#Et%?k%^HRj?x`rC5r+k7&QY=*&z8D zjTwS+hf09TgvyU9gX)Buf!d9FgvNsAgBFVhN3LmfY;*y1AM_0LQ4Ao44n_b*2F5%l z5vC^QN6b>pEzAonRxD+#c&uq`0Ja5oBK9oy0}cs}5RMj33Qi5q8tzM68{973E!+z{ zempC@3_Lhq8xR+{Sb%SVCcs!A90-{P-r;-USKyE0Z{c4M00_tk6bZ}-%>H|vVTL## zwRKxNS6f`&CW{@Xwpbe8PqH|AWfi+l77iTCQMK0S&XQ$(a2RB%!vPJ>BBlx2Ec5c$ zSR+5VjJm%9$0LI4Bk?p8-`e~1Qph?6mhOq5RxVMcPQ3c-@0LVnv(x@J8{$1C`R{)8 z$3tiJtFd+3mYD2Keo?C3Z4vB@x9uOc8^o9C!3rV{*t*T_Yc*dcbkIK6*p&X_nfUfm z76J}#_}sBPK0AA+8(yO_tm#g|U&q<|M^QDrW?E*nab_y8f|RDrJ!XaWLkSgw<6>-y zW$teoq_gQYheeS-T7R5#g1)_HEi$-O(HIif^K)e z=a1=%scFPsgr-LYUQAz-w<#UDNQoE0a{VA4!_cb}BagZY1`{;;v|781L(Y29^407{ zuAyaVlh7=u4Fw^|0(~Z1u9h%H6ZWNg)jx-Uh2%+iWu&~a+>abv7ZBI0%_3D6As(Y? z2~QRD=|s8Cf>k1}N4Jfnq8FLuJXYR4x6Vu)9^C3^e#+2>dD1$DChulfQRjMVW3k7d z7oq|uDiZeWeHhH`6j$cpYtjb}rh)TR#S`Xd+z1i1 zl7wV$K4DR%XY3F$C}dkitti$v`KfzeZS>byPs|A#M2Tb2N0zjJTaT|-v?4OAtDSiv z9&3OyYVP_M>klM>`rqkG=;`s#NZOOR!&YkWY=S7aiinDW(l1w{WKy`7A;^xvpsk!zC+=(z?1#%nx(zq4eA;SYDrmmzA-gdqC!?YafyC4=}VV z?)jG*ZR_1Qh|wXQsW%3BbCYso>N)Smni^^xQ(MH(2o{zHk89qFS+&1wm3hWH*yBWq zm#%B2bU2fM7a&sM2tsBX!Z3wdroZHSIFa3be_-qU#^4Put0_M% zT+t1OZ`W)DyHbvGxDM?-y1+zup1%UUL_JpuB9lPCeuykRtEzhai$)FVUlm|5_@7wb zt$HODpLWjozBLM%yY%c~{`~iGw^To!M?m)7cUcYd zyj+qzV@O}{fVn8OFzPPBP$?&#rf%lEPn}j3HhD&W){D9)MTnH9Zo~S*vjikc>VCgu z+zW?b`(UqZ(Acdkl-)S<_D$d*sAVI~I4OAN`R(XNu0qo;sGhxNpEac`Y~eHSfyHty z@sl66fG;s(`TdDibP$mQ)udpd?_46e;o~{ z8-OSyhz8+IS$~MJ^D74JP=0*3ig=TWYGd(v@ugeFe$#g2HmKQdHX`mI3=f0PM0!d$ zaVpK;d&~tprt6DpWeyit4lnm#B@h{Rx8>X|ADo=?m*t>ZjF@q4uof-6|GZF&Q%TP* zA$EUZ<}PuwmL<*X%c%oyy4Ue!BhTG_n>u9TgOdVu(H8pmXj0Ygr%dbq-BY!B{szf=Cdmid5_RTTc7>Z+4?{I;Uh(Kwa#2nC4#|jl3MECV-%8KZFPWF9 z7Wa1(7yimH#JTbXgH~PRIzQp?i3?CWM)o@X1k_i-224d=T-1dt*Az18h~u_Zj|5iQ^u|_)h*r+svtEobkRu3+L^XZhF@y>rXXu{tC?;WnZ5QpUN@g|SLE zcAgdO+CZv`^*hrcH2+P92|gsUO2p_=jZv&6~&lh0O+sRIin5YgWQ>`yCt4O-4^UNmW(hDz|Bn#Q@2JCr;KS-#uuK?7ZXM zMhX7G%h;qNA#CwMnJx{fPr&sGMt-N4_SD*(cEJ?CjK6=d>AX4q=l2Lv!1@9E06WSi zwsDQVr?%{lO!4hb$)c&!KAmd^KZD(!_c!6K6olM+l7V&p=T%}F#=6&>^QT{RbtR`> zEHvJ|ey#CjGjS3sbxFsCoj$?~rH|kFaw9V8eSy)CTm`QuBQ+dAiRrVJjg1uI+TpD8 zGmeo+bBnPzPy#DTZB9Zoq23OUNd|MNDBK2EheqX&o-+aleKN002kg`Lci@gwa0}C` zJs6|sJzZY%7%aiXgil^Uy&GjzlNSV{r%(Cbti#WuuA3rUFRb_?+cjZ>wjx1_*Y_#y zM$~)phl^_-)nZSb#VoMZzR2{ENqH6sYwfPt%3LLT=Uj%ocCJw7yL`YIUS1MeWc$1 zbIJdcHN#fQ0y7!%0pMpNgMn>nASvRpU6+C-R-PJ?YrHj3khi-nTO775#LJ8AZ?s3A zHjoxz`WG~txb`~S6CcPppYzd#zF%v6I0ZFnJWhx$wkgVA`tkd39ck6zoqbn3d9aRu zRdZEgA%Otgq5Tiy`1`cswa~7MUf9tub9v1_8eNYEplDA>U7-u#%l^xgKxK{LsuBEMGu8uZa=qj|G)P~+4)tam$7MBc|VrE#ZA{9Zu=G6OFfqc*4C zbM&BG^QGsf>z!jZCtWc&b)}tRuHmkvw8`U)!4(sj_0Qwq_E6zQSABb_Pb)EHtmhG~ zwdv0;7Fae1S)C^RS=TY}!~1YHr=$3~dtPvH?q}HWk<*p?$^OET`%%7I#p3i-{eW;Q zM;Wa%(U>IE54UKVP26`4LsA=07KbJjcC}T1+Ad{fwAQrrWoo#(Qz`fR>-_;jiS3$x z^M{a0b@IeF4&Vz?5V3t@VMWYNXxr<Bo5cPr?C*^3dO$m0fo#jhQP)aTJfi`2_Wrrsu@>=*;b$`xJOu^VGr((K)Fj@K7NkCIue) z=<)lhj^T*t>ly2v6)C%;`C@U(^3#)pg{e7nUCOiI6}M_>%>#zKSdM}(D*wj!^5R~J z`wj0;K&(wA<2_NDjfCPu*8I{D4@GYNIE&jNogE5)W!tS=iD@Y{c@D=>RfIligrjWC zVG{`^a0js%+z+ij*YV#81nyqJi;KbagF$BbeGtlFCbUsZAcG<)ejB zdZu};yuR8Jbo*uK2u5BT$N(%&Wu8g{tPm1ekh>^{BEi`fGj~MYRg_ugF4qLNMxG|n zl#Ox(E@xIr!Gl|+USOdv=+_$g&2hGb)Gr$KYkbWGY3SF8_d;2YHVWR~5^30hn0WL? zFPlqetMr`X%HuYB)Z_GyKrrq-;WK831bkNaIVGNtrBn=&Mqg~OrIYb6ii$9NY-PP~ zAfC|m06*{F?OeLLT)JCds_AazWDPA($XhlqJNkVm>fresaJZF*+-gX)A1^h`{k zno3!Je}9N{ah?pRB*xHBf8V@S(qJ<4$DiN)jtqkQj^;(&f1C^5Nsbm-8byy-^is5L zGA^Y&$<7MWW5sxwR^~&YdmfmZ^C}H7H_bWpTJlG~`$v~{j|-*4ucExRZSIKMAygp^ z0U_?E4?Qs)uhrk38POvi2Qs>S|GqK5GllTO{BMs7XlW$+88C6ON|8`Dw#rn%@IKO*JPEU(8A&Z{Yv$up%KP@4 zw!cxNok+N_^{T8W5f^Wbpf%#8M;NhkM@2V9u%A$Lap(nv>+a_N715$ zZV#tNZw4nqlgK@u`|mpIg5T^*8eYMEe(N(eRKjbrwL|c~o=q|rE#ASthd2d|ney`B z1>xddS|`k?cQ*~YzH0Hq*@a-9vcwotZ3PdoW#tHgy0OJ@*r6a!Z5y4WKb&t#LU)7I z9fY$*{oN76nFo^PX{Vav1ac>TtK3JSnnvU`Dc z_Z4#{b)$(|$6Z?g;|^;}r3mr#2E!HVl*H{MW`VlMIKy*3V8NVA^W)$C zqN#y>{Ny%iqAjc_Vt4!R%5d61NKBdv5bv&9yG6m3wo}PQrkdHCg!Oul%u>yD#b7<7 zpv|N@f};rkKIlkv{bog+oH~Y3+bCXlgp)mUL3>8eWLd8<;P#|PI^kA_>}6NeBaRE6 z-_t+E6O`8IG2LIT5Ep_WL!$62a>Jh$G=z2v(JSCM;Y3BDte6EzYq)S5<{@cT#m@8= zP;^M7+m=7S%TJkdI3qema4jBi5sq2^krzj1v{YwPXQ3=*(i!f;2?y*6<`5j#pfiyk z`iKR&Qru7^#D!|5I(>9%(`TCWbmFUdd;r3tXJ#SB_&PLul z^m@G5pbu+*>bB?H&_=lgxs` zH!^Lz_s47RqO@_`2G`$uOogj)L<~HN<5H6uJEqbFQ@5yJF$e|;u1^6S(_Xm@)CN11 zKio(tS<*Yp^gBbDrE?5iIT#i0FPih*$_8n^YZ-S#T8ju*v{KDE6E{8vKA zhp*r9U&8p$o2ok5Q(P|$Rq?s1939I(zY*jTPYO%RJlu4Xn1WH7oyt`u4bZK~{rF{6 z8e1cW{@0G!t3Rr;d8>d{KAxwRC6*ED5xanKb-Yo&z9fvD7P2@$zJavTMT@d+qmrGDh3t?3wC+<&Y!5O^2B2|SLAd#^a!`9l~M_Q7!8 zx1_FC*dV^#i~%~pLz1}VaD-11S#s!DKL41d0SVr8VLEFcu;SRbJd0iJj}b}8Dc>sQ zHy*q~@yfN(>cImF@o{qe{PPZ_D=D!;f86ZVom{h=SG|V!+o}t-6bQKVOc=ml5Vadr?}xcy~W*p!)61SAG`cLwomP zXl{bb=98Q41r*%!*8J*cKPjlO(uOxJPEfc(RIs$zQ^0xC&5Tiy&x=kfcYurIcP6Cp z__cm&Mj{PtO|#ofIf9=Iea%)y8DCVv#|5L=`8llMwotUCJl_^j5>FVXU$*B0Gw--Y43oSL)e3QF~A( zU@;EX?nEUE3L6_tQZPY(v1}i$!&Waw2}gmb@W`V86xL7M>!u6&bl4b(-+(KN1q78? z`Giw6>GgINr0WkMn?=sATkHe9LyaDuSnm>s0zPZXWf7>b<+S=7!e%)NG&(C#py5C& zKBwVkoaAD)EZB>IzE$t&cRO6HmHv##?EMNUicrolJVB0gINBT?GE_M@7n z-CX$kRV&TDr=!r<3Ayb7mj^2mJb4|0P+sK*efxsaajz%BPJYTdRl9zt8?P kG%FlTA`2_zG{G(sGl|oJ1`UAy9*~&)^A#nUE5qdf0dF*G8~^|S diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 725c0c29b9..3903f3ca08 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -19,6 +19,10 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + +// Features +$enableImageryThumbs: false; // Set to true if historical imagery thumbnails are supported + // Margins, spacing, radii $bodyMargin: 10px; $interiorMargin: 5px; @@ -34,9 +38,12 @@ $colorBodyBg: #333; $colorBodyFg: #999; $colorFooterBg: #000; $colorKey: #0099cc; +$colorKeySelectedBg: #005177; $colorKeyFg: #fff; $colorAlt1: #ffc700; $colorAlert: #ff3c00; +$colorPausedBg: #c56f01; +$colorPausedFg: #fff; $colorCheck: $colorKey; $colorCreateBtn: $colorKey; $colorInteriorBorder: lighten($colorBodyBg, 10%); @@ -50,7 +57,12 @@ $colorLimitYellow: #9d7500; $colorLimitRed: #aa0000; $colorTelemFresh: #fff; $colorTelemStale: #888; -$styleTelemState: italic; +$styleTelemStale: italic; +$colorInfoBubbleFg: #666; +$colorInfoBubbleBg: #ddd; +$colorThumbsBubbleFg: lighten($colorBodyFg, 10%); +$colorThumbsBubbleBg: lighten($colorBodyBg, 10%); + // Ratios $ltGamma: 20%; @@ -124,3 +136,13 @@ $tickLblH: 15px; $tickLblW: 50px; $tickH: $ticksH - $tickLblVMargin - $tickLblH; $tickW: 1px; + +// Imagery +$imageMainControlBarH: 20px; +$imageThumbsD: 120px; +$imageThumbsWrapperH: $imageThumbsD * 1.4; +$imageThumbPad: 1px; + +// Bubbles +$bubbleArwSize: 10px; +$bubblePad: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index 40a1a24414..c90a035c82 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -44,7 +44,7 @@ a.disabled { } @include keyframes(pulse) { - 0% { opacity: 0.2; } + 0% { opacity: 0.5; } 100% { opacity: 1; } } @@ -57,5 +57,5 @@ a.disabled { } .pulse { - @include pulse(1000ms); + @include pulse(750ms); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 5a7293e4f2..0ada165ec9 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -117,6 +117,13 @@ span { display: none !important; } +.paused { + &:not(.s-btn) { + border-color: $colorPausedBg !important; + color: $colorPausedBg !important; + } +} + .sep { color: rgba(#fff, 0.2); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 3c4fe84514..34e6cfba58 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -46,6 +46,7 @@ @import "controls/lists"; @import "controls/menus"; @import "controls/time-controller"; +@import "features/imagery"; @import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 3a99d6115c..107726e992 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -62,6 +62,31 @@ border-right: $size/$ratio solid transparent; } +@mixin triangle($dir: "left", $size: 5px, $ratio: 1, $color: red) { + //$size: $size*2; + width: 0; + height: 0; + $slopedB: $size/$ratio solid transparent; + $straightB: $size solid $color; + @if $dir == "up" { + border-left: $slopedB; + border-right: $slopedB; + border-bottom: $straightB; + } @else if $dir == "right" { + border-top: $slopedB; + border-bottom: $slopedB; + border-left: $straightB; + } @else if $dir == "down" { + border-left: $slopedB; + border-right: $slopedB; + border-top: $straightB; + } @else { + border-top: $slopedB; + border-bottom: $slopedB; + border-right: $straightB; + } +} + @mixin bgDiagonalStripes($c: yellow, $a: 0.1, $d: 40px) { @include background-image(linear-gradient(-45deg, rgba($c, $a) 25%, transparent 25%, diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index abbe655810..f8328dcdb5 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -19,25 +19,28 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -$pad: $interiorMargin * 2; +$pad: $interiorMargin * 1.5; /*********************************** TYPE STYLES */ .t-btn { cursor: pointer; } - /*********************************** STYLE STYLES */ .s-btn { - $base: lighten($colorBodyBg, 20%); @include border-radius($controlCr); @include box-sizing(border-box); @include text-shadow(rgba(black, 0.3) 0 1px 1px); line-height: 1.2em; - padding: 0 $pad; text-decoration: none; &.s-very-subtle { @include containerSubtle($colorBodyBg, $colorBodyFg, true); + &.paused { + @include containerSubtle($colorPausedBg, $colorPausedFg, true); + .icon:before { + content:"\0000EF"; + } + } } } @@ -47,9 +50,20 @@ $pad: $interiorMargin * 2; .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,8 +75,22 @@ $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.l-btn, @@ -70,4 +98,14 @@ span.l-btn span, a.l-btn, a.l-btn span { display: inline-block; +} + +.l-btn { + padding: 0 $pad; + &.sm { + padding: 0 $interiorMargin; + } + &.vsm { + padding: 0 $interiorMargin/2; + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 86544886f5..81c022b6ab 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -199,6 +199,19 @@ } } +.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; 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..e69de29bb2 diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index 61980cf554..0dad9e115b 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -21,18 +21,33 @@ *****************************************************************************/ //************************************************* LAYOUT -$infoBubbleFg: #666; -$infoBubbleBg: #ddd; - -.l-infobubble-wrapper { - $arwSize: 5px; - @include box-shadow(rgba(black, 0.4) 0 1px 5px); +.l-bubble-wrapper { position: absolute; z-index: 70; + .l-bubble { + padding: $bubblePad $bubblePad*2; + .l-btn.close { + padding: 0 2px; + position: absolute; + right: $interiorMargin; + top: $interiorMargin; + } + } + .arw { + position: absolute; + &.arw-up { + bottom: 100%; + + } + &.arw-down { + top: 100%; + } + } + .l-infobubble { display: inline-block; max-width: 250px; - padding: 5px 10px; + //padding: 5px 10px; &:before { content:""; position: absolute; @@ -71,57 +86,84 @@ $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; } } &.arw-down { - margin-bottom: $arwSize*2; - .l-infobubble::before { - left: 50%; - top: 100%; - margin-left: -1 * $arwSize; - border-left: $arwSize solid transparent; - border-right: $arwSize solid transparent; - border-top: ($arwSize * 1.5) solid $infoBubbleBg; + + } +} + +.l-thumbsbubble-wrapper { + $closeBtnD: 15px; + position: absolute; + left: $interiorMarginLg; + right: $interiorMarginLg; + height: $imageThumbsWrapperH + $bubblePad*2 + $interiorMargin; + width: auto; + .l-thumbsbubble { + @include absPosDefault(); + .l-image-thumbs-wrapper { + height: auto; + top: $bubblePad !important; right: $closeBtnD + ($interiorMargin*2); bottom: $bubblePad !important; left: $bubblePad; } } + .arw { + //left: 50%; + //margin-left: $bubbleArwSize / -2; + z-index: 2; + } + &.arw-up .arw.arw-down, + &.arw-down .arw.arw-up { display: none; } } //************************************************* LOOK AND FEEL -.s-infobubble { - $emFg: darken($infoBubbleFg, 20%); +.s-bubble-wrapper { + //@include box-shadow(rgba(black, 0.4) 0 1px 5px); +} + +.s-bubble { @include border-radius($basicCr); - background: $infoBubbleBg; - color: $infoBubbleFg; + @include box-shadow(rgba(black, 0.4) 0 1px 5px); +} + +.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($colorInfoBubbleFg, 20%); + background: $colorInfoBubbleBg; + color: $colorInfoBubbleFg; font-size: 0.8rem; .title { color: $emFg; @@ -129,7 +171,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 +181,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/plots.scss b/platform/commonUI/general/res/sass/plots.scss deleted file mode 100644 index bdcd774c5a..0000000000 --- a/platform/commonUI/general/res/sass/plots.scss +++ /dev/null @@ -1,30 +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. - *****************************************************************************/ -@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 diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 483bada8f0..7df73f3bd8 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -99,7 +99,7 @@ ul.tree { &.selected { $c: #fff; - background: #005177; + background: $colorKeySelectedBg; color: $c; .view-control { color: $colorItemTreeIcon; 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/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 1bb1de0e9c..d8ea7366b2 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -87,10 +87,10 @@ -
    + > + +
    + +
    + +
    +
    + + < + + + + I + +
    + + + +
    +
    +
    + + UTC + 16:03:43 + 2020/04/27 +
    +
    + + +
    +
    +
    + + + + +
    + + + +
    +
    +
    + x +
    +
    +
    +
    {{thumb.date}}
    +
    {{thumb.time}}
    +
    +
    +
    +
    +
    + + + \ No newline at end of file From 6e7203a49f941df9d0e546ba795a4f8af7922944 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 9 Jun 2015 16:59:17 -0700 Subject: [PATCH 64/74] [Merge] Cherrypick 2 from warp1220 WTD-1220 --- platform/commonUI/general/res/css/forms.css | 2 +- platform/commonUI/general/res/css/items.css | 4 +- .../general/res/css/theme-espresso.css | 86 +++++++-- platform/commonUI/general/res/css/tree.css | 2 +- platform/commonUI/general/res/sass/_main.scss | 1 + .../commonUI/general/res/sass/_mixins.scss | 16 ++ .../res/sass/features/_time-display.scss | 44 +++++ platform/features/static-markup/bundle.json | 21 -- .../features/static-markup/res/markup.html | 179 ------------------ 9 files changed, 133 insertions(+), 222 deletions(-) delete mode 100644 platform/features/static-markup/bundle.json delete mode 100644 platform/features/static-markup/res/markup.html diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 1f5ac947c5..9fe4b2fdcb 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -397,7 +397,7 @@ input[type="date"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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-size: 100%; diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 875fe8488f..1c57bbd7ae 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -119,7 +119,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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-size: 100%; @@ -210,7 +210,7 @@ background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #80dfff; } - /* line 181, ../sass/_mixins.scss */ + /* line 197, ../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-size: 100%; diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index ec08d1a95d..5654914aab 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1043,7 +1043,7 @@ span { display: inline-block; font-size: 1rem; vertical-align: middle; } - /* line 225, ../sass/_mixins.scss */ + /* line 241, ../sass/_mixins.scss */ .invoke-menu:hover { color: #33ccff; } @@ -1055,7 +1055,7 @@ span { /* line 70, ../sass/_icons.scss */ .icon-buttons-main .invoke-menu { color: #666666; } - /* line 225, ../sass/_mixins.scss */ + /* line 241, ../sass/_mixins.scss */ .icon-buttons-main .invoke-menu:hover { color: #999999; } @@ -1376,7 +1376,7 @@ span { border-top: 1px solid #666666; color: #999; display: inline-block; } - /* line 128, ../sass/_mixins.scss */ + /* line 144, ../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=='); background-size: 100%; @@ -1405,7 +1405,7 @@ span { border-top: 1px solid #fea32e; color: #fff; display: inline-block; } - /* line 128, ../sass/_mixins.scss */ + /* line 144, ../sass/_mixins.scss */ .s-btn.s-very-subtle.paused:hover, .s-very-subtle.paused.s-icon-btn:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlYTMyZSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZlOTgxNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -1708,7 +1708,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#33ccff, #0099cc); background-image: linear-gradient(#33ccff, #0099cc); color: #ccf2ff; } - /* line 181, ../sass/_mixins.scss */ + /* line 197, ../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%; @@ -1744,7 +1744,7 @@ a.l-btn span { background-image: -webkit-linear-gradient(#4dd2ff, #00ace6); background-image: linear-gradient(#4dd2ff, #00ace6); color: #ccf2ff; } - /* line 181, ../sass/_mixins.scss */ + /* line 197, ../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%; @@ -1782,7 +1782,7 @@ a.l-btn span { border-top: 1px solid #999999; color: #cccccc; display: inline-block; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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%; @@ -1811,7 +1811,7 @@ a.l-btn span { border-top: 1px solid #666666; color: #b3b3b3; display: inline-block; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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%; @@ -2025,7 +2025,7 @@ label.checkbox.custom { display: inline-block; height: 20px; line-height: 20px; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2202,7 +2202,7 @@ label.checkbox.custom { bottom: 0; left: auto; z-index: 2; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2210,7 +2210,7 @@ label.checkbox.custom { background-image: -moz-linear-gradient(#666666, #4d4d4d); background-image: -webkit-linear-gradient(#666666, #4d4d4d); background-image: linear-gradient(#666666, #4d4d4d); } - /* line 145, ../sass/_mixins.scss */ + /* line 161, ../sass/_mixins.scss */ .slider .knob:before { content: ''; display: block; @@ -2221,7 +2221,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 166, ../sass/_mixins.scss */ + /* line 182, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } /* line 500, ../sass/controls/_controls.scss */ @@ -2377,7 +2377,7 @@ label.checkbox.custom { .menu-element .menu ul { margin: 0; padding: 0; } - /* line 233, ../sass/_mixins.scss */ + /* line 249, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2804,6 +2804,56 @@ label.checkbox.custom { .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 @@ -3148,7 +3198,7 @@ input[type="date"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 173, ../sass/_mixins.scss */ + /* line 189, ../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-size: 100%; @@ -4292,7 +4342,7 @@ input[type="date"] { right: 0; width: auto; height: 5px; } - /* line 145, ../sass/_mixins.scss */ + /* line 161, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { content: ''; display: block; @@ -4303,7 +4353,7 @@ input[type="date"] { top: 2px; left: 5px; right: 5px; } - /* line 166, ../sass/_mixins.scss */ + /* line 182, ../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 */ @@ -4321,7 +4371,7 @@ input[type="date"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 145, ../sass/_mixins.scss */ + /* line 161, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { content: ''; display: block; @@ -4332,7 +4382,7 @@ input[type="date"] { left: 2px; bottom: 5px; top: 5px; } - /* line 166, ../sass/_mixins.scss */ + /* line 182, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { border-color: rgba(0, 153, 204, 0.9); } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 90e1957f25..705bc6506d 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -86,7 +86,7 @@ ul.tree { margin: 0; padding: 0; } - /* line 233, ../sass/_mixins.scss */ + /* line 249, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 34e6cfba58..010d590669 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -47,6 +47,7 @@ @import "controls/menus"; @import "controls/time-controller"; @import "features/imagery"; +@import "features/time-display"; @import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 107726e992..414437d2d3 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -26,6 +26,16 @@ width: auto; height: auto; } +@mixin trans-prop-nice($props, $t) { + @if $t == 0 { + @include transition-property(none); + } @else { + @include transition-property($props); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); + } +} + @mixin trans-prop-nice-fade($t: 0.5s) { @if $t == 0 { @include transition-property(none); @@ -42,6 +52,12 @@ @include transition-timing-function(ease-in-out); } +@mixin trans-prop-nice-resize-w($t: 0.5s) { + @include transition-property(width, left, right); + @include transition-duration($t); + @include transition-timing-function(ease-in-out); +} + @mixin triangle-right($size, $color) { $size: $size/2; $ratio: 1; diff --git a/platform/commonUI/general/res/sass/features/_time-display.scss b/platform/commonUI/general/res/sass/features/_time-display.scss index e69de29bb2..483231a97f 100644 --- a/platform/commonUI/general/res/sass/features/_time-display.scss +++ 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/features/static-markup/bundle.json b/platform/features/static-markup/bundle.json deleted file mode 100644 index e474df4888..0000000000 --- a/platform/features/static-markup/bundle.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extensions": { - "types": [ - { - "key": "static.markup", - "name": "Static Markup", - "glyph": "\u0070", - "description": "Static markup sandbox", - "features": [ "creation" ] - } - ], - "views": [ - { - "templateUrl": "markup.html", - "name": "Static Markup", - "type": "static.markup", - "key": "static.markup" - } - ] - } -} \ No newline at end of file diff --git a/platform/features/static-markup/res/markup.html b/platform/features/static-markup/res/markup.html deleted file mode 100644 index 43292642f4..0000000000 --- a/platform/features/static-markup/res/markup.html +++ /dev/null @@ -1,179 +0,0 @@ - - -
    - -
    - -
    -
    - - < - - - - I - -
    - - - -
    -
    -
    - - UTC - 16:03:43 - 2020/04/27 -
    -
    - - -
    -
    -
    - - - - -
    - - - -
    -
    -
    - x -
    -
    -
    -
    {{thumb.date}}
    -
    {{thumb.time}}
    -
    -
    -
    -
    -
    - - - \ No newline at end of file From db0cd9cf3a802ef047e3e01b2cf709603122acb1 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 15 Jun 2015 16:15:26 -0700 Subject: [PATCH 65/74] [Clocks/Timers] Merge in latest CSS Merge in latest CSS from WARP-specific branch, WTD-1220. --- platform/commonUI/general/res/css/forms.css | 8 +- .../general/res/css/theme-espresso.css | 220 +++++++++--------- .../commonUI/general/res/sass/_constants.scss | 6 +- platform/commonUI/general/res/sass/_main.scss | 2 +- 4 files changed, 120 insertions(+), 116 deletions(-) diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index 9fe4b2fdcb..1d32f5125c 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -325,22 +325,22 @@ input[type="date"] { input[type="text"].error, input[type="date"].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 */ + /* 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 */ + /* 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 */ + /* 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 */ + /* 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; diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5654914aab..cfbaf533cd 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -84,7 +84,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -105,38 +105,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -2542,103 +2542,6 @@ label.checkbox.custom { right: 0; width: auto; } -/* line 1, ../sass/controls/_time-controller.scss */ -.l-time-controller { - position: relative; - margin: 10px 0; - min-width: 400px; } - /* line 12, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-inputs-holder, - .l-time-controller .l-time-range-slider { - font-size: 0.8em; } - /* line 17, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-inputs-holder, - .l-time-controller .l-time-range-slider-holder, - .l-time-controller .l-time-range-ticks-holder { - margin-bottom: 5px; - position: relative; } - /* line 24, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider, - .l-time-controller .l-time-range-ticks { - overflow: visible; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; } - /* line 30, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-inputs-holder { - height: 20px; } - /* line 34, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider, - .l-time-controller .l-time-range-ticks { - left: 90px; - right: 90px; } - /* line 40, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider-holder { - height: 30px; } - /* line 42, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider-holder .range-holder { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - background: none; - border: none; - height: 75%; } - /* line 50, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder { - height: 10px; } - /* line 52, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { - border-top: 1px solid #4d4d4d; } - /* line 54, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { - background-color: #4d4d4d; - border: none; - width: 1px; - margin-left: -1px; } - /* line 59, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child { - margin-left: 0; } - /* line 62, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { - color: gray; - font-size: 0.7em; - position: absolute; - margin-left: -25px; - text-align: center; - top: 10px; - width: 50px; - z-index: 2; } - /* line 76, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob { - width: 9px; } - /* line 78, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob .range-value { - position: absolute; - top: 50%; - margin-top: -7px; - white-space: nowrap; - width: 75px; } - /* line 87, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob:hover .range-value { - color: #0099cc; } - /* line 90, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob.knob-l { - margin-left: -4.5px; } - /* line 92, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob.knob-l .range-value { - text-align: right; - right: 14px; } - /* line 97, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob.knob-r { - margin-right: -4.5px; } - /* line 99, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob.knob-r .range-value { - left: 14px; } - /* line 1, ../sass/features/_imagery.scss */ .l-image-main-wrapper, .l-image-main, @@ -2854,6 +2757,103 @@ label.checkbox.custom { font-size: 0.9em; line-height: 1em; } +/* line 1, ../sass/controls/_time-controller.scss */ +.l-time-controller { + position: relative; + margin: 10px 0; + min-width: 400px; } + /* line 12, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder, + .l-time-controller .l-time-range-slider { + font-size: 0.8em; } + /* line 17, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder, + .l-time-controller .l-time-range-slider-holder, + .l-time-controller .l-time-range-ticks-holder { + margin-bottom: 5px; + position: relative; } + /* line 24, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider, + .l-time-controller .l-time-range-ticks { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; } + /* line 30, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder { + height: 20px; } + /* line 34, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider, + .l-time-controller .l-time-range-ticks { + left: 90px; + right: 90px; } + /* line 40, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider-holder { + height: 30px; } + /* line 42, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider-holder .range-holder { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + background: none; + border: none; + height: 75%; } + /* line 50, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder { + height: 10px; } + /* line 52, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { + border-top: 1px solid #4d4d4d; } + /* line 54, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { + background-color: #4d4d4d; + border: none; + width: 1px; + margin-left: -1px; } + /* line 59, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child { + margin-left: 0; } + /* line 62, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { + color: gray; + font-size: 0.7em; + position: absolute; + margin-left: -25px; + text-align: center; + top: 10px; + width: 50px; + z-index: 2; } + /* line 76, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob { + width: 9px; } + /* line 78, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob .range-value { + position: absolute; + top: 50%; + margin-top: -7px; + white-space: nowrap; + width: 75px; } + /* line 87, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob:hover .range-value { + color: #0099cc; } + /* line 90, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-l { + margin-left: -4.5px; } + /* line 92, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-l .range-value { + text-align: right; + right: 14px; } + /* line 97, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-r { + margin-right: -4.5px; } + /* line 99, ../sass/controls/_time-controller.scss */ + .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 @@ -3126,22 +3126,22 @@ input[type="date"] { input[type="text"].error, input[type="date"].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 */ + /* 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 */ + /* 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 */ + /* 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 */ + /* 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; diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 3903f3ca08..705141ab90 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -62,7 +62,11 @@ $colorInfoBubbleFg: #666; $colorInfoBubbleBg: #ddd; $colorThumbsBubbleFg: lighten($colorBodyFg, 10%); $colorThumbsBubbleBg: lighten($colorBodyBg, 10%); - +$colorLimitYellow: #9d7500; +$colorLimitRed: #aa0000; +$colorTelemFresh: #fff; +$colorTelemStale: #888; +$styleTelemState: italic; // Ratios $ltGamma: 20%; diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 010d590669..fac4ebb85c 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -45,9 +45,9 @@ @import "controls/controls"; @import "controls/lists"; @import "controls/menus"; -@import "controls/time-controller"; @import "features/imagery"; @import "features/time-display"; +@import "controls/time-controller"; @import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; From d614d7ee868c3ec13a4cd044b50adacb17464052 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 15 Jun 2015 17:43:52 -0700 Subject: [PATCH 66/74] [Frontend] Very minor tweaks to bring open into parity with lastest scss from ue-frontend WTD-1292 Tweaks prior to rebuild of ue-frontend branch; --- .../general/res/css/theme-espresso.css | 204 +++++++++--------- platform/commonUI/general/res/sass/_main.scss | 2 +- .../general/res/sass/controls/_buttons.scss | 10 - 3 files changed, 98 insertions(+), 118 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5e1f434a1b..900558efd9 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1737,16 +1737,6 @@ a.l-btn, a.l-btn span { display: inline-block; } -/* line 153, ../sass/controls/_buttons.scss */ -.l-btn { - padding: 0 7.5px; } - /* line 155, ../sass/controls/_buttons.scss */ - .l-btn.sm { - padding: 0 5px; } - /* line 158, ../sass/controls/_buttons.scss */ - .l-btn.vsm { - padding: 0 2.5px; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2641,6 +2631,103 @@ label.checkbox.custom { right: 0; width: auto; } +/* line 1, ../sass/controls/_time-controller.scss */ +.l-time-controller { + position: relative; + margin: 10px 0; + min-width: 400px; } + /* line 12, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder, + .l-time-controller .l-time-range-slider { + font-size: 0.8em; } + /* line 17, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder, + .l-time-controller .l-time-range-slider-holder, + .l-time-controller .l-time-range-ticks-holder { + margin-bottom: 5px; + position: relative; } + /* line 24, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider, + .l-time-controller .l-time-range-ticks { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; } + /* line 30, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder { + height: 20px; } + /* line 34, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider, + .l-time-controller .l-time-range-ticks { + left: 90px; + right: 90px; } + /* line 40, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider-holder { + height: 30px; } + /* line 42, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider-holder .range-holder { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + background: none; + border: none; + height: 75%; } + /* line 50, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder { + height: 10px; } + /* line 52, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { + border-top: 1px solid #4d4d4d; } + /* line 54, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { + background-color: #4d4d4d; + border: none; + width: 1px; + margin-left: -1px; } + /* line 59, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child { + margin-left: 0; } + /* line 62, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { + color: gray; + font-size: 0.7em; + position: absolute; + margin-left: -25px; + text-align: center; + top: 10px; + width: 50px; + z-index: 2; } + /* line 76, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob { + width: 9px; } + /* line 78, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob .range-value { + position: absolute; + top: 50%; + margin-top: -7px; + white-space: nowrap; + width: 75px; } + /* line 87, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob:hover .range-value { + color: #0099cc; } + /* line 90, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-l { + margin-left: -4.5px; } + /* line 92, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-l .range-value { + text-align: right; + right: 14px; } + /* line 97, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-r { + margin-right: -4.5px; } + /* line 99, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-r .range-value { + left: 14px; } + /* line 1, ../sass/features/_imagery.scss */ .l-image-main-wrapper, .l-image-main, @@ -2856,103 +2943,6 @@ label.checkbox.custom { font-size: 0.9em; line-height: 1em; } -/* line 1, ../sass/controls/_time-controller.scss */ -.l-time-controller { - position: relative; - margin: 10px 0; - min-width: 400px; } - /* line 12, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-inputs-holder, - .l-time-controller .l-time-range-slider { - font-size: 0.8em; } - /* line 17, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-inputs-holder, - .l-time-controller .l-time-range-slider-holder, - .l-time-controller .l-time-range-ticks-holder { - margin-bottom: 5px; - position: relative; } - /* line 24, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider, - .l-time-controller .l-time-range-ticks { - overflow: visible; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - width: auto; - height: auto; } - /* line 30, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-inputs-holder { - height: 20px; } - /* line 34, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider, - .l-time-controller .l-time-range-ticks { - left: 90px; - right: 90px; } - /* line 40, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider-holder { - height: 30px; } - /* line 42, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-slider-holder .range-holder { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - background: none; - border: none; - height: 75%; } - /* line 50, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder { - height: 10px; } - /* line 52, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { - border-top: 1px solid #4d4d4d; } - /* line 54, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { - background-color: #4d4d4d; - border: none; - width: 1px; - margin-left: -1px; } - /* line 59, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child { - margin-left: 0; } - /* line 62, ../sass/controls/_time-controller.scss */ - .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { - color: gray; - font-size: 0.7em; - position: absolute; - margin-left: -25px; - text-align: center; - top: 10px; - width: 50px; - z-index: 2; } - /* line 76, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob { - width: 9px; } - /* line 78, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob .range-value { - position: absolute; - top: 50%; - margin-top: -7px; - white-space: nowrap; - width: 75px; } - /* line 87, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob:hover .range-value { - color: #0099cc; } - /* line 90, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob.knob-l { - margin-left: -4.5px; } - /* line 92, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob.knob-l .range-value { - text-align: right; - right: 14px; } - /* line 97, ../sass/controls/_time-controller.scss */ - .l-time-controller .knob.knob-r { - margin-right: -4.5px; } - /* line 99, ../sass/controls/_time-controller.scss */ - .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 diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index fac4ebb85c..010d590669 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -45,9 +45,9 @@ @import "controls/controls"; @import "controls/lists"; @import "controls/menus"; +@import "controls/time-controller"; @import "features/imagery"; @import "features/time-display"; -@import "controls/time-controller"; @import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index d9d36b0b37..98ca1378e4 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -148,14 +148,4 @@ a.btn span, a.l-btn, a.l-btn span { display: inline-block; -} - -.l-btn { - padding: 0 $pad; - &.sm { - padding: 0 $interiorMargin; - } - &.vsm { - padding: 0 $interiorMargin/2; - } } \ No newline at end of file From a984e60ca5ca29c87b6318226fd5e890f078d0bf Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 16 Jun 2015 10:48:31 -0700 Subject: [PATCH 67/74] [Frontend] Mods to layout element editing handles WTD-951 In-progress checkin --- .../general/res/css/theme-espresso.css | 76 +++++++++++++++++-- platform/commonUI/general/res/sass/_main.scss | 1 + .../general/res/sass/edit/_editor.scss | 53 +++++++++++++ .../general/res/sass/user-environ/_frame.scss | 7 -- .../features/layout/res/templates/layout.html | 15 ++-- 5 files changed, 133 insertions(+), 19 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5e1f434a1b..dbc2ce6eac 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2641,6 +2641,75 @@ label.checkbox.custom { right: 0; width: auto; } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/* line 26, ../sass/edit/_editor.scss */ +.edit-main .edit-handle { + position: absolute; + top: 40px; + right: 40px; + bottom: 40px; + left: 40px; } + /* line 33, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-move { + cursor: move; + left: 30%; + right: 30%; + top: 30%; + bottom: 30%; } + /* line 42, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-n { + top: 0px; + bottom: auto; + height: 15px; + cursor: n-resize; } + /* line 47, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-e { + right: 0px; + left: auto; + width: 15px; + cursor: e-resize; } + /* line 52, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-s { + bottom: 0px; + top: auto; + height: 15px; + cursor: s-resize; } + /* line 57, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-w { + left: 0px; + right: auto; + width: 15px; + cursor: w-resize; } +/* line 66, ../sass/edit/_editor.scss */ +.edit-main .frame.child-frame.panel:hover { + border-color: #0099cc; + -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; } + /* line 69, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-handle { + background-color: rgba(0, 153, 204, 0.3); } + /* line 1, ../sass/features/_imagery.scss */ .l-image-main-wrapper, .l-image-main, @@ -4000,13 +4069,6 @@ input[type="text"] { .frame .view-switcher .name { display: none; } -/* line 73, ../sass/user-environ/_frame.scss */ -.edit-main .frame.child-frame.panel:hover { - border-color: #0099cc; - -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index fac4ebb85c..0091db24b6 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -45,6 +45,7 @@ @import "controls/controls"; @import "controls/lists"; @import "controls/menus"; +@import "edit/editor"; @import "features/imagery"; @import "features/time-display"; @import "controls/time-controller"; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 01a21c06b3..8b0895369b 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -19,3 +19,56 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + +.edit-main { + + + .edit-handle { + $edgeHandleD: 15px; + $cornerM: 50px; + //@include border-radius(0.5em); + //display: none; + position: absolute; + top: $cornerM; right: $cornerM; bottom: $cornerM; left: $cornerM; + &.edit-move { + $m: 30%; + cursor: move; + left: $m; + right: $m; + top: $m; + bottom: $m; + + } + &.edit-resize-n { + top: 0px; bottom: auto; + height: $edgeHandleD; + cursor: n-resize; + } + &.edit-resize-e { + right: 0px; left: auto; + width: $edgeHandleD; + cursor: e-resize; + } + &.edit-resize-s { + bottom: 0px; top: auto; + height: $edgeHandleD; + cursor: s-resize; + } + &.edit-resize-w { + left: 0px; right: auto; + width: $edgeHandleD; + cursor: w-resize; + } + } + + + .frame.child-frame.panel { + &:hover { + border-color: $colorKey; + @include boxShdwLarge(); + .edit-handle { + background-color: rgba($colorKey, 0.3); + } + } + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index caeb3157e4..f19da8b43a 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -68,10 +68,3 @@ } } } - -.edit-main .frame.child-frame.panel { - &:hover { - border-color: $colorKey; - @include boxShdwLarge(); - } -} diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html index 3a4f78f6e0..b44b1f9d28 100644 --- a/platform/features/layout/res/templates/layout.html +++ b/platform/features/layout/res/templates/layout.html @@ -34,29 +34,34 @@ - - - - - From 70e1a8ad9e05d58f179771d1db794f59edb5e21b Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 16 Jun 2015 12:40:48 -0700 Subject: [PATCH 68/74] [Frontend] Mods to layout element drag handles and editing behavior WTD-951 layout.html: Added classes to and removed inline styles from drag handles, Removed edge handles, leaving corner handles in NW, SW and SE only; Added hover classes to display corner handles while editing; Modified z-indexing to allow view switcher to be accessed while editing; --- .../general/res/css/theme-espresso.css | 85 ++++++++++++++----- .../general/res/sass/edit/_editor.scss | 58 ++++++++++--- .../general/res/sass/user-environ/_frame.scss | 1 + .../features/layout/res/templates/layout.html | 19 +++-- 4 files changed, 121 insertions(+), 42 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index dbc2ce6eac..99d09f4b70 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2663,52 +2663,92 @@ label.checkbox.custom { * 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; - top: 40px; - right: 40px; - bottom: 40px; - left: 40px; } - /* line 33, ../sass/edit/_editor.scss */ + 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: 30%; - right: 30%; - top: 30%; - bottom: 30%; } - /* line 42, ../sass/edit/_editor.scss */ + 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 47, ../sass/edit/_editor.scss */ + /* line 70, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-resize-e { right: 0px; left: auto; width: 15px; cursor: e-resize; } - /* line 52, ../sass/edit/_editor.scss */ + /* line 75, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-resize-s { bottom: 0px; top: auto; height: 15px; cursor: s-resize; } - /* line 57, ../sass/edit/_editor.scss */ + /* line 80, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-resize-w { left: 0px; right: auto; width: 15px; cursor: w-resize; } -/* line 66, ../sass/edit/_editor.scss */ +/* line 89, ../sass/edit/_editor.scss */ .edit-main .frame.child-frame.panel:hover { - border-color: #0099cc; -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; } - /* line 69, ../sass/edit/_editor.scss */ - .edit-main .frame.child-frame.panel:hover .edit-handle { - background-color: rgba(0, 153, 204, 0.3); } + 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, @@ -4061,11 +4101,12 @@ input[type="text"] { left: 5px; } /* line 54, ../sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { - opacity: 0; } -/* line 58, ../sass/user-environ/_frame.scss */ + opacity: 0; + z-index: 10; } +/* line 59, ../sass/user-environ/_frame.scss */ .frame.frame-template:hover .view-switcher { opacity: 1; } -/* line 66, ../sass/user-environ/_frame.scss */ +/* line 67, ../sass/user-environ/_frame.scss */ .frame .view-switcher .name { display: none; } diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 8b0895369b..b4a4920f56 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -21,42 +21,65 @@ *****************************************************************************/ .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 { - $edgeHandleD: 15px; - $cornerM: 50px; - //@include border-radius(0.5em); - //display: none; - position: absolute; - top: $cornerM; right: $cornerM; bottom: $cornerM; left: $cornerM; + top: $handleD; right: $handleD; bottom: $handleD; left: $handleD; &.edit-move { - $m: 30%; + $m: 0; //$handleD; cursor: move; left: $m; right: $m; top: $m; bottom: $m; + z-index: 1; } &.edit-resize-n { top: 0px; bottom: auto; - height: $edgeHandleD; + height: $handleD; cursor: n-resize; } &.edit-resize-e { right: 0px; left: auto; - width: $edgeHandleD; + width: $handleD; cursor: e-resize; } &.edit-resize-s { bottom: 0px; top: auto; - height: $edgeHandleD; + height: $handleD; cursor: s-resize; } &.edit-resize-w { left: 0px; right: auto; - width: $edgeHandleD; + width: $handleD; cursor: w-resize; } } @@ -64,10 +87,17 @@ .frame.child-frame.panel { &:hover { - border-color: $colorKey; @include boxShdwLarge(); - .edit-handle { - background-color: rgba($colorKey, 0.3); + border-color: $colorKey; + z-index: 2; + .view-switcher { + opacity: 1; + } + .edit-corner { + background-color: rgba($colorKey, 0.8); + &:hover { + background-color: rgba($colorKey, 1); + } } } } diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index f19da8b43a..a371459cc0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -54,6 +54,7 @@ .view-switcher { //display: none; opacity: 0; + z-index: 10; } &:hover .view-switcher { // Show the view switcher on frame hover diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html index b44b1f9d28..0a42ba30fe 100644 --- a/platform/features/layout/res/templates/layout.html +++ b/platform/features/layout/res/templates/layout.html @@ -34,13 +34,14 @@ + - + - - - - + - From a8488a92d9b1802342ed3f90ab911ddd59760429 Mon Sep 17 00:00:00 2001 From: Shivam Dave Date: Thu, 18 Jun 2015 10:54:51 -0700 Subject: [PATCH 69/74] [Gestures] Browse/Edit Composition Disallows drag and drop during browse mode, unless dragging and dropping into a folder view. Allows drag and drop into a layout view only in edit mode also. Can be unit tested now. WTD-11. --- .../src/gestures/DropGesture.js | 31 ++++++++++++------- .../test/gestures/DropGestureSpec.js | 21 +++++++++++-- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index 3ff94ba974..3cfcae1b87 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,26 @@ 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); + }); + } + } else { + // Informs user that drag and drop is not allowed. + // window.alert("Cannot drag and drop objects during browse mode."); } - } // 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..466073098e 100644 --- a/platform/representation/test/gestures/DropGestureSpec.js +++ b/platform/representation/test/gestures/DropGestureSpec.js @@ -132,15 +132,32 @@ define( expect(mockEvent.dataTransfer.dropEffect).toBeDefined(); }); - it("invokes compose on drop", function () { + it("invokes compose on drop in browse", function () { callbacks.dragover(mockEvent); expect(mockAction.getActions).toHaveBeenCalledWith({ key: 'compose', selectedObject: mockDraggedObject }); callbacks.drop(mockEvent); - expect(mockCompose.perform).toHaveBeenCalled(); + mockDomainObject.useCapability('browse'); + var mockDomainObjectType = mockDomainObject.getModel().type; +// if (mockDomainObjectType === 'folder' || mockDomainObject.hasCapability('editor') { + expect((mockCompose.perform)).toHaveBeenCalled(); +// } }); + +// it("invokes compose on drop in edit", function () { +// callbacks.dragover(mockEvent); +// expect(mockAction.getActions).toHaveBeenCalledWith({ +// key: 'compose', +// selectedObject: mockDraggedObject +// }); +// callbacks.drop(mockEvent); +// mockDomainObject.useCapability('editor'); +// if (mockDomainObjectType === 'folder' || mockDomainObject.hasCapability('editor') { +// expect((mockCompose.perform)).toHaveBeenCalled(); +// } +// }); it("broadcasts drop position", function () { From 9e52ddaee709fea4555b1fa3be9bb4ac779d86e6 Mon Sep 17 00:00:00 2001 From: Sarah Hale Date: Thu, 18 Jun 2015 14:26:54 -0700 Subject: [PATCH 70/74] [Browse composition] Added and modified tests Added additional tests to account for the different cases of edit mode and folder vs non folder. Issue 11. --- .../test/gestures/DropGestureSpec.js | 67 ++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/platform/representation/test/gestures/DropGestureSpec.js b/platform/representation/test/gestures/DropGestureSpec.js index 466073098e..88154a9cdf 100644 --- a/platform/representation/test/gestures/DropGestureSpec.js +++ b/platform/representation/test/gestures/DropGestureSpec.js @@ -131,7 +131,8 @@ define( expect(mockEvent.preventDefault).toHaveBeenCalled(); expect(mockEvent.dataTransfer.dropEffect).toBeDefined(); }); - + +/* it("invokes compose on drop in browse", function () { callbacks.dragover(mockEvent); expect(mockAction.getActions).toHaveBeenCalledWith({ @@ -145,6 +146,7 @@ define( expect((mockCompose.perform)).toHaveBeenCalled(); // } }); +*/ // it("invokes compose on drop in edit", function () { // callbacks.dragover(mockEvent); @@ -158,9 +160,70 @@ define( // expect((mockCompose.perform)).toHaveBeenCalled(); // } // }); + + 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', + selectedObject: mockDraggedObject + }); + 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'}); + callbacks.dragover(mockEvent); + expect(mockAction.getActions).toHaveBeenCalledWith({ + key: 'compose', + selectedObject: mockDraggedObject + }); + callbacks.drop(mockEvent); + expect(mockCompose.perform).toHaveBeenCalled(); + }); + + /* + it("does not invoke compose on drop in browse mode for non-folders", function () { + if (mockDomainObject.hasCapability('editor') === false && !(domainObject.getModel().type === 'folder')) { + callbacks.dragover(mockEvent); + expect(mockAction.getActions).toHaveBeenCalledWith({ + key: 'compose', + selectedObject: mockDraggedObject + }); + callbacks.drop(mockEvent); + expect(mockCompose.perform).not.toHaveBeenCalled(); + } + }); + */ - it("broadcasts drop position", function () { + 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; From 451842fb82c8161847f98e3b3053c68d2eabc4ac Mon Sep 17 00:00:00 2001 From: Sarah Hale Date: Thu, 18 Jun 2015 14:29:46 -0700 Subject: [PATCH 71/74] [Browse composition] Cleanup Removed commented out code in tests. Issue 11. --- .../src/gestures/DropGesture.js | 1 + .../test/gestures/DropGestureSpec.js | 43 ------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index 3cfcae1b87..e4f1154262 100644 --- a/platform/representation/src/gestures/DropGesture.js +++ b/platform/representation/src/gestures/DropGesture.js @@ -112,6 +112,7 @@ define( // Informs user that drag and drop is not allowed. // window.alert("Cannot drag and drop objects during browse mode."); } + } // 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 88154a9cdf..6481eefa32 100644 --- a/platform/representation/test/gestures/DropGestureSpec.js +++ b/platform/representation/test/gestures/DropGestureSpec.js @@ -132,35 +132,6 @@ define( expect(mockEvent.dataTransfer.dropEffect).toBeDefined(); }); -/* - it("invokes compose on drop in browse", function () { - callbacks.dragover(mockEvent); - expect(mockAction.getActions).toHaveBeenCalledWith({ - key: 'compose', - selectedObject: mockDraggedObject - }); - callbacks.drop(mockEvent); - mockDomainObject.useCapability('browse'); - var mockDomainObjectType = mockDomainObject.getModel().type; -// if (mockDomainObjectType === 'folder' || mockDomainObject.hasCapability('editor') { - expect((mockCompose.perform)).toHaveBeenCalled(); -// } - }); -*/ - -// it("invokes compose on drop in edit", function () { -// callbacks.dragover(mockEvent); -// expect(mockAction.getActions).toHaveBeenCalledWith({ -// key: 'compose', -// selectedObject: mockDraggedObject -// }); -// callbacks.drop(mockEvent); -// mockDomainObject.useCapability('editor'); -// if (mockDomainObjectType === 'folder' || mockDomainObject.hasCapability('editor') { -// expect((mockCompose.perform)).toHaveBeenCalled(); -// } -// }); - it("invokes compose on drop in edit mode", function () { // Set the mockDomainObject to have the editor capability mockDomainObject.hasCapability.andReturn(true); @@ -206,20 +177,6 @@ define( expect(mockCompose.perform).toHaveBeenCalled(); }); - /* - it("does not invoke compose on drop in browse mode for non-folders", function () { - if (mockDomainObject.hasCapability('editor') === false && !(domainObject.getModel().type === 'folder')) { - callbacks.dragover(mockEvent); - expect(mockAction.getActions).toHaveBeenCalledWith({ - key: 'compose', - selectedObject: mockDraggedObject - }); - callbacks.drop(mockEvent); - expect(mockCompose.perform).not.toHaveBeenCalled(); - } - }); - */ - it("broadcasts drop position (in edit mode)", function () { // Set the mockDomainObject to have the editor capability mockDomainObject.hasCapability.andReturn(true); From 1f3c1da8c796b785902448f7c9f934ba5146f47b Mon Sep 17 00:00:00 2001 From: Sarah Hale Date: Thu, 18 Jun 2015 14:53:35 -0700 Subject: [PATCH 72/74] [Browse composition] Alert user When the user attempts a disallowed drag and drop composition, the browser will alert them to this. Issue 11. --- platform/representation/src/gestures/DropGesture.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index e4f1154262..b2414da07b 100644 --- a/platform/representation/src/gestures/DropGesture.js +++ b/platform/representation/src/gestures/DropGesture.js @@ -110,9 +110,8 @@ define( } } else { // Informs user that drag and drop is not allowed. - // window.alert("Cannot drag and drop objects during browse mode."); + window.alert("Cannot drag and drop objects during browse mode."); } - } // We can only handle drops if we have access to actions... From dab6d966885fefccf7a81193f49959d8340939d7 Mon Sep 17 00:00:00 2001 From: Shivam Dave Date: Thu, 18 Jun 2015 15:08:13 -0700 Subject: [PATCH 73/74] [Browse composition] Not Alerting User In this case the user is not alerted. This is to test the maven build. Issue 11. --- platform/representation/src/gestures/DropGesture.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index b2414da07b..6af53410cf 100644 --- a/platform/representation/src/gestures/DropGesture.js +++ b/platform/representation/src/gestures/DropGesture.js @@ -108,10 +108,11 @@ define( broadcastDrop(id, event); }); } - } else { - // Informs user that drag and drop is not allowed. - window.alert("Cannot drag and drop objects during browse mode."); } +// else { +// // Informs user that drag and drop is not allowed. +// window.alert("Cannot drag and drop objects during browse mode."); +// } } // We can only handle drops if we have access to actions... From 0292f046da815ac261cd1fc538ceaf09500d95be Mon Sep 17 00:00:00 2001 From: Shivam Dave Date: Thu, 18 Jun 2015 15:23:51 -0700 Subject: [PATCH 74/74] [Browse Composition] Removed Window Alert Removed commented out code that alerts the user if they cannot perform a drag and drop. Inserted a comment marking where an alert can be placed Issue 11. --- platform/representation/src/gestures/DropGesture.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index 6af53410cf..25bee716cf 100644 --- a/platform/representation/src/gestures/DropGesture.js +++ b/platform/representation/src/gestures/DropGesture.js @@ -109,10 +109,7 @@ define( }); } } -// else { -// // Informs user that drag and drop is not allowed. -// window.alert("Cannot drag and drop objects during browse mode."); -// } + // TODO: Alert user if drag and drop is not allowed } // We can only handle drops if we have access to actions...