Refine ported Zed1 themes (#3804)

This PR applies another round of refinements to the ported Zed1 themes.

Most of this was focused around the coloration of UI text to better
match Zed1.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-12-22 21:49:27 -05:00 committed by GitHub
commit 5a910aa874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 173 additions and 165 deletions

View File

@ -53,12 +53,15 @@ impl Render for Breadcrumbs {
};
let highlighted_segments = segments.into_iter().map(|segment| {
let mut text_style = cx.text_style();
text_style.color = Color::Muted.color(cx);
StyledText::new(segment.text)
.with_highlights(&cx.text_style(), segment.highlights.unwrap_or_default())
.with_highlights(&text_style, segment.highlights.unwrap_or_default())
.into_any()
});
let breadcrumbs = Itertools::intersperse_with(highlighted_segments, || {
Label::new("").into_any_element()
Label::new("").color(Color::Muted).into_any_element()
});
let editor = active_item

View File

@ -1372,7 +1372,11 @@ impl ProjectPanel {
GitFileStatus::Modified => Color::Modified,
GitFileStatus::Conflict => Color::Conflict,
})
.unwrap_or(Color::Default);
.unwrap_or(if is_selected {
Color::Default
} else {
Color::Muted
});
let file_name = details.filename.clone();
let icon = details.icon.clone();

View File

@ -18,15 +18,15 @@ pub fn andromeda() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2b2f39ff).into()),
border_variant: Some(rgba(0x2b2f39ff).into()),
border: Some(rgba(0x252931ff).into()),
border_variant: Some(rgba(0x21232aff).into()),
elevated_surface_background: Some(rgba(0x262a33ff).into()),
background: Some(rgba(0x262a33ff).into()),
panel_background: Some(rgba(0x21242bff).into()),
element_hover: Some(rgba(0x2b2f3980).into()),
element_selected: Some(rgba(0x383b4580).into()),
text: Some(rgba(0xaca8aeff).into()),
text_muted: Some(rgba(0x474a53ff).into()),
text: Some(rgba(0xf7f7f8ff).into()),
text_muted: Some(rgba(0xaca8aeff).into()),
text_placeholder: Some(rgba(0x474a53ff).into()),
text_disabled: Some(rgba(0xf7f7f8ff).into()),
text_accent: Some(rgba(0x11a793ff).into()),

View File

