From 1edd2043dce7a72b9e3b28b7f78798600246ad4b Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 15 Feb 2017 14:45:47 -0800 Subject: [PATCH] [Frontend] WIP Style Guide Fixes #1233 Added new "icon-expand" glyph and class; (cherry picked from commit adfbfc4) --- .../icomoon-project-openmct-symbols-16px.json | 141 +++++++++++------- .../fonts/symbols/openmct-symbols-16px.eot | Bin 14868 -> 15076 bytes .../fonts/symbols/openmct-symbols-16px.svg | 1 + .../fonts/symbols/openmct-symbols-16px.ttf | Bin 14652 -> 14860 bytes .../fonts/symbols/openmct-symbols-16px.woff | Bin 14728 -> 14936 bytes .../commonUI/general/res/sass/_glyphs.scss | 8 +- 6 files changed, 95 insertions(+), 55 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 68f8f5ea5e..71ed1f6051 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": 1481575258437, - "created": 1481575255265 + "lastOpened": 1487197651675, + "created": 1487194069058 }, "iconSets": [ { @@ -540,13 +540,21 @@ "code": 921654, "tempChar": "" }, + { + "order": 120, + "id": 105, + "name": "icon-reset", + "prevSize": 24, + "code": 921655, + "tempChar": "" + }, { "order": 121, "id": 103, "name": "icon-x-in-circle", "prevSize": 24, "code": 921656, - "tempChar": "" + "tempChar": "" }, { "order": 118, @@ -554,7 +562,7 @@ "name": "icon-brightness", "prevSize": 24, "code": 921657, - "tempChar": "" + "tempChar": "" }, { "order": 119, @@ -562,15 +570,15 @@ "name": "icon-contrast", "prevSize": 24, "code": 921664, - "tempChar": "" + "tempChar": "" }, { - "order": 120, - "id": 105, - "name": "icon-reset", + "order": 122, + "id": 106, + "name": "icon-expand", "prevSize": 24, - "code": 921655, - "tempChar": "" + "code": 921665, + "tempChar": "" }, { "order": 37, @@ -578,7 +586,7 @@ "name": "icon-activity", "id": 32, "code": 921856, - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -586,7 +594,7 @@ "name": "icon-activity-mode", "id": 31, "code": 921857, - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -594,7 +602,7 @@ "name": "icon-autoflow-tabular", "id": 47, "code": 921858, - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -602,7 +610,7 @@ "name": "icon-clock", "id": 50, "code": 921859, - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -610,7 +618,7 @@ "name": "icon-database", "id": 53, "code": 921860, - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -618,7 +626,7 @@ "name": "icon-database-query", "id": 52, "code": 921861, - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -626,7 +634,7 @@ "name": "icon-dataset", "id": 12, "code": 921862, - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -634,7 +642,7 @@ "name": "icon-datatable", "id": 17, "code": 921863, - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -642,7 +650,7 @@ "name": "icon-dictionary", "id": 54, "code": 921864, - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -650,7 +658,7 @@ "name": "icon-folder", "id": 57, "code": 921865, - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -658,7 +666,7 @@ "name": "icon-image", "id": 61, "code": 921872, - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -666,7 +674,7 @@ "name": "icon-layout", "id": 63, "code": 921873, - "tempChar": "" + "tempChar": "" }, { "order": 77, @@ -674,7 +682,7 @@ "name": "icon-object", "id": 72, "code": 921874, - "tempChar": "" + "tempChar": "" }, { "order": 78, @@ -682,7 +690,7 @@ "name": "icon-object-unknown", "id": 73, "code": 921875, - "tempChar": "" + "tempChar": "" }, { "order": 79, @@ -690,7 +698,7 @@ "name": "icon-packet", "id": 74, "code": 921876, - "tempChar": "" + "tempChar": "" }, { "order": 80, @@ -698,7 +706,7 @@ "name": "icon-page", "id": 75, "code": 921877, - "tempChar": "" + "tempChar": "" }, { "order": 114, @@ -706,7 +714,7 @@ "name": "icon-plot-overlay", "prevSize": 24, "code": 921878, - "tempChar": "" + "tempChar": "" }, { "order": 113, @@ -714,7 +722,7 @@ "name": "icon-plot-stacked", "prevSize": 24, "code": 921879, - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -722,7 +730,7 @@ "name": "icon-session", "id": 5, "code": 921880, - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -730,7 +738,7 @@ "name": "icon-tabular", "id": 19, "code": 921881, - "tempChar": "" + "tempChar": "" }, { "order": 7, @@ -738,7 +746,7 @@ "name": "icon-tabular-lad", "id": 2, "code": 921888, - "tempChar": "" + "tempChar": "" }, { "order": 6, @@ -746,7 +754,7 @@ "name": "icon-tabular-lad-set", "id": 1, "code": 921889, - "tempChar": "" + "tempChar": "" }, { "order": 8, @@ -754,7 +762,7 @@ "name": "icon-tabular-realtime", "id": 3, "code": 921890, - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -762,7 +770,7 @@ "name": "icon-tabular-scrolling", "id": 18, "code": 921891, - "tempChar": "" + "tempChar": "" }, { "order": 112, @@ -770,7 +778,7 @@ "name": "icon-telemetry", "id": 86, "code": 921892, - "tempChar": "" + "tempChar": "" }, { "order": 90, @@ -778,7 +786,7 @@ "name": "icon-telemetry-panel", "id": 85, "code": 921893, - "tempChar": "" + "tempChar": "" }, { "order": 93, @@ -786,7 +794,7 @@ "name": "icon-timeline", "id": 88, "code": 921894, - "tempChar": "" + "tempChar": "" }, { "order": 116, @@ -794,7 +802,7 @@ "name": "icon-timer-v1.5", "prevSize": 24, "code": 921895, - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -802,7 +810,7 @@ "name": "icon-topic", "id": 6, "code": 921896, - "tempChar": "" + "tempChar": "" }, { "order": 115, @@ -810,7 +818,7 @@ "name": "icon-box-with-dashed-lines", "id": 29, "code": 921897, - "tempChar": "" + "tempChar": "" } ], "metadata": { @@ -2183,6 +2191,30 @@ ] } }, + { + "id": 104, + "paths": [ + "M460.8 460.8l-187.8-187.8c57.2-42.8 128-68.2 204.8-68.2 188.2 0 341.6 153.2 341.6 341.4s-153.2 341.2-341.4 341.2c-165 0-302.8-117.6-334.6-273h-138.4c14.2 101.8 61 195.6 135 269.6 90.2 90.2 210.4 140 338 140s247.6-49.8 338-140 140-210.4 140-338-49.8-247.6-140-338-210.4-140-338-140c-111.4 0-217 38-302 107.6l-176-175.6v460.8h460.8z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-reset" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + } + ] + } + }, { "paths": [ "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM832 704l-128 128-192-192-192 192-128-128 192-192-192-192 128-128 192 192 192-192 128 128-192 192 192 192z" @@ -2303,26 +2335,31 @@ } }, { - "id": 104, + "id": 106, "paths": [ - "M460.8 460.8l-187.8-187.8c57.2-42.8 128-68.2 204.8-68.2 188.2 0 341.6 153.2 341.6 341.4s-153.2 341.2-341.4 341.2c-165 0-302.8-117.6-334.6-273h-138.4c14.2 101.8 61 195.6 135 269.6 90.2 90.2 210.4 140 338 140s247.6-49.8 338-140 140-210.4 140-338-49.8-247.6-140-338-210.4-140-338-140c-111.4 0-217 38-302 107.6l-176-175.6v460.8h460.8z" + "M960 0c0 0 0 0 0 0h-320v128h165.4l-210.6 210.8c-25 25-25 65.6 0 90.6 12.4 12.4 28.8 18.8 45.2 18.8s32.8-6.2 45.2-18.8l210.8-210.8v165.4h128v-384h-64z", + "M896 805.4l-210.8-210.6c-25-25-65.6-25-90.6 0s-25 65.6 0 90.6l210.8 210.6h-165.4v128h384v-384h-128v165.4z", + "M218.6 128h165.4v-128h-320c0 0 0 0 0 0h-64v384h128v-165.4l210.8 210.8c12.4 12.4 28.8 18.8 45.2 18.8s32.8-6.2 45.2-18.8c25-25 25-65.6 0-90.6l-210.6-210.8z", + "M338.8 594.8l-210.8 210.6v-165.4h-128v384h384v-128h-165.4l210.8-210.8c25-25 25-65.6 0-90.6-25.2-24.8-65.6-24.8-90.6 0.2z" ], "attrs": [ - { - "fill": "rgb(0, 161, 75)" - } + {}, + {}, + {}, + {} + ], + "grid": 16, + "tags": [ + "icon-expand" ], "isMulticolor": false, "isMulticolor2": false, - "grid": 16, - "tags": [ - "icon-reset" - ], "colorPermutations": { "1161751207457516161751": [ - { - "f": 1 - } + {}, + {}, + {}, + {} ] } }, 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 f3f8f249c30b069f7c99ab91c06ecc7e06ad6da0..ed27fdfafa9819e7afb9f1e5d51373cb402ef890 100755 GIT binary patch delta 548 zcmXw$PiPZS5XQfkT@p84+Pl z-GhjD3k`Vj;K6|R^`w`jr{YPH^rXieL_GKhFH%!yD}6A`d^5i{GmqD94jv^3Wk4;r zlAgRHquQE%&w|$O*v5|wIU7ja0Hz+-muidZ+xaRm-3Q>+DUsTeCjnO_eXQPSuD2EW z7wJ;~dwp-^c8y2*kA%j2zfoIXMH6d)|Autoeyy?O{~5nSdYfjHR#zT2AyEZqzr}S( zQuu<^+2kCli#W_drcivDyiS&*xJtf2Mq6MZJT6^1vLOR|kqjw91||47Ps^NPr;DbO zN@lWo=1h6#nCWn7V!T9|qs%so+-8njB+BNF`=9Z>=?N+2+Pvu6aZIoj4Wmw12*pxW zOX&qcPq>B<-3|+azqdNWXg266m-dT7-0TG`h-t$WQnZhz6(t?RyPqgcS7Rc9U`SY8 zB5)7g&hVfw!Uu)5%vcrj&Vp9?jS+eoo&JYsUl07I?D}juthgsxc-I?YSG7ah32jk( zu0x;E+xizi&!6xu{?o`C72}=pStP~NjGlRACe5b#ee~sMKYKm9ZRyrEYml1(qsGhh RN$Ge15}T|n!k#~u_y=6jh4=sf delta 345 zcmaD-I;Dh7#EOBz#&RN?8H?x{d4-7%yBTXH{*kGlsQ$*Efq^N4fx&P?MrvXT5650c z1_l!j1_lPR44?q}Ar=iF-vP*1$;d6Kn83;M8OTpzU|?L3lb@U@@P}mvP$>&g{!(sY zMFB%GLm7~N1ISm%OUz9*|D~1&Gn8B#&0OWZx z@Ch;iF(;7i1*8RlSQ5w%0n!RUtO;btZPsA+mEG*9SS%u=Ab&c5?LV1C)y=uCYC4mPCQ9`mG~=(Ith?ZfFZ(=!BE1$1+svFY4SxY;mwOJ G9GL(nbx?x< 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 0a33d43fa3..1d7c3ffa56 100755 --- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg @@ -77,6 +77,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 05524ac0ae1a328cfcfe83bd4f8a786eb7924ce7..783d69c302b34a6dc5182eb97d18c06f5e4dd0a6 100755 GIT binary patch delta 535 zcmdl})KfA+xxRscfl&sCP0|yK3m6y}1Q-~Y0)R9}dQN59M|VkOAU}eE!Kfx9H8F)} zOIRoagUJ=3yjccNfc+4QCIf>h50I~tky}zRg_GqokZ%AqZ%Iyma-!e?xeGw0AoW*r z6DtZBN*Kx*7|d4y`3iZ7xvA#A#MIJ&0w;i$C>7)vmoP8`r5G&VY}}F0sObn~dNS|{ zG5|3rknIhm1%Ox*$PNY43P23Bo*{m70F$q5JqrWF{{t)x%m)}m7?c>y8Qg%buwXP) z6g6gN6A_nVG&VA`XB0ISWL8&G0*c5pDvK%#Dl;0JDgsq03mTh3)R>!@s57&hDhn!_ zDudWS#moo(9awrvSeR3Shev|*azn#qVN)St;Y&*y8yfybFa3AGq2V&87g$nQIO=i( zV*^OFkf|{90kBdoPEIb6;y<^6!a%Jc6-*2b|A5LsQb2|O87?jT2Q!yp^DOx?5t&d1 zmaFmnHeVUIfj$F*E2lbM!RX04CgzNpn^R2m88`Qvax=Q{bMWi%r|@?PFbLQQOc8h? z7$(>vcu4S*kerZ>&@Q1n!fe8AA_5`{MA<}3L_dhl5xXKDB7Q{vd9w_l0Q(^p4ItkE$XCh8EvcBm$?_Sm8{#pDt1oQ-&1U?AL3C0Na2<{NPCKMu6CbU3U qL3ovjmB<27KG7~QGqF6ecj8IntHfVP)JcH601OI-jLqxJFHB}*GY z=pIChH))SKcxdj*dh)dNB%UORAk?FXc=GciHSL>d2mZV_|Mz?IW?;4&AKduH&2kwC z;5t78(LszsX#2sr__OicrngjWtO0~tSQz>*WohN%B6_<36OXvQUrCy^h3Y(jokpg} z6?-*ZsiBG94DL^JMfSvet?o9_!#;xjWOqjrf3B?FL(WMf)8nE+>Rr9s#JOY6FEn@| z4KA$Tuhtg;N*WH&ayfrS7uQxBF5bQL@?eAHFClpqPEbHem|w@JppuwZFs4y?%;)@8 z=*Fo{5#TToK?p#DEI3fc8|CbjH; zj8iP+gotg@jBWB9VIk-T?G9s-5sMj8*Ymo}RvGKGiRb;j)9wcsy{>d^P-JYj>k*IB zs?CI8fDTL2FozHJ(Z*Izguv?~#!CnuLZ{t7J{SDYBkS793W)FL1NXQU>kFff>e0M(d*Fb~IG#tfh!P^<^YR{>%6Lo6B@xg`}qF`z!i z1t2_uljUxqXmN`hH0vH!Fl;tJnrZO;?y8ta$0%7xC zYH0=e#U((uXKega&Zy}CRO!jUC&&QAoIti0kQM-9Ngz7}NGkxbCXgMsc@C4W?B=Zs z#Ue5a@@GWj`E9;3aI*kq7#OaU>~Vn6lU+>B88bH5nCdfbUT?LhLe O4F!dB#^zt