From 7f43c0bf1a5f9344a9c8803b35e81d56c773e99a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 2 Oct 2017 13:09:58 -0700 Subject: [PATCH] Add Notebook icon (#1742) * Add Notebook icon Fixes #1739 Added to Style Guide as well * Add icomoon project file Fixes #1739 --- example/styleguide/res/templates/glyphs.html | 3 +- .../icomoon-project-openmct-symbols-16px.json | 33 +++++++++++++++++- .../fonts/symbols/openmct-symbols-16px.eot | Bin 16348 -> 16440 bytes .../fonts/symbols/openmct-symbols-16px.svg | 1 + .../fonts/symbols/openmct-symbols-16px.ttf | Bin 16132 -> 16224 bytes .../fonts/symbols/openmct-symbols-16px.woff | Bin 16208 -> 16300 bytes .../commonUI/general/res/sass/_glyphs.scss | 2 ++ 7 files changed, 37 insertions(+), 2 deletions(-) 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 d078bc4529d4df62520431f44a9e9d3e77dfc245..ec6e7b74a3331e2347e344e577527f71dc9ca2b8 100755 GIT binary patch delta 326 zcmcapzoUVX)xv>+Az>n`Im^j)>4p;>b~ENr{3BEUVuIoy1_q`I1_tw-jMT&we*UZ9 z85k^|FfcHfWdH@(53!gqFj&a|`6?N?B^CQZS>6NrK(iPx7JfC8qBK=L00qXPpY&>|)V2E+7qC*%2TzA|vL z00kHruKw`Y4Ws}61KP^Sd}Q(zD}Bb2%}1=xFi!5VdBY{W4X6U7zhrZrZ5$H-+~-?! delta 230 zcmdndz<8&g^^QFQ1It8KbC!c2%$g@U>}JfH_(!Jx{&eQ03=B*a3=HNH8L5dWd^bY2 zGB8+9U|?V{%K!?nA7U{E@=pNyDjB&Y6}v)N-UIn>7#JAO + \ 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 d32c596d647e6d5dbfa4a6a62c7e299494918845..b380c5ff12e40e01413f6aa2a5111b566de080ac 100755 GIT binary patch delta 341 zcmZpvdr&t)xjvtPfl&sCL(&tA3m6y}1Q-~YKr}~sPG#DQ35tJ!{0asJ^PG&-#1wx1 ztKS(IES~`7%`$)j?1xxP7#OU8`WaL*a!V@qg|fT{@*RNYUC7B#PF(9T--&_2252V3 ztK7tj0){4rc|bnUOa_I##N1T#Ut(%$3=FnF1DKQw@{3Ctn1NCZ_6{3&Y-VIM+?>Ot zYF-Z%`hS3hfq6FrD}xY&7|?7JHFj1-QAI%!F=Is|GgCnmHD*OYMdk(%<3GQd8~!wS zn=&()dV81tYhY|(4z#fo`0eob08qe`5lH@HV02($1lq#Hz+jlZ?qoc_%~u9)7LdIR zSATfyhSC530c~YuJ~DZar9NZH<~NpS7$cEXzv I+c+`-0F?Dyx&QzG delta 231 zcmaD**HSk@xjv79fl&sCL(&tA3m6y}1Q-~YKr}~sPG#Et>C8)k{0asJbBT=9#1y_8 zAzK+3EGGcv%`$)j?1xy4f&3FdzDh=JNyV;EmiIvZ8=!e-a`KZCCr+C0#K2&^11SF@ zH?g9Cp^;%81B1;1AYUObF*nuxmzY`_P~ZU25~YIt;t~dCpcI4MlZ`tzGcp=%&S6qD zS7ro?FflMRn|(MK&u{aUftv-ShT-a+4k;KtnZwGQv3RqC)fvXg0yZz$7(jZ8H#6DB GF#!Pmu|2y0 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 f8e277083f514324810ed32ea361cf370f02d35d..277c9060d28c9cf4a891fb77cfc6a55fcdab24a4 100755 GIT binary patch delta 368 zcmcamx29gC+~3WOfsp|S?AI`GgXx5cBKGz9>50V!3=B+rfI=KlERdd4nFbU)!oXmj z1HvyRDE`SvO-x~6urdIuF#}&Fh&N82%q%VPM|Pz{()RAO^I@M2($QQB+Y-M9f&x$jnsG zM2%TdP?5R8!}!l{=7v8F-loh9rrzGA{~8z@m;-I>1b#dGJpdFiWdxG{7#JPEfy2bW zV3@w{WIVskR|aktpsN@duKw`Y4Ws}61KP^Sd}K0*l|Ez1W(%t`jFW8Ma7k|iDgcFT K$>vWsaZCX86JL=4 delta 279 zcmZ2ef1ysS+~3WOfsp|S>;o9M!88j4)8vWvViR@L>+{kRiwhVSnDziAIG|V{J*P4a zD0YN_!CV4_?@wo5nvt5A!oXm82dKsjg!yiSY|Q`)GB8+)0Qo8)%zlW)I3u^D0w`v| zz`%G0gm;CqywAx`2CB1R0jhZc!V@RWcgjty0NSf%^9CrO0LG0B^YRjNQyCa+d4QHH zfw1{6wX}l#;u4_S4L1JS&B$o5c?XlKxiZK*ObiUoW*-j5^V@u7;077Zz;N|WhZKyS d9Aah8SiHH%>I~!L7@HSt;2}MOt1OSn3Lx=zX 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'); }