3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-25 21:27:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix storing custom fonts

Browse source
This commit is contained in:
Elena Torro 2025-06-17 09:38:17 +02:00
parent a56822ad99
commit d248dd09bc
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/app/render_wasm/api/fonts.cljs
View file

@ -66,7 +66,8 @@
(let [font-uuid (custom-font-id->uuid font-id) (let [font-uuid (custom-font-id->uuid font-id)
matching-font (d/seek (fn [[_ font]] matching-font (d/seek (fn [[_ font]]
(and (= (:font-id font) font-uuid) (and (= (:font-id font) font-uuid)
(= (:font-variant-id font) font-variant-id))) (or (nil? (:font-variant-id font))
(= (:font-variant-id font) font-variant-id))))
(seq @fonts))] (seq @fonts))]
(when matching-font (when matching-font
(:ttf-file-id (second matching-font)))) (:ttf-file-id (second matching-font))))
@ -116,7 +117,7 @@
:google :google
(google-font-ttf-url font-id font-variant-id) (google-font-ttf-url font-id font-variant-id)
:custom :custom
(dm/str (u/join cf/public-uri "assets/by-id/" font-id)) (dm/str (u/join cf/public-uri "assets/by-id/" asset-id))
:builtin :builtin
(dm/str (u/join cf/public-uri "fonts/" asset-id)))) (dm/str (u/join cf/public-uri "fonts/" asset-id))))