@ -19,15 +19,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x969585ff).into()),
border_variant: Some(rgba(0x969585ff).into()),
border: Some(rgba(0xd1d0c6ff).into()),
border_variant: Some(rgba(0xedece5ff).into()),
elevated_surface_background: Some(rgba(0xc5c4b9ff).into()),
background: Some(rgba(0xc5c4b9ff).into()),
panel_background: Some(rgba(0xebeae3ff).into()),
element_hover: Some(rgba(0x96958580).into()),
element_selected: Some(rgba(0x8b8a7880).into()),
text: Some(rgba(0x61604fff).into()),
text_muted: Some(rgba(0x878573ff).into()),
text: Some(rgba(0x22221bff).into()),
text_muted: Some(rgba(0x61604fff).into()),
text_placeholder: Some(rgba(0x878573ff).into()),
text_disabled: Some(rgba(0x22221bff).into()),
text_accent: Some(rgba(0x38a166ff).into()),
@ -379,15 +379,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x665f5cff).into()),
border_variant: Some(rgba(0x665f5cff).into()),
border: Some(rgba(0x3b3431ff).into()),
border_variant: Some(rgba(0x251f1dff).into()),
elevated_surface_background: Some(rgba(0x443c39ff).into()),
background: Some(rgba(0x443c39ff).into()),
panel_background: Some(rgba(0x27211eff).into()),
element_hover: Some(rgba(0x665f5c80).into()),
element_selected: Some(rgba(0x71696680).into()),
text: Some(rgba(0xa79f9dff).into()),
text_muted: Some(rgba(0x766e6bff).into()),
text: Some(rgba(0xf1efeeff).into()),
text_muted: Some(rgba(0xa79f9dff).into()),
text_placeholder: Some(rgba(0x766e6bff).into()),
text_disabled: Some(rgba(0xf1efeeff).into()),
text_accent: Some(rgba(0x417ee6ff).into()),
@ -739,15 +739,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8b968eff).into()),
border_variant: Some(rgba(0x8b968eff).into()),
border: Some(rgba(0xc8d1cbff).into()),
border_variant: Some(rgba(0xe5ede7ff).into()),
elevated_surface_background: Some(rgba(0xbcc5bfff).into()),
background: Some(rgba(0xbcc5bfff).into()),
panel_background: Some(rgba(0xe3ebe6ff).into()),
element_hover: Some(rgba(0x8b968e80).into()),
element_selected: Some(rgba(0x7e8b8280).into()),
text: Some(rgba(0x546259ff).into()),
text_muted: Some(rgba(0x79877dff).into()),
text: Some(rgba(0x171c19ff).into()),
text_muted: Some(rgba(0x546259ff).into()),
text_placeholder: Some(rgba(0x79877dff).into()),
text_disabled: Some(rgba(0x171c19ff).into()),
text_accent: Some(rgba(0x488c90ff).into()),
@ -1099,15 +1099,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x56505eff).into()),
border_variant: Some(rgba(0x56505eff).into()),
border: Some(rgba(0x332f38ff).into()),
border_variant: Some(rgba(0x201e24ff).into()),
elevated_surface_background: Some(rgba(0x3a353fff).into()),
background: Some(rgba(0x3a353fff).into()),
panel_background: Some(rgba(0x221f26ff).into()),
element_hover: Some(rgba(0x56505e80).into()),
element_selected: Some(rgba(0x605a6880).into()),
text: Some(rgba(0x898591ff).into()),
text_muted: Some(rgba(0x655f6dff).into()),
text: Some(rgba(0xefecf4ff).into()),
text_muted: Some(rgba(0x898591ff).into()),
text_placeholder: Some(rgba(0x655f6dff).into()),
text_disabled: Some(rgba(0xefecf4ff).into()),
text_accent: Some(rgba(0x576ddaff).into()),
@ -1459,15 +1459,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5d5c4cff).into()),
border_variant: Some(rgba(0x5d5c4cff).into()),
border: Some(rgba(0x3c3b31ff).into()),
border_variant: Some(rgba(0x2a2922ff).into()),
elevated_surface_background: Some(rgba(0x424136ff).into()),
background: Some(rgba(0x424136ff).into()),
panel_background: Some(rgba(0x2c2b23ff).into()),
element_hover: Some(rgba(0x5d5c4c80).into()),
element_selected: Some(rgba(0x67665580).into()),
text: Some(rgba(0x91907fff).into()),
text_muted: Some(rgba(0x6c6b5aff).into()),
text: Some(rgba(0xf4f3ecff).into()),
text_muted: Some(rgba(0x91907fff).into()),
text_placeholder: Some(rgba(0x6c6b5aff).into()),
text_disabled: Some(rgba(0xf4f3ecff).into()),
text_accent: Some(rgba(0x37a166ff).into()),
@ -1819,15 +1819,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5c6485ff).into()),
border_variant: Some(rgba(0x5c6485ff).into()),
border: Some(rgba(0x363f62ff).into()),
border_variant: Some(rgba(0x252d4fff).into()),
elevated_surface_background: Some(rgba(0x3e4769ff).into()),
background: Some(rgba(0x3e4769ff).into()),
panel_background: Some(rgba(0x262f51ff).into()),
element_hover: Some(rgba(0x5c648580).into()),
element_selected: Some(rgba(0x666e8f80).into()),
text: Some(rgba(0x959bb2ff).into()),
text_muted: Some(rgba(0x6b7394ff).into()),
text: Some(rgba(0xf5f7ffff).into()),
text_muted: Some(rgba(0x959bb2ff).into()),
text_placeholder: Some(rgba(0x6b7394ff).into()),
text_disabled: Some(rgba(0xf5f7ffff).into()),
text_accent: Some(rgba(0x3e8fd0ff).into()),
@ -2179,15 +2179,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x9a9fb6ff).into()),
border_variant: Some(rgba(0x9a9fb6ff).into()),
border: Some(rgba(0xccd0e1ff).into()),
border_variant: Some(rgba(0xe9ebf7ff).into()),
elevated_surface_background: Some(rgba(0xc2c6d9ff).into()),
background: Some(rgba(0xc2c6d9ff).into()),
panel_background: Some(rgba(0xe5e8f5ff).into()),
element_hover: Some(rgba(0x9a9fb680).into()),
element_selected: Some(rgba(0x8e94aa80).into()),
text: Some(rgba(0x606889ff).into()),
text_muted: Some(rgba(0x898fa5ff).into()),
text: Some(rgba(0x202746ff).into()),
text_muted: Some(rgba(0x606889ff).into()),
text_placeholder: Some(rgba(0x898fa5ff).into()),
text_disabled: Some(rgba(0x202746ff).into()),
text_accent: Some(rgba(0x3f8fd0ff).into()),
@ -2539,15 +2539,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x6c695cff).into()),
border_variant: Some(rgba(0x6c695cff).into()),
border: Some(rgba(0x3b3933ff).into()),
border_variant: Some(rgba(0x252521ff).into()),
elevated_surface_background: Some(rgba(0x45433bff).into()),
background: Some(rgba(0x45433bff).into()),
panel_background: Some(rgba(0x262622ff).into()),
element_hover: Some(rgba(0x6c695c80).into()),
element_selected: Some(rgba(0x77746480).into()),
text: Some(rgba(0xa4a08bff).into()),
text_muted: Some(rgba(0x7c7968ff).into()),
text: Some(rgba(0xfefbecff).into()),
text_muted: Some(rgba(0xa4a08bff).into()),
text_placeholder: Some(rgba(0x7c7968ff).into()),
text_disabled: Some(rgba(0xfefbecff).into()),
text_accent: Some(rgba(0x6684e0ff).into()),
@ -2899,15 +2899,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5c6c5cff).into()),
border_variant: Some(rgba(0x5c6c5cff).into()),
border: Some(rgba(0x333b33ff).into()),
border_variant: Some(rgba(0x1d201dff).into()),
elevated_surface_background: Some(rgba(0x3b453bff).into()),
background: Some(rgba(0x3b453bff).into()),
panel_background: Some(rgba(0x1f231fff).into()),
element_hover: Some(rgba(0x5c6c5c80).into()),
element_selected: Some(rgba(0x64776480).into()),
text: Some(rgba(0x8ba48bff).into()),
text_muted: Some(rgba(0x687c68ff).into()),
text: Some(rgba(0xf4fbf4ff).into()),
text_muted: Some(rgba(0x8ba48bff).into()),
text_placeholder: Some(rgba(0x687c68ff).into()),
text_disabled: Some(rgba(0xf4fbf4ff).into()),
text_accent: Some(rgba(0x3e62f4ff).into()),
@ -3259,15 +3259,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8f8b96ff).into()),
border_variant: Some(rgba(0x8f8b96ff).into()),
border: Some(rgba(0xcbc8d1ff).into()),
border_variant: Some(rgba(0xe8e5edff).into()),
elevated_surface_background: Some(rgba(0xbfbcc5ff).into()),
background: Some(rgba(0xbfbcc5ff).into()),
panel_background: Some(rgba(0xe6e3ebff).into()),
element_hover: Some(rgba(0x8f8b9680).into()),
element_selected: Some(rgba(0x837e8b80).into()),
text: Some(rgba(0x5a5462ff).into()),
text_muted: Some(rgba(0x7e7987ff).into()),
text: Some(rgba(0x19171cff).into()),
text_muted: Some(rgba(0x5a5462ff).into()),
text_placeholder: Some(rgba(0x7e7987ff).into()),
text_disabled: Some(rgba(0x19171cff).into()),
text_accent: Some(rgba(0x586ddaff).into()),
@ -3619,15 +3619,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x564e4eff).into()),
border_variant: Some(rgba(0x564e4eff).into()),
border: Some(rgba(0x352f2fff).into()),
border_variant: Some(rgba(0x231f1fff).into()),
elevated_surface_background: Some(rgba(0x3b3535ff).into()),
background: Some(rgba(0x3b3535ff).into()),
panel_background: Some(rgba(0x252020ff).into()),
element_hover: Some(rgba(0x564e4e80).into()),
element_selected: Some(rgba(0x60585880).into()),
text: Some(rgba(0x898383ff).into()),
text_muted: Some(rgba(0x655d5dff).into()),
text: Some(rgba(0xf4ececff).into()),
text_muted: Some(rgba(0x898383ff).into()),
text_placeholder: Some(rgba(0x655d5dff).into()),
text_disabled: Some(rgba(0xf4ececff).into()),
text_accent: Some(rgba(0x7272caff).into()),
@ -3979,15 +3979,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x675b67ff).into()),
border_variant: Some(rgba(0x675b67ff).into()),
border: Some(rgba(0x393239ff).into()),
border_variant: Some(rgba(0x231e23ff).into()),
elevated_surface_background: Some(rgba(0x433a43ff).into()),
background: Some(rgba(0x433a43ff).into()),
panel_background: Some(rgba(0x252025ff).into()),
element_hover: Some(rgba(0x675b6780).into()),
element_selected: Some(rgba(0x72647280).into()),
text: Some(rgba(0xa99aa9ff).into()),
text_muted: Some(rgba(0x776977ff).into()),
text: Some(rgba(0xf7f3f7ff).into()),
text_muted: Some(rgba(0xa99aa9ff).into()),
text_placeholder: Some(rgba(0x776977ff).into()),
text_disabled: Some(rgba(0xf7f3f7ff).into()),
text_accent: Some(rgba(0x526aebff).into()),
@ -4339,15 +4339,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x4f6b78ff).into()),
border_variant: Some(rgba(0x4f6b78ff).into()),
border: Some(rgba(0x2c3b42ff).into()),
border_variant: Some(rgba(0x1b2327ff).into()),
elevated_surface_background: Some(rgba(0x33444dff).into()),
background: Some(rgba(0x33444dff).into()),
panel_background: Some(rgba(0x1c2529ff).into()),
element_hover: Some(rgba(0x4f6b7880).into()),
element_selected: Some(rgba(0x57768580).into()),
text: Some(rgba(0x7ca0b3ff).into()),
text_muted: Some(rgba(0x5a7b8bff).into()),
text: Some(rgba(0xebf8ffff).into()),
text_muted: Some(rgba(0x7ca0b3ff).into()),
text_placeholder: Some(rgba(0x5a7b8bff).into()),
text_disabled: Some(rgba(0xebf8ffff).into()),
text_accent: Some(rgba(0x277fadff).into()),
@ -4699,15 +4699,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xaaa3a1ff).into()),
border_variant: Some(rgba(0xaaa3a1ff).into()),
border: Some(rgba(0xd6d1cfff).into()),
border_variant: Some(rgba(0xebe8e6ff).into()),
elevated_surface_background: Some(rgba(0xcdc8c6ff).into()),
background: Some(rgba(0xcdc8c6ff).into()),
panel_background: Some(rgba(0xe9e6e4ff).into()),
element_hover: Some(rgba(0xaaa3a180).into()),
element_selected: Some(rgba(0xa1999680).into()),
text: Some(rgba(0x6a6360ff).into()),
text_muted: Some(rgba(0x9c9491ff).into()),
text: Some(rgba(0x1b1918ff).into()),
text_muted: Some(rgba(0x6a6360ff).into()),
text_placeholder: Some(rgba(0x9c9491ff).into()),
text_disabled: Some(rgba(0x1b1918ff).into()),
text_accent: Some(rgba(0x417ee6ff).into()),
@ -5059,15 +5059,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xa8a48eff).into()),
border_variant: Some(rgba(0xa8a48eff).into()),
border: Some(rgba(0xd7d3beff).into()),
border_variant: Some(rgba(0xf2eedcff).into()),
elevated_surface_background: Some(rgba(0xcecab4ff).into()),
background: Some(rgba(0xcecab4ff).into()),
panel_background: Some(rgba(0xeeebd7ff).into()),
element_hover: Some(rgba(0xa8a48e80).into()),
element_selected: Some(rgba(0x9e9a8580).into()),
text: Some(rgba(0x706d5fff).into()),
text_muted: Some(rgba(0x999580ff).into()),
text: Some(rgba(0x20201dff).into()),
text_muted: Some(rgba(0x706d5fff).into()),
text_placeholder: Some(rgba(0x999580ff).into()),
text_disabled: Some(rgba(0x20201dff).into()),
text_accent: Some(rgba(0x6784e0ff).into()),
@ -5419,15 +5419,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8e8989ff).into()),
border_variant: Some(rgba(0x8e8989ff).into()),
border: Some(rgba(0xcfc7c7ff).into()),
border_variant: Some(rgba(0xede5e5ff).into()),
elevated_surface_background: Some(rgba(0xc1bbbbff).into()),
background: Some(rgba(0xc1bbbbff).into()),
panel_background: Some(rgba(0xebe3e3ff).into()),
element_hover: Some(rgba(0x8e898980).into()),
element_selected: Some(rgba(0x837c7c80).into()),
text: Some(rgba(0x5a5252ff).into()),
text_muted: Some(rgba(0x7e7777ff).into()),
text: Some(rgba(0x1b1818ff).into()),
text_muted: Some(rgba(0x5a5252ff).into()),
text_placeholder: Some(rgba(0x7e7777ff).into()),
text_disabled: Some(rgba(0x1b1818ff).into()),
text_accent: Some(rgba(0x7372caff).into()),
@ -5779,15 +5779,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8ea88eff).into()),
border_variant: Some(rgba(0x8ea88eff).into()),
border: Some(rgba(0xbed7beff).into()),
border_variant: Some(rgba(0xdff0dfff).into()),
elevated_surface_background: Some(rgba(0xb4ceb4ff).into()),
background: Some(rgba(0xb4ceb4ff).into()),
panel_background: Some(rgba(0xdaeedaff).into()),
element_hover: Some(rgba(0x8ea88e80).into()),
element_selected: Some(rgba(0x859e8580).into()),
text: Some(rgba(0x5f705fff).into()),
text_muted: Some(rgba(0x809980ff).into()),
text: Some(rgba(0x131513ff).into()),
text_muted: Some(rgba(0x5f705fff).into()),
text_placeholder: Some(rgba(0x809980ff).into()),
text_disabled: Some(rgba(0x131513ff).into()),
text_accent: Some(rgba(0x3f62f4ff).into()),
@ -6139,15 +6139,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x505e55ff).into()),
border_variant: Some(rgba(0x505e55ff).into()),
border: Some(rgba(0x2f3832ff).into()),
border_variant: Some(rgba(0x1e2420ff).into()),
elevated_surface_background: Some(rgba(0x353f39ff).into()),
background: Some(rgba(0x353f39ff).into()),
panel_background: Some(rgba(0x1f2621ff).into()),
element_hover: Some(rgba(0x505e5580).into()),
element_selected: Some(rgba(0x5a685f80).into()),
text: Some(rgba(0x859188ff).into()),
text_muted: Some(rgba(0x5f6d64ff).into()),
text: Some(rgba(0xecf4eeff).into()),
text_muted: Some(rgba(0x859188ff).into()),
text_placeholder: Some(rgba(0x5f6d64ff).into()),
text_disabled: Some(rgba(0xecf4eeff).into()),
text_accent: Some(rgba(0x478c90ff).into()),
@ -6499,15 +6499,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xad9dadff).into()),
border_variant: Some(rgba(0xad9dadff).into()),
border: Some(rgba(0xcdbecdff).into()),
border_variant: Some(rgba(0xe5dce5ff).into()),
elevated_surface_background: Some(rgba(0xc6b8c6ff).into()),
background: Some(rgba(0xc6b8c6ff).into()),
panel_background: Some(rgba(0xe1d6e1ff).into()),
element_hover: Some(rgba(0xad9dad80).into()),
element_selected: Some(rgba(0xa394a380).into()),
text: Some(rgba(0x6b5e6bff).into()),
text_muted: Some(rgba(0x9e8f9eff).into()),
text: Some(rgba(0x1b181bff).into()),
text_muted: Some(rgba(0x6b5e6bff).into()),
text_placeholder: Some(rgba(0x9e8f9eff).into()),
text_disabled: Some(rgba(0x1b181bff).into()),
text_accent: Some(rgba(0x526aebff).into()),
@ -6859,15 +6859,15 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x80a4b6ff).into()),
border_variant: Some(rgba(0x80a4b6ff).into()),
border: Some(rgba(0xb0d3e5ff).into()),
border_variant: Some(rgba(0xd3edfaff).into()),
elevated_surface_background: Some(rgba(0xa6cadcff).into()),
background: Some(rgba(0xa6cadcff).into()),
panel_background: Some(rgba(0xcdeaf9ff).into()),
element_hover: Some(rgba(0x80a4b680).into()),
element_selected: Some(rgba(0x769aad80).into()),
text: Some(rgba(0x526f7dff).into()),
text_muted: Some(rgba(0x7195a8ff).into()),
text: Some(rgba(0x161b1dff).into()),
text_muted: Some(rgba(0x526f7dff).into()),
text_placeholder: Some(rgba(0x7195a8ff).into()),
text_disabled: Some(rgba(0x161b1dff).into()),
text_accent: Some(rgba(0x277fadff).into()),

