johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrey Antukh
2024-12-11 12:00:50 +01:00
parent 25a672b958 9f1f8cc80c
commit 7cff0f60a9
7 changed files with 28 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
frontend/src/app/main/ui/workspace/main_menu.cljs
View File

@@ -611,23 +611,25 @@
[:span {:class (stl/css :item-name)}
(tr "dashboard.add-shared")]]))
[:div {:class (stl/css :separator)}]
(when can-edit
[:*
[:div {:class (stl/css :separator)}]
[:> dropdown-menu-item* {:class (stl/css :submenu-item)
:on-click on-pin-version
:on-key-down on-pin-version-key-down
:id "file-menu-show-version-history"}
[:span {:class (stl/css :item-name)}
(tr "dashboard.create-version-menu")]]
[:> dropdown-menu-item* {:class (stl/css :submenu-item)
:on-click on-pin-version
:on-key-down on-pin-version-key-down
:id "file-menu-show-version-history"}
[:span {:class (stl/css :item-name)}
(tr "dashboard.create-version-menu")]]
[:> dropdown-menu-item* {:class (stl/css :submenu-item)
:on-click on-show-version-history
:on-key-down on-show-version-history-key-down
:id "file-menu-show-version-history"}
[:span {:class (stl/css :item-name)}
(tr "dashboard.show-version-history")]]
[:> dropdown-menu-item* {:class (stl/css :submenu-item)
:on-click on-show-version-history
:on-key-down on-show-version-history-key-down
:id "file-menu-show-version-history"}
[:span {:class (stl/css :item-name)}
(tr "dashboard.show-version-history")]]
[:div {:class (stl/css :separator)}]
[:div {:class (stl/css :separator)}]])
[:> dropdown-menu-item* {:class (stl/css :submenu-item)
:on-click on-export-shapes

4
frontend/src/app/main/ui/workspace/right_header.cljs
View File

@@ -251,7 +251,9 @@
:on-click toggle-history}
i/history]])
(when (cf/external-feature-flag "share-01" "test")
(when (and
(not (:is-default team))
(cf/external-feature-flag "share-01" "test"))
[:a {:class (stl/css :viewer-btn)
:title (tr "workspace.header.share")
:on-click open-share-dialog}