3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-03 10:11:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

🔧 Fix wrong code in merge

Browse source
This commit is contained in:
Andrés Moya 2024-11-08 16:08:07 +01:00
parent 5fee74cea8
commit b4440aad04
14 changed files with 16 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/app/common/files/changes_builder.cljc
View file

@ -401,7 +401,7 @@
(update :redo-changes conj add-change)
(cond->
(and (ctk/in-component-copy? parent) (not ignore-touched))
(update :undo-changes conj restore-touched-change))
(update :undo-changes conj restore-touched-change))
(update :undo-changes conj del-change)
(apply-changes-local)))))
@ -462,7 +462,7 @@
(update :redo-changes conj set-parent-change)
(cond->
(ctk/in-component-copy? parent)
(update :undo-changes conj restore-touched-change))
(update :undo-changes conj restore-touched-change))
(update :undo-changes #(reduce mk-undo-change % shapes))
(apply-changes-local)))))

16
common/src/app/common/types/token.cljc
View file

@ -128,9 +128,9 @@
(sm/register! ::dimensions
(merge-schemas ::sizing
::spacing
::stroke-width
::border-radius))
::spacing
::stroke-width
::border-radius))
(def dimensions-keys (schema-keys ::dimensions))
@ -145,8 +145,8 @@
(sm/register! ::applied-tokens
(merge-schemas ::tokens
::border-radius
::sizing
::spacing
::rotation
::dimensions))
::border-radius
::sizing
::spacing
::rotation
::dimensions))