From 5eaea63ca87c0e713014fcba01088ed1066dc0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Valderrama?= <mavalroot@gmail.com>
Date: Wed, 28 May 2025 17:08:23 +0200
Subject: [PATCH] :bug: Fix palette is over sidebar (#6581)

---
 CHANGES.md                                      | 1 +
 frontend/src/app/main/ui/workspace/palette.cljs | 4 ++--
 frontend/src/app/main/ui/workspace/sidebar.cljs | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 302afad663..656f9f3f26 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -87,6 +87,7 @@ A non exhaustive list of changes:
 - Fix spacing / sizes of different elements in the measurements section of the design tab [Taiga #11076](https://tree.taiga.io/project/penpot/issue/11076)
 - Fix selection of short paths [Github #4472](https://github.com/penpot/penpot/issues/4472)
 - Fix element positioning on the right side to adjust to grid [#11073](https://tree.taiga.io/project/penpot/issue/11073)
+- Fix palette is over sidebar [#11160](https://tree.taiga.io/project/penpot/issue/11160)
 
 ## 2.7.1
 
diff --git a/frontend/src/app/main/ui/workspace/palette.cljs b/frontend/src/app/main/ui/workspace/palette.cljs
index f4c3afec5e..1dd3dcaae6 100644
--- a/frontend/src/app/main/ui/workspace/palette.cljs
+++ b/frontend/src/app/main/ui/workspace/palette.cljs
@@ -40,12 +40,12 @@
         left-sidebar-size      (-> (dom/get-data left-sidebar "size")
                                    (d/parse-integer))
         rulers-width           (if rulers? 22 0)
-        min-left-sidebar-width 275
+        min-left-sidebar-width 318
         left-padding           4
         calculate-padding-left (+ rulers-width (or left-sidebar-size min-left-sidebar-width) left-padding 1)]
 
     #js {"paddingLeft" (dm/str calculate-padding-left "px")
-         "paddingRight" "280px"}))
+         "paddingRight" "322px"}))
 
 (mf/defc palette
   [{:keys [layout on-change-palette-size]}]
diff --git a/frontend/src/app/main/ui/workspace/sidebar.cljs b/frontend/src/app/main/ui/workspace/sidebar.cljs
index d6d5011ed8..6b82e1b6f4 100644
--- a/frontend/src/app/main/ui/workspace/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar.cljs
@@ -73,7 +73,7 @@
          on-pointer-move :on-pointer-move
          parent-ref :parent-ref
          size :size}
-        (use-resize-hook :left-sidebar 275 275 500 :x false :left)
+        (use-resize-hook :left-sidebar 318 318 500 :x false :left)
 
         {on-pointer-down-pages :on-pointer-down
          on-lost-pointer-capture-pages  :on-lost-pointer-capture