3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-10 13:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5556 from penpot/niwinz-enhancements-3

Browse source 
✨ Minor enhancements and rumext reverts
This commit is contained in:
Alejandro 2025-01-13 10:42:05 +01:00 • committed by GitHub
commit be9c4cc96e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/src/app/binfile/v3.clj
View file

@ -781,6 +781,7 @@
(d/update-when :thumbnail-id bfc/lookup-index))] (d/update-when :thumbnail-id bfc/lookup-index))]
(l/dbg :hint "inserting file media object" (l/dbg :hint "inserting file media object"
:old-id (str (:id item))
:id (str (:id params)) :id (str (:id params))
:file-id (str (:file-id params)) :file-id (str (:file-id params))
::l/sync? true) ::l/sync? true)

4
frontend/deps.edn
View file

@ -20,8 +20,8 @@
:git/url "https://github.com/funcool/beicon.git"} :git/url "https://github.com/funcool/beicon.git"}
funcool/rumext funcool/rumext
{:git/tag "v2.18" {:git/tag "v2.20"
:git/sha "b6e8f45" :git/sha "7f5e1cd"
:git/url "https://github.com/funcool/rumext.git"} :git/url "https://github.com/funcool/rumext.git"}
instaparse/instaparse {:mvn/version "1.5.0"} instaparse/instaparse {:mvn/version "1.5.0"}

2
frontend/src/app/main/ui/comments.cljs
View file

@ -962,7 +962,7 @@
(some? position-modifier) (some? position-modifier)
(gpt/transform position-modifier)) (gpt/transform position-modifier))
max-height (when (some? viewport) (int (* (obj/get viewport "height") 0.75))) max-height (when (some? viewport) (int (* (get viewport :height) 0.75)))
;; We should probably look for a better way of doing this. ;; We should probably look for a better way of doing this.
bubble-margin {:x 24 :y 24} bubble-margin {:x 24 :y 24}

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

@ -271,17 +271,20 @@
:on-click on-close-history :on-click on-close-history
:icon "close"}])] :icon "close"}])]
[:> tab-switcher*
{:tabs [{:label (tr "workspace.versions.tab.history") (let [tabs (mf/object
:id "history" [{:label (tr "workspace.versions.tab.history")
:content versions-tab} :id "history"
{:label (tr "workspace.versions.tab.actions") :content versions-tab}
:id "actions" {:label (tr "workspace.versions.tab.actions")
:content history-tab}] :id "actions"
:default-selected "history" :content history-tab}])]
:class (stl/css :left-sidebar-tabs) [:> tab-switcher*
:action-button-position "end" {:tabs tabs
:action-button button}]) :default-selected "history"
:class (stl/css :left-sidebar-tabs)
:action-button-position "end"
:action-button button}]))
:else :else
[:> options-toolbox* props])]]])) [:> options-toolbox* props])]]]))