View File

@ -19,15 +19,15 @@ pub fn ayu() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3f4043ff).into()),
border_variant: Some(rgba(0x3f4043ff).into()),
border: Some(rgba(0x2d2f34ff).into()),
border_variant: Some(rgba(0x1b1e24ff).into()),
elevated_surface_background: Some(rgba(0x313337ff).into()),
background: Some(rgba(0x313337ff).into()),
panel_background: Some(rgba(0x1f2127ff).into()),
element_hover: Some(rgba(0x3f404380).into()),
element_selected: Some(rgba(0x50515280).into()),
text: Some(rgba(0x8a8986ff).into()),
text_muted: Some(rgba(0x58595aff).into()),
text: Some(rgba(0xbfbdb6ff).into()),
text_muted: Some(rgba(0x8a8986ff).into()),
text_placeholder: Some(rgba(0x58595aff).into()),
text_disabled: Some(rgba(0xbfbdb6ff).into()),
text_accent: Some(rgba(0x5ac2feff).into()),
@ -358,15 +358,15 @@ pub fn ayu() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xcfd1d2ff).into()),
border_variant: Some(rgba(0xcfd1d2ff).into()),
border: Some(rgba(0xdfe0e1ff).into()),
border_variant: Some(rgba(0xefeff0ff).into()),
elevated_surface_background: Some(rgba(0xdcdddeff).into()),
background: Some(rgba(0xdcdddeff).into()),
panel_background: Some(rgba(0xececedff).into()),
element_hover: Some(rgba(0xcfd1d280).into()),
element_selected: Some(rgba(0xc0c2c480).into()),
text: Some(rgba(0x8c8f93ff).into()),
text_muted: Some(rgba(0xb9bbbdff).into()),
text: Some(rgba(0x5c6166ff).into()),
text_muted: Some(rgba(0x8c8f93ff).into()),
text_placeholder: Some(rgba(0xb9bbbdff).into()),
text_disabled: Some(rgba(0x5c6166ff).into()),
text_accent: Some(rgba(0x3b9ee5ff).into()),
@ -697,15 +697,15 @@ pub fn ayu() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x53565dff).into()),
border_variant: Some(rgba(0x53565dff).into()),
border: Some(rgba(0x43464fff).into()),
border_variant: Some(rgba(0x323641ff).into()),
elevated_surface_background: Some(rgba(0x464a52ff).into()),
background: Some(rgba(0x464a52ff).into()),
panel_background: Some(rgba(0x353944ff).into()),
element_hover: Some(rgba(0x53565d80).into()),
element_selected: Some(rgba(0x63656a80).into()),
text: Some(rgba(0x9a9a98ff).into()),
text_muted: Some(rgba(0x6b6d71ff).into()),
text: Some(rgba(0xcccac2ff).into()),
text_muted: Some(rgba(0x9a9a98ff).into()),
text_placeholder: Some(rgba(0x6b6d71ff).into()),
text_disabled: Some(rgba(0xcccac2ff).into()),
text_accent: Some(rgba(0x73cffeff).into()),

