mirror of
https://github.com/penpot/penpot.git
synced 2025-03-16 17:51:18 -05:00
🐛 Fix regresion on icon* id because of token merge
This commit is contained in:
parent
decec5d152
commit
0d9db14293
7 changed files with 12 additions and 13 deletions
frontend/src/app/main/ui
ds/notifications
workspace
|
@ -38,7 +38,7 @@
|
||||||
props (mf/spread-props props {:class class})]
|
props (mf/spread-props props {:class class})]
|
||||||
[:> "aside" props
|
[:> "aside" props
|
||||||
[:*
|
[:*
|
||||||
[:> i/icon* {:id icon-id :class (stl/css :icon)}]
|
[:> i/icon* {:icon-id icon-id :class (stl/css :icon)}]
|
||||||
children
|
children
|
||||||
;; TODO: this should be a buttom from the DS, but this variant is not designed yet.
|
;; TODO: this should be a buttom from the DS, but this variant is not designed yet.
|
||||||
;; https://tree.taiga.io/project/penpot/task/8492
|
;; https://tree.taiga.io/project/penpot/task/8492
|
||||||
|
|
|
@ -150,7 +150,7 @@
|
||||||
(mf/html
|
(mf/html
|
||||||
[:span {:class (stl/css :title-name)}
|
[:span {:class (stl/css :title-name)}
|
||||||
[:span {:class (stl/css :section-icon)}
|
[:span {:class (stl/css :section-icon)}
|
||||||
[:> icon* {:id (or icon (section-icon section)) :size "s"}]]
|
[:> icon* {:icon-id (or icon (section-icon section)) :size "s"}]]
|
||||||
[:span {:class (stl/css :section-name)}
|
[:span {:class (stl/css :section-name)}
|
||||||
title]
|
title]
|
||||||
|
|
||||||
|
|
|
@ -192,9 +192,9 @@
|
||||||
[:button {:class (stl/css :version-entry-snapshots)
|
[:button {:class (stl/css :version-entry-snapshots)
|
||||||
:aria-label (tr "workspace.versions.expand-snapshot")
|
:aria-label (tr "workspace.versions.expand-snapshot")
|
||||||
:on-click handle-toggle-expand}
|
:on-click handle-toggle-expand}
|
||||||
[:> i/icon* {:id i/clock :class (stl/css :icon-clock)}]
|
[:> i/icon* {:icon-id i/clock :class (stl/css :icon-clock)}]
|
||||||
(tr "workspace.versions.autosaved.entry" (count (:snapshots entry)))
|
(tr "workspace.versions.autosaved.entry" (count (:snapshots entry)))
|
||||||
[:> i/icon* {:id i/arrow :class (stl/css :icon-arrow)}]]
|
[:> i/icon* {:icon-id i/arrow :class (stl/css :icon-arrow)}]]
|
||||||
|
|
||||||
[:ul {:class (stl/css :version-snapshot-list)}
|
[:ul {:class (stl/css :version-snapshot-list)}
|
||||||
(for [[idx snapshot] (d/enumerate (:snapshots entry))]
|
(for [[idx snapshot] (d/enumerate (:snapshots entry))]
|
||||||
|
@ -358,7 +358,7 @@
|
||||||
|
|
||||||
(if (empty? data)
|
(if (empty? data)
|
||||||
[:div {:class (stl/css :versions-entry-empty)}
|
[:div {:class (stl/css :versions-entry-empty)}
|
||||||
[:div {:class (stl/css :versions-entry-empty-icon)} [:> i/icon* {:id i/history}]]
|
[:div {:class (stl/css :versions-entry-empty-icon)} [:> i/icon* {:icon-id i/history}]]
|
||||||
[:div {:class (stl/css :versions-entry-empty-msg)} (tr "workspace.versions.empty")]]
|
[:div {:class (stl/css :versions-entry-empty-msg)} (tr "workspace.versions.empty")]]
|
||||||
|
|
||||||
[:ul {:class (stl/css :versions-entries)}
|
[:ul {:class (stl/css :versions-entries)}
|
||||||
|
|
|
@ -298,7 +298,7 @@
|
||||||
:on-pointer-enter on-pointer-enter
|
:on-pointer-enter on-pointer-enter
|
||||||
:on-pointer-leave on-pointer-leave}
|
:on-pointer-leave on-pointer-leave}
|
||||||
(when selected?
|
(when selected?
|
||||||
[:> icon* {:id "tick" :size "s" :class (stl/css :icon-wrapper)}])
|
[:> icon* {:icon-id "tick" :size "s" :class (stl/css :icon-wrapper)}])
|
||||||
[:span {:class (stl/css-case :item-text true
|
[:span {:class (stl/css-case :item-text true
|
||||||
:item-with-icon-space (and
|
:item-with-icon-space (and
|
||||||
(not selected?)
|
(not selected?)
|
||||||
|
@ -306,7 +306,7 @@
|
||||||
title]
|
title]
|
||||||
(when children
|
(when children
|
||||||
[:*
|
[:*
|
||||||
[:> icon* {:id "arrow" :size "s"}]
|
[:> icon* {:icon-d "arrow" :size "s"}]
|
||||||
[:ul {:class (stl/css :token-context-submenu)
|
[:ul {:class (stl/css :token-context-submenu)
|
||||||
:data-direction submenu-direction
|
:data-direction submenu-direction
|
||||||
:ref submenu-ref
|
:ref submenu-ref
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
{:aria-label aria-label
|
{:aria-label aria-label
|
||||||
:class (stl/css :check-icon)
|
:class (stl/css :check-icon)
|
||||||
:size "s"
|
:size "s"
|
||||||
:id (if mixed? ic/remove ic/tick)}])]))
|
:icon-id (if mixed? ic/remove ic/tick)}])]))
|
||||||
|
|
||||||
(mf/defc sets-tree-set-group
|
(mf/defc sets-tree-set-group
|
||||||
[{:keys [label tree-depth tree-path active? selected? collapsed? editing? on-toggle on-edit on-edit-reset on-edit-submit]}]
|
[{:keys [label tree-depth tree-path active? selected? collapsed? editing? on-toggle on-edit on-edit-reset on-edit-submit]}]
|
||||||
|
|
|
@ -46,9 +46,8 @@
|
||||||
|
|
||||||
;; Components ------------------------------------------------------------------
|
;; Components ------------------------------------------------------------------
|
||||||
|
|
||||||
(mf/defc token-section-icon
|
(defn token-section-icon
|
||||||
{::mf/wrap-props false}
|
[type]
|
||||||
[{:keys [type]}]
|
|
||||||
(case type
|
(case type
|
||||||
:border-radius "corner-radius"
|
:border-radius "corner-radius"
|
||||||
:color "drop"
|
:color "drop"
|
||||||
|
|
|
@ -49,11 +49,11 @@
|
||||||
:mini true}]
|
:mini true}]
|
||||||
errors?
|
errors?
|
||||||
[:> icon*
|
[:> icon*
|
||||||
{:id "broken-link"
|
{:icon-id "broken-link"
|
||||||
:class (stl/css :token-pill-icon)}]
|
:class (stl/css :token-pill-icon)}]
|
||||||
|
|
||||||
:else
|
:else
|
||||||
[:> token-status-icon*
|
[:> token-status-icon*
|
||||||
{:id token-status-id
|
{:icon-id token-status-id
|
||||||
:class (stl/css :token-pill-icon)}])
|
:class (stl/css :token-pill-icon)}])
|
||||||
name]))
|
name]))
|
Loading…
Add table
Reference in a new issue