From 9ca4fa752c32d9a43edb580af0019f5e02332901 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 21 May 2025 09:44:06 +0200 Subject: [PATCH 1/3] :bug: Add json encoding for tokenslib type --- CHANGES.md | 1 + common/src/app/common/types/tokens_lib.cljc | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 4771a8b57..ee9d09ee2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -53,6 +53,7 @@ - Fix share button being displayed with no permissions [Taiga #11086](https://tree.taiga.io/project/penpot/issue/11086) - Fix inline styles in code tab [Taiga Issue #7583](https://tree.taiga.io/project/penpot/issue/7583) - Fix exception on returning openapi.json +- Fix json encoding of TokensLib [Taiga #10994](https://tree.taiga.io/project/penpot/issue/10994) ## 2.6.2 diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc index 5e2d17ddf..f96d1b029 100644 --- a/common/src/app/common/types/tokens_lib.cljc +++ b/common/src/app/common/types/tokens_lib.cljc @@ -7,6 +7,7 @@ (ns app.common.types.tokens-lib (:require #?(:clj [app.common.fressian :as fres]) + #?(:clj [clojure.data.json :as json]) [app.common.data :as d] [app.common.data.macros :as dm] [app.common.files.helpers :as cfh] @@ -911,6 +912,12 @@ Will return a value that matches this schema: "themes" (clj->js themes) "active-themes" (clj->js active-themes)))]) + + #?@(:clj + [json/JSONWriter + (-write [this writter options] (json/-write (encode-dtcg this) writter options))]) + + ITokenSets (add-set [_ token-set] (let [path (get-token-set-prefixed-path token-set) From faa68784af127d32995c83b56ee4096a2e54dada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Valderrama?= Date: Wed, 21 May 2025 14:17:48 +0200 Subject: [PATCH 2/3] :lipstick: Add styles for external widgets on workspace (#6509) * :lipstick: Add styles for Inkeep Chat at workspace * :paperclip: Styles review --- .../src/app/main/ui/workspace/palette.cljs | 1 + .../src/app/main/ui/workspace/palette.scss | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/frontend/src/app/main/ui/workspace/palette.cljs b/frontend/src/app/main/ui/workspace/palette.cljs index ff13a57b1..f4c3afec5 100644 --- a/frontend/src/app/main/ui/workspace/palette.cljs +++ b/frontend/src/app/main/ui/workspace/palette.cljs @@ -147,6 +147,7 @@ (swap! state* assoc :width width))) [:div {:class (stl/css :palette-wrapper) + :id "palette-wrapper" :style (calculate-palette-padding rulers?) :data-testid "palette"} (when-not workspace-read-only? diff --git a/frontend/src/app/main/ui/workspace/palette.scss b/frontend/src/app/main/ui/workspace/palette.scss index 9474a7909..c4896a1c1 100644 --- a/frontend/src/app/main/ui/workspace/palette.scss +++ b/frontend/src/app/main/ui/workspace/palette.scss @@ -4,6 +4,10 @@ // // Copyright (c) KALEIDOS INC +@use "../ds/spacing.scss" as *; +@use "../ds/z-index.scss" as *; +@use "../ds/_sizes.scss" as *; + @import "refactor/common-refactor.scss"; .palette-wrapper { @@ -12,6 +16,12 @@ left: 0; bottom: 0; padding-bottom: $s-4; + + /** Aligns AI Chat button **/ + display: flex; + align-items: center; + justify-content: space-between; + gap: var(--sp-s); } .palettes { @@ -164,3 +174,27 @@ padding-bottom: $s-8; } } + +/** AI Chat button styles **/ +.help-btn { + z-index: var(--z-index-panels); + flex-shrink: 0; + @extend .button-secondary; + inline-size: $sz-40; + block-size: $sz-40; + border-radius: $br-circle; + border: none; + &.selected { + @extend .button-icon-selected; + } + &:hover { + border: none; + } +} + +.icon-help { + @extend .button-icon; + stroke: var(--icon-foreground); + inline-size: var(--sp-xxl); + block-size: var(--sp-xxl); +} From 99fb90507059d53f03e6ed3c9a023345569a04e8 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Thu, 22 May 2025 13:15:09 +0200 Subject: [PATCH 3/3] :bug: Fix at icon (#6540) --- CHANGES.md | 1 + frontend/resources/images/icons/at.svg | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index ee9d09ee2..0ac0428b5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,7 @@ ### :bug: Bugs fixed +- Fix "at" icon to match all icons on app [Taiga #11136](https://tree.taiga.io/project/penpot/issue/11136) - Fix problem in viewer with the back button [Taiga #10907](https://tree.taiga.io/project/penpot/issue/10907) - Fix resize bar background on tokens panel [Taiga #10811](https://tree.taiga.io/project/penpot/issue/10811) - Fix shortcut for history version panel [Taiga #11006](https://tree.taiga.io/project/penpot/issue/11006) diff --git a/frontend/resources/images/icons/at.svg b/frontend/resources/images/icons/at.svg index 72e5ff01d..954c6be2a 100644 --- a/frontend/resources/images/icons/at.svg +++ b/frontend/resources/images/icons/at.svg @@ -1 +1,3 @@ - + + + \ No newline at end of file