diff --git a/crates/ui/src/menu/popup_menu.rs b/crates/ui/src/menu/popup_menu.rs index 7ef3b27d..a8d0ea13 100644 --- a/crates/ui/src/menu/popup_menu.rs +++ b/crates/ui/src/menu/popup_menu.rs @@ -660,14 +660,19 @@ impl PopupMenu { .border_color(cx.theme().border_faint) .disabled(true), PopupMenuItem::Label(label) => this.disabled(true).cursor_default().child( - h_flex().cursor_default().items_center().gap_x_1().child( - div() - .flex_1() - .text_style(TextStyle::Callout) - .font_semibold() - .text_color(cx.theme().text_muted) - .child(label.clone()), - ), + h_flex() + .cursor_default() + .items_center() + .gap_x_1() + .h_6() + .child( + div() + .flex_1() + .text_style(TextStyle::Footnote) + .font_semibold() + .text_color(cx.theme().text_muted) + .child(label.clone()), + ), ), PopupMenuItem::Item { icon, diff --git a/crates/workspace/src/dialogs/join_group.rs b/crates/workspace/src/dialogs/join_group.rs index ab93de15..e24010ed 100644 --- a/crates/workspace/src/dialogs/join_group.rs +++ b/crates/workspace/src/dialogs/join_group.rs @@ -35,7 +35,7 @@ pub fn open(window: &mut Window, cx: &mut App) { window.open_dialog(cx, move |this, _window, _cx| { this.width(px(380.)) - .title("Join Group") + .title("Join Public Group") .on_ok({ let join = join.clone(); move |event, window, cx| join(event, window, cx) diff --git a/crates/workspace/src/panels/greeter.rs b/crates/workspace/src/panels/greeter.rs index bfcb99d3..60bb59e6 100644 --- a/crates/workspace/src/panels/greeter.rs +++ b/crates/workspace/src/panels/greeter.rs @@ -428,7 +428,7 @@ impl GreeterPanel { .small() .text_color(cx.theme().text_faint), ) - .label("Browse Group") + .label("Browse Public Groups") .text_style(TextStyle::Callout) .on_click(cx.listener(|this, _, window, cx| { let panel = browse::init(this.dock.clone(), window, cx); diff --git a/crates/workspace/src/sidebar/header.rs b/crates/workspace/src/sidebar/header.rs index f0e6e469..3a68f84d 100644 --- a/crates/workspace/src/sidebar/header.rs +++ b/crates/workspace/src/sidebar/header.rs @@ -84,18 +84,23 @@ impl Sidebar { .ghost() .small() .dropdown_menu(|menu, _window, _cx| { - menu.menu_with_icon( - "New Group", - IconName::Group, - Box::new(Command::NewGroup), - ) - .menu_with_icon("Join Group", IconName::Door, Box::new(Command::JoinGroup)) - .separator() - .menu_with_icon( - "New Chat", - IconName::Message, - Box::new(Command::NewChat), - ) + menu.label("Public Group") + .menu_with_icon( + "New Group", + IconName::Group, + Box::new(Command::NewGroup), + ) + .menu_with_icon( + "Join Group", + IconName::Door, + Box::new(Command::JoinGroup), + ) + .separator() + .menu_with_icon( + "New Chat", + IconName::Message, + Box::new(Command::NewChat), + ) }), ) .when(self.group_open, |this| { diff --git a/crates/workspace/src/sidebar/list.rs b/crates/workspace/src/sidebar/list.rs index e339fcc6..f5779955 100644 --- a/crates/workspace/src/sidebar/list.rs +++ b/crates/workspace/src/sidebar/list.rs @@ -29,7 +29,7 @@ impl ListSection { pub(super) fn label(self) -> &'static str { match self { Self::Pins => "Pinned", - Self::Groups => "Groups", + Self::Groups => "Public Groups", Self::Chats => "Chats", } } diff --git a/crates/workspace/src/sidebar/rows.rs b/crates/workspace/src/sidebar/rows.rs index 4866f2e1..986eb145 100644 --- a/crates/workspace/src/sidebar/rows.rs +++ b/crates/workspace/src/sidebar/rows.rs @@ -93,10 +93,10 @@ impl Sidebar { Nav::new(label) .label(label) - .suffix(Icon::new(icon).small().text_color(cx.theme().text_faint)) + .suffix(Icon::new(icon).small().text_color(cx.theme().text_muted)) .text_style(TextStyle::Caption) .font_semibold() - .text_color(cx.theme().text_faint) + .text_color(cx.theme().text_muted) .on_click(cx.listener(move |this, _event, _window, cx| { match section { ListSection::Pins => this.pins_open = !this.pins_open,