mirror of
https://github.com/penpot/penpot.git
synced 2025-05-11 00:16:38 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
e362f423c0
3 changed files with 4 additions and 3 deletions
|
@ -26,7 +26,7 @@
|
|||
[rumext.v2 :as mf]))
|
||||
|
||||
(mf/defc options*
|
||||
[{:keys [shape file-id shapes-with-children shared-libs] :as props}]
|
||||
[{:keys [shape file-id shapes-with-children libraries] :as props}]
|
||||
(let [shape-id (dm/get-prop shape :id)
|
||||
shape-type (dm/get-prop shape :type)
|
||||
|
||||
|
@ -125,7 +125,7 @@
|
|||
[:> color-selection-menu* {:type shape-type
|
||||
:shapes shapes-with-children
|
||||
:file-id file-id
|
||||
:libraries shared-libs}]
|
||||
:libraries libraries}]
|
||||
[:> shadow-menu* {:ids ids :values (get shape :shadow)}]
|
||||
[:& blur-menu {:ids ids
|
||||
:values (select-keys shape [:blur])}]
|
||||
|
|
|
@ -292,7 +292,7 @@
|
|||
|
||||
page-id (unchecked-get props "page-id")
|
||||
file-id (unchecked-get props "file-id")
|
||||
shared-libs (unchecked-get props "shared-libs")
|
||||
shared-libs (unchecked-get props "libraries")
|
||||
|
||||
show-caps (some #(and (= :path (:type %)) (gsh/open-path? %)) shapes)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue