github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-11 14:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix margin input order is inconsistent with padding input order (#10797)

Browse Source
This commit is contained in:
Luis de Dios 2026-07-27 10:52:14 +02:00 committed by GitHub
parent af51c897a8
commit 5ce206f904
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
View File

@ -234,10 +234,10 @@
(mf/use-fn (mf/deps on-focus) #(on-focus :m2)) (mf/use-fn (mf/deps on-focus) #(on-focus :m2))
on-focus-m3 on-focus-m3
(mf/use-fn (mf/deps on-focus) #(on-focus :m1)) (mf/use-fn (mf/deps on-focus) #(on-focus :m3))
on-focus-m4 on-focus-m4
(mf/use-fn (mf/deps on-focus) #(on-focus :m2)) (mf/use-fn (mf/deps on-focus) #(on-focus :m4))
on-change' on-change'
(mf/use-fn (mf/use-fn
@ -329,7 +329,6 @@
:class (stl/css :bottom-margin-wrapper) :class (stl/css :bottom-margin-wrapper)
:attr :m3 :attr :m3
:default nil :default nil
:align :right
:input-type :vertical-margin :input-type :vertical-margin
:property "Bottom margin" :property "Bottom margin"
:nillable true :nillable true
@ -359,6 +358,7 @@
:class (stl/css :left-margin-wrapper) :class (stl/css :left-margin-wrapper)
:default nil :default nil
:attr :m4 :attr :m4
:align :right
:property "Left margin" :property "Left margin"
:input-type :horizontal-margin :input-type :horizontal-margin
:nillable true :nillable true

12
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.scss
View File

@ -140,20 +140,20 @@
grid-row: 1; grid-row: 1;
} }
.bottom-margin, .right-margin,
.bottom-margin-wrapper { .right-margin-wrapper {
grid-column: 2; grid-column: 2;
grid-row: 1; grid-row: 1;
} }
.left-margin, .bottom-margin,
.left-margin-wrapper { .bottom-margin-wrapper {
grid-column: 1; grid-column: 1;
grid-row: 2; grid-row: 2;
} }
.right-margin, .left-margin,
.right-margin-wrapper { .left-margin-wrapper {
grid-column: 2; grid-column: 2;
grid-row: 2; grid-row: 2;
} }