3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-29 17:56:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3983 from penpot/alotor-bugfixes-4

Browse source 
Alotor bugfixes 4
This commit is contained in:
Eva Marco 2024-01-08 18:50:12 +01:00 • committed by GitHub
commit 5a012d4e33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/main/ui/viewer/inspect/code.cljs
View file

@ -240,7 +240,8 @@
[:button.download-button {:on-click handle-open-review} [:button.download-button {:on-click handle-open-review}
"Preview"]] "Preview"]]
[:div {:class (stl/css :code-block)} [:div {:class (stl/css-case :code-block true
:collapsed collapsed-css?)}
[:div {:class (stl/css :code-row-lang)} [:div {:class (stl/css :code-row-lang)}
[:button {:class (stl/css :toggle-btn) [:button {:class (stl/css :toggle-btn)
:data-type "css" :data-type "css"
@ -274,7 +275,8 @@
:on-lost-pointer-capture on-style-lost-pointer-capture :on-lost-pointer-capture on-style-lost-pointer-capture
:on-pointer-move on-style-pointer-move}]] :on-pointer-move on-style-pointer-move}]]
[:div {:class (stl/css :code-block)} [:div {:class (stl/css-case :code-block true
:collapsed collapsed-markup?)}
[:div {:class (stl/css :code-row-lang)} [:div {:class (stl/css :code-row-lang)}
[:button {:class (stl/css :toggle-btn) [:button {:class (stl/css :toggle-btn)
:data-type "markup" :data-type "markup"

6
frontend/src/app/main/ui/viewer/inspect/code.scss
View file

@ -26,7 +26,6 @@
@include codeTypography; @include codeTypography;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1;
height: 100%; height: 100%;
min-height: 0; min-height: 0;
overflow: hidden; overflow: hidden;
@ -35,7 +34,6 @@
pre { pre {
border-radius: $br-8; border-radius: $br-8;
padding: $s-16; padding: $s-16;
max-height: var(--code-height);
overflow: auto; overflow: auto;
height: 100%; height: 100%;
} }
@ -44,6 +42,10 @@
:global(.hljs) { :global(.hljs) {
background: $db-tertiary; background: $db-tertiary;
} }
&.collapsed {
height: initial;
}
} }
.code-row-lang { .code-row-lang {

1
frontend/src/app/main/ui/viewer/inspect/right_sidebar.scss
View file

@ -16,6 +16,7 @@
grid-area: right-sidebar; grid-area: right-sidebar;
padding-top: $s-8; padding-top: $s-8;
padding-left: $s-12; padding-left: $s-12;
overflow: hidden;
&.viewer-code { &.viewer-code {
height: calc(100vh - $s-48); height: calc(100vh - $s-48);
} }

31
frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
View file

@ -261,16 +261,29 @@
on-drop on-drop
(mf/use-fn (mf/use-fn
(mf/deps id index objects) (mf/deps id index objects expanded?)
(fn [side _data] (fn [side _data]
(let [to-index (cond (let [shape (get objects id)
parent-id
(cond
(= side :center)
id
(and expanded? (= side :bot) (d/not-empty? (:shapes shape)))
id
:else
(cfh/get-parent-id objects id))
parent (get objects parent-id)
to-index (cond
(= side :center) 0 (= side :center) 0
(and expanded? (= side :bot) (d/not-empty? (:shapes shape))) (count (:shapes parent))
(= side :top) (inc index) (= side :top) (inc index)
:else index) :else index)]
parent-id (if (= side :center)
id
(cfh/get-parent-id objects id))
parent (get objects parent-id)]
(when-not (ctk/in-component-copy? parent) ;; We don't want to change the structure of component copies (when-not (ctk/in-component-copy? parent) ;; We don't want to change the structure of component copies
(st/emit! (dw/relocate-selected-shapes parent-id to-index)))))) (st/emit! (dw/relocate-selected-shapes parent-id to-index))))))
@ -308,8 +321,8 @@
depth (+ depth 1) depth (+ depth 1)
component-tree? (or component-child? (:component-root item)) component-tree? (or component-child? (:component-root item))
enable-drag (mf/use-fn #(reset! drag-disabled* true)) enable-drag (mf/use-fn #(reset! drag-disabled* false))
disable-drag (mf/use-fn #(reset! drag-disabled* false))] disable-drag (mf/use-fn #(reset! drag-disabled* true))]
(mf/with-effect [selected? selected] (mf/with-effect [selected? selected]
(let [single? (= (count selected) 1) (let [single? (= (count selected) 1)

2
frontend/src/app/main/ui/workspace/sidebar/layer_item.scss
View file

@ -51,7 +51,7 @@
border-bottom: $s-2 solid var(--layer-row-foreground-color-hover); border-bottom: $s-2 solid var(--layer-row-foreground-color-hover);
} }
&.dnd-over-top { &.dnd-over-top {
border-bottom: $s-2 solid var(--layer-row-foreground-color-hover); border-top: $s-2 solid var(--layer-row-foreground-color-hover);
} }
&.dnd-over { &.dnd-over {
border: $s-2 solid var(--layer-row-foreground-color-hover); border: $s-2 solid var(--layer-row-foreground-color-hover);