From 41924246aa793a68c42acd397f41d4751f4b89ca Mon Sep 17 00:00:00 2001 From: Eva Date: Tue, 11 Jul 2023 08:52:36 +0200 Subject: [PATCH 1/5] :bug: Fix text decoration on button --- CHANGES.md | 1 + frontend/resources/styles/main/partials/inspect.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 3cf9e5bf4b..3e68271012 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -58,6 +58,7 @@ - Fix incorrect fullname use on registring user after OIDC authentication [Taiga #5517](https://tree.taiga.io/project/penpot/issue/5517) - Fix incorrect modified-at on project after import file [Taiga #5268](https://tree.taiga.io/project/penpot/issue/5268) - Fix incorrect message after sending invitation to already member [Taiga 5599](https://tree.taiga.io/project/penpot/issue/5599) +- Fix text decoration on button [Taiga #5301](https://tree.taiga.io/project/penpot/issue/5301) ### :arrow_up: Deps updates diff --git a/frontend/resources/styles/main/partials/inspect.scss b/frontend/resources/styles/main/partials/inspect.scss index 32ce5a9e7e..043ba2c8d3 100644 --- a/frontend/resources/styles/main/partials/inspect.scss +++ b/frontend/resources/styles/main/partials/inspect.scss @@ -290,6 +290,7 @@ border-radius: $br4; margin: 0.5rem; cursor: pointer; + text-decoration: none; &:hover { background-color: $color-primary; From 2e461b30706b773e23f45f50828c64e8bc7671dd Mon Sep 17 00:00:00 2001 From: Eva Date: Tue, 11 Jul 2023 08:55:49 +0200 Subject: [PATCH 2/5] :bug: Fix text menu order on design tab --- CHANGES.md | 1 + .../ui/workspace/sidebar/options/shapes/multiple.cljs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3e68271012..0cc1e80730 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -59,6 +59,7 @@ - Fix incorrect modified-at on project after import file [Taiga #5268](https://tree.taiga.io/project/penpot/issue/5268) - Fix incorrect message after sending invitation to already member [Taiga 5599](https://tree.taiga.io/project/penpot/issue/5599) - Fix text decoration on button [Taiga #5301](https://tree.taiga.io/project/penpot/issue/5301) +- Fix menu order on design tab [Taiga #5195](https://tree.taiga.io/project/penpot/issue/5195) ### :arrow_up: Deps updates diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs index bdef18f32c..e93eb9314a 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs @@ -309,12 +309,12 @@ [measure-ids measure-values] (get-attrs shapes objects :measure) [layer-ids layer-values + text-ids text-values constraint-ids constraint-values fill-ids fill-values shadow-ids shadow-values blur-ids blur-values stroke-ids stroke-values - text-ids text-values exports-ids exports-values layout-container-ids layout-container-values layout-item-ids layout-item-values] @@ -325,12 +325,12 @@ [] (mapcat identity) [(get-attrs shapes objects-no-measures :layer) + (get-attrs shapes objects-no-measures :text) (get-attrs shapes objects-no-measures :constraint) (get-attrs shapes objects-no-measures :fill) (get-attrs shapes objects-no-measures :shadow) (get-attrs shapes objects-no-measures :blur) (get-attrs shapes objects-no-measures :stroke) - (get-attrs shapes objects-no-measures :text) (get-attrs shapes objects-no-measures :exports) (get-attrs shapes objects-no-measures :layout-container) (get-attrs shapes objects-no-measures :layout-item) @@ -356,6 +356,9 @@ (when-not (empty? layer-ids) [:& layer-menu {:type type :ids layer-ids :values layer-values}]) + (when-not (empty? text-ids) + [:& ot/text-menu {:type type :ids text-ids :values text-values}]) + (when-not (empty? fill-ids) [:& fill-menu {:type type :ids fill-ids :values fill-values}]) @@ -372,8 +375,5 @@ (when-not (empty? blur-ids) [:& blur-menu {:type type :ids blur-ids :values blur-values}]) - (when-not (empty? text-ids) - [:& ot/text-menu {:type type :ids text-ids :values text-values}]) - (when-not (empty? exports-ids) [:& exports-menu {:type type :ids exports-ids :values exports-values :page-id page-id :file-id file-id}])])) From 3dcd640a998f3a9ab971fb8d1e90990f4dac1e5a Mon Sep 17 00:00:00 2001 From: Eva Date: Tue, 11 Jul 2023 09:46:29 +0200 Subject: [PATCH 3/5] :bug: Fix search bar width on layer tab --- CHANGES.md | 1 + .../resources/styles/main/partials/sidebar-layers.scss | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 0cc1e80730..df879824ba 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -60,6 +60,7 @@ - Fix incorrect message after sending invitation to already member [Taiga 5599](https://tree.taiga.io/project/penpot/issue/5599) - Fix text decoration on button [Taiga #5301](https://tree.taiga.io/project/penpot/issue/5301) - Fix menu order on design tab [Taiga #5195](https://tree.taiga.io/project/penpot/issue/5195) +- Fix search bar width on layer tab [Taiga #5445](https://tree.taiga.io/project/penpot/issue/5445) ### :arrow_up: Deps updates diff --git a/frontend/resources/styles/main/partials/sidebar-layers.scss b/frontend/resources/styles/main/partials/sidebar-layers.scss index e9d3256b5c..f408a8fc46 100644 --- a/frontend/resources/styles/main/partials/sidebar-layers.scss +++ b/frontend/resources/styles/main/partials/sidebar-layers.scss @@ -378,6 +378,8 @@ span.element-name { background-color: $color-gray-50; color: $color-white; font-size: $fs12; + flex-grow: 1; + margin: 0; height: 16px; &:focus { outline: none; @@ -386,10 +388,16 @@ span.element-name { div { height: 16px; overflow: hidden; + width: 100%; + display: flex; + align-items: center; } .filter, .clear { width: 35px; + display: flex; + justify-content: center; + align-items: center; &.active { svg { fill: $color-primary; From 52545692dfe76d17723fc6396b445b33d910a9d9 Mon Sep 17 00:00:00 2001 From: Eva Date: Tue, 11 Jul 2023 11:26:31 +0200 Subject: [PATCH 4/5] :bug: Fix border radius values with decimals --- CHANGES.md | 3 ++- frontend/src/app/util/code_gen.cljs | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index df879824ba..4ebb767d41 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -61,7 +61,8 @@ - Fix text decoration on button [Taiga #5301](https://tree.taiga.io/project/penpot/issue/5301) - Fix menu order on design tab [Taiga #5195](https://tree.taiga.io/project/penpot/issue/5195) - Fix search bar width on layer tab [Taiga #5445](https://tree.taiga.io/project/penpot/issue/5445) - +- Fix border radius values with decimals [Taiga #5283](https://tree.taiga.io/project/penpot/issue/5283) + ### :arrow_up: Deps updates - Update google fonts catalog (at 2023/07/06) [Taiga #5592](https://tree.taiga.io/project/penpot/issue/5592) diff --git a/frontend/src/app/util/code_gen.cljs b/frontend/src/app/util/code_gen.cljs index f3cf5eea40..f50247b564 100644 --- a/frontend/src/app/util/code_gen.cljs +++ b/frontend/src/app/util/code_gen.cljs @@ -75,6 +75,14 @@ (fmt/format-size :width value values) (fmt/format-size :heigth value values)))) +(defn format-border-radius + [values] + + (and (coll? values) (d/not-empty? values)) + (->> values + (map fmt/format-pixels) + (str/join " "))) + (defn styles-data [shape] {:position {:props [:type] @@ -90,7 +98,7 @@ :rx "border-radius" :r1 "border-radius"} :format {:rotation #(str/fmt "rotate(%sdeg)" %) - :r1 #(apply str/fmt "%spx %spx %spx %spx" %) + :r1 format-border-radius :width #(get-size :width %) :height #(get-size :height %)} :multi {:r1 [:r1 :r2 :r3 :r4]}} @@ -236,9 +244,9 @@ (str/join "\n"))))) (defn shape->properties [shape] - (let [;; This property is added in an earlier step (code.cljs), + (let [;; This property is added in an earlier step (code.cljs), ;; it will come with a vector of flex-items if any. - ;; If there are none it will continue as usual. + ;; If there are none it will continue as usual. flex-items (:flex-items shape) props (->> (styles-data shape) vals (mapcat :props)) to-prop (->> (styles-data shape) vals (map :to-prop) (reduce merge)) From b94885a764485544c4c1d79d230abb594fce54d9 Mon Sep 17 00:00:00 2001 From: Eva Date: Tue, 11 Jul 2023 13:30:34 +0200 Subject: [PATCH 5/5] :bug: Fix shortcut translation --- CHANGES.md | 1 + frontend/translations/cs.po | 3 --- frontend/translations/en.po | 18 +++++++++--------- frontend/translations/he.po | 3 --- frontend/translations/hr.po | 3 --- frontend/translations/id.po | 3 --- frontend/translations/lv.po | 3 --- frontend/translations/pl.po | 3 --- frontend/translations/pt_BR.po | 3 --- frontend/translations/pt_PT.po | 3 --- frontend/translations/ro.po | 3 --- frontend/translations/tr.po | 3 --- frontend/translations/zh_CN.po | 3 --- 13 files changed, 10 insertions(+), 42 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4ebb767d41..5d11dac02a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -62,6 +62,7 @@ - Fix menu order on design tab [Taiga #5195](https://tree.taiga.io/project/penpot/issue/5195) - Fix search bar width on layer tab [Taiga #5445](https://tree.taiga.io/project/penpot/issue/5445) - Fix border radius values with decimals [Taiga #5283](https://tree.taiga.io/project/penpot/issue/5283) +- Fix shortcuts translations not homogenized [Taiga #5141](https://tree.taiga.io/project/penpot/issue/5141) ### :arrow_up: Deps updates diff --git a/frontend/translations/cs.po b/frontend/translations/cs.po index 6737bd477a..90b8ecd2cb 100644 --- a/frontend/translations/cs.po +++ b/frontend/translations/cs.po @@ -2321,9 +2321,6 @@ msgstr "Přichytit k vodicím lištám" msgid "shortcuts.toggle-textpalette" msgstr "Přepnout paletu textu" -msgid "shortcuts.toggle-visibility" -msgstr "Přepnout viditelnost" - msgid "shortcuts.toggle-zoom-style" msgstr "Přepnout styl přiblížení" diff --git a/frontend/translations/en.po b/frontend/translations/en.po index bfefc32b13..7c5e2f1627 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -2528,7 +2528,7 @@ msgid "shortcuts.h-distribute" msgstr "Distribute horizontally" msgid "shortcuts.hide-ui" -msgstr "Show/hide UI" +msgstr "Show / Hide UI" msgid "shortcuts.increase-zoom" msgstr "Zoom in" @@ -2687,10 +2687,10 @@ msgid "shortcuts.separate-nodes" msgstr "Separate nodes" msgid "shortcuts.show-pixel-grid" -msgstr "Show/hide pixel grid" +msgstr "Show / Hide pixel grid" msgid "shortcuts.show-shortcuts" -msgstr "Show/hide shortcuts" +msgstr "Show / Hide shortcuts" msgid "shortcuts.snap-nodes" msgstr "Snap to nodes" @@ -2742,7 +2742,7 @@ msgid "shortcuts.toggle-fullscreen" msgstr "Toggle fullscreen" msgid "shortcuts.toggle-grid" -msgstr "Show/hide grid" +msgstr "Show / Hide grid" msgid "shortcuts.toggle-history" msgstr "Toggle history" @@ -2751,16 +2751,16 @@ msgid "shortcuts.toggle-layers" msgstr "Toggle layers" msgid "shortcuts.toggle-layout-flex" -msgstr "Add/remove flex layout" +msgstr "Add / Remove flex layout" msgid "shortcuts.toggle-lock" -msgstr "Lock selected" +msgstr "Lock / Unlock" msgid "shortcuts.toggle-lock-size" msgstr "Lock proportions" msgid "shortcuts.toggle-rules" -msgstr "Show/hide rulers" +msgstr "Show / Hide rulers" msgid "shortcuts.toggle-scale-text" msgstr "Toggle scale text" @@ -2775,7 +2775,7 @@ msgid "shortcuts.toggle-textpalette" msgstr "Toggle text palette" msgid "shortcuts.toggle-visibility" -msgstr "Toggle visibility" +msgstr "Show / Hide" msgid "shortcuts.toggle-zoom-style" msgstr "Toggle zoom style" @@ -4472,7 +4472,7 @@ msgid "workspace.shape.menu.hide" msgstr "Hide" msgid "workspace.shape.menu.hide-ui" -msgstr "Show/Hide UI" +msgstr "Show / Hide UI" msgid "workspace.shape.menu.intersection" msgstr "Intersection" diff --git a/frontend/translations/he.po b/frontend/translations/he.po index e58d6cfd36..caa8c85dfb 100644 --- a/frontend/translations/he.po +++ b/frontend/translations/he.po @@ -2592,9 +2592,6 @@ msgstr "הצמדה לקווים מנחים" msgid "shortcuts.toggle-textpalette" msgstr "החלפת לוח טקסט" -msgid "shortcuts.toggle-visibility" -msgstr "החלפת מצב הצגה" - msgid "shortcuts.toggle-zoom-style" msgstr "החלפת סגנון תקריב" diff --git a/frontend/translations/hr.po b/frontend/translations/hr.po index 30e166fcc8..24aecc15c3 100644 --- a/frontend/translations/hr.po +++ b/frontend/translations/hr.po @@ -2405,9 +2405,6 @@ msgstr "Pričvrsti na guides" msgid "shortcuts.toggle-textpalette" msgstr "Promijeni paletu teksta" -msgid "shortcuts.toggle-visibility" -msgstr "Promijeni vidljivost" - msgid "shortcuts.toggle-zoom-style" msgstr "Promijeni stil zooma" diff --git a/frontend/translations/id.po b/frontend/translations/id.po index b54da37bb9..aed9bfad0b 100644 --- a/frontend/translations/id.po +++ b/frontend/translations/id.po @@ -2559,9 +2559,6 @@ msgstr "Tancap ke pemandu" msgid "shortcuts.toggle-textpalette" msgstr "Alih palet teks" -msgid "shortcuts.toggle-visibility" -msgstr "Alih keterlihatan" - msgid "shortcuts.toggle-zoom-style" msgstr "Alih gaya zum" diff --git a/frontend/translations/lv.po b/frontend/translations/lv.po index b798f414d0..8f6ad1c273 100644 --- a/frontend/translations/lv.po +++ b/frontend/translations/lv.po @@ -2592,9 +2592,6 @@ msgstr "Pieķerties vadotnēm" msgid "shortcuts.toggle-textpalette" msgstr "Pārslēgt teksta paleti" -msgid "shortcuts.toggle-visibility" -msgstr "Pārslēgt redzamību" - msgid "shortcuts.toggle-zoom-style" msgstr "Pārslēgt tālummaiņas stilu" diff --git a/frontend/translations/pl.po b/frontend/translations/pl.po index bfe0c45811..e82a766447 100644 --- a/frontend/translations/pl.po +++ b/frontend/translations/pl.po @@ -2612,9 +2612,6 @@ msgstr "Przyciągaj do prowadnic" msgid "shortcuts.toggle-textpalette" msgstr "Przełącz paletę tekstu" -msgid "shortcuts.toggle-visibility" -msgstr "Przełącz widoczność" - msgid "shortcuts.toggle-zoom-style" msgstr "Przełącz sposób powiększania" diff --git a/frontend/translations/pt_BR.po b/frontend/translations/pt_BR.po index d6f75a8cab..16a7baf605 100644 --- a/frontend/translations/pt_BR.po +++ b/frontend/translations/pt_BR.po @@ -2567,9 +2567,6 @@ msgstr "Aderir as réguas" msgid "shortcuts.toggle-textpalette" msgstr "Mostrar/Esconder paleta de tipografias" -msgid "shortcuts.toggle-visibility" -msgstr "Alternar visibilidade" - msgid "shortcuts.toggle-zoom-style" msgstr "Alternar estilo de zoom" diff --git a/frontend/translations/pt_PT.po b/frontend/translations/pt_PT.po index 7d04a6f486..960d485678 100644 --- a/frontend/translations/pt_PT.po +++ b/frontend/translations/pt_PT.po @@ -2424,9 +2424,6 @@ msgstr "Ajustar às guias" msgid "shortcuts.toggle-textpalette" msgstr "Alternar paleta de texto" -msgid "shortcuts.toggle-visibility" -msgstr "Alternar visibilidade" - msgid "shortcuts.toggle-zoom-style" msgstr "Alternar estilo de zoom" diff --git a/frontend/translations/ro.po b/frontend/translations/ro.po index f16de18700..6913b9a10a 100644 --- a/frontend/translations/ro.po +++ b/frontend/translations/ro.po @@ -2589,9 +2589,6 @@ msgstr "Fixare la ghiduri" msgid "shortcuts.toggle-textpalette" msgstr "Comutați paleta de text" -msgid "shortcuts.toggle-visibility" -msgstr "Comutați vizibilitatea" - msgid "shortcuts.toggle-zoom-style" msgstr "Comutați stilul zoomului" diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po index 31300fe2b0..13d08e5523 100644 --- a/frontend/translations/tr.po +++ b/frontend/translations/tr.po @@ -2691,9 +2691,6 @@ msgstr "Kılavuzlara tuttur" msgid "shortcuts.toggle-textpalette" msgstr "Metin paletini değiştir" -msgid "shortcuts.toggle-visibility" -msgstr "Görünürlüğü değiştir" - msgid "shortcuts.toggle-zoom-style" msgstr "Yakınlaştırma şeklini değiştir" diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po index f227f41e30..f2be6a4280 100644 --- a/frontend/translations/zh_CN.po +++ b/frontend/translations/zh_CN.po @@ -2446,9 +2446,6 @@ msgstr "辅助线对齐" msgid "shortcuts.toggle-textpalette" msgstr "切换文本调色板" -msgid "shortcuts.toggle-visibility" -msgstr "切换可见度" - msgid "shortcuts.toggle-zoom-style" msgstr "切换缩放样式"