mirror of
https://github.com/penpot/penpot.git
synced 2025-01-31 19:39:07 -05:00
Merge pull request #5556 from penpot/niwinz-enhancements-3
✨ Minor enhancements and rumext reverts
This commit is contained in:
commit
be9c4cc96e
4 changed files with 18 additions and 14 deletions
|
@ -781,6 +781,7 @@
|
|||
(d/update-when :thumbnail-id bfc/lookup-index))]
|
||||
|
||||
(l/dbg :hint "inserting file media object"
|
||||
:old-id (str (:id item))
|
||||
:id (str (:id params))
|
||||
:file-id (str (:file-id params))
|
||||
::l/sync? true)
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
:git/url "https://github.com/funcool/beicon.git"}
|
||||
|
||||
funcool/rumext
|
||||
{:git/tag "v2.18"
|
||||
:git/sha "b6e8f45"
|
||||
{:git/tag "v2.20"
|
||||
:git/sha "7f5e1cd"
|
||||
:git/url "https://github.com/funcool/rumext.git"}
|
||||
|
||||
instaparse/instaparse {:mvn/version "1.5.0"}
|
||||
|
|
|
@ -962,7 +962,7 @@
|
|||
(some? 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.
|
||||
bubble-margin {:x 24 :y 24}
|
||||
|
|
|
@ -271,17 +271,20 @@
|
|||
:on-click on-close-history
|
||||
:icon "close"}])]
|
||||
|
||||
[:> tab-switcher*
|
||||
{:tabs [{:label (tr "workspace.versions.tab.history")
|
||||
:id "history"
|
||||
:content versions-tab}
|
||||
{:label (tr "workspace.versions.tab.actions")
|
||||
:id "actions"
|
||||
:content history-tab}]
|
||||
:default-selected "history"
|
||||
:class (stl/css :left-sidebar-tabs)
|
||||
:action-button-position "end"
|
||||
:action-button button}])
|
||||
|
||||
(let [tabs (mf/object
|
||||
[{:label (tr "workspace.versions.tab.history")
|
||||
:id "history"
|
||||
:content versions-tab}
|
||||
{:label (tr "workspace.versions.tab.actions")
|
||||
:id "actions"
|
||||
:content history-tab}])]
|
||||
[:> tab-switcher*
|
||||
{:tabs tabs
|
||||
:default-selected "history"
|
||||
:class (stl/css :left-sidebar-tabs)
|
||||
:action-button-position "end"
|
||||
:action-button button}]))
|
||||
|
||||
:else
|
||||
[:> options-toolbox* props])]]]))
|
||||
|
|
Loading…
Add table
Reference in a new issue