Begin porting Zed1 themes to Zed2 (#3793)

This PR is a first pass at porting the Zed1 themes to Zed2.

For the initial release of Zed2 we'll be shipping just the themes that
existed in Zed1, ported to Zed2. The new themes that were previously
added just in Zed2 have been removed.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-12-22 17:37:53 -05:00 committed by GitHub
parent a1bd636c18
commit b501f4eafc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 11599 additions and 7614 deletions

View File

@ -721,10 +721,7 @@ impl PickerDelegate for FileFinderDelegate {
.child(
v_stack()
.child(HighlightedLabel::new(file_name, file_name_positions))
.child(
HighlightedLabel::new(full_path, full_path_positions)
.color(Color::Muted),
),
.child(HighlightedLabel::new(full_path, full_path_positions)),
),
)
}

View File

@ -6,8 +6,8 @@ use gpui::{HighlightStyle, SharedString};
use refineable::Refineable;
use crate::{
one_themes::one_family, zed_pro_family, Appearance, PlayerColors, StatusColors, SyntaxTheme,
SystemColors, Theme, ThemeColors, ThemeFamily, ThemeStyles, UserTheme, UserThemeFamily,
Appearance, PlayerColors, StatusColors, SyntaxTheme, SystemColors, Theme, ThemeColors,
ThemeFamily, ThemeStyles, UserTheme, UserThemeFamily,
};
#[derive(Debug, Clone)]
@ -34,7 +34,7 @@ impl ThemeRegistry {
}
#[allow(unused)]
fn insert_user_theme_familes(&mut self, families: impl IntoIterator<Item = UserThemeFamily>) {
fn insert_user_theme_families(&mut self, families: impl IntoIterator<Item = UserThemeFamily>) {
for family in families.into_iter() {
self.insert_user_themes(family.themes);
}
@ -117,18 +117,23 @@ impl ThemeRegistry {
pub fn load_user_themes(&mut self) {
#[cfg(not(feature = "importing-themes"))]
self.insert_user_theme_familes(crate::all_user_themes());
self.insert_user_theme_families(crate::all_user_themes());
}
}
impl Default for ThemeRegistry {
fn default() -> Self {
let mut this = Self {
let mut registry = Self {
themes: HashMap::default(),
};
this.insert_theme_families([zed_pro_family(), one_family()]);
// We're loading our new versions of the One themes by default, as
// we need them to be loaded for tests.
//
// These themes will get overwritten when `load_user_themes` is called
// when Zed starts, so the One variants used will be the ones ported from Zed1.
registry.insert_theme_families([crate::one_themes::one_family()]);
this
registry
}
}

View File

@ -12,287 +12,64 @@ use crate::{
pub fn andromeda() -> UserThemeFamily {
UserThemeFamily {
name: "Andromeda".into(),
author: "Eliver Lara (EliverLara)".into(),
themes: vec![
UserTheme {
author: "Zed Industries".into(),
themes: vec![UserTheme {
name: "Andromeda".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x1b1d23ff).into()),
border_variant: Some(rgba(0x1b1d23ff).into()),
border_focused: Some(rgba(0x746f77ff).into()),
border_selected: Some(rgba(0x1b1d23ff).into()),
border_transparent: Some(rgba(0x1b1d23ff).into()),
border_disabled: Some(rgba(0x1b1d23ff).into()),
elevated_surface_background: Some(rgba(0x2b303bff).into()),
surface_background: Some(rgba(0x23262eff).into()),
background: Some(rgba(0x23262eff).into()),
element_background: Some(rgba(0x00e8c5cc).into()),
element_hover: Some(rgba(0x23262eff).into()),
element_selected: Some(rgba(0x23262eff).into()),
drop_target_background: Some(rgba(0x3a404eff).into()),
ghost_element_hover: Some(rgba(0x23262eff).into()),
ghost_element_selected: Some(rgba(0x23262eff).into()),
text: Some(rgba(0xd5ced9ff).into()),
text_muted: Some(rgba(0x746f77ff).into()),
status_bar_background: Some(rgba(0x23262eff).into()),
title_bar_background: Some(rgba(0x23262eff).into()),
toolbar_background: Some(rgba(0x23262eff).into()),
tab_bar_background: Some(rgba(0x23262eff).into()),
tab_inactive_background: Some(rgba(0x23262eff).into()),
tab_active_background: Some(rgba(0x23262eff).into()),
scrollbar_thumb_background: Some(rgba(0x3a3f4c77).into()),
scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()),
scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()),
scrollbar_track_background: Some(rgba(0x23262eff).into()),
scrollbar_track_border: Some(rgba(0x1b1d23ff).into()),
editor_foreground: Some(rgba(0xd5ced9ff).into()),
editor_background: Some(rgba(0x23262eff).into()),
editor_gutter_background: Some(rgba(0x23262eff).into()),
editor_line_number: Some(rgba(0x746f77ff).into()),
editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
editor_wrap_guide: Some(rgba(0x1b1d23ff).into()),
editor_active_wrap_guide: Some(rgba(0x1b1d23ff).into()),
terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()),
terminal_ansi_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_cyan: Some(rgba(0x00e8c6ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x9bc53dbb).into()),
deleted: Some(rgba(0xfc644dbb).into()),
error: Some(rgba(0xfc644dff).into()),
hidden: Some(rgba(0x746f77ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x555555ff).into()),
modified: Some(rgba(0x5bc0ebbb).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0xa0a1a7cc).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xa0a1a7cc).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0xee5d43ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0xf92672ff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xc74dedff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc74dedff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xee5d43ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0xf92672ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x00e8c6ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x00e8c6ff).into()),
..Default::default()
},
),
],
}),
},
},
UserTheme {
name: "Andromeda Bordered".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x1b1d23ff).into()),
border_variant: Some(rgba(0x1b1d23ff).into()),
border_focused: Some(rgba(0x746f77ff).into()),
border_selected: Some(rgba(0x1b1d23ff).into()),
border_transparent: Some(rgba(0x1b1d23ff).into()),
border_disabled: Some(rgba(0x1b1d23ff).into()),
elevated_surface_background: Some(rgba(0x2b303bff).into()),
surface_background: Some(rgba(0x23262eff).into()),
border: Some(rgba(0x2b2f39ff).into()),
border_variant: Some(rgba(0x2b2f39ff).into()),
elevated_surface_background: Some(rgba(0x262a33ff).into()),
background: Some(rgba(0x262a33ff).into()),
element_background: Some(rgba(0x00e8c5cc).into()),
element_hover: Some(rgba(0x23262eff).into()),
element_selected: Some(rgba(0x23262eff).into()),
drop_target_background: Some(rgba(0x3a404eff).into()),
ghost_element_hover: Some(rgba(0x23262eff).into()),
ghost_element_selected: Some(rgba(0x23262eff).into()),
text: Some(rgba(0xd5ced9ff).into()),
text_muted: Some(rgba(0x746f77ff).into()),
status_bar_background: Some(rgba(0x23262eff).into()),
title_bar_background: Some(rgba(0x23262eff).into()),
toolbar_background: Some(rgba(0x262a33ff).into()),
tab_bar_background: Some(rgba(0x23262eff).into()),
tab_inactive_background: Some(rgba(0x23262eff).into()),
tab_active_background: Some(rgba(0x262a33ff).into()),
scrollbar_thumb_background: Some(rgba(0x3a3f4c77).into()),
scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()),
scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()),
scrollbar_track_background: Some(rgba(0x262a33ff).into()),
scrollbar_track_border: Some(rgba(0x1b1d23ff).into()),
editor_foreground: Some(rgba(0xd5ced9ff).into()),
editor_background: Some(rgba(0x262a33ff).into()),
editor_gutter_background: Some(rgba(0x262a33ff).into()),
editor_line_number: Some(rgba(0x746f77ff).into()),
editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
editor_wrap_guide: Some(rgba(0x1b1d23ff).into()),
editor_active_wrap_guide: Some(rgba(0x1b1d23ff).into()),
terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()),
terminal_ansi_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_cyan: Some(rgba(0x00e8c6ff).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()),
status_bar_background: Some(rgba(0x262a33ff).into()),
title_bar_background: Some(rgba(0x262a33ff).into()),
toolbar_background: Some(rgba(0x1e2025ff).into()),
tab_bar_background: Some(rgba(0x21242bff).into()),
tab_inactive_background: Some(rgba(0x21242bff).into()),
tab_active_background: Some(rgba(0x1e2025ff).into()),
scrollbar_thumb_background: Some(rgba(0xf7f7f84d).into()),
scrollbar_thumb_hover_background: Some(rgba(0xf7f7f84d).into()),
scrollbar_thumb_border: Some(rgba(0x21232aff).into()),
scrollbar_track_border: Some(rgba(0x21232aff).into()),
editor_foreground: Some(rgba(0xf7f7f8ff).into()),
editor_background: Some(rgba(0x1e2025ff).into()),
editor_gutter_background: Some(rgba(0x1e2025ff).into()),
editor_line_number: Some(rgba(0xf7f7f859).into()),
editor_active_line_number: Some(rgba(0xf7f7f8ff).into()),
editor_wrap_guide: Some(rgba(0xf7f7f80d).into()),
editor_active_wrap_guide: Some(rgba(0xf7f7f81a).into()),
terminal_background: Some(rgba(0x1e2025ff).into()),
terminal_ansi_bright_black: Some(rgba(0x40434cff).into()),
terminal_ansi_bright_red: Some(rgba(0x8e103aff).into()),
terminal_ansi_bright_green: Some(rgba(0x457c38ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0x958435ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x1b5148ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0x682781ff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x018169ff).into()),
terminal_ansi_bright_white: Some(rgba(0xf7f7f8ff).into()),
terminal_ansi_black: Some(rgba(0x1e2025ff).into()),
terminal_ansi_red: Some(rgba(0xf82872ff).into()),
terminal_ansi_green: Some(rgba(0x96df72ff).into()),
terminal_ansi_yellow: Some(rgba(0xfee56dff).into()),
terminal_ansi_blue: Some(rgba(0x11a793ff).into()),
terminal_ansi_magenta: Some(rgba(0xc74decff).into()),
terminal_ansi_cyan: Some(rgba(0x09e7c6ff).into()),
terminal_ansi_white: Some(rgba(0xf7f7f8ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x9bc53dbb).into()),
deleted: Some(rgba(0xfc644dbb).into()),
error: Some(rgba(0xfc644dff).into()),
hidden: Some(rgba(0x746f77ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x555555ff).into()),
modified: Some(rgba(0x5bc0ebbb).into()),
created: Some(rgba(0x96df72ff).into()),
deleted: Some(rgba(0xcd1d5aff).into()),
error: Some(rgba(0xf82872ff).into()),
modified: Some(rgba(0xfee56dff).into()),
success: Some(rgba(0xf7f7f8ff).into()),
warning: Some(rgba(0xfee56dff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -300,154 +77,277 @@ pub fn andromeda() -> UserThemeFamily {
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x96df72ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0xa0a1a7cc).into()),
color: Some(rgba(0xafabb1ff).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xa0a1a7cc).into()),
color: Some(rgba(0xafabb1ff).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0xee5d43ff).into()),
color: Some(rgba(0x96df72ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0xf92672ff).into()),
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
(
"embedded".into(),
UserHighlightStyle {
color: Some(rgba(0xf7f7f8ff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xc74dedff).into()),
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c12ff).into()),
color: Some(rgba(0x11a793ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"enum".into(),
UserHighlightStyle {
color: Some(rgba(0xf29c14ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
color: Some(rgba(0xfee56dff).into()),
..Default::default()
},
),
(
"hint".into(),
UserHighlightStyle {
color: Some(rgba(0x618399ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc74dedff).into()),
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
(
"label".into(),
UserHighlightStyle {
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
(
"link_text".into(),
UserHighlightStyle {
color: Some(rgba(0xf29c14ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"link_uri".into(),
UserHighlightStyle {
color: Some(rgba(0x96df72ff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c12ff).into()),
color: Some(rgba(0x96df72ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xee5d43ff).into()),
color: Some(rgba(0xf29c14ff).into()),
..Default::default()
},
),
(
"predictive".into(),
UserHighlightStyle {
color: Some(rgba(0x315f70ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xf7f7f8ff).into()),
..Default::default()
},
),
(
"primary".into(),
UserHighlightStyle {
color: Some(rgba(0xf7f7f8ff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xd8d5dbff).into()),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0xd8d5dbff).into()),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0xd8d5dbff).into()),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0xd8d5dbff).into()),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0xd8d5dbff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
color: Some(rgba(0xf29c14ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
color: Some(rgba(0xafabb1ff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
color: Some(rgba(0xf29c14ff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
color: Some(rgba(0xf29c14ff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
color: Some(rgba(0xf29c14ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0xf92672ff).into()),
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0x96e072ff).into()),
color: Some(rgba(0xf29c14ff).into()),
..Default::default()
},
),
(
"title".into(),
UserHighlightStyle {
color: Some(rgba(0xf7f7f8ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
color: Some(rgba(0x09e7c6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x00e8c6ff).into()),
color: Some(rgba(0xf7f7f8ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
"variant".into(),
UserHighlightStyle {
color: Some(rgba(0x00e8c6ff).into()),
color: Some(rgba(0x11a793ff).into()),
..Default::default()
},
),
],
}),
},
},
],
}],
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,250 +0,0 @@
// This file was generated by the `theme_importer`.
// Be careful when modifying it by hand.
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn dracula() -> UserThemeFamily {
UserThemeFamily {
name: "Dracula".into(),
author: "Zeno Rocha".into(),
themes: vec![UserTheme {
name: "Dracula".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xbd93f9ff).into()),
border_variant: Some(rgba(0xbd93f9ff).into()),
border_focused: Some(rgba(0x6272a4ff).into()),
border_selected: Some(rgba(0xbd93f9ff).into()),
border_transparent: Some(rgba(0xbd93f9ff).into()),
border_disabled: Some(rgba(0xbd93f9ff).into()),
elevated_surface_background: Some(rgba(0x343746ff).into()),
surface_background: Some(rgba(0x282a36ff).into()),
background: Some(rgba(0x282a36ff).into()),
element_background: Some(rgba(0x44475aff).into()),
element_hover: Some(rgba(0x44475a75).into()),
element_selected: Some(rgba(0x44475aff).into()),
drop_target_background: Some(rgba(0x44475aff).into()),
ghost_element_hover: Some(rgba(0x44475a75).into()),
ghost_element_selected: Some(rgba(0x44475aff).into()),
text: Some(rgba(0xf8f8f2ff).into()),
text_muted: Some(rgba(0x6272a4ff).into()),
status_bar_background: Some(rgba(0x191a21ff).into()),
title_bar_background: Some(rgba(0x21222cff).into()),
toolbar_background: Some(rgba(0x282a36ff).into()),
tab_bar_background: Some(rgba(0x191a21ff).into()),
tab_inactive_background: Some(rgba(0x21222cff).into()),
tab_active_background: Some(rgba(0x282a36ff).into()),
scrollbar_track_background: Some(rgba(0x282a36ff).into()),
scrollbar_track_border: Some(rgba(0x191a21ff).into()),
editor_foreground: Some(rgba(0xf8f8f2ff).into()),
editor_background: Some(rgba(0x282a36ff).into()),
editor_gutter_background: Some(rgba(0x282a36ff).into()),
editor_line_number: Some(rgba(0x6272a4ff).into()),
editor_active_line_number: Some(rgba(0xf8f8f2ff).into()),
editor_wrap_guide: Some(rgba(0xbd93f9ff).into()),
editor_active_wrap_guide: Some(rgba(0xbd93f9ff).into()),
terminal_background: Some(rgba(0x282a36ff).into()),
terminal_ansi_bright_black: Some(rgba(0x6272a4ff).into()),
terminal_ansi_bright_red: Some(rgba(0xff6e6eff).into()),
terminal_ansi_bright_green: Some(rgba(0x69ff94ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xffffa5ff).into()),
terminal_ansi_bright_blue: Some(rgba(0xd6acffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff92dfff).into()),
terminal_ansi_bright_cyan: Some(rgba(0xa4ffffff).into()),
terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
terminal_ansi_black: Some(rgba(0x21222cff).into()),
terminal_ansi_red: Some(rgba(0xff5555ff).into()),
terminal_ansi_green: Some(rgba(0x50fa7bff).into()),
terminal_ansi_yellow: Some(rgba(0xf1fa8cff).into()),
terminal_ansi_blue: Some(rgba(0xbd93f9ff).into()),
terminal_ansi_magenta: Some(rgba(0xff79c6ff).into()),
terminal_ansi_cyan: Some(rgba(0x8be9fdff).into()),
terminal_ansi_white: Some(rgba(0xf8f8f2ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffb86cff).into()),
created: Some(rgba(0x50fa7b80).into()),
deleted: Some(rgba(0xff555580).into()),
error: Some(rgba(0xff5555ff).into()),
hidden: Some(rgba(0x6272a4ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x6272a4ff).into()),
modified: Some(rgba(0x8be9fd80).into()),
warning: Some(rgba(0xffb86cff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x50fa7bff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x6272a4ff).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x6272a4ff).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0xbd93f9ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0xff79c6ff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0xffb86cff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x50fa7bff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xff79c6ff).into()),
..Default::default()
},
),
(
"link_text".into(),
UserHighlightStyle {
color: Some(rgba(0x8be9fdff).into()),
..Default::default()
},
),
(
"link_uri".into(),
UserHighlightStyle {
color: Some(rgba(0x8be9fdff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xbd93f9ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0xff79c6ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x8be9fdff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xf8f8f2ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0xbd93f9ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
],
}),
},
}],
}
}

File diff suppressed because it is too large Load Diff

View File

@ -2,43 +2,37 @@
// Be careful when modifying it by hand.
mod andromeda;
mod atelier;
mod ayu;
mod dracula;
mod gruvbox;
mod night_owl;
mod noctis;
mod nord;
mod palenight;
mod one;
mod rose_pine;
mod sandcastle;
mod solarized;
mod synthwave_84;
mod summercamp;
pub use andromeda::*;
pub use atelier::*;
pub use ayu::*;
pub use dracula::*;
pub use gruvbox::*;
pub use night_owl::*;
pub use noctis::*;
pub use nord::*;
pub use palenight::*;
pub use one::*;
pub use rose_pine::*;
pub use sandcastle::*;
pub use solarized::*;
pub use synthwave_84::*;
pub use summercamp::*;
use crate::UserThemeFamily;
pub(crate) fn all_user_themes() -> Vec<UserThemeFamily> {
vec![
andromeda(),
atelier(),
ayu(),
dracula(),
gruvbox(),
night_owl(),
noctis(),
nord(),
palenight(),
one(),
rose_pine(),
sandcastle(),
solarized(),
synthwave_84(),
summercamp(),
]
}

View File

@ -1,547 +0,0 @@
// This file was generated by the `theme_importer`.
// Be careful when modifying it by hand.
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn night_owl() -> UserThemeFamily {
UserThemeFamily {
name: "Night Owl".into(),
author: "Sarah Drasner (sdras)".into(),
themes: vec![
UserTheme {
name: "Night Owl".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5f7e97ff).into()),
border_variant: Some(rgba(0x5f7e97ff).into()),
border_focused: Some(rgba(0x122d42ff).into()),
border_selected: Some(rgba(0x5f7e97ff).into()),
border_transparent: Some(rgba(0x5f7e97ff).into()),
border_disabled: Some(rgba(0x5f7e97ff).into()),
elevated_surface_background: Some(rgba(0x011627ff).into()),
surface_background: Some(rgba(0x011627ff).into()),
background: Some(rgba(0x011627ff).into()),
element_background: Some(rgba(0x7e57c2cc).into()),
element_hover: Some(rgba(0x011627ff).into()),
element_selected: Some(rgba(0x234d708c).into()),
drop_target_background: Some(rgba(0x011627ff).into()),
ghost_element_hover: Some(rgba(0x011627ff).into()),
ghost_element_selected: Some(rgba(0x234d708c).into()),
text: Some(rgba(0xd6deebff).into()),
text_muted: Some(rgba(0x5f7e97ff).into()),
status_bar_background: Some(rgba(0x011627ff).into()),
title_bar_background: Some(rgba(0x011627ff).into()),
toolbar_background: Some(rgba(0x011627ff).into()),
tab_bar_background: Some(rgba(0x011627ff).into()),
tab_inactive_background: Some(rgba(0x01111dff).into()),
tab_active_background: Some(rgba(0x0b2942ff).into()),
scrollbar_thumb_background: Some(rgba(0x084d8180).into()),
scrollbar_thumb_hover_background: Some(rgba(0x084d8180).into()),
scrollbar_thumb_border: Some(rgba(0x084d8180).into()),
scrollbar_track_background: Some(rgba(0x011627ff).into()),
editor_foreground: Some(rgba(0xd6deebff).into()),
editor_background: Some(rgba(0x011627ff).into()),
editor_gutter_background: Some(rgba(0x011627ff).into()),
editor_line_number: Some(rgba(0x4b6479ff).into()),
editor_active_line_number: Some(rgba(0xd6deebff).into()),
editor_wrap_guide: Some(rgba(0x5f7e97ff).into()),
editor_active_wrap_guide: Some(rgba(0x5f7e97ff).into()),
terminal_ansi_bright_black: Some(rgba(0x575656ff).into()),
terminal_ansi_bright_red: Some(rgba(0xef5350ff).into()),
terminal_ansi_bright_green: Some(rgba(0x22da6eff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xffeb95ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xc792eaff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x7fdbcaff).into()),
terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
terminal_ansi_black: Some(rgba(0x011627ff).into()),
terminal_ansi_red: Some(rgba(0xef5350ff).into()),
terminal_ansi_green: Some(rgba(0x22da6eff).into()),
terminal_ansi_yellow: Some(rgba(0xc5e478ff).into()),
terminal_ansi_blue: Some(rgba(0x82aaffff).into()),
terminal_ansi_magenta: Some(rgba(0xc792eaff).into()),
terminal_ansi_cyan: Some(rgba(0x21c7a8ff).into()),
terminal_ansi_white: Some(rgba(0xffffffff).into()),
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffeb95cc).into()),
created: Some(rgba(0x9ccc65ff).into()),
deleted: Some(rgba(0xef5350ff).into()),
error: Some(rgba(0xef5350ff).into()),
hidden: Some(rgba(0x5f7e97ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x395a75ff).into()),
modified: Some(rgba(0xe2b93dff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xc5e478ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x637777ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x637777ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0xcaece6ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xf78c6cff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0x7fdbcaff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x80cbc4ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xecc48dff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0xecc48dff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0xecc48dff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0xecc48dff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0xcaece6ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0xecc48dff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xc5e478ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xc5e478ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x7fdbcaff).into()),
..Default::default()
},
),
],
}),
},
},
UserTheme {
name: "Night Owl Light".into(),
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xd9d9d9ff).into()),
border_variant: Some(rgba(0xd9d9d9ff).into()),
border_focused: Some(rgba(0x93a1a1ff).into()),
border_selected: Some(rgba(0xd9d9d9ff).into()),
border_transparent: Some(rgba(0xd9d9d9ff).into()),
border_disabled: Some(rgba(0xd9d9d9ff).into()),
elevated_surface_background: Some(rgba(0xf0f0f0ff).into()),
surface_background: Some(rgba(0xf0f0f0ff).into()),
background: Some(rgba(0xfbfbfbff).into()),
element_background: Some(rgba(0x2aa298ff).into()),
element_hover: Some(rgba(0xd3e8f8ff).into()),
element_selected: Some(rgba(0xd3e8f8ff).into()),
ghost_element_hover: Some(rgba(0xd3e8f8ff).into()),
ghost_element_selected: Some(rgba(0xd3e8f8ff).into()),
text: Some(rgba(0x403f53ff).into()),
text_muted: Some(rgba(0x403f53ff).into()),
status_bar_background: Some(rgba(0xf0f0f0ff).into()),
title_bar_background: Some(rgba(0xf0f0f0ff).into()),
toolbar_background: Some(rgba(0xfbfbfbff).into()),
tab_bar_background: Some(rgba(0xf0f0f0ff).into()),
tab_inactive_background: Some(rgba(0xf0f0f0ff).into()),
tab_active_background: Some(rgba(0xf6f6f6ff).into()),
scrollbar_track_background: Some(rgba(0xfbfbfbff).into()),
editor_foreground: Some(rgba(0x403f53ff).into()),
editor_background: Some(rgba(0xfbfbfbff).into()),
editor_gutter_background: Some(rgba(0xfbfbfbff).into()),
editor_line_number: Some(rgba(0x90a7b2ff).into()),
editor_active_line_number: Some(rgba(0x403f53ff).into()),
editor_wrap_guide: Some(rgba(0xd9d9d9ff).into()),
editor_active_wrap_guide: Some(rgba(0xd9d9d9ff).into()),
terminal_background: Some(rgba(0xf6f6f6ff).into()),
terminal_ansi_bright_black: Some(rgba(0x403f53ff).into()),
terminal_ansi_bright_red: Some(rgba(0xde3d3bff).into()),
terminal_ansi_bright_green: Some(rgba(0x08916aff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xdaaa01ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x288ed7ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xd6438aff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x2aa298ff).into()),
terminal_ansi_bright_white: Some(rgba(0xf0f0f0ff).into()),
terminal_ansi_black: Some(rgba(0x403f53ff).into()),
terminal_ansi_red: Some(rgba(0xde3d3bff).into()),
terminal_ansi_green: Some(rgba(0x08916aff).into()),
terminal_ansi_yellow: Some(rgba(0xe0af02ff).into()),
terminal_ansi_blue: Some(rgba(0x288ed7ff).into()),
terminal_ansi_magenta: Some(rgba(0xd6438aff).into()),
terminal_ansi_cyan: Some(rgba(0x2aa298ff).into()),
terminal_ansi_white: Some(rgba(0xf0f0f0ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x49d0c5ff).into()),
deleted: Some(rgba(0xf76e6eff).into()),
error: Some(rgba(0x403f53ff).into()),
hidden: Some(rgba(0x403f53ff).into()),
hint: Some(rgba(0x969696ff).into()),
modified: Some(rgba(0x6fbef6ff).into()),
warning: Some(rgba(0xdaaa01ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x989fb1ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x989fb1ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xaa0982ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0x0c969bff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x0c969bff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x0c969bff).into()),
..Default::default()
},
),
],
}),
},
},
],
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,277 +0,0 @@
// This file was generated by the `theme_importer`.
// Be careful when modifying it by hand.
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn nord() -> UserThemeFamily {
UserThemeFamily {
name: "Nord".into(),
author: "Sven Greb (svengreb)".into(),
themes: vec![UserTheme {
name: "Nord".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3b4252ff).into()),
border_variant: Some(rgba(0x3b4252ff).into()),
border_focused: Some(rgba(0x3b4252ff).into()),
border_selected: Some(rgba(0x3b4252ff).into()),
border_transparent: Some(rgba(0x3b4252ff).into()),
border_disabled: Some(rgba(0x3b4252ff).into()),
elevated_surface_background: Some(rgba(0x3b4252ff).into()),
surface_background: Some(rgba(0x2e3440ff).into()),
background: Some(rgba(0x2e3440ff).into()),
element_background: Some(rgba(0x88c0d0ee).into()),
element_hover: Some(rgba(0x3b4252ff).into()),
element_selected: Some(rgba(0x88c0d0ff).into()),
drop_target_background: Some(rgba(0x88c0d099).into()),
ghost_element_hover: Some(rgba(0x3b4252ff).into()),
ghost_element_selected: Some(rgba(0x88c0d0ff).into()),
text: Some(rgba(0xd8dee9ff).into()),
text_muted: Some(rgba(0xd8dee966).into()),
status_bar_background: Some(rgba(0x3b4252ff).into()),
title_bar_background: Some(rgba(0x2e3440ff).into()),
toolbar_background: Some(rgba(0x2e3440ff).into()),
tab_bar_background: Some(rgba(0x2e3440ff).into()),
tab_inactive_background: Some(rgba(0x2e3440ff).into()),
tab_active_background: Some(rgba(0x3b4252ff).into()),
scrollbar_thumb_background: Some(rgba(0x434c5e99).into()),
scrollbar_thumb_hover_background: Some(rgba(0x434c5eaa).into()),
scrollbar_thumb_border: Some(rgba(0x434c5e99).into()),
scrollbar_track_background: Some(rgba(0x2e3440ff).into()),
scrollbar_track_border: Some(rgba(0x3b4252ff).into()),
editor_foreground: Some(rgba(0xd8dee9ff).into()),
editor_background: Some(rgba(0x2e3440ff).into()),
editor_gutter_background: Some(rgba(0x2e3440ff).into()),
editor_line_number: Some(rgba(0x4c566aff).into()),
editor_active_line_number: Some(rgba(0xd8dee9ff).into()),
editor_wrap_guide: Some(rgba(0x3b4252ff).into()),
editor_active_wrap_guide: Some(rgba(0x3b4252ff).into()),
terminal_background: Some(rgba(0x2e3440ff).into()),
terminal_ansi_bright_black: Some(rgba(0x4c566aff).into()),
terminal_ansi_bright_red: Some(rgba(0xbf616aff).into()),
terminal_ansi_bright_green: Some(rgba(0xa3be8cff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xebcb8bff).into()),
terminal_ansi_bright_blue: Some(rgba(0x81a1c1ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xb48eadff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x8fbcbbff).into()),
terminal_ansi_bright_white: Some(rgba(0xeceff4ff).into()),
terminal_ansi_black: Some(rgba(0x3b4252ff).into()),
terminal_ansi_red: Some(rgba(0xbf616aff).into()),
terminal_ansi_green: Some(rgba(0xa3be8cff).into()),
terminal_ansi_yellow: Some(rgba(0xebcb8bff).into()),
terminal_ansi_blue: Some(rgba(0x81a1c1ff).into()),
terminal_ansi_magenta: Some(rgba(0xb48eadff).into()),
terminal_ansi_cyan: Some(rgba(0x88c0d0ff).into()),
terminal_ansi_white: Some(rgba(0xe5e9f0ff).into()),
link_text_hover: Some(rgba(0x88c0d0ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0x5e81acff).into()),
created: Some(rgba(0xa3be8cff).into()),
deleted: Some(rgba(0xbf616aff).into()),
error: Some(rgba(0xbf616aff).into()),
hidden: Some(rgba(0xd8dee966).into()),
hint: Some(rgba(0xd8dee9ff).into()),
ignored: Some(rgba(0xd8dee966).into()),
modified: Some(rgba(0xebcb8bff).into()),
warning: Some(rgba(0xebcb8bff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x8fbcbbff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x616e88ff).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x616e88ff).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x88c0d0ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xb48eadff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0x5e81acff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xeceff4ff).into()),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0xeceff4ff).into()),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0xeceff4ff).into()),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0xeceff4ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xa3be8cff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xebcb8bff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0xa3be8cff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0xa3be8cff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0xa3be8cff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0xa3be8cff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x8fbcbbff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
],
}),
},
}],
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,353 @@
// This file was generated by the `theme_importer`.
// Be careful when modifying it by hand.
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn sandcastle() -> UserThemeFamily {
UserThemeFamily {
name: "Sandcastle".into(),
author: "Zed Industries".into(),
themes: vec![UserTheme {
name: "Sandcastle".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3d4350ff).into()),
border_variant: Some(rgba(0x3d4350ff).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()),
status_bar_background: Some(rgba(0x333944ff).into()),
title_bar_background: Some(rgba(0x333944ff).into()),
toolbar_background: Some(rgba(0x282c34ff).into()),
tab_bar_background: Some(rgba(0x2b3039ff).into()),
tab_inactive_background: Some(rgba(0x2b3039ff).into()),
tab_active_background: Some(rgba(0x282c34ff).into()),
scrollbar_thumb_background: Some(rgba(0xfdf4c14d).into()),
scrollbar_thumb_hover_background: Some(rgba(0xfdf4c14d).into()),
scrollbar_thumb_border: Some(rgba(0x2a2f38ff).into()),
scrollbar_track_border: Some(rgba(0x2a2f38ff).into()),
editor_foreground: Some(rgba(0xfdf4c1ff).into()),
editor_background: Some(rgba(0x282c34ff).into()),
editor_gutter_background: Some(rgba(0x282c34ff).into()),
editor_line_number: Some(rgba(0xfdf4c159).into()),
editor_active_line_number: Some(rgba(0xfdf4c1ff).into()),
editor_wrap_guide: Some(rgba(0xfdf4c10d).into()),
editor_active_wrap_guide: Some(rgba(0xfdf4c11a).into()),
terminal_background: Some(rgba(0x282c34ff).into()),
terminal_ansi_bright_black: Some(rgba(0x5e5753ff).into()),
terminal_ansi_bright_red: Some(rgba(0x57333dff).into()),
terminal_ansi_bright_green: Some(rgba(0x414f4aff).into()),
terminal_ansi_bright_yellow: Some(rgba(0x4e3f22ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x2c4444ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0x523a18ff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x414f4aff).into()),
terminal_ansi_bright_white: Some(rgba(0xfdf4c1ff).into()),
terminal_ansi_black: Some(rgba(0x282c34ff).into()),
terminal_ansi_red: Some(rgba(0xb4637aff).into()),
terminal_ansi_green: Some(rgba(0x83a598ff).into()),
terminal_ansi_yellow: Some(rgba(0xa07e3bff).into()),
terminal_ansi_blue: Some(rgba(0x528b8bff).into()),
terminal_ansi_magenta: Some(rgba(0xa87323ff).into()),
terminal_ansi_cyan: Some(rgba(0x83a598ff).into()),
terminal_ansi_white: Some(rgba(0xfdf4c1ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x83a598ff).into()),
deleted: Some(rgba(0x8d4f61ff).into()),
error: Some(rgba(0xb4637aff).into()),
modified: Some(rgba(0xa07e3bff).into()),
success: Some(rgba(0xfdf4c1ff).into()),
warning: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0xa89984ff).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xa89984ff).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
(
"embedded".into(),
UserHighlightStyle {
color: Some(rgba(0xfdf4c1ff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"enum".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"hint".into(),
UserHighlightStyle {
color: Some(rgba(0x727d68ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
(
"label".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
(
"link_text".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"link_uri".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"predictive".into(),
UserHighlightStyle {
color: Some(rgba(0x5c6152ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xfdf4c1ff).into()),
..Default::default()
},
),
(
"primary".into(),
UserHighlightStyle {
color: Some(rgba(0xfdf4c1ff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xd5c5a1ff).into()),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0xd5c5a1ff).into()),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0xd5c5a1ff).into()),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0xd5c5a1ff).into()),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0xd5c5a1ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xa89984ff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0xa07e3bff).into()),
..Default::default()
},
),
(
"title".into(),
UserHighlightStyle {
color: Some(rgba(0xfdf4c1ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xfdf4c1ff).into()),
..Default::default()
},
),
(
"variant".into(),
UserHighlightStyle {
color: Some(rgba(0x528b8bff).into()),
..Default::default()
},
),
],
}),
},
}],
}
}

