diff --git a/example/styleguide/res/templates/glyphs.html b/example/styleguide/res/templates/glyphs.html index c6851245a88..a851d8f183c 100644 --- a/example/styleguide/res/templates/glyphs.html +++ b/example/styleguide/res/templates/glyphs.html @@ -127,7 +127,8 @@ { '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': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&#xe1130' } +{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&#xe1130' }, +{ 'meaning': 'Notebook object', 'cssClass': 'icon-notebook', 'cssContent': 'e1131', 'htmlEntity': '&#xe1131' } ]; "> 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 3dbde1523f2..3c575eb814b 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": 1505151140023 + "created": 1506973656040 }, "iconSets": [ { @@ -899,6 +899,14 @@ "prevSize": 24, "code": 921904, "tempChar": "" + }, + { + "order": 139, + "id": 117, + "name": "icon-notebook", + "prevSize": 24, + "code": 921905, + "tempChar": "" } ], "metadata": { @@ -3524,6 +3532,29 @@ {} ] } + }, + { + "id": 117, + "paths": [ + "M896 110.8c0-79.8-55.4-127.4-123-105.4l-773 250.6h896v-145.2z", + "M896 320h-896v576c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-448c0-70.4-57.6-128-128-128zM832 832h-384v-320h384v320z" + ], + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-notebook" + ], + "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 d078bc4529d..ec6e7b74a33 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 5acb151b4dd..ad47f27eaac 100755 --- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg @@ -118,4 +118,5 @@ + \ 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 d32c596d647..b380c5ff12e 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 f8e277083f5..277c9060d28 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 a3e1913a37a..b0a40d48e3a 100644 --- a/platform/commonUI/general/res/sass/_glyphs.scss +++ b/platform/commonUI/general/res/sass/_glyphs.scss @@ -146,6 +146,7 @@ $glyph-icon-timer: '\e1127'; $glyph-icon-topic: '\e1128'; $glyph-icon-box-with-dashed-lines: '\e1129'; $glyph-icon-summary-widget: '\e1130'; +$glyph-icon-notebook: '\e1131'; /************************** 16 PX CLASSES */ @@ -260,6 +261,7 @@ $glyph-icon-summary-widget: '\e1130'; .icon-topic { @include glyphBefore($glyph-icon-topic); } .icon-box-with-dashed-lines { @include glyphBefore($glyph-icon-box-with-dashed-lines); } .icon-summary-widget { @include glyphBefore($glyph-icon-summary-widget); } +.icon-notebook { @include glyphBefore($glyph-icon-notebook); } /************************** 12 PX CLASSES */ .icon-crosshair-12px { @include glyphBefore($glyph-icon-crosshair,'symbolsfont-12px'); }