View File

@ -19,15 +19,15 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
border_variant: Some(rgba(0xc9b99aff).into()),
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xefe2bcff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecddb5ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
element_selected: Some(rgba(0xb5a68e80).into()),
text: Some(rgba(0x5f5650ff).into()),
text_muted: Some(rgba(0xad9e87ff).into()),
text: Some(rgba(0x282828ff).into()),
text_muted: Some(rgba(0x5f5650ff).into()),
text_placeholder: Some(rgba(0xad9e87ff).into()),
text_disabled: Some(rgba(0x282828ff).into()),
text_accent: Some(rgba(0x0b6678ff).into()),
@ -365,15 +365,15 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
border_variant: Some(rgba(0x5b534dff).into()),
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x393634ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x3b3735ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
element_selected: Some(rgba(0x6e635a80).into()),
text: Some(rgba(0xc5b597ff).into()),
text_muted: Some(rgba(0x776b61ff).into()),
text: Some(rgba(0xfbf1c7ff).into()),
text_muted: Some(rgba(0xc5b597ff).into()),
text_placeholder: Some(rgba(0x776b61ff).into()),
text_disabled: Some(rgba(0xfbf1c7ff).into()),
text_accent: Some(rgba(0x83a598ff).into()),
@ -711,15 +711,15 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
border_variant: Some(rgba(0xc9b99aff).into()),
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xefe1b8ff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecddb4ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
element_selected: Some(rgba(0xb5a68e80).into()),
text: Some(rgba(0x5f5650ff).into()),
text_muted: Some(rgba(0xad9e87ff).into()),
text: Some(rgba(0x282828ff).into()),
text_muted: Some(rgba(0x5f5650ff).into()),
text_placeholder: Some(rgba(0xad9e87ff).into()),
text_disabled: Some(rgba(0x282828ff).into()),
text_accent: Some(rgba(0x0b6678ff).into()),
@ -1057,15 +1057,15 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
border_variant: Some(rgba(0x5b534dff).into()),
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x373432ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x3a3735ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
element_selected: Some(rgba(0x6e635a80).into()),
text: Some(rgba(0xc5b597ff).into()),
text_muted: Some(rgba(0x776b61ff).into()),
text: Some(rgba(0xfbf1c7ff).into()),
text_muted: Some(rgba(0xc5b597ff).into()),
text_placeholder: Some(rgba(0x776b61ff).into()),
text_disabled: Some(rgba(0xfbf1c7ff).into()),
text_accent: Some(rgba(0x83a598ff).into()),
@ -1403,15 +1403,15 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
border_variant: Some(rgba(0xc9b99aff).into()),
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xeddeb5ff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecdcb3ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
element_selected: Some(rgba(0xb5a68e80).into()),
text: Some(rgba(0x5f5650ff).into()),
text_muted: Some(rgba(0xad9e87ff).into()),
text: Some(rgba(0x282828ff).into()),
text_muted: Some(rgba(0x5f5650ff).into()),
text_placeholder: Some(rgba(0xad9e87ff).into()),
text_disabled: Some(rgba(0x282828ff).into()),
text_accent: Some(rgba(0x0b6678ff).into()),
@ -1749,15 +1749,15 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
border_variant: Some(rgba(0x5b534dff).into()),
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x343130ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x393634ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
element_selected: Some(rgba(0x6e635a80).into()),
text: Some(rgba(0xc5b597ff).into()),
text_muted: Some(rgba(0x776b61ff).into()),
text: Some(rgba(0xfbf1c7ff).into()),
text_muted: Some(rgba(0xc5b597ff).into()),
text_placeholder: Some(rgba(0x776b61ff).into()),
text_disabled: Some(rgba(0xfbf1c7ff).into()),
text_accent: Some(rgba(0x83a598ff).into()),

