github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-11 14:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix typography.cljs error from staging merge

Browse Source
This commit is contained in:
Alejandro Alonso 2026-09-03 12:34:54 +02:00
parent 37f1d3f0fd
commit 7b26949c76
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
View File

@ -221,15 +221,6 @@
:role "img" :role "img"
:aria-label (:name font)} :aria-label (:name font)}
[:use {:href (dm/str "#" fonts/preview-sprite-prefix font-id)}]] [:use {:href (dm/str "#" fonts/preview-sprite-prefix font-id)}]]
<<<<<<< HEAD
[:span {:class (stl/css :font-item-label)
:style (cond-> {}
loaded?
(assoc :font-family (dm/str "\"" (:family font) "\", sans-serif"))
(not (zero? label-offset))
(assoc :transform (dm/str "translateY(" label-offset "em)")))}
(:name font)])))
=======
;; The vertical correction goes on an INNER span, not on `.font-item-label` ;; The vertical correction goes on an INNER span, not on `.font-item-label`
;; itself: that class carries its own `overflow: hidden` (from the ;; itself: that class carries its own `overflow: hidden` (from the
;; text-ellipsis mixin, needed to truncate long font names), and a ;; text-ellipsis mixin, needed to truncate long font names), and a
@ -242,7 +233,6 @@
:transform (when-not (zero? label-offset) :transform (when-not (zero? label-offset)
(dm/str "translateY(" label-offset "em)"))}} (dm/str "translateY(" label-offset "em)"))}}
(:name font)]]))) (:name font)]])))
>>>>>>> origin/staging
(mf/defc font-item* (mf/defc font-item*
{::mf/wrap [mf/memo]} {::mf/wrap [mf/memo]}