From 6b3bfc85b39c56e48cbe9badcfa89422e568ab36 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Fri, 2 Aug 2024 09:30:42 +0200 Subject: [PATCH 1/3] :bug: Fix scroll on color picker modal --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/colorpicker/libraries.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index ea160e12e..6b303c241 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ ### :bug: Bugs fixed +- Fix scroll on color picker modal [Taiga #8353](https://tree.taiga.io/project/penpot/issue/8353) - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273) ## 2.1.1 diff --git a/frontend/src/app/main/ui/workspace/colorpicker/libraries.scss b/frontend/src/app/main/ui/workspace/colorpicker/libraries.scss index 63a0f8398..8b401448d 100644 --- a/frontend/src/app/main/ui/workspace/colorpicker/libraries.scss +++ b/frontend/src/app/main/ui/workspace/colorpicker/libraries.scss @@ -18,6 +18,7 @@ justify-content: space-between; overflow: auto; margin-top: $s-8; + max-height: $s-168; } .add-color-btn, From d527bbd8b5d9b46ccfe17c8e12bd02acaaf75806 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Fri, 2 Aug 2024 11:12:28 +0200 Subject: [PATCH 2/3] :bug: Fix fill collapsed options --- CHANGES.md | 1 + .../workspace/sidebar/options/menus/fill.cljs | 20 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6b303c241..cab9f0cbb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ ### :bug: Bugs fixed +- Fix fill collapsed options [Taiga #8351](https://tree.taiga.io/project/penpot/issue/8351) - Fix scroll on color picker modal [Taiga #8353](https://tree.taiga.io/project/penpot/issue/8353) - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs index 3d8574ef1..d19a39250 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs @@ -49,23 +49,23 @@ (tr "workspace.options.fill")) ;; Excluding nil values - values (d/without-nils values) - fills (:fills values) - has-fills? (or (= :multiple fills) (some? (seq fills))) + values (d/without-nils values) + fills (:fills values) + has-fills? (or (= :multiple fills) (some? (seq fills))) - state* (mf/use-state has-fills?) - open? (deref state*) + state* (mf/use-state true) + open? (deref state*) - toggle-content (mf/use-fn #(swap! state* not)) + toggle-content (mf/use-fn #(swap! state* not)) - open-content (mf/use-fn #(reset! state* true)) + open-content (mf/use-fn #(reset! state* true)) - close-content (mf/use-fn #(reset! state* false)) + close-content (mf/use-fn #(reset! state* false)) hide-fill-on-export? (:hide-fill-on-export values false) - checkbox-ref (mf/use-ref) + checkbox-ref (mf/use-ref) on-add (mf/use-fn @@ -149,7 +149,7 @@ :data-testid "add-fill" :on-click on-add} i/add])]] - (when open? + (when (and open? has-fills?) [:div {:class (stl/css :element-content)} (cond (= :multiple fills) From f011d94339ce5f8f158989815f7e78bde0ba7153 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Fri, 2 Aug 2024 14:14:51 +0200 Subject: [PATCH 3/3] :bug: Fix error on padding input props --- CHANGES.md | 1 + .../workspace/sidebar/options/menus/layout_container.cljs | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index cab9f0cbb..8cecbc3cb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ ### :bug: Bugs fixed +- Fix wrong props on padding input [Taiga #8254](https://tree.taiga.io/project/penpot/issue/8254) - Fix fill collapsed options [Taiga #8351](https://tree.taiga.io/project/penpot/issue/8351) - Fix scroll on color picker modal [Taiga #8353](https://tree.taiga.io/project/penpot/issue/8353) - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs index b7a5dde44..83caf49bd 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs @@ -342,7 +342,6 @@ :data-attr "p1" :on-change on-change' :on-focus on-focus - :nillable true :min 0 :value p1}]] [:div {:class (stl/css :padding-simple) @@ -357,7 +356,6 @@ :on-change on-change' :on-focus on-focus :on-blur on-padding-blur - :nillable true :min 0 :value p2}]]])) @@ -400,7 +398,6 @@ :on-change on-change' :on-focus on-focus :on-blur on-padding-blur - :nillable true :min 0 :value p1}]] @@ -415,7 +412,6 @@ :on-change on-change' :on-focus on-focus :on-blur on-padding-blur - :nillable true :min 0 :value p2}]] @@ -430,7 +426,6 @@ :on-change on-change' :on-focus on-focus :on-blur on-padding-blur - :nillable true :min 0 :value p3}]] @@ -445,7 +440,6 @@ :on-change on-change' :on-focus on-focus :on-blur on-padding-blur - :nillable true :min 0 :value p4}]]]))