3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-19 02:47:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Alejandro Alonso 2024-09-24 09:42:56 +02:00
commit 21aa8b0703
9 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/main/ui/ds/tab_switcher.cljs
View file

@ -118,9 +118,9 @@
(mf/defc tab-switcher*
{::mf/props :obj
::mf/schema schema:tab-switcher}
[{:keys [tabs class on-change-tab default-selected action-button-position action-button] :rest props}]
(let [selected* (mf/use-state #(get-selected-tab-id tabs default-selected))
selected (deref selected*)
[{:keys [tabs class on-change-tab default-selected selected action-button-position action-button] :rest props}]
(let [selected* (mf/use-state #(or selected (get-selected-tab-id tabs default-selected)))
selected (or selected (deref selected*))
tabs-nodes-refs (mf/use-ref nil)
tabs-ref (mf/use-ref nil)

4
frontend/src/app/main/ui/export.cljs
View file

@ -369,7 +369,9 @@
selected (:selected state)
status (:status state)
;; We've deprecated the merge option on non-binary files because it wasn't working
;; and we're planning to remove this export in future releases.
export-types (if binary? export-types [:all :detach])
start-export
(mf/use-fn

2
frontend/src/app/main/ui/onboarding/team_choice.cljs
View file

@ -57,7 +57,7 @@
(def ^:private schema:invite-form
[:map {:title "InviteForm"}
[:role :keyword]
[:emails [::sm/set {:kind ::sm/email}]]])
[:emails {:optional true} [::sm/set {:kind ::sm/email}]]])
(defn- get-available-roles
[]

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

@ -244,7 +244,8 @@
(fn [result]
(reset! images-data* result)))))
[:div {:class (stl/css :element-options)}
[:div {:class (stl/css-case :element-options true
:viewer-code-block (= :viewer from))}
[:div {:class (stl/css :attributes-block)}
[:button {:class (stl/css :download-button)
:on-click handle-copy-all-code}

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

@ -9,7 +9,7 @@
.element-options {
display: flex;
flex-direction: column;
height: calc(100vh - #{$s-128}); // TODO: Fix this hardcoded value
height: calc(100vh - #{$s-160}); // TODO: Fix this hardcoded value
overflow: hidden;
padding-bottom: $s-16;
overflow-y: auto;
@ -17,6 +17,10 @@
scrollbar-gutter: stable;
}
.viewer-code-block {
height: calc(100vh - #{$s-108}); // TODO: Fix this hardcoded value
}
.download-button {
@extend .button-secondary;
@include uppercaseTitleTipography;

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

@ -136,7 +136,8 @@
:else
[:div {:class (stl/css :settings-bar-content)}
[:> tab-switcher* {:tabs tabs
:default-selected (dm/str section)
:default-selected "layers"
:selected (name section)
:on-change-tab on-tab-change
:class (stl/css :left-sidebar-tabs)
:action-button-position "start"