View File

@ -19,15 +19,15 @@ pub fn one() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9c9caff).into()),
border_variant: Some(rgba(0xc9c9caff).into()),
border: Some(rgba(0xdfdfe0ff).into()),
border_variant: Some(rgba(0xeeeeeeff).into()),
elevated_surface_background: Some(rgba(0xdcdcddff).into()),
background: Some(rgba(0xdcdcddff).into()),
panel_background: Some(rgba(0xebebecff).into()),
element_hover: Some(rgba(0xc9c9ca80).into()),
element_selected: Some(rgba(0xafafaf80).into()),
text: Some(rgba(0x7f8188ff).into()),
text_muted: Some(rgba(0xa7a7a8ff).into()),
text: Some(rgba(0x383a41ff).into()),
text_muted: Some(rgba(0x7f8188ff).into()),
text_placeholder: Some(rgba(0xa7a7a8ff).into()),
text_disabled: Some(rgba(0x383a41ff).into()),
text_accent: Some(rgba(0x5c79e2ff).into()),
@ -365,15 +365,15 @@ pub fn one() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x464b57ff).into()),
border_variant: Some(rgba(0x464b57ff).into()),
border: Some(rgba(0x363c46ff).into()),
border_variant: Some(rgba(0x2e333cff).into()),
elevated_surface_background: Some(rgba(0x3b414dff).into()),
background: Some(rgba(0x3b414dff).into()),
panel_background: Some(rgba(0x2f343eff).into()),
element_hover: Some(rgba(0x464b5780).into()),
element_selected: Some(rgba(0x4f545e80).into()),
text: Some(rgba(0x838994ff).into()),
text_muted: Some(rgba(0x545862ff).into()),
text: Some(rgba(0xc8ccd4ff).into()),
text_muted: Some(rgba(0x838994ff).into()),
text_placeholder: Some(rgba(0x545862ff).into()),
text_disabled: Some(rgba(0xc8ccd4ff).into()),
text_accent: Some(rgba(0x74ade8ff).into()),

