github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-01 10:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse Source
This commit is contained in:
Andrey Antukh 2025-11-03 11:41:13 +01:00
commit 481fa44f18
8 changed files with 62 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.scss
View File

@ -7,7 +7,13 @@
@use "refactor/common-refactor.scss" as deprecated; @use "refactor/common-refactor.scss" as deprecated;
.element-set { .element-set {
margin: 0; display: grid;
grid-template-columns: repeat(8, var(--sp-xxxl));
column-gap: var(--sp-xs);
}
.element-title {
grid-column: span 8;
} }
.title-spacing-blur { .title-spacing-blur {

9
frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.scss
View File

@ -7,7 +7,13 @@
@use "refactor/common-refactor.scss" as deprecated; @use "refactor/common-refactor.scss" as deprecated;
.element-set { .element-set {
margin: 0; display: grid;
grid-template-columns: repeat(8, var(--sp-xxxl));
column-gap: var(--sp-xs);
}
.element-title {
grid-column: span 8;
} }
.title-spacing-selected-colors { .title-spacing-selected-colors {
@ -25,6 +31,7 @@
} }
.element-content { .element-content {
grid-column: span 8;
@include deprecated.flexColumn; @include deprecated.flexColumn;
margin-bottom: deprecated.$s-8; margin-bottom: deprecated.$s-8;
} }

8
frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.scss
View File

@ -7,7 +7,13 @@
@use "refactor/common-refactor.scss" as deprecated; @use "refactor/common-refactor.scss" as deprecated;
.element-set { .element-set {
margin: 0; display: grid;
grid-template-columns: repeat(8, var(--sp-xxxl));
column-gap: var(--sp-xs);
}
.element-title {
grid-column: span 8;
} }
.title-spacing-export { .title-spacing-export {

19
frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs
View File

@ -316,16 +316,17 @@
#(st/emit! (dw/add-frame-grid id)))] #(st/emit! (dw/add-frame-grid id)))]
[:div {:class (stl/css :element-set)} [:div {:class (stl/css :element-set)}
[:> title-bar* {:collapsable has-frame-grids? [:div {:class (stl/css :element-title)}
:collapsed (not open?) [:> title-bar* {:collapsable has-frame-grids?
:on-collapsed toggle-content :collapsed (not open?)
:class (stl/css-case :title-spacing-board-grid (not has-frame-grids?)) :on-collapsed toggle-content
:title (tr "workspace.options.guides.title")} :class (stl/css-case :title-spacing-board-grid (not has-frame-grids?))
:title (tr "workspace.options.guides.title")}
[:> icon-button* {:variant "ghost" [:> icon-button* {:variant "ghost"
:aria-label (tr "workspace.options.guides.add-guide") :aria-label (tr "workspace.options.guides.add-guide")
:on-click handle-create-grid :on-click handle-create-grid
:icon i/add}]] :icon i/add}]]]
(when (and open? (seq frame-grids)) (when (and open? (seq frame-grids))
[:div {:class (stl/css :element-set-content)} [:div {:class (stl/css :element-set-content)}

8
frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.scss
View File

@ -7,7 +7,13 @@
@use "refactor/common-refactor.scss" as deprecated; @use "refactor/common-refactor.scss" as deprecated;
.element-set { .element-set {
margin: 0; display: grid;
grid-template-columns: repeat(8, var(--sp-xxxl));
column-gap: var(--sp-xs);
}
.element-title {
grid-column: span 8;
} }
.title-spacing-board-grid { .title-spacing-board-grid {

11
frontend/src/app/main/ui/workspace/sidebar/options/menus/grid_cell.scss
View File

@ -12,10 +12,21 @@
gap: deprecated.$s-16; gap: deprecated.$s-16;
} }
.grid-cell-menu {
display: grid;
grid-template-columns: repeat(8, var(--sp-xxxl));
column-gap: var(--sp-xs);
}
.grid-cell-menu-title { .grid-cell-menu-title {
grid-column: span 8;
font-size: deprecated.$fs-11; font-size: deprecated.$fs-11;
} }
.grid-cell-menu-container {
grid-column: span 8;
}
.row { .row {
@include deprecated.flexRow; @include deprecated.flexRow;
} }

9
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss
View File

@ -5,7 +5,6 @@
// Copyright (c) KALEIDOS INC // Copyright (c) KALEIDOS INC
// TODO: When button replace remove this @use // TODO: When button replace remove this @use
@use "refactor/common-refactor.scss" as deprecated;
@use "ds/_utils.scss" as *; @use "ds/_utils.scss" as *;
@use "ds/_sizes.scss" as *; @use "ds/_sizes.scss" as *;
@use "ds/_borders.scss" as *; @use "ds/_borders.scss" as *;
@ -14,7 +13,13 @@
@use "ds/mixins.scss" as *; @use "ds/mixins.scss" as *;
.element-set { .element-set {
margin: 0; display: grid;
grid-template-columns: repeat(8, var(--sp-xxxl));
column-gap: var(--sp-xs);
}
.element-title {
grid-column: span 8;
} }
.title-spacing-layout { .title-spacing-layout {

7
frontend/src/app/main/ui/workspace/sidebar/options/menus/text.scss
View File

@ -7,14 +7,17 @@
@use "refactor/common-refactor.scss" as deprecated; @use "refactor/common-refactor.scss" as deprecated;
.element-set { .element-set {
margin: 0; display: grid;
grid-template-columns: repeat(8, var(--sp-xxxl));
column-gap: var(--sp-xs);
} }
.element-title { .element-title {
margin: 0; grid-column: span 8;
} }
.element-content { .element-content {
grid-column: span 8;
@include deprecated.flexColumn; @include deprecated.flexColumn;
margin-top: deprecated.$s-4; margin-top: deprecated.$s-4;
} }