diff --git a/example/generator/GeneratorMetadataProvider.js b/example/generator/GeneratorMetadataProvider.js index 1668d72d4c..ae62f74862 100644 --- a/example/generator/GeneratorMetadataProvider.js +++ b/example/generator/GeneratorMetadataProvider.js @@ -99,10 +99,10 @@ define([ GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) { return _.extend( - {}, - domainObject.telemetry, - METADATA_BY_TYPE[domainObject.type] - ); + {}, + domainObject.telemetry, + METADATA_BY_TYPE[domainObject.type] + ); }; return GeneratorMetadataProvider; diff --git a/src/plugins/filters/components/FilterObject.vue b/src/plugins/filters/components/FilterObject.vue index 6796c44f8a..af5ed4c31c 100644 --- a/src/plugins/filters/components/FilterObject.vue +++ b/src/plugins/filters/components/FilterObject.vue @@ -77,6 +77,14 @@ export default { this.$emit('updateFilters', this.keyString, this.updatedFilters); }, updateTextFilter(key, comparator, value) { + if (value.trim() === '') { + if (this.updatedFilters[key]) { + delete this.updatedFilters[key]; + this.$emit('updateFilters', this.keyString, this.updatedFilters); + } + return; + } + if (!this.updatedFilters[key]) { this.$set(this.updatedFilters, key, {}); this.$set(this.updatedFilters[key], comparator, ''); diff --git a/src/plugins/telemetryTable/components/TelemetryFilterIndicator.vue b/src/plugins/telemetryTable/components/TelemetryFilterIndicator.vue new file mode 100644 index 0000000000..a2468fdbc5 --- /dev/null +++ b/src/plugins/telemetryTable/components/TelemetryFilterIndicator.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/plugins/telemetryTable/components/table.vue b/src/plugins/telemetryTable/components/table.vue index c0305e04d5..9e327b83be 100644 --- a/src/plugins/telemetryTable/components/table.vue +++ b/src/plugins/telemetryTable/components/table.vue @@ -106,6 +106,7 @@ :row="sizingRowData"> + @@ -280,6 +281,7 @@ import TelemetryTableRow from './table-row.vue'; import search from '../../../ui/components/search.vue'; import TableColumnHeader from './table-column-header.vue'; +import TelemetryFilterIndicator from './TelemetryFilterIndicator.vue'; import CSVExporter from '../../../exporters/CSVExporter.js'; import _ from 'lodash'; @@ -295,7 +297,8 @@ export default { components: { TelemetryTableRow, TableColumnHeader, - search + search, + TelemetryFilterIndicator }, inject: ['table', 'openmct'], props: { diff --git a/src/styles-new/_constants-espresso.scss b/src/styles-new/_constants-espresso.scss index 8f9614fcd0..666a705111 100644 --- a/src/styles-new/_constants-espresso.scss +++ b/src/styles-new/_constants-espresso.scss @@ -117,6 +117,8 @@ $colorInfo: #2294a2; $colorInfoFg: #fff; $colorOk: #33cc33; $colorOkFg: #fff; +$colorFilterBg: #44449c; +$colorFilterFg: #8984e9; // States $colorPausedBg: #ff9900; diff --git a/src/styles-new/_constants-maelstrom.scss b/src/styles-new/_constants-maelstrom.scss index 8da8a14aae..5278ca76ef 100644 --- a/src/styles-new/_constants-maelstrom.scss +++ b/src/styles-new/_constants-maelstrom.scss @@ -121,6 +121,8 @@ $colorInfo: #2294a2; $colorInfoFg: #fff; $colorOk: #33cc33; $colorOkFg: #fff; +$colorFilterBg: #44449c; +$colorFilterFg: #8984e9; // States $colorPausedBg: #ff9900; diff --git a/src/styles-new/_constants-snow.scss b/src/styles-new/_constants-snow.scss index 4294393c68..3496c59a27 100644 --- a/src/styles-new/_constants-snow.scss +++ b/src/styles-new/_constants-snow.scss @@ -117,6 +117,8 @@ $colorInfo: #2294a2; $colorInfoFg: #fff; $colorOk: #33cc33; $colorOkFg: #fff; +$colorFilterBg: #a29fe2; +$colorFilterFg: #fff; // States $colorPausedBg: #ff9900; diff --git a/src/styles-new/_constants.scss b/src/styles-new/_constants.scss index 22c35398a7..91b1e81673 100644 --- a/src/styles-new/_constants.scss +++ b/src/styles-new/_constants.scss @@ -141,6 +141,8 @@ $glyph-icon-grid: '\e922'; $glyph-icon-grippy-ew: '\e923'; $glyph-icon-columns: '\e924'; $glyph-icon-rows: '\e925'; +$glyph-icon-filter: '\e926'; +$glyph-icon-filter-outline: '\e927'; $glyph-icon-arrows-right-left: '\ea00'; $glyph-icon-arrows-up-down: '\ea01'; $glyph-icon-bullet: '\ea02'; diff --git a/src/styles-new/_glyphs.scss b/src/styles-new/_glyphs.scss index 6e6e683b4b..910f2f8369 100644 --- a/src/styles-new/_glyphs.scss +++ b/src/styles-new/_glyphs.scss @@ -30,10 +30,10 @@ } @font-face { - // Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json to generate font files + // Use https://icomoon.io/app with icomoon-project-Open-MCT-Symbols-12px.json to generate font files font-family: 'symbolsfont-12px'; - src: url('./fonts/openmct-symbols-12px.woff') format('woff'), - url('./fonts/openmct-symbols-12px.ttf') format('truetype'); + src: url('./fonts/Open-MCT-Symbols-12px.woff') format('woff'), + url('./fonts/Open-MCT-Symbols-12px.ttf') format('truetype'); font-weight: normal; font-style: normal; } @@ -77,6 +77,8 @@ .icon-grippy-ew { @include glyphBefore($glyph-icon-grippy-ew); } .icon-columns { @include glyphBefore($glyph-icon-columns); } .icon-rows { @include glyphBefore($glyph-icon-rows); } +.icon-filter { @include glyphBefore($glyph-icon-filter); } +.icon-filter-outline { @include glyphBefore($glyph-icon-filter-outline); } .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); } @@ -164,6 +166,8 @@ /************************** 12 PX CLASSES */ // TODO: sync with 16px redo as of 10/25/18 +.icon-filter-12px { @include glyphBefore($glyph-icon-filter,'symbolsfont-12px'); } +.icon-filter-outline-12px { @include glyphBefore($glyph-icon-filter-outline,'symbolsfont-12px'); } .icon-crosshair-12px { @include glyphBefore($glyph-icon-crosshair,'symbolsfont-12px'); } .icon-folder-12px { @include glyphBefore($glyph-icon-folder,'symbolsfont-12px'); } .icon-list-view-12px { @include glyphBefore($glyph-icon-list-view,'symbolsfont-12px'); } diff --git a/src/styles-new/fonts/icomoon-project-openmct-symbols-12px.json b/src/styles-new/fonts/Open MCT Symbols 12px.json similarity index 71% rename from src/styles-new/fonts/icomoon-project-openmct-symbols-12px.json rename to src/styles-new/fonts/Open MCT Symbols 12px.json index f73ef211ae..7bd655c492 100644 --- a/src/styles-new/fonts/icomoon-project-openmct-symbols-12px.json +++ b/src/styles-new/fonts/Open MCT Symbols 12px.json @@ -1,19 +1,35 @@ { "metadata": { - "name": "openmct-symbols-12px", + "name": "Open MCT Symbols 12px", "lastOpened": 0, - "created": 1527031065005 + "created": 1561483556329 }, "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, @@ -21,7 +37,7 @@ "name": "icon12-grippy", "prevSize": 12, "code": 59697, - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -29,7 +45,7 @@ "name": "icon12-list-view", "prevSize": 12, "code": 921666, - "tempChar": "" + "tempChar": "" }, { "order": 6, @@ -37,14 +53,14 @@ "prevSize": 12, "code": 921865, "name": "icon12-folder", - "tempChar": "" + "tempChar": "" } ], "id": 0, "metadata": { - "name": "openmct-symbols-12px", + "name": "Open MCT Symbols 12px", "importSize": { - "width": 279, + "width": 384, "height": 384 }, "designer": "Charles Hacskaylo" @@ -52,6 +68,28 @@ "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": [ @@ -60,26 +98,11 @@ "M597.333 768h-170.667v256h170.667v-256z", "M256 426.667h-256v170.667h256v-170.667z" ], - "attrs": [ - {}, - {}, - {}, - {} - ], - "isMulticolor": false, - "isMulticolor2": false, + "attrs": [], "grid": 0, "tags": [ "icon12-crosshair" - ], - "colorPermutations": { - "1161751": [ - {}, - {}, - {}, - {} - ] - } + ] }, { "id": 8, @@ -95,39 +118,12 @@ "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, @@ -136,24 +132,11 @@ "M0 426.667h1024v170.667h-1024v-170.667z", "M0 853.333h1024v170.667h-1024v-170.667z" ], - "attrs": [ - {}, - {}, - {} - ], - "isMulticolor": false, - "isMulticolor2": false, + "attrs": [], "grid": 0, "tags": [ "icon12-list-view" - ], - "colorPermutations": { - "1161751": [ - {}, - {}, - {} - ] - } + ] }, { "id": 3, @@ -162,40 +145,14 @@ "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": [ - [ - [ - 0, - 0, - 0, - 1 - ], - [ - 0, - 161, - 75, - 1 - ] - ] - ], + "colorThemes": [], "colorThemeIdx": 0 } ], @@ -206,9 +163,9 @@ "showQuickUse2": true, "showSVGs": true, "fontPref": { - "prefix": "icon-", + "prefix": "openmct-symbols-", "metadata": { - "fontFamily": "openmct-symbols-12px", + "fontFamily": "Open-MCT-Symbols-12px", "majorVersion": 1, "minorVersion": 0 }, @@ -217,7 +174,12 @@ "baseline": 6.25, "whitespace": 50 }, - "embed": false + "embed": false, + "noie8": true, + "ie7": false, + "showMetadata": false, + "includeMetadata": false, + "showMetrics": true }, "imagePref": { "prefix": "icon-", diff --git a/src/styles-new/fonts/Icomoon.Open MCT Symbols 2018.json b/src/styles-new/fonts/Open MCT Symbols 16px.json similarity index 98% rename from src/styles-new/fonts/Icomoon.Open MCT Symbols 2018.json rename to src/styles-new/fonts/Open MCT Symbols 16px.json index 356d4204b8..7a35dbd1e9 100644 --- a/src/styles-new/fonts/Icomoon.Open MCT Symbols 2018.json +++ b/src/styles-new/fonts/Open MCT Symbols 16px.json @@ -1,8 +1,8 @@ { "metadata": { - "name": "Open MCT Symbols", + "name": "Open MCT Symbols 16px", "lastOpened": 0, - "created": 1541830438012 + "created": 1561482854927 }, "iconSets": [ { @@ -317,13 +317,29 @@ "code": 59685, "tempChar": "" }, + { + "order": 161, + "id": 142, + "name": "icon-filter", + "prevSize": 32, + "code": 59686, + "tempChar": "" + }, + { + "order": 162, + "id": 141, + "name": "icon-filter-outline", + "prevSize": 32, + "code": 59687, + "tempChar": "" + }, { "order": 27, "id": 105, "name": "icon-arrows-right-left", "prevSize": 32, "code": 59904, - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -331,7 +347,7 @@ "name": "icon-arrows-up-down", "prevSize": 32, "code": 59905, - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -339,7 +355,7 @@ "name": "icon-bullet", "prevSize": 32, "code": 59906, - "tempChar": "" + "tempChar": "" }, { "order": 150, @@ -347,7 +363,7 @@ "prevSize": 32, "code": 59907, "name": "icon-calendar", - "tempChar": "" + "tempChar": "" }, { "order": 45, @@ -355,7 +371,7 @@ "name": "icon-chain-links", "prevSize": 32, "code": 59908, - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -363,7 +379,7 @@ "name": "icon-download", "prevSize": 32, "code": 59909, - "tempChar": "" + "tempChar": "" }, { "order": 39, @@ -371,7 +387,7 @@ "name": "icon-duplicate", "prevSize": 32, "code": 59910, - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -379,7 +395,7 @@ "name": "icon-folder-new", "prevSize": 32, "code": 59911, - "tempChar": "" + "tempChar": "" }, { "order": 138, @@ -387,7 +403,7 @@ "name": "icon-fullscreen-collapse", "prevSize": 32, "code": 59912, - "tempChar": "" + "tempChar": "" }, { "order": 139, @@ -395,7 +411,7 @@ "name": "icon-fullscreen-expand", "prevSize": 32, "code": 59913, - "tempChar": "" + "tempChar": "" }, { "order": 122, @@ -403,7 +419,7 @@ "name": "icon-layers", "prevSize": 32, "code": 59914, - "tempChar": "" + "tempChar": "" }, { "order": 151, @@ -411,7 +427,7 @@ "name": "icon-line-horz", "prevSize": 32, "code": 59915, - "tempChar": "" + "tempChar": "" }, { "order": 100, @@ -419,7 +435,7 @@ "name": "icon-magnify", "prevSize": 32, "code": 59916, - "tempChar": "" + "tempChar": "" }, { "order": 99, @@ -427,7 +443,7 @@ "name": "icon-magnify-in", "prevSize": 32, "code": 59917, - "tempChar": "" + "tempChar": "" }, { "order": 101, @@ -435,7 +451,7 @@ "name": "icon-magnify-out-v2", "prevSize": 32, "code": 59918, - "tempChar": "" + "tempChar": "" }, { "order": 103, @@ -443,7 +459,7 @@ "name": "icon-menu", "prevSize": 32, "code": 59919, - "tempChar": "" + "tempChar": "" }, { "order": 124, @@ -451,7 +467,7 @@ "name": "icon-move", "prevSize": 32, "code": 59920, - "tempChar": "" + "tempChar": "" }, { "order": 7, @@ -459,7 +475,7 @@ "name": "icon-new-window", "prevSize": 32, "code": 59921, - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -467,7 +483,7 @@ "name": "icon-paint-bucket-v2", "prevSize": 32, "code": 59922, - "tempChar": "" + "tempChar": "" }, { "order": 15, @@ -475,7 +491,7 @@ "name": "icon-pencil", "prevSize": 32, "code": 59923, - "tempChar": "" + "tempChar": "" }, { "order": 54, @@ -483,7 +499,7 @@ "name": "icon-pencil-edit-in-place", "prevSize": 32, "code": 59924, - "tempChar": "" + "tempChar": "" }, { "order": 40, @@ -491,7 +507,7 @@ "name": "icon-play", "prevSize": 32, "code": 59925, - "tempChar": "" + "tempChar": "" }, { "order": 125, @@ -499,7 +515,7 @@ "name": "icon-pause", "prevSize": 32, "code": 59926, - "tempChar": "" + "tempChar": "" }, { "order": 119, @@ -507,7 +523,7 @@ "name": "icon-plot-resource", "prevSize": 32, "code": 59927, - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -515,7 +531,7 @@ "name": "icon-pointer-left", "prevSize": 32, "code": 59928, - "tempChar": "" + "tempChar": "" }, { "order": 47, @@ -523,7 +539,7 @@ "name": "icon-pointer-right", "prevSize": 32, "code": 59929, - "tempChar": "" + "tempChar": "" }, { "order": 85, @@ -531,7 +547,7 @@ "name": "icon-refresh", "prevSize": 32, "code": 59930, - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -539,7 +555,7 @@ "name": "icon-save", "prevSize": 32, "code": 59931, - "tempChar": "" + "tempChar": "" }, { "order": 56, @@ -547,7 +563,7 @@ "name": "icon-save-as", "prevSize": 32, "code": 59932, - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -555,7 +571,7 @@ "name": "icon-sine", "prevSize": 32, "code": 59933, - "tempChar": "" + "tempChar": "" }, { "order": 113, @@ -563,7 +579,7 @@ "name": "icon-font", "prevSize": 32, "code": 59934, - "tempChar": "" + "tempChar": "" }, { "order": 41, @@ -571,7 +587,7 @@ "name": "icon-thumbs-strip", "prevSize": 32, "code": 59935, - "tempChar": "" + "tempChar": "" }, { "order": 146, @@ -579,7 +595,7 @@ "name": "icon-two-parts-both", "prevSize": 32, "code": 59936, - "tempChar": "" + "tempChar": "" }, { "order": 145, @@ -587,7 +603,7 @@ "name": "icon-two-parts-one-only", "prevSize": 32, "code": 59937, - "tempChar": "" + "tempChar": "" }, { "order": 82, @@ -595,7 +611,7 @@ "name": "icon-resync", "prevSize": 32, "code": 59938, - "tempChar": "" + "tempChar": "" }, { "order": 86, @@ -603,7 +619,7 @@ "name": "icon-reset", "prevSize": 32, "code": 59939, - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -611,7 +627,7 @@ "name": "icon-x-in-circle", "prevSize": 32, "code": 59940, - "tempChar": "" + "tempChar": "" }, { "order": 84, @@ -619,7 +635,7 @@ "name": "icon-brightness", "prevSize": 32, "code": 59941, - "tempChar": "" + "tempChar": "" }, { "order": 83, @@ -627,7 +643,7 @@ "name": "icon-contrast", "prevSize": 32, "code": 59942, - "tempChar": "" + "tempChar": "" }, { "order": 87, @@ -635,7 +651,7 @@ "name": "icon-expand", "prevSize": 32, "code": 59943, - "tempChar": "" + "tempChar": "" }, { "order": 89, @@ -643,7 +659,7 @@ "name": "icon-list-view", "prevSize": 32, "code": 59944, - "tempChar": "" + "tempChar": "" }, { "order": 133, @@ -651,7 +667,7 @@ "name": "icon-grid-snap-to", "prevSize": 32, "code": 59945, - "tempChar": "" + "tempChar": "" }, { "order": 132, @@ -659,7 +675,7 @@ "name": "icon-grid-snap-no", "prevSize": 32, "code": 59946, - "tempChar": "" + "tempChar": "" }, { "order": 94, @@ -667,7 +683,7 @@ "name": "icon-frame-show", "prevSize": 32, "code": 59947, - "tempChar": "" + "tempChar": "" }, { "order": 95, @@ -675,7 +691,7 @@ "name": "icon-frame-hide", "prevSize": 32, "code": 59948, - "tempChar": "" + "tempChar": "" }, { "order": 97, @@ -683,7 +699,7 @@ "name": "icon-import", "prevSize": 32, "code": 59949, - "tempChar": "" + "tempChar": "" }, { "order": 96, @@ -691,7 +707,7 @@ "name": "icon-export", "prevSize": 32, "code": 59950, - "tempChar": "" + "tempChar": "" }, { "order": 114, @@ -699,7 +715,7 @@ "name": "icon-font-size", "prevSize": 32, "code": 59951, - "tempChar": "" + "tempChar": "" }, { "order": 144, @@ -707,7 +723,7 @@ "name": "icon-activity", "prevSize": 32, "code": 60160, - "tempChar": "" + "tempChar": "" }, { "order": 104, @@ -715,7 +731,7 @@ "name": "icon-activity-mode", "prevSize": 32, "code": 60161, - "tempChar": "" + "tempChar": "" }, { "order": 137, @@ -723,7 +739,7 @@ "name": "icon-autoflow-tabular", "prevSize": 32, "code": 60162, - "tempChar": "" + "tempChar": "" }, { "order": 115, @@ -731,7 +747,7 @@ "name": "icon-clock", "prevSize": 32, "code": 60163, - "tempChar": "" + "tempChar": "" }, { "order": 2, @@ -739,7 +755,7 @@ "name": "icon-database", "prevSize": 32, "code": 60164, - "tempChar": "" + "tempChar": "" }, { "order": 3, @@ -747,7 +763,7 @@ "name": "icon-database-query", "prevSize": 32, "code": 60165, - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -755,7 +771,7 @@ "name": "icon-dataset", "prevSize": 32, "code": 60166, - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -763,7 +779,7 @@ "name": "icon-datatable", "prevSize": 32, "code": 60167, - "tempChar": "" + "tempChar": "" }, { "order": 136, @@ -771,7 +787,7 @@ "name": "icon-dictionary", "prevSize": 32, "code": 60168, - "tempChar": "" + "tempChar": "" }, { "order": 51, @@ -779,7 +795,7 @@ "name": "icon-folder", "prevSize": 32, "code": 60169, - "tempChar": "" + "tempChar": "" }, { "order": 147, @@ -787,7 +803,7 @@ "name": "icon-image", "prevSize": 32, "code": 60170, - "tempChar": "" + "tempChar": "" }, { "order": 4, @@ -795,7 +811,7 @@ "name": "icon-layout", "prevSize": 32, "code": 60171, - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -803,7 +819,7 @@ "name": "icon-object", "prevSize": 32, "code": 60172, - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -811,7 +827,7 @@ "name": "icon-object-unknown", "prevSize": 32, "code": 60173, - "tempChar": "" + "tempChar": "" }, { "order": 105, @@ -819,7 +835,7 @@ "name": "icon-packet", "prevSize": 32, "code": 60174, - "tempChar": "" + "tempChar": "" }, { "order": 126, @@ -827,7 +843,7 @@ "name": "icon-page", "prevSize": 32, "code": 60175, - "tempChar": "" + "tempChar": "" }, { "order": 130, @@ -835,7 +851,7 @@ "name": "icon-plot-overlay", "prevSize": 32, "code": 60176, - "tempChar": "" + "tempChar": "" }, { "order": 80, @@ -843,7 +859,7 @@ "name": "icon-plot-stacked", "prevSize": 32, "code": 60177, - "tempChar": "" + "tempChar": "" }, { "order": 134, @@ -851,7 +867,7 @@ "name": "icon-session", "prevSize": 32, "code": 60178, - "tempChar": "" + "tempChar": "" }, { "order": 109, @@ -859,7 +875,7 @@ "name": "icon-tabular", "prevSize": 32, "code": 60179, - "tempChar": "" + "tempChar": "" }, { "order": 107, @@ -867,7 +883,7 @@ "name": "icon-tabular-lad", "prevSize": 32, "code": 60180, - "tempChar": "" + "tempChar": "" }, { "order": 106, @@ -875,7 +891,7 @@ "name": "icon-tabular-lad-set", "prevSize": 32, "code": 60181, - "tempChar": "" + "tempChar": "" }, { "order": 70, @@ -883,7 +899,7 @@ "name": "icon-tabular-realtime", "prevSize": 32, "code": 60182, - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -891,7 +907,7 @@ "name": "icon-tabular-scrolling", "prevSize": 32, "code": 60183, - "tempChar": "" + "tempChar": "" }, { "order": 131, @@ -899,7 +915,7 @@ "name": "icon-telemetry", "prevSize": 32, "code": 60184, - "tempChar": "" + "tempChar": "" }, { "order": 108, @@ -907,7 +923,7 @@ "name": "icon-timeline", "prevSize": 32, "code": 60185, - "tempChar": "" + "tempChar": "" }, { "order": 81, @@ -915,7 +931,7 @@ "name": "icon-timer", "prevSize": 32, "code": 60186, - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -923,7 +939,7 @@ "name": "icon-topic", "prevSize": 32, "code": 60187, - "tempChar": "" + "tempChar": "" }, { "order": 79, @@ -931,7 +947,7 @@ "name": "icon-box-with-dashed-lines-v2", "prevSize": 32, "code": 60188, - "tempChar": "" + "tempChar": "" }, { "order": 90, @@ -939,7 +955,7 @@ "name": "icon-summary-widget", "prevSize": 32, "code": 60189, - "tempChar": "" + "tempChar": "" }, { "order": 92, @@ -947,7 +963,7 @@ "name": "icon-notebook", "prevSize": 32, "code": 60190, - "tempChar": "" + "tempChar": "" }, { "order": 118, @@ -955,7 +971,7 @@ "name": "icon-tabs-view", "prevSize": 32, "code": 60191, - "tempChar": "" + "tempChar": "" }, { "order": 117, @@ -963,7 +979,7 @@ "name": "icon-flexible-layout", "prevSize": 32, "code": 60192, - "tempChar": "" + "tempChar": "" }, { "order": 152, @@ -971,7 +987,7 @@ "name": "icon-generator-sine", "prevSize": 32, "code": 60193, - "tempChar": "" + "tempChar": "" }, { "order": 153, @@ -979,7 +995,7 @@ "name": "icon-generator-event", "prevSize": 32, "code": 60194, - "tempChar": "" + "tempChar": "" }, { "order": 160, @@ -987,7 +1003,7 @@ "name": "icon-gauge", "prevSize": 32, "code": 60195, - "tempChar": "" + "tempChar": "" } ], "id": 0, @@ -1602,6 +1618,46 @@ ] } }, + { + "id": 142, + "paths": [ + "M896 0h-768c-70.601 0.227-127.773 57.399-128 127.978l-0 0.022v768c0.227 70.601 57.399 127.773 127.978 128l0.022 0h256v-512l-192-192h640l-192 192v512h256c70.601-0.227 127.773-57.399 128-127.978l0-0.022v-768c-0.227-70.601-57.399-127.773-127.978-128l-0.022-0z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 1, + "tags": [ + "icon-filter" + ], + "colorPermutations": { + "11841841841": [ + {} + ] + } + }, + { + "id": 141, + "paths": [ + "M896 0h-768c-70.601 0.227-127.773 57.399-128 127.978l-0 0.022v768c0.227 70.601 57.399 127.773 127.978 128l0.022 0h768c70.601-0.227 127.773-57.399 128-127.978l0-0.022v-768c-0.227-70.601-57.399-127.773-127.978-128l-0.022-0zM896 895.8h-256v-383.8l192-192h-640l192 192v384h-256v-767.8h768z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 1, + "tags": [ + "icon-filter-outline" + ], + "colorPermutations": { + "11841841841": [ + {} + ] + } + }, { "id": 105, "paths": [ diff --git a/src/styles-new/fonts/Open-MCT-Symbols-12px.ttf b/src/styles-new/fonts/Open-MCT-Symbols-12px.ttf new file mode 100644 index 0000000000..0e3434dea8 Binary files /dev/null and b/src/styles-new/fonts/Open-MCT-Symbols-12px.ttf differ diff --git a/src/styles-new/fonts/Open-MCT-Symbols-12px.woff b/src/styles-new/fonts/Open-MCT-Symbols-12px.woff new file mode 100644 index 0000000000..e76e6ed5a6 Binary files /dev/null and b/src/styles-new/fonts/Open-MCT-Symbols-12px.woff differ diff --git a/src/styles-new/fonts/Open-MCT-Symbols-16px.ttf b/src/styles-new/fonts/Open-MCT-Symbols-16px.ttf old mode 100755 new mode 100644 index ac0509be55..d6dd1b8b78 Binary files a/src/styles-new/fonts/Open-MCT-Symbols-16px.ttf and b/src/styles-new/fonts/Open-MCT-Symbols-16px.ttf differ diff --git a/src/styles-new/fonts/Open-MCT-Symbols-16px.woff b/src/styles-new/fonts/Open-MCT-Symbols-16px.woff old mode 100755 new mode 100644 index c73a38c322..42a2473a58 Binary files a/src/styles-new/fonts/Open-MCT-Symbols-16px.woff and b/src/styles-new/fonts/Open-MCT-Symbols-16px.woff differ diff --git a/src/styles-new/fonts/openmct-symbols-12px.ttf b/src/styles-new/fonts/openmct-symbols-12px.ttf deleted file mode 100755 index b985d7eb20..0000000000 Binary files a/src/styles-new/fonts/openmct-symbols-12px.ttf and /dev/null differ diff --git a/src/styles-new/fonts/openmct-symbols-12px.woff b/src/styles-new/fonts/openmct-symbols-12px.woff deleted file mode 100755 index da269d12ef..0000000000 Binary files a/src/styles-new/fonts/openmct-symbols-12px.woff and /dev/null differ