View File

@ -19,15 +19,15 @@ pub fn rose_pine() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xdcd6d5ff).into()),
border_variant: Some(rgba(0xdcd6d5ff).into()),
border: Some(rgba(0xe5e0dfff).into()),
border_variant: Some(rgba(0xfdf8f1ff).into()),
elevated_surface_background: Some(rgba(0xdcd8d8ff).into()),
background: Some(rgba(0xdcd8d8ff).into()),
panel_background: Some(rgba(0xfef9f2ff).into()),
element_hover: Some(rgba(0xdcd6d580).into()),
element_selected: Some(rgba(0xc1bac180).into()),
text: Some(rgba(0x706c8cff).into()),
text_muted: Some(rgba(0xb1abb5ff).into()),
text: Some(rgba(0x575279ff).into()),
text_muted: Some(rgba(0x706c8cff).into()),
text_placeholder: Some(rgba(0xb1abb5ff).into()),
text_disabled: Some(rgba(0x575279ff).into()),
text_accent: Some(rgba(0x57949fff).into()),
@ -372,15 +372,15 @@ pub fn rose_pine() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x504c68ff).into()),
border_variant: Some(rgba(0x504c68ff).into()),
border: Some(rgba(0x322f48ff).into()),
border_variant: Some(rgba(0x27243bff).into()),
elevated_surface_background: Some(rgba(0x38354eff).into()),
background: Some(rgba(0x38354eff).into()),
panel_background: Some(rgba(0x28253cff).into()),
element_hover: Some(rgba(0x504c6880).into()),
element_selected: Some(rgba(0x45415d80).into()),
text: Some(rgba(0x85819eff).into()),
text_muted: Some(rgba(0x3a3653ff).into()),
text: Some(rgba(0xe0def4ff).into()),
text_muted: Some(rgba(0x85819eff).into()),
text_placeholder: Some(rgba(0x3a3653ff).into()),
text_disabled: Some(rgba(0xe0def4ff).into()),
text_accent: Some(rgba(0x9cced7ff).into()),
@ -725,15 +725,15 @@ pub fn rose_pine() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x423f55ff).into()),
border_variant: Some(rgba(0x423f55ff).into()),
border: Some(rgba(0x232132ff).into()),
border_variant: Some(rgba(0x1c1a29ff).into()),
elevated_surface_background: Some(rgba(0x292739ff).into()),
background: Some(rgba(0x292739ff).into()),
panel_background: Some(rgba(0x1d1b2aff).into()),
element_hover: Some(rgba(0x423f5580).into()),
element_selected: Some(rgba(0x47445b80).into()),
text: Some(rgba(0x75718eff).into()),
text_muted: Some(rgba(0x3b384fff).into()),
text: Some(rgba(0xe0def4ff).into()),
text_muted: Some(rgba(0x75718eff).into()),
text_placeholder: Some(rgba(0x3b384fff).into()),
text_disabled: Some(rgba(0xe0def4ff).into()),
text_accent: Some(rgba(0x9cced7ff).into()),

