From 955538b12a6684bb160d8f67fb688af739d32a07 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 23 Jul 2025 16:03:07 +0200 Subject: [PATCH 1/2] :bug: Fix opacity on stroke gradients --- CHANGES.md | 1 + frontend/src/app/main/ui/shapes/attrs.cljs | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 21509e5061..dcf737b9ae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -48,6 +48,7 @@ - Fix "Copy as SVG" generates different code from the Inspect panel [Taiga #11519](https://tree.taiga.io/project/penpot/issue/11519) - Fix overriden tokens in text copies are not preserved [Taiga #11486](https://tree.taiga.io/project/penpot/issue/11486) - Fix problem when changing between flex/grid layout [Taiga #11625](https://tree.taiga.io/project/penpot/issue/11625) +- Fix opacity on stroke gradients [Taiga #11646](https://tree.taiga.io/project/penpot/issue/11646) ## 2.8.1 (Unreleased) diff --git a/frontend/src/app/main/ui/shapes/attrs.cljs b/frontend/src/app/main/ui/shapes/attrs.cljs index dfb6094843..fc9fa2b961 100644 --- a/frontend/src/app/main/ui/shapes/attrs.cljs +++ b/frontend/src/app/main/ui/shapes/attrs.cljs @@ -103,15 +103,15 @@ (obj/set! attrs "strokeWidth" width) - (when (some? gradient) + (if (some? gradient) (let [gradient-id (dm/str "stroke-color-gradient-" render-id "-" index)] - (obj/set! attrs "stroke" (str/ffmt "url(#%)" gradient-id)))) + (obj/set! attrs "stroke" (str/ffmt "url(#%)" gradient-id))) - (when-not (some? gradient) (when (some? color) - (obj/set! attrs "stroke" color)) - (when (some? opacity) - (obj/set! attrs "strokeOpacity" opacity))) + (obj/set! attrs "stroke" color))) + + (when (some? opacity) + (obj/set! attrs "strokeOpacity" opacity)) (when (not= style :svg) (obj/set! attrs "strokeDasharray" (calculate-dasharray style width))) From 52c1e227d59274265d6b251c554aefd0231c45a3 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 23 Jul 2025 16:25:10 +0200 Subject: [PATCH 2/2] :bug: Fix change from gradient to solid color --- CHANGES.md | 1 + frontend/src/app/main/data/workspace/colors.cljs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index dcf737b9ae..e3806a46e4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -49,6 +49,7 @@ - Fix overriden tokens in text copies are not preserved [Taiga #11486](https://tree.taiga.io/project/penpot/issue/11486) - Fix problem when changing between flex/grid layout [Taiga #11625](https://tree.taiga.io/project/penpot/issue/11625) - Fix opacity on stroke gradients [Taiga #11646](https://tree.taiga.io/project/penpot/issue/11646) +- Fix change from gradient to solid color [Taiga #11648](https://tree.taiga.io/project/penpot/issue/11648) ## 2.8.1 (Unreleased) diff --git a/frontend/src/app/main/data/workspace/colors.cljs b/frontend/src/app/main/data/workspace/colors.cljs index 0ed40e3e2e..8f20277316 100644 --- a/frontend/src/app/main/data/workspace/colors.cljs +++ b/frontend/src/app/main/data/workspace/colors.cljs @@ -1080,7 +1080,11 @@ (fn [state] (-> state (assoc :type :color) - (dissoc :editing-stop :stops :gradient))))))) + (dissoc :editing-stop :stops :gradient))))) + + ptk/WatchEvent + (watch [_ _ _] + (rx/of (update-colorpicker-color {} false))))) (defn activate-colorpicker-gradient [type]