From 49bbdfb25754a9f830e77d2c37bc59a60ad4cbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marina=20L=C3=B3pez?= Date: Wed, 3 Dec 2025 12:50:51 +0100 Subject: [PATCH 1/4] :bug: Fix U and E icon displayed in project list (#7875) * :bug: Fix U and E icon displayed in project lis * :bug: Fix U and E icon displayed in project list --- CHANGES.md | 1 + .../app/main/ui/dashboard/subscription.cljs | 18 ++++++++------- .../app/main/ui/dashboard/subscription.scss | 22 +++++++++---------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6ec0c6ada6..56de1813be 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -88,6 +88,7 @@ example. It's still usable as before, we just removed the example. - Fix input confirmation behavior is not uniform [Taiga #12294](https://tree.taiga.io/project/penpot/issue/12294) - Fix copy/pasting application/transit+json [Taiga #12721](https://tree.taiga.io/project/penpot/issue/12721) - Fix problem with plugins content attribute [Plugins #209](https://github.com/penpot/penpot-plugins/issues/209) +- Fix U and E icon displayed in project list [Taiga #12806](https://tree.taiga.io/project/penpot/issue/12806) ## 2.11.1 diff --git a/frontend/src/app/main/ui/dashboard/subscription.cljs b/frontend/src/app/main/ui/dashboard/subscription.cljs index fcfb82d1c3..65f8da6894 100644 --- a/frontend/src/app/main/ui/dashboard/subscription.cljs +++ b/frontend/src/app/main/ui/dashboard/subscription.cljs @@ -151,14 +151,16 @@ (mf/defc menu-team-icon* [{:keys [subscription-type]}] - [:span {:class (stl/css :subscription-icon) - :title (if (= subscription-type "unlimited") - (tr "subscription.dashboard.power-up.unlimited-plan") - (tr "subscription.dashboard.power-up.enterprise-plan")) - :data-testid "subscription-icon"} - (case subscription-type - "unlimited" i/character-u - "enterprise" i/character-e)]) + [:span {:class (stl/css :subscription-icon-wrapper)} + [:> icon* {:icon-id (case subscription-type + "unlimited" i/character-u + "enterprise" i/character-e) + :class (stl/css :subscription-icon) + :size "s" + :title (if (= subscription-type "unlimited") + (tr "subscription.dashboard.power-up.unlimited-plan") + (tr "subscription.dashboard.power-up.enterprise-plan")) + :data-testid "subscription-icon"}]]) (mf/defc main-menu-power-up* [{:keys [close-sub-menu]}] diff --git a/frontend/src/app/main/ui/dashboard/subscription.scss b/frontend/src/app/main/ui/dashboard/subscription.scss index a473ea45a9..7d18da543c 100644 --- a/frontend/src/app/main/ui/dashboard/subscription.scss +++ b/frontend/src/app/main/ui/dashboard/subscription.scss @@ -144,20 +144,20 @@ padding: 0; } -.subscription-icon { - @extend .button-icon; +.subscription-icon-wrapper { + display: flex; + justify-content: center; + align-items: center; background: var(--color-background-primary); - stroke: var(--color-foreground-secondary); - border-radius: 6px; + border-radius: $br-6; border: 1.75px solid var(--color-foreground-secondary); - stroke-width: 2.25px; - width: var(--sp-xl); - height: var(--sp-xl); + block-size: var(--sp-xl); + inline-size: var(--sp-xl); +} - svg { - block-size: var(--sp-m); - inline-size: var(--sp-m); - } +.subscription-icon { + stroke: var(--color-foreground-secondary); + stroke-width: 2.25px; } .menu-item { From df7caacb45bc0e054a91ed901e235a0f13c33be4 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 3 Dec 2025 13:01:36 +0100 Subject: [PATCH 2/4] :bug: Fix crash in token grid view due to tooltip validation (#7887) The color tokens in grid view have a tooltip which is a map. This is done so the frontend can render: ``` Name: foo Resolved value: #000000 ``` However the validation scheme for tooltips was only accepting functions and strings. --- How to reproduce the original (unreported) crash: * Create a color token * Create a shape, add a fill * Pick a color, chose the Token options * Click on the Grid View Crash: `{:hint "invalid props on component tooltip*\n\n -> 'content' should be a string\n"}` Signed-off-by: Dalai Felinto Co-authored-by: Dalai Felinto --- CHANGES.md | 1 + frontend/src/app/main/ui/ds/tooltip/tooltip.cljs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 56de1813be..f1e153712d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -61,6 +61,7 @@ example. It's still usable as before, we just removed the example. ### :heart: Community contributions (Thank you!) - Ensure consistent snap behavior across all zoom levels [Github #7774](https://github.com/penpot/penpot/pull/7774) by [@Tokytome](https://github.com/Tokytome) +- Fix crash in token grid view due to tooltip validation (by @dfelinto) [Github #7887](https://github.com/penpot/penpot/pull/7887) ### :sparkles: New features & Enhancements diff --git a/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs b/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs index 3dc5b71d66..5435ae0c77 100644 --- a/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs +++ b/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs @@ -173,7 +173,7 @@ [:id {:optional true} :string] [:offset {:optional true} :int] [:delay {:optional true} :int] - [:content [:or fn? :string]] + [:content [:or fn? :string map?]] [:placement {:optional true} [:maybe [:enum "top" "bottom" "left" "right" "top-right" "bottom-right" "bottom-left" "top-left"]]]]) From 00f8eac8fadaf623c5592ad4bed78911bfe6e491 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Wed, 3 Dec 2025 13:03:17 +0100 Subject: [PATCH 3/4] :bug: Fix can't delete unsaved variant prop (#7878) --- frontend/src/app/main/data/workspace/variants.cljs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/data/workspace/variants.cljs b/frontend/src/app/main/data/workspace/variants.cljs index 2dc9358737..1def674c9b 100644 --- a/frontend/src/app/main/data/workspace/variants.cljs +++ b/frontend/src/app/main/data/workspace/variants.cljs @@ -128,14 +128,16 @@ related-components (cfv/find-variant-components data objects variant-id) props (-> related-components last :variant-properties) - prop-name (-> props (nth pos) :name) + valid-pos? (> (count props) pos) + prop-name (when valid-pos? (-> props (nth pos) :name)) - changes (-> (pcb/empty-changes it page-id) - (pcb/with-objects objects) - (pcb/with-library-data data) - (clvp/generate-update-property-name variant-id pos new-name)) + changes (when valid-pos? + (-> (pcb/empty-changes it page-id) + (pcb/with-objects objects) + (pcb/with-library-data data) + (clvp/generate-update-property-name variant-id pos new-name))) undo-id (js/Symbol)] - (when (not= prop-name new-name) + (when (and valid-pos? (not= prop-name new-name)) (rx/of (dwu/start-undo-transaction undo-id) (dch/commit-changes changes) From bee2f70bfa4dc03a41e6beb30f5fbb3e639ff192 Mon Sep 17 00:00:00 2001 From: "Slava \"nerfur\" Voronzoff" Date: Fri, 28 Nov 2025 01:39:53 +0300 Subject: [PATCH 4/4] :bug: Add missing amd64 option on arch detection code on mange.sh script Signed-off-by: Slava "nerfur" Voronzoff --- manage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage.sh b/manage.sh index 174276b7d8..cc9d21307c 100755 --- a/manage.sh +++ b/manage.sh @@ -19,7 +19,7 @@ set -e ARCH=$(uname -m) -if [[ "$ARCH" == "x86_64" || "$ARCH" == "i386" || "$ARCH" == "i686" ]]; then +if [[ "$ARCH" == "x86_64" || "$ARCH" == "amd64" || "$ARCH" == "i386" || "$ARCH" == "i686" ]]; then ARCH="amd64" elif [[ "$ARCH" == "aarch64" || "$ARCH" == "arm64" ]]; then ARCH="arm64"