Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-24 23:49:45 -05:00
Code Issues Activity

🐛 Fix problem with shortcut colors and colorpicker

Browse source
This commit is contained in:
alonso.torres 2024-02-05 14:41:59 +01:00 • committed by Andrey Antukh
parent b8b40fc7ef
commit 512e9b2070
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frontend/src/app/util/color.cljs
View file

@ -37,14 +37,19 @@
;; TODO: REMOVE `VALUE` WHEN COLOR IS INTEGRATED ;; TODO: REMOVE `VALUE` WHEN COLOR IS INTEGRATED
(defn color->background [{:keys [color opacity gradient value]}] (defn color->background [{:keys [color opacity gradient value]}]
(let [color (or color value) (let [color (d/nilv color value)
opacity (or opacity 1)] opacity (or opacity 1)]
(cond (cond
(and gradient (not= :multiple gradient)) (and gradient (not= :multiple gradient))
(gradient->css gradient) (gradient->css gradient)
(not= color :multiple) (and (some? color) (not= color :multiple))
(let [[r g b] (cc/hex->rgb (or color value))] (let [color
(-> (str/replace color "#" "")
(cc/expand-hex)
(cc/prepend-hash))
[r g b] (cc/hex->rgb color)]
(str/fmt "rgba(%s, %s, %s, %s)" r g b opacity)) (str/fmt "rgba(%s, %s, %s, %s)" r g b opacity))
:else "transparent"))) :else "transparent")))