Markup changes WIP

Merge in latest TCR, resolve conflicts;
Migrate About, startup and splash screen styles
2019-03-15 16:52:02 -07:00 · 2019-03-12 12:28:53 -07:00 · 2019-03-12 11:59:48 -07:00 · 2019-03-12 11:44:40 -07:00 · 2019-03-12 11:43:46 -07:00 · 2019-03-12 11:40:38 -07:00
254 changed files with 9174 additions and 9570 deletions
--- a/example/generator/GeneratorMetadataProvider.js
+++ b/example/generator/GeneratorMetadataProvider.js
@@ -33,12 +33,19 @@ define([
                    formatString: '%0.2f',
                    hints: {
                        range: 1
                    },
                    filters: [
                        {
                            comparator: 'equals',
                            possibleValues: [1,2,3,4]
                        }
                    ]
                },
                {
                    key: "cos",
                    name: "Cosine",
                    formatString: '%0.2f',
                    filters: ['equals'],
                    hints: {
                        range: 2
                    }
--- a/example/notifications/res/dialog-launch.html
+++ b/example/notifications/res/dialog-launch.html
@@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="DialogLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="c-indicator c-indicator--clickable icon-box-with-arrow s-status-available"><span class="label c-indicator__label">
+    <div class="ls-indicator icon-box-with-arrow s-status-available"><span class="label">
-        <button ng-click="launchProgress(true)">Known</button>
+        <a ng-click="launchProgress(true)">Known</a>
-        <button ng-click="launchProgress(false)">Unknown</button>
+        <a ng-click="launchProgress(false)">Unknown</a>
-        <button ng-click="launchError()">Error</button>
+        <a ng-click="launchError()">Error</a>
-        <button ng-click="launchInfo()">Info</button>
+        <a ng-click="launchInfo()">Info</a>
    </span></div>
 </span>
--- a/example/notifications/res/notification-launch.html
+++ b/example/notifications/res/notification-launch.html
@@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="NotificationLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="c-indicator c-indicator--clickable icon-bell s-status-available"><span class="label c-indicator__label">
+    <div class="ls-indicator icon-bell s-status-available"><span class="label">
-        <button ng-click="newInfo()">Success</button>
+        <a ng-click="newInfo()">Success</a>
-        <button ng-click="newError()">Error</button>
+        <a ng-click="newError()">Error</a>
-        <button ng-click="newAlert()">Alert</button>
+        <a ng-click="newAlert()">Alert</a>
-        <button ng-click="newProgress()">Progress</button>
+        <a ng-click="newProgress()">Progress</a>
    </span></div>
 </span>
--- a/index.html
+++ b/index.html
@@ -27,9 +27,11 @@
        <meta name="apple-mobile-web-app-capable" content="yes">
        <title></title>
        <script src="dist/openmct.js"></script>
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
+        <link rel="stylesheet" href="dist/styles/openmct.css">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">
        <link rel="shortcut icon" href="dist/favicons/favicon.ico">
    </head>
    <body>
    </body>
@@ -48,12 +50,10 @@
        openmct.install(openmct.plugins.Generator());
        openmct.install(openmct.plugins.ExampleImagery());
        openmct.install(openmct.plugins.UTCTimeSystem());
        openmct.install(openmct.plugins.ImportExport());
        openmct.install(openmct.plugins.AutoflowView({
            type: "telemetry.panel"
        }));
        openmct.install(openmct.plugins.DisplayLayout({
            showAsView: ['summary-widget', 'example.imagery']
        }));
        openmct.install(openmct.plugins.Conductor({
            menuOptions: [
                {
@@ -77,10 +77,12 @@
        }));
        openmct.install(openmct.plugins.SummaryWidget());
        openmct.install(openmct.plugins.Notebook());
        openmct.install(openmct.plugins.FolderView());
        openmct.install(openmct.plugins.Tabs());
        openmct.install(openmct.plugins.FlexibleLayout());
        openmct.install(openmct.plugins.LADTable());
        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
        openmct.install(openmct.plugins.ObjectMigration());
        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
        openmct.start();
    </script>
 </html>
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
 {
  "name": "openmct",
-  "version": "1.0.0-beta",
+  "version": "0.14.0-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
    "acorn": "6.2.0",
    "angular": "1.4.14",
    "angular-route": "1.4.14",
    "babel-eslint": "8.2.6",
@@ -56,7 +55,7 @@
    "node-bourbon": "^4.2.3",
    "node-sass": "^4.9.2",
    "painterro": "^0.2.65",
-    "printj": "^1.2.1",
+    "printj": "^1.1.0",
    "raw-loader": "^0.5.1",
    "request": "^2.69.0",
    "split": "^1.0.0",
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -31,6 +31,7 @@ define([
    "./src/navigation/NavigateAction",
    "./src/navigation/OrphanNavigationHandler",
    "./src/windowing/NewTabAction",
    "./src/windowing/WindowTitler",
    "./res/templates/browse.html",
    "./res/templates/browse-object.html",
    "./res/templates/browse/object-header.html",
@@ -51,6 +52,7 @@ define([
    NavigateAction,
    OrphanNavigationHandler,
    NewTabAction,
    WindowTitler,
    browseTemplate,
    browseObjectTemplate,
    objectHeaderTemplate,
@@ -224,6 +226,14 @@ define([
                }
            ],
            "runs": [
                {
                    "implementation": WindowTitler,
                    "depends": [
                        "navigationService",
                        "$rootScope",
                        "$document"
                    ]
                },
                {
                    "implementation": OrphanNavigationHandler,
                    "depends": [
--- a/platform/commonUI/browse/src/windowing/WindowTitler.js
+++ b/platform/commonUI/browse/src/windowing/WindowTitler.js
@@ -20,16 +20,32 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-import PreviewAction from './PreviewAction';
+define(
    [],
    function () {
-export default class ViewHistoricalDataAction extends PreviewAction {
+        /**
-    constructor(openmct) {
+         * Updates the title of the current window to reflect the name
-        super(openmct);
+         * of the currently navigated-to domain object.
         * @memberof platform/commonUI/browse
         * @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;
            }
-        this.name = 'View Historical Data';
+            // Set the window title...
-        this.key = 'viewHistoricalData';
+            function setTitle(name) {
-        this.description = 'View Historical Data in a Table or Plot';
+                $document[0].title = name;
        this.cssClass = 'icon-eye-open';
        this.hideInDefaultMenu = true;
            }
            // Watch the former, and invoke the latter
            $rootScope.$watch(getNavigatedObjectName, setTitle);
        }
        return WindowTitler;
    }
 );
--- a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
+++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
@@ -0,0 +1,78 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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.
 *****************************************************************************/
 /**
 * WindowTitlerSpec. Created by vwoeltje on 11/6/14.
 */
 define(
    ["../../src/windowing/WindowTitler"],
    function (WindowTitler) {
        describe("The window titler", function () {
            var mockNavigationService,
                mockRootScope,
                mockDocument,
                mockDomainObject,
                titler; // eslint-disable-line
            beforeEach(function () {
                mockNavigationService = jasmine.createSpyObj(
                    'navigationService',
                    ['getNavigation']
                );
                mockRootScope = jasmine.createSpyObj(
                    '$rootScope',
                    ['$watch']
                );
                mockDomainObject = jasmine.createSpyObj(
                    'domainObject',
                    ['getModel']
                );
                mockDocument = [{}];
                mockDomainObject.getModel.and.returnValue({ name: 'Test name' });
                mockNavigationService.getNavigation.and.returnValue(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.calls.mostRecent().args[0]())
                    .toEqual('Test name');
            });
            it("sets the title to the name of the navigated object", function () {
                mockRootScope.$watch.calls.mostRecent().args[1]("Some name");
                expect(mockDocument[0].title).toEqual("Some name");
            });
        });
    }
 );
--- a/platform/commonUI/dialog/bundle.js
+++ b/platform/commonUI/dialog/bundle.js
@@ -28,7 +28,6 @@ define([
    "./res/templates/dialog.html",
    "./res/templates/overlay-blocking-message.html",
    "./res/templates/message.html",
    "./res/templates/notification-message.html",
    "./res/templates/overlay-message-list.html",
    "./res/templates/overlay.html",
    'legacyRegistry'
@@ -40,7 +39,6 @@ define([
    dialogTemplate,
    overlayBlockingMessageTemplate,
    messageTemplate,
    notificationMessageTemplate,
    overlayMessageListTemplate,
    overlayTemplate,
    legacyRegistry
@@ -65,8 +63,7 @@ define([
                    "depends": [
                        "$document",
                        "$compile",
-                        "$rootScope",
+                        "$rootScope"
                        "$timeout"
                    ]
                }
            ],
@@ -91,10 +88,6 @@ define([
                    "key": "message",
                    "template": messageTemplate
                },
                {
                    "key": "notification-message",
                    "template": notificationMessageTemplate
                },
                {
                    "key": "overlay-message-list",
                    "template": overlayMessageListTemplate
--- a/platform/commonUI/dialog/res/templates/message.html
+++ b/platform/commonUI/dialog/res/templates/message.html
@@ -1,32 +1,25 @@
-<div class="c-message"
+<div class="l-message"
     ng-class="'message-severity-' + ngModel.severity">
    <div class="w-message-contents">
-        <div class="c-message__top-bar">
+        <div class="top-bar">
-            <div class="c-message__title">{{ngModel.title}}</div>
+            <div class="title">{{ngModel.message}}</div>
        </div>
        <div class="c-message__hint" ng-hide="ngModel.hint === undefined">
            {{ngModel.hint}}
            <span ng-if="ngModel.timestamp !== undefined">[{{ngModel.timestamp}}]</span>
        </div>
        <div class="message-body">
            <div class="message-action">
                {{ngModel.actionText}}
            </div>
            <mct-include key="'progress-bar'"
                         ng-model="ngModel"
-                         ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
+                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
        </div>
-        <div class="c-overlay__button-bar">
+        <div class="bottom-bar">
-            <button ng-repeat="dialogOption in ngModel.options"
+            <a ng-repeat="dialogOption in ngModel.options"
-               class="c-button"
+                class="s-button"
                ng-click="dialogOption.callback()">
                    {{dialogOption.label}}
-            </button>
+            </a>
-            <button class="c-button c-button--major"
+            <a class="s-button major"
                ng-if="ngModel.primaryOption"
                ng-click="ngModel.primaryOption.callback()">
                    {{ngModel.primaryOption.label}}
-            </button>
+            </a>
        </div>
    </div>
 </div>
--- a/platform/commonUI/dialog/res/templates/notification-message.html
+++ b/platform/commonUI/dialog/res/templates/notification-message.html
@@ -1,25 +0,0 @@
 <div class="c-message"
     ng-class="'message-severity-' + ngModel.severity">
    <div class="w-message-contents">
        <div class="c-message__top-bar">
            <div class="c-message__title">{{ngModel.message}}</div>
        </div>
        <div class="message-body">
            <mct-include key="'progress-bar'"
                         ng-model="ngModel"
                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
        </div>
    </div>
    <div class="c-overlay__button-bar">
        <button ng-repeat="dialogOption in ngModel.options"
                class="c-button"
                ng-click="dialogOption.callback()">
            {{dialogOption.label}}
        </button>
        <button class="c-button c-button--major"
                ng-if="ngModel.primaryOption"
                ng-click="ngModel.primaryOption.callback()">
            {{ngModel.primaryOption.label}}
        </button>
    </div>
 </div>
--- a/platform/commonUI/dialog/res/templates/overlay-message-list.html
+++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html
@@ -1,23 +1,22 @@
 <mct-container key="overlay">
-    <div class="t-message-list c-overlay__contents">
+    <div class="t-message-list">
-        <div class="c-overlay__top-bar">
+        <div class="top-bar">
-            <div class="c-overlay__dialog-title">{{ngModel.dialog.title}}</div>
+            <div class="dialog-title">{{ngModel.dialog.title}}</div>
-            <div class="c-overlay__dialog-hint">Displaying {{ngModel.dialog.messages.length}} message<span
+            <div class="hint">Displaying {{ngModel.dialog.messages.length}} message<span ng-show="ngModel.dialog.messages.length > 1 ||
                    ng-show="ngModel.dialog.messages.length > 1 ||
                                                                                                  ngModel.dialog.messages.length == 0">s</span>
            </div>
        </div>
-        <div class="w-messages c-overlay__messages">
+        <div class="w-messages">
            <mct-include
                ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
-                key="'notification-message'" ng-model="msg.model"></mct-include>
+                key="'message'" ng-model="msg.model"></mct-include>
        </div>
-        <div class="c-overlay__bottom-bar">
+        <div class="bottom-bar">
-            <button ng-repeat="dialogAction in ngModel.dialog.actions"
+            <a ng-repeat="dialogAction in ngModel.dialog.actions"
-               class="c-button c-button--major"
+               class="s-button major"
               ng-click="dialogAction.action()">
                {{dialogAction.label}}
-            </button>
+            </a>
        </div>
    </div>
 </mct-container>
--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@@ -22,9 +22,9 @@
 <div class="c-overlay l-overlay-small" ng-class="{'delayEntry100ms' : ngModel.delay}">
    <div class="c-overlay__blocker"></div>
    <div class="c-overlay__outer">
-        <button ng-click="ngModel.cancel()"
+        <a ng-click="ngModel.cancel()"
           ng-if="ngModel.cancel"
-           class="c-click-icon c-overlay__close-button icon-x-in-circle"></button>
+           class="c-click-icon c-overlay__close-button icon-x-in-circle"></a>
        <div class="c-overlay__contents" ng-transclude></div>
    </div>
 </div>
--- a/platform/commonUI/dialog/src/OverlayService.js
+++ b/platform/commonUI/dialog/src/OverlayService.js
@@ -44,9 +44,8 @@ define(
         * @memberof platform/commonUI/dialog
         * @constructor
         */
-        function OverlayService($document, $compile, $rootScope, $timeout) {
+        function OverlayService($document, $compile, $rootScope) {
            this.$compile = $compile;
            this.$timeout = $timeout;
            // Don't include $document and $rootScope directly;
            // avoids https://docs.angularjs.org/error/ng/cpws
@@ -94,14 +93,12 @@ define(
            scope.key = key;
            scope.typeClass = typeClass || 't-dialog';
            this.$timeout(() => {
            // Create the overlay element and add it to the document's body
            element = this.$compile(TEMPLATE)(scope);
            // Append so that most recent dialog is last in DOM. This means the most recent dialog will be on top when
            // multiple overlays with the same z-index are active.
            this.findBody().append(element);
            });
            return {
                dismiss: dismiss
--- a/platform/commonUI/dialog/test/OverlayServiceSpec.js
+++ b/platform/commonUI/dialog/test/OverlayServiceSpec.js
@@ -35,20 +35,16 @@ define(
                mockTemplate,
                mockElement,
                mockScope,
                mockTimeout,
                overlayService;
            beforeEach(function () {
                mockDocument = jasmine.createSpyObj("$document", ["find"]);
                mockCompile = jasmine.createSpy("$compile");
                mockRootScope = jasmine.createSpyObj("$rootScope", ["$new"]);
-                mockBody = jasmine.createSpyObj("body", ["append"]);
+                mockBody = jasmine.createSpyObj("body", ["prepend"]);
                mockTemplate = jasmine.createSpy("template");
                mockElement = jasmine.createSpyObj("element", ["remove"]);
                mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
                mockTimeout = function (callback) {
                    callback();
                }
                mockDocument.find.and.returnValue(mockBody);
                mockCompile.and.returnValue(mockTemplate);
@@ -58,8 +54,7 @@ define(
                overlayService = new OverlayService(
                    mockDocument,
                    mockCompile,
-                    mockRootScope,
+                    mockRootScope
                    mockTimeout
                );
            });
@@ -72,7 +67,7 @@ define(
            it("adds the templated element to the body", function () {
                overlayService.createOverlay("test", {});
-                expect(mockBody.append).toHaveBeenCalledWith(mockElement);
+                expect(mockBody.prepend).toHaveBeenCalledWith(mockElement);
            });
            it("places the provided model/key in its template's scope", function () {
--- a/platform/commonUI/edit/src/actions/PropertiesDialog.js
+++ b/platform/commonUI/edit/src/actions/PropertiesDialog.js
@@ -49,7 +49,7 @@ define(
                    name: "Properties",
                    rows: this.properties.map(function (property, index) {
                        // Property definition is same as form row definition
-                        var row = JSON.parse(JSON.stringify(property.getDefinition()));
+                        var row = Object.create(property.getDefinition());
                        row.key = index;
                        return row;
                    }).filter(function (row) {
--- a/platform/commonUI/edit/src/actions/SaveAsAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAsAction.js
@@ -162,6 +162,9 @@ function (
        function saveAfterClone(clonedObject) {
            return this.openmct.editor.save().then(() => {
                // Force mutation for search indexing
                clonedObject.useCapability('mutation', (model) => {
                    return model;
                });
                return clonedObject;
            })
        }
@@ -170,14 +173,6 @@ function (
            return fetchObject(clonedObject.getId())
        }
        function indexForSearch(savedObject) {
            savedObject.useCapability('mutation', (model) => {
                return model;
            });
            return savedObject;
        }
        function onSuccess(object) {
            self.notificationService.info("Save Succeeded");
            return object;
@@ -199,7 +194,6 @@ function (
            .then(undirtyOriginals)
            .then(saveAfterClone)
            .then(finishEditing)
            .then(indexForSearch)
            .then(hideBlockingDialog)
            .then(onSuccess)
            .catch(onFailure);
--- a/platform/commonUI/edit/src/capabilities/EditorCapability.js
+++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js
@@ -64,6 +64,7 @@ define(
         * @returns boolean
         */
        EditorCapability.prototype.inEditContext = function () {
            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
            return this.openmct.editor.isEditing();
        };
@@ -73,6 +74,7 @@ define(
         * @returns {*}
         */
        EditorCapability.prototype.isEditContextRoot = function () {
            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
            return this.openmct.editor.isEditing();
        };
--- a/platform/commonUI/edit/src/creation/CreateAction.js
+++ b/platform/commonUI/edit/src/creation/CreateAction.js
@@ -71,27 +71,18 @@ define(
                openmct.editor.cancel();
            }
            function isFirstViewEditable(domainObject) {
                let firstView = openmct.objectViews.get(domainObject)[0];
                return firstView && firstView.canEdit && firstView.canEdit(domainObject);
            }
            function navigateAndEdit(object) {
                let objectPath = object.getCapability('context').getPath(),
                    url = '#/browse/' + objectPath
                        .slice(1)
                        .map(function (o) {
-                            return o && openmct.objects.makeKeyString(o.getId());
+                            return o && openmct.objects.makeKeyString(o.getId())
                        })
                        .join('/');
                window.location.href = url;
                if (isFirstViewEditable(object.useCapability('adapter'))) {
                openmct.editor.edit();
            }
            }
            newModel.type = this.type.getKey();
            newModel.location = this.parent.getId();
--- a/platform/commonUI/edit/src/creation/CreateWizard.js
+++ b/platform/commonUI/edit/src/creation/CreateWizard.js
@@ -66,7 +66,7 @@ define(
                name: "Properties",
                rows: this.properties.map(function (property, index) {
                    // Property definition is same as form row definition
-                    var row = JSON.parse(JSON.stringify(property.getDefinition()));
+                    var row = Object.create(property.getDefinition());
                    // Use index as the key into the formValue;
                    // this correlates to the indexing provided by
--- a/platform/commonUI/edit/src/services/TransactionManager.js
+++ b/platform/commonUI/edit/src/services/TransactionManager.js
@@ -77,19 +77,14 @@ define([], function () {
                return promiseFn().then(nextFn);
            };
        }
        /**
         * Clear any existing persistence calls for object with given ID. This ensures only the most recent persistence
         * call is executed. This should prevent stale objects being persisted and overwriting fresh ones.
         */
        if (this.isScheduled(id)) {
            this.clearTransactionsFor(id);
        }
        if (!this.isScheduled(id)) {
            this.clearTransactionFns[id] =
                this.transactionService.addToTransaction(
                    chain(onCommit, release),
                    chain(onCancel, release)
                );
        }
    };
    /**
--- a/platform/commonUI/edit/test/services/TransactionManagerSpec.js
+++ b/platform/commonUI/edit/test/services/TransactionManagerSpec.js
@@ -93,33 +93,24 @@ define(
                    expect(mockOnCancel).toHaveBeenCalled();
                });
-                describe("Adds callbacks to transaction", function () {
+                it("ignores subsequent calls for the same object", function () {
                    beforeEach(function () {
                        spyOn(manager, 'clearTransactionsFor');
                        manager.clearTransactionsFor.and.callThrough();
                    });
                    it("and clears pending calls if same object", function () {
                    manager.addToTransaction(
                        testId,
                        jasmine.createSpy(),
                        jasmine.createSpy()
                    );
-                        expect(manager.clearTransactionsFor).toHaveBeenCalledWith(testId);
+                    expect(mockTransactionService.addToTransaction.calls.count())
                        .toEqual(1);
                });
-                    it("and does not clear pending calls if different object", function () {
+                it("accepts subsequent calls for other objects", function () {
                    manager.addToTransaction(
                        'other-id',
                        jasmine.createSpy(),
                        jasmine.createSpy()
                    );
-                        expect(manager.clearTransactionsFor).not.toHaveBeenCalled();
+                    expect(mockTransactionService.addToTransaction.calls.count())
-                    });
+                        .toEqual(2);
                    afterEach(function () {
                        expect(mockTransactionService.addToTransaction.calls.count()).toEqual(2);
                    });
                });
                it("does not remove callbacks from the transaction", function () {
--- a/platform/commonUI/general/res/templates/angular-indicator.html
+++ b/platform/commonUI/general/res/templates/angular-indicator.html
@@ -20,7 +20,8 @@
 at runtime from the About dialog for additional information.
 -->
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<div class="c-indicator {{ngModel.getCssClass()}}"
+<div class="ls-indicator {{ngModel.getCssClass()}}"
 	 title="{{ngModel.getDescription()}}"
 	 ng-show="ngModel.getText().length > 0">
-	<span class="label c-indicator__label">{{ngModel.getText()}}</span>
+	<span class="label">{{ngModel.getText()}}</span>
 </div>
--- a/platform/commonUI/general/res/templates/message-banner.html
+++ b/platform/commonUI/general/res/templates/message-banner.html
@@ -1,13 +1,13 @@
 <div ng-controller="BannerController" ng-show="active.notification"
-     class="c-message-banner {{active.notification.model.severity}}" ng-class="{
+     class="l-message-banner s-message-banner {{active.notification.model.severity}}" ng-class="{
     'minimized': active.notification.model.minimized,
     'new': !active.notification.model.minimized}"
     ng-click="maximize(active.notification)">
-    <span class="c-message-banner__message">
+    <span class="banner-elem label">
        {{active.notification.model.title}}
    </span>
    <span ng-show="active.notification.model.progress !== undefined || active.notification.model.unknownProgress">
-        <mct-include key="'progress-bar'" class="c-message-banner__progress-bar"
+        <mct-include key="'progress-bar'" class="banner-elem"
                     ng-model="active.notification.model">
        </mct-include>
    </span>
@@ -16,5 +16,5 @@
       ng-click="action(active.notification.model.primaryOption.callback, $event)">
        {{active.notification.model.primaryOption.label}}
    </a>
-    <button class="c-message-banner__close-button c-click-icon icon-x-in-circle" ng-click="dismiss(active.notification, $event)"></button>
+    <a class="banner-elem close icon-x" ng-click="dismiss(active.notification, $event)"></a>
 </div>
--- a/platform/commonUI/general/src/directives/MCTSelectable.js
+++ b/platform/commonUI/general/src/directives/MCTSelectable.js
@@ -54,7 +54,6 @@ define(
                    if (isDestroyed) {
                        return;
                    }
                    var removeSelectable = openmct.selection.selectable(
                        element[0],
                        scope.$eval(attrs.mctSelectable),
--- a/platform/commonUI/notification/res/notification-indicator.html
+++ b/platform/commonUI/notification/res/notification-indicator.html
@@ -1,8 +1,8 @@
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<div ng-show="notifications.length > 0" class="c-indicator c-indicator--clickable s-status-{{highest.severity}} icon-bell"
+<div ng-show="notifications.length > 0" class="ls-indicator s-status-{{highest.severity}} icon-bell"
      ng-controller="NotificationIndicatorController">
-    <span class="label c-indicator__label">
+    <span class="label">
-        <button ng-click="showNotificationsList()">
+        <a ng-click="showNotificationsList()">
-           {{notifications.length}} Notification<span ng-show="notifications.length > 1">s</span></button>
+           {{notifications.length}} Notification<span ng-show="notifications.length > 1">s</span></a>
-    </span><span class="c-indicator__count">{{notifications.length}}</span>
+    </span><span class="count">{{notifications.length}}</span>
 </div>
--- a/platform/core/src/runs/TransactingMutationListener.js
+++ b/platform/core/src/runs/TransactingMutationListener.js
@@ -43,10 +43,23 @@ define([], function () {
        var mutationTopic = topic('mutation');
        mutationTopic.listen(function (domainObject) {
            var persistence = domainObject.getCapability('persistence');
            var wasActive = transactionService.isActive();
            cacheService.put(domainObject.getId(), domainObject.getModel());
            if (hasChanged(domainObject)) {
-                persistence.persist();
+
                if (!wasActive) {
                    transactionService.startTransaction();
                }
                transactionService.addToTransaction(
                    persistence.persist.bind(persistence),
                    persistence.refresh.bind(persistence)
                );
                if (!wasActive) {
                    transactionService.commit();
                }
            }
        });
    }
--- a/platform/core/test/runs/TransactingMutationListenerSpec.js
+++ b/platform/core/test/runs/TransactingMutationListenerSpec.js
@@ -24,27 +24,22 @@ define(
    ["../../src/runs/TransactingMutationListener"],
    function (TransactingMutationListener) {
-        describe("TransactingMutationListener", function () {
+        xdescribe("TransactingMutationListener", function () {
            var mockTopic,
                mockMutationTopic,
                mockCacheService,
                mockTransactionService,
                mockDomainObject,
                mockModel,
                mockPersistence;
            beforeEach(function () {
                mockTopic = jasmine.createSpy('topic');
                mockMutationTopic =
                    jasmine.createSpyObj('mutation', ['listen']);
                mockCacheService =
                    jasmine.createSpyObj('cacheService', [
                        'put'
                    ]);
                mockTransactionService =
                    jasmine.createSpyObj('transactionService', [
                        'isActive',
                        'startTransaction',
                        'addToTransaction',
                        'commit'
                    ]);
                mockDomainObject = jasmine.createSpyObj(
@@ -57,24 +52,18 @@ define(
                );
                mockTopic.and.callFake(function (t) {
-                    expect(t).toBe('mutation');
+                    return (t === 'mutation') && mockMutationTopic;
                    return mockMutationTopic;
                });
                mockDomainObject.getId.and.returnValue('mockId');
                mockDomainObject.getCapability.and.callFake(function (c) {
-                    expect(c).toBe('persistence');
+                    return (c === 'persistence') && mockPersistence;
                    return mockPersistence;
                });
                mockModel = {};
                mockDomainObject.getModel.and.returnValue(mockModel);
                mockPersistence.persisted.and.returnValue(true);
                return new TransactingMutationListener(
                    mockTopic,
-                    mockTransactionService,
+                    mockTransactionService
                    mockCacheService
                );
            });
@@ -83,27 +72,48 @@ define(
                    .toHaveBeenCalledWith(jasmine.any(Function));
            });
-            it("calls persist if the model has changed", function () {
+            [false, true].forEach(function (isActive) {
-                mockModel.persisted = Date.now();
+                var verb = isActive ? "is" : "isn't";
-                //Mark the model dirty by setting the mutated date later than the last persisted date.
+                function onlyWhenInactive(expectation) {
-                mockModel.modified = mockModel.persisted + 1;
+                    return isActive ? expectation.not : expectation;
                }
-                mockMutationTopic.listen.calls.mostRecent()
+                describe("when a transaction " + verb + " active", function () {
-                    .args[0](mockDomainObject);
+                    var innerVerb = isActive ? "does" : "doesn't";
-                expect(mockPersistence.persist).toHaveBeenCalled();
+                    beforeEach(function () {
                        mockTransactionService.isActive.and.returnValue(isActive);
                    });
-            it("does not call persist if the model has not changed", function () {
+                    describe("and mutation occurs", function () {
-                mockModel.persisted = Date.now();
+                        beforeEach(function () {
                mockModel.modified = mockModel.persisted;
                            mockMutationTopic.listen.calls.mostRecent()
                                .args[0](mockDomainObject);
                        });
-                expect(mockPersistence.persist).not.toHaveBeenCalled();
+
                        it(innerVerb + " start a new transaction", function () {
                            onlyWhenInactive(
                                expect(mockTransactionService.startTransaction)
                            ).toHaveBeenCalled();
                        });
                        it("adds to the active transaction", function () {
                            expect(mockTransactionService.addToTransaction)
                                .toHaveBeenCalledWith(
                                    jasmine.any(Function),
                                    jasmine.any(Function)
                                );
                        });
                        it(innerVerb + " immediately commit", function () {
                            onlyWhenInactive(
                                expect(mockTransactionService.commit)
                            ).toHaveBeenCalled();
                        });
                    });
                });
            });
        });
    }
--- a/platform/entanglement/bundle.js
+++ b/platform/entanglement/bundle.js
@@ -24,6 +24,7 @@ define([
    "./src/actions/MoveAction",
    "./src/actions/CopyAction",
    "./src/actions/LinkAction",
    "./src/actions/GoToOriginalAction",
    "./src/actions/SetPrimaryLocationAction",
    "./src/services/LocatingCreationDecorator",
    "./src/services/LocatingObjectDecorator",
@@ -40,6 +41,7 @@ define([
    MoveAction,
    CopyAction,
    LinkAction,
    GoToOriginalAction,
    SetPrimaryLocationAction,
    LocatingCreationDecorator,
    LocatingObjectDecorator,
@@ -102,6 +104,14 @@ define([
                        "linkService"
                    ]
                },
                {
                    "key": "follow",
                    "name": "Go To Original",
                    "description": "Go to the original, un-linked instance of this object.",
                    "cssClass": "",
                    "category": "contextual",
                    "implementation": GoToOriginalAction
                },
                {
                    "key": "locate",
                    "name": "Set Primary Location",
--- a/platform/entanglement/src/actions/GoToOriginalAction.js
+++ b/platform/entanglement/src/actions/GoToOriginalAction.js
@@ -0,0 +1,60 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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.
 *****************************************************************************/
 define(
    function () {
        /**
         * Implements the "Go To Original" action, which follows a link back
         * to an original instance of an object.
         *
         * @implements {Action}
         * @constructor
         * @private
         * @memberof platform/entanglement
         * @param {ActionContext} context the context in which the action
         *        will be performed
         */
        function GoToOriginalAction(context) {
            this.domainObject = context.domainObject;
        }
        GoToOriginalAction.prototype.perform = function () {
            return this.domainObject.getCapability("location").getOriginal()
                .then(function (originalObject) {
                    var actionCapability =
                        originalObject.getCapability("action");
                    return actionCapability &&
                            actionCapability.perform("navigate");
                });
        };
        GoToOriginalAction.appliesTo = function (context) {
            var domainObject = context.domainObject;
            return domainObject && domainObject.hasCapability("location") &&
                domainObject.getCapability("location").isLink();
        };
        return GoToOriginalAction;
    }
 );
--- a/platform/entanglement/test/actions/GoToOriginalActionSpec.js
+++ b/platform/entanglement/test/actions/GoToOriginalActionSpec.js
@@ -0,0 +1,93 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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.
 *****************************************************************************/
 define(
    [
        '../../src/actions/GoToOriginalAction',
        '../DomainObjectFactory',
        '../ControlledPromise'
    ],
    function (GoToOriginalAction, domainObjectFactory, ControlledPromise) {
        describe("The 'go to original' action", function () {
            var testContext,
                originalDomainObject,
                mockLocationCapability,
                mockOriginalActionCapability,
                originalPromise,
                action;
            beforeEach(function () {
                mockLocationCapability = jasmine.createSpyObj(
                    'location',
                    ['isLink', 'isOriginal', 'getOriginal']
                );
                mockOriginalActionCapability = jasmine.createSpyObj(
                    'action',
                    ['perform', 'getActions']
                );
                originalPromise = new ControlledPromise();
                mockLocationCapability.getOriginal.and.returnValue(originalPromise);
                mockLocationCapability.isLink.and.returnValue(true);
                mockLocationCapability.isOriginal.and.callFake(function () {
                    return !mockLocationCapability.isLink();
                });
                testContext = {
                    domainObject: domainObjectFactory({
                        capabilities: {
                            location: mockLocationCapability
                        }
                    })
                };
                originalDomainObject = domainObjectFactory({
                    capabilities: {
                        action: mockOriginalActionCapability
                    }
                });
                action = new GoToOriginalAction(testContext);
            });
            it("is applicable to links", function () {
                expect(GoToOriginalAction.appliesTo(testContext))
                    .toBeTruthy();
            });
            it("is not applicable to originals", function () {
                mockLocationCapability.isLink.and.returnValue(false);
                expect(GoToOriginalAction.appliesTo(testContext))
                    .toBeFalsy();
            });
            it("navigates to original objects when performed", function () {
                expect(mockOriginalActionCapability.perform)
                    .not.toHaveBeenCalled();
                action.perform();
                originalPromise.resolve(originalDomainObject);
                expect(mockOriginalActionCapability.perform)
                    .toHaveBeenCalledWith('navigate');
            });
        });
    }
 );
--- a/platform/features/clock/res/templates/timer.html
+++ b/platform/features/clock/res/templates/timer.html
@@ -24,10 +24,10 @@
        <button ng-click="timer.clickStopButton()"
                ng-hide="timer.timerState == 'stopped'"
                title="Reset"
-                class="c-timer__ctrl-reset c-icon-button c-icon-button--major icon-reset"></button>
+                class="c-timer__ctrl-reset c-click-icon c-click-icon--major icon-reset"></button>
        <button ng-click="timer.clickButton()"
                title="{{timer.buttonText()}}"
-                class="c-timer__ctrl-pause-play c-icon-button c-icon-button--major {{timer.buttonCssClass()}}"></button>
+                class="c-timer__ctrl-pause-play c-click-icon c-click-icon--major {{timer.buttonCssClass()}}"></button>
    </div>
    <div class="c-timer__direction {{timer.signClass()}}"
        ng-hide="!timer.signClass()"></div>
--- a/platform/features/clock/src/indicators/ClockIndicator.js
+++ b/platform/features/clock/src/indicators/ClockIndicator.js
@@ -49,7 +49,7 @@ define(
        };
        ClockIndicator.prototype.getCssClass = function () {
-            return "t-indicator-clock icon-clock no-minify c-indicator--not-clickable";
+            return "t-indicator-clock icon-clock no-collapse float-right";
        };
        ClockIndicator.prototype.getText = function () {
--- a/platform/features/hyperlink/bundle.js
+++ b/platform/features/hyperlink/bundle.js
@@ -45,6 +45,7 @@ define([
                            "key": "url",
                            "name": "URL",
                            "control": "textfield",
                            "pattern": "^(ftp|https?)\\:\\/\\/",
                            "required": true,
                            "cssClass": "l-input-lg"
                        },
--- a/platform/features/imagery/res/templates/imagery.html
+++ b/platform/features/imagery/res/templates/imagery.html
@@ -1,18 +1,22 @@
-<div class="t-imagery c-imagery" ng-controller="ImageryController as imagery">
+<div class="t-imagery" ng-controller="ImageryController as imagery">
    <mct-split-pane class='abs' anchor="bottom" alias="imagery">
-    <div class="split-pane-component has-local-controls l-image-main-wrapper l-flex-col">
+    <div class="split-pane-component has-local-controls l-image-main-wrapper l-flex-col"
-        <div class="h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover l-flex-row c-imagery__lc">
+        ng-mouseenter="showLocalControls = true;"
-            <span class="holder flex-elem grows c-imagery__lc__sliders">
+        ng-mouseleave="showLocalControls = false;">
        <div class="h-local-controls h-local-controls-overlay-content h-local-controls-trans s-local-controls local-controls-hidden l-flex-row">
            <span class="holder flex-elem grows">
                <input class="icon-brightness" type="range"
                       min="0"
                       max="500"
-                       ng-model="filters.brightness" />
+                       ng-model="filters.brightness">
                </input>
                <input class="icon-contrast" type="range"
                       min="0"
                       max="500"
-                       ng-model="filters.contrast" />
+                       ng-model="filters.contrast">
                </input>
            </span>
-            <span class="holder flex-elem t-reset-btn-holder c-imagery__lc__reset-btn">
+            <span class="holder flex-elem t-reset-btn-holder">
                <a class="s-icon-button icon-reset t-btn-reset"
                   ng-click="filters = { brightness: 100, contrast: 100 }"></a>
            </span>
--- a/platform/features/pages/bundle.js
+++ b/platform/features/pages/bundle.js
@@ -47,6 +47,7 @@ define([
                            "key": "url",
                            "name": "URL",
                            "control": "textfield",
                            "pattern": "^(ftp|https?)\\:\\/\\/",
                            "required": true,
                            "cssClass": "l-input-lg"
                        }
--- a/platform/import-export/src/actions/ImportAsJSONAction.js
+++ b/platform/import-export/src/actions/ImportAsJSONAction.js
@@ -64,30 +64,12 @@ define(['zepto'], function ($) {
        var tree = this.generateNewIdentifiers(objTree);
        var rootId = tree.rootId;
        var rootObj = this.instantiate(tree.openmct[rootId], rootId);
        var newStyleParent = parent.useCapability('adapter');
        var newStyleRootObj = rootObj.useCapability('adapter');
-        if (this.openmct.composition.checkPolicy(newStyleParent, newStyleRootObj)) {
+        // Instantiate all objects in tree with their newly genereated ids,
            // Instantiate all objects in tree with their newly generated ids,
        // adding each to its rightful parent's composition
        rootObj.getCapability("location").setPrimaryLocation(parent.getId());
        this.deepInstantiate(rootObj, tree.openmct, []);
        parent.getCapability("composition").add(rootObj);
        } else {
            var dialog = this.openmct.overlays.dialog({
                iconClass: 'alert',
                message: "We're sorry, but you cannot import that object type into this object.",
                buttons: [
                    {
                        label: "Ok",
                        emphasis: true,
                        callback: function () {
                            dialog.dismiss();
                        }
                    }
                ]
            });
        }
    };
    ImportAsJSONAction.prototype.deepInstantiate = function (parent, tree, seen) {
@@ -98,17 +80,15 @@ define(['zepto'], function ($) {
            var newObj;
            seen.push(parent.getId());
-
+            parentModel.composition.forEach(function (childId, index) {
-            parentModel.composition.forEach(function (childId) {
+                if (!tree[childId] || seen.includes(childId)) {
                let keystring = this.openmct.objects.makeKeyString(childId);
                if (!tree[keystring] || seen.includes(keystring)) {
                    return;
                }
-                newObj = this.instantiate(tree[keystring], keystring);
+                newObj = this.instantiate(tree[childId], childId);
                parent.getCapability("composition").add(newObj);
                newObj.getCapability("location")
-                    .setPrimaryLocation(tree[keystring].location);
+                    .setPrimaryLocation(tree[childId].location);
                this.deepInstantiate(newObj, tree, seen);
            }, this);
        }
--- a/platform/persistence/couch/src/CouchIndicator.js
+++ b/platform/persistence/couch/src/CouchIndicator.js
@@ -100,7 +100,7 @@ define(
        }
        CouchIndicator.prototype.getCssClass = function () {
-            return "c-indicator--clickable icon-suitcase " + this.state.statusClass;
+            return "icon-database " + this.state.statusClass;
        };
        CouchIndicator.prototype.getGlyphClass = function () {
--- a/platform/persistence/elastic/src/ElasticIndicator.js
+++ b/platform/persistence/elastic/src/ElasticIndicator.js
@@ -84,7 +84,7 @@ define(
        }
        ElasticIndicator.prototype.getCssClass = function () {
-            return "c-indicator--clickable icon-suitcase";
+            return "icon-database";
        };
        ElasticIndicator.prototype.getGlyphClass = function () {
            return this.state.glyphClass;
--- a/platform/persistence/elastic/test/ElasticIndicatorSpec.js
+++ b/platform/persistence/elastic/test/ElasticIndicatorSpec.js
@@ -59,7 +59,7 @@ define(
            });
            it("has a database icon", function () {
-                expect(indicator.getCssClass()).toEqual("icon-suitcase");
+                expect(indicator.getCssClass()).toEqual("icon-database");
            });
            it("consults the database at the configured path", function () {
--- a/platform/persistence/local/src/LocalStorageIndicator.js
+++ b/platform/persistence/local/src/LocalStorageIndicator.js
@@ -41,7 +41,7 @@ define(
        }
        LocalStorageIndicator.prototype.getCssClass = function () {
-            return "c-indicator--clickable icon-suitcase s-status-caution";
+            return "icon-database s-status-caution";
        };
        LocalStorageIndicator.prototype.getGlyphClass = function () {
            return 'caution';
--- a/platform/persistence/local/test/LocalStorageIndicatorSpec.js
+++ b/platform/persistence/local/test/LocalStorageIndicatorSpec.js
@@ -38,7 +38,7 @@ define(
            });
            it("has a database icon", function () {
-                expect(indicator.getCssClass()).toEqual("icon-suitcase s-status-caution");
+                expect(indicator.getCssClass()).toEqual("icon-database s-status-caution");
            });
            it("has a 'caution' class to draw attention", function () {
--- a/platform/persistence/queue/src/PersistenceFailureHandler.js
+++ b/platform/persistence/queue/src/PersistenceFailureHandler.js
@@ -37,17 +37,75 @@ define(
        }
        /**
-         * Discard failures
+         * Handle persistence failures by providing the user with a
         * dialog summarizing these failures, and giving the option
         * to overwrite/cancel as appropriate.
         * @param {Array} failures persistence failures, as prepared
         *        by PersistenceQueueHandler
         * @memberof platform/persistence/queue.PersistenceFailureHandler#
         */
        PersistenceFailureHandler.prototype.handle = function handleFailures(failures) {
-
+            // Prepare dialog for display
            var dialogModel = new PersistenceFailureDialog(failures),
                revisionErrors = dialogModel.model.revised,
                $q = this.$q;
            // Refresh revision information for the domain object associated
            // with this persistence failure
            function refresh(failure) {
                // Refresh the domain object to the latest from persistence
                return failure.persistence.refresh();
            }
            // Issue a new persist call for the domain object associated with
            // this failure.
            function persist(failure) {
                // Note that we reissue the persist request here, but don't
                // return it, to avoid a circular wait. We trust that the
                // PersistenceQueue will behave correctly on the next round
                // of flushing.
                failure.requeue();
            }
            // Retry persistence (overwrite) for this set of failed attempts
            function retry(failuresToRetry) {
                var models = {};
                // Cache a copy of the model
                function cacheModel(failure) {
                    // Clone...
                    models[failure.id] = JSON.parse(JSON.stringify(
                        failure.domainObject.getModel()
                    ));
                }
                // Mutate a domain object to restore its model
                function remutate(failure) {
                    var model = models[failure.id];
                    return failure.domainObject.useCapability(
                        "mutation",
                        function () {
                            return model;
                        },
                        model.modified
                    );
                }
                // Cache the object models we might want to save
                failuresToRetry.forEach(cacheModel);
                // Strategy here:
                // * Cache all of the models we might want to save (above)
                // * Refresh all domain objects (so they are latest versions)
                // * Re-insert the cached domain object models
                // * Invoke persistence again
                return $q.all(failuresToRetry.map(refresh)).then(function () {
                    return $q.all(failuresToRetry.map(remutate));
                }).then(function () {
                    return $q.all(failuresToRetry.map(persist));
                });
            }
            // Discard changes for a failed refresh
            function discard(failure) {
                var persistence =
@@ -60,7 +118,19 @@ define(
                return $q.all(failuresToDiscard.map(discard));
            }
            // Handle user input (did they choose to overwrite?)
            function handleChoice(key) {
                // If so, try again
                if (key === PersistenceFailureConstants.OVERWRITE_KEY) {
                    return retry(revisionErrors);
                } else {
                    return discardAll(revisionErrors);
                }
            }
            // Prompt for user input, the overwrite if they said so.
            return this.dialogService.getUserChoice(dialogModel)
                .then(handleChoice, handleChoice);
        };
        return PersistenceFailureHandler;
--- a/platform/persistence/queue/test/PersistenceFailureHandlerSpec.js
+++ b/platform/persistence/queue/test/PersistenceFailureHandlerSpec.js
@@ -74,14 +74,43 @@ define(
                handler = new PersistenceFailureHandler(mockQ, mockDialogService);
            });
-            it("discards on handle", function () {
+            it("shows a dialog to handle failures", function () {
                handler.handle(mockFailures);
                expect(mockDialogService.getUserChoice).toHaveBeenCalled();
            });
            it("overwrites on request", function () {
                mockQ.all.and.returnValue(asPromise([]));
                handler.handle(mockFailures);
                // User chooses overwrite
                mockPromise.then.calls.mostRecent().args[0](Constants.OVERWRITE_KEY);
                // Should refresh, remutate, and requeue all objects
                mockFailures.forEach(function (mockFailure, i) {
                    expect(mockFailure.persistence.refresh).toHaveBeenCalled();
                    expect(mockFailure.requeue).toHaveBeenCalled();
                    expect(mockFailure.domainObject.useCapability).toHaveBeenCalledWith(
                        'mutation',
                        jasmine.any(Function),
                        i // timestamp
                    );
                    expect(mockFailure.domainObject.useCapability.calls.mostRecent().args[1]())
                        .toEqual({ id: mockFailure.id, modified: i });
                });
            });
            it("discards on request", function () {
                mockQ.all.and.returnValue(asPromise([]));
                handler.handle(mockFailures);
                // User chooses overwrite
                mockPromise.then.calls.mostRecent().args[0](false);
                // Should refresh, but not remutate, and requeue all objects
                mockFailures.forEach(function (mockFailure) {
                    expect(mockFailure.persistence.refresh).toHaveBeenCalled();
                    expect(mockFailure.requeue).not.toHaveBeenCalled();
                    expect(mockFailure.domainObject.useCapability).not.toHaveBeenCalled();
                });
            });
        });
    }
 );
--- a/src/MCT.js
+++ b/src/MCT.js
@@ -38,14 +38,12 @@ define([
    './ui/router/ApplicationRouter',
    './ui/router/Browse',
    '../platform/framework/src/Main',
-    './styles/core.scss',
+    './styles-new/core.scss',
-    './styles/notebook.scss',
+    './styles-new/notebook.scss',
    './ui/layout/Layout.vue',
    '../platform/core/src/objects/DomainObjectImpl',
    '../platform/core/src/capabilities/ContextualDomainObject',
    './ui/preview/plugin',
    './api/Branding',
    './plugins/licenses/plugin',
    './plugins/remove/plugin',
    'vue'
 ], function (
@@ -72,8 +70,6 @@ define([
    DomainObjectImpl,
    ContextualDomainObject,
    PreviewPlugin,
    BrandingAPI,
    LicensesPlugin,
    RemoveActionPlugin,
    Vue
 ) {
@@ -95,13 +91,6 @@ define([
     */
    function MCT() {
        EventEmitter.call(this);
        this.buildInfo = {
            version: __OPENMCT_VERSION__,
            buildDate: __OPENMCT_BUILD_DATE__,
            revision: __OPENMCT_REVISION__,
            branch: __OPENMCT_BUILD_BRANCH__
        };
        this.legacyBundle = { extensions: {
            services: [
                {
@@ -241,29 +230,17 @@ define([
        this.contextMenu = new api.ContextMenuRegistry();
        this.router = new ApplicationRouter();
        this.branding = BrandingAPI.default;
        this.legacyRegistry = defaultRegistry;
        // Plugin's that are installed by default
        this.install(this.plugins.Plot());
        this.install(this.plugins.TelemetryTable());
        this.install(this.plugins.DisplayLayout());
        this.install(PreviewPlugin.default());
        this.install(LegacyIndicatorsPlugin());
        this.install(LicensesPlugin.default());
        this.install(RemoveActionPlugin.default());
        this.install(this.plugins.ImportExport());
        this.install(this.plugins.FolderView());
        this.install(this.plugins.Tabs());
        this.install(this.plugins.FlexibleLayout());
        this.install(this.plugins.GoToOriginalAction());
        if (typeof BUILD_CONSTANTS !== 'undefined') {
            this.install(buildInfoPlugin(BUILD_CONSTANTS));
        }
    }
    MCT.prototype = Object.create(EventEmitter.prototype);
@@ -334,12 +311,6 @@ define([
     *        MCT; if undefined, MCT will be run in the body of the document
     */
    MCT.prototype.start = function (domElement) {
        if (!this.plugins.DisplayLayout._installed) {
            this.install(this.plugins.DisplayLayout({
                showAsView: ['summary-widget']
            }));
        }
        if (!domElement) {
            domElement = document.body;
        }
@@ -363,8 +334,12 @@ define([
        legacyRegistry.register('adapter', this.legacyBundle);
        legacyRegistry.enable('adapter');
        this.install(LegacyIndicatorsPlugin());
        this.router = new ApplicationRouter();
        this.router.route(/^\/$/, () => {
-            this.router.setPath('/browse/');
+            this.router.setPath('/browse/mine');
        });
        /**
--- a/src/adapter/actions/LegacyContextMenuAction.js
+++ b/src/adapter/actions/LegacyContextMenuAction.js
@@ -26,7 +26,6 @@ const OUTSIDE_EDIT_PATH_BLACKLIST = ["copy", "follow", "properties", "move", "li
 export default class LegacyContextMenuAction {
    constructor(openmct, LegacyAction) {
        this.openmct = openmct;
        this.key = LegacyAction.definition.key;
        this.name = LegacyAction.definition.name;
        this.description = LegacyAction.definition.description;
        this.cssClass = LegacyAction.definition.cssClass;
@@ -34,13 +33,9 @@ export default class LegacyContextMenuAction {
    }
    invoke(objectPath) {
        this.openmct.objects.getRoot().then((root) => {
            let pathWithRoot = objectPath.slice();
            pathWithRoot.push(root);
        let context = {
            category: 'contextual',
-                domainObject: this.openmct.legacyObject(pathWithRoot)
+            domainObject: this.openmct.legacyObject(objectPath)
        }
        let legacyAction = new this.LegacyAction(context);
@@ -52,7 +47,6 @@ export default class LegacyContextMenuAction {
            }.bind(legacyAction);
        }
        legacyAction.perform();
        });
    }
    appliesTo(objectPath) {
--- a/src/adapter/bundle.js
+++ b/src/adapter/bundle.js
@@ -36,7 +36,7 @@ define([
    './runs/RegisterLegacyTypes',
    './services/LegacyObjectAPIInterceptor',
    './views/installLegacyViews',
-    './policies/LegacyCompositionPolicyAdapter',
+    './policies/legacyCompositionPolicyAdapter',
    './actions/LegacyActionAdapter'
 ], function (
    legacyRegistry,
--- a/src/adapter/runs/LegacyTelemetryProvider.js
+++ b/src/adapter/runs/LegacyTelemetryProvider.js
@@ -137,7 +137,8 @@ define([
        function callbackWrapper(series) {
            callback(createDatum(domainObject, metadata, series, series.getPointCount() - 1));
        }
-        return capability.subscribe(callbackWrapper, request) || function () {};
+
        return capability.subscribe(callbackWrapper, request);
    };
    LegacyTelemetryProvider.prototype.supportsLimits = function (domainObject) {
--- a/src/adapter/services/LegacyObjectAPIInterceptor.js
+++ b/src/adapter/services/LegacyObjectAPIInterceptor.js
@@ -57,10 +57,8 @@ define([
        }.bind(this);
        handleLegacyMutation = function (legacyObject) {
-            var newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId()),
+            var newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId());
-                keystring = utils.makeKeyString(newStyleObject.identifier);
+            this.eventEmitter.emit(newStyleObject.identifier.key + ":*", newStyleObject);
            this.eventEmitter.emit(keystring + ":*", newStyleObject);
            this.eventEmitter.emit('mutation', newStyleObject);
        }.bind(this);
--- a/src/adapter/views/LegacyViewProvider.js
+++ b/src/adapter/views/LegacyViewProvider.js
@@ -45,30 +45,15 @@ define([
            view: function (domainObject) {
                let $rootScope = openmct.$injector.get('$rootScope');
                let templateLinker = openmct.$injector.get('templateLinker');
-                let scope = $rootScope.$new(true);
+                let scope = $rootScope.$new();
                let legacyObject = convertToLegacyObject(domainObject);
                let isDestroyed = false;
                let unlistenToStatus;
                let element;
                scope.domainObject = legacyObject;
                scope.model = legacyObject.getModel();
-                let child;
+
                let parent;
                return {
                    show: function (container) {
                        parent = container;
                        child = document.createElement('div');
                        parent.appendChild(child);
                        let statusCapability = legacyObject.getCapability('status');
                        unlistenToStatus = statusCapability.listen((newStatus) => {
                            child.classList.remove('s-status-timeconductor-unsynced');
                            if (newStatus.includes('timeconductor-unsynced')) {
                                child.classList.add('s-status-timeconductor-unsynced');
                            }
                        });
                        // TODO: implement "gestures" support ?
                        let uses = legacyView.uses || [];
                        let promises = [];
@@ -89,13 +74,12 @@ define([
                            uses.forEach(function (key, i) {
                                scope[key] = results[i];
                            });
                            element = openmct.$angular.element(child);
                            templateLinker.link(
                                scope,
-                                element,
+                                openmct.$angular.element(container),
                                legacyView
                            );
-                            child.classList.add('u-contents');
+                            container.classList.add('u-contents');
                        }
                        if (promises.length) {
@@ -108,16 +92,8 @@ define([
                            link();
                        }
                    },
                    onClearData() {
                        scope.$broadcast('clearData');
                    },
                    destroy: function () {
                        element.off();
                        element.remove();
                        scope.$destroy();
                        element = null;
                        scope = null;
                        unlistenToStatus();
                    }
                }
            },
@@ -129,7 +105,7 @@ define([
                return priority;
            }
        };
-    }
+    };
    return LegacyViewProvider;
--- a/src/adapter/views/TypeInspectorViewProvider.js
+++ b/src/adapter/views/TypeInspectorViewProvider.js
@@ -25,34 +25,25 @@ define([
            cssClass: representation.cssClass,
            description: representation.description,
            canView: function (selection) {
-                if (selection.length !== 1 || selection[0].length === 0) {
+                if (!selection[0] || !selection[0].context.item) {
                    return false;
                }
-
+                let domainObject = selection[0].context.item;
-                let selectionContext = selection[0][0].context;
+                return domainObject.type === typeDefinition.key;
                if (!selectionContext.item) {
                    return false;
                }
                return selectionContext.item.type === typeDefinition.key;
            },
            view: function (selection) {
-                let domainObject = selection[0][0].context.item;
+                let domainObject = selection[0].context.item;
                let $rootScope = openmct.$injector.get('$rootScope');
                let templateLinker = openmct.$injector.get('templateLinker');
-                let scope = $rootScope.$new(true);
+                let scope = $rootScope.$new();
                let legacyObject = convertToLegacyObject(domainObject);
                let isDestroyed = false;
                let element;
                scope.domainObject = legacyObject;
                scope.model = legacyObject.getModel();
                return {
                    show: function (container) {
                        let child = document.createElement('div');
                        container.appendChild(child);
                        // TODO: implement "gestures" support ?
                        let uses = representation.uses || [];
                        let promises = [];
@@ -73,10 +64,9 @@ define([
                            uses.forEach(function (key, i) {
                                scope[key] = results[i];
                            });
                            element = openmct.$angular.element(child)
                            templateLinker.link(
                                scope,
-                                element,
+                                openmct.$angular.element(container),
                                representation
                            );
                            container.style.height = '100%';
@@ -93,16 +83,12 @@ define([
                        }
                    },
                    destroy: function () {
                        element.off();
                        element.remove();
                        scope.$destroy();
                        element = null;
                        scope = null;
                    }
                }
            }
        };
-    }
+    };
    return TypeInspectorViewProvider;
--- a/src/api/Branding.js
+++ b/src/api/Branding.js
@@ -1,45 +0,0 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2019, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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.
 *****************************************************************************/
 let brandingOptions = {};
 /**
 * @typedef {Object} BrandingOptions
 * @memberOf openmct/branding
 * @property {string} smallLogoImage URL to the image to use as the applications logo.
 * This logo will appear on every screen and when clicked will launch the about dialog.
 * @property {string} aboutHtml Custom content for the about screen. When defined the
 * supplied content will be inserted at the start of the about dialog, and the default
 * Open MCT splash logo will be suppressed.
 */
 /**
 * Set branding options for the application. These will override certain visual elements
 * of the application and allow for customization of the application.
 * @param {BrandingOptions} options
 */
 export default function Branding(options) {
    if (arguments.length === 1) {
        brandingOptions = options;
    }
    return brandingOptions;
 }
--- a/src/api/Editor.js
+++ b/src/api/Editor.js
@@ -28,6 +28,11 @@ export default class Editor extends EventEmitter {
        super();
        this.editing = false;
        this.openmct = openmct;
        document.addEventListener('drop', (event) => {
            if (!this.isEditing()) {
                this.edit();
            }
        }, {capture: true});
    }
    /**
@@ -74,11 +79,9 @@ export default class Editor extends EventEmitter {
     * @private
     */
    cancel() {
-        let cancelPromise = this.getTransactionService().cancel();
+        this.getTransactionService().cancel();
        this.editing = false;
        this.emit('isEditing', false);
        return cancelPromise;
    }
    /**
--- a/src/api/composition/CompositionAPISpec.js
+++ b/src/api/composition/CompositionAPISpec.js
@@ -21,23 +21,7 @@ define([
            topicService.and.returnValue(mutationTopic);
            publicAPI = {};
            publicAPI.objects = jasmine.createSpyObj('ObjectAPI', [
-                'get',
+                'get'
                'mutate',
                'observe',
                'areIdsEqual'
            ]);
            publicAPI.objects.areIdsEqual.and.callFake(function (id1, id2) {
                return id1.namespace === id2.namespace && id1.key === id2.key;
            });
            publicAPI.composition = jasmine.createSpyObj('CompositionAPI', [
                'checkPolicy'
            ]);
            publicAPI.composition.checkPolicy.and.returnValue(true);
            publicAPI.objects.eventEmitter = jasmine.createSpyObj('eventemitter', [
                'on'
            ]);
            publicAPI.objects.get.and.callFake(function (identifier) {
                return Promise.resolve({identifier: identifier});
@@ -68,14 +52,6 @@ define([
                        {
                            namespace: 'test',
                            key: 'a'
                        },
                        {
                            namespace: 'test',
                            key: 'b'
                        },
                        {
                            namespace: 'test',
                            key: 'c'
                        }
                    ]
                };
@@ -92,55 +68,55 @@ define([
                composition.on('add', listener);
                return composition.load().then(function () {
-                    expect(listener.calls.count()).toBe(3);
+                    expect(listener.calls.count()).toBe(1);
                    expect(listener).toHaveBeenCalledWith({
                        identifier: {namespace: 'test', key: 'a'}
                    });
                });
            });
            describe('supports reordering of composition', function () {
                var listener;
                beforeEach(function () {
                    listener = jasmine.createSpy('reorderListener');
                    composition.on('reorder', listener);
-                    return composition.load();
+            // TODO: Implement add/removal in new default provider.
-                });
+            xit('synchronizes changes between instances', function () {
-                it('', function () {
+                var otherComposition = compositionAPI.get(domainObject);
-                    composition.reorder(1, 0);
+                var addListener = jasmine.createSpy('addListener');
-                    let newComposition =
+                var removeListener = jasmine.createSpy('removeListener');
-                        publicAPI.objects.mutate.calls.mostRecent().args[2];
+                var otherAddListener = jasmine.createSpy('otherAddListener');
-                    let reorderPlan = listener.calls.mostRecent().args[0][0];
+                var otherRemoveListener = jasmine.createSpy('otherRemoveListener');
                    expect(reorderPlan.oldIndex).toBe(1);
                    expect(reorderPlan.newIndex).toBe(0);
                    expect(newComposition[0].key).toEqual('b');
                    expect(newComposition[1].key).toEqual('a');
                    expect(newComposition[2].key).toEqual('c');
                });
                it('', function () {
                    composition.reorder(0, 2);
                    let newComposition =
                        publicAPI.objects.mutate.calls.mostRecent().args[2];
                    let reorderPlan = listener.calls.mostRecent().args[0][0];
                    expect(reorderPlan.oldIndex).toBe(0);
                    expect(reorderPlan.newIndex).toBe(2);
                    expect(newComposition[0].key).toEqual('b');
                    expect(newComposition[1].key).toEqual('c');
                    expect(newComposition[2].key).toEqual('a');
                })
            });
            it('supports adding an object to composition', function () {
                let addListener = jasmine.createSpy('addListener');
                let mockChildObject = {
                    identifier: {key: 'mock-key', namespace: ''}
                };
                composition.on('add', addListener);
-                composition.add(mockChildObject);
+                composition.on('remove', removeListener);
                otherComposition.on('add', otherAddListener);
                otherComposition.on('remove', otherRemoveListener);
-                expect(domainObject.composition.length).toBe(4);
+                return Promise.all([composition.load(), otherComposition.load()])
-                expect(domainObject.composition[3]).toEqual(mockChildObject.identifier);
+                    .then(function () {
                        expect(addListener).toHaveBeenCalled();
                        expect(otherAddListener).toHaveBeenCalled();
                        expect(removeListener).not.toHaveBeenCalled();
                        expect(otherRemoveListener).not.toHaveBeenCalled();
                        var object = addListener.calls.mostRecent().args[0];
                        composition.remove(object);
                        expect(removeListener).toHaveBeenCalled();
                        expect(otherRemoveListener).toHaveBeenCalled();
                        addListener.reset();
                        otherAddListener.reset();
                        composition.add(object);
                        expect(addListener).toHaveBeenCalled();
                        expect(otherAddListener).toHaveBeenCalled();
                        removeListener.reset();
                        otherRemoveListener.reset();
                        otherComposition.remove(object);
                        expect(removeListener).toHaveBeenCalled();
                        expect(otherRemoveListener).toHaveBeenCalled();
                        addListener.reset();
                        otherAddListener.reset();
                        otherComposition.add(object);
                        expect(addListener).toHaveBeenCalled();
                        expect(otherAddListener).toHaveBeenCalled();
                    });
            });
        });
@@ -163,9 +139,7 @@ define([
                                key: 'thing'
                            }
                        ]);
-                    },
+                    }
                    add: jasmine.createSpy('add'),
                    remove: jasmine.createSpy('remove')
                };
                domainObject = {
                    identifier: {
@@ -195,25 +169,6 @@ define([
                    });
                });
            });
            describe('Calling add or remove', function () {
                let mockChildObject;
                beforeEach(function () {
                    mockChildObject = {
                        identifier: {key: 'mock-key', namespace: ''}
                    };
                    composition.add(mockChildObject);
                });
                it('calls add on the provider', function () {
                    expect(customProvider.add).toHaveBeenCalledWith(domainObject, mockChildObject.identifier);
                });
                it('calls remove on the provider', function () {
                    composition.remove(mockChildObject);
                    expect(customProvider.remove).toHaveBeenCalledWith(domainObject, mockChildObject.identifier);
                });
            });
        });
        describe('dynamic custom composition', function () {
--- a/src/api/composition/CompositionCollection.js
+++ b/src/api/composition/CompositionCollection.js
@@ -25,6 +25,7 @@ define([
 ], function (
    _
 ) {
    /**
     * A CompositionCollection represents the list of domain objects contained
     * by another domain object. It provides methods for loading this
@@ -55,13 +56,13 @@ define([
        this.listeners = {
            add: [],
            remove: [],
-            load: [],
+            load: []
            reorder: []
        };
        this.onProviderAdd = this.onProviderAdd.bind(this);
        this.onProviderRemove = this.onProviderRemove.bind(this);
    }
    /**
     * Listen for changes to this composition.  Supports 'add', 'remove', and
     * 'load' events.
@@ -74,9 +75,7 @@ define([
        if (!this.listeners[event]) {
            throw new Error('Event not supported by composition: ' + event);
        }
-        if (!this.mutationListener) {
+
            this._synchronize();
        }
        if (this.provider.on && this.provider.off) {
            if (event === 'add') {
                this.provider.on(
@@ -92,13 +91,6 @@ define([
                    this.onProviderRemove,
                    this
                );
            } if (event === 'reorder') {
                this.provider.on(
                    this.domainObject,
                    'reorder',
                    this.onProviderReorder,
                    this
                )
            }
        }
@@ -132,8 +124,6 @@ define([
        this.listeners[event].splice(index, 1);
        if (this.listeners[event].length === 0) {
            this._destroy();
            // Remove provider listener if this is the last callback to
            // be removed.
            if (this.provider.off && this.provider.on) {
@@ -151,13 +141,6 @@ define([
                        this.onProviderRemove,
                        this
                    );
                } else if (event === 'reorder') {
                    this.provider.off(
                        this.domainObject,
                        'reorder',
                        this.onProviderReorder,
                        this
                    );
                }
            }
        }
@@ -177,9 +160,6 @@ define([
     */
    CompositionCollection.prototype.add = function (child, skipMutate) {
        if (!skipMutate) {
            if (!this.publicAPI.composition.checkPolicy(this.domainObject, child)) {
                throw `Object of type ${child.type} cannot be added to object of type ${this.domainObject.type}`;
            }
            this.provider.add(this.domainObject, child.identifier);
        } else {
            this.emit('add', child);
@@ -229,29 +209,6 @@ define([
        }
    };
    /**
     * Reorder the domain objects in this composition.
     *
     * A call to [load]{@link module:openmct.CompositionCollection#load}
     * must have resolved before using this method.
     *
     * @param {number} oldIndex
     * @param {number} newIndex
     * @memberof module:openmct.CompositionCollection#
     * @name remove
     */
    CompositionCollection.prototype.reorder = function (oldIndex, newIndex, skipMutate) {
        this.provider.reorder(this.domainObject, oldIndex, newIndex);
    };
    /**
     * Handle reorder from provider.
     * @private
     */
    CompositionCollection.prototype.onProviderReorder = function (reorderMap) {
        this.emit('reorder', reorderMap);
    };
    /**
     * Handle adds from provider.
     * @private
@@ -271,29 +228,16 @@ define([
        this.remove(child, true);
    };
    CompositionCollection.prototype._synchronize = function () {
        this.mutationListener = this.publicAPI.objects.observe(this.domainObject, '*', (newDomainObject) => {
            this.domainObject = JSON.parse(JSON.stringify(newDomainObject));
        });
    };
    CompositionCollection.prototype._destroy = function () {
        if (this.mutationListener) {
            this.mutationListener();
            delete this.mutationListener;
        }
    };
    /**
     * Emit events.
     * @private
     */
-    CompositionCollection.prototype.emit = function (event, ...payload) {
+    CompositionCollection.prototype.emit = function (event, payload) {
        this.listeners[event].forEach(function (l) {
            if (l.context) {
-                l.callback.apply(l.context, payload);
+                l.callback.call(l.context, payload);
            } else {
-                l.callback(...payload);
+                l.callback(payload);
            }
        });
    };
--- a/src/api/composition/DefaultCompositionProvider.js
+++ b/src/api/composition/DefaultCompositionProvider.js
@@ -48,11 +48,24 @@ define([
        this.listeningTo = {};
        this.onMutation = this.onMutation.bind(this);
        this.cannotContainDuplicates = this.cannotContainDuplicates.bind(this);
        this.cannotContainItself = this.cannotContainItself.bind(this);
        compositionAPI.addPolicy(this.cannotContainDuplicates);
        compositionAPI.addPolicy(this.cannotContainItself);
    }
    /**
     * @private
     */
    DefaultCompositionProvider.prototype.cannotContainDuplicates = function (parent, child) {
        return this.appliesTo(parent) &&
            parent.composition.findIndex((composeeId) => {
                return composeeId.namespace === child.identifier.namespace &&
                    composeeId.key === child.identifier.key;
            }) === -1;
    }
    /**
     * @private
     */
@@ -113,7 +126,6 @@ define([
            objectListeners = this.listeningTo[keyString] = {
                add: [],
                remove: [],
                reorder: [],
                composition: [].slice.apply(domainObject.composition)
            };
        }
@@ -148,7 +160,7 @@ define([
        });
        objectListeners[event].splice(index, 1);
-        if (!objectListeners.add.length && !objectListeners.remove.length && !objectListeners.reorder.length) {
+        if (!objectListeners.add.length && !objectListeners.remove.length) {
            delete this.listeningTo[keyString];
        }
    };
@@ -186,66 +198,9 @@ define([
     * @memberof module:openmct.CompositionProvider#
     * @method add
     */
-    DefaultCompositionProvider.prototype.add = function (parent, childId) {
+    DefaultCompositionProvider.prototype.add = function (domainObject, child) {
-        if (!this.includes(parent, childId)) {
+        throw new Error('Default Provider does not implement adding.');
-            parent.composition.push(childId);
+        // TODO: this needs to be synchronized via mutation
            this.publicAPI.objects.mutate(parent, 'composition', parent.composition);
        }
    };
    /**
     * @private
     */
    DefaultCompositionProvider.prototype.includes = function (parent, childId) {
        return parent.composition.findIndex(composee =>
            this.publicAPI.objects.areIdsEqual(composee, childId)) !== -1;
    };
    DefaultCompositionProvider.prototype.reorder = function (domainObject, oldIndex, newIndex) {
        let newComposition = domainObject.composition.slice();
        let removeId = oldIndex > newIndex ? oldIndex + 1 : oldIndex;
        let insertPosition = oldIndex < newIndex ? newIndex + 1 : newIndex;
        //Insert object in new position
        newComposition.splice(insertPosition, 0, domainObject.composition[oldIndex]);
        newComposition.splice(removeId, 1);
        let reorderPlan = [{
            oldIndex,
            newIndex
        }];
        if (oldIndex > newIndex) {
            for (let i = newIndex; i < oldIndex; i++) {
                reorderPlan.push({
                    oldIndex: i,
                    newIndex: i + 1
                });
            }
        } else {
            for (let i = oldIndex + 1; i <= newIndex; i++) {
                reorderPlan.push({
                    oldIndex: i,
                    newIndex: i - 1
                });
            }
        }
        this.publicAPI.objects.mutate(domainObject, 'composition', newComposition);
        let id = objectUtils.makeKeyString(domainObject.identifier);
        var listeners = this.listeningTo[id];
        if (!listeners) {
            return;
        }
        listeners.reorder.forEach(notify);
        function notify(listener) {
            if (listener.context) {
                listener.callback.call(listener.context, reorderPlan);
            } else {
                listener.callback(reorderPlan);
            }
        }
    };
    /**
--- a/src/api/contextMenu/ContextMenuAPI.js
+++ b/src/api/contextMenu/ContextMenuAPI.js
@@ -49,9 +49,6 @@ class ContextMenuAPI {
     *           a single sentence or short paragraph) of this kind of view
     * @property {string} cssClass the CSS class to apply to labels for this
     *           view (to add icons, for instance)
     * @property {string} key unique key to identify the context menu action
     *           (used in custom context menu eg table rows, to identify which actions to include)
     * @property {boolean} hideInDefaultMenu optional flag to hide action from showing in the default context menu (tree item)
     */
    /**
     * @method appliesTo
@@ -75,21 +72,12 @@ class ContextMenuAPI {
    /**
     * @private
     */
-    _showContextMenuForObjectPath(objectPath, x, y, actionsToBeIncluded) {
+    _showContextMenuForObjectPath(objectPath, x, y) {
        let applicableActions = this._allActions.filter((action) => {
            if (actionsToBeIncluded) {
                if (action.appliesTo === undefined && actionsToBeIncluded.includes(action.key)) {
                    return true;
                }
                return action.appliesTo(objectPath, actionsToBeIncluded) && actionsToBeIncluded.includes(action.key);
            } else {
            if (action.appliesTo === undefined) {
                return true;
            }
-                return action.appliesTo(objectPath) && !action.hideInDefaultMenu;
+            return action.appliesTo(objectPath);
            }
        });
        if (this._activeContextMenu) {
--- a/src/api/indicators/SimpleIndicator.js
+++ b/src/api/indicators/SimpleIndicator.js
@@ -28,11 +28,11 @@ define(['zepto', './res/indicator-template.html'],
            this.openmct = openmct;
            this.element = $(indicatorTemplate)[0];
-            this.textElement = this.element.querySelector('.js-indicator-text');
+            this.textElement = this.element.querySelector('.indicator-text');
            //Set defaults
            this.text('New Indicator');
-            this.description('');
+            this.description('A simple indicator');
            this.iconClass(DEFAULT_ICON_CLASS);
            this.statusClass('');
        }
--- a/src/api/indicators/res/indicator-template.html
+++ b/src/api/indicators/res/indicator-template.html
@@ -1,3 +1,3 @@
-<div class="c-indicator c-indicator--clickable c-indicator--simple" title="">
+<div class="ls-indicator" title="">
-    <span class="label js-indicator-text c-indicator__label"></span>
+    <span class="label indicator-text"></span>
 </div>
--- a/src/api/notifications/NotificationApi.js
+++ b/src/api/notifications/NotificationApi.js
--- a/src/api/objects/MutableObject.js
+++ b/src/api/objects/MutableObject.js
@@ -21,10 +21,8 @@
 *****************************************************************************/
 define([
    './object-utils.js',
    'lodash'
 ], function (
    utils,
    _
 ) {
    var ANY_OBJECT_EVENT = "mutation";
@@ -43,9 +41,7 @@ define([
    }
    function qualifiedEventName(object, eventName) {
-        var keystring = utils.makeKeyString(object.identifier);
+        return [object.identifier.key, eventName].join(':');
        return [keystring, eventName].join(':');
    }
    MutableObject.prototype.stopListening = function () {
--- a/src/api/objects/ObjectAPI.js
+++ b/src/api/objects/ObjectAPI.js
@@ -226,20 +226,7 @@ define([
                    (identifier.namespace === identifiers[0].namespace &&
                        identifier.key === identifiers[0].key);
            });
    };
    ObjectAPI.prototype.getOriginalPath = function (identifier, path = []) {
        return this.get(identifier).then((domainObject) => {
            path.push(domainObject);
            let location = domainObject.location;
            if (location) {
                return this.getOriginalPath(utils.parseKeyString(location), path);
            } else {
                return path;
    }
        });
    };
    /**
     * Uniquely identifies a domain object.
--- a/src/api/overlays/Overlay.js
+++ b/src/api/overlays/Overlay.js
@@ -5,8 +5,7 @@ import Vue from 'vue';
 const cssClasses = {
    large: 'l-overlay-large',
    small: 'l-overlay-small',
-    fit: 'l-overlay-fit',
+    fit: 'l-overlay-fit'
    fullscreen: 'l-overlay-fullscreen'
 };
 class Overlay extends EventEmitter {
--- a/src/api/overlays/components/DialogComponent.vue
+++ b/src/api/overlays/components/DialogComponent.vue
@@ -27,16 +27,10 @@
 <style lang="scss">
    @import "~styles/sass-base";
    @mixin legacyMessage() {
        flex: 0 1 auto;
        font-family: symbolsfont;
        font-size: $messageIconD; // Singleton message in a dialog
        margin-right: $interiorMarginLg;
    }
    .c-message {
        display: flex;
        align-items: center;
        padding: $interiorMarginLg;
        > * + * {
            margin-left: $interiorMarginLg;
@@ -64,44 +58,7 @@
        &__title,
        &__action-text {
            font-size: 1.2em; // TEMP
        }
        &--simple {
            // Icon and text elements only
            &:before {
                font-size: 30px !important;
            }
            [class*='__text'] {
                font-size: 1.25em;
            }
        }
        /************************** LEGACY */
        &.message-severity-info:before {
            @include legacyMessage();
            content: $glyph-icon-info;
            color: $colorInfo;
        }
        &.message-severity-alert:before {
            @include legacyMessage();
            content: $glyph-icon-alert-rect;
            color: $colorWarningLo;
        }
        &.message-severity-error:before {
            @include legacyMessage();
            content: $glyph-icon-alert-triangle;
            color: $colorWarningHi;
        }
        // Messages in a list
        .c-overlay__messages & {
            padding: $interiorMarginLg;
            &:before {
                font-size: $messageListIconD;
            }
        }
    }
 </style>
--- a/src/api/overlays/components/OverlayComponent.vue
+++ b/src/api/overlays/components/OverlayComponent.vue
@@ -56,11 +56,9 @@
        }
        &__close-button {
-            $p: $interiorMargin;
+            $p: $interiorMarginSm;
            border-radius: 100% !important;
            color: $overlayColorFg;
            display: inline-block;
            font-size: 1.25em;
            position: absolute;
            top: $p; right: $p;
        }
@@ -69,7 +67,6 @@
            flex: 1 1 auto;
            display: flex;
            flex-direction: column;
            overflow: hidden;
        }
        &__top-bar {
@@ -93,7 +90,6 @@
            display: flex;
            flex-direction: column;
            flex: 1 1 auto;
            height: 0; // Chrome 73 overflow bug fix
            overflow: auto;
            padding-right: $interiorMargin; // fend off scroll bar
        }
@@ -123,25 +119,14 @@
                cursor: pointer;
                display: block;
            }
        }
-        // Overlay types, styling for desktop. Appended to .l-overlay-wrapper element.
+            &__outer {
        .l-overlay-large,
        .l-overlay-small,
        .l-overlay-fit {
            .c-overlay__outer {
                border-radius: $overlayCr;
                box-shadow: rgba(black, 0.5) 0 2px 25px;
            }
        }
-        .l-overlay-fullscreen {
+        // Overlay types, styling for desktop. Appended to .l-overlay-wrapper element.
            // Used by About > Licenses display
            .c-overlay__outer {
                @include overlaySizing($overlayOuterMarginFullscreen);
            }
        }
        .l-overlay-large {
            // Default
            .c-overlay__outer {
@@ -155,7 +140,6 @@
            }
        }
        .t-dialog-sm .l-overlay-small, // Legacy dialog support
        .l-overlay-fit {
            .c-overlay__outer {
                @include overlaySizing(auto);
--- a/src/api/telemetry/TelemetryAPI.js
+++ b/src/api/telemetry/TelemetryAPI.js
@@ -280,11 +280,7 @@ define([
        if (!provider) {
            return Promise.reject('No provider found');
        }
-        return provider.request.apply(provider, arguments).catch((rejected) => {
+        return provider.request.apply(provider, arguments);
            this.openmct.notifications.error('Error requesting telemetry data, see console for details');
            console.error(rejected);
            return Promise.reject(rejected);
        });
    };
    /**
--- a/src/api/telemetry/TelemetryAPISpec.js
+++ b/src/api/telemetry/TelemetryAPISpec.js
@@ -28,22 +28,14 @@ define([
    describe('Telemetry API', function () {
        var openmct;
        var telemetryAPI;
        var mockTypeService;
        beforeEach(function () {
            openmct = {
                time: jasmine.createSpyObj('timeAPI', [
                    'timeSystem',
                    'bounds'
                ]),
                $injector: jasmine.createSpyObj('injector', [
                    'get'
                ])
            };
            mockTypeService = jasmine.createSpyObj('typeService', [
                'getType'
            ]);
            openmct.$injector.get.and.returnValue(mockTypeService);
            openmct.time.timeSystem.and.returnValue({key: 'system'});
            openmct.time.bounds.and.returnValue({start: 0, end: 1});
            telemetryAPI = new TelemetryAPI(openmct);
@@ -304,233 +296,5 @@ define([
                );
            });
        });
        describe('metadata', function () {
            let mockMetadata = {};
            let mockObjectType = {
                typeDef: {}
            };
            beforeEach(function () {
                telemetryAPI.addProvider({
                    key: 'mockMetadataProvider',
                    supportsMetadata() {
                        return true;
                    },
                    getMetadata() {
                        return mockMetadata;
                    }
                });
                mockTypeService.getType.and.returnValue(mockObjectType);
            })
            it('respects explicit priority', function () {
                mockMetadata.values = [
                    {
                        key: "name",
                        name: "Name",
                        hints: {
                            priority: 2
                        }
                    },
                    {
                        key: "timestamp",
                        name: "Timestamp",
                        hints: {
                            priority: 1
                        }
                    },
                    {
                        key: "sin",
                        name: "Sine",
                        hints: {
                            priority: 4
                        }
                    },
                    {
                        key: "cos",
                        name: "Cosine",
                        hints: {
                            priority: 3
                        }
                    }
                ];
                let metadata = telemetryAPI.getMetadata({});
                let values = metadata.values();
                values.forEach((value, index) => {
                    expect(value.hints.priority).toBe(index + 1);
                });
            });
            it('if no explicit priority, defaults to order defined', function () {
                mockMetadata.values = [
                    {
                        key: "name",
                        name: "Name"
                    },
                    {
                        key: "timestamp",
                        name: "Timestamp"
                    },
                    {
                        key: "sin",
                        name: "Sine"
                    },
                    {
                        key: "cos",
                        name: "Cosine"
                    }
                ];
                let metadata = telemetryAPI.getMetadata({});
                let values = metadata.values();
                values.forEach((value, index) => {
                    expect(value.key).toBe(mockMetadata.values[index].key);
                });
            });
            it('respects domain priority', function () {
                mockMetadata.values = [
                    {
                        key: "name",
                        name: "Name"
                    },
                    {
                        key: "timestamp-utc",
                        name: "Timestamp UTC",
                        hints: {
                            domain: 2
                        }
                    },
                    {
                        key: "timestamp-local",
                        name: "Timestamp Local",
                        hints: {
                            domain: 1
                        }
                    },
                    {
                        key: "sin",
                        name: "Sine",
                        hints: {
                            range: 2
                        }
                    },
                    {
                        key: "cos",
                        name: "Cosine",
                        hints: {
                            range: 1
                        }
                    }
                ];
                let metadata = telemetryAPI.getMetadata({});
                let values = metadata.valuesForHints(['domain']);
                expect(values[0].key).toBe('timestamp-local');
                expect(values[1].key).toBe('timestamp-utc');
            });
            it('respects range priority', function () {
                mockMetadata.values = [
                    {
                        key: "name",
                        name: "Name"
                    },
                    {
                        key: "timestamp-utc",
                        name: "Timestamp UTC",
                        hints: {
                            domain: 2
                        }
                    },
                    {
                        key: "timestamp-local",
                        name: "Timestamp Local",
                        hints: {
                            domain: 1
                        }
                    },
                    {
                        key: "sin",
                        name: "Sine",
                        hints: {
                            range: 2
                        }
                    },
                    {
                        key: "cos",
                        name: "Cosine",
                        hints: {
                            range: 1
                        }
                    }
                ];
                let metadata = telemetryAPI.getMetadata({});
                let values = metadata.valuesForHints(['range']);
                expect(values[0].key).toBe('cos');
                expect(values[1].key).toBe('sin');
            });
            it('respects priority and domain ordering', function () {
                mockMetadata.values = [
                    {
                        key: "id",
                        name: "ID",
                        hints: {
                            priority: 2
                        }
                    },
                    {
                        key: "name",
                        name: "Name",
                        hints: {
                            priority: 1
                        }
                    },
                    {
                        key: "timestamp-utc",
                        name: "Timestamp UTC",
                        hints: {
                            domain: 2,
                            priority: 1
                        }
                    },
                    {
                        key: "timestamp-local",
                        name: "Timestamp Local",
                        hints: {
                            domain: 1,
                            priority: 2
                        }
                    },
                    {
                        key: "timestamp-pst",
                        name: "Timestamp PST",
                        hints: {
                            domain: 3,
                            priority: 2
                        }
                    },
                    {
                        key: "sin",
                        name: "Sine"
                    },
                    {
                        key: "cos",
                        name: "Cosine"
                    }
                ];
                let metadata = telemetryAPI.getMetadata({});
                let values = metadata.valuesForHints(['priority', 'domain']);
                [
                    'timestamp-utc',
                    'timestamp-local',
                    'timestamp-pst'
                ].forEach((key, index) => {
                    expect(values[index].key).toBe(key);
                });
            });
        })
    });
 });
--- a/src/api/telemetry/TelemetryMetadataManager.js
+++ b/src/api/telemetry/TelemetryMetadataManager.js
@@ -116,12 +116,12 @@ define([
            return hints.every(hasHint, metadata);
        }
        var matchingMetadata = this.valueMetadatas.filter(hasHints);
-        let iteratees = hints.map(hint => {
+        var sortedMetadata = _.sortBy(matchingMetadata, function (metadata) {
-            return (metadata) => {
+            return hints.map(function (hint) {
                return metadata.hints[hint];
            }
            });
-        return _.sortByAll(matchingMetadata, ...iteratees);
+        });
        return sortedMetadata;
    };
    TelemetryMetadataManager.prototype.getFilterableValues = function () {
--- a/src/exporters/CSVExporter.js
+++ b/src/exporters/CSVExporter.js
@@ -32,6 +32,6 @@ class CSVExporter {
        let blob = new Blob([csvText], { type: "text/csv" });
        saveAs(blob, filename);
    }
-}
+};
 export default CSVExporter;
--- a/src/fonts/symbols/icomoon-project-openmct-symbols-12px.json
+++ b/src/fonts/symbols/icomoon-project-openmct-symbols-12px.json
@@ -1,35 +1,19 @@
 {
  "metadata": {
-    "name": "Open MCT Symbols 12px",
+    "name": "openmct-symbols-12px",
    "lastOpened": 0,
-    "created": 1561483556329
+    "created": 1527031065005
  },
  "iconSets": [
    {
      "selection": [
        {
          "order": 12,
          "id": 10,
          "name": "icon12-filter",
          "prevSize": 12,
          "code": 59686,
          "tempChar": ""
        },
        {
          "order": 14,
          "id": 11,
          "name": "icon12-filter-outline",
          "prevSize": 12,
          "code": 59687,
          "tempChar": ""
        },
        {
          "order": 9,
          "id": 6,
          "name": "icon12-crosshair",
          "prevSize": 12,
          "code": 59696,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 11,
@@ -37,7 +21,7 @@
          "name": "icon12-grippy",
          "prevSize": 12,
          "code": 59697,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 10,
@@ -45,7 +29,7 @@
          "name": "icon12-list-view",
          "prevSize": 12,
          "code": 921666,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 6,
@@ -53,14 +37,14 @@
          "prevSize": 12,
          "code": 921865,
          "name": "icon12-folder",
-          "tempChar": ""
+          "tempChar": ""
        }
      ],
      "id": 0,
      "metadata": {
-        "name": "Open MCT Symbols 12px",
+        "name": "openmct-symbols-12px",
        "importSize": {
-          "width": 384,
+          "width": 279,
          "height": 384
        },
        "designer": "Charles Hacskaylo"
@@ -68,28 +52,6 @@
      "height": 1024,
      "prevSize": 12,
      "icons": [
        {
          "id": 10,
          "paths": [
            "M853.333 0h-682.667c-94.135 0.302-170.364 76.532-170.667 170.638l-0 0.029v682.667c0.302 94.135 76.532 170.364 170.638 170.667l0.029 0h256v-341.333l-341.333-341.333h853.333l-341.333 341.333 1.067 341.333h254.933c94.135-0.302 170.364-76.532 170.667-170.638l0-0.029v-682.667c-0.302-94.135-76.532-170.364-170.638-170.667l-0.029-0z"
          ],
          "attrs": [],
          "grid": 0,
          "tags": [
            "icon12-filter"
          ]
        },
        {
          "id": 11,
          "paths": [
            "M853.333 0h-682.667c-94.135 0.302-170.364 76.532-170.667 170.638l-0 0.029v682.667c0.302 94.135 76.532 170.364 170.638 170.667l0.029 0h682.667c94.135-0.302 170.364-76.532 170.667-170.638l0-0.029v-682.667c-0.302-94.135-76.532-170.364-170.638-170.667l-0.029-0zM170.933 853.333h-0.267v-512l256 256v256zM853.067 853.333h-255.2l-0.533-256 256-256v511.733zM853.333 341.333h-682.667v-170.4h682.667z"
          ],
          "attrs": [],
          "grid": 0,
          "tags": [
            "icon12-filter-outline"
          ]
        },
        {
          "id": 6,
          "paths": [
@@ -98,11 +60,26 @@
            "M597.333 768h-170.667v256h170.667v-256z",
            "M256 426.667h-256v170.667h256v-170.667z"
          ],
-          "attrs": [],
+          "attrs": [
            {},
            {},
            {},
            {}
          ],
          "isMulticolor": false,
          "isMulticolor2": false,
          "grid": 0,
          "tags": [
            "icon12-crosshair"
          ],
          "colorPermutations": {
            "1161751": [
              {},
              {},
              {},
              {}
            ]
          }
        },
        {
          "id": 8,
@@ -118,12 +95,39 @@
            "M744.773 511.867c0 51.458-41.715 93.173-93.173 93.173s-93.173-41.715-93.173-93.173c0-51.458 41.715-93.173 93.173-93.173s93.173 41.715 93.173 93.173z",
            "M744.773 791.36c0 51.458-41.715 93.173-93.173 93.173s-93.173-41.715-93.173-93.173c0-51.458 41.715-93.173 93.173-93.173s93.173 41.715 93.173 93.173z"
          ],
-          "attrs": [],
+          "attrs": [
            {},
            {},
            {},
            {},
            {},
            {},
            {},
            {},
            {},
            {}
          ],
          "width": 745,
          "isMulticolor": false,
          "isMulticolor2": false,
          "grid": 0,
          "tags": [
            "icon12-grippy"
          ],
          "colorPermutations": {
            "1161751": [
              {},
              {},
              {},
              {},
              {},
              {},
              {},
              {},
              {},
              {}
            ]
          }
        },
        {
          "id": 7,
@@ -132,11 +136,24 @@
            "M0 426.667h1024v170.667h-1024v-170.667z",
            "M0 853.333h1024v170.667h-1024v-170.667z"
          ],
-          "attrs": [],
+          "attrs": [
            {},
            {},
            {}
          ],
          "isMulticolor": false,
          "isMulticolor2": false,
          "grid": 0,
          "tags": [
            "icon12-list-view"
          ],
          "colorPermutations": {
            "1161751": [
              {},
              {},
              {}
            ]
          }
        },
        {
          "id": 3,
@@ -145,14 +162,40 @@
            "M85.333 426.667h853.333c47.128 0 85.333 38.205 85.333 85.333v426.667c0 47.128-38.205 85.333-85.333 85.333h-853.333c-47.128 0-85.333-38.205-85.333-85.333v-426.667c0-47.128 38.205-85.333 85.333-85.333z"
          ],
          "attrs": [],
          "isMulticolor": false,
          "grid": 0,
          "tags": [
            "icon12-folder"
          ],
          "colorPermutations": {
            "1161751": [
              {
                "f": 0
              },
              {
                "f": 0
              }
            ]
          }
        }
      ],
      "invisible": false,
-      "colorThemes": [],
+      "colorThemes": [
        [
          [
            0,
            0,
            0,
            1
          ],
          [
            0,
            161,
            75,
            1
          ]
        ]
      ],
      "colorThemeIdx": 0
    }
  ],
@@ -163,9 +206,9 @@
    "showQuickUse2": true,
    "showSVGs": true,
    "fontPref": {
-      "prefix": "openmct-symbols-",
+      "prefix": "icon-",
      "metadata": {
-        "fontFamily": "Open-MCT-Symbols-12px",
+        "fontFamily": "openmct-symbols-12px",
        "majorVersion": 1,
        "minorVersion": 0
      },
@@ -174,12 +217,7 @@
        "baseline": 6.25,
        "whitespace": 50
      },
-      "embed": false,
+      "embed": false
      "noie8": true,
      "ie7": false,
      "showMetadata": false,
      "includeMetadata": false,
      "showMetrics": true
    },
    "imagePref": {
      "prefix": "icon-",
--- a/src/fonts/symbols/icomoon-project-openmct-symbols-16px.json
+++ b/src/fonts/symbols/icomoon-project-openmct-symbols-16px.json
--- a/src/fonts/symbols/openmct-symbols-12px.eot
+++ b/src/fonts/symbols/openmct-symbols-12px.eot
--- a/src/fonts/symbols/openmct-symbols-12px.svg
+++ b/src/fonts/symbols/openmct-symbols-12px.svg
@@ -0,0 +1,14 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by IcoMoon</metadata>
 <defs>
 <font id="openmct-symbols-12px" horiz-adv-x="1024">
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
 <glyph unicode="&#xe930;" glyph-name="icon12-crosshair" d="M597.333 938.667h-170.667v-256h170.667v256zM1024 512h-256v-170.667h256v170.667zM597.333 170.667h-170.667v-256h170.667v256zM256 512h-256v-170.667h256v170.667z" />
 <glyph unicode="&#xe931;" glyph-name="icon12-grippy" horiz-adv-x="745" d="M186.347 706.027c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173zM186.347 426.8c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173zM186.347 147.307c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173zM465.573 845.494c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173zM465.573 566.267c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173zM379.028 379.939c51.328-3.652 89.978-48.223 86.325-99.551s-48.223-89.978-99.551-86.325c-51.328 3.652-89.978 48.223-86.325 99.551s48.223 89.978 99.551 86.325zM379.017 100.707c51.328-3.652 89.978-48.223 86.325-99.551s-48.223-89.978-99.551-86.325c-51.328 3.652-89.978 48.223-86.325 99.551s48.223 89.978 99.551 86.325zM744.773 706.027c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173zM744.773 426.8c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173zM744.773 147.307c0-51.458-41.715-93.173-93.173-93.173s-93.173 41.715-93.173 93.173c0 51.458 41.715 93.173 93.173 93.173s93.173-41.715 93.173-93.173z" />
 <glyph unicode="&#xe1042;" glyph-name="icon12-list-view" d="M0 938.667h1024v-170.667h-1024v170.667zM0 512h1024v-170.667h-1024v170.667zM0 85.334h1024v-170.667h-1024v170.667z" />
 <glyph unicode="&#xe1109;" glyph-name="icon12-folder" d="M938.667 768h-341.333l-110.32 110.32c-33.2 33.2-98.667 60.347-145.68 60.347h-256c-47.073-0.136-85.197-38.26-85.333-85.32v-341.346c0.136 47.073 38.26 85.197 85.32 85.333h853.346c47.073-0.136 85.197-38.26 85.333-85.32v170.654c-0.136 47.073-38.26 85.197-85.32 85.333zM85.333 512h853.333c47.128 0 85.333-38.205 85.333-85.333v-426.667c0-47.128-38.205-85.333-85.333-85.333h-853.333c-47.128 0-85.333 38.205-85.333 85.333v426.667c0 47.128 38.205 85.333 85.333 85.333z" />
 </font></defs></svg>
--- a/src/fonts/symbols/openmct-symbols-12px.ttf
+++ b/src/fonts/symbols/openmct-symbols-12px.ttf
--- a/src/fonts/symbols/openmct-symbols-12px.woff
+++ b/src/fonts/symbols/openmct-symbols-12px.woff
--- a/src/fonts/symbols/openmct-symbols-16px.eot
+++ b/src/fonts/symbols/openmct-symbols-16px.eot
--- a/src/fonts/symbols/openmct-symbols-16px.svg
+++ b/src/fonts/symbols/openmct-symbols-16px.svg
@@ -0,0 +1,123 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by IcoMoon</metadata>
 <defs>
 <font id="openmct-symbols-16px" horiz-adv-x="1024">
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
 <glyph unicode="&#xe900;" glyph-name="icon-alert-rect" d="M896 960h-768c-70.6-0.2-127.8-57.4-128-128v-768c0.2-70.6 57.4-127.8 128-128h768c70.6 0.2 127.8 57.4 128 128v768c-0.2 70.6-57.4 127.8-128 128zM576 64h-128v128h128v-128zM597.8 448l-37.8-192h-96l-37.8 192v384h171.8v-384z" />
 <glyph unicode="&#xe901;" glyph-name="icon-alert-triangle" d="M998.2 111.2l-422.6 739.6c-35 61.2-92 61.2-127 0l-422.8-739.6c-35-61.2-6-111.2 64.4-111.2h843.4c70.6 0 99.6 50 64.6 111.2zM576 64h-128v128h128v-128zM597.8 448l-37.8-192h-96l-37.8 192v256h171.8v-256z" />
 <glyph unicode="&#xe902;" glyph-name="icon-arrow-down" d="M512 192l512 512h-1024z" />
 <glyph unicode="&#xe903;" glyph-name="icon-arrow-left" d="M256 448l512-512v1024z" />
 <glyph unicode="&#xe904;" glyph-name="icon-arrow-right" d="M768 448l-512 512v-1024z" />
 <glyph unicode="&#xe905;" glyph-name="icon-arrow-double-up" d="M510 450l512-512h-1024zM510 962l512-512h-1024z" />
 <glyph unicode="&#xe906;" glyph-name="icon-arrow-tall-up" d="M512 960l512-1024h-1024z" />
 <glyph unicode="&#xe907;" glyph-name="icon-arrow-tall-down" d="M512-64l-512 1024h1024z" />
 <glyph unicode="&#xe908;" glyph-name="icon-arrow-double-down" d="M510 450l-512 512h1024zM510-62l-512 512h1024z" />
 <glyph unicode="&#xe909;" glyph-name="icon-arrow-up" d="M512 704l-512-512h1024z" />
 <glyph unicode="&#xe910;" glyph-name="icon-asterisk" d="M1004.166 619.542l-97.522 168.916-330.534-229.414 33.414 400.956h-195.048l33.414-400.956-330.534 229.414-97.522-168.916 363.944-171.542-363.944-171.542 97.522-168.916 330.534 229.414-33.414-400.956h195.048l-33.414 400.956 330.534-229.414 97.522 168.916-363.944 171.542z" />
 <glyph unicode="&#xe911;" glyph-name="icon-bell" d="M512-64c106 0 192 86 192 192h-384c0-106 86-192 192-192zM896 512v64c0 212-172 384-384 384s-384-172-384-384v-64c0-70.6-57.4-128-128-128v-128h1024v128c-70.6 0-128 57.4-128 128z" />
 <glyph unicode="&#xe912;" glyph-name="icon-box" d="M0 960h1024v-1024h-1024v1024z" />
 <glyph unicode="&#xe913;" glyph-name="icon-box-with-arrow-cursor" d="M894 962h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h400c-2.2 3.8-4 7.6-5.8 11.4l-255.2 576.8c-21.4 48.4-10.8 105 26.6 142.4 24.4 24.4 57.2 37.4 90.4 37.4 17.4 0 35.2-3.6 51.8-11l576.6-255.4c4-1.8 7.8-3.8 11.4-5.8v400.2c0.2 70.4-57.4 128-127.8 128zM958.6 322.6l-576.6 255.4 255.4-576.6 64.6 128.6 192-192 128 128-192 192z" />
 <glyph unicode="&#xe914;" glyph-name="icon-check" d="M1024 960l-640-640-384 384v-384l384-384 640 640z" />
 <glyph unicode="&#xe915;" glyph-name="icon-connectivity" d="M704 384c0-70.4-57.6-128-128-128h-128c-70.4 0-128 57.6-128 128v128c0 70.4 57.6 128 128 128h128c70.4 0 128-57.6 128-128v-128zM1024 448l-192 320v-640zM0 448l192 320v-640z" />
 <glyph unicode="&#xe916;" glyph-name="icon-database-in-brackets" d="M768 608c0-53.019-114.615-96-256-96s-256 42.981-256 96c0 53.019 114.615 96 256 96s256-42.981 256-96zM768 288v256c0-53-114.6-96-256-96s-256 43-256 96v-256c0-53 114.6-96 256-96s256 43 256 96zM832 960h-128v-192h127.6c0.2 0 0.2-0.2 0.4-0.4v-639.4c0-0.2-0.2-0.2-0.4-0.4h-127.6v-192h128c105.6 0 192 86.4 192 192v640.2c0 105.6-86.4 192-192 192zM192 128.4v639.4c0 0.2 0.2 0.2 0.4 0.4h127.6v191.8h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192h-127.6c-0.2 0-0.4 0.2-0.4 0.4z" />
 <glyph unicode="&#xe917;" glyph-name="icon-eye-open" d="M512 843.6c-245.8 0-452.2-168-510.8-395.6 58.6-227.4 265-395.6 510.8-395.6s452.2 168 510.8 395.6c-58.6 227.4-265 395.6-510.8 395.6zM829.2 371.6c-22.6-34.4-50.6-64.8-83-90.4-32.8-25.8-69-45.6-108-59.4-40.4-14.2-82.8-21.4-126-21.4s-85.8 7.2-126 21.4c-39 13.8-75.4 33.8-108 59.4-32.4 25.6-60.4 55.8-83 90.4-15.8 24-28.8 49.6-38.6 76.4 10 26.8 23 52.4 38.6 76.4 22.6 34.4 50.6 64.8 83 90.4 32.8 25.8 69 45.6 108 59.4 40.4 14.2 82.8 21.4 126 21.4s85.8-7.2 126-21.4c39-13.8 75.4-33.8 108-59.4 32.4-25.6 60.4-55.8 83-90.4 15.8-24 28.8-49.6 38.6-76.4-9.8-26.8-22.8-52.4-38.6-76.4zM704 448c0-106.039-85.961-192-192-192s-192 85.961-192 192c0 106.039 85.961 192 192 192s192-85.961 192-192z" />
 <glyph unicode="&#xe918;" glyph-name="icon-gear" d="M1024 384v128l-140.976 35.244c-8.784 32.922-21.818 64.106-38.504 92.918l74.774 124.622-90.51 90.51-124.622-74.774c-28.812 16.686-59.996 29.72-92.918 38.504l-35.244 140.976h-128l-35.244-140.976c-32.922-8.784-64.106-21.818-92.918-38.504l-124.622 74.774-90.51-90.51 74.774-124.622c-16.686-28.812-29.72-59.996-38.504-92.918l-140.976-35.244v-128l140.976-35.244c8.784-32.922 21.818-64.106 38.504-92.918l-74.774-124.622 90.51-90.51 124.622 74.774c28.812-16.686 59.996-29.72 92.918-38.504l35.244-140.976h128l35.244 140.976c32.922 8.784 64.106 21.818 92.918 38.504l124.622-74.774 90.51 90.51-74.774 124.622c16.686 28.812 29.72 59.996 38.504 92.918l140.976 35.244zM704 448c0-106.038-85.962-192-192-192s-192 85.962-192 192 85.962 192 192 192 192-85.962 192-192z" />
 <glyph unicode="&#xe919;" glyph-name="icon-hourglass" d="M1024 960h-1024c0-282.8 229.2-512 512-512s512 229.2 512 512zM512 576c-102.6 0-199 40-271.6 112.4-41.2 41.2-72 90.2-90.8 143.6h724.6c-18.8-53.4-49.6-102.4-90.8-143.6-72.4-72.4-168.8-112.4-271.4-112.4zM512 448c-282.8 0-512-229.2-512-512h1024c0 282.8-229.2 512-512 512z" />
 <glyph unicode="&#xe920;" glyph-name="icon-info" d="M512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM512 832c70.6 0 128-57.4 128-128s-57.4-128-128-128c-70.6 0-128 57.4-128 128s57.4 128 128 128zM704 128h-384v128h64v256h256v-256h64v-128z" />
 <glyph unicode="&#xe921;" glyph-name="icon-link" d="M1024 448l-512 512v-307.2l-512-204.8v-256h512v-256z" />
 <glyph unicode="&#xe922;" glyph-name="icon-lock" d="M832 576h-32v96c0 158.8-129.2 288-288 288s-288-129.2-288-288v-96h-32c-70.4 0-128-57.6-128-128v-384c0-70.4 57.6-128 128-128h640c70.4 0 128 57.6 128 128v384c0 70.4-57.6 128-128 128zM416 672c0 53 43 96 96 96s96-43 96-96v-96h-192v96z" />
 <glyph unicode="&#xe923;" glyph-name="icon-minus" d="M960 320c35.2 0 64 28.8 64 64v128c0 35.2-28.8 64-64 64h-896c-35.2 0-64-28.8-64-64v-128c0-35.2 28.8-64 64-64h896z" />
 <glyph unicode="&#xe924;" glyph-name="icon-people" d="M704 640h64c70.4 0 128 57.6 128 128v64c0 70.4-57.6 128-128 128h-64c-70.4 0-128-57.6-128-128v-64c0-70.4 57.6-128 128-128zM256 640h64c70.4 0 128 57.6 128 128v64c0 70.4-57.6 128-128 128h-64c-70.4 0-128-57.6-128-128v-64c0-70.4 57.6-128 128-128zM832 576h-192c-34.908 0-67.716-9.448-96-25.904 57.278-33.324 96-95.404 96-166.096v-448h384v448c0 105.6-86.4 192-192 192zM384 576h-192c-105.6 0-192-86.4-192-192v-448h576v448c0 105.6-86.4 192-192 192z" />
 <glyph unicode="&#xe925;" glyph-name="icon-person" d="M768 704c0-105.6-86.4-192-192-192h-128c-105.6 0-192 86.4-192 192v64c0 105.6 86.4 192 192 192h128c105.6 0 192-86.4 192-192v-64zM64-64v192c0 140.8 115.2 256 256 256h384c140.8 0 256-115.2 256-256v-192z" />
 <glyph unicode="&#xe926;" glyph-name="icon-plus" d="M960 576h-330v320c0 35.2-28.8 64-64 64h-108c-35.2 0-64-28.8-64-64v-320h-330c-35.2 0-64-28.8-64-64v-128c0-35.2 28.8-64 64-64h330v-320c0-35.2 28.8-64 64-64h108c35.2 0 64 28.8 64 64v320h330c35.2 0 64 28.8 64 64v128c0 35.2-28.8 64-64 64z" />
 <glyph unicode="&#xe927;" glyph-name="icon-trash" d="M832 832h-192.36v64c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-64h-191.64c-105.6 0-192-72-192-160s0-160 0-160h64v-384c0-105.6 86.4-192 192-192h512c105.6 0 192 86.4 192 192v384h64c0 0 0 72 0 160s-86.4 160-192 160zM320 128h-128v384h128v-384zM576 128h-128v384h128v-384zM832 128h-128v384h128v-384z" />
 <glyph unicode="&#xe928;" glyph-name="icon-x" d="M384 448l-365.332-365.332c-24.89-24.89-24.89-65.62 0-90.51l37.49-37.49c24.89-24.89 65.62-24.89 90.51 0 0 0 365.332 365.332 365.332 365.332l365.332-365.332c24.89-24.89 65.62-24.89 90.51 0l37.49 37.49c24.89 24.89 24.89 65.62 0 90.51l-365.332 365.332c0 0 365.332 365.332 365.332 365.332 24.89 24.89 24.89 65.62 0 90.51l-37.49 37.49c-24.89 24.89-65.62 24.89-90.51 0 0 0-365.332-365.332-365.332-365.332l-365.332 365.332c-24.89 24.89-65.62 24.89-90.51 0l-37.49-37.49c-24.89-24.89-24.89-65.62 0-90.51 0 0 365.332-365.332 365.332-365.332z" />
 <glyph unicode="&#xe929;" glyph-name="icon-brackets" d="M832 960h-192v-192h191.66l0.34-0.34v-639.32l-0.34-0.34h-191.66v-192h192c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM384 128h-191.66l-0.34 0.34v639.32l0.34 0.34h191.66v192h-192c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h192v192z" />
 <glyph unicode="&#xe930;" glyph-name="icon-crosshair" d="M574 962h-128v-320h128v320zM1022 514h-320v-128h320v128zM574 258h-128v-320h128v320zM318 514h-320v-128h320v128z" />
 <glyph unicode="&#xe931;" glyph-name="icon-grippy-v2" horiz-adv-x="586" d="M146.4 777.2c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM146.4 557.8c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM146.4 338.2c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM146.4 118.8c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM365.8 886.8c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM365.8 667.4c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM365.8 448c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM365.8 228.6c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM365.8 9.2c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM585.2 777.2c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM585.2 557.8c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM585.2 338.2c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2zM585.2 118.8c0-40.427-32.773-73.2-73.2-73.2s-73.2 32.773-73.2 73.2c0 40.427 32.773 73.2 73.2 73.2s73.2-32.773 73.2-73.2z" />
 <glyph unicode="&#xe932;" glyph-name="icon-arrow-right-equilateral" d="M962 448l-896-512v1024z" />
 <glyph unicode="&#xe1000;" glyph-name="icon-arrows-out" d="M0 448l256-256v512zM512 960l-256-256h512zM512-64l256 256h-512zM768 704v-512l256 256z" />
 <glyph unicode="&#xe1001;" glyph-name="icon-arrows-right-left" d="M1024 448l-448-512v1024zM448 960l-448-512 448-512z" />
 <glyph unicode="&#xe1002;" glyph-name="icon-arrows-up-down" d="M512 960l512-448h-1024zM0 384l512-448 512 448z" />
 <glyph unicode="&#xe1004;" glyph-name="icon-bullet" d="M832 208c0-44-36-80-80-80h-480c-44 0-80 36-80 80v480c0 44 36 80 80 80h480c44 0 80-36 80-80v-480z" />
 <glyph unicode="&#xe1005;" glyph-name="icon-calendar" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM640 512h-256v192h256v-192zM384 448h256v-192h-256v192zM320 256h-256v192h256v-192zM320 704v-192h-256v192h256zM128 0c-17 0-33 6.6-45.2 18.8s-18.8 28.2-18.8 45.2v128h256v-192h-192zM384 0v192h256v-192h-256zM960 64c0-17-6.6-33-18.8-45.2s-28.2-18.8-45.2-18.8h-192v192h256v-128zM960 256h-256v192h256v-192zM960 512h-256v192h256v-192z" />
 <glyph unicode="&#xe1006;" glyph-name="icon-chain-links" d="M958.4 894.4c-43.8 43.8-101 65.6-158.4 65.6s-114.6-21.8-158.4-65.6l-128-128c-74-74-85.4-187-34-273l-12.8-12.8c-35.4 20.8-75 31.4-114.8 31.4-57.4 0-114.6-21.8-158.4-65.6l-128-128c-87.4-87.4-87.4-229.4 0-316.8 43.8-43.8 101-65.6 158.4-65.6s114.6 21.8 158.4 65.6l128 128c74 74 85.4 187 34 273l12.8 12.8c35.2-21 75-31.6 114.6-31.6 57.4 0 114.6 21.8 158.4 65.6l128 128c87.6 87.6 87.6 229.6 0.2 317zM419.8 220.2l-128-128c-18-18.2-42.2-28.2-67.8-28.2s-49.8 10-67.8 28.2c-37.4 37.4-37.4 98.4 0 135.8l128 128c18.2 18.2 42.2 28.2 67.8 28.2 5.6 0 11.2-0.6 16.8-1.4l-55.6-55.6c-10.4-10.4-16.2-24.2-16.2-38.8s5.8-28.6 16.2-38.8c10.4-10.4 24.2-16.2 38.8-16.2s28.6 5.8 38.8 16.2l55.6 55.6c5.4-30.4-3.6-62.2-26.6-85zM867.8 668.2l-128-128c-18-18.2-42.2-28.2-67.8-28.2-5.6 0-11.2 0.6-16.8 1.4l55.6 55.6c10.4 10.4 16.2 24.2 16.2 38.8s-5.8 28.6-16.2 38.8c-10.4 10.4-24.2 16.2-38.8 16.2s-28.6-5.8-38.8-16.2l-55.6-55.6c-5.2 29.8 3.6 61.6 26.6 84.6l128 128c18 18.4 42.2 28.4 67.8 28.4s49.8-10 67.8-28.2c37.6-37.4 37.6-98.2 0-135.6z" />
 <glyph unicode="&#xe1007;" glyph-name="icon-pane-collapse-left" horiz-adv-x="832" d="M0 960h192v-1024h-192v1024zM832 704h-256v256l-320-416 320-416v256h256v320z" />
 <glyph unicode="&#xe1008;" glyph-name="icon-pane-collapse-right" horiz-adv-x="832" d="M640 960h192v-1024h-192v1024zM0 704h256v256l320-416-320-416v256h-256v320z" />
 <glyph unicode="&#xe1009;" glyph-name="icon-download" d="M832 384v-255.66l-0.34-0.34-639.66 0.34v255.66h-192v-256c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v256h-192zM512 320l448 448h-256v192h-384v-192h-256l448-448z" />
 <glyph unicode="&#xe1010;" glyph-name="icon-duplicate" d="M640 704v128c0 70.4-57.6 128-128 128h-384c-70.4 0-128-57.6-128-128v-384c0-70.4 57.6-128 128-128h128v139.6c0 134.8 109.6 244.4 244.4 244.4h139.6zM896 576h-384c-70.4 0-128-57.6-128-128v-384c0-70.4 57.6-128 128-128h384c70.4 0 128 57.6 128 128v384c0 70.4-57.6 128-128 128z" />
 <glyph unicode="&#xe1011;" glyph-name="icon-folder-new" d="M896 768h-320c-16.4 16.4-96.8 96.8-109.2 109.2l-37.4 37.4c-25 25-74.2 45.4-109.4 45.4h-256c-35.2 0-64-28.8-64-64v-384c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v128c0 70.4-57.6 128-128 128zM896 512h-768c-70.4 0-128-57.6-128-128v-320c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v320c0 70.4-57.6 128-128 128zM704 160h-128v-128h-128v128h-128v128h128v128h128v-128h128v-128z" />
 <glyph unicode="&#xe1012;" glyph-name="icon-fullscreen-expand" d="M192.344 128c-0.118 0.1-0.244 0.224-0.344 0.344v191.656h-192v-192c0-105.6 86.4-192 192-192h192v192h-191.656zM192 767.656c0.1 0.118 0.224 0.244 0.344 0.344h191.656v192h-192c-105.6 0-192-86.4-192-192v-192h192v191.656zM832 960h-192v-192h191.656c0.118-0.1 0.244-0.226 0.344-0.344v-191.656h192v192c0 105.6-86.4 192-192 192zM832 128.344c-0.1-0.118-0.224-0.244-0.344-0.344h-191.656v-192h192c105.6 0 192 86.4 192 192v192h-192v-191.656z" />
 <glyph unicode="&#xe1013;" glyph-name="icon-fullscreen-collapse" d="M191.656 128c0.118-0.1 0.244-0.224 0.344-0.344v-191.656h192v192c0 105.6-86.4 192-192 192h-192v-192h191.656zM192 768.344c-0.1-0.118-0.224-0.244-0.344-0.344h-191.656v-192h192c105.6 0 192 86.4 192 192v192h-192v-191.656zM832 576h192v192h-191.656c-0.118 0.1-0.244 0.226-0.344 0.344v191.656h-192v-192c0-105.6 86.4-192 192-192zM832 127.656c0.1 0.118 0.224 0.244 0.344 0.344h191.656v192h-192c-105.6 0-192-86.4-192-192v-192h192v191.656z" />
 <glyph unicode="&#xe1014;" glyph-name="icon-layers" d="M1024 576l-512 384-512-384 512-384zM512 64l-426.666 320-85.334-64 512-384 512 384-85.334 64z" />
 <glyph unicode="&#xe1015;" glyph-name="icon-line-horz" d="M64 384c-35.346 0-64 28.654-64 64s28.654 64 64 64h896c35.346 0 64-28.654 64-64s-28.654-64-64-64h-896z" />
 <glyph unicode="&#xe1016;" glyph-name="icon-magnify" d="M1024 64l-256.8 256.8c42.4 66.6 65 144 64.8 223.2 0 229.8-186.2 416-416 416s-416-186.2-416-416 186.2-416 416-416c79-0.2 156.4 22.4 223.2 64.8l256.8-256.8 128 128zM212.4 340.4c-112.4 112.4-112.4 294.8 0 407.2s294.8 112.4 407.2 0 112.4-294.8 0-407.2c-54-54-127.2-84.4-203.6-84.4-76.4-0.2-149.8 30.2-203.6 84.4z" />
 <glyph unicode="&#xe1017;" glyph-name="icon-magnify-in" d="M1024 64l-256.86 256.86c40.681 62.963 64.861 139.898 64.861 222.481 0 0.232 0 0.464-0.001 0.696v-0.036c0 229.76-186.24 416-416 416s-416-186.24-416-416 186.24-416 416-416c0.196 0 0.427-0.001 0.659-0.001 82.583 0 159.518 24.18 224.112 65.846l-1.631-0.985 256.86-256.86zM212.36 340.36c-52.114 52.117-84.346 124.114-84.346 203.64 0 159.058 128.942 288 288 288s288-128.942 288-288c0-159.058-128.942-288-288-288-0.005 0-0.010 0-0.014 0h0.001c-0.242-0.001-0.529-0.001-0.815-0.001-79.271 0-151.010 32.251-202.811 84.348l-0.013 0.014zM224 608h384v-128h-384v128zM352 736h128v-384h-128v384z" />
 <glyph unicode="&#xe1018;" glyph-name="icon-magnify-out" d="M767.2 320.8c42.4 66.6 65 144 64.8 223.2 0 229.8-186.2 416-416 416s-416-186.2-416-416 186.2-416 416-416c79-0.2 156.4 22.4 223.2 64.8l256.8-256.8 128 128-256.8 256.8zM619.6 340.4c-54-54-127.2-84.4-203.6-84.4-76.4-0.2-149.8 30.2-203.6 84.4-112.4 112.4-112.4 294.8 0 407.2s294.8 112.4 407.2 0c112.4-112.4 112.4-294.8 0-407.2zM224 608h384v-128h-384v128z" />
 <glyph unicode="&#xe1019;" glyph-name="icon-menu" d="M0 832h1024v-128h-1024v128zM0 512h1024v-128h-1024v128zM0 192h1024v-128h-1024v128z" />
 <glyph unicode="&#xe1020;" glyph-name="icon-move" d="M293.4 448l218.6 218.6 256-256v421.4c0 70.4-57.6 128-128 128h-512c-70.4 0-128-57.6-128-128v-512c0-70.4 57.6-128 128-128h421.4l-256 256zM1024 512h-128v-320l-384 384-128-128 384-384h-320v-128h576z" />
 <glyph unicode="&#xe1021;" glyph-name="icon-new-window" d="M448 960v-128h320l-384-384 128-128 384 384v-320h128v576zM576 285.726v-157.382c-0.1-0.118-0.226-0.244-0.344-0.344h-383.312c-0.118 0.1-0.244 0.226-0.344 0.344v383.312c0.1 0.118 0.226 0.244 0.344 0.344h157.382l192 192h-349.726c-105.6 0-192-86.4-192-192v-384c0-105.6 86.4-192 192-192h384c105.6 0 192 86.4 192 192v349.726l-192-192z" />
 <glyph unicode="&#xe1022;" glyph-name="icon-paint-bucket" d="M544 736v-224c0-88.4-71.6-160-160-160s-160 71.6-160 160v97.2l-197.4-196.4c-50-50-12.4-215.2 112.4-340s290-162.4 340-112.4l417 423.6-352 352zM896-64c70.6 0 128 57.4 128 128 0 108.6-128 192-128 192s-128-83.4-128-192c0-70.6 57.4-128 128-128zM384 448c-35.4 0-64 28.6-64 64v384c0 35.4 28.6 64 64 64s64-28.6 64-64v-384c0-35.4-28.6-64-64-64z" />
 <glyph unicode="&#xe1023;" glyph-name="icon-pause" d="M126 962h256v-1024h-256v1024zM638 962h256v-1024h-256v1024z" />
 <glyph unicode="&#xe1024;" glyph-name="icon-pencil" d="M922.344 858.32c-38.612 38.596-81.306 69.232-120.304 86.324-68.848 30.25-104.77 9.078-120.194-6.344l-516.228-516.216-3.136-9.152-162.482-476.932 485.998 165.612 6.73 6.806 509.502 509.506c9.882 9.866 21.768 27.77 21.768 56.578 0.002 50.71-38.996 121.148-101.654 183.818zM237.982 104.34l-69.73 69.728 69.25 203.228 18.498 6.704h64v-128h128v-64l-6.846-18.506-203.172-69.154z" />
 <glyph unicode="&#xe1025;" glyph-name="icon-play" d="M1024 448l-1024-512v1024z" />
 <glyph unicode="&#xe1026;" glyph-name="icon-plot-resource" d="M255.884 256c0.040 0.034 0.082 0.074 0.116 0.116v127.884c0 70.58 57.42 128 128 128h255.884c0.040 0.034 0.082 0.074 0.116 0.116v127.884c0 70.58 57.42 128 128 128h143.658c-93.832 117.038-237.98 192-399.658 192-282.77 0-512-229.23-512-512 0-67.904 13.25-132.704 37.256-192h218.628zM768.116 640c-0.040-0.034-0.082-0.074-0.116-0.116v-127.884c0-70.58-57.42-128-128-128h-255.884c-0.040-0.034-0.082-0.074-0.116-0.116v-127.884c0-70.58-57.42-128-128-128h-143.658c93.832-117.038 237.98-192 399.658-192 282.77 0 512 229.23 512 512 0 67.904-13.25 132.704-37.256 192h-218.628z" />
 <glyph unicode="&#xe1027;" glyph-name="icon-pointer-left" horiz-adv-x="512" d="M510-64l-256 512 256 512h-256l-256-512 256-512z" />
 <glyph unicode="&#xe1028;" glyph-name="icon-pointer-right" horiz-adv-x="512" d="M-2 960l256-512-256-512h256l256 512-256 512z" />
 <glyph unicode="&#xe1029;" glyph-name="icon-refresh" d="M960 528v432l-164.8-164.8c-79.8 65.2-178.8 100.8-283.2 100.8-119.6 0-232.2-46.6-316.8-131.2s-131.2-197.2-131.2-316.8 46.6-232.2 131.2-316.8c84.6-84.6 197.2-131.2 316.8-131.2s232.2 46.6 316.8 131.2c69.4 69.4 113.2 157.4 126.6 252.8h-130c-29.8-145.8-159-256-313.6-256-176.4 0-320 143.6-320 320s143.8 320 320.2 320c72 0 138.4-23.8 192-64l-176-176h432z" />
 <glyph unicode="&#xe1030;" glyph-name="icon-save" d="M192.2 384c-0.2 0-0.2 0 0 0l-0.2-448h640v447.8c0 0 0 0-0.2 0.2h-639.6zM978.8 749.2l-165.4 165.4c-25 25-74.2 45.4-109.4 45.4h-576c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128v448c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-448c70.4 0 128 57.6 128 128v576c0 35.2-20.4 84.4-45.2 109.2zM704 704c0-35.2-28.8-64-64-64h-448c-35.2 0-64 28.8-64 64v192h320v-192h128v192h128v-192z" />
 <glyph unicode="&#xe1031;" glyph-name="icon-sine" d="M1022.294 448c-1.746 7.196-3.476 14.452-5.186 21.786-20.036 85.992-53.302 208.976-98 306.538-22.42 48.938-45.298 86.556-69.946 115.006-48.454 55.93-98.176 67.67-131.356 67.67s-82.902-11.74-131.356-67.672c-24.648-28.45-47.528-66.068-69.948-115.006-44.696-97.558-77.962-220.544-98-306.538-21.646-92.898-46.444-175.138-71.71-237.836-16.308-40.46-30.222-66.358-40.6-82.604-10.378 16.246-24.292 42.142-40.6 82.604-23.272 57.75-46.144 132.088-66.524 216.052h-197.362c1.746-7.196 3.476-14.452 5.186-21.786 20.036-85.992 53.302-208.976 98-306.538 22.42-48.938 45.298-86.556 69.946-115.006 48.454-55.932 98.176-67.672 131.356-67.672s82.902 11.74 131.356 67.672c24.648 28.45 47.528 66.068 69.948 115.006 44.696 97.558 77.962 220.544 98 306.538 21.646 92.898 46.444 175.138 71.71 237.836 16.308 40.46 30.222 66.358 40.6 82.604 10.378-16.246 24.292-42.142 40.6-82.604 23.274-57.748 46.146-132.086 66.526-216.050h197.36z" />
 <glyph unicode="&#xe1032;" glyph-name="icon-T" d="M0 960v-256h128v64h256v-704h-192v-128h640v128h-192v704h256v-64h128v256z" />
 <glyph unicode="&#xe1033;" glyph-name="icon-thumbs-strip" d="M448 578c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM1024 578c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM448 2c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM1024 2c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320z" />
 <glyph unicode="&#xe1034;" glyph-name="icon-two-parts-both" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM128 832h320v-768h-320v768zM896 64h-320v768h320v-768z" />
 <glyph unicode="&#xe1035;" glyph-name="icon-two-parts-one-only" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM896 64h-320v768h320v-768z" />
 <glyph unicode="&#xe1036;" glyph-name="icon-resync" d="M795.2 795.2c-79.8 65.2-178.8 100.8-283.2 100.8-119.6 0-232.2-46.6-316.8-131.2-69.4-69.4-113.2-157.4-126.6-252.8h130c29.6 145.8 158.8 256 313.4 256 72 0 138.4-23.8 192-64l-176-176h432v432l-164.8-164.8zM512 128c-72 0-138.4 23.8-192 64l176 176h-432v-432l164.8 164.8c79.8-65.2 178.8-100.8 283.2-100.8 119.6 0 232.2 46.6 316.8 131.2 69.4 69.4 113.2 157.4 126.6 252.8h-130c-29.6-145.8-158.8-256-313.4-256z" />
 <glyph unicode="&#xe1037;" glyph-name="icon-reset" d="M460.8 499.2l-187.8 187.8c57.2 42.8 128 68.2 204.8 68.2 188.2 0 341.6-153.2 341.6-341.4s-153.2-341.2-341.4-341.2c-165 0-302.8 117.6-334.6 273h-138.4c14.2-101.8 61-195.6 135-269.6 90.2-90.2 210.4-140 338-140s247.6 49.8 338 140 140 210.4 140 338-49.8 247.6-140 338-210.4 140-338 140c-111.4 0-217-38-302-107.6l-176 175.6v-460.8h460.8z" />
 <glyph unicode="&#xe1038;" glyph-name="icon-x-in-circle" d="M512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM832 256l-128-128-192 192-192-192-128 128 192 192-192 192 128 128 192-192 192 192 128-128-192-192 192-192z" />
 <glyph unicode="&#xe1039;" glyph-name="icon-brightness" d="M253.414 641.939l-155.172 116.384c-50.233-66.209-85.127-146.713-97.91-234.39l191.586-30.216c8.145 56.552 29.998 106.879 62.068 149.006zM191.98 402.283l-191.919-27.434c13.115-90.459 48.009-170.963 99.174-238.453l154.18 117.665c-31.476 41.347-53.309 91.675-61.231 146.504zM466.283 768.020l-27.434 191.919c-90.459-13.115-170.963-48.009-238.453-99.174l117.665-154.18c41.347 31.476 91.675 53.309 146.504 61.231zM822.323 861.758c-66.209 50.233-146.713 85.127-234.39 97.91l-30.216-191.586c56.552-8.145 106.879-29.998 149.006-62.068zM832.020 493.717l191.919 27.434c-13.115 90.459-48.009 170.963-99.174 238.453l-154.18-117.665c31.476-41.347 53.309-91.675 61.231-146.504zM201.677 34.242c66.209-50.233 146.713-85.127 234.39-97.91l30.216 191.586c-56.552 8.145-106.879 29.998-149.006 62.068zM770.586 254.061l155.131-116.343c50.233 66.209 85.127 146.713 97.91 234.39l-191.586 30.216c-8.125-56.564-29.966-106.906-62.028-149.049zM557.717 127.98l27.434-191.919c90.459 13.115 170.963 48.009 238.453 99.174l-117.665 154.18c-41.347-31.476-91.675-53.309-146.504-61.231zM770.586 448c0-142.813-115.773-258.586-258.586-258.586s-258.586 115.773-258.586 258.586c0 142.813 115.773 258.586 258.586 258.586s258.586-115.773 258.586-258.586z" />
 <glyph unicode="&#xe1040;" glyph-name="icon-contrast" d="M512 960c-282.78 0-512-229.24-512-512s229.22-512 512-512 512 229.24 512 512-229.22 512-512 512zM783.52 176.48c-69.111-69.481-164.785-112.481-270.502-112.481-0.358 0-0.716 0-1.074 0.001l0.055 768c212.070-0.010 383.982-171.929 383.982-384 0-106.034-42.977-202.031-112.462-271.52z" />
 <glyph unicode="&#xe1041;" glyph-name="icon-expand" d="M960 960c0 0 0 0 0 0h-320v-128h165.4l-210.6-210.8c-25-25-25-65.6 0-90.6 12.4-12.4 28.8-18.8 45.2-18.8s32.8 6.2 45.2 18.8l210.8 210.8v-165.4h128v384h-64zM896 154.6l-210.8 210.6c-25 25-65.6 25-90.6 0s-25-65.6 0-90.6l210.8-210.6h-165.4v-128h384v384h-128v-165.4zM218.6 832h165.4v128h-320c0 0 0 0 0 0h-64v-384h128v165.4l210.8-210.8c12.4-12.4 28.8-18.8 45.2-18.8s32.8 6.2 45.2 18.8c25 25 25 65.6 0 90.6l-210.6 210.8zM338.8 365.2l-210.8-210.6v165.4h-128v-384h384v128h-165.4l210.8 210.8c25 25 25 65.6 0 90.6-25.2 24.8-65.6 24.8-90.6-0.2z" />
 <glyph unicode="&#xe1042;" glyph-name="icon-list-view" d="M0 896h1024v-128h-1024v128zM0 640h1024v-128h-1024v128zM0 384h1024v-128h-1024v128zM0 128h1024v-128h-1024v128z" />
 <glyph unicode="&#xe1043;" glyph-name="icon-grid-snap-to" d="M382 130h448v448h-448v-448zM510 450h192v-192h-192v192zM-2 386h320v-64h-320v64zM894 386h128v-64h-128v64zM574 962h64v-320h-64v320zM574 66h64v-128h-64v128zM574 386h64v-64h-64v64z" />
 <glyph unicode="&#xe1044;" glyph-name="icon-grid-snap-no" d="M768 384h192v-64h-192v64zM256 384h192v-64h-192v64zM0 384h192v-64h-192v64zM640 448h-64v-64h-64v-64h64v-64h64v64h64v64h-64zM576 704h64v-192h-64v192zM576 960h64v-192h-64v192zM576 192h64v-192h-64v192z" />
 <glyph unicode="&#xe1045;" glyph-name="icon-frame-show" d="M0 896v-896h1024v896h-1024zM896 128h-768v640h768v-640zM192 704h384v-128h-384v128z" />
 <glyph unicode="&#xe1046;" glyph-name="icon-frame-hide" d="M128 770h420l104 128h-652v-802.4l128 157.4zM896 130h-420l-104-128h652v802.4l-128-157.4zM832 962l-832-1024h192l832 1024zM392 578l104 128h-304v-128z" />
 <glyph unicode="&#xe1047;" glyph-name="icon-import" d="M832 767.6v-639.4c0-0.2-0.2-0.2-0.4-0.4h-319.6v-192h320c105.6 0 192 86.4 192 192v640.2c0 105.6-86.4 192-192 192h-320v-192h319.6c0.2 0 0.4-0.2 0.4-0.4zM192 256v-192l384 384-384 384v-192h-192v-384z" />
 <glyph unicode="&#xe1048;" glyph-name="icon-export" d="M192 128.34v639.32l0.34 0.34h319.66v192h-320c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h320v192h-319.66zM1024 448l-384 384v-192h-192v-384h192v-192l384 384z" />
 <glyph unicode="&#xe1100;" glyph-name="icon-activity" d="M576 896h-256l320-320h-290.256c-44.264 76.516-126.99 128-221.744 128h-128v-512h128c94.754 0 177.48 51.484 221.744 128h290.256l-320-320h256l448 448-448 448z" />
 <glyph unicode="&#xe1101;" glyph-name="icon-activity-mode" d="M512 960c-214.866 0-398.786-132.372-474.744-320h90.744c56.86 0 107.938-24.724 143.094-64h240.906l-192 192h256l320-320-320-320h-256l192 192h-240.906c-35.156-39.276-86.234-64-143.094-64h-90.744c75.958-187.628 259.878-320 474.744-320 282.77 0 512 229.23 512 512s-229.23 512-512 512z" />
 <glyph unicode="&#xe1102;" glyph-name="icon-autoflow-tabular" d="M192 960c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h64v1024h-64zM384 960h256v-1024h-256v1024zM832 960h-64v-704h256v512c0 105.6-86.4 192-192 192z" />
 <glyph unicode="&#xe1103;" glyph-name="icon-clock" d="M512 960c-282.76 0-512-229.24-512-512s229.24-512 512-512 512 229.24 512 512-229.24 512-512 512zM782 270c-12.681-21.673-35.844-36-62.354-36-0.023 0-0.047 0-0.070 0-0.016 0-0.040 0-0.064 0-13.234 0-25.63 3.587-36.269 9.843l-221.644 127.977q-1.2 0.7-2.38 1.46l-0.86 0.56-1.86 1.28-1.26 0.9-1.26 0.96-1.7 1.34-0.64 0.54c-0.72 0.6-1.44 1.22-2.14 1.84v0c-5.012 4.562-9.331 9.758-12.863 15.491-0.457 0.769-0.717 1.249-0.997 1.709s-0.58 0.98-0.86 1.48c-3.092 5.53-5.561 11.936-7.071 18.704l-0.089 0.596c-0.2 0.92-0.38 1.84-0.54 2.76 0 0.28-0.1 0.56-0.16 0.84-0.12 0.7-0.22 1.42-0.3 2.14s-0.14 1.040-0.2 1.58-0.1 1.020-0.14 1.54-0.12 1.5-0.18 2.24c0 0.34 0 0.68 0 1.040q0 1.4 0 2.78c0 0.1 0 0.22 0 0.32v364.080c0 39.765 32.235 72 72 72s72-32.235 72-72v-322.44l185.7-107.22c21.605-12.697 35.879-35.823 35.879-62.284 0-13.278-3.594-25.716-9.862-36.395z" />
 <glyph unicode="&#xe1104;" glyph-name="icon-database" d="M1024 768c0-106.039-229.23-192-512-192s-512 85.961-512 192c0 106.039 229.23 192 512 192s512-85.961 512-192zM512 448c-282.77 0-512 85.962-512 192v-512c0-106.038 229.23-192 512-192s512 85.962 512 192v512c0-106.038-229.23-192-512-192z" />
 <glyph unicode="&#xe1105;" glyph-name="icon-database-query" d="M683.52 140.714c-50.782-28.456-109.284-44.714-171.52-44.714-194.094 0-352 157.906-352 352s157.906 352 352 352 352-157.906 352-352c0-62.236-16.258-120.738-44.714-171.52l191.692-191.692c8.516 13.89 13.022 28.354 13.022 43.212v640c0 106.038-229.23 192-512 192s-512-85.962-512-192v-640c0-106.038 229.23-192 512-192 126.11 0 241.548 17.108 330.776 45.46l-159.256 159.254zM352 448c0-88.224 71.776-160 160-160s160 71.776 160 160-71.776 160-160 160-160-71.776-160-160z" />
 <glyph unicode="&#xe1106;" glyph-name="icon-dataset" d="M896 768h-320c-16.4 16.4-96.8 96.8-109.2 109.2l-37.4 37.4c-25 25-74.2 45.4-109.4 45.4h-256c-35.2 0-64-28.8-64-64v-384c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v128c0 70.4-57.6 128-128 128zM896 512h-768c-70.4 0-128-57.6-128-128v-320c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v320c0 70.4-57.6 128-128 128zM320 64h-128v320h128v-320zM576 64h-128v320h128v-320zM832 64h-128v320h128v-320z" />
 <glyph unicode="&#xe1107;" glyph-name="icon-datatable" d="M1024 768c0-106.039-229.23-192-512-192s-512 85.961-512 192c0 106.039 229.23 192 512 192s512-85.961 512-192zM512 448c-282.8 0-512 86-512 192v-512c0-106 229.2-192 512-192s512 86 512 192v512c0-106-229.2-192-512-192zM896 385v-256c-36.6-15.6-79.8-28.8-128-39.4v256c48.2 10.6 91.4 23.8 128 39.4zM256 345.6v-256c-48.2 10.4-91.4 23.8-128 39.4v256c36.6-15.6 79.8-28.8 128-39.4zM384 70v256c41-4 83.8-6 128-6s87 2.2 128 6v-256c-41-4-83.8-6-128-6s-87 2.2-128 6z" />
 <glyph unicode="&#xe1108;" glyph-name="icon-dictionary" d="M832 320c105.6 0 192 86.4 192 192v256c0 105.6-86.4 192-192 192v-320l-128 64-128-64v320h-384c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v192c0-105.6-86.4-192-192-192h-640v192h640z" />
 <glyph unicode="&#xe1109;" glyph-name="icon-folder" d="M896 768h-320c-16.4 16.4-96.8 96.8-109.2 109.2l-37.4 37.4c-25 25-74.2 45.4-109.4 45.4h-256c-35.2 0-64-28.8-64-64v-384c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v128c0 70.4-57.6 128-128 128zM896 512h-768c-70.4 0-128-57.6-128-128v-320c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v320c0 70.4-57.6 128-128 128z" />
 <glyph unicode="&#xe1110;" glyph-name="icon-image" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM896 64h-768v768h768v-768zM320 704l-128-128v-448h640v320l-128 128-128-128z" />
 <glyph unicode="&#xe1111;" glyph-name="icon-layout" d="M448 960h-256c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h256v1024zM832 960h-256v-577.664h448v385.664c0 105.6-86.4 192-192 192zM576-64h256c105.6 0 192 86.4 192 192v129.664h-448v-321.664z" />
 <glyph unicode="&#xe1112;" glyph-name="icon-object" d="M512-64l512 320v384l-512.020 320-511.98-320v-384l512-320zM512 768l358.4-224-358.4-224-358.4 224 358.4 224z" />
 <glyph unicode="&#xe1113;" glyph-name="icon-object-unknown" d="M510 962l-512-320v-384l512-320 512 320v384l-512 320zM585.4 100.8c-21.2-20.8-46-30.8-76-30.8-31.2 0-56.2 9.8-76.2 29.6-20 20-29.6 44.8-29.6 76.2 0 30.4 10.2 55.2 31 76.2s45.2 31.2 74.8 31.2c29.6 0 54.2-10.4 75.6-32s31.8-46.4 31.8-76c-0.2-29-10.8-54-31.4-74.4zM638.2 413.4c-23.6-11.8-37.4-22-43.4-32.4-3.6-6.2-6-14.8-7.4-26.8v-41h-161.4v44.2c0 40.2 4.4 69.8 13 88 8 17.2 22.6 30.2 44.8 40l34.8 15.4c32 14.2 48.2 35.2 48.2 62.8 0 16-6 30.4-17.2 41.8-11.2 11.2-25.6 17.2-41.6 17.2-24 0-54.4-10-62.8-57.4l-2.2-12.2h-147l1.4 16.2c4 44.6 17 82.4 38.8 112.2 19.6 27 45.6 48.6 77 64.6s64.6 24 98.2 24c60.6 0 110.2-19.4 151.4-59.6 41.2-40 61.2-88 61.2-147.2 0-70.8-28.8-121.4-85.8-149.8z" />
 <glyph unicode="&#xe1114;" glyph-name="icon-packet" d="M511.98 960l-511.98-320v-512c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v512l-512.020 320zM512 768l358.4-224-358.4-224-358.4 224 358.4 224z" />
 <glyph unicode="&#xe1115;" glyph-name="icon-page" d="M702 452c-105.6 0-192 86.4-192 192v320h-320c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v320h-320zM766 580h256l-384 384v-256c0-70.4 57.6-128 128-128z" />
 <glyph unicode="&#xe1116;" glyph-name="icon-plot-overlay" d="M830 960h-636c-106.7 0-194-87.3-194-194v-406.82c14.18-18.64 25.66-28.34 32-30.84 14.28 5.62 54.44 47.54 92.96 146 42.46 108.38 116.32 237.66 227.040 237.66 52.4 0 101.42-29.16 145.7-86.68 37.34-48.5 64.84-108.92 81.34-151.080 38.52-98.38 78.68-140.3 92.96-146 14.28 5.62 54.44 47.54 92.96 146 42.46 108.48 116.32 237.76 227.040 237.76 11.354-0.003 22.389-1.366 32.952-3.936l-0.952 57.936c0 106.7-87.3 194-194 194zM992 567.66c-14.28-5.62-54.44-47.52-92.96-146-42.46-108.38-116.32-237.66-227.040-237.66-52.4 0-101.42 29.16-145.7 86.68-37.34 48.5-64.84 108.92-81.34 151.080-38.52 98.38-78.68 140.3-92.96 146-14.28-5.62-54.44-47.52-92.96-146-42.46-108.48-116.32-237.76-227.040-237.76-11.355 0.003-22.389 1.367-32.952 3.936l0.952-57.936c0-106.7 87.3-194 194-194h636c106.7 0 194 87.3 194 194v406.82c-14.18 18.64-25.66 28.34-32 30.84z" />
 <glyph unicode="&#xe1117;" glyph-name="icon-plot-stacked" d="M89.6 648c24.98 0 48.96 26.52 85.52 70.18 45.42 54.28 102 121.82 196 121.82 44.64 0 86.62-15.46 124.8-46 28.68-22.9 51.16-50.42 72.92-77.060 38.42-46.94 59.16-68.94 83.96-68.94h371.2v118c0 106.7-87.3 194-194 194h-636c-106.7 0-194-87.3-194-194v-118h89.6zM529.5 549.6c-28.24 22.64-50.52 50-72 76.28-35.5 43.48-58.76 70.12-86.3 70.12-25.060 0-49.080-26.54-85.66-70.24-45.4-54.24-102-121.76-196-121.76h-89.54v-112h371.2c44 0 85.54-15.34 123.3-45.6 28.24-22.64 50.52-50 72-76.28 35.5-43.48 58.76-70.12 86.3-70.12 25.060 0 49.080 26.54 85.66 70.24 45.4 54.24 102 121.76 196 121.76h89.54v112h-371.2c-44.060 0-85.54 15.34-123.3 45.6zM934.4 248c-24.98 0-48.96-26.52-85.52-70.18-45.42-54.28-102-121.82-196-121.82-44.64 0-86.62 15.46-124.8 46-28.68 22.9-51.16 50.42-72.92 77.060-38.42 46.94-59.16 68.94-83.96 68.94h-371.2v-118c0-106.7 87.3-194 194-194h636c106.7 0 194 87.3 194 194v118h-89.6z" />
 <glyph unicode="&#xe1118;" glyph-name="icon-session" d="M635.6 435.6c6.6-4.2 13.2-8.6 19.2-13.6l120.4-96.4c29.6-23.8 83.8-23.8 113.4 0l135.2 108c0.2 4.8 0.2 9.4 0.2 14.2 0 52.2-7.8 102.4-22.2 149.8l-154.8-123.6c-58.2-46.6-140.2-59.2-211.4-38.4zM248.6 325.8l120.4 96.4c58 46.4 140 59.2 211.2 38.4-6.6 4.2-13.2 8.6-19.2 13.6l-120.4 96.4c-29.6 23.8-83.8 23.8-113.4 0l-120.2-96.6c-40-32-91.4-48-143-48-21.6 0-43 2.8-63.8 8.4 0-0.6 0-1.2 0-1.6 5-3.4 10-6.8 14.6-10.6l120.4-96.4c29.8-23.8 83.8-23.8 113.4 0zM120.6 581.8l120.4 96.4c80.2 64.2 205.6 64.2 285.8 0l120.4-96.4c29.6-23.8 83.8-23.8 113.4 0l181 144.8c-91.2 140.4-249.6 233.4-429.6 233.4-238.6 0-439.2-163.2-496-384.2 30.8-17.6 77.8-15.6 104.6 6zM689 218l-120.4 96.4c-29.6 23.8-83.8 23.8-113.4 0l-120.2-96.4c-40-32-91.4-48-143-48-47.8 0-95.4 13.8-134.2 41.4 85.6-163.6 256.8-275.4 454.2-275.4s368.6 111.8 454.2 275.4c-80.4-57.4-199.8-55.2-277.2 6.6z" />
 <glyph unicode="&#xe1119;" glyph-name="icon-tabular" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM640 512h-256v192h256v-192zM384 448h256v-192h-256v192zM320 256h-256v192h256v-192zM320 704v-192h-256v192h256zM128 0c-17 0-33 6.6-45.2 18.8s-18.8 28.2-18.8 45.2v128h256v-192h-192zM384 0v192h256v-192h-256zM960 64c0-17-6.6-33-18.8-45.2s-28.2-18.8-45.2-18.8h-192v192h256v-128zM960 256h-256v192h256v-192zM960 512h-256v192h256v-192z" />
 <glyph unicode="&#xe1120;" glyph-name="icon-tabular-lad" d="M896 960h-768c-70.606-0.215-127.785-57.394-128-127.979v-768.021c0.215-70.606 57.394-127.785 127.979-128h768.021c70.606 0.215 127.785 57.394 128 127.979v768.021c-0.215 70.606-57.394 127.785-127.979 128zM64 704h256v-192h-256v192zM64 448h256v-192h-256v192zM128 0c-35.26 0.214-63.786 28.74-64 63.98v128.020h256v-192h-192zM384 0v192h256v-192h-256zM960 64c-0.214-35.26-28.74-63.786-63.98-64h-192.020v192h256v-128zM960 448v-192h-576v192h64v64h-64v192h576v-192h-64v-64h64zM782.32 412.62l-110.32 55.16v172.22c0 17.673-14.327 32-32 32s-32-14.327-32-32v-211.78l145.68-72.84c4.172-2.133 9.1-3.383 14.32-3.383 17.675 0 32.003 14.328 32.003 32.003 0 12.454-7.114 23.247-17.501 28.536z" />
 <glyph unicode="&#xe1121;" glyph-name="icon-tabular-lad-set" d="M128 192v576c-70.606-0.215-127.785-57.394-128-127.979v-576.021c0.215-70.606 57.394-127.785 127.979-128h576.021c70.606 0.215 127.785 57.394 128 127.979l-576 0.021c-70.606 0.215-127.785 57.394-128 127.979zM896 960h-576c-70.606-0.215-127.785-57.394-128-127.979v-576.021c0.215-70.606 57.394-127.785 127.979-128h576.021c70.606 0.215 127.785 57.394 128 127.979v576.021c-0.215 70.606-57.394 127.785-127.979 128zM256 768h192v-128h-192v128zM256 576h192v-192h-192v192zM320 192c-35.26 0.214-63.786 28.74-64 63.98v64.020h192v-128h-128zM512 192v128h192v-128h-192zM960 256c-0.214-35.26-28.74-63.786-63.98-64h-128.020v128h192v-64zM960 384h-448v384h448v-384zM832 480c0.002 0 0.005 0 0.007 0 17.673 0 32 14.327 32 32 0 14.055-9.062 25.994-21.662 30.293l-74.345 24.767v104.94c0 17.673-14.327 32-32 32s-32-14.327-32-32v-151.060l117.88-39.3c3.018-1.040 6.495-1.64 10.113-1.64 0.003 0 0.005 0 0.008 0z" />
 <glyph unicode="&#xe1122;" glyph-name="icon-tabular-realtime" d="M896 960h-768c-70.606-0.215-127.785-57.394-128-127.979v-768.021c0.215-70.606 57.394-127.785 127.979-128h768.021c70.606 0.215 127.785 57.394 128 127.979v768.021c-0.215 70.606-57.394 127.785-127.979 128zM448 668l25.060-25.32c7.916-7.922 18.856-12.822 30.94-12.822s23.024 4.9 30.94 12.822l75.5 76.3c29.97 30.338 71.571 49.128 117.56 49.128s87.59-18.79 117.544-49.112l50.456-50.997v-152.2c-24.111 8.83-44.678 22.255-61.542 39.342l-75.518 76.318c-7.916 7.922-18.856 12.822-30.94 12.822s-23.024-4.9-30.94-12.822l-75.5-76.3c-29.971-30.343-71.575-49.137-117.568-49.137-20.084 0-39.331 3.584-57.137 10.146l1.145 151.831zM320 0h-192c-35.26 0.214-63.786 28.74-64 63.98v128.020h256v-192zM320 256h-256v192h256v-192zM320 512h-256v192h256v-192zM640 0h-256v192h256v-192zM448 323.38v174.5c1.88-1.74 3.74-3.5 5.56-5.34l75.5-76.3c7.916-7.922 18.856-12.822 30.94-12.822s23.024 4.9 30.94 12.822l75.5 76.3c29.966 30.333 71.56 49.119 117.542 49.119 43.28 0 82.673-16.644 112.128-43.879l-0.11-174.399c-1.88 1.74-3.74 3.5-5.56 5.34l-75.5 76.3c-7.916 7.922-18.856 12.822-30.94 12.822s-23.024-4.9-30.94-12.822l-75.5-76.3c-29.966-30.333-71.56-49.119-117.542-49.119-43.28 0-82.673 16.644-112.128 43.879zM960 64c-0.214-35.26-28.74-63.786-63.98-64h-192.020v192h256v-128z" />
 <glyph unicode="&#xe1123;" glyph-name="icon-tabular-scrolling" d="M64 960c-35.2 0-64-28.8-64-64v-192h448v256h-384zM1024 704v192c0 35.2-28.8 64-64 64h-384v-256h448zM0 576v-192c0-35.2 28.8-64 64-64h384v256h-448zM960 320c35.2 0 64 28.8 64 64v192h-448v-256h384zM512-64l-256 256h512z" />
 <glyph unicode="&#xe1124;" glyph-name="icon-telemetry" d="M32 328.34c14.28 5.62 54.44 47.54 92.96 146 42.46 108.38 116.32 237.66 227.040 237.66 52.4 0 101.42-29.16 145.7-86.68 37.34-48.5 64.84-108.92 81.34-151.080 38.52-98.38 78.68-140.3 92.96-146 14.28 5.62 54.44 47.54 92.96 146 37.4 95.5 99.14 207.14 188.94 232.46-90.462 152.598-254.314 253.3-441.686 253.3-0.075 0-0.15 0-0.226 0-282.748 0-511.988-229.24-511.988-512 0-0.032 0-0.070 0-0.108 0-35.719 3.641-70.587 10.572-104.255 8.968-7.457 16.648-13.417 21.428-15.297zM992 567.66c-14.28-5.62-54.44-47.52-92.96-146-42.46-108.38-116.32-237.66-227.040-237.66-52.4 0-101.42 29.16-145.7 86.68-37.34 48.5-64.84 108.92-81.34 151.080-38.52 98.38-78.68 140.3-92.96 146-14.28-5.62-54.44-47.52-92.96-146-37.4-95.5-99.14-207.14-188.94-232.46 90.462-152.598 254.314-253.3 441.686-253.3 0.075 0 0.15 0 0.226 0 282.748 0 511.988 229.24 511.988 512 0 0.032 0 0.070 0 0.108 0 35.719-3.641 70.587-10.572 104.255-8.968 7.457-16.648 13.417-21.428 15.297z" />
 <glyph unicode="&#xe1125;" glyph-name="icon-telemetry-panel" d="M169.2 512c14 56.4 33 122 56.6 176.8 15.4 35.8 31.2 63.2 48.2 84 18.4 22.4 49 49.2 91 49.2s72.6-26.8 91-49.2c17-20.6 32.6-48.2 48.2-84 23.6-54.8 42.8-120.4 56.6-176.8h461.2v256c0 105.6-86.4 192-192 192h-640c-105.6 0-192-86.4-192-192v-256h171.2zM718.6 384h-127.2c25-93.4 48.4-144.4 63.6-168.6 15.2 24.2 38.6 75.2 63.6 168.6zM301.4 512h127.2c-25 93.4-48.4 144.4-63.6 168.6-15.2-24.2-38.6-75.2-63.6-168.6zM850.8 384c-14-56.4-33-122-56.6-176.8-15.4-35.8-31.2-63.2-48.2-84-18.4-22.4-49-49.2-91-49.2s-72.6 26.8-91 49.2c-17 20.6-32.6 48.2-48.2 84-23.6 54.8-42.8 120.4-56.6 176.8h-461.2v-256c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v256h-171.2z" />
 <glyph unicode="&#xe1126;" glyph-name="icon-timeline" d="M256 704h384v-128h-384v128zM384 512h384v-128h-384v128zM320 320h384v-128h-384v128zM832 960h-128v-192h127.6c0.2 0 0.2-0.2 0.4-0.4v-639.4c0-0.2-0.2-0.2-0.4-0.4h-127.6v-192h128c105.6 0 192 86.4 192 192v640.2c0 105.6-86.4 192-192 192zM192 128.4v639.2c0 0.2 0.2 0.2 0.4 0.4h127.6v192h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192h-127.6c-0.2 0-0.4 0.2-0.4 0.4z" />
 <glyph unicode="&#xe1127;" glyph-name="icon-timer-v1.5" horiz-adv-x="896" d="M576 813.4v82.58c0 35.346-28.654 64-64 64h-128c-35.346 0-64-28.654-64-64v-82.58c-185.040-55.080-320-226.48-320-429.42 0-247.42 200.58-448 448-448s448 200.58 448 448c0 202.96-135 374.4-320 429.42zM468 363.98l-263.76-211c-57.105 59.935-92.24 141.251-92.24 230.772 0 0.080 0 0.16 0 0.24 0 185.268 150.72 335.988 336 335.988 6.72 0 13.38-0.22 20-0.62v-355.38z" />
 <glyph unicode="&#xe1128;" glyph-name="icon-topic" d="M454.36 483.36l86.3 86.3c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c19.328-19.358 42.832-34.541 69.047-44.082l1.313 171.722-57.64 57.64c-34.407 34.33-81.9 55.558-134.35 55.558s-99.943-21.228-134.354-55.562l-86.296-86.297c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-28.674 28.654v-172.14c19.045-7.022 41.040-11.084 63.984-11.084 52.463 0 99.966 21.239 134.379 55.587zM505.64 412.64l-86.3-86.3c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-86.294 86.294c-2 2-4.2 4-6.36 6v-197.36c33.664-30.72 78.65-49.537 128.031-49.537 52.44 0 99.923 21.22 134.333 55.541l86.296 86.296c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c2-2 4.2-4 6.36-6v197.36c-33.664 30.72-78.65 49.537-128.031 49.537-52.44 0-99.923-21.22-134.333-55.541zM832 960h-128v-192h127.66l0.34-0.34v-639.32l-0.34-0.34h-127.66v-192h128c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM320 128h-127.66l-0.34 0.34v639.32l0.34 0.34h127.66v192h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192z" />
 <glyph unicode="&#xe1129;" glyph-name="icon-box-with-dashed-lines" d="M0 576h128v-256h-128v256zM128 831.78l0.22 0.22h191.78v128h-192c-70.606-0.215-127.785-57.394-128-127.979v-192.021h128v191.78zM128 64.22v191.78h-128v-192c0.215-70.606 57.394-127.785 127.979-128h192.021v128h-191.78zM384 960h256v-128h-256v128zM896 64.22l-0.22-0.22h-191.78v-128h192c70.606 0.215 127.785 57.394 128 127.979v192.021h-128v-191.78zM896 960h-192v-128h191.78l0.22-0.22v-191.78h128v192c-0.215 70.606-57.394 127.785-127.979 128zM896 576h128v-256h-128v256zM384 64h256v-128h-256v128zM256 704h512v-512h-512v512z" />
 <glyph unicode="&#xe1130;" glyph-name="icon-summary-widget" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM847.8 349.6l-82.6-143.2-189.6 131.6 19.2-230h-165.4l19.2 230-189.6-131.6-82.6 143.2 208.6 98.4-208.8 98.4 82.6 143.2 189.6-131.6-19.2 230h165.4l-19.2-230 189.6 131.6 82.6-143.2-208.6-98.4 208.8-98.4z" />
 <glyph unicode="&#xe1131;" glyph-name="icon-notebook" d="M896 849.2c0 79.8-55.4 127.4-123 105.4l-773-250.6h896v145.2zM896 640h-896v-576c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v448c0 70.4-57.6 128-128 128zM832 128h-384v320h384v-320z" />
 </font></defs></svg>
--- a/src/fonts/symbols/openmct-symbols-16px.ttf
+++ b/src/fonts/symbols/openmct-symbols-16px.ttf
--- a/src/fonts/symbols/openmct-symbols-16px.woff
+++ b/src/fonts/symbols/openmct-symbols-16px.woff
--- a/src/ui/layout/assets/images/bg-splash.jpg
+++ b/src/ui/layout/assets/images/bg-splash.jpg
--- a/src/images/favicons/favicon-16x16.png
+++ b/src/images/favicons/favicon-16x16.png
--- a/src/images/favicons/favicon-32x32.png
+++ b/src/images/favicons/favicon-32x32.png
--- a/src/images/favicons/favicon-96x96.png
+++ b/src/images/favicons/favicon-96x96.png
--- a/src/images/favicons/favicon.ico
+++ b/src/images/favicons/favicon.ico
--- a/src/ui/layout/assets/images/logo-openmct-shdw.svg
+++ b/src/ui/layout/assets/images/logo-openmct-shdw.svg
--- a/src/images/logo-app.svg
+++ b/src/images/logo-app.svg
@@ -0,0 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="20 0 640 150" enable-background="new 20 0 640 150" xml:space="preserve">
 <g>
 	<path fill="#FFFFFF" d="M90.7,13.2c14.8,0,22.8,8,22.8,22.8v46.3c0,14.8-8,22.8-22.8,22.8H62.8c-14.8,0-22.8-8-22.8-22.8V36
 		c0-14.8,8-22.8,22.8-22.8H90.7z M97.8,36.2c0-5.8-3.1-9.2-9.2-9.2h-24c-5.8,0-9.2,3.2-9.2,9.2v45.9c0,6,3.4,9.2,9.2,9.2h24
 		c6,0,9.2-3.2,9.2-9.2V36.2z"/>
 	<path fill="#FFFFFF" d="M173.2,13.2c14.8,0,22.8,8,22.8,22.8v46.3c0,14.8-8,22.8-22.8,22.8h-9c-11.2,0-19.2-6.6-26.5-13.6v44.2
 		h-15.5V13.2h15.5v13.6c7.3-7,15.3-13.6,26.5-13.6H173.2z M180.3,36.2c0-5.8-3.1-9.2-9.2-9.2h-8.3c-9.4,0-17,3.6-25.2,9.2v45.9
 		c8.2,5.6,15.8,9.2,25.2,9.2h8.3c6.1,0,9.2-3.4,9.2-9.2V36.2z"/>
 	<path fill="#FFFFFF" d="M220.3,82.8c0,6,3.2,9.2,9.2,9.2h23c6,0,9.2-3.4,9.2-9.2V76h15.6v6.3c0,14.8-8,22.8-22.8,22.8h-27
 		c-14.8,0-22.8-8-22.8-22.8V36c0-14.8,8-22.8,22.8-22.8h27c14.8,0,22.8,8,22.8,22.8v26.9h-57V82.8z M229.5,26.3
 		c-6,0-9.2,3.2-9.2,9.2v15.8h41.3V35.5c0-6-3.1-9.2-9.2-9.2H229.5z"/>
 	<path fill="#FFFFFF" d="M285.7,13.2h15.5v13.6c7.3-7,15.3-13.6,26.5-13.6h7.1c14.8,0,22.8,8,22.8,22.8v69.1h-15.5V36.6
 		c0-6-3.2-9.2-9.2-9.2h-6.6c-9.4,0-17,3.4-25.2,9.2v68.5h-15.5V13.2z"/>
 	<path fill="#4F79F7" d="M495.4,105.1c-12.5,0-18.4-6-18.4-18.4V28.7c0-12.5,6.2-18.4,18.7-18.4h42.2c12.5,0,18.1,6,18.1,18.4v17.7
 		h-25.4V33.9c0-1.9-0.5-2.4-2.4-2.4h-23.3c-1.9,0-2.4,0.5-2.4,2.4v47.6c0,1.9,0.5,2.4,2.4,2.4h23.3c1.9,0,2.4-0.5,2.4-2.4V69H556
 		v17.7c0,12.5-6,18.4-18.4,18.4H495.4z"/>
 	<path fill="#4F79F7" d="M613.7,32v73.1h-25.4V32H562V10.3h78V32H613.7z"/>
 	<path fill="#4F79F7" d="M425.3,93.6l17.4-42.4v48.6c0,3,2.4,5.4,5.4,5.4h19V15.7c0-3-2.4-5.4-5.4-5.4h-23.3l-21.2,49.4l-21.2-49.4
 		h-23.3c-3,0-5.4,2.4-5.4,5.4v89.5h19c3,0,5.4-2.4,5.4-5.4V51.2l17.4,42.4H425.3z"/>
 </g>
 </svg>
--- a/src/ui/layout/assets/images/logo-nasa.svg
+++ b/src/ui/layout/assets/images/logo-nasa.svg
--- a/src/plugins/LADTable/LADTableSetViewProvider.js
+++ b/src/plugins/LADTable/LADTableSetViewProvider.js
@@ -35,10 +35,7 @@ define([
            canView: function (domainObject) {
                return domainObject.type === 'LadTableSet';
            },
-            canEdit: function (domainObject) {
+            view: function (domainObject) {
                return domainObject.type === 'LadTableSet';
            },
            view: function (domainObject, isEditing, objectPath) {
                let component;
                return {
@@ -49,8 +46,7 @@ define([
                            },
                            provide: {
                                openmct,
-                                domainObject,
+                                domainObject
                                objectPath
                            },
                            el: element,
                            template: '<lad-table-set></lad-table-set>'
--- a/src/plugins/LADTable/LADTableViewProvider.js
+++ b/src/plugins/LADTable/LADTableViewProvider.js
@@ -21,7 +21,7 @@
 *****************************************************************************/
 define([
-    './components/LADTable.vue',
+    './components/LadTable.vue',
    'vue'
 ], function (
    LadTableComponent,
@@ -35,10 +35,7 @@ define([
            canView: function (domainObject) {
                return domainObject.type === 'LadTable';
            },
-            canEdit: function (domainObject) {
+            view: function (domainObject) {
                return domainObject.type === 'LadTable';
            },
            view: function (domainObject, isEditing, objectPath) {
                let component;
                return {
@@ -49,8 +46,7 @@ define([
                            },
                            provide: {
                                openmct,
-                                domainObject,
+                                domainObject
                                objectPath
                            },
                            el: element,
                            template: '<lad-table-component></lad-table-component>'
--- a/src/plugins/LADTable/components/LADRow.vue
+++ b/src/plugins/LADTable/components/LADRow.vue
@@ -1,4 +1,3 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
@@ -22,7 +21,7 @@
 *****************************************************************************/
 <template>
-    <tr @contextmenu.prevent="showContextMenu">
+    <tr>
        <td>{{name}}</td>
        <td>{{timestamp}}</td>
        <td :class="valueClass">
@@ -36,25 +35,15 @@
 </style>
 <script>
 const CONTEXT_MENU_ACTIONS = [
    'viewHistoricalData',
    'remove'
 ];
 export default {
-    inject: ['openmct', 'objectPath'],
+    inject: ['openmct'],
    props: ['domainObject'],
    data() {
        let currentObjectPath = this.objectPath.slice();
        currentObjectPath.unshift(this.domainObject);
        return {
            name: this.domainObject.name,
            timestamp: '---',
            value: '---',
-            valueClass: '',
+            valueClass: ''
            currentObjectPath
        }
    },
    methods: {
@@ -84,15 +73,11 @@ export default {
                .request(this.domainObject, {strategy: 'latest'})
                .then((array) => this.updateValues(array[array.length - 1]));
        },
        showContextMenu(event) {
           this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
        }
    },
    mounted() {
        this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
        this.formats = this.openmct.telemetry.getFormatMap(this.metadata);
        this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
        this.limitEvaluator = openmct
            .telemetry
--- a/src/plugins/LADTable/components/LADTable.vue
+++ b/src/plugins/LADTable/components/LADTable.vue
@@ -41,10 +41,10 @@
 <script>
 import lodash from 'lodash';
-import LadRow from './LADRow.vue';
+import LadRow from './LadRow.vue';
 export default {
-    inject: ['openmct', 'domainObject', 'objectPath'],
+    inject: ['openmct', 'domainObject'],
    components: {
        LadRow
    },
@@ -65,25 +65,17 @@ export default {
            let index = _.findIndex(this.items, (item) => this.openmct.objects.makeKeyString(identifier) === item.key);
            this.items.splice(index, 1);
        },
        reorder(reorderPlan) {
            let oldItems = this.items.slice();
            reorderPlan.forEach((reorderEvent) => {
                this.$set(this.items, reorderEvent.newIndex, oldItems[reorderEvent.oldIndex]);
            });
        }
    },
    mounted() {
        this.composition = this.openmct.composition.get(this.domainObject);
        this.composition.on('add', this.addItem);
        this.composition.on('remove', this.removeItem);
        this.composition.on('reorder', this.reorder);
        this.composition.load();
    },
    destroyed() {
        this.composition.off('add', this.addItem);
        this.composition.off('remove', this.removeItem);
        this.composition.off('reorder', this.reorder);
    }
 }
 </script>
--- a/src/plugins/LADTable/components/LadTableSet.vue
+++ b/src/plugins/LADTable/components/LadTableSet.vue
@@ -52,7 +52,7 @@
 <script>
    import lodash from 'lodash';
-    import LadRow from './LADRow.vue';
+    import LadRow from './LadRow.vue';
    export default {
    inject: ['openmct', 'domainObject'],
@@ -93,12 +93,6 @@
            this.primaryTelemetryObjects.splice(index,1);
            primary = undefined;
        },
        reorderPrimary(reorderPlan) {
            let oldComposition = this.primaryTelemetryObjects.slice();
            reorderPlan.forEach(reorderEvent => {
                this.$set(this.primaryTelemetryObjects, reorderEvent.newIndex, oldComposition[reorderEvent.oldIndex]);
            });
        },
        addSecondary(primary) {
            return (domainObject) => {
                let secondary = {};
@@ -126,13 +120,11 @@
        this.composition = this.openmct.composition.get(this.domainObject);
        this.composition.on('add', this.addPrimary);
        this.composition.on('remove', this.removePrimary);
        this.composition.on('reorder', this.reorderPrimary);
        this.composition.load();
    },
    destroyed() {
        this.composition.off('add', this.addPrimary);
        this.composition.off('remove', this.removePrimary);
        this.composition.off('reorder', this.reorderPrimary);
        this.compositions.forEach(c => {
            c.composition.off('add', c.addCallback);
            c.composition.off('remove', c.removeCallback);
--- a/src/plugins/clearData/clearDataAction.js
+++ b/src/plugins/clearData/clearDataAction.js
@@ -1,40 +0,0 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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.
 *****************************************************************************/
 export default class ClearDataAction {
    constructor(openmct, appliesToObjects) {
        this.name = 'Clear Data for Object';
        this.description = 'Clears current data for object, unsubscribes and resubscribes to data';
        this.cssClass = 'icon-clear-data';
        this._openmct = openmct;
        this._appliesToObjects = appliesToObjects;
    }
    invoke(objectPath) {
        this._openmct.objectViews.emit('clearData', objectPath[0]);
    }
    appliesTo(objectPath) {
        let contextualDomainObject = objectPath[0];
        return this._appliesToObjects.filter(type => contextualDomainObject.type === type).length;
    }
 }
--- a/src/plugins/clearData/components/globalClearIndicator.vue
+++ b/src/plugins/clearData/components/globalClearIndicator.vue
@@ -1,18 +0,0 @@
 <template>
    <div class="c-indicator c-indicator--clickable icon-clear-data s-status-caution">
        <span class="label c-indicator__label">
            <button @click="globalClearEmit">Clear All Data</button>
        </span>
    </div>
 </template>
 <script>
 export default {
    inject: ['openmct'],
    methods: {
        globalClearEmit() {
            this.openmct.objectViews.emit('clearData');
        }
    }
 }
 </script>
--- a/src/plugins/clearData/plugin.js
+++ b/src/plugins/clearData/plugin.js
@@ -1,54 +0,0 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2019, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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.
 *****************************************************************************/
 define([
    './components/globalClearIndicator.vue',
    './clearDataAction',
    'vue'
 ], function (
    GlobaClearIndicator,
    ClearDataAction,
    Vue
 ) {
    return function plugin(appliesToObjects) {
        appliesToObjects = appliesToObjects || [];
        return function install(openmct) {
            let component = new Vue ({
                    provide: {
                        openmct
                    },
                    components: {
                        GlobalClearIndicator: GlobaClearIndicator.default
                    },
                    template: '<GlobalClearIndicator></GlobalClearIndicator>'
                }),
                indicator = {
                    element: component.$mount().$el
                };
            openmct.indicators.add(indicator);
            openmct.contextMenu.registerAction(new ClearDataAction.default(openmct, appliesToObjects));
        };
    };
 });
--- a/src/plugins/clearData/test/clearDataActionSpec.js
+++ b/src/plugins/clearData/test/clearDataActionSpec.js
@@ -1,62 +0,0 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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 ClearDataActionPlugin  from '../plugin.js';
 import ClearDataAction from '../clearDataAction.js';
 describe('When the Clear Data Plugin is installed,', function () {
    var mockObjectViews = jasmine.createSpyObj('objectViews', ['emit']),
        mockIndicatorProvider = jasmine.createSpyObj('indicators', ['add']),
        mockContextMenuProvider = jasmine.createSpyObj('contextMenu', ['registerAction']),
        openmct = {
            objectViews: mockObjectViews,
            indicators: mockIndicatorProvider,
            contextMenu: mockContextMenuProvider,
            install: function (plugin) {
                plugin(this);
            }
        },
        mockObjectPath = [
            {name: 'mockObject1'},
            {name: 'mockObject2'}
        ];
    it('Global Clear Indicator is installed', function () {
        openmct.install(ClearDataActionPlugin([]));
        expect(mockIndicatorProvider.add).toHaveBeenCalled();
    });
    it('Clear Data context menu action is installed', function () {
        openmct.install(ClearDataActionPlugin([]));
        expect(mockContextMenuProvider.registerAction).toHaveBeenCalled();
    });
    it('clear data action emits a clearData event when invoked', function () {
        let action = new ClearDataAction(openmct);
        action.invoke(mockObjectPath);
        expect(mockObjectViews.emit).toHaveBeenCalledWith('clearData', mockObjectPath[0]);
    });
 });
--- a/src/plugins/displayLayout/AlphanumericFormatViewProvider.js
+++ b/src/plugins/displayLayout/AlphanumericFormatViewProvider.js
@@ -1,78 +0,0 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT 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 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.
 *****************************************************************************/
 define([
    './components/AlphanumericFormatView.vue',
    'vue'
 ], function (AlphanumericFormatView, Vue) {
    function AlphanumericFormatViewProvider(openmct, options) {
        function isTelemetryObject(selectionPath) {
            let selectedObject = selectionPath[0].context.item;
            let parentObject = selectionPath[1].context.item;
            return parentObject &&
                parentObject.type === 'layout' &&
                selectedObject &&
                openmct.telemetry.isTelemetryObject(selectedObject) &&
                !options.showAsView.includes(selectedObject.type)
        }
        return {
            key: 'alphanumeric-format',
            name: 'Alphanumeric Format',
            canView: function (selection) {
                if (selection.length === 0 || selection[0].length === 1) {
                    return false;
                }
                return selection.every(isTelemetryObject);
            },
            view: function (domainObject, isEditing, objectPath) {
                let component;
                return {
                    show: function (element) {
                        component = new Vue({
                            provide: {
                                openmct,
                                objectPath
                            },
                            components: {
                                AlphanumericFormatView: AlphanumericFormatView.default
                            },
                            template: '<alphanumeric-format-view></alphanumeric-format-view>',
                            el: element
                        });
                    },
                    destroy: function () {
                        component.$destroy();
                        component = undefined;
                    }
                }
            },
            priority: function () {
                return 1;
            }
        }
    }
    return AlphanumericFormatViewProvider;
 });
--- a/src/plugins/displayLayout/DisplayLayoutToolbar.js
+++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js
@@ -28,17 +28,11 @@ define([], function () {
            key: "layout",
            description: "A toolbar for objects inside a display layout.",
            forSelection: function (selection) {
-                if (!selection || selection.length === 0) {
+                // Apply the layout toolbar if the edit mode is on, and the selected object
-                    return false;
+                // is inside a layout, or the main layout is selected.
-                }
+                return (openmct.editor.isEditing() && selection &&
-
+                    ((selection[1] && selection[1].context.item && selection[1].context.item.type === 'layout') ||
-                let selectionPath = selection[0];
+                        (selection[0].context.item && selection[0].context.item.type === 'layout')));
                let selectedObject = selectionPath[0];
                let selectedParent = selectionPath[1];
                // Apply the layout toolbar if the selected object is inside a layout, or the main layout is selected.
                return (selectedParent && selectedParent.context.item && selectedParent.context.item.type === 'layout') ||
                    (selectedObject.context.item && selectedObject.context.item.type === 'layout');
            },
            toolbar: function (selection) {
                const DIALOG_FORM = {
@@ -79,36 +73,27 @@ define([], function () {
                    return openmct.$injector.get('dialogService').getUserInput(form, {});
                }
-                function getPath(selectionPath) {
+                function getPath() {
-                    return `configuration.items[${selectionPath[0].context.index}]`;
+                    return `configuration.items[${selection[0].context.index}]`;
                }
-                function getAllTypes(selection) {
+                let selectedParent = selection[1] && selection[1].context.item,
-                    return selection.filter(selectionPath => {
+                    selectedObject = selection[0].context.item,
-                        let type = selectionPath[0].context.layoutItem.type;
+                    layoutItem = selection[0].context.layoutItem,
-                        return type === 'text-view' ||
+                    toolbar = [];
                            type === 'telemetry-view' ||
                            type === 'box-view' ||
                            type === 'image-view' ||
                            type === 'line-view' ||
                            type === 'subobject-view';
                    });
                }
-                function getAddButton(selection, selectionPath) {
+                if (selectedObject && selectedObject.type === 'layout') {
-                    if (selection.length === 1) {
+                    toolbar.push({
                        selectionPath = selectionPath || selection[0];
                        return {
                        control: "menu",
-                            domainObject: selectionPath[0].context.item,
+                        domainObject: selectedObject,
                        method: function (option) {
                            let name = option.name.toLowerCase();
                            let form = DIALOG_FORM[name];
                            if (form) {
                                getUserInput(form)
-                                        .then(element => selectionPath[0].context.addElement(name, element));
+                                    .then(element => selection[0].context.addElement(name, element));
                            } else {
-                                    selectionPath[0].context.addElement(name);
+                                selection[0].context.addElement(name);
                            }
                        },
                        key: "add",
@@ -132,43 +117,23 @@ define([], function () {
                                "class": "icon-image"
                            }
                        ]
-                        };
+                    });
                    }
                }
-                function getToggleFrameButton(selectedParent, selection) {
+                if (!layoutItem) {
-                    return {
+                    return toolbar;
                        control: "toggle-button",
                        domainObject: selectedParent,
                        applicableSelectedItems: selection.filter(selectionPath =>
                            selectionPath[0].context.layoutItem.type === 'subobject-view'
                        ),
                        property: function (selectionPath) {
                            return getPath(selectionPath) + ".hasFrame";
                        },
                        options: [
                            {
                                value: false,
                                icon: 'icon-frame-show',
                                title: "Frame visible"
                            },
                            {
                                value: true,
                                icon: 'icon-frame-hide',
                                title: "Frame hidden"
                            }
                        ]
                    };
                }
-                function getRemoveButton(selectedParent, selectionPath, selection) {
+                let separator = {
-                    return {
+                    control: "separator"
                };
                let remove = {
                    control: "button",
                    domainObject: selectedParent,
                    icon: "icon-trash",
                    title: "Delete the selected object",
                    method: function () {
-                            let removeItem = selectionPath[1].context.removeItem;
+                        let removeItem = selection[1].context.removeItem;
                        let prompt = openmct.overlays.dialog({
                            iconClass: 'alert',
                            message: `Warning! This action will remove this item from the Display Layout. Do you want to continue?`,
@@ -177,7 +142,7 @@ define([], function () {
                                    label: 'Ok',
                                    emphasis: 'true',
                                    callback: function () {
-                                            removeItem(getAllTypes(selection));
+                                        removeItem(layoutItem, selection[0].context.index);
                                        prompt.dismiss();
                                    }
                                },
@@ -191,10 +156,7 @@ define([], function () {
                        });
                    }
                };
-                }
+                let stackOrder = {
                function getStackOrder(selectedParent, selectionPath) {
                    return {
                    control: "menu",
                    domainObject: selectedParent,
                    icon: "icon-layers",
@@ -222,122 +184,138 @@ define([], function () {
                        }
                    ],
                    method: function (option) {
-                            selectionPath[1].context.orderItem(option.value, getAllTypes(selection));
+                        selection[1].context.orderItem(option.value, selection[0].context.index);
                    }
                };
                let useGrid = {
                    control: "toggle-button",
                    domainObject: selectedParent,
                    property: function () {
                        return getPath() + ".useGrid";
                    },
                    options: [
                        {
                            value: false,
                            icon: "icon-grid-snap-to",
                            title: "Grid snapping enabled"
                        },
                        {
                            value: true,
                            icon: "icon-grid-snap-no",
                            title: "Grid snapping disabled"
                        }
-
+                    ]
-                function getXInput(selectedParent, selection) {
+                };
-                    if (selection.length === 1) {
+                let x = {
                        return {
                    control: "input",
                    type: "number",
                    domainObject: selectedParent,
-                            applicableSelectedItems: getAllTypes(selection),
+                    property: function () {
-                            property: function (selectionPath) {
+                        return getPath() + ".x";
                                return getPath(selectionPath) + ".x";
                    },
                    label: "X:",
                    title: "X position"
-                        };
+                },
-                    }
+                y = {
                }
                function getYInput(selectedParent, selection) {
                    if (selection.length === 1) {
                        return {
                    control: "input",
                    type: "number",
                    domainObject: selectedParent,
-                            applicableSelectedItems: getAllTypes(selection),
+                    property: function () {
-                            property: function (selectionPath) {
+                        return getPath() + ".y";
                                return getPath(selectionPath) + ".y";
                    },
                    label: "Y:",
-                            title: "Y position"
+                    title: "Y position",
-                        };
+                },
-                    }
+                width = {
                }
                function getWidthInput(selectedParent, selection) {
                    if (selection.length === 1) {
                        return {
                    control: 'input',
                    type: 'number',
                    domainObject: selectedParent,
-                            applicableSelectedItems: getAllTypes(selection),
+                    property: function () {
-                            property: function (selectionPath) {
+                        return getPath() + ".width";
                                return getPath(selectionPath) + ".width";
                    },
                    label: 'W:',
                    title: 'Resize object width'
-                        };
+                },
-                    }
+                height = {
                }
                function getHeightInput(selectedParent, selection) {
                    if (selection.length === 1) {
                        return {
                    control: 'input',
                    type: 'number',
                    domainObject: selectedParent,
-                            applicableSelectedItems: getAllTypes(selection),
+                    property: function () {
-                            property: function (selectionPath) {
+                        return getPath() + ".height";
                                return getPath(selectionPath) + ".height";
                    },
                    label: 'H:',
                    title: 'Resize object height'
                };
-                    }
+
                if (layoutItem.type === 'subobject-view') {
                    if (toolbar.length > 0) {
                        toolbar.push(separator);
                    }
-                function getX2Input(selectedParent, selection) {
+                    toolbar.push({
-                    if (selection.length === 1) {
+                        control: "toggle-button",
                        return {
                            control: "input",
                            type: "number",
                        domainObject: selectedParent,
-                            applicableSelectedItems: selection.filter(selectionPath => {
+                        property: function () {
-                                return selectionPath[0].context.layoutItem.type === 'line-view';
+                            return getPath() + ".hasFrame";
                            }),
                            property: function (selectionPath) {
                                return getPath(selectionPath) + ".x2";
                        },
-                            label: "X2:",
+                        options: [
-                            title: "X2 position"
+                            {
-                        };
+                                value: false,
-                    }
+                                icon: 'icon-frame-show',
-                }
+                                title: "Frame visible"
                function getY2Input(selectedParent, selection) {
                    if (selection.length === 1) {
                        return {
                            control: "input",
                            type: "number",
                            domainObject: selectedParent,
                            applicableSelectedItems: selection.filter(selectionPath => {
                                return selectionPath[0].context.layoutItem.type === 'line-view';
                            }),
                            property: function (selectionPath) {
                                return getPath(selectionPath) + ".y2";
                            },
-                            label: "Y2:",
+                            {
-                            title: "Y2 position"
+                                value: true,
-                        };
+                                icon: 'icon-frame-hide',
                                title: "Frame hidden"
                            }
-                }
+                        ]
-
+                    });
-                function getTextSizeMenu(selectedParent, selection) {
+                    toolbar.push(separator);
                    toolbar.push(stackOrder);
                    toolbar.push(x);
                    toolbar.push(y);
                    toolbar.push(width);
                    toolbar.push(height);
                    toolbar.push(useGrid);
                    toolbar.push(separator);
                    toolbar.push(remove);
                } else {
                    const TEXT_SIZE = [8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 24, 30, 36, 48, 72, 96, 128];
-                    return {
+                    let fill = {
                        control: "color-picker",
                        domainObject: selectedParent,
                        property: function () {
                            return getPath() + ".fill";
                        },
                        icon: "icon-paint-bucket",
                        title: "Set fill color"
                    },
                    stroke = {
                        control: "color-picker",
                        domainObject: selectedParent,
                        property: function () {
                            return getPath() + ".stroke";
                        },
                        icon: "icon-line-horz",
                        title: "Set border color"
                    },
                    color = {
                        control: "color-picker",
                        domainObject: selectedParent,
                        property: function () {
                            return getPath() + ".color";
                        },
                        icon: "icon-font",
                        mandatory: true,
                        title: "Set text color",
                        preventNone: true
                    },
                    size = {
                        control: "select-menu",
                        domainObject: selectedParent,
-                        applicableSelectedItems: selection.filter(selectionPath => {
+                        property: function () {
-                            let type = selectionPath[0].context.layoutItem.type;
+                            return getPath() + ".size";
                            return type === 'text-view' || type === 'telemetry-view';
                        }),
                        property: function (selectionPath) {
                            return getPath(selectionPath) + ".size";
                        },
                        title: "Set text size",
                        options: TEXT_SIZE.map(size => {
@@ -346,128 +324,13 @@ define([], function () {
                            };
                        })
                    };
                }
-                function getFillMenu(selectedParent, selection) {
+                    if (layoutItem.type === 'telemetry-view') {
-                    return {
+                        let displayMode = {
                        control: "color-picker",
                        domainObject: selectedParent,
                        applicableSelectedItems: selection.filter(selectionPath => {
                            let type = selectionPath[0].context.layoutItem.type;
                            return type === 'text-view' ||
                                type === 'telemetry-view' ||
                                type === 'box-view';
                        }),
                        property: function (selectionPath) {
                            return getPath(selectionPath) + ".fill";
                        },
                        icon: "icon-paint-bucket",
                        title: "Set fill color"
                    };
                }
                function getStrokeMenu(selectedParent, selection) {
                    return {
                        control: "color-picker",
                        domainObject: selectedParent,
                        applicableSelectedItems: selection.filter(selectionPath => {
                            let type = selectionPath[0].context.layoutItem.type;
                            return type === 'text-view' ||
                                type === 'telemetry-view' ||
                                type === 'box-view' ||
                                type === 'image-view' ||
                                type === 'line-view';
                        }),
                        property: function (selectionPath) {
                            return getPath(selectionPath) + ".stroke";
                        },
                        icon: "icon-line-horz",
                        title: "Set border color"
                    };
                }
                function getTextColorMenu(selectedParent, selection) {
                    return {
                        control: "color-picker",
                        domainObject: selectedParent,
                        applicableSelectedItems: selection.filter(selectionPath => {
                            let type = selectionPath[0].context.layoutItem.type;
                            return type === 'text-view' || type === 'telemetry-view';
                        }),
                        property: function (selectionPath) {
                            return getPath(selectionPath) + ".color";
                        },
                        icon: "icon-font",
                        mandatory: true,
                        title: "Set text color",
                        preventNone: true
                    };
                }
                function getURLButton(selectedParent, selection) {
                    return {
                        control: "button",
                        domainObject: selectedParent,
                        applicableSelectedItems: selection.filter(selectionPath => {
                            return selectionPath[0].context.layoutItem.type === 'image-view';
                        }),
                        property: function (selectionPath) {
                            return getPath(selectionPath);
                        },
                        icon: "icon-image",
                        title: "Edit image properties",
                        dialog: DIALOG_FORM.image
                    };
                }
                function getTextButton(selectedParent, selection) {
                    return {
                        control: "button",
                        domainObject: selectedParent,
                        applicableSelectedItems: selection.filter(selectionPath => {
                            return selectionPath[0].context.layoutItem.type === 'text-view';
                        }),
                        property: function (selectionPath) {
                            return getPath(selectionPath);
                        },
                        icon: "icon-gear",
                        title: "Edit text properties",
                        dialog: DIALOG_FORM.text
                    };
                }
                function getTelemetryValueMenu(selectionPath, selection) {
                    if (selection.length === 1) {
                        return {
                            control: "select-menu",
                            domainObject: selectionPath[1].context.item,
                            applicableSelectedItems: selection.filter(selectionPath => {
                                return selectionPath[0].context.layoutItem.type === 'telemetry-view';
                            }),
                            property: function (selectionPath) {
                                return getPath(selectionPath) + ".value";
                            },
                            title: "Set value",
                            options: openmct.telemetry.getMetadata(selectionPath[0].context.item).values().map(value => {
                                return {
                                    name: value.name,
                                    value: value.key
                                }
                            })
                        };
                    }
                }
                function getDisplayModeMenu(selectedParent, selection) {
                    if (selection.length === 1) {
                        return {
                            control: "select-menu",
                            domainObject: selectedParent,
-                            applicableSelectedItems: selection.filter(selectionPath => {
+                            property: function () {
-                                return selectionPath[0].context.layoutItem.type === 'telemetry-view';
+                                return getPath() + ".displayMode";
                            }),
                            property: function (selectionPath) {
                                return getPath(selectionPath) + ".displayMode";
                            },
                            title: "Set display mode",
                            options: [
@@ -484,196 +347,146 @@ define([], function () {
                                    value: "value"
                                }
                            ]
-                        };
+                        },
-                    }
+                        value = {
-                }
+                            control: "select-menu",
-
+                            domainObject: selectedParent,
-                function getSeparator() {
+                            property: function () {
                                return getPath() + ".value";
                            },
                            title: "Set value",
                            options: openmct.telemetry.getMetadata(selectedObject).values().map(value => {
                                return {
-                        control: "separator"
+                                    name: value.name,
                                    value: value.key
                                }
                            })
                        };
-                }
+                        toolbar = [
-
+                            displayMode,
-                function isMainLayoutSelected(selectionPath) {
+                            separator,
-                    let selectedObject = selectionPath[0].context.item;
+                            value,
-                    return selectedObject && selectedObject.type === 'layout' &&
+                            separator,
-                        !selectionPath[0].context.layoutItem;
+                            fill,
-                }
+                            stroke,
-
+                            color,
-                if (isMainLayoutSelected(selection[0])) {
+                            separator,
-                    return [getAddButton(selection)];
+                            size,
-                }
+                            separator,
-
+                            stackOrder,
-                let toolbar = {
+                            x,
-                    'add-menu': [],
+                            y,
-                    'toggle-frame': [],
+                            height,
-                    'display-mode': [],
+                            width,
-                    'telemetry-value': [],
+                            useGrid,
-                    'style': [],
+                            separator,
-                    'text-style': [],
+                            remove
                    'position': [],
                    'text': [],
                    'url': [],
                    'remove': []
                };
                selection.forEach(selectionPath => {
                    let selectedParent = selectionPath[1].context.item;
                    let layoutItem = selectionPath[0].context.layoutItem;
                    if (layoutItem.type === 'subobject-view') {
                        if (toolbar['add-menu'].length === 0 && selectionPath[0].context.item.type === 'layout') {
                            toolbar['add-menu'] = [getAddButton(selection, selectionPath)];
                        }
                        if (toolbar['toggle-frame'].length === 0) {
                            toolbar['toggle-frame'] = [getToggleFrameButton(selectedParent, selection)];
                        }
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
                                getXInput(selectedParent, selection),
                                getYInput(selectedParent, selection),
                                getHeightInput(selectedParent, selection),
                                getWidthInput(selectedParent, selection)
                        ];
                        }
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                        }
                    } else if (layoutItem.type === 'telemetry-view') {
                        if (toolbar['display-mode'].length === 0) {
                            toolbar['display-mode'] = [getDisplayModeMenu(selectedParent, selection)];
                        }
                        if (toolbar['telemetry-value'].length === 0) {
                            toolbar['telemetry-value'] = [getTelemetryValueMenu(selectionPath, selection)];
                        }
                        if (toolbar.style.length < 2) {
                            toolbar.style = [
                                getFillMenu(selectedParent, selection),
                                getStrokeMenu(selectedParent, selection)
                            ];
                        }
                        if (toolbar['text-style'].length === 0) {
                            toolbar['text-style'] = [
                                getTextColorMenu(selectedParent, selection),
                                getTextSizeMenu(selectedParent, selection)
                            ];
                        }
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
                                getXInput(selectedParent, selection),
                                getYInput(selectedParent, selection),
                                getHeightInput(selectedParent, selection),
                                getWidthInput(selectedParent, selection)
                            ];
                        }
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                        }
                    } else if (layoutItem.type === 'text-view') {
-                        if (toolbar.style.length < 2) {
+                        let text = {
-                            toolbar.style = [
+                            control: "button",
-                                getFillMenu(selectedParent, selection),
+                            domainObject: selectedParent,
-                                getStrokeMenu(selectedParent, selection)
+                            property: function () {
                                return getPath();
                            },
                            icon: "icon-gear",
                            title: "Edit text properties",
                            dialog: DIALOG_FORM['text']
                        };
                        toolbar = [
                            fill,
                            stroke,
                            separator,
                            color,
                            size,
                            separator,
                            stackOrder,
                            x,
                            y,
                            height,
                            width,
                            useGrid,
                            separator,
                            text,
                            separator,
                            remove
                        ];
                        }
                        if (toolbar['text-style'].length === 0) {
                            toolbar['text-style'] = [
                                getTextColorMenu(selectedParent, selection),
                                getTextSizeMenu(selectedParent, selection)
                            ];
                        }
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
                                getXInput(selectedParent, selection),
                                getYInput(selectedParent, selection),
                                getHeightInput(selectedParent, selection),
                                getWidthInput(selectedParent, selection)
                            ];
                        }
                        if (toolbar.text.length === 0) {
                            toolbar.text = [getTextButton(selectedParent, selection)];
                        }
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                        }
                    } else if (layoutItem.type === 'box-view') {
-                        if (toolbar.style.length < 2) {
+                        toolbar = [
-                            toolbar.style = [
+                            fill,
-                                getFillMenu(selectedParent, selection),
+                            stroke,
-                                getStrokeMenu(selectedParent, selection)
+                            separator,
                            stackOrder,
                            x,
                            y,
                            height,
                            width,
                            useGrid,
                            separator,
                            remove
                        ];
                        }
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
                                getXInput(selectedParent, selection),
                                getYInput(selectedParent, selection),
                                getHeightInput(selectedParent, selection),
                                getWidthInput(selectedParent, selection)
                            ];
                        }
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                        }
                    } else if (layoutItem.type === 'image-view') {
-                        if (toolbar.style.length === 0) {
+                        let url = {
-                            toolbar.style = [
+                            control: "button",
-                                getStrokeMenu(selectedParent, selection)
+                            domainObject: selectedParent,
                            property: function () {
                                return getPath();
                            },
                            icon: "icon-image",
                            title: "Edit image properties",
                            dialog: DIALOG_FORM['image']
                        };
                        toolbar = [
                            stroke,
                            separator,
                            stackOrder,
                            x,
                            y,
                            height,
                            width,
                            useGrid,
                            separator,
                            url,
                            separator,
                            remove
                        ];
                        }
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
                                getXInput(selectedParent, selection),
                                getYInput(selectedParent, selection),
                                getHeightInput(selectedParent, selection),
                                getWidthInput(selectedParent, selection)
                            ];
                        }
                        if (toolbar.url.length === 0) {
                            toolbar.url = [getURLButton(selectedParent, selection)];
                        }
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                        }
                    } else if (layoutItem.type === 'line-view') {
-                        if (toolbar.style.length === 0) {
+                        let x2 = {
-                            toolbar.style = [
+                            control: "input",
-                                getStrokeMenu(selectedParent, selection)
+                            type: "number",
                            domainObject: selectedParent,
                            property: function () {
                                return getPath() + ".x2";
                            },
                            label: "X2:",
                            title: "X2 position"
                        },
                        y2 = {
                            control: "input",
                            type: "number",
                            domainObject: selectedParent,
                            property: function () {
                                return getPath() + ".y2";
                            },
                            label: "Y2:",
                            title: "Y2 position",
                        };
                        toolbar = [
                            stroke,
                            separator,
                            stackOrder,
                            x,
                            y,
                            x2,
                            y2,
                            useGrid,
                            separator,
                            remove
                        ];
                    }
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
                                getXInput(selectedParent, selection),
                                getYInput(selectedParent, selection),
                                getX2Input(selectedParent, selection),
                                getY2Input(selectedParent, selection)
                            ];
                        }
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                        }
                    }
                });
                let toolbarArray = Object.values(toolbar);
                return _.flatten(toolbarArray.reduce((accumulator, group, index) => {
                    group = group.filter(control => control !== undefined);
                    if (group.length > 0) {
                        accumulator.push(group);
                        if (index < toolbarArray.length - 1) {
                            accumulator.push(getSeparator());
                        }
                }
-                    return accumulator;
+                return toolbar;
                }, []));
            }
        }
    }
--- a/src/plugins/displayLayout/DisplayLayoutType.js
+++ b/src/plugins/displayLayout/DisplayLayoutType.js
@@ -31,7 +31,7 @@ define(function () {
                domainObject.composition = [];
                domainObject.configuration = {
                    items: [],
-                    layoutGrid: [10, 10]
+                    layoutGrid: [10, 10],
                };
            },
            form: [
--- a/src/plugins/displayLayout/LayoutDrag.js
+++ b/src/plugins/displayLayout/LayoutDrag.js
@@ -95,7 +95,7 @@ define(
         * @param {number[]} pixelDelta the offset from the
         *        original position, in pixels
         */
-        LayoutDrag.prototype.getAdjustedPositionAndDimensions = function (pixelDelta) {
+        LayoutDrag.prototype.getAdjustedPosition = function (pixelDelta) {
            var gridDelta = toGridDelta(this.gridSize, pixelDelta);
            return {
                position: max(add(
@@ -109,16 +109,6 @@ define(
            };
        };
        LayoutDrag.prototype.getAdjustedPosition = function (pixelDelta) {
            var gridDelta = toGridDelta(this.gridSize, pixelDelta);
            return {
                position: max(add(
                    this.rawPosition.position,
                    multiply(gridDelta, this.posFactor)
                ), [0, 0])
            };
        };
        return LayoutDrag;
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
charlesh88	5465b0df9b	Markup changes WIP	2019-03-15 16:52:02 -07:00
charlesh88	d1732d057e	Merge in latest TCR, resolve conflicts;	2019-03-12 12:28:53 -07:00
charlesh88	508abb9da1	Migrate About, startup and splash screen styles	2019-03-12 11:59:48 -07:00
Charles Hacskaylo	9d82d7501d	Removed commented code	2019-03-12 11:44:40 -07:00
Charles Hacskaylo	13c2da52e8	Removed commented code	2019-03-12 11:43:46 -07:00
Charles Hacskaylo	584bc356ec	Update Palette.js	2019-03-12 11:40:38 -07:00
Charles Hacskaylo	ef982c4e6e	Update Palette.js	2019-03-12 11:39:15 -07:00
charlesh88	5a9d1f0ca5	Remove old src/styles directory - Remove old Snow and Espresso plugins; - Remove refs to old Snow and Espresso config'd aliases;	2019-03-12 11:25:07 -07:00
charlesh88	cc9c2bfe67	Migrate wait spinners, final cleanup	2019-03-12 11:13:13 -07:00
charlesh88	b57233b09d	Merge branch 'topic-core-refactor' into migrate-styles	2019-03-12 10:37:30 -07:00
charlesh88	c83e82de78	Migrate various - Autoflow tabular; - Datetime; - Channel selector; - Form validation;	2019-03-12 10:33:25 -07:00
charlesh88	d3d47dc305	Significant work for Summary Widgets, mctForm, compact form - Forms in overlay dialogs fixed; - form, compact-form, other classes migrated into new _forms.scss; - Fixes for Summary Widgets; - Theme constants files synced, add form values; - Removed import of legacy forms/elems SCSS file;	2019-03-08 17:22:41 -08:00
charlesh88	adfea14fa9	Various - Fix hover color in tree for better mechanics on a variety of bgs; - Fix object label in Locator tree; - Remove overlay blocker test color;	2019-03-08 13:54:16 -08:00
charlesh88	e2d2bd63cc	Fix palettes in Inspector	2019-03-08 11:05:35 -08:00
charlesh88	72d26432a2	Object labels, legacy cleanup - Add and apply .c-object-label for tree node elements; - Remove legacy class "tree" from markup; - Tweak color of tree item hover for better contrast in Inspector;	2019-03-08 09:51:14 -08:00
charlesh88	cd495b1bf7	Migrate effects and animation mixins	2019-03-08 00:13:58 -08:00
charlesh88	3e653c655c	Migrate archetypes - l-flex-row, l-flex-col, etc. moved to legacy; - grid-* styles cleaned up and moved, @extends removed; - WIP on c-object-label, move styles from mct-tree.vue into ObjectLabel .vue; - TODO: finish up c-object-label, cleanups in mct-tree.vue;	2019-03-07 16:52:58 -08:00
charlesh88	0b81d256f3	Migrate tree view used in Locator - Mods to legacy markup; - Mods to current CSS; - Removed import of legacy tree CSS in legacy-styles.scss;	2019-03-07 15:51:21 -08:00
charlesh88	d6c18e9b57	Significant fixes for Summary Widgets - Widget editing UI fixed; - JS cleanups and improvements; - CSS, JS code cleanup;	2019-03-07 14:22:54 -08:00
charlesh88	250dd2ddab	Fixed palettes - Fixed icon palette; - Significant refinement to general palette styles;	2019-03-07 10:41:09 -08:00
charlesh88	f8a44c5474	Fix layout in shell left pane due to elements being moved - Styles fixed and refined;	2019-03-07 08:58:55 -08:00
charlesh88	893e04f9a0	Merge branch 'topic-core-refactor' into migrate-styles	2019-03-07 08:29:20 -08:00
charlesh88	c76212cd62	Fix Summary Widgets UI WIP - Fix button in Test Data area;	2019-02-24 22:49:53 -08:00
charlesh88	697d7d4abd	Fix Summary Widgets UI WIP - Clean up code;	2019-02-23 15:41:46 -08:00
charlesh88	c80935a53c	Fix Summary Widgets UI WIP - Palettes all fixed and functional; - Conditions layout; - New c-button--swatched styles;	2019-02-23 11:59:30 -08:00
charlesh88	5895ddb0af	Fix Summary Widgets UI WIP - Toolbar styles made more portable; - Palette style migration; - Very WIP;	2019-02-23 09:52:35 -08:00
charlesh88	585a865b76	Fix Summary Widgets UI WIP - Rule formatting and layout; - Refinement to _controls / select {} padding;	2019-02-22 12:41:19 -08:00
charlesh88	fbd19140e6	Fix Summary Widgets UI WIP - Markup changes; - Migrate CSS to styles-new, remove old;	2019-02-22 10:28:28 -08:00
charlesh88	6f10d2fe60	Fix Summary Widgets UI WIP - Remove non-working status 'editing' checks; - view-control > c-disclosure-triangle;	2019-02-21 18:55:34 -08:00
charlesh88	6b657f24c1	Fix Summary Widgets UI WIP - Remove non-working status 'editing' checks;	2019-02-21 16:42:03 -08:00
charlesh88	5b67ccbd37	Merge branch 'topic-core-refactor' into migrate-styles	2019-02-21 14:36:41 -08:00
charlesh88	9cf6a361c5	Significant progress on migration, but still very WIP - Mostly constants and overlay styling; - Also bubbles and splitter; - TODO: fix tree in overlay and splitter in imagery!	2019-02-08 15:35:56 -08:00
charlesh88	8196339f3f	Merge latest TCR in, fix conflicts	2019-02-08 13:22:11 -08:00
charlesh88	f702fd48eb	WIP Styles migration - s-button converted to c-button, WIP; - Other	2019-01-28 15:40:46 -08:00
charlesh88	a56e1222f2	Further migrations and deprecating - Legacy indicator styles moved;	2019-01-26 09:40:21 -08:00
charlesh88	a4b089a93f	Merge in latest TCR	2019-01-26 09:07:07 -08:00
charlesh88	b1fedb6245	Legacy style migration in progress - Working bottom up, many legacy items commented out. Stopped at controls/indicators;	2019-01-18 16:24:20 -08:00