View File

@ -18,15 +18,15 @@ pub fn sandcastle() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3d4350ff).into()),
border_variant: Some(rgba(0x3d4350ff).into()),
border: Some(rgba(0x313741ff).into()),
border_variant: Some(rgba(0x2a2f38ff).into()),
elevated_surface_background: Some(rgba(0x333944ff).into()),
background: Some(rgba(0x333944ff).into()),
panel_background: Some(rgba(0x2b3039ff).into()),
element_hover: Some(rgba(0x3d435080).into()),
element_selected: Some(rgba(0x57535380).into()),
text: Some(rgba(0xa69782ff).into()),
text_muted: Some(rgba(0x645b54ff).into()),
text: Some(rgba(0xfdf4c1ff).into()),
text_muted: Some(rgba(0xa69782ff).into()),
text_placeholder: Some(rgba(0x645b54ff).into()),
text_disabled: Some(rgba(0xfdf4c1ff).into()),
text_accent: Some(rgba(0x528b8bff).into()),

View File

@ -19,15 +19,15 @@ pub fn solarized() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x9faaa8ff).into()),
border_variant: Some(rgba(0x9faaa8ff).into()),
border: Some(rgba(0xdcdacbff).into()),
border_variant: Some(rgba(0xf5eedbff).into()),
elevated_surface_background: Some(rgba(0xcfd0c4ff).into()),
background: Some(rgba(0xcfd0c4ff).into()),
panel_background: Some(rgba(0xf3eddaff).into()),
element_hover: Some(rgba(0x9faaa880).into()),
element_selected: Some(rgba(0x7f919480).into()),
text: Some(rgba(0x34555eff).into()),
text_muted: Some(rgba(0x788b8fff).into()),
text: Some(rgba(0x002b36ff).into()),
text_muted: Some(rgba(0x34555eff).into()),
text_placeholder: Some(rgba(0x788b8fff).into()),
text_disabled: Some(rgba(0x002b36ff).into()),
text_accent: Some(rgba(0x298bd1ff).into()),
@ -358,15 +358,15 @@ pub fn solarized() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2b4f58ff).into()),
border_variant: Some(rgba(0x2b4f58ff).into()),
border: Some(rgba(0x063541ff).into()),
border_variant: Some(rgba(0x032f3bff).into()),
elevated_surface_background: Some(rgba(0x083743ff).into()),
background: Some(rgba(0x083743ff).into()),
panel_background: Some(rgba(0x04313cff).into()),
element_hover: Some(rgba(0x2b4f5880).into()),
element_selected: Some(rgba(0x566d7480).into()),
text: Some(rgba(0x93a1a1ff).into()),
text_muted: Some(rgba(0x5f757dff).into()),
text: Some(rgba(0xfdf6e3ff).into()),
text_muted: Some(rgba(0x93a1a1ff).into()),
text_placeholder: Some(rgba(0x5f757dff).into()),
text_disabled: Some(rgba(0xfdf6e3ff).into()),
text_accent: Some(rgba(0x288bd1ff).into()),