View File

@ -12,64 +12,65 @@ use crate::{
pub fn solarized() -> UserThemeFamily {
UserThemeFamily {
name: "Solarized".into(),
author: "Ethan Schoonover (altercation)".into(),
author: "Zed Industries".into(),
themes: vec![
UserTheme {
name: "Solarized Dark".into(),
appearance: Appearance::Dark,
name: "Solarized Light".into(),
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x003847ff).into()),
border_variant: Some(rgba(0x003847ff).into()),
border_focused: Some(rgba(0x2aa19899).into()),
border_selected: Some(rgba(0x003847ff).into()),
border_transparent: Some(rgba(0x003847ff).into()),
border_disabled: Some(rgba(0x003847ff).into()),
elevated_surface_background: Some(rgba(0x00212bff).into()),
background: Some(rgba(0x002b36ff).into()),
element_background: Some(rgba(0x2aa19899).into()),
element_hover: Some(rgba(0x004454aa).into()),
element_selected: Some(rgba(0x005a6fff).into()),
drop_target_background: Some(rgba(0x00445488).into()),
ghost_element_hover: Some(rgba(0x004454aa).into()),
ghost_element_selected: Some(rgba(0x005a6fff).into()),
text: Some(rgba(0xbbbbbbff).into()),
text_muted: Some(rgba(0x93a1a1ff).into()),
status_bar_background: Some(rgba(0x00212bff).into()),
title_bar_background: Some(rgba(0x002c39ff).into()),
toolbar_background: Some(rgba(0x002b36ff).into()),
tab_bar_background: Some(rgba(0x004052ff).into()),
tab_inactive_background: Some(rgba(0x004052ff).into()),
tab_active_background: Some(rgba(0x002b37ff).into()),
scrollbar_track_background: Some(rgba(0x002b36ff).into()),
editor_foreground: Some(rgba(0xbbbbbbff).into()),
editor_background: Some(rgba(0x002b36ff).into()),
editor_gutter_background: Some(rgba(0x002b36ff).into()),
editor_line_number: Some(rgba(0x566c74ff).into()),
editor_wrap_guide: Some(rgba(0x003847ff).into()),
editor_active_wrap_guide: Some(rgba(0x003847ff).into()),
terminal_ansi_bright_black: Some(rgba(0x586e75ff).into()),
terminal_ansi_bright_red: Some(rgba(0xcb4b16ff).into()),
terminal_ansi_bright_green: Some(rgba(0x859900ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0x657b83ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x839496ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0x6c71c4ff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x93a1a1ff).into()),
terminal_ansi_bright_white: Some(rgba(0x839496ff).into()),
terminal_ansi_black: Some(rgba(0x073642ff).into()),
terminal_ansi_red: Some(rgba(0xdc322fff).into()),
terminal_ansi_green: Some(rgba(0x859900ff).into()),
terminal_ansi_yellow: Some(rgba(0xb58900ff).into()),
terminal_ansi_blue: Some(rgba(0x268bd2ff).into()),
terminal_ansi_magenta: Some(rgba(0xd33682ff).into()),
terminal_ansi_cyan: Some(rgba(0x2aa198ff).into()),
terminal_ansi_white: Some(rgba(0x839496ff).into()),
border: Some(rgba(0x9faaa8ff).into()),
border_variant: Some(rgba(0x9faaa8ff).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()),
status_bar_background: Some(rgba(0xcfd0c4ff).into()),
title_bar_background: Some(rgba(0xcfd0c4ff).into()),
toolbar_background: Some(rgba(0xfdf6e3ff).into()),
tab_bar_background: Some(rgba(0xf3eddaff).into()),
tab_inactive_background: Some(rgba(0xf3eddaff).into()),
tab_active_background: Some(rgba(0xfdf6e3ff).into()),
scrollbar_thumb_background: Some(rgba(0x002b364d).into()),
scrollbar_thumb_hover_background: Some(rgba(0x002b364d).into()),
scrollbar_thumb_border: Some(rgba(0xf5eedbff).into()),
scrollbar_track_border: Some(rgba(0xf5eedbff).into()),
editor_foreground: Some(rgba(0x002b36ff).into()),
editor_background: Some(rgba(0xfdf6e3ff).into()),
editor_gutter_background: Some(rgba(0xfdf6e3ff).into()),
editor_line_number: Some(rgba(0x002b3659).into()),
editor_active_line_number: Some(rgba(0x002b36ff).into()),
editor_wrap_guide: Some(rgba(0x002b360d).into()),
editor_active_wrap_guide: Some(rgba(0x002b361a).into()),
terminal_background: Some(rgba(0xfdf6e3ff).into()),
terminal_ansi_bright_black: Some(rgba(0x7b8e91ff).into()),
terminal_ansi_bright_red: Some(rgba(0xfaa091ff).into()),
terminal_ansi_bright_green: Some(rgba(0xc6cb8bff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xe1c28aff).into()),
terminal_ansi_bright_blue: Some(rgba(0xa5c3e9ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xf0a2bfff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x9fd0cbff).into()),
terminal_ansi_bright_white: Some(rgba(0x002b36ff).into()),
terminal_ansi_black: Some(rgba(0xfdf6e3ff).into()),
terminal_ansi_red: Some(rgba(0xdc3330ff).into()),
terminal_ansi_green: Some(rgba(0x859904ff).into()),
terminal_ansi_yellow: Some(rgba(0xb58904ff).into()),
terminal_ansi_blue: Some(rgba(0x298bd1ff).into()),
terminal_ansi_magenta: Some(rgba(0xd33882ff).into()),
terminal_ansi_cyan: Some(rgba(0x2ca198ff).into()),
terminal_ansi_white: Some(rgba(0x002b36ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
error: Some(rgba(0xffeaeaff).into()),
hidden: Some(rgba(0x93a1a1ff).into()),
hint: Some(rgba(0x969696ff).into()),
created: Some(rgba(0xa0ad46ff).into()),
deleted: Some(rgba(0xdc3330ff).into()),
error: Some(rgba(0xdc3330ff).into()),
modified: Some(rgba(0xb58904ff).into()),
success: Some(rgba(0x002b36ff).into()),
warning: Some(rgba(0xb58904ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -77,205 +78,271 @@ pub fn solarized() -> UserThemeFamily {
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x30525bff).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x30525bff).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
(
"embedded".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
color: Some(rgba(0x002b36ff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xd33682ff).into()),
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0xd33682ff).into()),
color: Some(rgba(0x298bd1ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"enum".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4c18ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x839496ff).into()),
color: Some(rgba(0xb58904ff).into()),
..Default::default()
},
),
(
"hint".into(),
UserHighlightStyle {
color: Some(rgba(0x5889a3ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x859900ff).into()),
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
(
"label".into(),
UserHighlightStyle {
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
(
"link_text".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4c18ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"link_uri".into(),
UserHighlightStyle {
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xd33682ff).into()),
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4c18ff).into()),
..Default::default()
},
),
(
"predictive".into(),
UserHighlightStyle {
color: Some(rgba(0x679aafff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0x002b36ff).into()),
..Default::default()
},
),
(
"primary".into(),
UserHighlightStyle {
color: Some(rgba(0x002b36ff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x839496ff).into()),
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0x05333eff).into()),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0x05333eff).into()),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0x05333eff).into()),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0x05333eff).into()),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0x05333eff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4c18ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4b16ff).into()),
color: Some(rgba(0x30525bff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4c18ff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4c18ff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4c18ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4c18ff).into()),
..Default::default()
},
),
(
"title".into(),
UserHighlightStyle {
color: Some(rgba(0x002b36ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0x2ca198ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x002b36ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
"variant".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x298bd1ff).into()),
..Default::default()
},
),
@ -284,59 +351,62 @@ pub fn solarized() -> UserThemeFamily {
},
},
UserTheme {
name: "Solarized Light".into(),
appearance: Appearance::Light,
name: "Solarized Dark".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xddd6c1ff).into()),
border_variant: Some(rgba(0xddd6c1ff).into()),
border_focused: Some(rgba(0xd3af86ff).into()),
border_selected: Some(rgba(0xddd6c1ff).into()),
border_transparent: Some(rgba(0xddd6c1ff).into()),
border_disabled: Some(rgba(0xddd6c1ff).into()),
elevated_surface_background: Some(rgba(0xeee8d5ff).into()),
background: Some(rgba(0xfdf6e3ff).into()),
element_background: Some(rgba(0xac9d57ff).into()),
element_hover: Some(rgba(0xdfca8844).into()),
element_selected: Some(rgba(0xdfca88ff).into()),
ghost_element_hover: Some(rgba(0xdfca8844).into()),
ghost_element_selected: Some(rgba(0xdfca88ff).into()),
text: Some(rgba(0x333333ff).into()),
text_muted: Some(rgba(0x586e75ff).into()),
status_bar_background: Some(rgba(0xeee8d5ff).into()),
title_bar_background: Some(rgba(0xeee8d5ff).into()),
toolbar_background: Some(rgba(0xfdf6e3ff).into()),
tab_bar_background: Some(rgba(0xd9d2c2ff).into()),
tab_inactive_background: Some(rgba(0xd3cbb7ff).into()),
tab_active_background: Some(rgba(0xfdf6e3ff).into()),
scrollbar_track_background: Some(rgba(0xfdf6e3ff).into()),
editor_foreground: Some(rgba(0x333333ff).into()),
editor_background: Some(rgba(0xfdf6e3ff).into()),
editor_gutter_background: Some(rgba(0xfdf6e3ff).into()),
editor_line_number: Some(rgba(0x9ca8a6ff).into()),
editor_wrap_guide: Some(rgba(0xddd6c1ff).into()),
editor_active_wrap_guide: Some(rgba(0xddd6c1ff).into()),
terminal_ansi_bright_black: Some(rgba(0x657b83ff).into()),
terminal_ansi_bright_red: Some(rgba(0xcb4b16ff).into()),
terminal_ansi_bright_green: Some(rgba(0x859900ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0x657b83ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x839496ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0x6c71c4ff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x93a1a1ff).into()),
terminal_ansi_bright_white: Some(rgba(0xeee8d5ff).into()),
terminal_ansi_black: Some(rgba(0x657b83ff).into()),
terminal_ansi_red: Some(rgba(0xdc322fff).into()),
terminal_ansi_green: Some(rgba(0x859900ff).into()),
terminal_ansi_yellow: Some(rgba(0xb58900ff).into()),
terminal_ansi_blue: Some(rgba(0x268bd2ff).into()),
terminal_ansi_magenta: Some(rgba(0xd33682ff).into()),
terminal_ansi_cyan: Some(rgba(0x2aa198ff).into()),
terminal_ansi_white: Some(rgba(0xeee8d5ff).into()),
border: Some(rgba(0x2b4f58ff).into()),
border_variant: Some(rgba(0x2b4f58ff).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()),
status_bar_background: Some(rgba(0x083743ff).into()),
title_bar_background: Some(rgba(0x083743ff).into()),
toolbar_background: Some(rgba(0x002b36ff).into()),
tab_bar_background: Some(rgba(0x04313cff).into()),
tab_inactive_background: Some(rgba(0x04313cff).into()),
tab_active_background: Some(rgba(0x002b36ff).into()),
scrollbar_thumb_background: Some(rgba(0xfdf6e34d).into()),
scrollbar_thumb_hover_background: Some(rgba(0xfdf6e34d).into()),
scrollbar_thumb_border: Some(rgba(0x032f3bff).into()),
scrollbar_track_border: Some(rgba(0x032f3bff).into()),
editor_foreground: Some(rgba(0xfdf6e3ff).into()),
editor_background: Some(rgba(0x002b36ff).into()),
editor_gutter_background: Some(rgba(0x002b36ff).into()),
editor_line_number: Some(rgba(0xfdf6e359).into()),
editor_active_line_number: Some(rgba(0xfdf6e3ff).into()),
editor_wrap_guide: Some(rgba(0xfdf6e30d).into()),
editor_active_wrap_guide: Some(rgba(0xfdf6e31a).into()),
terminal_background: Some(rgba(0x002b36ff).into()),
terminal_ansi_bright_black: Some(rgba(0x5c7279ff).into()),
terminal_ansi_bright_red: Some(rgba(0x7d181cff).into()),
terminal_ansi_bright_green: Some(rgba(0x434a11ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0x5d4310ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x214465ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0x6f1f40ff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x204e4aff).into()),
terminal_ansi_bright_white: Some(rgba(0xfdf6e3ff).into()),
terminal_ansi_black: Some(rgba(0x002b36ff).into()),
terminal_ansi_red: Some(rgba(0xdc3330ff).into()),
terminal_ansi_green: Some(rgba(0x859904ff).into()),
terminal_ansi_yellow: Some(rgba(0xb58903ff).into()),
terminal_ansi_blue: Some(rgba(0x288bd1ff).into()),
terminal_ansi_magenta: Some(rgba(0xd33782ff).into()),
terminal_ansi_cyan: Some(rgba(0x2ca198ff).into()),
terminal_ansi_white: Some(rgba(0xfdf6e3ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
hidden: Some(rgba(0x586e75ff).into()),
hint: Some(rgba(0x969696ff).into()),
created: Some(rgba(0x859904ff).into()),
deleted: Some(rgba(0xb52727ff).into()),
error: Some(rgba(0xdc3330ff).into()),
modified: Some(rgba(0xb58903ff).into()),
success: Some(rgba(0xfdf6e3ff).into()),
warning: Some(rgba(0xb58903ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -344,170 +414,271 @@ pub fn solarized() -> UserThemeFamily {
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x99a5a4ff).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x99a5a4ff).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),
(
"embedded".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0xfdf6e3ff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xd33682ff).into()),
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0xd33682ff).into()),
color: Some(rgba(0x288bd1ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"enum".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4b17ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0xb58903ff).into()),
..Default::default()
},
),
(
"hint".into(),
UserHighlightStyle {
color: Some(rgba(0x4f8297ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x859900ff).into()),
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),
(
"label".into(),
UserHighlightStyle {
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),
(
"link_text".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4b17ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"link_uri".into(),
UserHighlightStyle {
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xd33682ff).into()),
color: Some(rgba(0x859904ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4b17ff).into()),
..Default::default()
},
),
(
"predictive".into(),
UserHighlightStyle {
color: Some(rgba(0x40728bff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0xfdf6e3ff).into()),
..Default::default()
},
),
(
"primary".into(),
UserHighlightStyle {
color: Some(rgba(0xfdf6e3ff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xefe9d6ff).into()),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
color: Some(rgba(0xefe9d6ff).into()),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0xefe9d6ff).into()),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0xefe9d6ff).into()),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0xefe9d6ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4b17ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4b16ff).into()),
color: Some(rgba(0x99a5a4ff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4b17ff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4b17ff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4b17ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0x2aa198ff).into()),
color: Some(rgba(0xcb4b17ff).into()),
..Default::default()
},
),
(
"title".into(),
UserHighlightStyle {
color: Some(rgba(0xfdf6e3ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
color: Some(rgba(0x2ca198ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0xfdf6e3ff).into()),
..Default::default()
},
),
(
"variable.special".into(),
"variant".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x288bd1ff).into()),
..Default::default()
},
),

