mirror of
https://github.com/penpot/penpot.git
synced 2026-05-22 00:13:41 +00:00
🐛 Fix merge issues
This commit is contained in:
parent
7067cc2286
commit
23e77b5f03
@ -681,12 +681,12 @@
|
|||||||
(if (rx/observable? res)
|
(if (rx/observable? res)
|
||||||
res
|
res
|
||||||
(rx/of res))))
|
(rx/of res))))
|
||||||
(rx/of (dwu/commit-undo-transaction undo-id))))))))))
|
(rx/of (dwu/commit-undo-transaction undo-id)))))))))
|
||||||
|
|
||||||
(rx/of (ntf/show {:content (tr "workspace.tokens.error-text-edition")
|
(rx/of (ntf/show {:content (tr "workspace.tokens.error-text-edition")
|
||||||
:type :toast
|
:type :toast
|
||||||
:level :warning
|
:level :warning
|
||||||
:timeout 3000}))))))
|
:timeout 3000})))))))
|
||||||
|
|
||||||
(defn apply-spacing-token-separated
|
(defn apply-spacing-token-separated
|
||||||
"Handles edge-case for spacing token when applying token via toggle button.
|
"Handles edge-case for spacing token when applying token via toggle button.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user