diff --git a/src/plugins/condition/components/inspector/StylesView.vue b/src/plugins/condition/components/inspector/StylesView.vue
index f623301e73..818e169aa6 100644
--- a/src/plugins/condition/components/inspector/StylesView.vue
+++ b/src/plugins/condition/components/inspector/StylesView.vue
@@ -141,6 +141,7 @@ const NON_STYLEABLE_CONTAINER_TYPES = [
const NON_STYLEABLE_LAYOUT_ITEM_TYPES = [
'line-view',
'box-view',
+ 'ellipse-view',
'image-view'
];
diff --git a/src/plugins/condition/pluginSpec.js b/src/plugins/condition/pluginSpec.js
index e3418352a0..ed4cfb17dc 100644
--- a/src/plugins/condition/pluginSpec.js
+++ b/src/plugins/condition/pluginSpec.js
@@ -230,7 +230,7 @@ describe('the plugin', function () {
};
const staticStyle = {
"style": {
- "backgroundColor": "#717171",
+ "backgroundColor": "#666666",
"border": "1px solid #00ffff"
}
};
@@ -238,7 +238,7 @@ describe('the plugin', function () {
"conditionId": "39584410-cbf9-499e-96dc-76f27e69885d",
"style": {
"isStyleInvisible": "",
- "backgroundColor": "#717171",
+ "backgroundColor": "#666666",
"border": "1px solid #ffff00"
}
};
@@ -250,7 +250,7 @@ describe('the plugin', function () {
"configuration": {
"items": [
{
- "fill": "#717171",
+ "fill": "#666666",
"stroke": "",
"x": 1,
"y": 1,
@@ -259,12 +259,22 @@ describe('the plugin', function () {
"type": "box-view",
"id": "89b88746-d325-487b-aec4-11b79afff9e8"
},
+ {
+ "fill": "#666666",
+ "stroke": "",
+ "x": 1,
+ "y": 1,
+ "width": 10,
+ "height": 5,
+ "type": "ellipse-view",
+ "id": "19b88746-d325-487b-aec4-11b79afff9z8"
+ },
{
"x": 18,
"y": 9,
"x2": 23,
"y2": 4,
- "stroke": "#717171",
+ "stroke": "#666666",
"type": "line-view",
"id": "57d49a28-7863-43bd-9593-6570758916f0"
},
@@ -299,12 +309,12 @@ describe('the plugin', function () {
"y": 9,
"x2": 23,
"y2": 4,
- "stroke": "#717171",
+ "stroke": "#666666",
"type": "line-view",
"id": "57d49a28-7863-43bd-9593-6570758916f0"
};
boxLayoutItem = {
- "fill": "#717171",
+ "fill": "#666666",
"stroke": "",
"x": 1,
"y": 1,
diff --git a/src/plugins/condition/utils/styleUtils.js b/src/plugins/condition/utils/styleUtils.js
index 8581cf3f15..98d2adaf27 100644
--- a/src/plugins/condition/utils/styleUtils.js
+++ b/src/plugins/condition/utils/styleUtils.js
@@ -29,9 +29,10 @@ const styleProps = {
noneValue: NONE_VALUE,
applicableForType: type => {
return !type ? true : (type === 'text-view'
- || type === 'telemetry-view'
- || type === 'box-view'
- || type === 'subobject-view');
+ || type === 'telemetry-view'
+ || type === 'box-view'
+ || type === 'ellipse-view'
+ || type === 'subobject-view');
}
},
border: {
@@ -41,6 +42,7 @@ const styleProps = {
return !type ? true : (type === 'text-view'
|| type === 'telemetry-view'
|| type === 'box-view'
+ || type === 'ellipse-view'
|| type === 'image-view'
|| type === 'line-view'
|| type === 'subobject-view');
diff --git a/src/plugins/displayLayout/DisplayLayoutToolbar.js b/src/plugins/displayLayout/DisplayLayoutToolbar.js
index cb204bf724..51ae1e3fb9 100644
--- a/src/plugins/displayLayout/DisplayLayoutToolbar.js
+++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js
@@ -149,6 +149,7 @@ define(['lodash'], function (_) {
return type === 'text-view'
|| type === 'telemetry-view'
|| type === 'box-view'
+ || type === 'ellipse-view'
|| type === 'image-view'
|| type === 'line-view'
|| type === 'subobject-view';
@@ -180,6 +181,10 @@ define(['lodash'], function (_) {
"name": "Box",
"class": "icon-box-round-corners"
},
+ {
+ "name": "Ellipse",
+ "class": "icon-circle"
+ },
{
"name": "Line",
"class": "icon-line-horz"
@@ -745,7 +750,7 @@ define(['lodash'], function (_) {
if (toolbar.remove.length === 0) {
toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
}
- } else if (layoutItem.type === 'box-view') {
+ } else if (layoutItem.type === 'box-view' || layoutItem.type === 'ellipse-view') {
if (toolbar.position.length === 0) {
toolbar.position = [
getStackOrder(selectedParent, selectionPath),
diff --git a/src/plugins/displayLayout/components/BoxView.vue b/src/plugins/displayLayout/components/BoxView.vue
index 4bebc382ae..577ce8b09f 100644
--- a/src/plugins/displayLayout/components/BoxView.vue
+++ b/src/plugins/displayLayout/components/BoxView.vue
@@ -43,7 +43,7 @@ import conditionalStylesMixin from '../mixins/objectStyles-mixin';
export default {
makeDefinition() {
return {
- fill: '#717171',
+ fill: '#666666',
stroke: '',
x: 1,
y: 1,
diff --git a/src/plugins/displayLayout/components/DisplayLayout.vue b/src/plugins/displayLayout/components/DisplayLayout.vue
index 6f06350407..c6a6115b93 100644
--- a/src/plugins/displayLayout/components/DisplayLayout.vue
+++ b/src/plugins/displayLayout/components/DisplayLayout.vue
@@ -76,6 +76,7 @@ import uuid from 'uuid';
import SubobjectView from './SubobjectView.vue';
import TelemetryView from './TelemetryView.vue';
import BoxView from './BoxView.vue';
+import EllipseView from './EllipseView.vue';
import TextView from './TextView.vue';
import LineView from './LineView.vue';
import ImageView from './ImageView.vue';
@@ -112,6 +113,7 @@ const ITEM_TYPE_VIEW_MAP = {
'subobject-view': SubobjectView,
'telemetry-view': TelemetryView,
'box-view': BoxView,
+ 'ellipse-view': EllipseView,
'line-view': LineView,
'text-view': TextView,
'image-view': ImageView
diff --git a/src/plugins/displayLayout/components/EllipseView.vue b/src/plugins/displayLayout/components/EllipseView.vue
new file mode 100644
index 0000000000..5e7f404b95
--- /dev/null
+++ b/src/plugins/displayLayout/components/EllipseView.vue
@@ -0,0 +1,122 @@
+/*****************************************************************************
+* Open MCT, Copyright (c) 2014-2021, 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.
+*****************************************************************************/
+
+
+ $emit('move', gridDelta)"
+ @endMove="() => $emit('endMove')"
+>
+
+
+
+
+
diff --git a/src/plugins/displayLayout/components/LineView.vue b/src/plugins/displayLayout/components/LineView.vue
index 25c0bbeec9..1f8ccba2ca 100644
--- a/src/plugins/displayLayout/components/LineView.vue
+++ b/src/plugins/displayLayout/components/LineView.vue
@@ -96,7 +96,7 @@ export default {
y: 10,
x2: 10,
y2: 5,
- stroke: '#717171'
+ stroke: '#666666'
};
},
mixins: [conditionalStylesMixin],
diff --git a/src/plugins/displayLayout/components/box-and-line-views.scss b/src/plugins/displayLayout/components/box-and-line-views.scss
index fd11906d27..13c5a2316e 100644
--- a/src/plugins/displayLayout/components/box-and-line-views.scss
+++ b/src/plugins/displayLayout/components/box-and-line-views.scss
@@ -1,4 +1,5 @@
-.c-box-view {
+.c-box-view,
+.c-ellipse-view {
border-width: $drawingObjBorderW !important;
display: flex;
align-items: stretch;
@@ -8,6 +9,10 @@
}
}
+.c-ellipse-view {
+ border-radius: 50%;
+}
+
.c-line-view {
&.c-frame {
box-shadow: none !important;
diff --git a/src/plugins/displayLayout/pluginSpec.js b/src/plugins/displayLayout/pluginSpec.js
index 43c2e10c50..43ef4932f7 100644
--- a/src/plugins/displayLayout/pluginSpec.js
+++ b/src/plugins/displayLayout/pluginSpec.js
@@ -186,7 +186,7 @@ describe('the plugin', function () {
'configuration': {
'items': [
{
- 'fill': '#717171',
+ 'fill': '#666666',
'stroke': '',
'x': 1,
'y': 1,
@@ -195,12 +195,22 @@ describe('the plugin', function () {
'type': 'box-view',
'id': '89b88746-d325-487b-aec4-11b79afff9e8'
},
+ {
+ 'fill': '#666666',
+ 'stroke': '',
+ 'x': 1,
+ 'y': 1,
+ 'width': 10,
+ 'height': 10,
+ 'type': 'ellipse-view',
+ 'id': '19b88746-d325-487b-aec4-11b79afff9z8'
+ },
{
'x': 18,
'y': 9,
'x2': 23,
'y2': 4,
- 'stroke': '#717171',
+ 'stroke': '#666666',
'type': 'line-view',
'id': '57d49a28-7863-43bd-9593-6570758916f0'
},
@@ -341,7 +351,7 @@ describe('the plugin', function () {
it('provides controls including separators', () => {
const displayLayoutToolbar = openmct.toolbars.get(selection);
- expect(displayLayoutToolbar.length).toBe(9);
+ expect(displayLayoutToolbar.length).toBe(7);
});
});
});
diff --git a/src/styles/_constants.scss b/src/styles/_constants.scss
index b493ca0584..25c9cf668b 100755
--- a/src/styles/_constants.scss
+++ b/src/styles/_constants.scss
@@ -154,6 +154,7 @@ $glyph-icon-flag: '\e92a';
$glyph-icon-eye-disabled: '\e92b';
$glyph-icon-notebook-page: '\e92c';
$glyph-icon-unlocked: '\e92d';
+$glyph-icon-circle: '\e92e';
$glyph-icon-arrows-right-left: '\ea00';
$glyph-icon-arrows-up-down: '\ea01';
$glyph-icon-bullet: '\ea02';
diff --git a/src/styles/_glyphs.scss b/src/styles/_glyphs.scss
index 0a4702b3a2..1d4f84148b 100755
--- a/src/styles/_glyphs.scss
+++ b/src/styles/_glyphs.scss
@@ -85,6 +85,7 @@
.icon-eye-disabled { @include glyphBefore($glyph-icon-eye-disabled); }
.icon-notebook-page { @include glyphBefore($glyph-icon-notebook-page); }
.icon-unlocked { @include glyphBefore($glyph-icon-unlocked); }
+.icon-circle { @include glyphBefore($glyph-icon-circle); }
.icon-arrows-right-left { @include glyphBefore($glyph-icon-arrows-right-left); }
.icon-arrows-up-down { @include glyphBefore($glyph-icon-arrows-up-down); }
.icon-bullet { @include glyphBefore($glyph-icon-bullet); }
diff --git a/src/styles/fonts/Open MCT Symbols 16px.json b/src/styles/fonts/Open MCT Symbols 16px.json
index 416ddff325..473a82e973 100755
--- a/src/styles/fonts/Open MCT Symbols 16px.json
+++ b/src/styles/fonts/Open MCT Symbols 16px.json
@@ -2,7 +2,7 @@
"metadata": {
"name": "Open MCT Symbols 16px",
"lastOpened": 0,
- "created": 1621648023886
+ "created": 1629996145999
},
"iconSets": [
{
@@ -375,13 +375,21 @@
"code": 59693,
"tempChar": ""
},
+ {
+ "order": 197,
+ "id": 169,
+ "name": "icon-circle",
+ "prevSize": 24,
+ "code": 59694,
+ "tempChar": ""
+ },
{
"order": 27,
"id": 105,
"name": "icon-arrows-right-left",
"prevSize": 24,
"code": 59904,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 26,
@@ -389,7 +397,7 @@
"name": "icon-arrows-up-down",
"prevSize": 24,
"code": 59905,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 68,
@@ -397,7 +405,7 @@
"name": "icon-bullet",
"prevSize": 24,
"code": 59906,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 150,
@@ -405,7 +413,7 @@
"prevSize": 24,
"code": 59907,
"name": "icon-calendar",
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 45,
@@ -413,7 +421,7 @@
"name": "icon-chain-links",
"prevSize": 24,
"code": 59908,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 73,
@@ -421,7 +429,7 @@
"name": "icon-download",
"prevSize": 24,
"code": 59909,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 39,
@@ -429,7 +437,7 @@
"name": "icon-duplicate",
"prevSize": 24,
"code": 59910,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 50,
@@ -437,7 +445,7 @@
"name": "icon-folder-new",
"prevSize": 24,
"code": 59911,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 138,
@@ -445,7 +453,7 @@
"name": "icon-fullscreen-collapse",
"prevSize": 24,
"code": 59912,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 139,
@@ -453,7 +461,7 @@
"name": "icon-fullscreen-expand",
"prevSize": 24,
"code": 59913,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 122,
@@ -461,7 +469,7 @@
"name": "icon-layers",
"prevSize": 24,
"code": 59914,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 151,
@@ -469,7 +477,7 @@
"name": "icon-line-horz",
"prevSize": 24,
"code": 59915,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 100,
@@ -477,7 +485,7 @@
"name": "icon-magnify",
"prevSize": 24,
"code": 59916,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 99,
@@ -485,7 +493,7 @@
"name": "icon-magnify-in",
"prevSize": 24,
"code": 59917,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 101,
@@ -493,7 +501,7 @@
"name": "icon-magnify-out-v2",
"prevSize": 24,
"code": 59918,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 103,
@@ -501,7 +509,7 @@
"name": "icon-menu",
"prevSize": 24,
"code": 59919,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 124,
@@ -509,7 +517,7 @@
"name": "icon-move",
"prevSize": 24,
"code": 59920,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 7,
@@ -517,7 +525,7 @@
"name": "icon-new-window",
"prevSize": 24,
"code": 59921,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 63,
@@ -525,7 +533,7 @@
"name": "icon-paint-bucket-v2",
"prevSize": 24,
"code": 59922,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 15,
@@ -533,7 +541,7 @@
"name": "icon-pencil",
"prevSize": 24,
"code": 59923,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 54,
@@ -541,7 +549,7 @@
"name": "icon-pencil-edit-in-place",
"prevSize": 24,
"code": 59924,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 40,
@@ -549,7 +557,7 @@
"name": "icon-play",
"prevSize": 24,
"code": 59925,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 125,
@@ -557,7 +565,7 @@
"name": "icon-pause",
"prevSize": 24,
"code": 59926,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 119,
@@ -565,7 +573,7 @@
"name": "icon-plot-resource",
"prevSize": 24,
"code": 59927,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 48,
@@ -573,7 +581,7 @@
"name": "icon-pointer-left",
"prevSize": 24,
"code": 59928,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 47,
@@ -581,7 +589,7 @@
"name": "icon-pointer-right",
"prevSize": 24,
"code": 59929,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 85,
@@ -589,7 +597,7 @@
"name": "icon-refresh",
"prevSize": 24,
"code": 59930,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 55,
@@ -597,7 +605,7 @@
"name": "icon-save",
"prevSize": 24,
"code": 59931,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 56,
@@ -605,7 +613,7 @@
"name": "icon-save-as",
"prevSize": 24,
"code": 59932,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 58,
@@ -613,7 +621,7 @@
"name": "icon-sine",
"prevSize": 24,
"code": 59933,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 113,
@@ -621,7 +629,7 @@
"name": "icon-font",
"prevSize": 24,
"code": 59934,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 41,
@@ -629,7 +637,7 @@
"name": "icon-thumbs-strip",
"prevSize": 24,
"code": 59935,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 146,
@@ -637,7 +645,7 @@
"name": "icon-two-parts-both",
"prevSize": 24,
"code": 59936,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 145,
@@ -645,7 +653,7 @@
"name": "icon-two-parts-one-only",
"prevSize": 24,
"code": 59937,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 82,
@@ -653,7 +661,7 @@
"name": "icon-resync",
"prevSize": 24,
"code": 59938,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 86,
@@ -661,7 +669,7 @@
"name": "icon-reset",
"prevSize": 24,
"code": 59939,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 61,
@@ -669,7 +677,7 @@
"name": "icon-x-in-circle",
"prevSize": 24,
"code": 59940,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 84,
@@ -677,7 +685,7 @@
"name": "icon-brightness",
"prevSize": 24,
"code": 59941,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 83,
@@ -685,7 +693,7 @@
"name": "icon-contrast",
"prevSize": 24,
"code": 59942,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 87,
@@ -693,7 +701,7 @@
"name": "icon-expand",
"prevSize": 24,
"code": 59943,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 89,
@@ -701,7 +709,7 @@
"name": "icon-list-view",
"prevSize": 24,
"code": 59944,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 133,
@@ -709,7 +717,7 @@
"name": "icon-grid-snap-to",
"prevSize": 24,
"code": 59945,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 132,
@@ -717,7 +725,7 @@
"name": "icon-grid-snap-no",
"prevSize": 24,
"code": 59946,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 94,
@@ -725,7 +733,7 @@
"name": "icon-frame-show",
"prevSize": 24,
"code": 59947,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 95,
@@ -733,7 +741,7 @@
"name": "icon-frame-hide",
"prevSize": 24,
"code": 59948,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 97,
@@ -741,7 +749,7 @@
"name": "icon-import",
"prevSize": 24,
"code": 59949,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 96,
@@ -749,7 +757,7 @@
"name": "icon-export",
"prevSize": 24,
"code": 59950,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 194,
@@ -757,7 +765,7 @@
"name": "icon-font-size",
"prevSize": 24,
"code": 59951,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 163,
@@ -765,7 +773,7 @@
"name": "icon-clear-data",
"prevSize": 24,
"code": 59952,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 173,
@@ -773,7 +781,7 @@
"name": "icon-history",
"prevSize": 24,
"code": 59953,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 181,
@@ -781,7 +789,7 @@
"name": "icon-arrow-up-to-parent",
"prevSize": 24,
"code": 59954,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 184,
@@ -789,7 +797,7 @@
"name": "icon-crosshair-in-circle",
"prevSize": 24,
"code": 59955,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 185,
@@ -797,7 +805,7 @@
"name": "icon-target",
"prevSize": 24,
"code": 59956,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 187,
@@ -805,7 +813,7 @@
"name": "icon-items-collapse",
"prevSize": 24,
"code": 59957,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 188,
@@ -813,7 +821,7 @@
"name": "icon-items-expand",
"prevSize": 24,
"code": 59958,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 190,
@@ -821,7 +829,7 @@
"name": "icon-3-dots",
"prevSize": 24,
"code": 59959,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 193,
@@ -829,7 +837,7 @@
"name": "icon-grid-on",
"prevSize": 24,
"code": 59960,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 192,
@@ -837,7 +845,7 @@
"name": "icon-grid-off",
"prevSize": 24,
"code": 59961,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 191,
@@ -845,7 +853,7 @@
"name": "icon-camera",
"prevSize": 24,
"code": 59962,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 196,
@@ -853,7 +861,7 @@
"name": "icon-folders-collapse",
"prevSize": 24,
"code": 59963,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 144,
@@ -861,7 +869,7 @@
"name": "icon-activity",
"prevSize": 24,
"code": 60160,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 104,
@@ -869,7 +877,7 @@
"name": "icon-activity-mode",
"prevSize": 24,
"code": 60161,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 137,
@@ -877,7 +885,7 @@
"name": "icon-autoflow-tabular",
"prevSize": 24,
"code": 60162,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 115,
@@ -885,7 +893,7 @@
"name": "icon-clock",
"prevSize": 24,
"code": 60163,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 2,
@@ -893,7 +901,7 @@
"name": "icon-database",
"prevSize": 24,
"code": 60164,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 3,
@@ -901,7 +909,7 @@
"name": "icon-database-query",
"prevSize": 24,
"code": 60165,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 67,
@@ -909,7 +917,7 @@
"name": "icon-dataset",
"prevSize": 24,
"code": 60166,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 59,
@@ -917,7 +925,7 @@
"name": "icon-datatable",
"prevSize": 24,
"code": 60167,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 136,
@@ -925,7 +933,7 @@
"name": "icon-dictionary",
"prevSize": 24,
"code": 60168,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 51,
@@ -933,7 +941,7 @@
"name": "icon-folder",
"prevSize": 24,
"code": 60169,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 147,
@@ -941,7 +949,7 @@
"name": "icon-image",
"prevSize": 24,
"code": 60170,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 4,
@@ -949,7 +957,7 @@
"name": "icon-layout",
"prevSize": 24,
"code": 60171,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 24,
@@ -957,7 +965,7 @@
"name": "icon-object",
"prevSize": 24,
"code": 60172,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 52,
@@ -965,7 +973,7 @@
"name": "icon-object-unknown",
"prevSize": 24,
"code": 60173,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 105,
@@ -973,7 +981,7 @@
"name": "icon-packet",
"prevSize": 24,
"code": 60174,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 126,
@@ -981,7 +989,7 @@
"name": "icon-page",
"prevSize": 24,
"code": 60175,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 130,
@@ -989,7 +997,7 @@
"name": "icon-plot-overlay",
"prevSize": 24,
"code": 60176,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 80,
@@ -997,7 +1005,7 @@
"name": "icon-plot-stacked",
"prevSize": 24,
"code": 60177,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 134,
@@ -1005,7 +1013,7 @@
"name": "icon-session",
"prevSize": 24,
"code": 60178,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 109,
@@ -1013,7 +1021,7 @@
"name": "icon-tabular",
"prevSize": 24,
"code": 60179,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 107,
@@ -1021,7 +1029,7 @@
"name": "icon-tabular-lad",
"prevSize": 24,
"code": 60180,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 106,
@@ -1029,7 +1037,7 @@
"name": "icon-tabular-lad-set",
"prevSize": 24,
"code": 60181,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 70,
@@ -1037,7 +1045,7 @@
"name": "icon-tabular-realtime",
"prevSize": 24,
"code": 60182,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 60,
@@ -1045,7 +1053,7 @@
"name": "icon-tabular-scrolling",
"prevSize": 24,
"code": 60183,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 131,
@@ -1053,7 +1061,7 @@
"name": "icon-telemetry",
"prevSize": 24,
"code": 60184,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 108,
@@ -1061,7 +1069,7 @@
"name": "icon-timeline",
"prevSize": 24,
"code": 60185,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 81,
@@ -1069,7 +1077,7 @@
"name": "icon-timer",
"prevSize": 24,
"code": 60186,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 69,
@@ -1077,7 +1085,7 @@
"name": "icon-topic",
"prevSize": 24,
"code": 60187,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 79,
@@ -1085,7 +1093,7 @@
"name": "icon-box-with-dashed-lines-v2",
"prevSize": 24,
"code": 60188,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 90,
@@ -1093,7 +1101,7 @@
"name": "icon-summary-widget",
"prevSize": 24,
"code": 60189,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 92,
@@ -1101,7 +1109,7 @@
"name": "icon-notebook",
"prevSize": 24,
"code": 60190,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 168,
@@ -1109,7 +1117,7 @@
"name": "icon-tabs-view",
"prevSize": 24,
"code": 60191,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 117,
@@ -1117,7 +1125,7 @@
"name": "icon-flexible-layout",
"prevSize": 24,
"code": 60192,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 166,
@@ -1125,7 +1133,7 @@
"name": "icon-generator-sine",
"prevSize": 24,
"code": 60193,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 167,
@@ -1133,7 +1141,7 @@
"name": "icon-generator-event",
"prevSize": 24,
"code": 60194,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 165,
@@ -1141,7 +1149,7 @@
"name": "icon-gauge-v2",
"prevSize": 24,
"code": 60195,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 170,
@@ -1149,7 +1157,7 @@
"name": "icon-spectra",
"prevSize": 24,
"code": 60196,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 171,
@@ -1157,7 +1165,7 @@
"name": "icon-telemetry-spectra",
"prevSize": 24,
"code": 60197,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 172,
@@ -1165,7 +1173,7 @@
"name": "icon-pushbutton",
"prevSize": 24,
"code": 60198,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 174,
@@ -1173,7 +1181,7 @@
"name": "icon-conditional",
"prevSize": 24,
"code": 60199,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 178,
@@ -1181,7 +1189,7 @@
"name": "icon-condition-widget",
"prevSize": 24,
"code": 60200,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 180,
@@ -1189,7 +1197,7 @@
"name": "icon-alphanumeric",
"prevSize": 24,
"code": 60201,
- "tempChar": ""
+ "tempChar": ""
},
{
"order": 183,
@@ -1197,7 +1205,7 @@
"name": "icon-image-telemetry",
"prevSize": 24,
"code": 60202,
- "tempChar": ""
+ "tempChar": ""
}
],
"id": 0,
@@ -2000,6 +2008,26 @@
]
}
},
+ {
+ "id": 169,
+ "paths": [
+ "M1024 512c0 282.77-229.23 512-512 512s-512-229.23-512-512c0-282.77 229.23-512 512-512s512 229.23 512 512z"
+ ],
+ "attrs": [
+ {}
+ ],
+ "isMulticolor": false,
+ "isMulticolor2": false,
+ "grid": 16,
+ "tags": [
+ "icon-circle"
+ ],
+ "colorPermutations": {
+ "12552552551": [
+ {}
+ ]
+ }
+ },
{
"id": 105,
"paths": [
diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.svg b/src/styles/fonts/Open-MCT-Symbols-16px.svg
index 0ce6df4786..96218e61b8 100644
--- a/src/styles/fonts/Open-MCT-Symbols-16px.svg
+++ b/src/styles/fonts/Open-MCT-Symbols-16px.svg
@@ -53,6 +53,7 @@
+
diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.ttf b/src/styles/fonts/Open-MCT-Symbols-16px.ttf
index 162658da32..1ca412a9b6 100644
Binary files a/src/styles/fonts/Open-MCT-Symbols-16px.ttf and b/src/styles/fonts/Open-MCT-Symbols-16px.ttf differ
diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.woff b/src/styles/fonts/Open-MCT-Symbols-16px.woff
index 512d06356d..1f3b60278c 100644
Binary files a/src/styles/fonts/Open-MCT-Symbols-16px.woff and b/src/styles/fonts/Open-MCT-Symbols-16px.woff differ