diff --git a/crates/theme2/src/default_colors.rs b/crates/theme2/src/default_colors.rs index 8150015311..8cbfc23fa3 100644 --- a/crates/theme2/src/default_colors.rs +++ b/crates/theme2/src/default_colors.rs @@ -13,91 +13,82 @@ impl ThemeColors { let system = SystemColors::default(); Self { - background: neutral().light().step_1(), border: neutral().light().step_6(), - border_disabled: neutral().light().step_3(), + border_variant: neutral().light().step_5(), border_focused: blue().light().step_5(), border_selected: blue().light().step_5(), border_transparent: system.transparent, - border_variant: neutral().light().step_5(), - code_block_background: gpui::transparent_black(), - code_block_border: gpui::transparent_black(), - drop_target_background: blue().light_alpha().step_2(), - editor_active_line_background: neutral().light_alpha().step_3(), - editor_active_line_number: neutral().light().step_11(), - editor_active_wrap_guide: neutral().light_alpha().step_8(), // todo!("pick the right colors") - editor_foreground: neutral().light().step_12(), - editor_background: neutral().light().step_1(), - editor_document_highlight_read_background: neutral().light_alpha().step_3(), // todo!("pick the right colors") - editor_document_highlight_write_background: neutral().light_alpha().step_4(), // todo!("pick the right colors") - editor_gutter_background: neutral().light().step_1(), // todo!("pick the right colors") - editor_highlighted_line_background: neutral().light_alpha().step_3(), - editor_invisible: neutral().light().step_10(), - editor_line_number: neutral().light().step_10(), - editor_subheader_background: neutral().light().step_2(), - editor_wrap_guide: neutral().light_alpha().step_7(), - element_active: neutral().light_alpha().step_5(), - element_background: neutral().light().step_3(), - element_disabled: neutral().light_alpha().step_3(), - element_hover: neutral().light_alpha().step_4(), - element_selected: neutral().light_alpha().step_5(), + border_disabled: neutral().light().step_3(), elevated_surface_background: neutral().light().step_2(), - emphasis: neutral().light().step_12(), - ghost_element_active: neutral().light_alpha().step_4(), - ghost_element_background: system.transparent, - ghost_element_disabled: neutral().light_alpha().step_3(), - ghost_element_hover: neutral().light_alpha().step_3(), - ghost_element_selected: neutral().light_alpha().step_5(), - headline: blue().light().step_9(), - icon: neutral().light().step_11(), - icon_accent: blue().light().step_11(), - icon_disabled: neutral().light().step_9(), - icon_muted: neutral().light().step_10(), - icon_placeholder: neutral().light().step_10(), - inline_code_background: gpui::transparent_black(), - inline_code_border: gpui::transparent_black(), - link_text: orange().light().step_9(), - link_text_hover: orange().light().step_10(), - link_uri: green().light().step_9(), - pane_focused_border: blue().light().step_5(), - panel_background: neutral().light().step_2(), - panel_focused_border: blue().light().step_5(), - paragraph: neutral().light().step_12(), - scrollbar_thumb_background: neutral().light_alpha().step_3(), - scrollbar_thumb_border: gpui::transparent_black(), - scrollbar_thumb_hover_background: neutral().light_alpha().step_4(), - scrollbar_track_background: gpui::transparent_black(), - scrollbar_track_border: neutral().light().step_5(), - search_match_background: neutral().light().step_2(), // todo!(this was inserted by Mikayla) - status_bar_background: neutral().light().step_2(), surface_background: neutral().light().step_2(), - tab_active_background: neutral().light().step_1(), - tab_bar_background: neutral().light().step_2(), - tab_inactive_background: neutral().light().step_2(), - terminal_ansi_black: black().light().step_12(), - terminal_ansi_blue: blue().light().step_11(), - terminal_ansi_bright_black: black().light().step_11(), - terminal_ansi_bright_blue: blue().light().step_10(), - terminal_ansi_bright_cyan: cyan().light().step_10(), - terminal_ansi_bright_green: green().light().step_10(), - terminal_ansi_bright_magenta: violet().light().step_10(), - terminal_ansi_bright_red: red().light().step_10(), - terminal_ansi_bright_white: neutral().light().step_11(), - terminal_ansi_bright_yellow: yellow().light().step_10(), - terminal_ansi_cyan: cyan().light().step_11(), - terminal_ansi_green: green().light().step_11(), - terminal_ansi_magenta: violet().light().step_11(), - terminal_ansi_red: red().light().step_11(), - terminal_ansi_white: neutral().light().step_12(), - terminal_ansi_yellow: yellow().light().step_11(), - terminal_background: neutral().light().step_1(), + background: neutral().light().step_1(), + element_background: neutral().light().step_3(), + element_hover: neutral().light_alpha().step_4(), // todo!("pick the right colors") + element_active: neutral().light_alpha().step_5(), + element_selected: neutral().light_alpha().step_5(), + element_disabled: neutral().light_alpha().step_3(), // todo!("pick the right colors") + drop_target_background: blue().light_alpha().step_2(), // todo!("pick the right colors") + ghost_element_background: system.transparent, // todo!("pick the right colors") + ghost_element_hover: neutral().light_alpha().step_3(), + ghost_element_active: neutral().light_alpha().step_4(), + ghost_element_selected: neutral().light_alpha().step_5(), + ghost_element_disabled: neutral().light_alpha().step_3(), text: neutral().light().step_12(), - text_accent: blue().light().step_11(), - text_disabled: neutral().light().step_9(), text_muted: neutral().light().step_10(), text_placeholder: neutral().light().step_10(), + text_disabled: neutral().light().step_9(), + text_accent: blue().light().step_11(), + icon: neutral().light().step_11(), + icon_muted: neutral().light().step_10(), + icon_disabled: neutral().light().step_9(), + icon_placeholder: neutral().light().step_10(), + icon_accent: blue().light().step_11(), + status_bar_background: neutral().light().step_2(), title_bar_background: neutral().light().step_2(), toolbar_background: neutral().light().step_1(), + tab_bar_background: neutral().light().step_2(), + tab_inactive_background: neutral().light().step_2(), + tab_active_background: neutral().light().step_1(), + search_match_background: neutral().light().step_2(), + panel_background: neutral().light().step_2(), + panel_focused_border: blue().light().step_5(), + pane_focused_border: blue().light().step_5(), + scrollbar_thumb_background: neutral().light_alpha().step_3(), + scrollbar_thumb_hover_background: neutral().light_alpha().step_4(), + scrollbar_thumb_border: gpui::transparent_black(), + scrollbar_track_background: gpui::transparent_black(), + scrollbar_track_border: neutral().light().step_5(), + editor_foreground: neutral().light().step_12(), + editor_background: neutral().light().step_1(), // todo!(this was inserted by Mikayla) + editor_gutter_background: neutral().light().step_1(), + editor_subheader_background: neutral().light().step_2(), + editor_active_line_background: neutral().light_alpha().step_3(), + editor_highlighted_line_background: neutral().light_alpha().step_3(), + editor_line_number: neutral().light().step_10(), + editor_active_line_number: neutral().light().step_11(), + editor_invisible: neutral().light().step_10(), + editor_wrap_guide: neutral().light_alpha().step_7(), + editor_active_wrap_guide: neutral().light_alpha().step_8(), + editor_document_highlight_read_background: neutral().light_alpha().step_3(), + editor_document_highlight_write_background: neutral().light_alpha().step_4(), + terminal_background: neutral().light().step_1(), + terminal_ansi_bright_black: black().light().step_11(), + terminal_ansi_bright_red: red().light().step_10(), + terminal_ansi_bright_green: green().light().step_10(), + terminal_ansi_bright_yellow: yellow().light().step_10(), + terminal_ansi_bright_blue: blue().light().step_10(), + terminal_ansi_bright_magenta: violet().light().step_10(), + terminal_ansi_bright_cyan: cyan().light().step_10(), + terminal_ansi_bright_white: neutral().light().step_11(), + terminal_ansi_black: black().light().step_12(), + terminal_ansi_red: red().light().step_11(), + terminal_ansi_green: green().light().step_11(), + terminal_ansi_yellow: yellow().light().step_11(), + terminal_ansi_blue: blue().light().step_11(), + terminal_ansi_magenta: violet().light().step_11(), + terminal_ansi_cyan: cyan().light().step_11(), + terminal_ansi_white: neutral().light().step_12(), + link_text_hover: orange().light().step_10(), } } @@ -105,91 +96,82 @@ impl ThemeColors { let system = SystemColors::default(); Self { - background: neutral().dark().step_1(), border: neutral().dark().step_6(), - border_disabled: neutral().dark().step_3(), + border_variant: neutral().dark().step_5(), border_focused: blue().dark().step_5(), border_selected: blue().dark().step_5(), border_transparent: system.transparent, - border_variant: neutral().dark().step_5(), - code_block_background: gpui::transparent_black(), - code_block_border: gpui::transparent_black(), - drop_target_background: blue().dark_alpha().step_2(), - editor_active_line_background: neutral().dark_alpha().step_3(), - editor_active_line_number: neutral().dark_alpha().step_12(), - editor_active_wrap_guide: neutral().dark_alpha().step_4(), // todo!("pick the right colors") - editor_background: neutral().dark().step_1(), - editor_document_highlight_read_background: neutral().dark_alpha().step_4(), // todo!("pick the right colors") - editor_document_highlight_write_background: neutral().dark_alpha().step_4(), // todo!("pick the right colors") - editor_foreground: neutral().dark().step_12(), - editor_gutter_background: neutral().dark().step_1(), - editor_highlighted_line_background: neutral().dark_alpha().step_4(), // todo!("pick the right colors") - editor_invisible: neutral().dark_alpha().step_4(), // todo!("pick the right colors") - editor_line_number: neutral().dark_alpha().step_10(), - editor_subheader_background: neutral().dark().step_3(), - editor_wrap_guide: neutral().dark_alpha().step_4(), // todo!("pick the right colors") - element_active: neutral().dark_alpha().step_5(), - element_background: neutral().dark().step_3(), - element_disabled: neutral().dark_alpha().step_3(), - element_hover: neutral().dark_alpha().step_4(), - element_selected: neutral().dark_alpha().step_5(), + border_disabled: neutral().dark().step_3(), elevated_surface_background: neutral().dark().step_2(), - emphasis: neutral().dark().step_12(), - ghost_element_active: neutral().dark_alpha().step_5(), - ghost_element_background: system.transparent, - ghost_element_disabled: neutral().dark_alpha().step_3(), - ghost_element_hover: neutral().dark_alpha().step_4(), - ghost_element_selected: neutral().dark_alpha().step_5(), - headline: blue().dark().step_9(), - icon: neutral().dark().step_11(), - icon_accent: blue().dark().step_11(), - icon_disabled: neutral().dark().step_9(), - icon_muted: neutral().dark().step_10(), - icon_placeholder: neutral().dark().step_10(), - inline_code_background: gpui::transparent_black(), - inline_code_border: gpui::transparent_black(), - link_text: orange().dark().step_9(), - link_text_hover: orange().dark().step_10(), - link_uri: green().dark().step_9(), - pane_focused_border: blue().dark().step_5(), - panel_background: neutral().dark().step_2(), - panel_focused_border: blue().dark().step_5(), - paragraph: neutral().dark().step_12(), - scrollbar_thumb_background: neutral().dark_alpha().step_3(), - scrollbar_thumb_border: gpui::transparent_black(), - scrollbar_thumb_hover_background: neutral().dark_alpha().step_4(), - scrollbar_track_background: gpui::transparent_black(), - scrollbar_track_border: neutral().dark().step_5(), - search_match_background: neutral().dark().step_2(), // todo!(this was inserted by Mikayla) - status_bar_background: neutral().dark().step_2(), surface_background: neutral().dark().step_2(), - tab_active_background: neutral().dark().step_1(), - tab_bar_background: neutral().dark().step_2(), - tab_inactive_background: neutral().dark().step_2(), - terminal_ansi_black: black().dark().step_12(), - terminal_ansi_blue: blue().dark().step_11(), - terminal_ansi_bright_black: black().dark().step_11(), - terminal_ansi_bright_blue: blue().dark().step_10(), - terminal_ansi_bright_cyan: cyan().dark().step_10(), - terminal_ansi_bright_green: green().dark().step_10(), - terminal_ansi_bright_magenta: violet().dark().step_10(), - terminal_ansi_bright_red: red().dark().step_10(), - terminal_ansi_bright_white: neutral().dark().step_11(), - terminal_ansi_bright_yellow: yellow().dark().step_10(), - terminal_ansi_cyan: cyan().dark().step_11(), - terminal_ansi_green: green().dark().step_11(), - terminal_ansi_magenta: violet().dark().step_11(), - terminal_ansi_red: red().dark().step_11(), - terminal_ansi_white: neutral().dark().step_12(), - terminal_ansi_yellow: yellow().dark().step_11(), - terminal_background: neutral().dark().step_1(), - text: neutral().dark().step_12(), - text_accent: blue().dark().step_11(), - text_disabled: neutral().dark().step_9(), + background: neutral().dark().step_1(), + element_background: neutral().dark().step_3(), + element_hover: neutral().dark_alpha().step_4(), // todo!("pick the right colors") + element_active: neutral().dark_alpha().step_5(), + element_selected: neutral().dark_alpha().step_5(), // todo!("pick the right colors") + element_disabled: neutral().dark_alpha().step_3(), // todo!("pick the right colors") + drop_target_background: blue().dark_alpha().step_2(), + ghost_element_background: system.transparent, + ghost_element_hover: neutral().dark_alpha().step_4(), // todo!("pick the right colors") + ghost_element_active: neutral().dark_alpha().step_5(), // todo!("pick the right colors") + ghost_element_selected: neutral().dark_alpha().step_5(), + ghost_element_disabled: neutral().dark_alpha().step_3(), + text: neutral().dark().step_12(), // todo!("pick the right colors") text_muted: neutral().dark().step_11(), text_placeholder: neutral().dark().step_10(), + text_disabled: neutral().dark().step_9(), + text_accent: blue().dark().step_11(), + icon: neutral().dark().step_11(), + icon_muted: neutral().dark().step_10(), + icon_disabled: neutral().dark().step_9(), + icon_placeholder: neutral().dark().step_10(), + icon_accent: blue().dark().step_11(), + status_bar_background: neutral().dark().step_2(), title_bar_background: neutral().dark().step_2(), toolbar_background: neutral().dark().step_1(), + tab_bar_background: neutral().dark().step_2(), + tab_inactive_background: neutral().dark().step_2(), + tab_active_background: neutral().dark().step_1(), + search_match_background: neutral().dark().step_2(), + panel_background: neutral().dark().step_2(), + panel_focused_border: blue().dark().step_5(), + pane_focused_border: blue().dark().step_5(), + scrollbar_thumb_background: neutral().dark_alpha().step_3(), + scrollbar_thumb_hover_background: neutral().dark_alpha().step_4(), + scrollbar_thumb_border: gpui::transparent_black(), + scrollbar_track_background: gpui::transparent_black(), + scrollbar_track_border: neutral().dark().step_5(), // todo!(this was inserted by Mikayla) + editor_foreground: neutral().dark().step_12(), + editor_background: neutral().dark().step_1(), + editor_gutter_background: neutral().dark().step_1(), + editor_subheader_background: neutral().dark().step_3(), + editor_active_line_background: neutral().dark_alpha().step_3(), + editor_highlighted_line_background: neutral().dark_alpha().step_4(), + editor_line_number: neutral().dark_alpha().step_10(), + editor_active_line_number: neutral().dark_alpha().step_12(), + editor_invisible: neutral().dark_alpha().step_4(), + editor_wrap_guide: neutral().dark_alpha().step_4(), + editor_active_wrap_guide: neutral().dark_alpha().step_4(), + editor_document_highlight_read_background: neutral().dark_alpha().step_4(), + editor_document_highlight_write_background: neutral().dark_alpha().step_4(), + terminal_background: neutral().dark().step_1(), + terminal_ansi_bright_black: black().dark().step_11(), + terminal_ansi_bright_red: red().dark().step_10(), + terminal_ansi_bright_green: green().dark().step_10(), + terminal_ansi_bright_yellow: yellow().dark().step_10(), + terminal_ansi_bright_blue: blue().dark().step_10(), + terminal_ansi_bright_magenta: violet().dark().step_10(), + terminal_ansi_bright_cyan: cyan().dark().step_10(), + terminal_ansi_bright_white: neutral().dark().step_11(), + terminal_ansi_black: black().dark().step_12(), + terminal_ansi_red: red().dark().step_11(), + terminal_ansi_green: green().dark().step_11(), + terminal_ansi_yellow: yellow().dark().step_11(), + terminal_ansi_blue: blue().dark().step_11(), + terminal_ansi_magenta: violet().dark().step_11(), + terminal_ansi_cyan: cyan().dark().step_11(), + terminal_ansi_white: neutral().dark().step_12(), + link_text_hover: orange().dark().step_10(), } } } diff --git a/crates/theme2/src/one_themes.rs b/crates/theme2/src/one_themes.rs index 72411dc40c..498a9ef84d 100644 --- a/crates/theme2/src/one_themes.rs +++ b/crates/theme2/src/one_themes.rs @@ -23,7 +23,6 @@ pub(crate) fn one_dark() -> Theme { let elevated_surface = hsla(225. / 360., 12. / 100., 17. / 100., 1.); let blue = hsla(207.8 / 360., 81. / 100., 66. / 100., 1.0); - let light_gray = hsla(218.8 / 360., 14. / 100., 71. / 100., 1.0); let gray = hsla(218.8 / 360., 10. / 100., 40. / 100., 1.0); let green = hsla(95. / 360., 38. / 100., 62. / 100., 1.0); let orange = hsla(29. / 360., 54. / 100., 61. / 100., 1.0); @@ -123,16 +122,7 @@ pub(crate) fn one_dark() -> Theme { scrollbar_track_background: gpui::transparent_black(), scrollbar_track_border: hsla(228. / 360., 8. / 100., 25. / 100., 1.), editor_foreground: hsla(218. / 360., 14. / 100., 71. / 100., 1.), - headline: hsla(355. / 360., 65. / 100., 65. / 100., 1.), - paragraph: light_gray, - link_text: blue, link_text_hover: blue, - link_uri: teal, - inline_code_background: gpui::transparent_black(), - inline_code_border: gpui::transparent_black(), - code_block_background: gpui::transparent_black(), - code_block_border: gpui::transparent_black(), - emphasis: orange, }, status: StatusColors { conflict: yellow, diff --git a/crates/theme2/src/styles/colors.rs b/crates/theme2/src/styles/colors.rs index 0b548c5a74..5f22958665 100644 --- a/crates/theme2/src/styles/colors.rs +++ b/crates/theme2/src/styles/colors.rs @@ -206,16 +206,7 @@ pub struct ThemeColors { // === // UI/Rich Text // === - pub headline: Hsla, - pub paragraph: Hsla, - pub link_text: Hsla, pub link_text_hover: Hsla, - pub link_uri: Hsla, - pub inline_code_background: Hsla, - pub inline_code_border: Hsla, - pub code_block_background: Hsla, - pub code_block_border: Hsla, - pub emphasis: Hsla, } #[derive(Refineable, Clone)] diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index a0518aea83..c50961cb72 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -64,10 +64,16 @@ pub fn andromeda() -> UserThemeFamily { editor_foreground: Some(rgba(0xf7f7f8ff).into()), editor_background: Some(rgba(0x1e2025ff).into()), editor_gutter_background: Some(rgba(0x1e2025ff).into()), + editor_subheader_background: Some(rgba(0x21242bff).into()), + editor_active_line_background: Some(rgba(0x21242bbf).into()), + editor_highlighted_line_background: Some(rgba(0x21242bff).into()), editor_line_number: Some(rgba(0xf7f7f859).into()), editor_active_line_number: Some(rgba(0xf7f7f8ff).into()), + editor_invisible: Some(rgba(0xaca8aeff).into()), editor_wrap_guide: Some(rgba(0xf7f7f80d).into()), editor_active_wrap_guide: Some(rgba(0xf7f7f81a).into()), + editor_document_highlight_read_background: Some(rgba(0x11a7931a).into()), + editor_document_highlight_write_background: Some(rgba(0x64646d66).into()), terminal_background: Some(rgba(0x1e2025ff).into()), terminal_ansi_bright_black: Some(rgba(0x40434cff).into()), terminal_ansi_bright_red: Some(rgba(0x8e103aff).into()), @@ -85,6 +91,7 @@ pub fn andromeda() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xc74decff).into()), terminal_ansi_cyan: Some(rgba(0x09e7c6ff).into()), terminal_ansi_white: Some(rgba(0xf7f7f8ff).into()), + link_text_hover: Some(rgba(0x11a793ff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs index e6464cc2c1..460af35963 100644 --- a/crates/theme2/src/themes/atelier.rs +++ b/crates/theme2/src/themes/atelier.rs @@ -65,10 +65,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x302f27ff).into()), editor_background: Some(rgba(0xf4f3ecff).into()), editor_gutter_background: Some(rgba(0xf4f3ecff).into()), + editor_subheader_background: Some(rgba(0xebeae3ff).into()), + editor_active_line_background: Some(rgba(0xebeae3bf).into()), + editor_highlighted_line_background: Some(rgba(0xebeae3ff).into()), editor_line_number: Some(rgba(0x22221b59).into()), editor_active_line_number: Some(rgba(0x22221bff).into()), + editor_invisible: Some(rgba(0x61604fff).into()), editor_wrap_guide: Some(rgba(0x22221b0d).into()), editor_active_wrap_guide: Some(rgba(0x22221b1a).into()), + editor_document_highlight_read_background: Some(rgba(0x38a1661a).into()), + editor_document_highlight_write_background: Some(rgba(0x7a786766).into()), terminal_background: Some(rgba(0xf4f3ecff).into()), terminal_ansi_bright_black: Some(rgba(0x898775ff).into()), terminal_ansi_bright_red: Some(rgba(0xe4af96ff).into()), @@ -86,6 +92,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x9d6c7cff).into()), terminal_ansi_cyan: Some(rgba(0x5c9d49ff).into()), terminal_ansi_white: Some(rgba(0x22221bff).into()), + link_text_hover: Some(rgba(0x38a166ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -489,10 +496,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xe6e2e0ff).into()), editor_background: Some(rgba(0x1b1918ff).into()), editor_gutter_background: Some(rgba(0x1b1918ff).into()), + editor_subheader_background: Some(rgba(0x27211eff).into()), + editor_active_line_background: Some(rgba(0x27211ebf).into()), + editor_highlighted_line_background: Some(rgba(0x27211eff).into()), editor_line_number: Some(rgba(0xf1efee59).into()), editor_active_line_number: Some(rgba(0xf1efeeff).into()), + editor_invisible: Some(rgba(0xa79f9dff).into()), editor_wrap_guide: Some(rgba(0xf1efee0d).into()), editor_active_wrap_guide: Some(rgba(0xf1efee1a).into()), + editor_document_highlight_read_background: Some(rgba(0x417ee61a).into()), + editor_document_highlight_write_background: Some(rgba(0x89817e66).into()), terminal_background: Some(rgba(0x1b1918ff).into()), terminal_ansi_bright_black: Some(rgba(0x746c69ff).into()), terminal_ansi_bright_red: Some(rgba(0x8c1223ff).into()), @@ -510,6 +523,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xc340f2ff).into()), terminal_ansi_cyan: Some(rgba(0x3e97b8ff).into()), terminal_ansi_white: Some(rgba(0xf1efeeff).into()), + link_text_hover: Some(rgba(0x417ee6ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -913,10 +927,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x232a25ff).into()), editor_background: Some(rgba(0xecf4eeff).into()), editor_gutter_background: Some(rgba(0xecf4eeff).into()), + editor_subheader_background: Some(rgba(0xe3ebe6ff).into()), + editor_active_line_background: Some(rgba(0xe3ebe6bf).into()), + editor_highlighted_line_background: Some(rgba(0xe3ebe6ff).into()), editor_line_number: Some(rgba(0x171c1959).into()), editor_active_line_number: Some(rgba(0x171c19ff).into()), + editor_invisible: Some(rgba(0x546259ff).into()), editor_wrap_guide: Some(rgba(0x171c190d).into()), editor_active_wrap_guide: Some(rgba(0x171c191a).into()), + editor_document_highlight_read_background: Some(rgba(0x488c901a).into()), + editor_document_highlight_write_background: Some(rgba(0x6c7a7166).into()), terminal_background: Some(rgba(0xecf4eeff).into()), terminal_ansi_bright_black: Some(rgba(0x7b897fff).into()), terminal_ansi_bright_red: Some(rgba(0xdeae97ff).into()), @@ -934,6 +954,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x867469ff).into()), terminal_ansi_cyan: Some(rgba(0x1f9aa0ff).into()), terminal_ansi_white: Some(rgba(0x171c19ff).into()), + link_text_hover: Some(rgba(0x488c90ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -1337,10 +1358,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xe2dfe7ff).into()), editor_background: Some(rgba(0x19171cff).into()), editor_gutter_background: Some(rgba(0x19171cff).into()), + editor_subheader_background: Some(rgba(0x221f26ff).into()), + editor_active_line_background: Some(rgba(0x221f26bf).into()), + editor_highlighted_line_background: Some(rgba(0x221f26ff).into()), editor_line_number: Some(rgba(0xefecf459).into()), editor_active_line_number: Some(rgba(0xefecf4ff).into()), + editor_invisible: Some(rgba(0x898591ff).into()), editor_wrap_guide: Some(rgba(0xefecf40d).into()), editor_active_wrap_guide: Some(rgba(0xefecf41a).into()), + editor_document_highlight_read_background: Some(rgba(0x576dda1a).into()), + editor_document_highlight_write_background: Some(rgba(0x726c7a66).into()), terminal_background: Some(rgba(0x19171cff).into()), terminal_ansi_bright_black: Some(rgba(0x635d6bff).into()), terminal_ansi_bright_red: Some(rgba(0x5c283cff).into()), @@ -1358,6 +1385,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xbf41bfff).into()), terminal_ansi_cyan: Some(rgba(0x3a8bc6ff).into()), terminal_ansi_white: Some(rgba(0xefecf4ff).into()), + link_text_hover: Some(rgba(0x576ddaff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -1761,10 +1789,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xe7e6dfff).into()), editor_background: Some(rgba(0x22221bff).into()), editor_gutter_background: Some(rgba(0x22221bff).into()), + editor_subheader_background: Some(rgba(0x2c2b23ff).into()), + editor_active_line_background: Some(rgba(0x2c2b23bf).into()), + editor_highlighted_line_background: Some(rgba(0x2c2b23ff).into()), editor_line_number: Some(rgba(0xf4f3ec59).into()), editor_active_line_number: Some(rgba(0xf4f3ecff).into()), + editor_invisible: Some(rgba(0x91907fff).into()), editor_wrap_guide: Some(rgba(0xf4f3ec0d).into()), editor_active_wrap_guide: Some(rgba(0xf4f3ec1a).into()), + editor_document_highlight_read_background: Some(rgba(0x37a1661a).into()), + editor_document_highlight_write_background: Some(rgba(0x7a786766).into()), terminal_background: Some(rgba(0x22221bff).into()), terminal_ansi_bright_black: Some(rgba(0x6a6958ff).into()), terminal_ansi_bright_red: Some(rgba(0x5c331fff).into()), @@ -1782,6 +1816,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x9d6c7cff).into()), terminal_ansi_cyan: Some(rgba(0x5b9d48ff).into()), terminal_ansi_white: Some(rgba(0xf4f3ecff).into()), + link_text_hover: Some(rgba(0x37a166ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -2185,10 +2220,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xdfe2f1ff).into()), editor_background: Some(rgba(0x202746ff).into()), editor_gutter_background: Some(rgba(0x202746ff).into()), + editor_subheader_background: Some(rgba(0x262f51ff).into()), + editor_active_line_background: Some(rgba(0x262f51bf).into()), + editor_highlighted_line_background: Some(rgba(0x262f51ff).into()), editor_line_number: Some(rgba(0xf5f7ff59).into()), editor_active_line_number: Some(rgba(0xf5f7ffff).into()), + editor_invisible: Some(rgba(0x959bb2ff).into()), editor_wrap_guide: Some(rgba(0xf5f7ff0d).into()), editor_active_wrap_guide: Some(rgba(0xf5f7ff1a).into()), + editor_document_highlight_read_background: Some(rgba(0x3e8fd01a).into()), + editor_document_highlight_write_background: Some(rgba(0x7a819c66).into()), terminal_background: Some(rgba(0x202746ff).into()), terminal_ansi_bright_black: Some(rgba(0x697192ff).into()), terminal_ansi_bright_red: Some(rgba(0x6d2616ff).into()), @@ -2206,6 +2247,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x9c637aff).into()), terminal_ansi_cyan: Some(rgba(0x25a2c9ff).into()), terminal_ansi_white: Some(rgba(0xf5f7ffff).into()), + link_text_hover: Some(rgba(0x3e8fd0ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -2609,10 +2651,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x293256ff).into()), editor_background: Some(rgba(0xf5f7ffff).into()), editor_gutter_background: Some(rgba(0xf5f7ffff).into()), + editor_subheader_background: Some(rgba(0xe5e8f5ff).into()), + editor_active_line_background: Some(rgba(0xe5e8f5bf).into()), + editor_highlighted_line_background: Some(rgba(0xe5e8f5ff).into()), editor_line_number: Some(rgba(0x20274659).into()), editor_active_line_number: Some(rgba(0x202746ff).into()), + editor_invisible: Some(rgba(0x606889ff).into()), editor_wrap_guide: Some(rgba(0x2027460d).into()), editor_active_wrap_guide: Some(rgba(0x2027461a).into()), + editor_document_highlight_read_background: Some(rgba(0x3f8fd01a).into()), + editor_document_highlight_write_background: Some(rgba(0x7a819c66).into()), terminal_background: Some(rgba(0xf5f7ffff).into()), terminal_ansi_bright_black: Some(rgba(0x8b91a7ff).into()), terminal_ansi_bright_red: Some(rgba(0xefa58cff).into()), @@ -2630,6 +2678,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x9c637aff).into()), terminal_ansi_cyan: Some(rgba(0x25a2c9ff).into()), terminal_ansi_white: Some(rgba(0x202746ff).into()), + link_text_hover: Some(rgba(0x3f8fd0ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -3033,10 +3082,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xe8e4cfff).into()), editor_background: Some(rgba(0x20201dff).into()), editor_gutter_background: Some(rgba(0x20201dff).into()), + editor_subheader_background: Some(rgba(0x262622ff).into()), + editor_active_line_background: Some(rgba(0x262622bf).into()), + editor_highlighted_line_background: Some(rgba(0x262622ff).into()), editor_line_number: Some(rgba(0xfefbec59).into()), editor_active_line_number: Some(rgba(0xfefbecff).into()), + editor_invisible: Some(rgba(0xa4a08bff).into()), editor_wrap_guide: Some(rgba(0xfefbec0d).into()), editor_active_wrap_guide: Some(rgba(0xfefbec1a).into()), + editor_document_highlight_read_background: Some(rgba(0x6684e01a).into()), + editor_document_highlight_write_background: Some(rgba(0x8b887466).into()), terminal_background: Some(rgba(0x20201dff).into()), terminal_ansi_bright_black: Some(rgba(0x7a7766ff).into()), terminal_ansi_bright_red: Some(rgba(0x781c1fff).into()), @@ -3054,6 +3109,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xd43652ff).into()), terminal_ansi_cyan: Some(rgba(0x21ad83ff).into()), terminal_ansi_white: Some(rgba(0xfefbecff).into()), + link_text_hover: Some(rgba(0x6684e0ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -3457,10 +3513,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xcfe8cfff).into()), editor_background: Some(rgba(0x131513ff).into()), editor_gutter_background: Some(rgba(0x131513ff).into()), + editor_subheader_background: Some(rgba(0x1f231fff).into()), + editor_active_line_background: Some(rgba(0x1f231fbf).into()), + editor_highlighted_line_background: Some(rgba(0x1f231fff).into()), editor_line_number: Some(rgba(0xf4fbf459).into()), editor_active_line_number: Some(rgba(0xf4fbf4ff).into()), + editor_invisible: Some(rgba(0x8ba48bff).into()), editor_wrap_guide: Some(rgba(0xf4fbf40d).into()), editor_active_wrap_guide: Some(rgba(0xf4fbf41a).into()), + editor_document_highlight_read_background: Some(rgba(0x3e62f41a).into()), + editor_document_highlight_write_background: Some(rgba(0x748b7466).into()), terminal_background: Some(rgba(0x131513ff).into()), terminal_ansi_bright_black: Some(rgba(0x667a66ff).into()), terminal_ansi_bright_red: Some(rgba(0x840b21ff).into()), @@ -3478,6 +3540,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xe61cc3ff).into()), terminal_ansi_cyan: Some(rgba(0x1c99b3ff).into()), terminal_ansi_white: Some(rgba(0xf4fbf4ff).into()), + link_text_hover: Some(rgba(0x3e62f4ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -3881,10 +3944,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x26232aff).into()), editor_background: Some(rgba(0xefecf4ff).into()), editor_gutter_background: Some(rgba(0xefecf4ff).into()), + editor_subheader_background: Some(rgba(0xe6e3ebff).into()), + editor_active_line_background: Some(rgba(0xe6e3ebbf).into()), + editor_highlighted_line_background: Some(rgba(0xe6e3ebff).into()), editor_line_number: Some(rgba(0x19171c59).into()), editor_active_line_number: Some(rgba(0x19171cff).into()), + editor_invisible: Some(rgba(0x5a5462ff).into()), editor_wrap_guide: Some(rgba(0x19171c0d).into()), editor_active_wrap_guide: Some(rgba(0x19171c1a).into()), + editor_document_highlight_read_background: Some(rgba(0x586dda1a).into()), + editor_document_highlight_write_background: Some(rgba(0x726c7a66).into()), terminal_background: Some(rgba(0xefecf4ff).into()), terminal_ansi_bright_black: Some(rgba(0x807b89ff).into()), terminal_ansi_bright_red: Some(rgba(0xe3a4b9ff).into()), @@ -3902,6 +3971,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xbf41bfff).into()), terminal_ansi_cyan: Some(rgba(0x3b8bc6ff).into()), terminal_ansi_white: Some(rgba(0x19171cff).into()), + link_text_hover: Some(rgba(0x586ddaff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -4305,10 +4375,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xe7dfdfff).into()), editor_background: Some(rgba(0x1b1818ff).into()), editor_gutter_background: Some(rgba(0x1b1818ff).into()), + editor_subheader_background: Some(rgba(0x252020ff).into()), + editor_active_line_background: Some(rgba(0x252020bf).into()), + editor_highlighted_line_background: Some(rgba(0x252020ff).into()), editor_line_number: Some(rgba(0xf4ecec59).into()), editor_active_line_number: Some(rgba(0xf4ececff).into()), + editor_invisible: Some(rgba(0x898383ff).into()), editor_wrap_guide: Some(rgba(0xf4ecec0d).into()), editor_active_wrap_guide: Some(rgba(0xf4ecec1a).into()), + editor_document_highlight_read_background: Some(rgba(0x7272ca1a).into()), + editor_document_highlight_write_background: Some(rgba(0x726a6a66).into()), terminal_background: Some(rgba(0x1b1818ff).into()), terminal_ansi_bright_black: Some(rgba(0x635b5bff).into()), terminal_ansi_bright_red: Some(rgba(0x692727ff).into()), @@ -4326,6 +4402,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xbd5187ff).into()), terminal_ansi_cyan: Some(rgba(0x5485b6ff).into()), terminal_ansi_white: Some(rgba(0xf4ececff).into()), + link_text_hover: Some(rgba(0x7272caff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -4729,10 +4806,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xd8cad8ff).into()), editor_background: Some(rgba(0x1b181bff).into()), editor_gutter_background: Some(rgba(0x1b181bff).into()), + editor_subheader_background: Some(rgba(0x252025ff).into()), + editor_active_line_background: Some(rgba(0x252025bf).into()), + editor_highlighted_line_background: Some(rgba(0x252025ff).into()), editor_line_number: Some(rgba(0xf7f3f759).into()), editor_active_line_number: Some(rgba(0xf7f3f7ff).into()), + editor_invisible: Some(rgba(0xa99aa9ff).into()), editor_wrap_guide: Some(rgba(0xf7f3f70d).into()), editor_active_wrap_guide: Some(rgba(0xf7f3f71a).into()), + editor_document_highlight_read_background: Some(rgba(0x526aeb1a).into()), + editor_document_highlight_write_background: Some(rgba(0x8b7c8b66).into()), terminal_background: Some(rgba(0x1b181bff).into()), terminal_ansi_bright_black: Some(rgba(0x756775ff).into()), terminal_ansi_bright_red: Some(rgba(0x6d221aff).into()), @@ -4750,6 +4833,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xcc34ccff).into()), terminal_ansi_cyan: Some(rgba(0x189393ff).into()), terminal_ansi_white: Some(rgba(0xf7f3f7ff).into()), + link_text_hover: Some(rgba(0x526aebff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -5153,10 +5237,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xc1e4f6ff).into()), editor_background: Some(rgba(0x161b1dff).into()), editor_gutter_background: Some(rgba(0x161b1dff).into()), + editor_subheader_background: Some(rgba(0x1c2529ff).into()), + editor_active_line_background: Some(rgba(0x1c2529bf).into()), + editor_highlighted_line_background: Some(rgba(0x1c2529ff).into()), editor_line_number: Some(rgba(0xebf8ff59).into()), editor_active_line_number: Some(rgba(0xebf8ffff).into()), + editor_invisible: Some(rgba(0x7ca0b3ff).into()), editor_wrap_guide: Some(rgba(0xebf8ff0d).into()), editor_active_wrap_guide: Some(rgba(0xebf8ff1a).into()), + editor_document_highlight_read_background: Some(rgba(0x277fad1a).into()), + editor_document_highlight_write_background: Some(rgba(0x66889a66).into()), terminal_background: Some(rgba(0x161b1dff).into()), terminal_ansi_bright_black: Some(rgba(0x587989ff).into()), terminal_ansi_bright_red: Some(rgba(0x6f1c3aff).into()), @@ -5174,6 +5264,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xb72ed2ff).into()), terminal_ansi_cyan: Some(rgba(0x2e8f6fff).into()), terminal_ansi_white: Some(rgba(0xebf8ffff).into()), + link_text_hover: Some(rgba(0x277fadff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -5577,10 +5668,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x2c2421ff).into()), editor_background: Some(rgba(0xf1efeeff).into()), editor_gutter_background: Some(rgba(0xf1efeeff).into()), + editor_subheader_background: Some(rgba(0xe9e6e4ff).into()), + editor_active_line_background: Some(rgba(0xe9e6e4bf).into()), + editor_highlighted_line_background: Some(rgba(0xe9e6e4ff).into()), editor_line_number: Some(rgba(0x1b191859).into()), editor_active_line_number: Some(rgba(0x1b1918ff).into()), + editor_invisible: Some(rgba(0x6a6360ff).into()), editor_wrap_guide: Some(rgba(0x1b19180d).into()), editor_active_wrap_guide: Some(rgba(0x1b19181a).into()), + editor_document_highlight_read_background: Some(rgba(0x417ee61a).into()), + editor_document_highlight_write_background: Some(rgba(0x89817e66).into()), terminal_background: Some(rgba(0xf1efeeff).into()), terminal_ansi_bright_black: Some(rgba(0x9e9693ff).into()), terminal_ansi_bright_red: Some(rgba(0xffa29aff).into()), @@ -5598,6 +5695,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xc340f2ff).into()), terminal_ansi_cyan: Some(rgba(0x3f97b8ff).into()), terminal_ansi_white: Some(rgba(0x1b1918ff).into()), + link_text_hover: Some(rgba(0x417ee6ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -6001,10 +6099,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x292824ff).into()), editor_background: Some(rgba(0xfefbecff).into()), editor_gutter_background: Some(rgba(0xfefbecff).into()), + editor_subheader_background: Some(rgba(0xeeebd7ff).into()), + editor_active_line_background: Some(rgba(0xeeebd7bf).into()), + editor_highlighted_line_background: Some(rgba(0xeeebd7ff).into()), editor_line_number: Some(rgba(0x20201d59).into()), editor_active_line_number: Some(rgba(0x20201dff).into()), + editor_invisible: Some(rgba(0x706d5fff).into()), editor_wrap_guide: Some(rgba(0x20201d0d).into()), editor_active_wrap_guide: Some(rgba(0x20201d1a).into()), + editor_document_highlight_read_background: Some(rgba(0x6784e01a).into()), + editor_document_highlight_write_background: Some(rgba(0x8b887466).into()), terminal_background: Some(rgba(0xfefbecff).into()), terminal_ansi_bright_black: Some(rgba(0x9b9782ff).into()), terminal_ansi_bright_red: Some(rgba(0xf7a195ff).into()), @@ -6022,6 +6126,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xd43753ff).into()), terminal_ansi_cyan: Some(rgba(0x22ad83ff).into()), terminal_ansi_white: Some(rgba(0x20201dff).into()), + link_text_hover: Some(rgba(0x6784e0ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -6425,10 +6530,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x292424ff).into()), editor_background: Some(rgba(0xf4ececff).into()), editor_gutter_background: Some(rgba(0xf4ececff).into()), + editor_subheader_background: Some(rgba(0xebe3e3ff).into()), + editor_active_line_background: Some(rgba(0xebe3e3bf).into()), + editor_highlighted_line_background: Some(rgba(0xebe3e3ff).into()), editor_line_number: Some(rgba(0x1b181859).into()), editor_active_line_number: Some(rgba(0x1b1818ff).into()), + editor_invisible: Some(rgba(0x5a5252ff).into()), editor_wrap_guide: Some(rgba(0x1b18180d).into()), editor_active_wrap_guide: Some(rgba(0x1b18181a).into()), + editor_document_highlight_read_background: Some(rgba(0x7372ca1a).into()), + editor_document_highlight_write_background: Some(rgba(0x726a6a66).into()), terminal_background: Some(rgba(0xf4ececff).into()), terminal_ansi_bright_black: Some(rgba(0x807979ff).into()), terminal_ansi_bright_red: Some(rgba(0xeda69fff).into()), @@ -6446,6 +6557,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xbd5287ff).into()), terminal_ansi_cyan: Some(rgba(0x5585b6ff).into()), terminal_ansi_white: Some(rgba(0x1b1818ff).into()), + link_text_hover: Some(rgba(0x7372caff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -6849,10 +6961,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x242924ff).into()), editor_background: Some(rgba(0xf4fbf4ff).into()), editor_gutter_background: Some(rgba(0xf4fbf4ff).into()), + editor_subheader_background: Some(rgba(0xdaeedaff).into()), + editor_active_line_background: Some(rgba(0xdaeedabf).into()), + editor_highlighted_line_background: Some(rgba(0xdaeedaff).into()), editor_line_number: Some(rgba(0x13151359).into()), editor_active_line_number: Some(rgba(0x131513ff).into()), + editor_invisible: Some(rgba(0x5f705fff).into()), editor_wrap_guide: Some(rgba(0x1315130d).into()), editor_active_wrap_guide: Some(rgba(0x1315131a).into()), + editor_document_highlight_read_background: Some(rgba(0x3f62f41a).into()), + editor_document_highlight_write_background: Some(rgba(0x748b7466).into()), terminal_background: Some(rgba(0xf4fbf4ff).into()), terminal_ansi_bright_black: Some(rgba(0x829b82ff).into()), terminal_ansi_bright_red: Some(rgba(0xff9d98ff).into()), @@ -6870,6 +6988,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xe61dc3ff).into()), terminal_ansi_cyan: Some(rgba(0x1d99b3ff).into()), terminal_ansi_white: Some(rgba(0x131513ff).into()), + link_text_hover: Some(rgba(0x3f62f4ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -7273,10 +7392,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0xdfe7e2ff).into()), editor_background: Some(rgba(0x171c19ff).into()), editor_gutter_background: Some(rgba(0x171c19ff).into()), + editor_subheader_background: Some(rgba(0x1f2621ff).into()), + editor_active_line_background: Some(rgba(0x1f2621bf).into()), + editor_highlighted_line_background: Some(rgba(0x1f2621ff).into()), editor_line_number: Some(rgba(0xecf4ee59).into()), editor_active_line_number: Some(rgba(0xecf4eeff).into()), + editor_invisible: Some(rgba(0x859188ff).into()), editor_wrap_guide: Some(rgba(0xecf4ee0d).into()), editor_active_wrap_guide: Some(rgba(0xecf4ee1a).into()), + editor_document_highlight_read_background: Some(rgba(0x478c901a).into()), + editor_document_highlight_write_background: Some(rgba(0x6c7a7166).into()), terminal_background: Some(rgba(0x171c19ff).into()), terminal_ansi_bright_black: Some(rgba(0x5d6b62ff).into()), terminal_ansi_bright_red: Some(rgba(0x563220ff).into()), @@ -7294,6 +7419,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x867469ff).into()), terminal_ansi_cyan: Some(rgba(0x1e9aa0ff).into()), terminal_ansi_white: Some(rgba(0xecf4eeff).into()), + link_text_hover: Some(rgba(0x478c90ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -7697,10 +7823,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x292329ff).into()), editor_background: Some(rgba(0xf7f3f7ff).into()), editor_gutter_background: Some(rgba(0xf7f3f7ff).into()), + editor_subheader_background: Some(rgba(0xe1d6e1ff).into()), + editor_active_line_background: Some(rgba(0xe1d6e1bf).into()), + editor_highlighted_line_background: Some(rgba(0xe1d6e1ff).into()), editor_line_number: Some(rgba(0x1b181b59).into()), editor_active_line_number: Some(rgba(0x1b181bff).into()), + editor_invisible: Some(rgba(0x6b5e6bff).into()), editor_wrap_guide: Some(rgba(0x1b181b0d).into()), editor_active_wrap_guide: Some(rgba(0x1b181b1a).into()), + editor_document_highlight_read_background: Some(rgba(0x526aeb1a).into()), + editor_document_highlight_write_background: Some(rgba(0x8b7c8b66).into()), terminal_background: Some(rgba(0xf7f3f7ff).into()), terminal_ansi_bright_black: Some(rgba(0xa091a0ff).into()), terminal_ansi_bright_red: Some(rgba(0xf0a28fff).into()), @@ -7718,6 +7850,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xcc35ccff).into()), terminal_ansi_cyan: Some(rgba(0x199393ff).into()), terminal_ansi_white: Some(rgba(0x1b181bff).into()), + link_text_hover: Some(rgba(0x526aebff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -8121,10 +8254,16 @@ pub fn atelier() -> UserThemeFamily { editor_foreground: Some(rgba(0x1f292eff).into()), editor_background: Some(rgba(0xebf8ffff).into()), editor_gutter_background: Some(rgba(0xebf8ffff).into()), + editor_subheader_background: Some(rgba(0xcdeaf9ff).into()), + editor_active_line_background: Some(rgba(0xcdeaf9bf).into()), + editor_highlighted_line_background: Some(rgba(0xcdeaf9ff).into()), editor_line_number: Some(rgba(0x161b1d59).into()), editor_active_line_number: Some(rgba(0x161b1dff).into()), + editor_invisible: Some(rgba(0x526f7dff).into()), editor_wrap_guide: Some(rgba(0x161b1d0d).into()), editor_active_wrap_guide: Some(rgba(0x161b1d1a).into()), + editor_document_highlight_read_background: Some(rgba(0x277fad1a).into()), + editor_document_highlight_write_background: Some(rgba(0x66889a66).into()), terminal_background: Some(rgba(0xebf8ffff).into()), terminal_ansi_bright_black: Some(rgba(0x7397aaff).into()), terminal_ansi_bright_red: Some(rgba(0xf09fb6ff).into()), @@ -8142,6 +8281,7 @@ pub fn atelier() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xb72fd2ff).into()), terminal_ansi_cyan: Some(rgba(0x2f8f6fff).into()), terminal_ansi_white: Some(rgba(0x161b1dff).into()), + link_text_hover: Some(rgba(0x277fadff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index 4b7fdf8b19..cf23d5c8de 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -65,10 +65,16 @@ pub fn ayu() -> UserThemeFamily { editor_foreground: Some(rgba(0xbfbdb6ff).into()), editor_background: Some(rgba(0x0d1017ff).into()), editor_gutter_background: Some(rgba(0x0d1017ff).into()), + editor_subheader_background: Some(rgba(0x1f2127ff).into()), + editor_active_line_background: Some(rgba(0x1f2127bf).into()), + editor_highlighted_line_background: Some(rgba(0x1f2127ff).into()), editor_line_number: Some(rgba(0xbfbdb659).into()), editor_active_line_number: Some(rgba(0xbfbdb6ff).into()), + editor_invisible: Some(rgba(0x8a8986ff).into()), editor_wrap_guide: Some(rgba(0xbfbdb60d).into()), editor_active_wrap_guide: Some(rgba(0xbfbdb61a).into()), + editor_document_highlight_read_background: Some(rgba(0x5ac2fe1a).into()), + editor_document_highlight_write_background: Some(rgba(0x66676766).into()), terminal_background: Some(rgba(0x0d1017ff).into()), terminal_ansi_bright_black: Some(rgba(0x545557ff).into()), terminal_ansi_bright_red: Some(rgba(0x83363cff).into()), @@ -86,6 +92,7 @@ pub fn ayu() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x3abae5ff).into()), terminal_ansi_cyan: Some(rgba(0x95e5cbff).into()), terminal_ansi_white: Some(rgba(0xbfbdb6ff).into()), + link_text_hover: Some(rgba(0x5ac2feff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -468,10 +475,16 @@ pub fn ayu() -> UserThemeFamily { editor_foreground: Some(rgba(0x5c6166ff).into()), editor_background: Some(rgba(0xfcfcfcff).into()), editor_gutter_background: Some(rgba(0xfcfcfcff).into()), + editor_subheader_background: Some(rgba(0xececedff).into()), + editor_active_line_background: Some(rgba(0xececedbf).into()), + editor_highlighted_line_background: Some(rgba(0xececedff).into()), editor_line_number: Some(rgba(0x5c616659).into()), editor_active_line_number: Some(rgba(0x5c6166ff).into()), + editor_invisible: Some(rgba(0x8c8f93ff).into()), editor_wrap_guide: Some(rgba(0x5c61660d).into()), editor_active_wrap_guide: Some(rgba(0x5c61661a).into()), + editor_document_highlight_read_background: Some(rgba(0x3b9ee51a).into()), + editor_document_highlight_write_background: Some(rgba(0xacafb166).into()), terminal_background: Some(rgba(0xfcfcfcff).into()), terminal_ansi_bright_black: Some(rgba(0xbcbec0ff).into()), terminal_ansi_bright_red: Some(rgba(0xfebab6ff).into()), @@ -489,6 +502,7 @@ pub fn ayu() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x56b4d3ff).into()), terminal_ansi_cyan: Some(rgba(0x4dbf99ff).into()), terminal_ansi_white: Some(rgba(0x5c6166ff).into()), + link_text_hover: Some(rgba(0x3b9ee5ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -871,10 +885,16 @@ pub fn ayu() -> UserThemeFamily { editor_foreground: Some(rgba(0xcccac2ff).into()), editor_background: Some(rgba(0x242936ff).into()), editor_gutter_background: Some(rgba(0x242936ff).into()), + editor_subheader_background: Some(rgba(0x353944ff).into()), + editor_active_line_background: Some(rgba(0x353944bf).into()), + editor_highlighted_line_background: Some(rgba(0x353944ff).into()), editor_line_number: Some(rgba(0xcccac259).into()), editor_active_line_number: Some(rgba(0xcccac2ff).into()), + editor_invisible: Some(rgba(0x9a9a98ff).into()), editor_wrap_guide: Some(rgba(0xcccac20d).into()), editor_active_wrap_guide: Some(rgba(0xcccac21a).into()), + editor_document_highlight_read_background: Some(rgba(0x73cffe1a).into()), + editor_document_highlight_write_background: Some(rgba(0x787a7c66).into()), terminal_background: Some(rgba(0x242936ff).into()), terminal_ansi_bright_black: Some(rgba(0x67696eff).into()), terminal_ansi_bright_red: Some(rgba(0x83403dff).into()), @@ -892,6 +912,7 @@ pub fn ayu() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x5ccee5ff).into()), terminal_ansi_cyan: Some(rgba(0x95e5cbff).into()), terminal_ansi_white: Some(rgba(0xcccac2ff).into()), + link_text_hover: Some(rgba(0x73cffeff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 2a9b171f41..7d23075c6a 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -65,10 +65,16 @@ pub fn gruvbox() -> UserThemeFamily { editor_foreground: Some(rgba(0x282828ff).into()), editor_background: Some(rgba(0xf9f5d7ff).into()), editor_gutter_background: Some(rgba(0xf9f5d7ff).into()), + editor_subheader_background: Some(rgba(0xecddb5ff).into()), + editor_active_line_background: Some(rgba(0xecddb5bf).into()), + editor_highlighted_line_background: Some(rgba(0xecddb5ff).into()), editor_line_number: Some(rgba(0x28282859).into()), editor_active_line_number: Some(rgba(0x282828ff).into()), + editor_invisible: Some(rgba(0x5f5650ff).into()), editor_wrap_guide: Some(rgba(0x2828280d).into()), editor_active_wrap_guide: Some(rgba(0x2828281a).into()), + editor_document_highlight_read_background: Some(rgba(0x0b66781a).into()), + editor_document_highlight_write_background: Some(rgba(0x92847466).into()), terminal_background: Some(rgba(0xf9f5d7ff).into()), terminal_ansi_bright_black: Some(rgba(0xb1a28aff).into()), terminal_ansi_bright_red: Some(rgba(0xdc8c7bff).into()), @@ -86,6 +92,7 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x7c6f64ff).into()), terminal_ansi_cyan: Some(rgba(0x437b59ff).into()), terminal_ansi_white: Some(rgba(0x282828ff).into()), + link_text_hover: Some(rgba(0x0b6678ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -475,10 +482,16 @@ pub fn gruvbox() -> UserThemeFamily { editor_foreground: Some(rgba(0xebdbb2ff).into()), editor_background: Some(rgba(0x32302fff).into()), editor_gutter_background: Some(rgba(0x32302fff).into()), + editor_subheader_background: Some(rgba(0x3b3735ff).into()), + editor_active_line_background: Some(rgba(0x3b3735bf).into()), + editor_highlighted_line_background: Some(rgba(0x3b3735ff).into()), editor_line_number: Some(rgba(0xfbf1c759).into()), editor_active_line_number: Some(rgba(0xfbf1c7ff).into()), + editor_invisible: Some(rgba(0xc5b597ff).into()), editor_wrap_guide: Some(rgba(0xfbf1c70d).into()), editor_active_wrap_guide: Some(rgba(0xfbf1c71a).into()), + editor_document_highlight_read_background: Some(rgba(0x83a5981a).into()), + editor_document_highlight_write_background: Some(rgba(0x92847466).into()), terminal_background: Some(rgba(0x32302fff).into()), terminal_ansi_bright_black: Some(rgba(0x73675eff).into()), terminal_ansi_bright_red: Some(rgba(0x93211eff).into()), @@ -496,6 +509,7 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xa89984ff).into()), terminal_ansi_cyan: Some(rgba(0x8ec07cff).into()), terminal_ansi_white: Some(rgba(0xfbf1c7ff).into()), + link_text_hover: Some(rgba(0x83a598ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -885,10 +899,16 @@ pub fn gruvbox() -> UserThemeFamily { editor_foreground: Some(rgba(0x282828ff).into()), editor_background: Some(rgba(0xfbf1c7ff).into()), editor_gutter_background: Some(rgba(0xfbf1c7ff).into()), + editor_subheader_background: Some(rgba(0xecddb4ff).into()), + editor_active_line_background: Some(rgba(0xecddb4bf).into()), + editor_highlighted_line_background: Some(rgba(0xecddb4ff).into()), editor_line_number: Some(rgba(0x28282859).into()), editor_active_line_number: Some(rgba(0x282828ff).into()), + editor_invisible: Some(rgba(0x5f5650ff).into()), editor_wrap_guide: Some(rgba(0x2828280d).into()), editor_active_wrap_guide: Some(rgba(0x2828281a).into()), + editor_document_highlight_read_background: Some(rgba(0x0b66781a).into()), + editor_document_highlight_write_background: Some(rgba(0x92847466).into()), terminal_background: Some(rgba(0xfbf1c7ff).into()), terminal_ansi_bright_black: Some(rgba(0xb1a28aff).into()), terminal_ansi_bright_red: Some(rgba(0xdc8c7bff).into()), @@ -906,6 +926,7 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x7c6f64ff).into()), terminal_ansi_cyan: Some(rgba(0x437b59ff).into()), terminal_ansi_white: Some(rgba(0x282828ff).into()), + link_text_hover: Some(rgba(0x0b6678ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -1295,10 +1316,16 @@ pub fn gruvbox() -> UserThemeFamily { editor_foreground: Some(rgba(0xebdbb2ff).into()), editor_background: Some(rgba(0x282828ff).into()), editor_gutter_background: Some(rgba(0x282828ff).into()), + editor_subheader_background: Some(rgba(0x3a3735ff).into()), + editor_active_line_background: Some(rgba(0x3a3735bf).into()), + editor_highlighted_line_background: Some(rgba(0x3a3735ff).into()), editor_line_number: Some(rgba(0xfbf1c759).into()), editor_active_line_number: Some(rgba(0xfbf1c7ff).into()), + editor_invisible: Some(rgba(0xc5b597ff).into()), editor_wrap_guide: Some(rgba(0xfbf1c70d).into()), editor_active_wrap_guide: Some(rgba(0xfbf1c71a).into()), + editor_document_highlight_read_background: Some(rgba(0x83a5981a).into()), + editor_document_highlight_write_background: Some(rgba(0x92847466).into()), terminal_background: Some(rgba(0x282828ff).into()), terminal_ansi_bright_black: Some(rgba(0x73675eff).into()), terminal_ansi_bright_red: Some(rgba(0x93211eff).into()), @@ -1316,6 +1343,7 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xa89984ff).into()), terminal_ansi_cyan: Some(rgba(0x8ec07cff).into()), terminal_ansi_white: Some(rgba(0xfbf1c7ff).into()), + link_text_hover: Some(rgba(0x83a598ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -1705,10 +1733,16 @@ pub fn gruvbox() -> UserThemeFamily { editor_foreground: Some(rgba(0x282828ff).into()), editor_background: Some(rgba(0xf2e5bcff).into()), editor_gutter_background: Some(rgba(0xf2e5bcff).into()), + editor_subheader_background: Some(rgba(0xecdcb3ff).into()), + editor_active_line_background: Some(rgba(0xecdcb3bf).into()), + editor_highlighted_line_background: Some(rgba(0xecdcb3ff).into()), editor_line_number: Some(rgba(0x28282859).into()), editor_active_line_number: Some(rgba(0x282828ff).into()), + editor_invisible: Some(rgba(0x5f5650ff).into()), editor_wrap_guide: Some(rgba(0x2828280d).into()), editor_active_wrap_guide: Some(rgba(0x2828281a).into()), + editor_document_highlight_read_background: Some(rgba(0x0b66781a).into()), + editor_document_highlight_write_background: Some(rgba(0x92847466).into()), terminal_background: Some(rgba(0xf2e5bcff).into()), terminal_ansi_bright_black: Some(rgba(0xb1a28aff).into()), terminal_ansi_bright_red: Some(rgba(0xdc8c7bff).into()), @@ -1726,6 +1760,7 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x7c6f64ff).into()), terminal_ansi_cyan: Some(rgba(0x437b59ff).into()), terminal_ansi_white: Some(rgba(0x282828ff).into()), + link_text_hover: Some(rgba(0x0b6678ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -2115,10 +2150,16 @@ pub fn gruvbox() -> UserThemeFamily { editor_foreground: Some(rgba(0xebdbb2ff).into()), editor_background: Some(rgba(0x1d2021ff).into()), editor_gutter_background: Some(rgba(0x1d2021ff).into()), + editor_subheader_background: Some(rgba(0x393634ff).into()), + editor_active_line_background: Some(rgba(0x393634bf).into()), + editor_highlighted_line_background: Some(rgba(0x393634ff).into()), editor_line_number: Some(rgba(0xfbf1c759).into()), editor_active_line_number: Some(rgba(0xfbf1c7ff).into()), + editor_invisible: Some(rgba(0xc5b597ff).into()), editor_wrap_guide: Some(rgba(0xfbf1c70d).into()), editor_active_wrap_guide: Some(rgba(0xfbf1c71a).into()), + editor_document_highlight_read_background: Some(rgba(0x83a5981a).into()), + editor_document_highlight_write_background: Some(rgba(0x92847466).into()), terminal_background: Some(rgba(0x1d2021ff).into()), terminal_ansi_bright_black: Some(rgba(0x73675eff).into()), terminal_ansi_bright_red: Some(rgba(0x93211eff).into()), @@ -2136,6 +2177,7 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xa89984ff).into()), terminal_ansi_cyan: Some(rgba(0x8ec07cff).into()), terminal_ansi_white: Some(rgba(0xfbf1c7ff).into()), + link_text_hover: Some(rgba(0x83a598ff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs index c2c061c8f5..39dc20e517 100644 --- a/crates/theme2/src/themes/one.rs +++ b/crates/theme2/src/themes/one.rs @@ -65,10 +65,16 @@ pub fn one() -> UserThemeFamily { editor_foreground: Some(rgba(0x383a41ff).into()), editor_background: Some(rgba(0xfafafaff).into()), editor_gutter_background: Some(rgba(0xfafafaff).into()), + editor_subheader_background: Some(rgba(0xebebecff).into()), + editor_active_line_background: Some(rgba(0xebebecbf).into()), + editor_highlighted_line_background: Some(rgba(0xebebecff).into()), editor_line_number: Some(rgba(0x383a4159).into()), editor_active_line_number: Some(rgba(0x383a41ff).into()), + editor_invisible: Some(rgba(0x7f8188ff).into()), editor_wrap_guide: Some(rgba(0x383a410d).into()), editor_active_wrap_guide: Some(rgba(0x383a411a).into()), + editor_document_highlight_read_background: Some(rgba(0x5c79e21a).into()), + editor_document_highlight_write_background: Some(rgba(0xa3a3a466).into()), terminal_background: Some(rgba(0xfafafaff).into()), terminal_ansi_bright_black: Some(rgba(0xaaaaaaff).into()), terminal_ansi_bright_red: Some(rgba(0xf0b0a4ff).into()), @@ -86,6 +92,7 @@ pub fn one() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x994fa6ff).into()), terminal_ansi_cyan: Some(rgba(0x3b82b7ff).into()), terminal_ansi_white: Some(rgba(0x383a41ff).into()), + link_text_hover: Some(rgba(0x5c79e2ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -475,10 +482,16 @@ pub fn one() -> UserThemeFamily { editor_foreground: Some(rgba(0xacb2beff).into()), editor_background: Some(rgba(0x282c34ff).into()), editor_gutter_background: Some(rgba(0x282c34ff).into()), + editor_subheader_background: Some(rgba(0x2f343eff).into()), + editor_active_line_background: Some(rgba(0x2f343ebf).into()), + editor_highlighted_line_background: Some(rgba(0x2f343eff).into()), editor_line_number: Some(rgba(0xc8ccd459).into()), editor_active_line_number: Some(rgba(0xc8ccd4ff).into()), + editor_invisible: Some(rgba(0x838994ff).into()), editor_wrap_guide: Some(rgba(0xc8ccd40d).into()), editor_active_wrap_guide: Some(rgba(0xc8ccd41a).into()), + editor_document_highlight_read_background: Some(rgba(0x74ade81a).into()), + editor_document_highlight_write_background: Some(rgba(0x555a6366).into()), terminal_background: Some(rgba(0x282c34ff).into()), terminal_ansi_bright_black: Some(rgba(0x525661ff).into()), terminal_ansi_bright_red: Some(rgba(0x673a3cff).into()), @@ -496,6 +509,7 @@ pub fn one() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xbe5046ff).into()), terminal_ansi_cyan: Some(rgba(0x6fb4c0ff).into()), terminal_ansi_white: Some(rgba(0xc8ccd4ff).into()), + link_text_hover: Some(rgba(0x74ade8ff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index c7ea51ea25..0eb5bafa19 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -65,10 +65,16 @@ pub fn rose_pine() -> UserThemeFamily { editor_foreground: Some(rgba(0x575279ff).into()), editor_background: Some(rgba(0xfaf4edff).into()), editor_gutter_background: Some(rgba(0xfaf4edff).into()), + editor_subheader_background: Some(rgba(0xfef9f2ff).into()), + editor_active_line_background: Some(rgba(0xfef9f2bf).into()), + editor_highlighted_line_background: Some(rgba(0xfef9f2ff).into()), editor_line_number: Some(rgba(0x57527959).into()), editor_active_line_number: Some(rgba(0x575279ff).into()), + editor_invisible: Some(rgba(0x706c8cff).into()), editor_wrap_guide: Some(rgba(0x5752790d).into()), editor_active_wrap_guide: Some(rgba(0x5752791a).into()), + editor_document_highlight_read_background: Some(rgba(0x57949f1a).into()), + editor_document_highlight_write_background: Some(rgba(0x9691a466).into()), terminal_background: Some(rgba(0xfaf4edff).into()), terminal_ansi_bright_black: Some(rgba(0xb8b2baff).into()), terminal_ansi_bright_red: Some(rgba(0xdcb0bbff).into()), @@ -86,6 +92,7 @@ pub fn rose_pine() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x7c697fff).into()), terminal_ansi_cyan: Some(rgba(0x2a6983ff).into()), terminal_ansi_white: Some(rgba(0x575279ff).into()), + link_text_hover: Some(rgba(0x57949fff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -482,10 +489,16 @@ pub fn rose_pine() -> UserThemeFamily { editor_foreground: Some(rgba(0xe0def4ff).into()), editor_background: Some(rgba(0x232136ff).into()), editor_gutter_background: Some(rgba(0x232136ff).into()), + editor_subheader_background: Some(rgba(0x28253cff).into()), + editor_active_line_background: Some(rgba(0x28253cbf).into()), + editor_highlighted_line_background: Some(rgba(0x28253cff).into()), editor_line_number: Some(rgba(0xe0def459).into()), editor_active_line_number: Some(rgba(0xe0def4ff).into()), + editor_invisible: Some(rgba(0x85819eff).into()), editor_wrap_guide: Some(rgba(0xe0def40d).into()), editor_active_wrap_guide: Some(rgba(0xe0def41a).into()), + editor_document_highlight_read_background: Some(rgba(0x9cced71a).into()), + editor_document_highlight_write_background: Some(rgba(0x59557166).into()), terminal_background: Some(rgba(0x232136ff).into()), terminal_ansi_bright_black: Some(rgba(0x3f3b58ff).into()), terminal_ansi_bright_red: Some(rgba(0x7e3647ff).into()), @@ -503,6 +516,7 @@ pub fn rose_pine() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xa784a1ff).into()), terminal_ansi_cyan: Some(rgba(0x3f8fb0ff).into()), terminal_ansi_white: Some(rgba(0xe0def4ff).into()), + link_text_hover: Some(rgba(0x9cced7ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -899,10 +913,16 @@ pub fn rose_pine() -> UserThemeFamily { editor_foreground: Some(rgba(0xe0def4ff).into()), editor_background: Some(rgba(0x191724ff).into()), editor_gutter_background: Some(rgba(0x191724ff).into()), + editor_subheader_background: Some(rgba(0x1d1b2aff).into()), + editor_active_line_background: Some(rgba(0x1d1b2abf).into()), + editor_highlighted_line_background: Some(rgba(0x1d1b2aff).into()), editor_line_number: Some(rgba(0xe0def459).into()), editor_active_line_number: Some(rgba(0xe0def4ff).into()), + editor_invisible: Some(rgba(0x75718eff).into()), editor_wrap_guide: Some(rgba(0xe0def40d).into()), editor_active_wrap_guide: Some(rgba(0xe0def41a).into()), + editor_document_highlight_read_background: Some(rgba(0x9cced71a).into()), + editor_document_highlight_write_background: Some(rgba(0x28253c66).into()), terminal_background: Some(rgba(0x191724ff).into()), terminal_ansi_bright_black: Some(rgba(0x403d55ff).into()), terminal_ansi_bright_red: Some(rgba(0x7e3647ff).into()), @@ -920,6 +940,7 @@ pub fn rose_pine() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0x9d7691ff).into()), terminal_ansi_cyan: Some(rgba(0x32748fff).into()), terminal_ansi_white: Some(rgba(0xe0def4ff).into()), + link_text_hover: Some(rgba(0x9cced7ff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs index 7682b5307d..3b71f5e4f8 100644 --- a/crates/theme2/src/themes/sandcastle.rs +++ b/crates/theme2/src/themes/sandcastle.rs @@ -64,10 +64,16 @@ pub fn sandcastle() -> UserThemeFamily { editor_foreground: Some(rgba(0xfdf4c1ff).into()), editor_background: Some(rgba(0x282c34ff).into()), editor_gutter_background: Some(rgba(0x282c34ff).into()), + editor_subheader_background: Some(rgba(0x2b3039ff).into()), + editor_active_line_background: Some(rgba(0x2b3039bf).into()), + editor_highlighted_line_background: Some(rgba(0x2b3039ff).into()), editor_line_number: Some(rgba(0xfdf4c159).into()), editor_active_line_number: Some(rgba(0xfdf4c1ff).into()), + editor_invisible: Some(rgba(0xa69782ff).into()), editor_wrap_guide: Some(rgba(0xfdf4c10d).into()), editor_active_wrap_guide: Some(rgba(0xfdf4c11a).into()), + editor_document_highlight_read_background: Some(rgba(0x528b8b1a).into()), + editor_document_highlight_write_background: Some(rgba(0x7c6f6466).into()), terminal_background: Some(rgba(0x282c34ff).into()), terminal_ansi_bright_black: Some(rgba(0x5e5753ff).into()), terminal_ansi_bright_red: Some(rgba(0x57333dff).into()), @@ -85,6 +91,7 @@ pub fn sandcastle() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xa87323ff).into()), terminal_ansi_cyan: Some(rgba(0x83a598ff).into()), terminal_ansi_white: Some(rgba(0xfdf4c1ff).into()), + link_text_hover: Some(rgba(0x528b8bff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 942249cbf1..4c839f0101 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -65,10 +65,16 @@ pub fn solarized() -> UserThemeFamily { editor_foreground: Some(rgba(0x002b36ff).into()), editor_background: Some(rgba(0xfdf6e3ff).into()), editor_gutter_background: Some(rgba(0xfdf6e3ff).into()), + editor_subheader_background: Some(rgba(0xf3eddaff).into()), + editor_active_line_background: Some(rgba(0xf3eddabf).into()), + editor_highlighted_line_background: Some(rgba(0xf3eddaff).into()), editor_line_number: Some(rgba(0x002b3659).into()), editor_active_line_number: Some(rgba(0x002b36ff).into()), + editor_invisible: Some(rgba(0x34555eff).into()), editor_wrap_guide: Some(rgba(0x002b360d).into()), editor_active_wrap_guide: Some(rgba(0x002b361a).into()), + editor_document_highlight_read_background: Some(rgba(0x298bd11a).into()), + editor_document_highlight_write_background: Some(rgba(0x6d828866).into()), terminal_background: Some(rgba(0xfdf6e3ff).into()), terminal_ansi_bright_black: Some(rgba(0x7b8e91ff).into()), terminal_ansi_bright_red: Some(rgba(0xfaa091ff).into()), @@ -86,6 +92,7 @@ pub fn solarized() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xd33882ff).into()), terminal_ansi_cyan: Some(rgba(0x2ca198ff).into()), terminal_ansi_white: Some(rgba(0x002b36ff).into()), + link_text_hover: Some(rgba(0x298bd1ff).into()), ..Default::default() }, status: StatusColorsRefinement { @@ -468,10 +475,16 @@ pub fn solarized() -> UserThemeFamily { editor_foreground: Some(rgba(0xfdf6e3ff).into()), editor_background: Some(rgba(0x002b36ff).into()), editor_gutter_background: Some(rgba(0x002b36ff).into()), + editor_subheader_background: Some(rgba(0x04313cff).into()), + editor_active_line_background: Some(rgba(0x04313cbf).into()), + editor_highlighted_line_background: Some(rgba(0x04313cff).into()), editor_line_number: Some(rgba(0xfdf6e359).into()), editor_active_line_number: Some(rgba(0xfdf6e3ff).into()), + editor_invisible: Some(rgba(0x93a1a1ff).into()), editor_wrap_guide: Some(rgba(0xfdf6e30d).into()), editor_active_wrap_guide: Some(rgba(0xfdf6e31a).into()), + editor_document_highlight_read_background: Some(rgba(0x288bd11a).into()), + editor_document_highlight_write_background: Some(rgba(0x6d828866).into()), terminal_background: Some(rgba(0x002b36ff).into()), terminal_ansi_bright_black: Some(rgba(0x5c7279ff).into()), terminal_ansi_bright_red: Some(rgba(0x7d181cff).into()), @@ -489,6 +502,7 @@ pub fn solarized() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xd33782ff).into()), terminal_ansi_cyan: Some(rgba(0x2ca198ff).into()), terminal_ansi_white: Some(rgba(0xfdf6e3ff).into()), + link_text_hover: Some(rgba(0x288bd1ff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs index cea8ae66f1..d46aa776fa 100644 --- a/crates/theme2/src/themes/summercamp.rs +++ b/crates/theme2/src/themes/summercamp.rs @@ -64,10 +64,16 @@ pub fn summercamp() -> UserThemeFamily { editor_foreground: Some(rgba(0xf8f5deff).into()), editor_background: Some(rgba(0x1c1810ff).into()), editor_gutter_background: Some(rgba(0x1c1810ff).into()), + editor_subheader_background: Some(rgba(0x231f16ff).into()), + editor_active_line_background: Some(rgba(0x231f16bf).into()), + editor_highlighted_line_background: Some(rgba(0x231f16ff).into()), editor_line_number: Some(rgba(0xf8f5de59).into()), editor_active_line_number: Some(rgba(0xf8f5deff).into()), + editor_invisible: Some(rgba(0x736e55ff).into()), editor_wrap_guide: Some(rgba(0xf8f5de0d).into()), editor_active_wrap_guide: Some(rgba(0xf8f5de1a).into()), + editor_document_highlight_read_background: Some(rgba(0x499bef1a).into()), + editor_document_highlight_write_background: Some(rgba(0x49443366).into()), terminal_background: Some(rgba(0x1c1810ff).into()), terminal_ansi_bright_black: Some(rgba(0x3b3627ff).into()), terminal_ansi_bright_red: Some(rgba(0x7f2724ff).into()), @@ -85,6 +91,7 @@ pub fn summercamp() -> UserThemeFamily { terminal_ansi_magenta: Some(rgba(0xf59be6ff).into()), terminal_ansi_cyan: Some(rgba(0x5beabcff).into()), terminal_ansi_white: Some(rgba(0xf8f5deff).into()), + link_text_hover: Some(rgba(0x499befff).into()), ..Default::default() }, status: StatusColorsRefinement { diff --git a/crates/theme_importer/src/theme_printer.rs b/crates/theme_importer/src/theme_printer.rs index 54f99e3b4c..e760327582 100644 --- a/crates/theme_importer/src/theme_printer.rs +++ b/crates/theme_importer/src/theme_printer.rs @@ -281,16 +281,7 @@ impl<'a> Debug for ThemeColorsRefinementPrinter<'a> { ("terminal_ansi_magenta", self.0.terminal_ansi_magenta), ("terminal_ansi_cyan", self.0.terminal_ansi_cyan), ("terminal_ansi_white", self.0.terminal_ansi_white), - ("headline", self.0.headline), - ("paragraph", self.0.paragraph), - ("link_text", self.0.link_text), ("link_text_hover", self.0.link_text_hover), - ("link_uri", self.0.link_uri), - ("inline_code_background", self.0.inline_code_background), - ("inline_code_border", self.0.inline_code_border), - ("code_block_background", self.0.code_block_background), - ("code_block_border", self.0.code_block_border), - ("emphasis", self.0.emphasis), ]; f.write_str("ThemeColorsRefinement {")?; diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 76b2248b10..1b1c5795a0 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -149,23 +149,26 @@ impl Zed1ThemeConverter { ghost_element_active: convert(lowest.on.active.background), ghost_element_selected: convert(lowest.on.active.background), // TODO: Check what this should be ghost_element_disabled: convert(lowest.on.disabled.background), - icon: convert(lowest.base.default.foreground), - icon_muted: convert(lowest.variant.default.foreground), - icon_placeholder: convert(lowest.variant.default.foreground), // TODO: What should placeholder be? - icon_disabled: convert(lowest.base.disabled.foreground), - icon_accent: convert(lowest.accent.default.foreground), text: convert(lowest.base.default.foreground), text_muted: convert(lowest.variant.default.foreground), - text_placeholder: convert(lowest.base.disabled.foreground), + text_placeholder: convert(lowest.base.disabled.foreground), // TODO: What should placeholder be? text_disabled: convert(lowest.base.disabled.foreground), text_accent: convert(lowest.accent.default.foreground), + icon: convert(lowest.base.default.foreground), + icon_muted: convert(lowest.variant.default.foreground), + icon_disabled: convert(lowest.base.disabled.foreground), + icon_placeholder: convert(lowest.variant.default.foreground), + icon_accent: convert(lowest.accent.default.foreground), status_bar_background: convert(lowest.base.default.background), title_bar_background: convert(lowest.base.default.background), toolbar_background: convert(highest.base.default.background), tab_bar_background: convert(middle.base.default.background), tab_inactive_background: convert(middle.base.default.background), tab_active_background: convert(highest.base.default.background), + search_match_background: convert(highest.accent.default.background), panel_background: convert(middle.base.default.background), + panel_focused_border: convert(lowest.accent.hovered.border), + pane_focused_border: convert(lowest.accent.hovered.border), scrollbar_thumb_background: convert(middle.base.default.background), scrollbar_thumb_hover_background: convert(middle.base.hovered.background), scrollbar_thumb_border: convert(middle.base.default.border), @@ -174,10 +177,20 @@ impl Zed1ThemeConverter { editor_foreground: convert(editor.text_color), editor_background: convert(editor.background), editor_gutter_background: convert(editor.gutter_background), + editor_subheader_background: convert(middle.base.default.background), + editor_active_line_background: convert(editor.active_line_background), + editor_highlighted_line_background: convert(editor.highlighted_line_background), editor_line_number: convert(editor.line_number), editor_active_line_number: convert(editor.line_number_active), + editor_invisible: convert(highest.variant.default.foreground), // TODO: Is this light enough? editor_wrap_guide: convert(editor.wrap_guide), editor_active_wrap_guide: convert(editor.active_wrap_guide), + editor_document_highlight_read_background: convert( + editor.document_highlight_read_background, + ), + editor_document_highlight_write_background: convert( + editor.document_highlight_write_background, + ), terminal_background: convert(terminal.background), terminal_ansi_bright_black: convert(terminal.bright_black), terminal_ansi_bright_red: convert(terminal.bright_red), @@ -195,7 +208,7 @@ impl Zed1ThemeConverter { terminal_ansi_magenta: convert(terminal.magenta), terminal_ansi_cyan: convert(terminal.cyan), terminal_ansi_white: convert(terminal.white), - ..Default::default() + link_text_hover: convert(highest.accent.default.foreground), }) }