View File

@ -0,0 +1,353 @@
// This file was generated by the `theme_importer`.
// Be careful when modifying it by hand.
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn summercamp() -> UserThemeFamily {
UserThemeFamily {
name: "Summercamp".into(),
author: "Zed Industries".into(),
themes: vec![UserTheme {
name: "Summercamp".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x312d21ff).into()),
border_variant: Some(rgba(0x312d21ff).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()),
status_bar_background: Some(rgba(0x2a261cff).into()),
title_bar_background: Some(rgba(0x2a261cff).into()),
toolbar_background: Some(rgba(0x1c1810ff).into()),
tab_bar_background: Some(rgba(0x231f16ff).into()),
tab_inactive_background: Some(rgba(0x231f16ff).into()),
tab_active_background: Some(rgba(0x1c1810ff).into()),
scrollbar_thumb_background: Some(rgba(0xf8f5de4d).into()),
scrollbar_thumb_hover_background: Some(rgba(0xf8f5de4d).into()),
scrollbar_thumb_border: Some(rgba(0x221e15ff).into()),
scrollbar_track_border: Some(rgba(0x221e15ff).into()),
editor_foreground: Some(rgba(0xf8f5deff).into()),
editor_background: Some(rgba(0x1c1810ff).into()),
editor_gutter_background: Some(rgba(0x1c1810ff).into()),
editor_line_number: Some(rgba(0xf8f5de59).into()),
editor_active_line_number: Some(rgba(0xf8f5deff).into()),
editor_wrap_guide: Some(rgba(0xf8f5de0d).into()),
editor_active_wrap_guide: Some(rgba(0xf8f5de1a).into()),
terminal_background: Some(rgba(0x1c1810ff).into()),
terminal_ansi_bright_black: Some(rgba(0x3b3627ff).into()),
terminal_ansi_bright_red: Some(rgba(0x7f2724ff).into()),
terminal_ansi_bright_green: Some(rgba(0x28842cff).into()),
terminal_ansi_bright_yellow: Some(rgba(0x8c9a10ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x234b7fff).into()),
terminal_ansi_bright_magenta: Some(rgba(0x88487eff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x298462ff).into()),
terminal_ansi_bright_white: Some(rgba(0xf8f5deff).into()),
terminal_ansi_black: Some(rgba(0x1c1810ff).into()),
terminal_ansi_red: Some(rgba(0xe35142ff).into()),
terminal_ansi_green: Some(rgba(0x5dea5aff).into()),
terminal_ansi_yellow: Some(rgba(0xf1fe29ff).into()),
terminal_ansi_blue: Some(rgba(0x499befff).into()),
terminal_ansi_magenta: Some(rgba(0xf59be6ff).into()),
terminal_ansi_cyan: Some(rgba(0x5beabcff).into()),
terminal_ansi_white: Some(rgba(0xf8f5deff).into()),
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x5dea5aff).into()),
deleted: Some(rgba(0xb93f36ff).into()),
error: Some(rgba(0xe35142ff).into()),
modified: Some(rgba(0xf1fe29ff).into()),
success: Some(rgba(0xf8f5deff).into()),
warning: Some(rgba(0xf1fe29ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x5dea5aff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x777259ff).into()),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x777259ff).into()),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x5dea5aff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
(
"embedded".into(),
UserHighlightStyle {
color: Some(rgba(0xf8f5deff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"enum".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fe29ff).into()),
..Default::default()
},
),
(
"hint".into(),
UserHighlightStyle {
color: Some(rgba(0x246e61ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
(
"label".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
(
"link_text".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"link_uri".into(),
UserHighlightStyle {
color: Some(rgba(0x5dea5aff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0x5dea5aff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
..Default::default()
},
),
(
"predictive".into(),
UserHighlightStyle {
color: Some(rgba(0x79434bff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xf8f5deff).into()),
..Default::default()
},
),
(
"primary".into(),
UserHighlightStyle {
color: Some(rgba(0xf8f5deff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xbfbb9bff).into()),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0xbfbb9bff).into()),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0xbfbb9bff).into()),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0xbfbb9bff).into()),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0xbfbb9bff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x777259ff).into()),
..Default::default()
},
),
(
"string.regex".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
..Default::default()
},
),
(
"string.special".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
..Default::default()
},
),
(
"string.special.symbol".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0xfaa11dff).into()),
..Default::default()
},
),
(
"title".into(),
UserHighlightStyle {
color: Some(rgba(0xf8f5deff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x5beabcff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xf8f5deff).into()),
..Default::default()
},
),
(
"variant".into(),
UserHighlightStyle {
color: Some(rgba(0x499befff).into()),
..Default::default()
},
),
],
}),
},
}],
}
}

