From dc510bccbb81b71adb8f864e48865bb92c6ad463 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 11 Dec 2021 23:57:23 +0100 Subject: [PATCH] Remove tgfont from pipeline, build it to git (#63358) --- code/modules/asset_cache/asset_list_items.dm | 6 +-- tgui/packages/tgfont/static/tgfont.css | 50 +++++++++++++++++++ tgui/packages/tgfont/static/tgfont.eot | Bin 0 -> 4040 bytes tgui/packages/tgfont/static/tgfont.woff2 | Bin 0 -> 1824 bytes tools/build/build.js | 4 +- 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 tgui/packages/tgfont/static/tgfont.css create mode 100644 tgui/packages/tgfont/static/tgfont.eot create mode 100644 tgui/packages/tgfont/static/tgfont.woff2 diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 4e316998596..4b1543a3fdd 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -143,11 +143,11 @@ /datum/asset/simple/namespaced/tgfont assets = list( - "tgfont.eot" = file("tgui/packages/tgfont/dist/tgfont.eot"), - "tgfont.woff2" = file("tgui/packages/tgfont/dist/tgfont.woff2"), + "tgfont.eot" = file("tgui/packages/tgfont/static/tgfont.eot"), + "tgfont.woff2" = file("tgui/packages/tgfont/static/tgfont.woff2"), ) parents = list( - "tgfont.css" = file("tgui/packages/tgfont/dist/tgfont.css"), + "tgfont.css" = file("tgui/packages/tgfont/static/tgfont.css"), ) /datum/asset/spritesheet/chat diff --git a/tgui/packages/tgfont/static/tgfont.css b/tgui/packages/tgfont/static/tgfont.css new file mode 100644 index 00000000000..ad732b8fc06 --- /dev/null +++ b/tgui/packages/tgfont/static/tgfont.css @@ -0,0 +1,50 @@ +@font-face { + font-family: "tgfont"; + src: url("./tgfont.woff2?45c3c7acc69dd413375d77898d24e41e") format("woff2"), +url("./tgfont.eot?45c3c7acc69dd413375d77898d24e41e#iefix") format("embedded-opentype"); +} + +i[class^="tg-"]:before, i[class*=" tg-"]:before { + font-family: tgfont !important; + font-style: normal; + font-weight: normal !important; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.tg-air-tank-slash:before { + content: "\f101"; +} +.tg-air-tank:before { + content: "\f102"; +} +.tg-bad-touch:before { + content: "\f103"; +} +.tg-image-minus:before { + content: "\f104"; +} +.tg-image-plus:before { + content: "\f105"; +} +.tg-nanotrasen-logo:before { + content: "\f106"; +} +.tg-non-binary:before { + content: "\f107"; +} +.tg-prosthetic-leg:before { + content: "\f108"; +} +.tg-sound-minus:before { + content: "\f109"; +} +.tg-sound-plus:before { + content: "\f10a"; +} +.tg-syndicate-logo:before { + content: "\f10b"; +} diff --git a/tgui/packages/tgfont/static/tgfont.eot b/tgui/packages/tgfont/static/tgfont.eot new file mode 100644 index 0000000000000000000000000000000000000000..09e774836e303f6b68238bf451290217441c5109 GIT binary patch literal 4040 zcmd^CON^UW6~6EP|NZ+le$Fel$DXk}nT+RcPm*RPz>rB$q9n~jp$}4L#`8!$_GIj7 z8^j_)LO>f;5tL0ARV7$}C{mHStRhq-9uf~x{&Uac{`dYW#Mn~+&IF?-n3f&_&I3-^`AZ%8p!e7ypIclG9B}tBKWnjdw#FK) z4veuNdxllP*=03WVLRX?*mZDrSd(pfQW-YIifj@i|2Y>ddYQ}aG07&EuUz|l=Jk=U zf;kWF)r(gqrWZ|Nb(^QyU5xjF z&eSVg)$hDHvJ1Ok1n*zljb`fy-*{NVnnAN)knJ3AM*C>*&fXn9?ybgSbUVMtfm~pD z@wuC!r~k&>&Wx{(ymyae=!v=S^Ks0^BD!IMVo-jz1r9X|o)169_J~BIaUYzzz{Jv- z^H*80R%z8)KU3alXZ$eEYn$s8PaDnTkfTu!4rj*0i25FXz%-~g*zeFE?LHqM$QKUh z4#pm9m)5?x%6``7?at~3u$J=>pf~Ne*MJbby?2NG9#4XA?(KPzdVB9f_AY3GMF8_` zpgbk-!cM-?)pZMbLRydE32%U}Sjm%7#BaOM$l9EG(47?u$SPC zn_#S*v`jWXyU49Vxip=KmGcukTQIRSPfV9)3yGk}m&!8>BE$<24Gb6)a?Qq4|B?>5 z5oP(c7NSpRc|t0`Hqvlm$syJ6RGiTPOS@rHUhY3<{NbQ-{6c6kz@?6=pern6q$BFO z3Q=$6pJCsBVcnBj_JmfEw-k1lUt@R4!v86F?0I;LoRZI)Sd#ovu%?o5Tfr)L?o0Cm zjm4*8kV@tYMP53|Nq&rHO-KfLiZAj7z-%JTEtBGE!1KSfm>vnAPrYEyB-c}ue~I)*qy3Rn$DR^g$P3!Gb;AydqxpE19K+>i8Z%aZ-LEVi}bZIdr^`b(%t<-hn zI04%}ciGP+4-8TFtPl=OaD>Q;QHY0>Jf`J$X~u?j0+`@j2>S)+{vpo24>46*$L<_< zzy-F_qPy{ zJ~o7WrMMt0h{`FRq~IVnNW~*aQ!9_uO!Ig$Va7yZ?s!s&9+BkSd-l#tA>*9i?mSM5 zr-jH2ae548xy23VeJPZ3A3TbkZ0}?CWA<0pgM1jJqe^)SnLox&F7CMy9m*mXpDtPZ zS>pM4E<1sgnVHL)AN6rd8^`BpD`o6-EEtTPbVD{}d5_Nt5k0@AjDBe8dFP#AY$-Mv za?fh}thOHNqeNqO-TQFwefCFuJ#BUc$0;VM2&o*Cg?tdzmYooJ%UD5p0>6_ync_3k zJFe=D z$Rj-i(#SA&S*}%&Fxn1FJ&Zj;`Ga|*WRKEP`vZbYsbkWs5&B{=_7nC1u^d7itw)uc zOn7yje8lL~#?oMhN-i^~9OuQdK%?&dpq53c29?q;X;nI?RnmU&jvSkN!V3J99Y2hE zN+a|}Dls9z5Nn65dA3tYU9oN@3NihdX=G35jCh*8z&^*$;iPt%U1MJcRe^2UAdkmV zDjq}7i@cDFBPSNbY*EdYD2Ha|@`afcPtL>)^0+XAU9CJ-nj>}+h2@PWkxmI?rIBRi zM9eC5>68<|w=wD{pJUmE+hM;QaI|qF$QhRlVFXG~VF!^|7j`@$EFGX;^+?HW&N)&C zPm$`9&l}g$q{~vaEiDt3(l`Mh7{)R5S%$BWyh16=C8ZI;p^^C9fTX7J0!S&17vfLe z33pEFzz$Bj6hjLq6;A-C8p8rzTmg@EagFmxUl%vv4|j1NP8~3}yDZNmt@X7=z4c6WeYaNG=@6a% zdUdC{*{Elxijy72aCDa|Rl!wOS*yz0x6pAwJk- literal 0 HcmV?d00001 diff --git a/tgui/packages/tgfont/static/tgfont.woff2 b/tgui/packages/tgfont/static/tgfont.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..0590bf6c44fb276ef7aa96d26f356004192fac29 GIT binary patch literal 1824 zcmV+*2jBR2Pew8T0RR9100$rd3jhEB01qet00zrrSHUcCAFbf(01Rw>2eg}a@8tfVv`S#oB94v0+GT&nuOM&riz@2!1-YF$VA+MaR?UnZF8xQ(y;(F3bQ{6%<+VG zaSwT!qcgNhT7t4Ac@Ct@Ht zgaQGC0RjjM1P~4gAT}U?*nt4T0|7(;0*D9%5D8Nu4QZDo0F?lJ31CF1(w39i4%>EO zZd6r;N0_xI?!VR-s2%aa;0)KY(B3(FI-w5rUz zdJW4mLq%Lb*r>1sArUhOkw~#Vq}N1ELNcI#h)j=nw*n&ZSca;$TQOA)iKHbxP*N;D zCJi>27NbBo*G)*NVZ%uCA)qYMGqprjMZnNSwSh)LBxts6(?zsKFGaeD*fj$^X+WY{ zM))dQb!BjtnEASSAZY5ka%nVA(@aHAI`iE0vs6Qsq<~>aF^_eQ*623**4bAp4dFC8kX}iDb~DR9aKYClv3lel!oS*X)1S$EHqotPzj6zkX-Cms9>b(LSr5#3oP}> z=WcKYXDF)cXN7T@z7)c`7&T2zgi*A>vJ~d!fRTBmv<4C}HOX+4VZEYClMb7SSR_rO zB2Ss8PKh1|RvlefiT;&7d3De~<7!u6MO}B_S=|G@Gp=!^SFgN>>vVJOsEfJU7>i^pR#?M+ezisg=TRz_pZ>Y5YlYzg6x4$y? zl&RkO)yw^_{`^^RxKn%%IDIMZmWi7WxM(6X%Iy$$a2xoyJ=&Pqb;88%lFKLl-gLER zjHv)g8Bm8Gy-iIUYaG1egNJCxc5ww>m{mu8RG?Y3PFzKxzL1X=7E&hbd-wHBH&fEi z)-Y$V)$D4Kurk2fjytrBom&iyOuFtNUOWRZc$Og~%QTBzShqwZNmL+-(Ps^u;-R!f z&v5&_3qeAU?b}4QdsRjSl2@hs6htjj${uTXm_C#yEu?W5j0m7&?Jm%1qNG6eIwxxA?3Q3qtzE>|MgM>Y{* zoXqh$71Z@gce)W2So9;*q$p0n4)ITM4StOmmp4f%m3kdcg|!3oq?%RmU%&H)1v6TH zeW_U7IgR+_|#YiWHm4|=i?po|h9=42pBGK2hUrBS2)`El?n5Iz?F!(=#I3xKrq zHAVu~frlET07T6W#1*Rxk9W~eA~OT@@5ludtTs51$>t^k4ib`~O_SyTh$u$U-VzcK z00Y7bAV|PU0Vtf<3K%5dU?!V;GT@+r{tH)B?jLx>_x~xLuvXTR3H2Sy(mlU8Yqf7+ zX@q9$HnFQ50fD_jGT~-%{*c(Vf1=}3C3`%=Ahp zi0Y^{g7cnHnJkwzJ0c5r { }; export const TgsTarget = new Juke.Target({ - dependsOn: [TguiTarget, TgFontTarget], + dependsOn: [TguiTarget], executes: async () => { Juke.logger.info('Prepending TGS define'); prependDefines('TGS');