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

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

Browse source
This commit is contained in:
Alejandro Alonso 2022-06-15 12:00:14 +02:00
commit 5e2a7e76f3
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/util/import/parser.cljs
View file

@ -421,7 +421,6 @@
[props node svg-data]
(let [fill (:fill svg-data)
hide-fill-on-export (get-meta node :hide-fill-on-export str->bool)
fill-color-ref-id (get-meta node :fill-color-ref-id uuid/uuid)
fill-color-ref-file (get-meta node :fill-color-ref-file uuid/uuid)
meta-fill-color (get-meta node :fill-color)
@ -455,9 +454,6 @@
(assoc :fill-color fill
:fill-opacity (-> svg-data (:fill-opacity "1") d/parse-double))
(some? hide-fill-on-export)
(assoc :hide-fill-on-export hide-fill-on-export)
(some? fill-color-ref-id)
(assoc :fill-color-ref-id fill-color-ref-id
:fill-color-ref-file fill-color-ref-file))))
@ -884,6 +880,8 @@
(assoc :fills (parse-fills node svg-data))
(assoc :strokes (parse-strokes node svg-data))
(assoc :hide-fill-on-export (get-meta node :hide-fill-on-export str->bool))
(cond-> (= :svg-raw type)
(add-svg-content node))