diff --git a/crates/story/src/list_story.rs b/crates/story/src/list_story.rs index 5ba966c6..f6ea2352 100644 --- a/crates/story/src/list_story.rs +++ b/crates/story/src/list_story.rs @@ -180,18 +180,20 @@ impl ListDelegate for CompanyListDelegate { .border_color(cx.theme().muted_foreground.opacity(0.3)) .line_height(relative(1.)) .p_1() - .child(div().child(name).text_xs()) + .child(div().whitespace_nowrap().child(name).text_xs()) }) .collect::>(); - let element = v_flex() .p_4() .child( - v_flex() - .gap_y_2() - .child("History") - .child(h_flex().gap_x_4().children(input_history)), + v_flex().gap_y_2().child("History").child( + h_flex() + .gap_x_4() + .gap_y_2() + .flex_wrap() + .children(input_history), + ), ) .into_any_element(); Some(element) diff --git a/crates/ui/src/dock/tab_panel.rs b/crates/ui/src/dock/tab_panel.rs index ba9ad0ca..cbbc91f7 100644 --- a/crates/ui/src/dock/tab_panel.rs +++ b/crates/ui/src/dock/tab_panel.rs @@ -16,7 +16,7 @@ use crate::{ popup_menu::{PopupMenu, PopupMenuExt}, tab::{Tab, TabBar}, theme::ActiveTheme, - v_flex, AxisExt, IconName, Placement, Selectable, Sizable, StyledExt, + v_flex, AxisExt, IconName, Placement, Selectable, Sizable, }; use super::{ @@ -473,12 +473,10 @@ impl TabPanel { div() .id("tab") .flex_1() - .debug_red() .min_w_16() .overflow_hidden() .text_ellipsis() .whitespace_nowrap() - .debug_green() .child(panel.title(cx)) .when(self.can_split(), |this| { this.on_drag( diff --git a/crates/ui/src/scroll/scrollbar.rs b/crates/ui/src/scroll/scrollbar.rs index 68dbb025..1f476eae 100644 --- a/crates/ui/src/scroll/scrollbar.rs +++ b/crates/ui/src/scroll/scrollbar.rs @@ -162,7 +162,7 @@ impl Scrollbar { state, axis, scroll_size, - width: px(11.), + width: px(8.), scroll_handle: Rc::new(Box::new(scroll_handle)), } } diff --git a/crates/ui/src/theme.rs b/crates/ui/src/theme.rs index 7a82ea8a..7b42e63f 100644 --- a/crates/ui/src/theme.rs +++ b/crates/ui/src/theme.rs @@ -201,7 +201,7 @@ impl Colors { input: hsl(240.0, 5.9, 90.0), ring: hsl(240.0, 5.9, 65.0), selection: hsl(211.0, 97.0, 85.0), - scrollbar: hsl(0., 0., 97.).opacity(0.7), + scrollbar: hsl(0., 0., 97.).opacity(0.3), scrollbar_thumb: hsl(0., 0., 69.), panel: hsl(0.0, 0.0, 100.0), tab_bar: hsl(240.0, 4.8, 95.9), @@ -243,8 +243,8 @@ impl Colors { input: hsl(240.0, 3.7, 15.9), ring: hsl(240.0, 4.9, 83.9), selection: hsl(211.0, 97.0, 22.0), - scrollbar: hsl(240., 1., 15.).opacity(0.7), - scrollbar_thumb: hsl(0., 0., 58.), + scrollbar: hsl(240., 1., 15.).opacity(0.3), + scrollbar_thumb: hsl(0., 0., 68.), panel: hsl(299.0, 2., 9.), tab_bar: hsl(299.0, 2., 9.), list: hsl(0.0, 0.0, 6.0),