From 7a270152a4ec8b8e1ae6cbeba803c87e1850155c Mon Sep 17 00:00:00 2001 From: Matt Potts Date: Fri, 13 Oct 2023 20:46:35 +0100 Subject: [PATCH 1/3] feat: Replaces the wrench and screwdriver icon on the actor sheet with a custom icon --- src/public/assets/fonts/fabricate-regular.eot | Bin 0 -> 1584 bytes src/public/assets/fonts/fabricate-regular.svg | 11 ++++++ src/public/assets/fonts/fabricate-regular.ttf | Bin 0 -> 1380 bytes .../assets/fonts/fabricate-regular.woff | Bin 0 -> 1456 bytes src/scripts/module.ts | 2 +- src/styles/module.less | 33 +++++++++++++++++- 6 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 src/public/assets/fonts/fabricate-regular.eot create mode 100644 src/public/assets/fonts/fabricate-regular.svg create mode 100644 src/public/assets/fonts/fabricate-regular.ttf create mode 100644 src/public/assets/fonts/fabricate-regular.woff diff --git a/src/public/assets/fonts/fabricate-regular.eot b/src/public/assets/fonts/fabricate-regular.eot new file mode 100644 index 0000000000000000000000000000000000000000..21dfa360f68ec99a51736c7d16bad260d8d6109b GIT binary patch literal 1584 zcmbVM&r4KM6#nje^F|#-dtn+f#KYfj@mP!yvTU%u_efPbq&PY^v;NJV4@BElM_ndcPL15Yd1T<8O zz`Bskt=rYS^!24@H5Wc<1KKeI8)+0Uiwsc_4kFYXWU+)fG6e=TV&VkTf)tqo78&Ov z4-0Wb5u@+_Wu&9LSUny?M{IoZQeV?qqnFHEuKSsJd!aS;X^l?u&Qn=?ae?O<>hi43 z&aKQuzU+RZzRVTNIrend>&*^8drA9XjzrBH{XO*^>Ycgy;&RLw)wPmX2P>gH*FKPW=AYs_ z`bC}es}R9!S4$GugT7tfMpEaZ@vunJ&yt(>Yw{PvwE3s*d4&`YecZU zC*D0UBnJD8_+VeFAQvYm$QjMSj`r@$1B3m2EusRS>#9^LE&85m9y~E)rfKSr%-F$o zLIRTqX;VujBax(Br3Z&dZ%afYi9{rtC_OylUZ?;+ysj##nf6m8OE(pWgrW&QNy%1} z_g;LTaBj8dUenbdsFy7S?2Zq7K0ei}us2x~Ul`-nm<5xf?^nFM?_u~BUy)(D*P{d> zG~)s`ya)r6;JZ@}Gkc2K8nLPJ3Yg^lN@}RVmclyuDTM>X9~CzE_4O+pB)_I`2yH@> zy%VS-(@u+zHI9LI3hU$@g#*Mp3L9v_HHCxZHxv$GK!j)PbYV7Q7oAAK$u7;=g@4bU zlv7xob@Ns{8vFCWIYrJ>giNUWR!zZE(QhjB!cdD68$wq{?=v#=ilo{r6%3 literal 0 HcmV?d00001 diff --git a/src/public/assets/fonts/fabricate-regular.svg b/src/public/assets/fonts/fabricate-regular.svg new file mode 100644 index 00000000..5d16950c --- /dev/null +++ b/src/public/assets/fonts/fabricate-regular.svg @@ -0,0 +1,11 @@ + + + +Generated by IcoMoon + + + + + + + \ No newline at end of file diff --git a/src/public/assets/fonts/fabricate-regular.ttf b/src/public/assets/fonts/fabricate-regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2347d1f1b7cfbe824d6dc9a18091f7cba5ee5131 GIT binary patch literal 1380 zcmbVM&ubGw7=5#wP204zuEbVKkfpy5CMIo7Er^LA#U4tbtpQKENw-Nc$%btTEhy?i zdeme63-llbFCL1AdhsL(9>imdAQZ3lWKDd#JF(k~hkjvZ-h1DVo&9Du5CA&y1S*pA zi&w^b&TC^--gDe9RLojm?#mV+V&qFjbFIep9J#x;7t5O~@oxt|$Tv8WCCgkMe!DXW zD6i>HmngKoQ$LdLlMj_D^^K0-L{LMVqGh{aVhnG{FOqjv%#9klaEE+|+^Cur>shCH zm;4s%H){4;o%^I|%UY!QF-pK;wL6VhZ`3#!EK+mEN}>Quepb;%0Z{w ziiD(`IrBHFg5Lk zoW%WK3j@tP^+?@i9Rrs!jTtO(`>Eb&n+Ok#rbZ^GM0#9HrN{dOwG=f$O^b#H2S%<= zrYFXGMF3wI4w9fpJ=FE%r+QM?b@j2HJibXtpmU+DE4geuo^?m#K?|wV&9++$DQK0jFgywsE;-;zI9VLh$ic8q`GBhlLeW$f5dqhs%*pYPwbZY)d zDrm#5#47bAi9^JnCD!=$O-LN3z9n%4{X%i?PN;**06jid(2WlgtJE!tL&Wt)ly3QXkTU=;N6VvqG&%e_o<@;mbzBsY>k~eK}X6t58~Br1pV` zOGLlz{Vcjp9xx6#J}xo%W_zGW5im#SUy^8fYkn*)*Vd@rrr#~m`Ufa^IXREzV{23hlU4c9vagn_ROl@vP0cyW&-AJTEmp&m=RAy4Zxp{k$+f(SPpu;upq5 zEB$5@UCo~4X<#4bZetf|lb|AqBa0}aRv`;>O!6>WIV+3+uCWiXQU-qlk$p7&HX77$ z%thlzZ$L+=0X71HvpQ84Uo(J-NwxI<^-tG=Kx5ZDFn5?If)Pw2gIT6d^mMm~VE<6! za&kh9k6MZG(Oy9@<&<`?h`f)Q;P>Z9cK%hc`({ zY<84wV<8=lrX}hRj+oh(ibYeYXe?EKbgaG90e*PviKKScPm!+Q(j*#+rTipyM@y<+ ztWUW3c<5f|_1|a}H_qrv_D@QjS*w%RkY-;{Z8fd|e<|g%d%>(40HMjT$k7*vHzM**teZr7$ zC(ufzpCdju(1G`wo77#+1LWT|x6p$dng^+GX&ypSgcqG`Whv*>+-Suutd^V#7U3X^ z3YL%~t1)Gio{IujQKC{=a4Xd%uN+Cl;#lB71yxS=Q0D7PAcpuEa-Jb%R_}MVd2eUP zlkv*6NWm?;6;>f1$*xDHa^AG(m1F#lrSAmO^)mi { label: "Crafting", tooltip: "Fabricate Crafting", class: "fab-actor-sheet-header-button", - icon: "fa-solid fa-screwdriver-wrench", + icon: "fas fabricate-icon-logo", onclick: async () => { await fabricateUserInterfaceAPI.renderActorCraftingApp({ targetActorId: actorSheet.actor.id diff --git a/src/styles/module.less b/src/styles/module.less index 926ba588..06cc5d0d 100644 --- a/src/styles/module.less +++ b/src/styles/module.less @@ -1284,4 +1284,35 @@ END COMMON STRUCTURAL STYLES flex: 0; justify-self: flex-end; } -} \ No newline at end of file +} + +@font-face { + font-family: 'fabricate-regular'; + src: url("modules/fabricate/assets/fonts/fabricate-regular.eot?uhkbys"); + src: url("modules/fabricate/assets/fonts/fabricate-regular.eot?uhkbys#iefix") format("embedded-opentype"), + url("modules/fabricate/assets/fonts/fabricate-regular.ttf?uhkbys") format("truetype"), + url("modules/fabricate/assets/fonts/fabricate-regular.woff?uhkbys") format("woff"), + url("modules/fabricate/assets/fonts/fabricate-regular.svg?uhkbys#fabricate-regular") format("svg"); + font-weight: normal; + font-style: normal; + font-display: block; +} + +[class^="fabricate-icon-"], [class*=" fabricate-icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: "fabricate-regular" !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.fabricate-icon-logo:before { + content: "\e900"; +} From 06c1b5bfb0456ca42efc08185e1048d880a40cfe Mon Sep 17 00:00:00 2001 From: Matt Potts Date: Fri, 13 Oct 2023 20:47:36 +0100 Subject: [PATCH 2/3] defect: Removes a deprecation warning from ts jest --- jest.config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jest.config.ts b/jest.config.ts index a8732f0d..f0505406 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,9 +1,9 @@ module.exports = { preset: "ts-jest", testEnvironment: "node", - globals: { - "ts-jest": { + transform: { + '^.+\\.tsx?$': ['ts-jest', { isolatedModules: true - } + }] } }; \ No newline at end of file From 9e3df05e811d69d2b5959d83c01da5ed2f7f19d3 Mon Sep 17 00:00:00 2001 From: Matt Potts Date: Fri, 13 Oct 2023 20:48:44 +0100 Subject: [PATCH 3/3] ci: Releases 0.10.3 --- docs/_config.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index 50429651..2e86a830 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,4 +1,4 @@ -title: Fabricate 0.10.2 +title: Fabricate 0.10.3 email: matt@misterpotts.uk description: >- End user documentation for the Foundry Virtual Tabletop (VTT) Module, "Fabricate". diff --git a/package.json b/package.json index 43803850..7a5b7d49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fabricate", - "version": "0.10.2", + "version": "0.10.3", "description": "A system-agnostic, flexible crafting module for FoundryVT", "main": "index.js", "type": "module",