From 1ac86aced054ea768291f9f83d0bd4682aa38863 Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Tue, 4 Feb 2025 13:05:05 +0100 Subject: [PATCH 1/6] Update CHANGES.md --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 47f7c9b21..13d1e1453 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -37,7 +37,8 @@ is a number of cores) ### :sparkles: New features -- New gradients UI with multi-stop support. [Taiga #3418](https://tree.taiga.io/project/penpot/epic/3418) +- [GRADIENTS] New gradients UI with multi-stop support. [Taiga #3418](https://tree.taiga.io/project/penpot/epic/3418) +- [GRADIENTS] Radial Gradient [Taiga #8768](https://tree.taiga.io/project/penpot/us/8768) - Shareable link pointing to an specific board. [Taiga #3219](https://tree.taiga.io/project/penpot/us/3219) - Copy styles in CSS [Taiga #9401](https://tree.taiga.io/project/penpot/us/9401) - Copy/paste shape styles (fills, strokes, shadows, etc..) [Taiga #8937](https://tree.taiga.io/project/penpot/us/8937) From 4bfe4ca230879606f6505fecb49c3feec061c577 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 3 Feb 2025 12:41:06 +0100 Subject: [PATCH 2/6] :bug: Fix incorrect error handling on legacy workspace redirect --- frontend/src/app/main/ui.cljs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui.cljs b/frontend/src/app/main/ui.cljs index a7cbde8f0..bf6b1ebaa 100644 --- a/frontend/src/app/main/ui.cljs +++ b/frontend/src/app/main/ui.cljs @@ -10,6 +10,7 @@ [app.config :as cf] [app.main.data.common :as dcm] [app.main.data.team :as dtm] + [app.main.errors :as errors] [app.main.refs :as refs] [app.main.repo :as rp] [app.main.router :as rt] @@ -29,7 +30,6 @@ [app.util.dom :as dom] [app.util.i18n :refer [tr]] [beicon.v2.core :as rx] - [potok.v2.core :as ptk] [rumext.v2 :as mf])) (def auth-page @@ -61,8 +61,7 @@ :file-id file-id :page-id page-id :layout layout))) - ptk/handle-error))) - + errors/on-error))) [:> loader* {:title (tr "labels.loading") :overlay true}]) From 9b64a6034b3b68a8478bb488bd34053d77ed3747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marina=20L=C3=B3pez?= Date: Tue, 4 Feb 2025 15:20:22 +0100 Subject: [PATCH 3/6] :bug: Fix wrong text and styles from AB test (#5762) --- frontend/src/app/main/ui/dashboard/placeholder.cljs | 2 +- frontend/src/app/main/ui/dashboard/placeholder.scss | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/dashboard/placeholder.cljs b/frontend/src/app/main/ui/dashboard/placeholder.cljs index d1b735561..8af3d723b 100644 --- a/frontend/src/app/main/ui/dashboard/placeholder.cljs +++ b/frontend/src/app/main/ui/dashboard/placeholder.cljs @@ -79,7 +79,7 @@ :on-click on-click :on-mouse-enter on-mouse-enter :on-mouse-leave on-mouse-leave} - (if @show-text (tr "dashboard.add-file") i/add)] + (if @show-text (tr "dashboard.empty-project.create") i/add)] [:button {:class (stl/css :create-new) :on-click on-click} i/add])])))) diff --git a/frontend/src/app/main/ui/dashboard/placeholder.scss b/frontend/src/app/main/ui/dashboard/placeholder.scss index d852a2670..590d38289 100644 --- a/frontend/src/app/main/ui/dashboard/placeholder.scss +++ b/frontend/src/app/main/ui/dashboard/placeholder.scss @@ -105,9 +105,9 @@ .empty-project-container { width: 100%; - display: flex; - justify-content: space-around; + display: grid; gap: $s-16; + grid-template-columns: 1fr 1fr 1fr; margin-top: $s-12; } @@ -130,6 +130,10 @@ --color-card-title: var(--color-background-secondary); --color-card-subtitle: var(--color-background-secondary); cursor: pointer; + + .empty-project-card-title { + font-weight: $fw500; + } } flex-grow: 1; From b913c75c417ff4252365d7b219fe915dd6630322 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 4 Feb 2025 11:38:16 +0100 Subject: [PATCH 4/6] :fire: Remove unused parameters from backend run template script --- backend/scripts/run.template.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/scripts/run.template.sh b/backend/scripts/run.template.sh index 3d04cdcec..e1f7a727b 100644 --- a/backend/scripts/run.template.sh +++ b/backend/scripts/run.template.sh @@ -18,7 +18,7 @@ if [ -f ./environ ]; then source ./environ fi -export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow -Dpolyglot.engine.WarnInterpreterOnly=false --enable-preview $JVM_OPTS" +export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow --enable-preview $JVM_OPTS" ENTRYPOINT=${1:-app.main}; From 1f2e36774e899c6ec2b3b5f21c51b0f2fa85f7e1 Mon Sep 17 00:00:00 2001 From: Aitor Moreno Date: Tue, 4 Feb 2025 15:54:17 +0100 Subject: [PATCH 5/6] :bug: Fix pasting adds a newline (#5763) --- .../src/editor/controllers/SelectionController.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/text-editor/src/editor/controllers/SelectionController.js b/frontend/text-editor/src/editor/controllers/SelectionController.js index fbc2d263b..dd0104855 100644 --- a/frontend/text-editor/src/editor/controllers/SelectionController.js +++ b/frontend/text-editor/src/editor/controllers/SelectionController.js @@ -1066,9 +1066,15 @@ export class SelectionController extends EventTarget { } const collapseNode = fragment.lastElementChild.lastElementChild.firstChild if (this.isParagraphStart) { + const a = fragment.lastElementChild; + const b = this.focusParagraph; this.focusParagraph.before(fragment); + mergeParagraphs(a, b); } else if (this.isParagraphEnd) { + const a = this.focusParagraph; + const b = fragment.firstElementChild; this.focusParagraph.after(fragment); + mergeParagraphs(a, b); } else { const newParagraph = splitParagraph( this.focusParagraph, From b0d0abb0ad533aafa4a945ab9805276f6b01419f Mon Sep 17 00:00:00 2001 From: Aitor Moreno Date: Tue, 4 Feb 2025 15:54:46 +0100 Subject: [PATCH 6/6] :bug: Fix cursor not preserving white space (#5764) --- frontend/src/app/main/ui/workspace/shapes/text/v2_editor.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.scss b/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.scss index cc4ab2ea8..d2732bd7f 100644 --- a/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.scss +++ b/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.scss @@ -62,6 +62,10 @@ [data-itype="paragraph"] { white-space: nowrap; } + + [data-itype="inline"] { + white-space-collapse: preserve; + } } // Vertical align.