wip

crates/workspace/src/sidebar/list.rs

@@ -1,22 +1,21 @@
-use crate::nav::Nav;
-use gpui_kit::assets::IconName;
-use gpui_kit::component::scroll::Scrollbar;
-use gpui_kit::component::{ActiveTheme, Icon, Sizable, h_flex, v_flex};
 use std::rc::Rc;
 
 use chat::{ChatRegistry, RoomKind};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    AnyElement, App, Context, IntoElement, ParentElement, SharedString, Styled, div, px,
-    uniform_list,
+    AnyElement, App, Context, IntoElement, ParentElement, SharedString, Styled, div, uniform_list,
 };
+use gpui_kit::assets::IconName;
+use gpui_kit::base::StyledExt as _;
+use gpui_kit::component::scroll::Scrollbar;
+use gpui_kit::component::{ActiveTheme, Icon, Sizable, h_flex, v_flex};
 use nip29::GroupsRegistry;
 use settings::AppSettings;
-use ui::{TextStyle, Typeset as _, control_radius};
 
 use super::Sidebar;
 use super::rows::SidebarRow;
 use crate::Command;
+use crate::nav::Nav;
 
 /// A collapsible section of the sidebar's main list.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -62,7 +61,7 @@ impl Sidebar {
             .flex_1()
             .min_h_0()
             .relative()
-            .gap(px(ui::SPACE))
+            .gap_2()
             .child(
                 v_flex()
                     .px_2()
@@ -90,10 +89,11 @@ impl Sidebar {
                                                 .px_1()
                                                 .min_w_6()
                                                 .justify_center()
-                                                .text_style(TextStyle::Caption2)
+                                                .text_xs()
+                                                .font_medium()
                                                 .text_color(cx.theme().muted_foreground)
                                                 .text_center()
-                                                .rounded(px(control_radius()))
+                                                .rounded(cx.theme().radius)
                                                 .bg(cx.theme().secondary)
                                                 .child(SharedString::from(
                                                     request_count.to_string(),
@@ -128,7 +128,7 @@ impl Sidebar {
                 this.child(
                     div()
                         .px_4()
-                        .text_style(TextStyle::Caption)
+                        .text_xs()
                         .font_weight(gpui::FontWeight::SEMIBOLD)
                         .text_color(cx.theme().muted_foreground)
                         .child(list_title),