View File

@ -18,15 +18,15 @@ pub fn summercamp() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x312d21ff).into()),
border_variant: Some(rgba(0x312d21ff).into()),
border: Some(rgba(0x29251bff).into()),
border_variant: Some(rgba(0x221e15ff).into()),
elevated_surface_background: Some(rgba(0x2a261cff).into()),
background: Some(rgba(0x2a261cff).into()),
panel_background: Some(rgba(0x231f16ff).into()),
element_hover: Some(rgba(0x312d2180).into()),
element_selected: Some(rgba(0x39342780).into()),
text: Some(rgba(0x736e55ff).into()),
text_muted: Some(rgba(0x3d382aff).into()),
text: Some(rgba(0xf8f5deff).into()),
text_muted: Some(rgba(0x736e55ff).into()),
text_placeholder: Some(rgba(0x3d382aff).into()),
text_disabled: Some(rgba(0xf8f5deff).into()),
text_accent: Some(rgba(0x499befff).into()),

View File

@ -99,11 +99,9 @@ impl Zed1ThemeConverter {
let scrollbar = &self.theme.editor.scrollbar;
let terminal = &self.theme.terminal;
let title_bar_border = convert(title_bar.container.border.color);
Ok(ThemeColorsRefinement {
border: title_bar_border,
border_variant: title_bar_border,
border: convert(active_tab.container.border.color),
border_variant: convert(toolbar.container.border.color),
background: convert(self.theme.workspace.background),
elevated_surface_background: picker.container.background_color.map(zed1_color_to_hsla),
title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla),
@ -116,8 +114,8 @@ impl Zed1ThemeConverter {
.container
.background_color
.map(zed1_color_to_hsla),
text: convert(self.theme.project_panel.entry.default_style().text.color),
text_muted: convert(active_tab.description.text.color),
text: convert(self.theme.collab_panel.channel_name.text.color),
text_muted: convert(tab_bar.pane_button.default_style().color),
text_accent: convert(status_bar.panel_buttons.button.active_state().icon_color),
text_disabled: convert(status_bar.panel_buttons.button.disabled_style().icon_color),
text_placeholder: picker

View File

@ -381,6 +381,7 @@ impl Pane {
.child(
IconButton::new("plus", Icon::Plus)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(cx.listener(|pane, _, cx| {
let menu = ContextMenu::build(cx, |menu, _| {
menu.action("New File", NewFile.boxed_clone())
@ -402,6 +403,7 @@ impl Pane {
.child(
IconButton::new("split", Icon::Split)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(cx.listener(|pane, _, cx| {
let menu = ContextMenu::build(cx, |menu, _| {
menu.action("Split Right", SplitRight.boxed_clone())
@ -422,6 +424,7 @@ impl Pane {
let zoomed = pane.is_zoomed();
IconButton::new("toggle_zoom", Icon::Maximize)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.selected(zoomed)
.selected_icon(Icon::Minimize)
.on_click(cx.listener(|pane, _, cx| {