3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-03 09:51:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2023-05-24 11:00:54 +02:00
commit 2801431fab
11 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/main/data/workspace/shapes.cljs
View file

@ -334,9 +334,11 @@
(->> (map :id starting-flows)
(reduce ctp/remove-flow flows))))))]
(rx/of (dc/detach-comment-thread ids)
(rx/of (dwu/start-undo-transaction undo-id)
(dc/detach-comment-thread ids)
(dch/commit-changes changes)
(ptk/data-event :layout/update all-parents)
(dch/commit-changes changes))))
(dwu/commit-undo-transaction undo-id))))
(defn create-and-add-shape
[type frame-x frame-y data]

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

@ -1316,7 +1316,8 @@
:auto-focus true
:default-value (cph/merge-path-item (:path color) (:name color))}]
[:div.name-block {:on-double-click rename-color-clicked}
[:div.name-block {:title (:name color)
:on-double-click rename-color-clicked}
(:name color)
(when-not (= (:name color) default-name)
[:span default-name])])

4
frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
View file

@ -509,7 +509,7 @@
:font-weight (:font-weight typography)
:font-style (:font-style typography)}}
(tr "workspace.assets.typography.sample")]
[:div.typography-name (:name typography)]]
[:div.typography-name {:title (:name typography)}(:name typography)]]
[:div.element-set-actions
(when on-detach
[:div.element-set-actions-button
@ -527,7 +527,7 @@
(if (not editable?)
[:div.element-set-content.typography-read-only-data
[:div.row-flex.typography-name
[:span (:name typography)]]
[:span {:title (:name typography)} (:name typography)]]
[:div.row-flex
[:span.label (tr "workspace.assets.typography.font-id")]

3
frontend/src/app/main/ui/workspace/textpalette.cljs
View file

@ -42,7 +42,8 @@
:attrs attrs}))
selected-ids))))]
[:div.typography-item {:on-click handle-click}
[:div.typography-item {:title (:name typography)
:on-click handle-click}
[:div.typography-name
{:style {:font-family (:font-family typography)
:font-weight (:font-weight typography)

5
frontend/src/app/main/ui/workspace/viewport/actions.cljs
View file

@ -361,9 +361,10 @@
(fn [event]
(let [event (.getBrowserEvent ^js event)
target (dom/get-target event)
mod? (kbd/mod? event)]
mod? (kbd/mod? event)
picking-color? (= "pixel-overlay" (.-id target))]
(when (uwvv/inside-viewport? target)
(when (or (uwvv/inside-viewport? target) picking-color?)
(dom/prevent-default event)
(dom/stop-propagation event)
(let [raw-pt (dom/get-client-position event)

3
frontend/src/app/main/ui/workspace/viewport/pixel_overlay.cljs
View file

@ -211,7 +211,8 @@
[:*
[:div.pixel-overlay
{:tab-index 0
{:id "pixel-overlay"
:tab-index 0
:style {:cursor cur/picker}
:on-pointer-down handle-pointer-down-picker
:on-pointer-up handle-pointer-up-picker

2
frontend/src/app/util/code_gen.cljs
View file

@ -95,7 +95,7 @@
:height #(get-size :height %)}
:multi {:r1 [:r1 :r2 :r3 :r4]}}
:fill {:props [:fills]
:to-prop {:fills (if (> (count (:fills shape)) 1) "background-image" "background")}
:to-prop {:fills (if (> (count (:fills shape)) 1) "background-image" "background-color")}
:format {:fills format-fill-color}}
:stroke {:props [:strokes]
:to-prop {:strokes "border"}