diff --git a/example/styleguide/res/templates/glyphs.html b/example/styleguide/res/templates/glyphs.html index d6d252b0b2..c6851245a8 100644 --- a/example/styleguide/res/templates/glyphs.html +++ b/example/styleguide/res/templates/glyphs.html @@ -48,7 +48,9 @@ { 'meaning': 'General usage plus symbol; used in timer object', 'cssClass': 'icon-plus', 'cssContent': 'e926', 'htmlEntity': '&#xe926' }, { 'meaning': 'Delete', 'cssClass': 'icon-trash', 'cssContent': 'e927', 'htmlEntity': '&#xe927' }, { 'meaning': 'Close, remove', 'cssClass': 'icon-x', 'cssContent': 'e928', 'htmlEntity': '&#xe928' }, -{ 'meaning': 'Enclosing, inclusive; used in Time Conductor', 'cssClass': 'icon-brackets', 'cssContent': 'e929', 'htmlEntity': '&#xe929' } +{ 'meaning': 'Enclosing, inclusive; used in Time Conductor', 'cssClass': 'icon-brackets', 'cssContent': 'e929', 'htmlEntity': '&#xe929' }, +{ 'meaning': 'Something is targeted', 'cssClass': 'icon-crosshair', 'cssContent': 'e930', 'htmlEntity': '&#xe930' }, +{ 'meaning': 'Draggable', 'cssClass': 'icon-grippy', 'cssContent': 'e931', 'htmlEntity': '&#xe931' } ]; controls= [{ 'meaning': 'Reset zoom/pam', 'cssClass': 'icon-arrows-out', 'cssContent': 'e1000', 'htmlEntity': '&#xe1000' }, { 'meaning': 'Expand vertically', 'cssClass': 'icon-arrows-right-left', 'cssContent': 'e1001', 'htmlEntity': '&#xe1001' }, { 'meaning': 'View scrolling', 'cssClass': 'icon-arrows-up-down', 'cssContent': 'e1002', 'htmlEntity': '&#xe1002' }, @@ -84,10 +86,17 @@ { 'meaning': 'Image thumbs strip; view items grid', 'cssClass': 'icon-thumbs-strip', 'cssContent': 'e1033', 'htmlEntity': '&#xe1033' }, { 'meaning': 'Two part item, both parts', 'cssClass': 'icon-two-parts-both', 'cssContent': 'e1034', 'htmlEntity': '&#xe1034' }, { 'meaning': 'Two part item, one only', 'cssClass': 'icon-two-parts-one-only', 'cssContent': 'e1035', 'htmlEntity': '&#xe1035' }, +{ 'meaning': 'Resync', 'cssClass': 'icon-resync', 'cssContent': 'e1036', 'htmlEntity': '&#xe1036' }, +{ 'meaning': 'Reset', 'cssClass': 'icon-reset', 'cssContent': 'e1037', 'htmlEntity': '&#xe1037' }, { 'meaning': 'Clear', 'cssClass': 'icon-x-in-circle', 'cssContent': 'e1038', 'htmlEntity': '&#xe1038' }, { 'meaning': 'Brightness', 'cssClass': 'icon-brightness', 'cssContent': 'e1039', 'htmlEntity': '&#xe1039' }, { 'meaning': 'Contrast', 'cssClass': 'icon-contrast', 'cssContent': 'e1040', 'htmlEntity': '&#xe1040' }, -{ 'meaning': 'Expand', 'cssClass': 'icon-expand', 'cssContent': 'e1041', 'htmlEntity': '&#xe1041' } +{ 'meaning': 'Expand', 'cssClass': 'icon-expand', 'cssContent': 'e1041', 'htmlEntity': '&#xe1041' }, +{ 'meaning': 'View items in a tabular list', 'cssClass': 'icon-list-view', 'cssContent': 'e1042', 'htmlEntity': '&#xe1042' }, +{ 'meaning': 'Snap an object corner to a grid', 'cssClass': 'icon-grid-snap-to', 'cssContent': 'e1043', 'htmlEntity': '&#xe1043' }, +{ 'meaning': 'Do not snap an object corner to a grid', 'cssClass': 'icon-grid-snap-no', 'cssContent': 'e1044', 'htmlEntity': '&#xe1044' }, +{ 'meaning': 'Show an object frame in a Display Layout', 'cssClass': 'icon-frame-show', 'cssContent': 'e1045', 'htmlEntity': '&#xe1045' }, +{ 'meaning': 'Do not show an object frame in a Display Layout', 'cssClass': 'icon-frame-hide', 'cssContent': 'e1046', 'htmlEntity': '&#xe1046' } ]; objects= [{ 'meaning': 'Activity', 'cssClass': 'icon-activity', 'cssContent': 'e1100', 'htmlEntity': '&#xe1100' }, { 'meaning': 'Activity Mode', 'cssClass': 'icon-activity-mode', 'cssContent': 'e1101', 'htmlEntity': '&#xe1101' }, { 'meaning': 'Auto-flow Tabular view', 'cssClass': 'icon-autoflow-tabular', 'cssContent': 'e1102', 'htmlEntity': '&#xe1102' }, @@ -117,7 +126,8 @@ { 'meaning': 'Timeline object', 'cssClass': 'icon-timeline', 'cssContent': 'e1126', 'htmlEntity': '&#xe1126' }, { 'meaning': 'Timer object', 'cssClass': 'icon-timer', 'cssContent': 'e1127', 'htmlEntity': '&#xe1127' }, { 'meaning': 'Data Topic', 'cssClass': 'icon-topic', 'cssContent': 'e1128', 'htmlEntity': '&#xe1128' }, -{ 'meaning': 'Fixed Position object', 'cssClass': 'icon-box-with-dashed-lines', 'cssContent': 'e1129', 'htmlEntity': '&#xe1129' } +{ 'meaning': 'Fixed Position object', 'cssClass': 'icon-box-with-dashed-lines', 'cssContent': 'e1129', 'htmlEntity': '&#xe1129' }, +{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&#xe1130' } ]; "> @@ -141,8 +151,8 @@

How to Use Glyphs

-

The easiest way to use a glyph is to include its CSS class in element. The CSS adds a psuedo :before HTML element to whatever element it's attached to that makes proper use of the symbols font.

-

Alternately, you can use the .ui-symbol class in an object that contains encoded HTML entities. This method is only recommended if you cannot use the aforementioned CSS class approach for some reason.

+

The easiest way to use a glyph is to include its CSS class in an element. The CSS adds a psuedo :before HTML element to whatever element it's attached to that makes proper use of the symbols font.

+

Alternately, you can use the .ui-symbol class in an object that contains encoded HTML entities. This method is only recommended if you cannot use the aforementioned CSS class approach.



@@ -160,8 +170,8 @@
- +
Meaning{{glyph.meaning}}
Class.{{glyph.cssClass}}
Meaning{{glyph.meaning}}
CSS Content\{{glyph.cssContent}}
HTML Entity{{glyph.htmlEntity}}
@@ -176,8 +186,8 @@
- +
Meaning{{glyph.meaning}}
Class.{{glyph.cssClass}}
Meaning{{glyph.meaning}}
CSS Content\{{glyph.cssContent}}
HTML Entity{{glyph.htmlEntity}}
@@ -192,8 +202,8 @@
- +
Meaning{{glyph.meaning}}
Class.{{glyph.cssClass}}
Meaning{{glyph.meaning}}
CSS Content\{{glyph.cssContent}}
HTML Entity{{glyph.htmlEntity}}
diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json index 86f11674f2..54a0d68539 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json @@ -1,207 +1,144 @@ { - "metadata": { - "name": "openmct-symbols-12px", - "lastOpened": 1467322505818, - "created": 1467322503679 - }, - "iconSets": [ - { - "selection": [ - { - "order": 4, - "id": 2, - "prevSize": 12, - "code": 59671, - "name": "icon12-eye-open", - "tempChar": "" - }, - { - "order": 7, - "id": 5, - "prevSize": 12, - "code": 921607, - "name": "icon12-pane-collapse-left", - "tempChar": "" - }, - { - "order": 8, - "id": 4, - "prevSize": 12, - "code": 921608, - "name": "icon12-pane-collapse-right", - "tempChar": "" - }, - { - "order": 6, - "id": 3, - "prevSize": 12, - "code": 921865, - "name": "icon12-folder", - "tempChar": "" - } - ], - "id": 0, - "metadata": { - "name": "openmct-symbols-12px", - "importSize": { - "width": 320, - "height": 384 - }, - "designer": "Charles Hacskaylo" - }, - "height": 1024, - "prevSize": 12, - "icons": [ - { - "id": 2, - "paths": [ - "M512 86c-257.92 0-471.28 185.147-506.667 426 35.493 240.853 248.853 426 506.667 426s471.28-185.147 506.667-426c-35.387-240.853-248.747-426-506.667-426zM738.373 685.2c-131.048 109.517-321.699 109.517-452.747 0-53.328-44.749-90.832-105.477-106.96-173.2 16.101-67.707 53.565-128.435 106.853-173.2 131.048-109.517 321.699-109.517 452.747 0 53.368 44.733 90.909 105.464 107.067 173.2-16.128 67.723-53.632 128.451-106.96 173.2z", - "M682.667 512c0 94.257-76.41 170.667-170.667 170.667s-170.667-76.41-170.667-170.667c0-94.257 76.41-170.667 170.667-170.667s170.667 76.41 170.667 170.667z" - ], - "attrs": [], - "isMulticolor": false, - "grid": 0, - "tags": [ - "icon12-eye-open" - ], - "colorPermutations": { - "1161751": [ - { - "f": 0 - }, - { - "f": 0 - } - ] - } - }, - { - "id": 5, - "paths": [ - "M0 0h170.667v1024h-170.667v-1024z", - "M853.333 256h-256v-256l-341.333 426.667 341.333 426.667v-256h256v-341.333z" - ], - "attrs": [ - { - "opacity": 1 - }, - { - "opacity": 1 - } - ], - "isMulticolor": false, - "width": 853, - "grid": 0, - "tags": [ - "icon12-pane-collapse-left" - ], - "colorPermutations": { - "1161751": [ - {}, - {} - ] - } - }, - { - "id": 4, - "paths": [ - "M682.667 0h170.667v1024h-170.667v-1024z", - "M0 256h256v-256l341.333 426.667-341.333 426.667v-256h-256v-341.333z" - ], - "attrs": [ - { - "opacity": 1 - }, - { - "opacity": 1 - } - ], - "isMulticolor": false, - "width": 853, - "grid": 0, - "tags": [ - "icon12-pane-collapse-right" - ], - "colorPermutations": { - "1161751": [ - {}, - {} - ] - } - }, - { - "id": 3, - "paths": [ - "M938.667 170.667h-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.32l-0 341.346c0.136-47.073 38.26-85.197 85.32-85.333l853.346-0c47.073 0.136 85.197 38.26 85.333 85.32l0-170.654c-0.136-47.073-38.26-85.197-85.32-85.333z", - "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 - ] - ] - ], - "colorThemeIdx": 0 - } - ], - "preferences": { - "showGlyphs": true, - "showCodes": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "icon-", - "metadata": { - "fontFamily": "openmct-symbols-12px", - "majorVersion": 1, - "minorVersion": 0 - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "embed": false - }, - "imagePref": { - "prefix": "icon-", - "png": true, - "useClassSelector": true, - "color": 0, - "bgColor": 16777215 - }, - "historySize": 100, - "gridSize": 16 - }, - "uid": -1 -} + "metadata": { + "name": "openmct-symbols-12px", + "lastOpened": 0, + "created": 1502213994889 + }, + "iconSets": [ + { + "selection": [ + { + "order": 9, + "id": 6, + "name": "icon12-crosshair", + "prevSize": 12, + "code": 59696, + "tempChar": "" + }, + { + "order": 6, + "id": 3, + "prevSize": 12, + "code": 921865, + "name": "icon12-folder", + "tempChar": "" + } + ], + "id": 0, + "metadata": { + "name": "openmct-symbols-12px", + "importSize": { + "width": 384, + "height": 384 + }, + "designer": "Charles Hacskaylo" + }, + "height": 1024, + "prevSize": 12, + "icons": [ + { + "id": 6, + "paths": [ + "M597.333 0h-170.667v256h170.667v-256z", + "M1024 426.667h-256v170.667h256v-170.667z", + "M597.333 768h-170.667v256h170.667v-256z", + "M256 426.667h-256v170.667h256v-170.667z" + ], + "attrs": [ + {}, + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "icon12-crosshair" + ], + "colorPermutations": { + "1161751": [ + {}, + {}, + {}, + {} + ] + } + }, + { + "id": 3, + "paths": [ + "M938.667 170.667h-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.32l-0 341.346c0.136-47.073 38.26-85.197 85.32-85.333l853.346-0c47.073 0.136 85.197 38.26 85.333 85.32l0-170.654c-0.136-47.073-38.26-85.197-85.32-85.333z", + "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 + ] + ] + ], + "colorThemeIdx": 0 + } + ], + "preferences": { + "showGlyphs": true, + "showCodes": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "icon-", + "metadata": { + "fontFamily": "openmct-symbols-12px", + "majorVersion": 1, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 0, + "bgColor": 16777215 + }, + "historySize": 100, + "gridSize": 16 + }, + "uid": -1, + "time": 1502216581486 +} \ No newline at end of file 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 8c4521bd05..629fd93b14 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 @@ -2,7 +2,7 @@ "metadata": { "name": "openmct-symbols-16px", "lastOpened": 0, - "created": 1501626045289 + "created": 1502213984498 }, "iconSets": [ { @@ -252,13 +252,21 @@ "code": 59689, "tempChar": "" }, + { + "order": 134, + "id": 114, + "name": "icon-crosshair", + "prevSize": 24, + "code": 59696, + "tempChar": "" + }, { "order": 127, "id": 109, "name": "icon-grippy-v2", "prevSize": 24, "code": 59697, - "tempChar": "" + "tempChar": "" }, { "order": 48, @@ -266,7 +274,7 @@ "name": "icon-arrows-out", "id": 43, "code": 921600, - "tempChar": "" + "tempChar": "" }, { "order": 49, @@ -274,7 +282,7 @@ "name": "icon-arrows-right-left", "id": 44, "code": 921601, - "tempChar": "" + "tempChar": "" }, { "order": 50, @@ -282,7 +290,7 @@ "name": "icon-arrows-up-down", "id": 45, "code": 921602, - "tempChar": "" + "tempChar": "" }, { "order": 9, @@ -290,7 +298,7 @@ "name": "icon-bullet", "id": 4, "code": 921604, - "tempChar": "" + "tempChar": "" }, { "order": 25, @@ -298,7 +306,7 @@ "name": "icon-calendar", "id": 20, "code": 921605, - "tempChar": "" + "tempChar": "" }, { "order": 30, @@ -306,7 +314,7 @@ "name": "icon-chain-links", "id": 25, "code": 921606, - "tempChar": "" + "tempChar": "" }, { "order": 109, @@ -314,7 +322,7 @@ "prevSize": 24, "code": 921607, "name": "icon-pane-collapse-left", - "tempChar": "" + "tempChar": "" }, { "order": 110, @@ -322,7 +330,7 @@ "prevSize": 24, "code": 921608, "name": "icon-pane-collapse-right", - "tempChar": "" + "tempChar": "" }, { "order": 5, @@ -330,7 +338,7 @@ "prevSize": 24, "code": 921609, "name": "icon-download", - "tempChar": "" + "tempChar": "" }, { "order": 60, @@ -338,7 +346,7 @@ "name": "icon-duplicate", "id": 55, "code": 921616, - "tempChar": "" + "tempChar": "" }, { "order": 61, @@ -346,7 +354,7 @@ "name": "icon-folder-new", "id": 56, "code": 921617, - "tempChar": "" + "tempChar": "" }, { "order": 64, @@ -354,7 +362,7 @@ "name": "icon-fullscreen-expand", "id": 59, "code": 921618, - "tempChar": "" + "tempChar": "" }, { "order": 63, @@ -362,7 +370,7 @@ "name": "icon-fullscreen-collapse", "id": 58, "code": 921619, - "tempChar": "" + "tempChar": "" }, { "order": 67, @@ -370,7 +378,7 @@ "name": "icon-layers", "id": 62, "code": 921620, - "tempChar": "" + "tempChar": "" }, { "order": 69, @@ -378,7 +386,7 @@ "name": "icon-line-horz", "id": 64, "code": 921621, - "tempChar": "" + "tempChar": "" }, { "order": 73, @@ -386,7 +394,7 @@ "name": "icon-magnify", "id": 68, "code": 921622, - "tempChar": "" + "tempChar": "" }, { "order": 71, @@ -394,7 +402,7 @@ "name": "icon-magnify-in", "id": 66, "code": 921623, - "tempChar": "" + "tempChar": "" }, { "order": 72, @@ -402,7 +410,7 @@ "name": "icon-magnify-out", "id": 67, "code": 921624, - "tempChar": "" + "tempChar": "" }, { "order": 74, @@ -410,7 +418,7 @@ "name": "icon-menu", "id": 69, "code": 921625, - "tempChar": "" + "tempChar": "" }, { "order": 75, @@ -418,7 +426,7 @@ "name": "icon-move", "id": 70, "code": 921632, - "tempChar": "" + "tempChar": "" }, { "order": 76, @@ -426,7 +434,7 @@ "name": "icon-new-window", "id": 71, "code": 921633, - "tempChar": "" + "tempChar": "" }, { "order": 26, @@ -434,7 +442,7 @@ "name": "icon-paint-bucket", "id": 21, "code": 921634, - "tempChar": "" + "tempChar": "" }, { "order": 81, @@ -442,7 +450,7 @@ "name": "icon-pause", "id": 76, "code": 921635, - "tempChar": "" + "tempChar": "" }, { "order": 82, @@ -450,7 +458,7 @@ "name": "icon-pencil", "id": 77, "code": 921636, - "tempChar": "" + "tempChar": "" }, { "order": 84, @@ -458,7 +466,7 @@ "name": "icon-play", "id": 79, "code": 921637, - "tempChar": "" + "tempChar": "" }, { "order": 85, @@ -466,7 +474,7 @@ "name": "icon-plot-resource", "id": 80, "code": 921638, - "tempChar": "" + "tempChar": "" }, { "order": 27, @@ -474,7 +482,7 @@ "name": "icon-pointer-left", "id": 22, "code": 921639, - "tempChar": "" + "tempChar": "" }, { "order": 28, @@ -482,7 +490,7 @@ "name": "icon-pointer-right", "id": 23, "code": 921640, - "tempChar": "" + "tempChar": "" }, { "order": 32, @@ -490,7 +498,7 @@ "name": "icon-refresh", "id": 27, "code": 921641, - "tempChar": "" + "tempChar": "" }, { "order": 16, @@ -498,7 +506,7 @@ "name": "icon-save", "id": 11, "code": 921648, - "tempChar": "" + "tempChar": "" }, { "order": 88, @@ -506,7 +514,7 @@ "name": "icon-sine", "id": 83, "code": 921649, - "tempChar": "" + "tempChar": "" }, { "order": 102, @@ -514,7 +522,7 @@ "name": "icon-T", "id": 84, "code": 921650, - "tempChar": "" + "tempChar": "" }, { "order": 92, @@ -522,7 +530,7 @@ "name": "icon-thumbs-strip", "id": 87, "code": 921651, - "tempChar": "" + "tempChar": "" }, { "order": 96, @@ -530,7 +538,7 @@ "name": "icon-two-parts-both", "id": 91, "code": 921652, - "tempChar": "" + "tempChar": "" }, { "order": 97, @@ -538,7 +546,7 @@ "name": "icon-two-parts-one-only", "id": 92, "code": 921653, - "tempChar": "" + "tempChar": "" }, { "order": 21, @@ -546,7 +554,7 @@ "name": "icon-resync", "id": 16, "code": 921654, - "tempChar": "" + "tempChar": "" }, { "order": 120, @@ -554,7 +562,7 @@ "name": "icon-reset", "prevSize": 24, "code": 921655, - "tempChar": "" + "tempChar": "" }, { "order": 121, @@ -562,7 +570,7 @@ "name": "icon-x-in-circle", "prevSize": 24, "code": 921656, - "tempChar": "" + "tempChar": "" }, { "order": 118, @@ -570,7 +578,7 @@ "name": "icon-brightness", "prevSize": 24, "code": 921657, - "tempChar": "" + "tempChar": "" }, { "order": 119, @@ -578,7 +586,7 @@ "name": "icon-contrast", "prevSize": 24, "code": 921664, - "tempChar": "" + "tempChar": "" }, { "order": 124, @@ -586,7 +594,7 @@ "name": "icon-expand", "prevSize": 24, "code": 921665, - "tempChar": "" + "tempChar": "" }, { "order": 125, @@ -594,7 +602,7 @@ "name": "icon-list-view", "prevSize": 24, "code": 921666, - "tempChar": "" + "tempChar": "" }, { "order": 133, @@ -602,7 +610,7 @@ "name": "icon-grid-snap-to", "prevSize": 24, "code": 921667, - "tempChar": "" + "tempChar": "" }, { "order": 128, @@ -610,7 +618,7 @@ "name": "icon-grid-snap-no", "prevSize": 24, "code": 921668, - "tempChar": "" + "tempChar": "" }, { "order": 131, @@ -618,7 +626,7 @@ "name": "icon-frame-show", "prevSize": 24, "code": 921669, - "tempChar": "" + "tempChar": "" }, { "order": 130, @@ -626,7 +634,7 @@ "name": "icon-frame-hide", "prevSize": 24, "code": 921670, - "tempChar": "" + "tempChar": "" }, { "order": 37, @@ -634,7 +642,7 @@ "name": "icon-activity", "id": 32, "code": 921856, - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -642,7 +650,7 @@ "name": "icon-activity-mode", "id": 31, "code": 921857, - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -650,7 +658,7 @@ "name": "icon-autoflow-tabular", "id": 47, "code": 921858, - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -658,7 +666,7 @@ "name": "icon-clock", "id": 50, "code": 921859, - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -666,7 +674,7 @@ "name": "icon-database", "id": 53, "code": 921860, - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -674,7 +682,7 @@ "name": "icon-database-query", "id": 52, "code": 921861, - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -682,7 +690,7 @@ "name": "icon-dataset", "id": 12, "code": 921862, - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -690,7 +698,7 @@ "name": "icon-datatable", "id": 17, "code": 921863, - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -698,7 +706,7 @@ "name": "icon-dictionary", "id": 54, "code": 921864, - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -706,7 +714,7 @@ "name": "icon-folder", "id": 57, "code": 921865, - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -714,7 +722,7 @@ "name": "icon-image", "id": 61, "code": 921872, - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -722,7 +730,7 @@ "name": "icon-layout", "id": 63, "code": 921873, - "tempChar": "" + "tempChar": "" }, { "order": 77, @@ -730,7 +738,7 @@ "name": "icon-object", "id": 72, "code": 921874, - "tempChar": "" + "tempChar": "" }, { "order": 78, @@ -738,7 +746,7 @@ "name": "icon-object-unknown", "id": 73, "code": 921875, - "tempChar": "" + "tempChar": "" }, { "order": 79, @@ -746,7 +754,7 @@ "name": "icon-packet", "id": 74, "code": 921876, - "tempChar": "" + "tempChar": "" }, { "order": 80, @@ -754,7 +762,7 @@ "name": "icon-page", "id": 75, "code": 921877, - "tempChar": "" + "tempChar": "" }, { "order": 0, @@ -770,7 +778,7 @@ "name": "icon-plot-stacked", "prevSize": 24, "code": 921879, - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -778,7 +786,7 @@ "name": "icon-session", "id": 5, "code": 921880, - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -786,7 +794,7 @@ "name": "icon-tabular", "id": 19, "code": 921881, - "tempChar": "" + "tempChar": "" }, { "order": 7, @@ -794,7 +802,7 @@ "name": "icon-tabular-lad", "id": 2, "code": 921888, - "tempChar": "" + "tempChar": "" }, { "order": 6, @@ -802,7 +810,7 @@ "name": "icon-tabular-lad-set", "id": 1, "code": 921889, - "tempChar": "" + "tempChar": "" }, { "order": 8, @@ -810,7 +818,7 @@ "name": "icon-tabular-realtime", "id": 3, "code": 921890, - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -818,7 +826,7 @@ "name": "icon-tabular-scrolling", "id": 18, "code": 921891, - "tempChar": "" + "tempChar": "" }, { "order": 112, @@ -826,7 +834,7 @@ "name": "icon-telemetry", "id": 86, "code": 921892, - "tempChar": "" + "tempChar": "" }, { "order": 90, @@ -834,7 +842,7 @@ "name": "icon-telemetry-panel", "id": 85, "code": 921893, - "tempChar": "" + "tempChar": "" }, { "order": 93, @@ -842,7 +850,7 @@ "name": "icon-timeline", "id": 88, "code": 921894, - "tempChar": "" + "tempChar": "" }, { "order": 116, @@ -850,7 +858,7 @@ "name": "icon-timer-v1.5", "prevSize": 24, "code": 921895, - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -858,7 +866,7 @@ "name": "icon-topic", "id": 6, "code": 921896, - "tempChar": "" + "tempChar": "" }, { "order": 115, @@ -866,7 +874,7 @@ "name": "icon-box-with-dashed-lines", "id": 29, "code": 921897, - "tempChar": "" + "tempChar": "" }, { "order": 126, @@ -874,7 +882,7 @@ "name": "icon-summary-widget", "prevSize": 24, "code": 921904, - "tempChar": "" + "tempChar": "" } ], "metadata": { @@ -1521,6 +1529,35 @@ ] } }, + { + "id": 114, + "paths": [ + "M574-2h-128v320h128v-320z", + "M1022 446h-320v128h320v-128z", + "M574 702h-128v320h128v-320z", + "M318 446h-320v128h320v-128z" + ], + "attrs": [ + {}, + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-crosshair" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {}, + {}, + {} + ] + } + }, { "id": 109, "paths": [ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot index 399c1c56b8..00f227a4ac 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg index 00bad365e3..c8f0f279a9 100755 --- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg @@ -7,8 +7,6 @@ - - - + - + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf index dabd0d7eac..652f886b86 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff index 714e467924..f2eb41499b 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff differ 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 133e6b5005..9eea72e553 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 6a88157947..9260dd1974 100755 --- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg @@ -37,6 +37,7 @@ + @@ -100,6 +101,7 @@ + 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 2b84960022..fee735bcff 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 697e49c2e6..505201c680 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 b483df1bd9..d50eb5701b 100644 --- a/platform/commonUI/general/res/sass/_glyphs.scss +++ b/platform/commonUI/general/res/sass/_glyphs.scss @@ -156,6 +156,7 @@ $glyph-icon-summary-widget: '\e1130'; .icon-trash { @include glyphBefore($glyph-icon-trash); } .icon-x { @include glyphBefore($glyph-icon-x); } .icon-brackets { @include glyphBefore($glyph-icon-brackets); } +.icon-crosshair { @include glyphBefore($glyph-icon-crosshair); } .icon-grippy { @include glyphBefore($glyph-icon-grippy); } .icon-arrows-out { @include glyphBefore($glyph-icon-arrows-out); } .icon-arrows-right-left { @include glyphBefore($glyph-icon-arrows-right-left); } @@ -236,8 +237,5 @@ $glyph-icon-summary-widget: '\e1130'; .icon-summary-widget { @include glyphBefore($glyph-icon-summary-widget); } /************************** 12 PX CLASSES */ - -.icon-eye-open-12px { @include glyphBefore($glyph-icon-eye-open,'symbolsfont-12px'); } -.icon-collapse-pane-left-12px { @include glyphBefore($glyph-icon-collapse-pane-left,'symbolsfont-12px'); } -.icon-collapse-pane-right-12px { @include glyphBefore($glyph-icon-collapse-pane-right,'symbolsfont-12px'); } +.icon-crosshair-12px { @include glyphBefore($glyph-icon-crosshair,'symbolsfont-12px'); } .icon-folder-12px { @include glyphBefore($glyph-icon-folder,'symbolsfont-12px'); }