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

🐛 [LIBRARIES & TEMPLATES] Missing fills and texts

Browse source
This commit is contained in:
Alejandro Alonso 2022-04-08 09:30:49 +02:00 • committed by Andrés Moya
parent 62f55a47c5
commit c766e08027
6 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
frontend/src/app/main/render.cljs
View file

@ -234,7 +234,8 @@
:xmlns:penpot (when include-metadata? "https://penpot.app/xmlns") :xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")
:style {:width "100%" :style {:width "100%"
:height "100%" :height "100%"
:background bgcolor}} :background bgcolor}
:fill "none"}
(when include-metadata? (when include-metadata?
[:& export/export-page {:options (:options data)}]) [:& export/export-page {:options (:options data)}])
@ -300,7 +301,8 @@
:version "1.1" :version "1.1"
:xmlns "http://www.w3.org/2000/svg" :xmlns "http://www.w3.org/2000/svg"
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlnsXlink "http://www.w3.org/1999/xlink"
:xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")} :xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")
:fill "none"}
(if (or (not show-thumbnails?) (nil? (:thumbnail frame))) (if (or (not show-thumbnails?) (nil? (:thumbnail frame)))
[:& wrapper {:shape frame :view-box vbox}] [:& wrapper {:shape frame :view-box vbox}]
@ -352,7 +354,8 @@
:version "1.1" :version "1.1"
:xmlns "http://www.w3.org/2000/svg" :xmlns "http://www.w3.org/2000/svg"
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlnsXlink "http://www.w3.org/1999/xlink"
:xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")} :xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")
:fill "none"}
[:> shape-container {:shape group} [:> shape-container {:shape group}
[:& group-wrapper {:shape group :view-box vbox}]]])) [:& group-wrapper {:shape group :view-box vbox}]]]))
@ -399,7 +402,8 @@
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlnsXlink "http://www.w3.org/1999/xlink"
;; Fix Chromium bug about color of html texts ;; Fix Chromium bug about color of html texts
;; https://bugs.chromium.org/p/chromium/issues/detail?id=1244560#c5 ;; https://bugs.chromium.org/p/chromium/issues/detail?id=1244560#c5
:style {:-webkit-print-color-adjust :exact}} :style {:-webkit-print-color-adjust :exact}
:fill "none"}
(let [shapes (cph/get-children objects obj-id)] (let [shapes (cph/get-children objects obj-id)]
[:& ff/fontfaces-style {:shapes shapes}]) [:& ff/fontfaces-style {:shapes shapes}])
@ -421,7 +425,8 @@
:height (:height object) :height (:height object)
:version "1.1" :version "1.1"
:xmlns "http://www.w3.org/2000/svg" :xmlns "http://www.w3.org/2000/svg"
:xmlnsXlink "http://www.w3.org/1999/xlink"} :xmlnsXlink "http://www.w3.org/1999/xlink"
:fill "none"}
[:& shape-wrapper {:shape (assoc object :x 0 :y 0)}]]]))])) [:& shape-wrapper {:shape (assoc object :x 0 :y 0)}]]]))]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -464,7 +469,8 @@
:xmlns "http://www.w3.org/2000/svg" :xmlns "http://www.w3.org/2000/svg"
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlnsXlink "http://www.w3.org/1999/xlink"
:xmlns:penpot (when include-metadata? "https://penpot.app/xmlns") :xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")
:style {:display (when-not (some? children) "none")}} :style {:display (when-not (some? children) "none")}
:fill "none"}
[:defs [:defs
(for [[id data] (:components data)] (for [[id data] (:components data)]
[:& component-symbol {:id id :key (dm/str id) :data data}])] [:& component-symbol {:id id :key (dm/str id) :data data}])]

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

@ -104,7 +104,8 @@
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlnsXlink "http://www.w3.org/1999/xlink"
;; Fix Chromium bug about color of html texts ;; Fix Chromium bug about color of html texts
;; https://bugs.chromium.org/p/chromium/issues/detail?id=1244560#c5 ;; https://bugs.chromium.org/p/chromium/issues/detail?id=1244560#c5
:style {:-webkit-print-color-adjust :exact}} :style {:-webkit-print-color-adjust :exact}
:fill "none"}
[:& shape-wrapper {:shape shape}]])] [:& shape-wrapper {:shape shape}]])]

5
frontend/src/app/main/ui/shapes/custom_stroke.cljs
View file

@ -380,7 +380,10 @@
(cond-> (obj/merge! props fill-props) (cond-> (obj/merge! props fill-props)
(some? style) (some? style)
(obj/set! "style" style)))))) (obj/set! "style" style)))
:else
props)))
(defn build-stroke-props [position child value render-id] (defn build-stroke-props [position child value render-id]
(let [props (-> (obj/get child "props") (let [props (-> (obj/get child "props")

3
frontend/src/app/main/ui/viewer/handoff/render.cljs
View file

@ -215,7 +215,8 @@
:height height :height height
:version "1.1" :version "1.1"
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlnsXlink "http://www.w3.org/1999/xlink"
:xmlns "http://www.w3.org/2000/svg"} :xmlns "http://www.w3.org/2000/svg"
:fill "none"}
[:& render {:shape frame :view-box vbox}] [:& render {:shape frame :view-box vbox}]
[:& selection-feedback [:& selection-feedback

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

@ -94,7 +94,8 @@
:height (:height size) :height (:height size)
:version "1.1" :version "1.1"
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlnsXlink "http://www.w3.org/1999/xlink"
:xmlns "http://www.w3.org/2000/svg"} :xmlns "http://www.w3.org/2000/svg"
:fill "none"}
[:& wrapper {:shape frame [:& wrapper {:shape frame
:view-box (:vbox size)}]]]])) :view-box (:vbox size)}]]]]))

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

@ -217,7 +217,8 @@
:height (:height vport 0) :height (:height vport 0)
:view-box (utils/format-viewbox vbox) :view-box (utils/format-viewbox vbox)
:style {:background-color background :style {:background-color background
:pointer-events "none"}} :pointer-events "none"}
:fill "none"}
(when (debug? :show-export-metadata) (when (debug? :show-export-metadata)
[:& use/export-page {:options options}]) [:& use/export-page {:options options}])