View File

@ -1,248 +0,0 @@
// This file was generated by the `theme_importer`.
// Be careful when modifying it by hand.
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn synthwave_84() -> UserThemeFamily {
UserThemeFamily {
name: "Synthwave 84".into(),
author: "Robb Owen (robb0wen)".into(),
themes: vec![UserTheme {
name: "Synthwave 84".into(),
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border_focused: Some(rgba(0x1f212bff).into()),
elevated_surface_background: Some(rgba(0x232530ff).into()),
background: Some(rgba(0x262335ff).into()),
element_background: Some(rgba(0x614d85ff).into()),
element_hover: Some(rgba(0x37294d99).into()),
element_selected: Some(rgba(0xffffff20).into()),
drop_target_background: Some(rgba(0x34294f66).into()),
ghost_element_hover: Some(rgba(0x37294d99).into()),
ghost_element_selected: Some(rgba(0xffffff20).into()),
text: Some(rgba(0xffffffff).into()),
status_bar_background: Some(rgba(0x241b2fff).into()),
title_bar_background: Some(rgba(0x241b2fff).into()),
toolbar_background: Some(rgba(0x262335ff).into()),
tab_bar_background: Some(rgba(0x241b2fff).into()),
tab_inactive_background: Some(rgba(0x262335ff).into()),
tab_active_background: Some(rgba(0x262335ff).into()),
scrollbar_thumb_background: Some(rgba(0x9d8bca30).into()),
scrollbar_thumb_hover_background: Some(rgba(0x9d8bca50).into()),
scrollbar_thumb_border: Some(rgba(0x9d8bca30).into()),
scrollbar_track_background: Some(rgba(0x262335ff).into()),
scrollbar_track_border: Some(rgba(0x34294fb3).into()),
editor_background: Some(rgba(0x262335ff).into()),
editor_gutter_background: Some(rgba(0x262335ff).into()),
editor_line_number: Some(rgba(0xffffff73).into()),
terminal_ansi_bright_red: Some(rgba(0xfe4450ff).into()),
terminal_ansi_bright_green: Some(rgba(0x72f1b8ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xfede5dff).into()),
terminal_ansi_bright_blue: Some(rgba(0x03edf9ff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff7edbff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x03edf9ff).into()),
terminal_ansi_red: Some(rgba(0xfe4450ff).into()),
terminal_ansi_green: Some(rgba(0x72f1b8ff).into()),
terminal_ansi_yellow: Some(rgba(0xf3e70fff).into()),
terminal_ansi_blue: Some(rgba(0x03edf9ff).into()),
terminal_ansi_magenta: Some(rgba(0xff7edbff).into()),
terminal_ansi_cyan: Some(rgba(0x03edf9ff).into()),
link_text_hover: Some(rgba(0xff7edbff).into()),
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x206d4bd6).into()),
deleted: Some(rgba(0xfa2e46a4).into()),
error: Some(rgba(0xfe4450ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xffffff59).into()),
modified: Some(rgba(0xb893ce8f).into()),
warning: Some(rgba(0x72f1b8bb).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xfede5dff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xf97e72ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x848bbdff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x848bbdff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0xf97e72ff).into()),
..Default::default()
},
),
(
"constructor".into(),
UserHighlightStyle {
color: Some(rgba(0x72f1b8ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x36f9f6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xfede5dff).into()),
..Default::default()
},
),
(
"label".into(),
UserHighlightStyle {
color: Some(rgba(0xfe4450ff).into()),
..Default::default()
},
),
(
"link_text".into(),
UserHighlightStyle {
color: Some(rgba(0xdd5500ff).into()),
..Default::default()
},
),
(
"link_uri".into(),
UserHighlightStyle {
color: Some(rgba(0xdd5500ff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xf97e72ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xfede5dff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0xff7edbff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x36f9f6ff).into()),
..Default::default()
},
),
(
"punctuation.bracket".into(),
UserHighlightStyle {
color: Some(rgba(0x36f9f6ff).into()),
..Default::default()
},
),
(
"punctuation.delimiter".into(),
UserHighlightStyle {
color: Some(rgba(0x36f9f6ff).into()),
..Default::default()
},
),
(
"punctuation.list_marker".into(),
UserHighlightStyle {
color: Some(rgba(0x36f9f6ff).into()),
..Default::default()
},
),
(
"punctuation.special".into(),
UserHighlightStyle {
color: Some(rgba(0x36f9f6ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0x72f1b8ff).into()),
..Default::default()
},
),
(
"title".into(),
UserHighlightStyle {
color: Some(rgba(0xfe4450ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xfe4450ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xff7edbff).into()),
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0xfe4450ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
],
}),
},
}],
}
}

