From 81a604dca264cedc28b015fa4c61d60dc2d89677 Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Tue, 9 Mar 2021 13:08:37 +0100 Subject: [PATCH] :sparkles: Add some enhancements to context menus --- frontend/resources/styles/main/partials/context-menu.scss | 7 ++++++- .../resources/styles/main/partials/workspace-header.scss | 1 + frontend/resources/styles/main/partials/workspace.scss | 1 + frontend/src/app/main/ui/components/context_menu.cljs | 4 +++- frontend/src/app/main/ui/dashboard/file_menu.cljs | 1 + frontend/src/app/main/ui/dashboard/files.cljs | 1 - frontend/src/app/main/ui/dashboard/grid.cljs | 1 - frontend/src/app/main/ui/dashboard/project_menu.cljs | 1 + 8 files changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/resources/styles/main/partials/context-menu.scss b/frontend/resources/styles/main/partials/context-menu.scss index f76c201af..3696e8dc1 100644 --- a/frontend/resources/styles/main/partials/context-menu.scss +++ b/frontend/resources/styles/main/partials/context-menu.scss @@ -41,6 +41,10 @@ padding: 0px; margin: 2px; } + + &.min-width { + min-width: 13rem; + } } .context-menu-action { @@ -72,8 +76,9 @@ } &.submenu-back { - color: $color-gray-30; + color: $color-black; display: flex; + font-weight: bold; align-items: center; & svg { diff --git a/frontend/resources/styles/main/partials/workspace-header.scss b/frontend/resources/styles/main/partials/workspace-header.scss index 6fd1cd7e3..4b220a49d 100644 --- a/frontend/resources/styles/main/partials/workspace-header.scss +++ b/frontend/resources/styles/main/partials/workspace-header.scss @@ -167,6 +167,7 @@ .shortcut { color: $color-gray-20; + font-size: $fs12; } &:hover { diff --git a/frontend/resources/styles/main/partials/workspace.scss b/frontend/resources/styles/main/partials/workspace.scss index 850f34b0f..520182046 100644 --- a/frontend/resources/styles/main/partials/workspace.scss +++ b/frontend/resources/styles/main/partials/workspace.scss @@ -41,6 +41,7 @@ span:last-child { color: $color-gray-20; + font-size: $fs12; } &:hover { diff --git a/frontend/src/app/main/ui/components/context_menu.cljs b/frontend/src/app/main/ui/components/context_menu.cljs index 9e95e5259..19f9141e5 100644 --- a/frontend/src/app/main/ui/components/context_menu.cljs +++ b/frontend/src/app/main/ui/components/context_menu.cljs @@ -33,6 +33,7 @@ top (gobj/get props "top" 0) left (gobj/get props "left" 0) fixed? (gobj/get props "fixed?" false) + min-width? (gobj/get props "min-width?" false) local (mf/use-state {:offset 0 :levels nil}) @@ -89,7 +90,8 @@ :style {:top (+ top (:offset @local)) :left left}} (let [level (-> @local :levels peek)] - [:ul.context-menu-items {:ref check-menu-offscreen} + [:ul.context-menu-items {:class (classnames :min-width min-width?) + :ref check-menu-offscreen} (when-let [parent-option (:parent-option level)] [:* [:li.context-menu-item diff --git a/frontend/src/app/main/ui/dashboard/file_menu.cljs b/frontend/src/app/main/ui/dashboard/file_menu.cljs index 95c599be3..ac11732fc 100644 --- a/frontend/src/app/main/ui/dashboard/file_menu.cljs +++ b/frontend/src/app/main/ui/dashboard/file_menu.cljs @@ -156,6 +156,7 @@ [:& context-menu {:on-close on-menu-close :show show? :fixed? (or (not= top 0) (not= left 0)) + :min-width? true :top top :left left :options [[(tr "dashboard.open-in-new-tab") on-new-tab] diff --git a/frontend/src/app/main/ui/dashboard/files.cljs b/frontend/src/app/main/ui/dashboard/files.cljs index 6bfa862c0..791724ca8 100644 --- a/frontend/src/app/main/ui/dashboard/files.cljs +++ b/frontend/src/app/main/ui/dashboard/files.cljs @@ -12,7 +12,6 @@ [app.main.data.dashboard :as dd] [app.main.data.modal :as modal] [app.main.store :as st] - [app.main.ui.components.context-menu :refer [context-menu]] [app.main.ui.dashboard.grid :refer [grid]] [app.main.ui.dashboard.inline-edition :refer [inline-edition]] [app.main.ui.dashboard.project-menu :refer [project-menu]] diff --git a/frontend/src/app/main/ui/dashboard/grid.cljs b/frontend/src/app/main/ui/dashboard/grid.cljs index c5d085159..26b1fd165 100644 --- a/frontend/src/app/main/ui/dashboard/grid.cljs +++ b/frontend/src/app/main/ui/dashboard/grid.cljs @@ -16,7 +16,6 @@ [app.main.data.modal :as modal] [app.main.fonts :as fonts] [app.main.store :as st] - [app.main.ui.components.context-menu :refer [context-menu]] [app.main.ui.dashboard.file-menu :refer [file-menu]] [app.main.ui.dashboard.inline-edition :refer [inline-edition]] [app.main.ui.icons :as i] diff --git a/frontend/src/app/main/ui/dashboard/project_menu.cljs b/frontend/src/app/main/ui/dashboard/project_menu.cljs index 77269a936..8f6a245bb 100644 --- a/frontend/src/app/main/ui/dashboard/project_menu.cljs +++ b/frontend/src/app/main/ui/dashboard/project_menu.cljs @@ -96,6 +96,7 @@ [:& context-menu {:on-close on-menu-close :show show? :fixed? (or (not= top 0) (not= left 0)) + :min-width? true :top top :left left :options [[(tr "labels.rename") on-edit]