From 28649fb71d4a1bbf598d81806735c73a1fdfcf96 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Tue, 15 Aug 2023 18:36:23 -0400 Subject: [PATCH] Update channel context menu --- crates/collab_ui/src/collab_panel.rs | 11 +++++++---- styles/src/style_tree/context_menu.ts | 12 +----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs index 498b278abd13b17b478a75476b0a38b1a3d95910..ce4ffc8f6b14934d9ba7f48a8f9c3fbf4dbde046 100644 --- a/crates/collab_ui/src/collab_panel.rs +++ b/crates/collab_ui/src/collab_panel.rs @@ -1834,10 +1834,13 @@ impl CollabPanel { }, vec![ ContextMenuItem::action("New Subchannel", NewChannel { channel_id }), - ContextMenuItem::action("Remove Channel", RemoveChannel { channel_id }), - ContextMenuItem::action("Manage members", ManageMembers { channel_id }), - ContextMenuItem::action("Invite members", InviteMembers { channel_id }), - ContextMenuItem::action("Rename Channel", RenameChannel { channel_id }), + ContextMenuItem::Separator, + ContextMenuItem::action("Invite to Channel", InviteMembers { channel_id }), + ContextMenuItem::Separator, + ContextMenuItem::action("Rename", RenameChannel { channel_id }), + ContextMenuItem::action("Manage", ManageMembers { channel_id }), + ContextMenuItem::Separator, + ContextMenuItem::action("Delete", RemoveChannel { channel_id }), ], cx, ); diff --git a/styles/src/style_tree/context_menu.ts b/styles/src/style_tree/context_menu.ts index d4266a71fe6f3974dcf8a154002f658fadf38d07..84688c09716cf524b3de74733107a9dd281bcd01 100644 --- a/styles/src/style_tree/context_menu.ts +++ b/styles/src/style_tree/context_menu.ts @@ -19,7 +19,7 @@ export default function context_menu(): any { icon_width: 14, padding: { left: 6, right: 6, top: 2, bottom: 2 }, corner_radius: 6, - label: text(theme.middle, "sans", { size: "sm" }), + label: text(theme.middle, "ui_sans", { size: "sm" }), keystroke: { ...text(theme.middle, "sans", "variant", { size: "sm", @@ -31,16 +31,6 @@ export default function context_menu(): any { state: { hovered: { background: background(theme.middle, "hovered"), - label: text(theme.middle, "sans", "hovered", { - size: "sm", - }), - keystroke: { - ...text(theme.middle, "sans", "hovered", { - size: "sm", - weight: "bold", - }), - padding: { left: 3, right: 3 }, - }, }, clicked: { background: background(theme.middle, "pressed"),