github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-09 13:39:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5394 from Friendly-Pixel/color_bullet_title

Browse Source 
✨ Add path to color bullet title
This commit is contained in:
Andrey Antukh 2024-11-29 10:22:00 +01:00 committed by GitHub
commit ad421c3bcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/main/ui/components/color_bullet.cljs
View File

@ -16,6 +16,8 @@
(defn- color-title (defn- color-title
[color-item] [color-item]
(let [name (:name color-item) (let [name (:name color-item)
path (:path color-item)
path-and-name (if path (str path " / " name) name)
gradient (:gradient color-item) gradient (:gradient color-item)
image (:image color-item) image (:image color-item)
color (:color color-item)] color (:color color-item)]
@ -23,16 +25,16 @@
(if (some? name) (if (some? name)
(cond (cond
(some? color) (some? color)
(str/ffmt "% (%)" name color) (str/ffmt "% (%)" path-and-name color)
(some? gradient) (some? gradient)
(str/ffmt "% (%)" name (uc/gradient-type->string (:type gradient))) (str/ffmt "% (%)" path-and-name (uc/gradient-type->string (:type gradient)))
(some? image) (some? image)
(str/ffmt "% (%)" name (tr "media.image")) (str/ffmt "% (%)" path-and-name (tr "media.image"))
:else :else
name) path-and-name)
(cond (cond
(some? color) (some? color)