From 1ed698670eb0dd20cf592c403a2096bf846bd750 Mon Sep 17 00:00:00 2001
From: Eva Marco <evamarcod@gmail.com>
Date: Mon, 15 Jun 2026 17:20:59 +0200
Subject: [PATCH] :bug: Fix fonts select position

---
 .../workspace/sidebar/options/menus/text.cljs | 21 +++++++++----------
 .../workspace/sidebar/options/menus/text.scss |  3 +--
 .../sidebar/options/menus/typography.scss     |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs
index 1eb144494f..22fab594b6 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs
@@ -480,7 +480,15 @@
                             :aria-label        (tr "workspace.options.convert-to-typography")
                             :on-click          on-convert-to-typography
                             :tooltip-placement "top-left"
-                            :icon              i/add}])]]]
+                            :icon              i/add}])]]
+      (when (and token-typography-row-enabled? token-dropdown-open?)
+        [:> searchable-options-dropdown* {:on-click     on-option-click
+                                          :id           listbox-id
+                                          :options      (resolve-delay dropdown-options)
+                                          :selected     selected-token-id
+                                          :align        "right"
+                                          :placeholder  (tr "workspace.tokens.search-by-token")
+                                          :ref          set-option-ref}])]
 
      (when main-menu-open?
        [:div {:class (stl/css :element-content)}
@@ -540,13 +548,4 @@
           [:div {:class (stl/css :text-decoration-options)}
            [:> vertical-align* common-props]
            [:> text-decoration-options* (mf/spread-props common-props {:token-applied current-token-name})]
-           [:> text-direction-options* common-props]])])
-
-     (when (and token-typography-row-enabled? token-dropdown-open?)
-       [:> searchable-options-dropdown* {:on-click     on-option-click
-                                         :id           listbox-id
-                                         :options      (resolve-delay dropdown-options)
-                                         :selected     selected-token-id
-                                         :align        "right"
-                                         :placeholder  (tr "workspace.tokens.search-by-token")
-                                         :ref          set-option-ref}])]))
+           [:> text-direction-options* common-props]])])]))
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.scss
index 0de08225f7..adc7da205a 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.scss
@@ -14,12 +14,11 @@
 
 .element-set {
   @include sidebar.option-grid-structure;
-
-  position: relative;
 }
 
 .element-title {
   grid-column: span 8;
+  position: relative;
 }
 
 .element-content {
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss
index 0a383b8fcd..c8a8693543 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss
@@ -389,7 +389,7 @@
 }
 
 .font-selector-dropdown-full-size {
-  block-size: calc(100vh - 48px); // TODO: ugly hack :( Find a workaround for this.
+  block-size: var(--sidebar-element-options-height);
   display: grid;
   grid-template-rows: auto 1fr;
   padding: var(--sp-xxs) var(--sp-m) var(--sp-m) var(--sp-m);