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 00000000000..09e774836e3 Binary files /dev/null and b/tgui/packages/tgfont/static/tgfont.eot differ diff --git a/tgui/packages/tgfont/static/tgfont.woff2 b/tgui/packages/tgfont/static/tgfont.woff2 new file mode 100644 index 00000000000..0590bf6c44f Binary files /dev/null and b/tgui/packages/tgfont/static/tgfont.woff2 differ diff --git a/tools/build/build.js b/tools/build/build.js index 3c94d19a9ef..1cadcef3194 100644 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -208,7 +208,7 @@ export const LintTarget = new Juke.Target({ }); export const BuildTarget = new Juke.Target({ - dependsOn: [TguiTarget, TgFontTarget, DmTarget], + dependsOn: [TguiTarget, DmTarget], }); export const ServerTarget = new Juke.Target({ @@ -272,7 +272,7 @@ const prependDefines = (...defines) => { }; export const TgsTarget = new Juke.Target({ - dependsOn: [TguiTarget, TgFontTarget], + dependsOn: [TguiTarget], executes: async () => { Juke.logger.info('Prepending TGS define'); prependDefines('TGS');