diff --git a/CHANGES.md b/CHANGES.md index 1b88df24d6..ac4a5ab855 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -50,7 +50,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) diff --git a/backend/scripts/run.template.sh b/backend/scripts/run.template.sh index 3d04cdcec8..e1f7a727b4 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}; diff --git a/frontend/src/app/main/ui/dashboard/placeholder.cljs b/frontend/src/app/main/ui/dashboard/placeholder.cljs index d1b7355618..8af3d723b8 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 d852a26709..590d38289a 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; 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 cc4ab2ea8d..d2732bd7f3 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. diff --git a/frontend/text-editor/src/editor/controllers/SelectionController.js b/frontend/text-editor/src/editor/controllers/SelectionController.js index fbc2d263b9..dd01048552 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,