From b5b68e74390fe682f7b9b6192d55d0c31ba03483 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Mon, 12 Dec 2016 12:49:38 -0800 Subject: [PATCH] Fix icon assignments Icons had been accidentally swapped around, updated the assignements and regenererated file. --- .../icomoon-project-openmct-symbols-16px.json | 16 ++++++++-------- .../fonts/symbols/openmct-symbols-16px.eot | Bin 14868 -> 14868 bytes .../fonts/symbols/openmct-symbols-16px.svg | 10 +++++----- .../fonts/symbols/openmct-symbols-16px.ttf | Bin 14652 -> 14652 bytes .../fonts/symbols/openmct-symbols-16px.woff | Bin 14728 -> 14728 bytes .../commonUI/general/res/sass/_glyphs.scss | 11 +++++------ 6 files changed, 18 insertions(+), 19 deletions(-) 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 ebcfe8e4c3..68f8f5ea5e 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": 1480112601593, - "created": 1480112580248 + "lastOpened": 1481575258437, + "created": 1481575255265 }, "iconSets": [ { @@ -535,15 +535,15 @@ { "order": 21, "prevSize": 24, - "name": "icon-x-in-circle", + "name": "icon-resync", "id": 16, "code": 921654, "tempChar": "" }, { - "order": 117, + "order": 121, "id": 103, - "name": "icon-brightness", + "name": "icon-x-in-circle", "prevSize": 24, "code": 921656, "tempChar": "" @@ -551,7 +551,7 @@ { "order": 118, "id": 102, - "name": "icon-contrast", + "name": "icon-brightness", "prevSize": 24, "code": 921657, "tempChar": "" @@ -559,7 +559,7 @@ { "order": 119, "id": 104, - "name": "icon-reset", + "name": "icon-contrast", "prevSize": 24, "code": 921664, "tempChar": "" @@ -567,7 +567,7 @@ { "order": 120, "id": 105, - "name": "icon-resync", + "name": "icon-reset", "prevSize": 24, "code": 921655, "tempChar": "" 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 0df32f10c381c5a091814cf91f3ff33faec53d2f..f3f8f249c30b069f7c99ab91c06ecc7e06ad6da0 100755 GIT binary patch delta 56 zcmbPIGNojK4YTMO`HA)~S$H`1GH%vk+-oc?e?~N(-{va=Hwyy@Tq)V(0HZgvm - - - - - + + + + + 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 13fc5182695b0e56f480238abefcd09aa381611a..05524ac0ae1a328cfcfe83bd4f8a786eb7924ce7 100755 GIT binary patch delta 48 vcmdl}w5Mo701FStUdD|fdyS>#&xpqJ+k9o(sSd4v&Pbu!maWAHeVUISr|azN?cY7jNV*fBESj&mb?z{ diff --git a/platform/commonUI/general/res/sass/_glyphs.scss b/platform/commonUI/general/res/sass/_glyphs.scss index 84e003bb59..c8a369e6e7 100644 --- a/platform/commonUI/general/res/sass/_glyphs.scss +++ b/platform/commonUI/general/res/sass/_glyphs.scss @@ -40,7 +40,6 @@ $glyph-icon-brackets: '\e929'; $glyph-icon-arrows-out: '\e1000'; $glyph-icon-arrows-right-left: '\e1001'; $glyph-icon-arrows-up-down: '\e1002'; -$glyph-icon-box-with-dashed-lines: ''; $glyph-icon-bullet: '\e1004'; $glyph-icon-calendar: '\e1005'; $glyph-icon-chain-links: '\e1006'; @@ -73,11 +72,11 @@ $glyph-icon-T: '\e1032'; $glyph-icon-thumbs-strip: '\e1033'; $glyph-icon-two-parts-both: '\e1034'; $glyph-icon-two-parts-one-only: '\e1035'; -$glyph-icon-x-in-circle: '\e1036'; -$glyph-icon-brightness: '\e1038'; -$glyph-icon-contrast: '\e1039'; -$glyph-icon-reset: '\e1040'; -$glyph-icon-resync: '\e1037'; +$glyph-icon-resync: '\e1036'; +$glyph-icon-x-in-circle: '\e1038'; +$glyph-icon-brightness: '\e1039'; +$glyph-icon-contrast: '\e1040'; +$glyph-icon-reset: '\e1037'; $glyph-icon-activity: '\e1100'; $glyph-icon-activity-mode: '\e1101'; $glyph-icon-autoflow-tabular: '\e1102';