From b27317631bafdc1c8a948ca66dc6129e667ed1b9 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 17 Sep 2021 13:11:09 -0700 Subject: [PATCH] Add new glyphs for Bar Chart and Map views (#4219) - New glyph and background classes for `icon-bar-chart` and `bg-icon-bar-chart`; - New glyph and background classes for `icon-map` and `bg-icon-map`; --- src/styles/_constants.scss | 4 ++ src/styles/_glyphs.scss | 4 ++ src/styles/fonts/Open MCT Symbols 16px.json | 64 +++++++++++++++++++- src/styles/fonts/Open-MCT-Symbols-16px.svg | 2 + src/styles/fonts/Open-MCT-Symbols-16px.ttf | Bin 23740 -> 23972 bytes src/styles/fonts/Open-MCT-Symbols-16px.woff | Bin 23816 -> 24048 bytes 6 files changed, 73 insertions(+), 1 deletion(-) diff --git a/src/styles/_constants.scss b/src/styles/_constants.scss index 42ced94dd1..4358b6077c 100755 --- a/src/styles/_constants.scss +++ b/src/styles/_constants.scss @@ -259,6 +259,8 @@ $glyph-icon-condition-widget: '\eb28'; $glyph-icon-alphanumeric: '\eb29'; $glyph-icon-image-telemetry: '\eb2a'; $glyph-icon-telemetry-aggregate: '\eb2b'; +$glyph-icon-bar-chart: '\eb2c'; +$glyph-icon-map: '\eb2d'; /************************** GLYPHS AS DATA URI */ // Only objects have been converted, for use in Create menu and folder views @@ -310,3 +312,5 @@ $bg-icon-spectra-telemetry: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns=' $bg-icon-command: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath fill='%23000000' d='M185.1 229.7a96.5 96.5 0 0015.8 11.7A68.5 68.5 0 01192 208c0-19.8 8.9-38.8 25.1-53.7 18.5-17 43.7-26.3 70.9-26.3 20.1 0 39.1 5.1 55.1 14.6a81.3 81.3 0 00-16.2-20.3C308.4 105.3 283.2 96 256 96s-52.4 9.3-70.9 26.3C168.9 137.2 160 156.2 160 176s8.9 38.8 25.1 53.7z'/%3e%3cpath d='M442.7 134.8C422.4 57.5 346.5 0 256 0S89.6 57.5 69.3 134.8C26.3 174.8 0 228.7 0 288c0 123.7 114.6 224 256 224s256-100.3 256-224c0-59.3-26.3-113.2-69.3-153.2zM256 64c70.6 0 128 50.2 128 112s-57.4 112-128 112-128-50.2-128-112S185.4 64 256 64zm0 352c-87.7 0-159.2-63.9-160-142.7 34.4 47.4 93.2 78.7 160 78.7s125.6-31.3 160-78.7c-.8 78.8-72.3 142.7-160 142.7z'/%3e%3c/svg%3e"); $bg-icon-conditional: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath fill='%23000000' d='M256 0C114.62 0 0 114.62 0 256s114.62 256 256 256 256-114.62 256-256S397.38 0 256 0zm0 384L64 256l192-128 192 128z'/%3e%3c/svg%3e"); $bg-icon-condition-widget: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath fill='%23000000' d='M416 0H96C43.2 0 0 43.2 0 96v320c0 52.8 43.2 96 96 96h320c52.8 0 96-43.2 96-96V96c0-52.8-43.2-96-96-96zM256 384L64 256l192-128 192 128z'/%3e%3c/svg%3e"); +$bg-icon-bar-chart: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath d='M416 0H96C43.2 0 0 43.2 0 96v320c0 52.8 43.2 96 96 96h320c52.8 0 96-43.2 96-96V96c0-52.8-43.2-96-96-96ZM133.82 448H64V224h69.82Zm104.73 0h-69.82V64h69.82Zm104.72 0h-69.82V288h69.82ZM448 448h-69.82V128H448Z'/%3e%3c/svg%3e"); +$bg-icon-map: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3e%3cpath d='M448 32.7 384 64v448l64-31.3c35.2-17.21 64-60.1 64-95.3v-320c0-35.2-28.8-49.91-64-32.7ZM160 456l193.6 48.4v-448L160 8v448zM129.6.4 128 0 64 31.3C28.8 48.51 0 91.4 0 126.6v320c0 35.2 28.8 49.91 64 32.7l64-31.3 1.6.4Z'/%3e%3c/svg%3e"); diff --git a/src/styles/_glyphs.scss b/src/styles/_glyphs.scss index 508b5a7871..f21d356c68 100755 --- a/src/styles/_glyphs.scss +++ b/src/styles/_glyphs.scss @@ -190,6 +190,8 @@ .icon-alphanumeric { @include glyphBefore($glyph-icon-alphanumeric); } .icon-image-telemetry { @include glyphBefore($glyph-icon-image-telemetry); } .icon-telemetry-aggregate { @include glyphBefore($glyph-icon-telemetry-aggregate); } +.icon-bar-chart { @include glyphBefore($glyph-icon-bar-chart); } +.icon-map { @include glyphBefore($glyph-icon-map); } /************************** 12 PX CLASSES */ // TODO: sync with 16px redo as of 10/25/18 @@ -249,3 +251,5 @@ .bg-icon-command { @include glyphBg($bg-icon-command); } .bg-icon-conditional { @include glyphBg($bg-icon-conditional); } .bg-icon-condition-widget { @include glyphBg($bg-icon-condition-widget); } +.bg-icon-bar-chart { @include glyphBg($bg-icon-bar-chart); } +.bg-icon-map { @include glyphBg($bg-icon-map); } diff --git a/src/styles/fonts/Open MCT Symbols 16px.json b/src/styles/fonts/Open MCT Symbols 16px.json index c7464b2112..7f634985a8 100755 --- a/src/styles/fonts/Open MCT Symbols 16px.json +++ b/src/styles/fonts/Open MCT Symbols 16px.json @@ -2,7 +2,7 @@ "metadata": { "name": "Open MCT Symbols 16px", "lastOpened": 0, - "created": 1629996145999 + "created": 1631832601684 }, "iconSets": [ { @@ -1214,6 +1214,22 @@ "prevSize": 24, "code": 60203, "tempChar": "" + }, + { + "order": 199, + "id": 172, + "name": "icon-bar-graph", + "prevSize": 24, + "code": 60204, + "tempChar": "" + }, + { + "order": 200, + "id": 171, + "name": "icon-map", + "prevSize": 24, + "code": 60205, + "tempChar": "" } ], "id": 0, @@ -3846,6 +3862,52 @@ {} ] } + }, + { + "id": 172, + "paths": [ + "M832 0h-640c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192zM267.64 896h-139.64v-448h139.64zM477.1 896h-139.64v-768h139.64zM686.54 896h-139.64v-320h139.64zM896 896h-139.64v-640h139.64z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-bar-graph" + ], + "colorPermutations": { + "12552552551": [ + {} + ] + } + }, + { + "id": 171, + "paths": [ + "M896 65.4l-128 62.6v896l128-62.6c70.4-34.42 128-120.2 128-190.6v-640c0-70.4-57.6-99.82-128-65.4z", + "M320 912l387.2 96.8v-896l-387.2-96.8v896z", + "M259.2 0.8l-3.2-0.8-128 62.6c-70.4 34.42-128 120.2-128 190.6v640c0 70.4 57.6 99.82 128 65.4l128-62.6 3.2 0.8z" + ], + "attrs": [ + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-map" + ], + "colorPermutations": { + "12552552551": [ + {}, + {}, + {} + ] + } } ], "invisible": false, diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.svg b/src/styles/fonts/Open-MCT-Symbols-16px.svg index c5cfafbc92..28b3ff99d1 100644 --- a/src/styles/fonts/Open-MCT-Symbols-16px.svg +++ b/src/styles/fonts/Open-MCT-Symbols-16px.svg @@ -158,4 +158,6 @@ + + \ No newline at end of file diff --git a/src/styles/fonts/Open-MCT-Symbols-16px.ttf b/src/styles/fonts/Open-MCT-Symbols-16px.ttf index c6765c6992f3b1dfa9f45bb59502d853cbfc5187..4e5fb761e15ab3ddab2b9c7678e3d4a245586294 100644 GIT binary patch delta 515 zcmdn9lX1yz#(D-u1_lOhh6V;^1_S?KeIx$4>~=trJwTk0oSRs{$hKdTfq_v5$WKX6 zEG_`j0ziHPkmg9wsZ859>(~b%zk`7xbU{XHVv78c$W#V~a1EfmSq4ymlZAC7ke>kL zt7PPsRAg{)v;+Aq3=B*qIr+(!i8YTWtz%$_`~ft?CO5I7fMGSmeFlbT6QBl#yu{p8 z#pko%0Qn(64SEIn#U((80zquc#2xO8x|10F8Fe=YF#ZjxXJugc@4&*q?7+a!Aj}}n zAk82TG*VHCO;k`s%vjOL%v8`sjZs<9SQrU2JN#|%FD&$D0+D}fdwMSR^jrdy%npVA z2)REEj0gTXFf;sRV08F*fT;oK0-!UX_HhAil&%L_#x7`X#|W~9osm^gRghVoosSV@ zyFH^gb3;ReskgW3-vf-z|7vZS!JGzWrvLVT8tf$tOqm)?)g=FHOk{3I{L{eP&j=Fx z3lg&j#Sb`=SS4rKD@)yt=ePOFz|8^@Ww@JJrv{}N)g~8&nKRDaydo@zY4U<_j?E&G f7K|cVv$QUNbb`^; delta 271 zcmZ3on{m%h#(D-u1_lOhh6V;^1_S?KeIx$4>^4A=JwTk0oSRs{$hKddfq_v5$WKX6 zEG_`j0ziHPkmg9wsZ4vN^;{Cj?_gjEIg*i@m?A&zTPXuWm=93iECVRO$-=rG$ZrAi zRWfo*DiSz2+JXEP3=B*;Ir+(!i9w#}_ZS!=MSzA_5t*nXTyK}0n^?fWz?cD)N&#U; zw*8vviNzqXGeABE6bq#1RHgyNt}rl!E&$SvF#}=wBax{YKtZ6` z8X#W;FfcFy)iRZ2aB#HegE)gUgZyL#CXsqUV_{_kW_I}7;9pqi&jcd>*7o#V?CH4#CYc=y{Sk71 z8W<1!b6{rp%fRUH?*LN+&`Hd23%Gz*NCO?tE@*DYXewx;#?Htps4B>;&d$duDkvgm z&nV8^(9mG&?QQxu@&IG=zgk;nFt34`>A(G-27Ac@Q>F$}HOW646PX(l|1>c7GlIna zg2e0@fp&r8ja71%y|UEZcz&C&4BRXrQHHyjb!sqr@}4kr#<`ongyk?z{t(WwIU&-5 TkxOfq)&;QUxtr%jWibH&`=g3b delta 301 zcmeyco3UdTqe!{Gn;Qco0}#Y=FmQwDm^~9kwCin>a}x^~7#K5vA}Juu$hKcSJ+T-h zb_U4jfMS94oXRwy*cAqbkRu@cO6$2~MrtBZPuL8g8Z!`-vn`k_w>M7X}8V91u?6;AqduPX?;9i%b9-Y5~GQp6T~;6DxogM}Z7f0OOSm_wy2S zQ-NYTfEx8cSn>JnHwF2{B|sm%nE1z^QG2ovBaqxYhw*QSGRTLllCylL{?(7?xB1Gz q%>oo)V7MD}W*v;4JR{tkarWj5;W