diff --git a/assets/icons/arrow_circle.svg b/assets/icons/arrow_circle.svg
new file mode 100644
index 0000000000000000000000000000000000000000..750e349e2b8c73ef0c78b9974ea100f70ae37abe
--- /dev/null
+++ b/assets/icons/arrow_circle.svg
@@ -0,0 +1 @@
+
diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index 7b19ad130c4c42316f6ca65c8063be9c3842b42b..4c7b183fc02a3bb390d99da2b5af06892887b05a 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -1125,8 +1125,6 @@ impl Render for AssistantPanel {
.child(Label::new(
"Click on the Z button in the status bar to close this panel."
))
- .border()
- .border_color(gpui::red())
} else {
let header = TabBar::new("assistant_header")
.start_child(
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 16d8be89af78db45bdcc27b317bffcbfdf66e98e..8150fe1e4ddf19bb422697d17cf0edf4ade0aed5 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -110,6 +110,7 @@ impl Render for CollabTitlebarItem {
&room,
project_id,
¤t_user,
+ cx,
))
.children(
remote_participants.iter().filter_map(|collaborator| {
@@ -127,6 +128,7 @@ impl Render for CollabTitlebarItem {
&room,
project_id,
¤t_user,
+ cx,
)?;
Some(
@@ -405,6 +407,7 @@ impl CollabTitlebarItem {
room: &Room,
project_id: Option,
current_user: &Arc,
+ cx: &ViewContext,
) -> Option {
let followers = project_id.map_or(&[] as &[_], |id| room.followers_for(peer_id, id));
@@ -413,9 +416,9 @@ impl CollabTitlebarItem {
Avatar::new(user.avatar_uri.clone())
.grayscale(!is_present)
.border_color(if is_speaking {
- gpui::blue()
+ cx.theme().status().info_border
} else if is_muted {
- gpui::red()
+ cx.theme().status().error_border
} else {
Hsla::default()
}),
diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs
index 9f7be0c04f2ca27413953cd5a133139cba4e10ea..da1f77b9afb0f1c4308362f42f479dc30890e77b 100644
--- a/crates/diagnostics/src/items.rs
+++ b/crates/diagnostics/src/items.rs
@@ -23,11 +23,21 @@ pub struct DiagnosticIndicator {
impl Render for DiagnosticIndicator {
fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement {
let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) {
- (0, 0) => h_stack().child(
- IconElement::new(Icon::Check)
- .size(IconSize::Small)
- .color(Color::Success),
- ),
+ (0, 0) => h_stack().map(|this| {
+ if !self.in_progress_checks.is_empty() {
+ this.child(
+ IconElement::new(Icon::ArrowCircle)
+ .size(IconSize::Small)
+ .color(Color::Muted),
+ )
+ } else {
+ this.child(
+ IconElement::new(Icon::Check)
+ .size(IconSize::Small)
+ .color(Color::Default),
+ )
+ }
+ }),
(0, warning_count) => h_stack()
.gap_1()
.child(
@@ -64,6 +74,7 @@ impl Render for DiagnosticIndicator {
Some(
Label::new("Checking…")
.size(LabelSize::Small)
+ .color(Color::Muted)
.into_any_element(),
)
} else if let Some(diagnostic) = &self.current_diagnostic {
diff --git a/crates/theme/src/themes/andromeda.rs b/crates/theme/src/themes/andromeda.rs
index e46e9cf9d0977bb527eb34d3a3697916a81b96a1..effdfb85f97a0c9baa1d4b9881b6c89de9ec1245 100644
--- a/crates/theme/src/themes/andromeda.rs
+++ b/crates/theme/src/themes/andromeda.rs
@@ -20,7 +20,7 @@ pub fn andromeda() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2b2f39ff).into()),
- border_variant: Some(rgba(0x2b2f39ff).into()),
+ border_variant: Some(rgba(0x252931ff).into()),
border_focused: Some(rgba(0x183a34ff).into()),
border_selected: Some(rgba(0x183a34ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -59,7 +59,7 @@ pub fn andromeda() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf7f7f84c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x252931ff).into()),
scrollbar_thumb_border: Some(rgba(0x252931ff).into()),
- scrollbar_track_background: Some(rgba(0x1e2025ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x21232aff).into()),
editor_foreground: Some(rgba(0xf7f7f8ff).into()),
editor_background: Some(rgba(0x1e2025ff).into()),
diff --git a/crates/theme/src/themes/atelier.rs b/crates/theme/src/themes/atelier.rs
index 75226c669bbe7aa32119d70f85fb63ccbf2e6190..2d05a6b65be1daa7353ef6bb4775725d864b5dca 100644
--- a/crates/theme/src/themes/atelier.rs
+++ b/crates/theme/src/themes/atelier.rs
@@ -21,7 +21,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x969585ff).into()),
- border_variant: Some(rgba(0x969585ff).into()),
+ border_variant: Some(rgba(0xd1d0c6ff).into()),
border_focused: Some(rgba(0xbbddc6ff).into()),
border_selected: Some(rgba(0xbbddc6ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -60,7 +60,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x22221b4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xd1d0c6ff).into()),
scrollbar_thumb_border: Some(rgba(0xd1d0c6ff).into()),
- scrollbar_track_background: Some(rgba(0xf4f3ecff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xedece5ff).into()),
editor_foreground: Some(rgba(0x302f27ff).into()),
editor_background: Some(rgba(0xf4f3ecff).into()),
@@ -486,7 +486,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x665f5cff).into()),
- border_variant: Some(rgba(0x665f5cff).into()),
+ border_variant: Some(rgba(0x3b3431ff).into()),
border_focused: Some(rgba(0x192e5bff).into()),
border_selected: Some(rgba(0x192e5bff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -525,7 +525,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf1efee4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x3b3431ff).into()),
scrollbar_thumb_border: Some(rgba(0x3b3431ff).into()),
- scrollbar_track_background: Some(rgba(0x1b1918ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x251f1dff).into()),
editor_foreground: Some(rgba(0xe6e2e0ff).into()),
editor_background: Some(rgba(0x1b1918ff).into()),
@@ -951,7 +951,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8b968eff).into()),
- border_variant: Some(rgba(0x8b968eff).into()),
+ border_variant: Some(rgba(0xc8d1cbff).into()),
border_focused: Some(rgba(0xbed4d6ff).into()),
border_selected: Some(rgba(0xbed4d6ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -990,7 +990,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x171c194c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xc8d1cbff).into()),
scrollbar_thumb_border: Some(rgba(0xc8d1cbff).into()),
- scrollbar_track_background: Some(rgba(0xecf4eeff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xe5ede7ff).into()),
editor_foreground: Some(rgba(0x232a25ff).into()),
editor_background: Some(rgba(0xecf4eeff).into()),
@@ -1416,7 +1416,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x56505eff).into()),
- border_variant: Some(rgba(0x56505eff).into()),
+ border_variant: Some(rgba(0x332f38ff).into()),
border_focused: Some(rgba(0x222953ff).into()),
border_selected: Some(rgba(0x222953ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -1455,7 +1455,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xefecf44c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x332f38ff).into()),
scrollbar_thumb_border: Some(rgba(0x332f38ff).into()),
- scrollbar_track_background: Some(rgba(0x19171cff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x201e24ff).into()),
editor_foreground: Some(rgba(0xe2dfe7ff).into()),
editor_background: Some(rgba(0x19171cff).into()),
@@ -1881,7 +1881,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5d5c4cff).into()),
- border_variant: Some(rgba(0x5d5c4cff).into()),
+ border_variant: Some(rgba(0x3c3b31ff).into()),
border_focused: Some(rgba(0x1c3927ff).into()),
border_selected: Some(rgba(0x1c3927ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -1920,7 +1920,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf4f3ec4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x3c3b31ff).into()),
scrollbar_thumb_border: Some(rgba(0x3c3b31ff).into()),
- scrollbar_track_background: Some(rgba(0x22221bff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x2a2922ff).into()),
editor_foreground: Some(rgba(0xe7e6dfff).into()),
editor_background: Some(rgba(0x22221bff).into()),
@@ -2346,7 +2346,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5c6485ff).into()),
- border_variant: Some(rgba(0x5c6485ff).into()),
+ border_variant: Some(rgba(0x363f62ff).into()),
border_focused: Some(rgba(0x203348ff).into()),
border_selected: Some(rgba(0x203348ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -2385,7 +2385,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf5f7ff4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x363f62ff).into()),
scrollbar_thumb_border: Some(rgba(0x363f62ff).into()),
- scrollbar_track_background: Some(rgba(0x202746ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x252d4fff).into()),
editor_foreground: Some(rgba(0xdfe2f1ff).into()),
editor_background: Some(rgba(0x202746ff).into()),
@@ -2811,7 +2811,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x9a9fb6ff).into()),
- border_variant: Some(rgba(0x9a9fb6ff).into()),
+ border_variant: Some(rgba(0xccd0e1ff).into()),
border_focused: Some(rgba(0xc2d5efff).into()),
border_selected: Some(rgba(0xc2d5efff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -2850,7 +2850,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x2027464c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xccd0e1ff).into()),
scrollbar_thumb_border: Some(rgba(0xccd0e1ff).into()),
- scrollbar_track_background: Some(rgba(0xf5f7ffff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xe9ebf7ff).into()),
editor_foreground: Some(rgba(0x293256ff).into()),
editor_background: Some(rgba(0xf5f7ffff).into()),
@@ -3276,7 +3276,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x6c695cff).into()),
- border_variant: Some(rgba(0x6c695cff).into()),
+ border_variant: Some(rgba(0x3b3933ff).into()),
border_focused: Some(rgba(0x263056ff).into()),
border_selected: Some(rgba(0x263056ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -3315,7 +3315,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xfefbec4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x3b3933ff).into()),
scrollbar_thumb_border: Some(rgba(0x3b3933ff).into()),
- scrollbar_track_background: Some(rgba(0x20201dff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x252521ff).into()),
editor_foreground: Some(rgba(0xe8e4cfff).into()),
editor_background: Some(rgba(0x20201dff).into()),
@@ -3741,7 +3741,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5c6c5cff).into()),
- border_variant: Some(rgba(0x5c6c5cff).into()),
+ border_variant: Some(rgba(0x333b33ff).into()),
border_focused: Some(rgba(0x102668ff).into()),
border_selected: Some(rgba(0x102668ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -3780,7 +3780,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf4fbf44c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x333b33ff).into()),
scrollbar_thumb_border: Some(rgba(0x333b33ff).into()),
- scrollbar_track_background: Some(rgba(0x131513ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x1d201dff).into()),
editor_foreground: Some(rgba(0xcfe8cfff).into()),
editor_background: Some(rgba(0x131513ff).into()),
@@ -4206,7 +4206,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8f8b96ff).into()),
- border_variant: Some(rgba(0x8f8b96ff).into()),
+ border_variant: Some(rgba(0xcbc8d1ff).into()),
border_focused: Some(rgba(0xc9c8f3ff).into()),
border_selected: Some(rgba(0xc9c8f3ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -4245,7 +4245,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x19171c4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xcbc8d1ff).into()),
scrollbar_thumb_border: Some(rgba(0xcbc8d1ff).into()),
- scrollbar_track_background: Some(rgba(0xefecf4ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xe8e5edff).into()),
editor_foreground: Some(rgba(0x26232aff).into()),
editor_background: Some(rgba(0xefecf4ff).into()),
@@ -4671,7 +4671,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x564e4eff).into()),
- border_variant: Some(rgba(0x564e4eff).into()),
+ border_variant: Some(rgba(0x352f2fff).into()),
border_focused: Some(rgba(0x2c2b45ff).into()),
border_selected: Some(rgba(0x2c2b45ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -4710,7 +4710,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf4ecec4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x352f2fff).into()),
scrollbar_thumb_border: Some(rgba(0x352f2fff).into()),
- scrollbar_track_background: Some(rgba(0x1b1818ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x231f1fff).into()),
editor_foreground: Some(rgba(0xe7dfdfff).into()),
editor_background: Some(rgba(0x1b1818ff).into()),
@@ -5136,7 +5136,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x675b67ff).into()),
- border_variant: Some(rgba(0x675b67ff).into()),
+ border_variant: Some(rgba(0x393239ff).into()),
border_focused: Some(rgba(0x1a2961ff).into()),
border_selected: Some(rgba(0x1a2961ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -5175,7 +5175,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf7f3f74c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x393239ff).into()),
scrollbar_thumb_border: Some(rgba(0x393239ff).into()),
- scrollbar_track_background: Some(rgba(0x1b181bff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x231e23ff).into()),
editor_foreground: Some(rgba(0xd8cad8ff).into()),
editor_background: Some(rgba(0x1b181bff).into()),
@@ -5601,7 +5601,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x4f6b78ff).into()),
- border_variant: Some(rgba(0x4f6b78ff).into()),
+ border_variant: Some(rgba(0x2c3b42ff).into()),
border_focused: Some(rgba(0x1a2f3cff).into()),
border_selected: Some(rgba(0x1a2f3cff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -5640,7 +5640,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xebf8ff4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x2c3b42ff).into()),
scrollbar_thumb_border: Some(rgba(0x2c3b42ff).into()),
- scrollbar_track_background: Some(rgba(0x161b1dff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x1b2327ff).into()),
editor_foreground: Some(rgba(0xc1e4f6ff).into()),
editor_background: Some(rgba(0x161b1dff).into()),
@@ -6066,7 +6066,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xaaa3a1ff).into()),
- border_variant: Some(rgba(0xaaa3a1ff).into()),
+ border_variant: Some(rgba(0xd6d1cfff).into()),
border_focused: Some(rgba(0xc6cef7ff).into()),
border_selected: Some(rgba(0xc6cef7ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -6105,7 +6105,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x1b19184c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xd6d1cfff).into()),
scrollbar_thumb_border: Some(rgba(0xd6d1cfff).into()),
- scrollbar_track_background: Some(rgba(0xf1efeeff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xebe8e6ff).into()),
editor_foreground: Some(rgba(0x2c2421ff).into()),
editor_background: Some(rgba(0xf1efeeff).into()),
@@ -6531,7 +6531,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xa8a48eff).into()),
- border_variant: Some(rgba(0xa8a48eff).into()),
+ border_variant: Some(rgba(0xd7d3beff).into()),
border_focused: Some(rgba(0xcdd1f5ff).into()),
border_selected: Some(rgba(0xcdd1f5ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -6570,7 +6570,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x20201d4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xd7d3beff).into()),
scrollbar_thumb_border: Some(rgba(0xd7d3beff).into()),
- scrollbar_track_background: Some(rgba(0xfefbecff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xf2eedcff).into()),
editor_foreground: Some(rgba(0x292824ff).into()),
editor_background: Some(rgba(0xfefbecff).into()),
@@ -6996,7 +6996,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8e8989ff).into()),
- border_variant: Some(rgba(0x8e8989ff).into()),
+ border_variant: Some(rgba(0xcfc7c7ff).into()),
border_focused: Some(rgba(0xcecaecff).into()),
border_selected: Some(rgba(0xcecaecff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -7035,7 +7035,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x1b18184c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xcfc7c7ff).into()),
scrollbar_thumb_border: Some(rgba(0xcfc7c7ff).into()),
- scrollbar_track_background: Some(rgba(0xf4ececff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xede5e5ff).into()),
editor_foreground: Some(rgba(0x292424ff).into()),
editor_background: Some(rgba(0xf4ececff).into()),
@@ -7461,7 +7461,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8ea88eff).into()),
- border_variant: Some(rgba(0x8ea88eff).into()),
+ border_variant: Some(rgba(0xbed7beff).into()),
border_focused: Some(rgba(0xc9c4fdff).into()),
border_selected: Some(rgba(0xc9c4fdff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -7500,7 +7500,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x1315134c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xbed7beff).into()),
scrollbar_thumb_border: Some(rgba(0xbed7beff).into()),
- scrollbar_track_background: Some(rgba(0xf4fbf4ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xdff0dfff).into()),
editor_foreground: Some(rgba(0x242924ff).into()),
editor_background: Some(rgba(0xf4fbf4ff).into()),
@@ -7926,7 +7926,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x505e55ff).into()),
- border_variant: Some(rgba(0x505e55ff).into()),
+ border_variant: Some(rgba(0x2f3832ff).into()),
border_focused: Some(rgba(0x1f3233ff).into()),
border_selected: Some(rgba(0x1f3233ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -7965,7 +7965,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xecf4ee4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x2f3832ff).into()),
scrollbar_thumb_border: Some(rgba(0x2f3832ff).into()),
- scrollbar_track_background: Some(rgba(0x171c19ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x1e2420ff).into()),
editor_foreground: Some(rgba(0xdfe7e2ff).into()),
editor_background: Some(rgba(0x171c19ff).into()),
@@ -8391,7 +8391,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xad9dadff).into()),
- border_variant: Some(rgba(0xad9dadff).into()),
+ border_variant: Some(rgba(0xcdbecdff).into()),
border_focused: Some(rgba(0xcac7faff).into()),
border_selected: Some(rgba(0xcac7faff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -8430,7 +8430,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x1b181b4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xcdbecdff).into()),
scrollbar_thumb_border: Some(rgba(0xcdbecdff).into()),
- scrollbar_track_background: Some(rgba(0xf7f3f7ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xe5dce5ff).into()),
editor_foreground: Some(rgba(0x292329ff).into()),
editor_background: Some(rgba(0xf7f3f7ff).into()),
@@ -8856,7 +8856,7 @@ pub fn atelier() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x80a4b6ff).into()),
- border_variant: Some(rgba(0x80a4b6ff).into()),
+ border_variant: Some(rgba(0xb0d3e5ff).into()),
border_focused: Some(rgba(0xbacfe1ff).into()),
border_selected: Some(rgba(0xbacfe1ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -8895,7 +8895,7 @@ pub fn atelier() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x161b1d4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xb0d3e5ff).into()),
scrollbar_thumb_border: Some(rgba(0xb0d3e5ff).into()),
- scrollbar_track_background: Some(rgba(0xebf8ffff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xd3edfaff).into()),
editor_foreground: Some(rgba(0x1f292eff).into()),
editor_background: Some(rgba(0xebf8ffff).into()),
diff --git a/crates/theme/src/themes/ayu.rs b/crates/theme/src/themes/ayu.rs
index 9029a01e25f52b5814d2dacd2061d5d15a219450..a0402825c1a1eaf5e6f91986c47505c68772c743 100644
--- a/crates/theme/src/themes/ayu.rs
+++ b/crates/theme/src/themes/ayu.rs
@@ -21,7 +21,7 @@ pub fn ayu() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3f4043ff).into()),
- border_variant: Some(rgba(0x3f4043ff).into()),
+ border_variant: Some(rgba(0x2d2f34ff).into()),
border_focused: Some(rgba(0x1b4a6eff).into()),
border_selected: Some(rgba(0x1b4a6eff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -60,7 +60,7 @@ pub fn ayu() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xbfbdb64c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x2d2f34ff).into()),
scrollbar_thumb_border: Some(rgba(0x2d2f34ff).into()),
- scrollbar_track_background: Some(rgba(0x0d1017ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x1b1e24ff).into()),
editor_foreground: Some(rgba(0xbfbdb6ff).into()),
editor_background: Some(rgba(0x0d1017ff).into()),
@@ -465,7 +465,7 @@ pub fn ayu() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xcfd1d2ff).into()),
- border_variant: Some(rgba(0xcfd1d2ff).into()),
+ border_variant: Some(rgba(0xdfe0e1ff).into()),
border_focused: Some(rgba(0xc4daf6ff).into()),
border_selected: Some(rgba(0xc4daf6ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -504,7 +504,7 @@ pub fn ayu() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x5c61664c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xdfe0e1ff).into()),
scrollbar_thumb_border: Some(rgba(0xdfe0e1ff).into()),
- scrollbar_track_background: Some(rgba(0xfcfcfcff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xefeff0ff).into()),
editor_foreground: Some(rgba(0x5c6166ff).into()),
editor_background: Some(rgba(0xfcfcfcff).into()),
@@ -909,7 +909,7 @@ pub fn ayu() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x53565dff).into()),
- border_variant: Some(rgba(0x53565dff).into()),
+ border_variant: Some(rgba(0x43464fff).into()),
border_focused: Some(rgba(0x24556fff).into()),
border_selected: Some(rgba(0x24556fff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -948,7 +948,7 @@ pub fn ayu() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xcccac24c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x43464fff).into()),
scrollbar_thumb_border: Some(rgba(0x43464fff).into()),
- scrollbar_track_background: Some(rgba(0x242936ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x323641ff).into()),
editor_foreground: Some(rgba(0xcccac2ff).into()),
editor_background: Some(rgba(0x242936ff).into()),
diff --git a/crates/theme/src/themes/gruvbox.rs b/crates/theme/src/themes/gruvbox.rs
index 615c29dea805eb5336532dac4793a0ea2cba6cd6..b6b76bf47207918e289470471f715d2cfbfc1725 100644
--- a/crates/theme/src/themes/gruvbox.rs
+++ b/crates/theme/src/themes/gruvbox.rs
@@ -21,7 +21,7 @@ pub fn gruvbox() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
- border_variant: Some(rgba(0xc9b99aff).into()),
+ border_variant: Some(rgba(0xddcca7ff).into()),
border_focused: Some(rgba(0xaec6cdff).into()),
border_selected: Some(rgba(0xaec6cdff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -60,7 +60,7 @@ pub fn gruvbox() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x2828284c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()),
scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()),
- scrollbar_track_background: Some(rgba(0xf9f5d7ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xefe2bcff).into()),
editor_foreground: Some(rgba(0x282828ff).into()),
editor_background: Some(rgba(0xf9f5d7ff).into()),
@@ -472,7 +472,7 @@ pub fn gruvbox() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
- border_variant: Some(rgba(0x5b534dff).into()),
+ border_variant: Some(rgba(0x494340ff).into()),
border_focused: Some(rgba(0x303a36ff).into()),
border_selected: Some(rgba(0x303a36ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -511,7 +511,7 @@ pub fn gruvbox() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xfbf1c74c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()),
scrollbar_thumb_border: Some(rgba(0x494340ff).into()),
- scrollbar_track_background: Some(rgba(0x32302fff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x393634ff).into()),
editor_foreground: Some(rgba(0xebdbb2ff).into()),
editor_background: Some(rgba(0x32302fff).into()),
@@ -923,7 +923,7 @@ pub fn gruvbox() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
- border_variant: Some(rgba(0xc9b99aff).into()),
+ border_variant: Some(rgba(0xddcca7ff).into()),
border_focused: Some(rgba(0xaec6cdff).into()),
border_selected: Some(rgba(0xaec6cdff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -962,7 +962,7 @@ pub fn gruvbox() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x2828284c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()),
scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()),
- scrollbar_track_background: Some(rgba(0xfbf1c7ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xefe1b8ff).into()),
editor_foreground: Some(rgba(0x282828ff).into()),
editor_background: Some(rgba(0xfbf1c7ff).into()),
@@ -1374,7 +1374,7 @@ pub fn gruvbox() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
- border_variant: Some(rgba(0x5b534dff).into()),
+ border_variant: Some(rgba(0x494340ff).into()),
border_focused: Some(rgba(0x303a36ff).into()),
border_selected: Some(rgba(0x303a36ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -1413,7 +1413,7 @@ pub fn gruvbox() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xfbf1c74c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()),
scrollbar_thumb_border: Some(rgba(0x494340ff).into()),
- scrollbar_track_background: Some(rgba(0x282828ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x373432ff).into()),
editor_foreground: Some(rgba(0xebdbb2ff).into()),
editor_background: Some(rgba(0x282828ff).into()),
@@ -1825,7 +1825,7 @@ pub fn gruvbox() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
- border_variant: Some(rgba(0xc9b99aff).into()),
+ border_variant: Some(rgba(0xddcca7ff).into()),
border_focused: Some(rgba(0xaec6cdff).into()),
border_selected: Some(rgba(0xaec6cdff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -1864,7 +1864,7 @@ pub fn gruvbox() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x2828284c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()),
scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()),
- scrollbar_track_background: Some(rgba(0xf2e5bcff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xeddeb5ff).into()),
editor_foreground: Some(rgba(0x282828ff).into()),
editor_background: Some(rgba(0xf2e5bcff).into()),
@@ -2276,7 +2276,7 @@ pub fn gruvbox() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
- border_variant: Some(rgba(0x5b534dff).into()),
+ border_variant: Some(rgba(0x494340ff).into()),
border_focused: Some(rgba(0x303a36ff).into()),
border_selected: Some(rgba(0x303a36ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -2315,7 +2315,7 @@ pub fn gruvbox() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xfbf1c74c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()),
scrollbar_thumb_border: Some(rgba(0x494340ff).into()),
- scrollbar_track_background: Some(rgba(0x1d2021ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x343130ff).into()),
editor_foreground: Some(rgba(0xebdbb2ff).into()),
editor_background: Some(rgba(0x1d2021ff).into()),
diff --git a/crates/theme/src/themes/one.rs b/crates/theme/src/themes/one.rs
index 12fd7e9b663dbc9879a6b3110cd9e55b2a975e68..c941fb294ddb32fd5638ee1ff92fe7a080121d4b 100644
--- a/crates/theme/src/themes/one.rs
+++ b/crates/theme/src/themes/one.rs
@@ -21,7 +21,7 @@ pub fn one() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9c9caff).into()),
- border_variant: Some(rgba(0xc9c9caff).into()),
+ border_variant: Some(rgba(0xdfdfe0ff).into()),
border_focused: Some(rgba(0xcbcdf6ff).into()),
border_selected: Some(rgba(0xcbcdf6ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -60,7 +60,7 @@ pub fn one() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x383a414c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xdfdfe0ff).into()),
scrollbar_thumb_border: Some(rgba(0xdfdfe0ff).into()),
- scrollbar_track_background: Some(rgba(0xfafafaff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xeeeeeeff).into()),
editor_foreground: Some(rgba(0x383a41ff).into()),
editor_background: Some(rgba(0xfafafaff).into()),
@@ -472,7 +472,7 @@ pub fn one() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x464b57ff).into()),
- border_variant: Some(rgba(0x464b57ff).into()),
+ border_variant: Some(rgba(0x363c46ff).into()),
border_focused: Some(rgba(0x293c5bff).into()),
border_selected: Some(rgba(0x293c5bff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -511,7 +511,7 @@ pub fn one() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xc8ccd44c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x363c46ff).into()),
scrollbar_thumb_border: Some(rgba(0x363c46ff).into()),
- scrollbar_track_background: Some(rgba(0x282c34ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x2e333cff).into()),
editor_foreground: Some(rgba(0xacb2beff).into()),
editor_background: Some(rgba(0x282c34ff).into()),
diff --git a/crates/theme/src/themes/rose_pine.rs b/crates/theme/src/themes/rose_pine.rs
index 966d6e5e625b5ffa5dbb9c4ae1ef5d0ff3e2aaec..59b8a924377b6f105e8610717935391f1f2c0682 100644
--- a/crates/theme/src/themes/rose_pine.rs
+++ b/crates/theme/src/themes/rose_pine.rs
@@ -21,7 +21,7 @@ pub fn rose_pine() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xdcd6d5ff).into()),
- border_variant: Some(rgba(0xdcd6d5ff).into()),
+ border_variant: Some(rgba(0xe5e0dfff).into()),
border_focused: Some(rgba(0xc3d7dbff).into()),
border_selected: Some(rgba(0xc3d7dbff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -60,7 +60,7 @@ pub fn rose_pine() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x5752794c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xe5e0dfff).into()),
scrollbar_thumb_border: Some(rgba(0xe5e0dfff).into()),
- scrollbar_track_background: Some(rgba(0xfaf4edff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xfdf8f1ff).into()),
editor_foreground: Some(rgba(0x575279ff).into()),
editor_background: Some(rgba(0xfaf4edff).into()),
@@ -479,7 +479,7 @@ pub fn rose_pine() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x504c68ff).into()),
- border_variant: Some(rgba(0x504c68ff).into()),
+ border_variant: Some(rgba(0x322f48ff).into()),
border_focused: Some(rgba(0x435255ff).into()),
border_selected: Some(rgba(0x435255ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -518,7 +518,7 @@ pub fn rose_pine() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xe0def44c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x322f48ff).into()),
scrollbar_thumb_border: Some(rgba(0x322f48ff).into()),
- scrollbar_track_background: Some(rgba(0x232136ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x27243bff).into()),
editor_foreground: Some(rgba(0xe0def4ff).into()),
editor_background: Some(rgba(0x232136ff).into()),
@@ -937,7 +937,7 @@ pub fn rose_pine() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x423f55ff).into()),
- border_variant: Some(rgba(0x423f55ff).into()),
+ border_variant: Some(rgba(0x232132ff).into()),
border_focused: Some(rgba(0x435255ff).into()),
border_selected: Some(rgba(0x435255ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -976,7 +976,7 @@ pub fn rose_pine() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xe0def44c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x232132ff).into()),
scrollbar_thumb_border: Some(rgba(0x232132ff).into()),
- scrollbar_track_background: Some(rgba(0x191724ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x1c1a29ff).into()),
editor_foreground: Some(rgba(0xe0def4ff).into()),
editor_background: Some(rgba(0x191724ff).into()),
diff --git a/crates/theme/src/themes/sandcastle.rs b/crates/theme/src/themes/sandcastle.rs
index 9ca7a9dff2bb3483ec737d9b146985ae4fdaa965..bace9e936f8c26364cc57151b8bbc81c5cd21cc4 100644
--- a/crates/theme/src/themes/sandcastle.rs
+++ b/crates/theme/src/themes/sandcastle.rs
@@ -20,7 +20,7 @@ pub fn sandcastle() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3d4350ff).into()),
- border_variant: Some(rgba(0x3d4350ff).into()),
+ border_variant: Some(rgba(0x313741ff).into()),
border_focused: Some(rgba(0x223232ff).into()),
border_selected: Some(rgba(0x223232ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -59,7 +59,7 @@ pub fn sandcastle() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xfdf4c14c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x313741ff).into()),
scrollbar_thumb_border: Some(rgba(0x313741ff).into()),
- scrollbar_track_background: Some(rgba(0x282c34ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x2a2f38ff).into()),
editor_foreground: Some(rgba(0xfdf4c1ff).into()),
editor_background: Some(rgba(0x282c34ff).into()),
diff --git a/crates/theme/src/themes/solarized.rs b/crates/theme/src/themes/solarized.rs
index 945d99ed5bd5da5eaa012fabf5527a6e25b722fd..c925785b176018f2813e396a22a35569504aca85 100644
--- a/crates/theme/src/themes/solarized.rs
+++ b/crates/theme/src/themes/solarized.rs
@@ -21,7 +21,7 @@ pub fn solarized() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x9faaa8ff).into()),
- border_variant: Some(rgba(0x9faaa8ff).into()),
+ border_variant: Some(rgba(0xdcdacbff).into()),
border_focused: Some(rgba(0xbfd3efff).into()),
border_selected: Some(rgba(0xbfd3efff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -60,7 +60,7 @@ pub fn solarized() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0x002b364c).into()),
scrollbar_thumb_hover_background: Some(rgba(0xdcdacbff).into()),
scrollbar_thumb_border: Some(rgba(0xdcdacbff).into()),
- scrollbar_track_background: Some(rgba(0xfdf6e3ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0xf5eedbff).into()),
editor_foreground: Some(rgba(0x002b36ff).into()),
editor_background: Some(rgba(0xfdf6e3ff).into()),
@@ -465,7 +465,7 @@ pub fn solarized() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2b4f58ff).into()),
- border_variant: Some(rgba(0x2b4f58ff).into()),
+ border_variant: Some(rgba(0x063541ff).into()),
border_focused: Some(rgba(0x1c3249ff).into()),
border_selected: Some(rgba(0x1c3249ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -504,7 +504,7 @@ pub fn solarized() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xfdf6e34c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x063541ff).into()),
scrollbar_thumb_border: Some(rgba(0x063541ff).into()),
- scrollbar_track_background: Some(rgba(0x002b36ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x032f3bff).into()),
editor_foreground: Some(rgba(0xfdf6e3ff).into()),
editor_background: Some(rgba(0x002b36ff).into()),
diff --git a/crates/theme/src/themes/summercamp.rs b/crates/theme/src/themes/summercamp.rs
index 963608d5db1a4a5d5fffcda73bbb1de267a27761..2ee5f12394dd00328a2d2c698d44687aeeab94b6 100644
--- a/crates/theme/src/themes/summercamp.rs
+++ b/crates/theme/src/themes/summercamp.rs
@@ -20,7 +20,7 @@ pub fn summercamp() -> UserThemeFamily {
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x312d21ff).into()),
- border_variant: Some(rgba(0x312d21ff).into()),
+ border_variant: Some(rgba(0x29251bff).into()),
border_focused: Some(rgba(0x193761ff).into()),
border_selected: Some(rgba(0x193761ff).into()),
border_transparent: Some(rgba(0x00000000).into()),
@@ -59,7 +59,7 @@ pub fn summercamp() -> UserThemeFamily {
scrollbar_thumb_background: Some(rgba(0xf8f5de4c).into()),
scrollbar_thumb_hover_background: Some(rgba(0x29251bff).into()),
scrollbar_thumb_border: Some(rgba(0x29251bff).into()),
- scrollbar_track_background: Some(rgba(0x1c1810ff).into()),
+ scrollbar_track_background: Some(rgba(0x00000000).into()),
scrollbar_track_border: Some(rgba(0x221e15ff).into()),
editor_foreground: Some(rgba(0xf8f5deff).into()),
editor_background: Some(rgba(0x1c1810ff).into()),
diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs
index 45563971d17ceabdeecdb5fbfe31d0cb46d5451a..86c40dfde55a29cb7bb0c6745ae433ecba6553d3 100644
--- a/crates/theme_importer/src/zed1/converter.rs
+++ b/crates/theme_importer/src/zed1/converter.rs
@@ -187,7 +187,7 @@ impl Zed1ThemeConverter {
Ok(ThemeColorsRefinement {
border: convert(lowest.base.default.border),
- border_variant: convert(lowest.variant.default.border),
+ border_variant: convert(middle.variant.default.border),
border_focused: convert(lowest.accent.hovered.border),
border_selected: convert(lowest.accent.default.border),
border_transparent: Some(gpui::transparent_black()),
@@ -230,7 +230,7 @@ impl Zed1ThemeConverter {
.map(|color| color_alpha(color, 0.3)),
scrollbar_thumb_hover_background: convert(middle.base.hovered.background),
scrollbar_thumb_border: convert(middle.base.default.border),
- scrollbar_track_background: convert(highest.base.default.background),
+ scrollbar_track_background: Some(gpui::transparent_black()),
scrollbar_track_border: convert(highest.variant.default.border),
editor_foreground: convert(editor.text_color),
editor_background: convert(editor.background),
diff --git a/crates/ui/docs/todo.md b/crates/ui/docs/todo.md
deleted file mode 100644
index e7a053ecf47d212e9527733a629482c57a2359eb..0000000000000000000000000000000000000000
--- a/crates/ui/docs/todo.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Documentation priorities:
-
-These are the priorities to get documented, in a rough stack rank order:
-
-- [ ] label
-- [ ] button
-- [ ] icon_button
-- [ ] icon
-- [ ] list
-- [ ] avatar
-- [ ] panel
-- [ ] modal
-- [ ] palette
-- [ ] input
-- [ ] facepile
-- [ ] player
-- [ ] stacks
-- [ ] context menu
-- [ ] input
-- [ ] textarea/multiline input (not built - not an editor)
-- [ ] indicator
-- [ ] public actor
-- [ ] keybinding
-- [ ] tab
-- [ ] toast
diff --git a/crates/ui/src/components/icon.rs b/crates/ui/src/components/icon.rs
index 9c0b1e58e301306bbcd7b5494bafc0ba5c1a582f..4c6e48c0fc034dbcfbd4454c920b2d4a994b92b0 100644
--- a/crates/ui/src/components/icon.rs
+++ b/crates/ui/src/components/icon.rs
@@ -29,6 +29,7 @@ pub enum Icon {
ArrowRight,
ArrowUp,
ArrowUpRight,
+ ArrowCircle,
AtSign,
AudioOff,
AudioOn,
@@ -119,6 +120,7 @@ impl Icon {
Icon::ArrowRight => "icons/arrow_right.svg",
Icon::ArrowUp => "icons/arrow_up.svg",
Icon::ArrowUpRight => "icons/arrow_up_right.svg",
+ Icon::ArrowCircle => "icons/arrow_circle.svg",
Icon::AtSign => "icons/at_sign.svg",
Icon::AudioOff => "icons/speaker_off.svg",
Icon::AudioOn => "icons/speaker_loud.svg",
diff --git a/crates/ui/src/ui.rs b/crates/ui/src/ui.rs
index b34e66dbdaaf990b6c87cfd13be0907d1b2e6cbb..b074f10dad50b9e61d0ed69ca29f39687e54973e 100644
--- a/crates/ui/src/ui.rs
+++ b/crates/ui/src/ui.rs
@@ -2,15 +2,8 @@
//!
//! This crate provides a set of UI primitives and components that are used to build all of the elements in Zed's UI.
//!
-//! ## Work in Progress
-//!
-//! This crate is still a work in progress. The initial primitives and components are built for getting all the UI on the screen,
-//! much of the state and functionality is mocked or hard codeded, and performance has not been a focus.
-//!
-#![doc = include_str!("../docs/hello-world.md")]
#![doc = include_str!("../docs/building-ui.md")]
-#![doc = include_str!("../docs/todo.md")]
mod clickable;
mod components;