View File

@ -73,10 +73,6 @@ pub struct ThemeMetadata {
#[derive(Parser)]
#[command(author, version, about, long_about = None)]
struct Args {
/// Whether to import Zed1 themes.
#[arg(long)]
zed1: bool,
/// Whether to warn when values are missing from the theme.
#[arg(long)]
warn_on_missing: bool,
@ -106,6 +102,14 @@ fn main() -> Result<()> {
TermLogger::init(LevelFilter::Trace, log_config, TerminalMode::Mixed)
.expect("could not initialize logger");
let mut theme_families = Vec::new();
/// Whether VS Code themes should be imported.
///
/// For the initial release of Zed2, we will just be using the Zed1 themes ported to Zed2.
const IMPORT_VS_CODE_THEMES: bool = false;
if IMPORT_VS_CODE_THEMES {
log::info!("Loading themes source...");
let vscode_themes_path = PathBuf::from_str(SOURCE_PATH)?;
if !vscode_themes_path.exists() {
@ -115,8 +119,6 @@ fn main() -> Result<()> {
)));
}
let mut theme_families = Vec::new();
for theme_family_dir in fs::read_dir(&vscode_themes_path)? {
let theme_family_dir = theme_family_dir?;
@ -186,8 +188,8 @@ fn main() -> Result<()> {
theme_families.push(theme_family);
}
}
if args.zed1 {
let zed1_themes_path = PathBuf::from_str("assets/themes")?;
let zed1_theme_familes = [
@ -249,8 +251,7 @@ fn main() -> Result<()> {
let theme_without_comments = StripComments::new(theme_file);
let zed1_theme: Zed1Theme =
gpui1::fonts::with_font_cache(zed1_font_cache.clone(), || {
let zed1_theme: Zed1Theme = gpui1::fonts::with_font_cache(zed1_font_cache.clone(), || {
serde_json::from_reader(theme_without_comments)
.context(format!("failed to parse theme {theme_file_path:?}"))
})?;
@ -274,14 +275,13 @@ fn main() -> Result<()> {
for (family, themes) in zed1_themes_by_family {
let theme_family = UserThemeFamily {
name: format!("{family} (Zed1)"),
name: family,
author: "Zed Industries".to_string(),
themes,
};
theme_families.push(theme_family);
}
}
let themes_output_path = PathBuf::from_str(OUT_PATH)?;

View File

@ -160,6 +160,7 @@ impl<'a> Debug for ThemeColorsRefinementPrinter<'a> {
),
("surface_background", self.0.surface_background),
("background", self.0.background),
("panel_background", self.0.panel_background),
("element_background", self.0.element_background),
("element_hover", self.0.element_hover),
("element_active", self.0.element_active),

View File

@ -53,7 +53,7 @@ impl Zed1ThemeConverter {
let syntax_theme = self.convert_syntax_theme()?;
Ok(UserTheme {
name: format!("{} (Zed1)", self.theme.meta.name),
name: self.theme.meta.name,
appearance,
styles: UserThemeStylesRefinement {
colors: theme_colors_refinement,
@ -68,12 +68,16 @@ impl Zed1ThemeConverter {
Some(zed1_color_to_hsla(color))
}
let diff_style = self.theme.editor.diff.clone();
let diff_style = &self.theme.editor.diff;
let diagnostic_summary = &self.theme.workspace.status_bar.diagnostic_summary;
Ok(StatusColorsRefinement {
created: convert(diff_style.inserted),
modified: convert(diff_style.modified),
deleted: convert(diff_style.deleted),
success: convert(diagnostic_summary.icon_color_ok),
warning: convert(diagnostic_summary.icon_color_warning),
error: convert(diagnostic_summary.icon_color_error),
..Default::default()
})
}
@ -83,11 +87,11 @@ impl Zed1ThemeConverter {
Some(zed1_color_to_hsla(color))
}
let tab_bar = self.theme.workspace.tab_bar.clone();
let active_tab = self.theme.workspace.tab_bar.tab_style(true, true).clone();
let inactive_tab = self.theme.workspace.tab_bar.tab_style(true, false).clone();
let toolbar = self.theme.workspace.toolbar.clone();
let scrollbar = self.theme.editor.scrollbar.clone();
let tab_bar = &self.theme.workspace.tab_bar;
let active_tab = &self.theme.workspace.tab_bar.tab_style(true, true);
let inactive_tab = &self.theme.workspace.tab_bar.tab_style(true, false);
let toolbar = &self.theme.workspace.toolbar;
let scrollbar = &self.theme.editor.scrollbar;
let zed1_titlebar_border = convert(self.theme.titlebar.container.border.color);
@ -95,6 +99,12 @@ impl Zed1ThemeConverter {
border: zed1_titlebar_border,
border_variant: zed1_titlebar_border,
background: convert(self.theme.workspace.background),
elevated_surface_background: self
.theme
.picker
.container
.background_color
.map(zed1_color_to_hsla),
title_bar_background: self
.theme
.titlebar
@ -107,8 +117,38 @@ impl Zed1ThemeConverter {
.status_bar
.container
.background_color
.map(zed1_color_to_hsla)
.or_else(|| {
self.theme
.titlebar
.container
.background_color
.map(zed1_color_to_hsla)
}),
panel_background: self
.theme
.project_panel
.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),
element_hover: self
.theme
.picker
.item
.hovered
.as_ref()
.and_then(|hovered| hovered.container.background_color)
.map(zed1_color_to_hsla),
element_selected: self
.theme
.picker
.item
.active_state()
.container
.background_color
.map(zed1_color_to_hsla),
text: convert(self.theme.editor.text_color),
tab_bar_background: tab_bar.container.background_color.map(zed1_color_to_hsla),
tab_active_background: active_tab
.container

View File

@ -537,6 +537,7 @@ impl Render for Dock {
div()
.flex()
.bg(cx.theme().colors().panel_background)
.border_color(cx.theme().colors().border)
.overflow_hidden()
.map(|this| match self.position().axis() {