diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json index ff893a59e0..ad06071a51 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json @@ -1,8 +1,8 @@ { "metadata": { "name": "openmct-symbols-16px", - "lastOpened": 1469139168184, - "created": 1469139152052 + "lastOpened": 1469491083971, + "created": 1469491080974 }, "iconSets": [ { @@ -276,21 +276,13 @@ "code": 921602, "tempChar": "" }, - { - "order": 34, - "prevSize": 24, - "name": "icon-box-with-dashed-lines", - "id": 29, - "code": 921603, - "tempChar": "" - }, { "order": 9, "prevSize": 24, "name": "icon-bullet", "id": 4, "code": 921604, - "tempChar": "" + "tempChar": "" }, { "order": 25, @@ -298,7 +290,7 @@ "name": "icon-calendar", "id": 20, "code": 921605, - "tempChar": "" + "tempChar": "" }, { "order": 30, @@ -306,7 +298,7 @@ "name": "icon-chain-links", "id": 25, "code": 921606, - "tempChar": "" + "tempChar": "" }, { "order": 109, @@ -314,7 +306,7 @@ "prevSize": 24, "code": 921607, "name": "icon-pane-collapse-left", - "tempChar": "" + "tempChar": "" }, { "order": 110, @@ -322,7 +314,7 @@ "prevSize": 24, "code": 921608, "name": "icon-pane-collapse-right", - "tempChar": "" + "tempChar": "" }, { "order": 5, @@ -330,7 +322,7 @@ "prevSize": 24, "code": 921609, "name": "icon-download", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -338,7 +330,7 @@ "name": "icon-duplicate", "id": 55, "code": 921616, - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -346,7 +338,7 @@ "name": "icon-folder-new", "id": 56, "code": 921617, - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -354,7 +346,7 @@ "name": "icon-fullscreen-expand", "id": 59, "code": 921618, - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -362,7 +354,7 @@ "name": "icon-fullscreen-collapse", "id": 58, "code": 921619, - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -370,7 +362,7 @@ "name": "icon-layers", "id": 62, "code": 921620, - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -378,7 +370,7 @@ "name": "icon-line-horz", "id": 64, "code": 921621, - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -386,7 +378,7 @@ "name": "icon-magnify", "id": 68, "code": 921622, - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -394,7 +386,7 @@ "name": "icon-magnify-in", "id": 66, "code": 921623, - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -402,7 +394,7 @@ "name": "icon-magnify-out", "id": 67, "code": 921624, - "tempChar": "" + "tempChar": "" }, { "order": 74, @@ -410,7 +402,7 @@ "name": "icon-menu", "id": 69, "code": 921625, - "tempChar": "" + "tempChar": "" }, { "order": 75, @@ -418,7 +410,7 @@ "name": "icon-move", "id": 70, "code": 921632, - "tempChar": "" + "tempChar": "" }, { "order": 76, @@ -426,7 +418,7 @@ "name": "icon-new-window", "id": 71, "code": 921633, - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -434,7 +426,7 @@ "name": "icon-paint-bucket", "id": 21, "code": 921634, - "tempChar": "" + "tempChar": "" }, { "order": 81, @@ -442,7 +434,7 @@ "name": "icon-pause", "id": 76, "code": 921635, - "tempChar": "" + "tempChar": "" }, { "order": 82, @@ -450,7 +442,7 @@ "name": "icon-pencil", "id": 77, "code": 921636, - "tempChar": "" + "tempChar": "" }, { "order": 84, @@ -458,7 +450,7 @@ "name": "icon-play", "id": 79, "code": 921637, - "tempChar": "" + "tempChar": "" }, { "order": 85, @@ -466,7 +458,7 @@ "name": "icon-plot-resource", "id": 80, "code": 921638, - "tempChar": "" + "tempChar": "" }, { "order": 27, @@ -474,7 +466,7 @@ "name": "icon-pointer-left", "id": 22, "code": 921639, - "tempChar": "" + "tempChar": "" }, { "order": 28, @@ -482,7 +474,7 @@ "name": "icon-pointer-right", "id": 23, "code": 921640, - "tempChar": "" + "tempChar": "" }, { "order": 32, @@ -490,7 +482,7 @@ "name": "icon-refresh", "id": 27, "code": 921641, - "tempChar": "" + "tempChar": "" }, { "order": 16, @@ -498,7 +490,7 @@ "name": "icon-save", "id": 11, "code": 921648, - "tempChar": "" + "tempChar": "" }, { "order": 88, @@ -506,7 +498,7 @@ "name": "icon-sine", "id": 83, "code": 921649, - "tempChar": "" + "tempChar": "" }, { "order": 102, @@ -514,7 +506,7 @@ "name": "icon-T", "id": 84, "code": 921650, - "tempChar": "" + "tempChar": "" }, { "order": 92, @@ -522,7 +514,7 @@ "name": "icon-thumbs-strip", "id": 87, "code": 921651, - "tempChar": "" + "tempChar": "" }, { "order": 96, @@ -530,7 +522,7 @@ "name": "icon-two-parts-both", "id": 91, "code": 921652, - "tempChar": "" + "tempChar": "" }, { "order": 97, @@ -538,7 +530,7 @@ "name": "icon-two-parts-one-only", "id": 92, "code": 921653, - "tempChar": "" + "tempChar": "" }, { "order": 21, @@ -546,7 +538,7 @@ "name": "icon-x-in-circle", "id": 16, "code": 921654, - "tempChar": "" + "tempChar": "" }, { "order": 37, @@ -554,7 +546,7 @@ "name": "icon-activity", "id": 32, "code": 921856, - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -562,7 +554,7 @@ "name": "icon-activity-mode", "id": 31, "code": 921857, - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -570,7 +562,7 @@ "name": "icon-autoflow-tabular", "id": 47, "code": 921858, - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -578,7 +570,7 @@ "name": "icon-clock", "id": 50, "code": 921859, - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -586,7 +578,7 @@ "name": "icon-database", "id": 53, "code": 921860, - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -594,7 +586,7 @@ "name": "icon-database-query", "id": 52, "code": 921861, - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -602,7 +594,7 @@ "name": "icon-dataset", "id": 12, "code": 921862, - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -610,7 +602,7 @@ "name": "icon-datatable", "id": 17, "code": 921863, - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -618,7 +610,7 @@ "name": "icon-dictionary", "id": 54, "code": 921864, - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -626,7 +618,7 @@ "name": "icon-folder", "id": 57, "code": 921865, - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -634,7 +626,7 @@ "name": "icon-image", "id": 61, "code": 921872, - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -642,7 +634,7 @@ "name": "icon-layout", "id": 63, "code": 921873, - "tempChar": "" + "tempChar": "" }, { "order": 77, @@ -650,7 +642,7 @@ "name": "icon-object", "id": 72, "code": 921874, - "tempChar": "" + "tempChar": "" }, { "order": 78, @@ -658,7 +650,7 @@ "name": "icon-object-unknown", "id": 73, "code": 921875, - "tempChar": "" + "tempChar": "" }, { "order": 79, @@ -666,7 +658,7 @@ "name": "icon-packet", "id": 74, "code": 921876, - "tempChar": "" + "tempChar": "" }, { "order": 80, @@ -674,95 +666,119 @@ "name": "icon-page", "id": 75, "code": 921877, + "tempChar": "" + }, + { + "order": 114, + "id": 99, + "name": "icon-plot-overlay", + "prevSize": 24, + "code": 921878, "tempChar": "" }, + { + "order": 113, + "id": 100, + "name": "icon-plot-stacked", + "prevSize": 24, + "code": 921879, + "tempChar": "" + }, { "order": 10, "prevSize": 24, "name": "icon-session", "id": 5, - "code": 921878, - "tempChar": "" + "code": 921880, + "tempChar": "" }, { "order": 24, "prevSize": 24, "name": "icon-tabular", "id": 19, - "code": 921879, - "tempChar": "" + "code": 921881, + "tempChar": "" }, { "order": 7, "prevSize": 24, "name": "icon-tabular-lad", "id": 2, - "code": 921880, - "tempChar": "" + "code": 921888, + "tempChar": "" }, { "order": 6, "prevSize": 24, "name": "icon-tabular-lad-set", "id": 1, - "code": 921881, - "tempChar": "" + "code": 921889, + "tempChar": "" }, { "order": 8, "prevSize": 24, "name": "icon-tabular-realtime", "id": 3, - "code": 921888, - "tempChar": "" + "code": 921890, + "tempChar": "" }, { "order": 23, "prevSize": 24, "name": "icon-tabular-scrolling", "id": 18, - "code": 921889, - "tempChar": "" + "code": 921891, + "tempChar": "" }, { - "order": 91, + "order": 112, "prevSize": 24, "name": "icon-telemetry", "id": 86, - "code": 921890, - "tempChar": "" + "code": 921892, + "tempChar": "" }, { "order": 90, "prevSize": 24, "name": "icon-telemetry-panel", "id": 85, - "code": 921891, - "tempChar": "" + "code": 921893, + "tempChar": "" }, { "order": 93, "prevSize": 24, "name": "icon-timeline", "id": 88, - "code": 921892, - "tempChar": "" + "code": 921894, + "tempChar": "" }, { "order": 94, "prevSize": 24, "name": "icon-timer", "id": 89, - "code": 921893, - "tempChar": "" + "code": 921895, + "tempChar": "" }, { "order": 11, "prevSize": 24, "name": "icon-topic", "id": 6, - "code": 921894, - "tempChar": "" + "code": 921896, + "tempChar": "" + }, + { + "order": 115, + "prevSize": 24, + "name": "icon-box-with-dashed-lines", + "id": 29, + "code": 921897, + "tempChar": "" } ], "metadata": { @@ -1459,33 +1475,6 @@ "1161751207457516161751": [] } }, - { - "paths": [ - "M640 256h-256c-70.4 0-128 57.6-128 128v256c0 70.4 57.6 128 128 128h256c70.4 0 128-57.6 128-128v-256c0-70.4-57.6-128-128-128z", - "M0 0h192v192h-192v-192z", - "M256 0h192v128h-192v-128z", - "M576 0h192v128h-192v-128z", - "M256 896h192v128h-192v-128z", - "M576 896h192v128h-192v-128z", - "M0 576h128v192h-128v-192z", - "M0 256h128v192h-128v-192z", - "M896 576h128v192h-128v-192z", - "M896 256h128v192h-128v-192z", - "M832 0h192v192h-192v-192z", - "M0 832h192v192h-192v-192z", - "M832 832h192v192h-192v-192z" - ], - "grid": 16, - "tags": [ - "icon-box-with-dashed-lines" - ], - "defaultCode": 51, - "id": 29, - "attrs": [], - "colorPermutations": { - "1161751207457516161751": [] - } - }, { "paths": [ "M832 752c0 44-36 80-80 80h-480c-44 0-80-36-80-80v-480c0-44 36-80 80-80h480c44 0 80 36 80 80v480z" @@ -2419,6 +2408,55 @@ "1161751207457516161751": [] } }, + { + "id": 99, + "paths": [ + "M32 701.86c16.5-13 57.3-67.26 98.6-208 15.78-53.74 42-130.66 77.34-191.84 42.2-73.080 90.66-110.14 144-110.14s101.88 37.060 144 110.14c35.32 61.18 61.56 138 77.34 191.84 41.3 140.64 82.1 194.9 98.6 208 16.5-13 57.3-67.26 98.6-208 15.78-53.74 42-130.66 77.34-191.84 42.2-73.080 90.66-110.14 144-110.14 11.407 0.001 22.419 1.689 32.802 4.828l-0.802-2.708c0-106.7-87.3-194-194-194h-635.82c-106.7 0-194 87.3-194 194v466.1c13.8 23.5 25.060 36.3 32 41.76z", + "M992 322.14c-16.5 13-57.3 67.26-98.6 208-15.78 53.74-42 130.66-77.34 191.84-42.2 73.080-90.66 110.14-144 110.14s-101.88-37.060-144-110.14c-35.32-61.18-61.56-138-77.34-191.84-41.3-140.64-82.1-194.9-98.6-208-16.5 13-57.3 67.26-98.6 208-15.78 53.74-42 130.66-77.34 191.84-42.2 73.080-90.66 110.14-144 110.14-11.407-0.001-22.419-1.689-32.802-4.828l0.802 2.708c0 106.7 87.3 194 194 194h636c106.7 0 194-87.3 194-194v-466.1c-13.98-23.5-25.24-36.3-32.18-41.76z" + ], + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-plot-overlay" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "id": 100, + "paths": [ + "M209 320c15.62-46.74 36.78-100.6 62.92-145.86 42.2-73.080 90.68-110.14 144.080-110.14s101.88 37.060 144 110.14c26.2 45.26 47.36 99.12 63 145.86h401v-126c0-106.7-87.3-194-194-194h-636c-106.7 0-194 87.3-194 194v126h209z", + "M879 704c-15.62 46.74-36.78 100.6-62.92 145.86-42.2 73.080-90.68 110.14-144.080 110.14s-101.88-37.060-144-110.14c-26.2-45.26-47.36-99.12-63-145.86h-465v126c0 106.7 87.3 194 194 194h636c106.7 0 194-87.3 194-194v-126h-145z", + "M514.6 402c-41.3-140.64-82.1-194.9-98.6-207.9-16.5 13-57.3 67.26-98.6 207.9-8.037 26.798-32.476 45.992-61.399 46l-256.001 0v128h512c28.924 0.008 53.363 19.202 61.283 45.547 41.417 141.093 82.217 195.353 98.717 208.353 16.5-13 57.3-67.26 98.6-207.9 8.037-26.798 32.476-45.992 61.399-46l192.001-0v-128h-448c-28.924-0.008-53.363-19.202-61.283-45.547z" + ], + "attrs": [ + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-plot-stacked" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {}, + {} + ] + } + }, { "paths": [ "M635.6 524.4c6.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.4z", @@ -2690,10 +2728,8 @@ }, { "paths": [ - "M718.6 576h-127.2c25 93.4 48.4 144.4 63.6 168.6 15.2-24.2 38.6-75.2 63.6-168.6z", - "M794.2 752.8c-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-457.2c31.4 252.6 247 448 508 448s476.6-195.4 508-448h-167.2c-14 56.4-33 122-56.6 176.8z", - "M301.4 448h127.2c-25-93.4-48.4-144.4-63.6-168.6-15.2 24.2-38.6 75.2-63.6 168.6z", - "M274 187.2c18.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.8h457.2c-31.4-252.6-246.8-448-508-448s-476.6 195.4-508 448h167.2c14-56.4 33-122 56.6-176.8 15.6-35.8 31.4-63.2 48.2-84z" + "M130.6 494c15.78-53.74 42-130.66 77.34-191.84 42.2-73.080 90.66-110.14 144-110.14s101.88 37.060 144 110.14c35.32 61.18 61.56 138 77.34 191.84 41.3 140.64 82.1 194.9 98.6 208 16.5-13 57.3-67.26 98.6-208 15.78-53.74 42-130.66 77.34-191.84q36.46-63.14 78.92-90.2c-93.98-129.044-244.56-211.96-414.505-211.96-0.082 0-0.165 0-0.247 0-282.747-0-511.987 229.24-511.987 512-0 0.17-0 0.371-0 0.572 0 67.113 12.946 131.202 36.477 189.907 16.943-20.479 55.323-76.379 94.123-208.479z", + "M893.4 530c-15.78 53.74-42 130.66-77.34 191.84-42.2 73.080-90.66 110.14-144 110.14s-101.88-37.060-144-110.14c-35.32-61.18-61.56-138-77.34-191.84-41.3-140.64-82.1-194.9-98.6-208-16.5 13-57.3 67.26-98.6 208-15.78 53.74-42 130.66-77.34 191.84q-36.46 63.14-78.92 90.2c93.98 129.044 244.56 211.96 414.505 211.96 0.082 0 0.165-0 0.247-0 282.747 0 511.987-229.24 511.987-512 0-0.17 0-0.371 0-0.572 0-67.113-12.946-131.202-36.477-189.907-16.943 20.479-55.323 76.379-94.123 208.479z" ], "grid": 16, "tags": [ @@ -2701,9 +2737,17 @@ ], "defaultCode": 84, "id": 86, - "attrs": [], + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, "colorPermutations": { - "1161751207457516161751": [] + "1161751207457516161751": [ + {}, + {} + ] } }, { @@ -2776,6 +2820,51 @@ "colorPermutations": { "1161751207457516161751": [] } + }, + { + "paths": [ + "M0 384h128v256h-128v-256z", + "M128 128.22l0.22-0.22h191.78v-128h-192c-70.606 0.215-127.785 57.394-128 127.979l-0 192.021h128v-191.78z", + "M128 895.78v-191.78h-128v192c0.215 70.606 57.394 127.785 127.979 128l192.021 0v-128h-191.78z", + "M384 0h256v128h-256v-128z", + "M896 895.78l-0.22 0.22h-191.78v128h192c70.606-0.215 127.785-57.394 128-127.979l0-192.021h-128v191.78z", + "M896 0h-192v128h191.78l0.22 0.22v191.78h128v-192c-0.215-70.606-57.394-127.785-127.979-128z", + "M896 384h128v256h-128v-256z", + "M384 896h256v128h-256v-128z", + "M256 256h512v512h-512v-512z" + ], + "grid": 16, + "tags": [ + "icon-box-with-dashed-lines" + ], + "defaultCode": 51, + "id": 29, + "attrs": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "colorPermutations": { + "1161751207457516161751": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + } } ], "colorThemes": [ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot index 721323ca5a..d36b25b470 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg index 3eb2c1291b..0c0f087523 100755 --- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg @@ -40,7 +40,6 @@ - @@ -90,15 +89,18 @@ - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf index 125e9ef96d..92d00a3a85 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff index a514ce3b1f..9af95a713c 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff differ diff --git a/platform/commonUI/general/res/sass/_glyphs.scss b/platform/commonUI/general/res/sass/_glyphs.scss index 78799df8d4..876cf36c0a 100644 --- a/platform/commonUI/general/res/sass/_glyphs.scss +++ b/platform/commonUI/general/res/sass/_glyphs.scss @@ -90,8 +90,8 @@ $glyph-icon-object: '\e1112'; $glyph-icon-object-unknown: '\e1113'; $glyph-icon-packet: '\e1114'; $glyph-icon-page: '\e1115'; -$glyph-icon-plot-overlay: ''; -$glyph-icon-plot-stacked: ''; +$glyph-icon-plot-overlay: '\e1116'; +$glyph-icon-plot-stacked: '\e1117'; $glyph-icon-session: '\e1118'; $glyph-icon-tabular: '\e1119'; $glyph-icon-tabular-lad: '\e1120';