From 7b26949c76b08bb5a5c5e9b059896c79d6096367 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 3 Sep 2026 12:34:54 +0200 Subject: [PATCH] :bug: Fix typography.cljs error from staging merge --- .../ui/workspace/sidebar/options/menus/typography.cljs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs index 8a8e41354c..6c4268cfce 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs @@ -221,15 +221,6 @@ :role "img" :aria-label (:name font)} [: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` ;; itself: that class carries its own `overflow: hidden` (from the ;; text-ellipsis mixin, needed to truncate long font names), and a @@ -242,7 +233,6 @@ :transform (when-not (zero? label-offset) (dm/str "translateY(" label-offset "em)"))}} (:name font)]]))) ->>>>>>> origin/staging (mf/defc font-item* {::mf/wrap [mf/memo]}