Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-06 14:50:20 -05:00
Code Issues Activity

🐛 fix color-bullet props error

Browse source
This commit is contained in:
Xaviju 2024-12-13 10:59:59 +01:00 committed by Xaviju
parent 0fafc52ea4
commit 8a4fbf385c
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/app/main/ui/dashboard/grid.cljs
View file

@ -189,7 +189,7 @@
[:& bc/color-bullet {:color {:color (:color color) [:& bc/color-bullet {:color {:color (:color color)
:id (:id color) :id (:id color)
:opacity (:opacity color)} :opacity (:opacity color)}
:mini? true}] :mini true}]
[:div {:class (stl/css :name-block)} [:div {:class (stl/css :name-block)}
[:span {:class (stl/css :color-name)} (:name color)] [:span {:class (stl/css :color-name)} (:name color)]
(when-not (= (:name color) default-name) (when-not (= (:name color) default-name)

4
frontend/src/app/main/ui/viewer/inspect/attributes/common.cljs
View file

@ -70,7 +70,7 @@
[:div {:class (stl/css :bullet-wrapper) [:div {:class (stl/css :bullet-wrapper)
:style #js {"--bullet-size" "16px"}} :style #js {"--bullet-size" "16px"}}
[:& cb/color-bullet {:color color [:& cb/color-bullet {:color color
:mini? true}]] :mini true}]]
[:div {:class (stl/css :format-wrapper)} [:div {:class (stl/css :format-wrapper)}
[:div {:class (stl/css :image-format)} [:div {:class (stl/css :image-format)}
@ -102,7 +102,7 @@
[:div {:class (stl/css :bullet-wrapper) [:div {:class (stl/css :bullet-wrapper)
:style #js {"--bullet-size" "16px"}} :style #js {"--bullet-size" "16px"}}
[:& cb/color-bullet {:color color [:& cb/color-bullet {:color color
:mini? true}]] :mini true}]]
[:div {:class (stl/css :format-wrapper)} [:div {:class (stl/css :format-wrapper)}
(when-not (and on-change-format (or (:gradient color) image)) (when-not (and on-change-format (or (:gradient color) image))

6
frontend/src/app/main/ui/workspace/color_palette_ctx_menu.cljs
View file

@ -44,7 +44,7 @@
:style #js {"--bullet-size" "20px"}} :style #js {"--bullet-size" "20px"}}
(for [[i {:keys [color id gradient]}] (map-indexed vector (take 7 colors))] (for [[i {:keys [color id gradient]}] (map-indexed vector (take 7 colors))]
[:& cb/color-bullet {:key (dm/str "color-" i) [:& cb/color-bullet {:key (dm/str "color-" i)
:mini? true :mini true
:color {:color color :id id :gradient gradient}}])]]])) :color {:color color :id id :gradient gradient}}])]]]))
[:li {:class (stl/css-case :file-library true [:li {:class (stl/css-case :file-library true
@ -68,7 +68,7 @@
:style #js {"--bullet-size" "20px"}} :style #js {"--bullet-size" "20px"}}
(for [[i color] (map-indexed vector (take 7 (vals file-colors)))] (for [[i color] (map-indexed vector (take 7 (vals file-colors)))]
[:& cb/color-bullet {:key (dm/str "color-" i) [:& cb/color-bullet {:key (dm/str "color-" i)
:mini? true :mini true
:color color}])]]] :color color}])]]]
[:li {:class (stl/css :recent-colors true [:li {:class (stl/css :recent-colors true
@ -90,5 +90,5 @@
:style #js {"--bullet-size" "20px"}} :style #js {"--bullet-size" "20px"}}
(for [[idx color] (map-indexed vector (take 7 (reverse recent-colors)))] (for [[idx color] (map-indexed vector (take 7 (reverse recent-colors)))]
[:& cb/color-bullet {:key (str "color-" idx) [:& cb/color-bullet {:key (str "color-" idx)
:mini? true :mini true
:color color}])]]]]])) :color color}])]]]]]))

2
frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs
View file

@ -216,7 +216,7 @@
[:div {:class (stl/css :bullet-block)} [:div {:class (stl/css :bullet-block)}
[:& cb/color-bullet {:color color [:& cb/color-bullet {:color color
:mini? true}]] :mini true}]]
(if ^boolean editing? (if ^boolean editing?
[:input [:input

2
frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
View file

@ -212,7 +212,7 @@
(nil? color-name) (assoc (nil? color-name) (assoc
:id nil :id nil
:file-id nil)) :file-id nil))
:mini? true :mini true
:on-click handle-click-color}]] :on-click handle-click-color}]]
(cond (cond
;; Rendering a color with ID ;; Rendering a color with ID

2
frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
View file

@ -73,7 +73,7 @@
(wtt/resolved-value-hex theme-token) (wtt/resolved-value-hex theme-token)
(wtt/resolved-value-hex token))] (wtt/resolved-value-hex token))]
[:& color-bullet {:color color [:& color-bullet {:color color
:mini? true}]) :mini true}])
name])) name]))
(mf/defc token-section-icon (mf/defc token-section-icon