github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-23 22:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix main toolbar overlaps grid edition bar (#10789)

Browse Source
This commit is contained in:
Luis de Dios 2026-07-23 10:25:47 +02:00 committed by GitHub
parent 4900d4b24a
commit c57f90d4a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs
View File

@ -28,6 +28,7 @@
[app.main.refs :as refs]
[app.main.store :as st]
[app.main.ui.css-cursors :as cur]
[app.main.ui.ds.buttons.button :refer [button*]]
[app.main.ui.formats :as fmt]
[app.main.ui.icons :as deprecated-icon]
[app.main.ui.workspace.viewport.viewport-ref :as uwvv]
@ -52,18 +53,17 @@
:flex (dm/str (fmt/format-number value) "FR")
:auto "AUTO"))
(mf/defc grid-edition-actions
{::mf/wrap-props false}
(mf/defc grid-edition-actions*
[{:keys [shape]}]
[:div {:class (stl/css :grid-actions)}
[:div {:class (stl/css :grid-actions-container)}
[:div {:class (stl/css :grid-actions-title)}
(tr "workspace.layout-grid.editor.title") " " [:span {:stl/css :board-name} (:name shape)]]
[:button {:class (stl/css :locate-btn)
:on-click #(st/emit! (dwge/locate-board (:id shape)))}
[:> button* {:variant "secondary"
:on-click #(st/emit! (dwge/locate-board (:id shape)))}
(tr "workspace.layout-grid.editor.top-bar.locate")]
[:button {:class (stl/css :done-btn)
:on-click #(st/emit! (dw/clear-edition-mode))}
[:> button* {:variant "primary"
:on-click #(st/emit! (dw/clear-edition-mode))}
(tr "workspace.layout-grid.editor.top-bar.done")]]])
(mf/defc grid-editor-frame

19
frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss
View File

@ -5,6 +5,7 @@
// Copyright (c) KALEIDOS INC Sucursal en España SL
@use "refactor/common-refactor.scss" as deprecated;
@use "ds/z-index.scss" as *;
.grid-track-marker {
.marker-shape {
@ -123,7 +124,7 @@
position: absolute;
top: deprecated.$s-44;
left: 50%;
z-index: deprecated.$z-index-20;
z-index: var(--z-index-notifications);
}
.grid-actions-container {
@ -148,22 +149,6 @@
padding-left: deprecated.$s-8;
}
.locate-btn {
@extend %button-secondary;
text-transform: uppercase;
padding: deprecated.$s-8 deprecated.$s-20;
font-size: deprecated.$fs-11;
}
.done-btn {
@extend %button-primary;
text-transform: uppercase;
padding: deprecated.$s-8 deprecated.$s-20;
font-size: deprecated.$fs-11;
}
.close-btn {
@extend %button-tertiary;

4
frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
View File

@ -12,7 +12,7 @@
[app.main.refs :as refs]
[app.main.store :as st]
[app.main.ui.ds.buttons.button :refer [button*]]
[app.main.ui.workspace.viewport.grid-layout-editor :refer [grid-edition-actions]]
[app.main.ui.workspace.viewport.grid-layout-editor :refer [grid-edition-actions*]]
[app.main.ui.workspace.viewport.path-actions :refer [path-actions*]]
[app.util.i18n :as i18n :refer [tr]]
[rumext.v2 :as mf]))
@ -55,4 +55,4 @@
(mf/defc grid-edition-bar*
[{:keys [shape]}]
[:& grid-edition-actions {:shape shape}])
[:> grid-edition-actions* {:shape shape}])