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

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

Browse source
This commit is contained in:
Andrey Antukh 2023-07-31 12:33:54 +02:00
commit 228b09c340
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/src/app/common/types/grid.cljc
View file

@ -21,7 +21,7 @@
(sm/def! ::column-params (sm/def! ::column-params
[:map [:map
[:color ::grid-color] [:color ::grid-color]
[:type [::sm/one-of #{:stretch :left :center :right}]] [:type {:optional true} [::sm/one-of #{:stretch :left :center :right}]]
[:size {:optional true} [:maybe ::sm/safe-number]] [:size {:optional true} [:maybe ::sm/safe-number]]
[:margin {:optional true} [:maybe ::sm/safe-number]] [:margin {:optional true} [:maybe ::sm/safe-number]]
[:item-length {:optional true} [:maybe ::sm/safe-number]] [:item-length {:optional true} [:maybe ::sm/safe-number]]

6
common/src/app/common/types/shape.cljc
View file

@ -100,7 +100,7 @@
[:vector {:gen/max 4 :gen/min 4} ::gpt/point]) [:vector {:gen/max 4 :gen/min 4} ::gpt/point])
(sm/def! ::fill (sm/def! ::fill
[:map {:title "Fill" :min 1} [:map {:title "Fill"}
[:fill-color {:optional true} ::ctc/rgb-color] [:fill-color {:optional true} ::ctc/rgb-color]
[:fill-opacity {:optional true} ::sm/safe-number] [:fill-opacity {:optional true} ::sm/safe-number]
[:fill-color-gradient {:optional true} ::ctc/gradient] [:fill-color-gradient {:optional true} ::ctc/gradient]
@ -201,7 +201,7 @@
(sm/def! ::group-attrs (sm/def! ::group-attrs
[:map {:title "GroupAttrs"} [:map {:title "GroupAttrs"}
[:type [:= :group]] [:type [:= :group]]
[:shapes [:vector {:min 1 :gen/max 10 :gen/min 1} ::sm/uuid]]]) [:shapes [:vector {:gen/max 10 :gen/min 1} ::sm/uuid]]])
(sm/def! ::frame-attrs (sm/def! ::frame-attrs
[:map {:title "FrameAttrs"} [:map {:title "FrameAttrs"}
@ -214,7 +214,7 @@
(sm/def! ::bool-attrs (sm/def! ::bool-attrs
[:map {:title "BoolAttrs"} [:map {:title "BoolAttrs"}
[:type [:= :bool]] [:type [:= :bool]]
[:shapes [:vector {:min 1 :gen/max 10 :gen/min 1} ::sm/uuid]] [:shapes [:vector {:gen/max 10 :gen/min 1} ::sm/uuid]]
;; FIXME: improve this schema ;; FIXME: improve this schema
[:bool-type :keyword] [:bool-type :keyword]