From 7ea9725125c6da447a8982893d906047ab49fdd4 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Tue, 2 Jan 2024 14:21:20 -0500 Subject: [PATCH 1/4] Start using base theme in zed1 theme importer Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com> --- crates/theme/src/theme.rs | 8 +- crates/theme2/src/themes/andromeda.rs | 23 +- crates/theme2/src/themes/atelier.rs | 460 ++++++++++++++++++-- crates/theme2/src/themes/ayu.rs | 69 ++- crates/theme2/src/themes/gruvbox.rs | 138 +++++- crates/theme2/src/themes/one.rs | 46 +- crates/theme2/src/themes/rose_pine.rs | 69 ++- crates/theme2/src/themes/sandcastle.rs | 23 +- crates/theme2/src/themes/solarized.rs | 46 +- crates/theme2/src/themes/summercamp.rs | 23 +- crates/theme_importer/src/zed1/converter.rs | 103 +++-- styles/src/style_tree/app.ts | 1 + 12 files changed, 890 insertions(+), 119 deletions(-) diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index e4b8c02eca04d6e1b059a01fb708e9705f2cd3a0..766cf708008c955b08b50f321f3b8cdb1b33b47f 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -8,7 +8,7 @@ use components::{ }; use gpui::{ color::Color, - elements::{Border, ContainerStyle, ImageStyle, LabelStyle, Shadow, SvgStyle, TooltipStyle}, + elements::{Border, ContainerStyle, ImageStyle, LabelStyle, SvgStyle, TooltipStyle}, fonts::{HighlightStyle, TextStyle}, platform, AppContext, AssetSource, MouseState, }; @@ -1276,15 +1276,9 @@ pub struct WelcomeStyle { pub struct ColorScheme { pub name: String, pub is_light: bool, - pub ramps: RampSet, pub lowest: Layer, pub middle: Layer, pub highest: Layer, - - pub popover_shadow: Shadow, - pub modal_shadow: Shadow, - - pub players: Vec, } #[derive(Clone, Deserialize, Default, JsonSchema)] diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index ba6eadd31581278443aad406110d7ca29d2afc7d..7541784b0779aa3aebd892f1a05b0521d57cecc5 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -19,19 +19,37 @@ pub fn andromeda() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x252931ff).into()), - border_variant: Some(rgba(0x21232aff).into()), + border: Some(rgba(0x2b2f39ff).into()), + border_variant: Some(rgba(0x2b2f39ff).into()), + border_focused: Some(rgba(0x183a34ff).into()), + border_selected: Some(rgba(0x183a34ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x292d37ff).into()), elevated_surface_background: Some(rgba(0x21242bff).into()), + surface_background: Some(rgba(0x21242bff).into()), background: Some(rgba(0x262a33ff).into()), panel_background: Some(rgba(0x21242bff).into()), + element_background: Some(rgba(0x21242bff).into()), element_hover: Some(rgba(0x2b2f3980).into()), + element_active: Some(rgba(0x2a2f39ff).into()), element_selected: Some(rgba(0x383b4580).into()), + element_disabled: Some(rgba(0x21242bff).into()), drop_target_background: Some(rgba(0xaca8ae80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x2b2f3980).into()), + ghost_element_active: Some(rgba(0x2a2f39ff).into()), + ghost_element_selected: Some(rgba(0x383b4580).into()), + ghost_element_disabled: Some(rgba(0x21242bff).into()), text: Some(rgba(0xf7f7f8ff).into()), text_muted: Some(rgba(0xaca8aeff).into()), text_placeholder: Some(rgba(0x474a53ff).into()), text_disabled: Some(rgba(0xf7f7f8ff).into()), text_accent: Some(rgba(0x11a793ff).into()), + icon: Some(rgba(0xf7f7f8ff).into()), + icon_muted: Some(rgba(0xaca8aeff).into()), + icon_disabled: Some(rgba(0x6b6b73ff).into()), + icon_placeholder: Some(rgba(0xaca8aeff).into()), + icon_accent: Some(rgba(0x11a793ff).into()), status_bar_background: Some(rgba(0x262a33ff).into()), title_bar_background: Some(rgba(0x262a33ff).into()), toolbar_background: Some(rgba(0x1e2025ff).into()), @@ -41,6 +59,7 @@ pub fn andromeda() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf7f7f84d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf7f7f84d).into()), scrollbar_thumb_border: Some(rgba(0x21232aff).into()), + scrollbar_track_background: Some(rgba(0x1e2025ff).into()), scrollbar_track_border: Some(rgba(0x21232aff).into()), editor_foreground: Some(rgba(0xf7f7f8ff).into()), editor_background: Some(rgba(0x1e2025ff).into()), diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs index ca008450532e5df64e6cfe7a75826174e67d91e6..7d2f855c5f29c155acbb5bb1f326ebec1e044323 100644 --- a/crates/theme2/src/themes/atelier.rs +++ b/crates/theme2/src/themes/atelier.rs @@ -20,19 +20,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xd1d0c6ff).into()), - border_variant: Some(rgba(0xedece5ff).into()), + border: Some(rgba(0x969585ff).into()), + border_variant: Some(rgba(0x969585ff).into()), + border_focused: Some(rgba(0xbbddc6ff).into()), + border_selected: Some(rgba(0xbbddc6ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xadac9fff).into()), elevated_surface_background: Some(rgba(0xebeae3ff).into()), + surface_background: Some(rgba(0xebeae3ff).into()), background: Some(rgba(0xc5c4b9ff).into()), panel_background: Some(rgba(0xebeae3ff).into()), + element_background: Some(rgba(0xebeae3ff).into()), element_hover: Some(rgba(0x96958580).into()), + element_active: Some(rgba(0x989788ff).into()), element_selected: Some(rgba(0x8b8a7880).into()), + element_disabled: Some(rgba(0xebeae3ff).into()), drop_target_background: Some(rgba(0x61604f80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x96958580).into()), + ghost_element_active: Some(rgba(0x989788ff).into()), + ghost_element_selected: Some(rgba(0x8b8a7880).into()), + ghost_element_disabled: Some(rgba(0xebeae3ff).into()), text: Some(rgba(0x22221bff).into()), text_muted: Some(rgba(0x61604fff).into()), text_placeholder: Some(rgba(0x878573ff).into()), text_disabled: Some(rgba(0x22221bff).into()), text_accent: Some(rgba(0x38a166ff).into()), + icon: Some(rgba(0x22221bff).into()), + icon_muted: Some(rgba(0x61604fff).into()), + icon_disabled: Some(rgba(0x767463ff).into()), + icon_placeholder: Some(rgba(0x61604fff).into()), + icon_accent: Some(rgba(0x38a166ff).into()), status_bar_background: Some(rgba(0xc5c4b9ff).into()), title_bar_background: Some(rgba(0xc5c4b9ff).into()), toolbar_background: Some(rgba(0xf4f3ecff).into()), @@ -42,6 +60,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x22221b4d).into()), scrollbar_thumb_hover_background: Some(rgba(0x22221b4d).into()), scrollbar_thumb_border: Some(rgba(0xedece5ff).into()), + scrollbar_track_background: Some(rgba(0xf4f3ecff).into()), scrollbar_track_border: Some(rgba(0xedece5ff).into()), editor_foreground: Some(rgba(0x302f27ff).into()), editor_background: Some(rgba(0xf4f3ecff).into()), @@ -425,19 +444,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x3b3431ff).into()), - border_variant: Some(rgba(0x251f1dff).into()), + border: Some(rgba(0x665f5cff).into()), + border_variant: Some(rgba(0x665f5cff).into()), + border_focused: Some(rgba(0x192e5bff).into()), + border_selected: Some(rgba(0x192e5bff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x554e4bff).into()), elevated_surface_background: Some(rgba(0x27211eff).into()), + surface_background: Some(rgba(0x27211eff).into()), background: Some(rgba(0x443c39ff).into()), panel_background: Some(rgba(0x27211eff).into()), + element_background: Some(rgba(0x27211eff).into()), element_hover: Some(rgba(0x665f5c80).into()), + element_active: Some(rgba(0x645d5aff).into()), element_selected: Some(rgba(0x71696680).into()), + element_disabled: Some(rgba(0x27211eff).into()), drop_target_background: Some(rgba(0xa79f9d80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x665f5c80).into()), + ghost_element_active: Some(rgba(0x645d5aff).into()), + ghost_element_selected: Some(rgba(0x71696680).into()), + ghost_element_disabled: Some(rgba(0x27211eff).into()), text: Some(rgba(0xf1efeeff).into()), text_muted: Some(rgba(0xa79f9dff).into()), text_placeholder: Some(rgba(0x766e6bff).into()), text_disabled: Some(rgba(0xf1efeeff).into()), text_accent: Some(rgba(0x417ee6ff).into()), + icon: Some(rgba(0xf1efeeff).into()), + icon_muted: Some(rgba(0xa79f9dff).into()), + icon_disabled: Some(rgba(0x8e8683ff).into()), + icon_placeholder: Some(rgba(0xa79f9dff).into()), + icon_accent: Some(rgba(0x417ee6ff).into()), status_bar_background: Some(rgba(0x443c39ff).into()), title_bar_background: Some(rgba(0x443c39ff).into()), toolbar_background: Some(rgba(0x1b1918ff).into()), @@ -447,6 +484,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf1efee4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf1efee4d).into()), scrollbar_thumb_border: Some(rgba(0x251f1dff).into()), + scrollbar_track_background: Some(rgba(0x1b1918ff).into()), scrollbar_track_border: Some(rgba(0x251f1dff).into()), editor_foreground: Some(rgba(0xe6e2e0ff).into()), editor_background: Some(rgba(0x1b1918ff).into()), @@ -830,19 +868,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xc8d1cbff).into()), - border_variant: Some(rgba(0xe5ede7ff).into()), + border: Some(rgba(0x8b968eff).into()), + border_variant: Some(rgba(0x8b968eff).into()), + border_focused: Some(rgba(0xbed4d6ff).into()), + border_selected: Some(rgba(0xbed4d6ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xa3ada6ff).into()), elevated_surface_background: Some(rgba(0xe3ebe6ff).into()), + surface_background: Some(rgba(0xe3ebe6ff).into()), background: Some(rgba(0xbcc5bfff).into()), panel_background: Some(rgba(0xe3ebe6ff).into()), + element_background: Some(rgba(0xe3ebe6ff).into()), element_hover: Some(rgba(0x8b968e80).into()), + element_active: Some(rgba(0x8d9890ff).into()), element_selected: Some(rgba(0x7e8b8280).into()), + element_disabled: Some(rgba(0xe3ebe6ff).into()), drop_target_background: Some(rgba(0x54625980).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x8b968e80).into()), + ghost_element_active: Some(rgba(0x8d9890ff).into()), + ghost_element_selected: Some(rgba(0x7e8b8280).into()), + ghost_element_disabled: Some(rgba(0xe3ebe6ff).into()), text: Some(rgba(0x171c19ff).into()), text_muted: Some(rgba(0x546259ff).into()), text_placeholder: Some(rgba(0x79877dff).into()), text_disabled: Some(rgba(0x171c19ff).into()), text_accent: Some(rgba(0x488c90ff).into()), + icon: Some(rgba(0x171c19ff).into()), + icon_muted: Some(rgba(0x546259ff).into()), + icon_disabled: Some(rgba(0x68766dff).into()), + icon_placeholder: Some(rgba(0x546259ff).into()), + icon_accent: Some(rgba(0x488c90ff).into()), status_bar_background: Some(rgba(0xbcc5bfff).into()), title_bar_background: Some(rgba(0xbcc5bfff).into()), toolbar_background: Some(rgba(0xecf4eeff).into()), @@ -852,6 +908,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x171c194d).into()), scrollbar_thumb_hover_background: Some(rgba(0x171c194d).into()), scrollbar_thumb_border: Some(rgba(0xe5ede7ff).into()), + scrollbar_track_background: Some(rgba(0xecf4eeff).into()), scrollbar_track_border: Some(rgba(0xe5ede7ff).into()), editor_foreground: Some(rgba(0x232a25ff).into()), editor_background: Some(rgba(0xecf4eeff).into()), @@ -1235,19 +1292,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x332f38ff).into()), - border_variant: Some(rgba(0x201e24ff).into()), + border: Some(rgba(0x56505eff).into()), + border_variant: Some(rgba(0x56505eff).into()), + border_focused: Some(rgba(0x222953ff).into()), + border_selected: Some(rgba(0x222953ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x48434fff).into()), elevated_surface_background: Some(rgba(0x221f26ff).into()), + surface_background: Some(rgba(0x221f26ff).into()), background: Some(rgba(0x3a353fff).into()), panel_background: Some(rgba(0x221f26ff).into()), + element_background: Some(rgba(0x221f26ff).into()), element_hover: Some(rgba(0x56505e80).into()), + element_active: Some(rgba(0x544f5cff).into()), element_selected: Some(rgba(0x605a6880).into()), + element_disabled: Some(rgba(0x221f26ff).into()), drop_target_background: Some(rgba(0x89859180).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x56505e80).into()), + ghost_element_active: Some(rgba(0x544f5cff).into()), + ghost_element_selected: Some(rgba(0x605a6880).into()), + ghost_element_disabled: Some(rgba(0x221f26ff).into()), text: Some(rgba(0xefecf4ff).into()), text_muted: Some(rgba(0x898591ff).into()), text_placeholder: Some(rgba(0x655f6dff).into()), text_disabled: Some(rgba(0xefecf4ff).into()), text_accent: Some(rgba(0x576ddaff).into()), + icon: Some(rgba(0xefecf4ff).into()), + icon_muted: Some(rgba(0x898591ff).into()), + icon_disabled: Some(rgba(0x756f7eff).into()), + icon_placeholder: Some(rgba(0x898591ff).into()), + icon_accent: Some(rgba(0x576ddaff).into()), status_bar_background: Some(rgba(0x3a353fff).into()), title_bar_background: Some(rgba(0x3a353fff).into()), toolbar_background: Some(rgba(0x19171cff).into()), @@ -1257,6 +1332,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xefecf44d).into()), scrollbar_thumb_hover_background: Some(rgba(0xefecf44d).into()), scrollbar_thumb_border: Some(rgba(0x201e24ff).into()), + scrollbar_track_background: Some(rgba(0x19171cff).into()), scrollbar_track_border: Some(rgba(0x201e24ff).into()), editor_foreground: Some(rgba(0xe2dfe7ff).into()), editor_background: Some(rgba(0x19171cff).into()), @@ -1640,19 +1716,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x3c3b31ff).into()), - border_variant: Some(rgba(0x2a2922ff).into()), + border: Some(rgba(0x5d5c4cff).into()), + border_variant: Some(rgba(0x5d5c4cff).into()), + border_focused: Some(rgba(0x1c3927ff).into()), + border_selected: Some(rgba(0x1c3927ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x504f41ff).into()), elevated_surface_background: Some(rgba(0x2c2b23ff).into()), + surface_background: Some(rgba(0x2c2b23ff).into()), background: Some(rgba(0x424136ff).into()), panel_background: Some(rgba(0x2c2b23ff).into()), + element_background: Some(rgba(0x2c2b23ff).into()), element_hover: Some(rgba(0x5d5c4c80).into()), + element_active: Some(rgba(0x5c5b4bff).into()), element_selected: Some(rgba(0x67665580).into()), + element_disabled: Some(rgba(0x2c2b23ff).into()), drop_target_background: Some(rgba(0x91907f80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x5d5c4c80).into()), + ghost_element_active: Some(rgba(0x5c5b4bff).into()), + ghost_element_selected: Some(rgba(0x67665580).into()), + ghost_element_disabled: Some(rgba(0x2c2b23ff).into()), text: Some(rgba(0xf4f3ecff).into()), text_muted: Some(rgba(0x91907fff).into()), text_placeholder: Some(rgba(0x6c6b5aff).into()), text_disabled: Some(rgba(0xf4f3ecff).into()), text_accent: Some(rgba(0x37a166ff).into()), + icon: Some(rgba(0xf4f3ecff).into()), + icon_muted: Some(rgba(0x91907fff).into()), + icon_disabled: Some(rgba(0x7d7c6aff).into()), + icon_placeholder: Some(rgba(0x91907fff).into()), + icon_accent: Some(rgba(0x37a166ff).into()), status_bar_background: Some(rgba(0x424136ff).into()), title_bar_background: Some(rgba(0x424136ff).into()), toolbar_background: Some(rgba(0x22221bff).into()), @@ -1662,6 +1756,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf4f3ec4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf4f3ec4d).into()), scrollbar_thumb_border: Some(rgba(0x2a2922ff).into()), + scrollbar_track_background: Some(rgba(0x22221bff).into()), scrollbar_track_border: Some(rgba(0x2a2922ff).into()), editor_foreground: Some(rgba(0xe7e6dfff).into()), editor_background: Some(rgba(0x22221bff).into()), @@ -2045,19 +2140,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x363f62ff).into()), - border_variant: Some(rgba(0x252d4fff).into()), + border: Some(rgba(0x5c6485ff).into()), + border_variant: Some(rgba(0x5c6485ff).into()), + border_focused: Some(rgba(0x203348ff).into()), + border_selected: Some(rgba(0x203348ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x4d5577ff).into()), elevated_surface_background: Some(rgba(0x262f51ff).into()), + surface_background: Some(rgba(0x262f51ff).into()), background: Some(rgba(0x3e4769ff).into()), panel_background: Some(rgba(0x262f51ff).into()), + element_background: Some(rgba(0x262f51ff).into()), element_hover: Some(rgba(0x5c648580).into()), + element_active: Some(rgba(0x5a6284ff).into()), element_selected: Some(rgba(0x666e8f80).into()), + element_disabled: Some(rgba(0x262f51ff).into()), drop_target_background: Some(rgba(0x959bb280).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x5c648580).into()), + ghost_element_active: Some(rgba(0x5a6284ff).into()), + ghost_element_selected: Some(rgba(0x666e8f80).into()), + ghost_element_disabled: Some(rgba(0x262f51ff).into()), text: Some(rgba(0xf5f7ffff).into()), text_muted: Some(rgba(0x959bb2ff).into()), text_placeholder: Some(rgba(0x6b7394ff).into()), text_disabled: Some(rgba(0xf5f7ffff).into()), text_accent: Some(rgba(0x3e8fd0ff).into()), + icon: Some(rgba(0xf5f7ffff).into()), + icon_muted: Some(rgba(0x959bb2ff).into()), + icon_disabled: Some(rgba(0x7e849eff).into()), + icon_placeholder: Some(rgba(0x959bb2ff).into()), + icon_accent: Some(rgba(0x3e8fd0ff).into()), status_bar_background: Some(rgba(0x3e4769ff).into()), title_bar_background: Some(rgba(0x3e4769ff).into()), toolbar_background: Some(rgba(0x202746ff).into()), @@ -2067,6 +2180,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf5f7ff4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf5f7ff4d).into()), scrollbar_thumb_border: Some(rgba(0x252d4fff).into()), + scrollbar_track_background: Some(rgba(0x202746ff).into()), scrollbar_track_border: Some(rgba(0x252d4fff).into()), editor_foreground: Some(rgba(0xdfe2f1ff).into()), editor_background: Some(rgba(0x202746ff).into()), @@ -2450,19 +2564,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xccd0e1ff).into()), - border_variant: Some(rgba(0xe9ebf7ff).into()), + border: Some(rgba(0x9a9fb6ff).into()), + border_variant: Some(rgba(0x9a9fb6ff).into()), + border_focused: Some(rgba(0xc2d5efff).into()), + border_selected: Some(rgba(0xc2d5efff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xaeb3c7ff).into()), elevated_surface_background: Some(rgba(0xe5e8f5ff).into()), + surface_background: Some(rgba(0xe5e8f5ff).into()), background: Some(rgba(0xc2c6d9ff).into()), panel_background: Some(rgba(0xe5e8f5ff).into()), + element_background: Some(rgba(0xe5e8f5ff).into()), element_hover: Some(rgba(0x9a9fb680).into()), + element_active: Some(rgba(0x9ca1b8ff).into()), element_selected: Some(rgba(0x8e94aa80).into()), + element_disabled: Some(rgba(0xe5e8f5ff).into()), drop_target_background: Some(rgba(0x60688980).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x9a9fb680).into()), + ghost_element_active: Some(rgba(0x9ca1b8ff).into()), + ghost_element_selected: Some(rgba(0x8e94aa80).into()), + ghost_element_disabled: Some(rgba(0xe5e8f5ff).into()), text: Some(rgba(0x202746ff).into()), text_muted: Some(rgba(0x606889ff).into()), text_placeholder: Some(rgba(0x898fa5ff).into()), text_disabled: Some(rgba(0x202746ff).into()), text_accent: Some(rgba(0x3f8fd0ff).into()), + icon: Some(rgba(0x202746ff).into()), + icon_muted: Some(rgba(0x606889ff).into()), + icon_disabled: Some(rgba(0x767d9aff).into()), + icon_placeholder: Some(rgba(0x606889ff).into()), + icon_accent: Some(rgba(0x3f8fd0ff).into()), status_bar_background: Some(rgba(0xc2c6d9ff).into()), title_bar_background: Some(rgba(0xc2c6d9ff).into()), toolbar_background: Some(rgba(0xf5f7ffff).into()), @@ -2472,6 +2604,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x2027464d).into()), scrollbar_thumb_hover_background: Some(rgba(0x2027464d).into()), scrollbar_thumb_border: Some(rgba(0xe9ebf7ff).into()), + scrollbar_track_background: Some(rgba(0xf5f7ffff).into()), scrollbar_track_border: Some(rgba(0xe9ebf7ff).into()), editor_foreground: Some(rgba(0x293256ff).into()), editor_background: Some(rgba(0xf5f7ffff).into()), @@ -2855,19 +2988,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x3b3933ff).into()), - border_variant: Some(rgba(0x252521ff).into()), + border: Some(rgba(0x6c695cff).into()), + border_variant: Some(rgba(0x6c695cff).into()), + border_focused: Some(rgba(0x263056ff).into()), + border_selected: Some(rgba(0x263056ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x58564bff).into()), elevated_surface_background: Some(rgba(0x262622ff).into()), + surface_background: Some(rgba(0x262622ff).into()), background: Some(rgba(0x45433bff).into()), panel_background: Some(rgba(0x262622ff).into()), + element_background: Some(rgba(0x262622ff).into()), element_hover: Some(rgba(0x6c695c80).into()), + element_active: Some(rgba(0x6a675aff).into()), element_selected: Some(rgba(0x77746480).into()), + element_disabled: Some(rgba(0x262622ff).into()), drop_target_background: Some(rgba(0xa4a08b80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x6c695c80).into()), + ghost_element_active: Some(rgba(0x6a675aff).into()), + ghost_element_selected: Some(rgba(0x77746480).into()), + ghost_element_disabled: Some(rgba(0x262622ff).into()), text: Some(rgba(0xfefbecff).into()), text_muted: Some(rgba(0xa4a08bff).into()), text_placeholder: Some(rgba(0x7c7968ff).into()), text_disabled: Some(rgba(0xfefbecff).into()), text_accent: Some(rgba(0x6684e0ff).into()), + icon: Some(rgba(0xfefbecff).into()), + icon_muted: Some(rgba(0xa4a08bff).into()), + icon_disabled: Some(rgba(0x8f8b77ff).into()), + icon_placeholder: Some(rgba(0xa4a08bff).into()), + icon_accent: Some(rgba(0x6684e0ff).into()), status_bar_background: Some(rgba(0x45433bff).into()), title_bar_background: Some(rgba(0x45433bff).into()), toolbar_background: Some(rgba(0x20201dff).into()), @@ -2877,6 +3028,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xfefbec4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xfefbec4d).into()), scrollbar_thumb_border: Some(rgba(0x252521ff).into()), + scrollbar_track_background: Some(rgba(0x20201dff).into()), scrollbar_track_border: Some(rgba(0x252521ff).into()), editor_foreground: Some(rgba(0xe8e4cfff).into()), editor_background: Some(rgba(0x20201dff).into()), @@ -3260,19 +3412,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x333b33ff).into()), - border_variant: Some(rgba(0x1d201dff).into()), + border: Some(rgba(0x5c6c5cff).into()), + border_variant: Some(rgba(0x5c6c5cff).into()), + border_focused: Some(rgba(0x102668ff).into()), + border_selected: Some(rgba(0x102668ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x4b584bff).into()), elevated_surface_background: Some(rgba(0x1f231fff).into()), + surface_background: Some(rgba(0x1f231fff).into()), background: Some(rgba(0x3b453bff).into()), panel_background: Some(rgba(0x1f231fff).into()), + element_background: Some(rgba(0x1f231fff).into()), element_hover: Some(rgba(0x5c6c5c80).into()), + element_active: Some(rgba(0x5a6a5aff).into()), element_selected: Some(rgba(0x64776480).into()), + element_disabled: Some(rgba(0x1f231fff).into()), drop_target_background: Some(rgba(0x8ba48b80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x5c6c5c80).into()), + ghost_element_active: Some(rgba(0x5a6a5aff).into()), + ghost_element_selected: Some(rgba(0x64776480).into()), + ghost_element_disabled: Some(rgba(0x1f231fff).into()), text: Some(rgba(0xf4fbf4ff).into()), text_muted: Some(rgba(0x8ba48bff).into()), text_placeholder: Some(rgba(0x687c68ff).into()), text_disabled: Some(rgba(0xf4fbf4ff).into()), text_accent: Some(rgba(0x3e62f4ff).into()), + icon: Some(rgba(0xf4fbf4ff).into()), + icon_muted: Some(rgba(0x8ba48bff).into()), + icon_disabled: Some(rgba(0x778f77ff).into()), + icon_placeholder: Some(rgba(0x8ba48bff).into()), + icon_accent: Some(rgba(0x3e62f4ff).into()), status_bar_background: Some(rgba(0x3b453bff).into()), title_bar_background: Some(rgba(0x3b453bff).into()), toolbar_background: Some(rgba(0x131513ff).into()), @@ -3282,6 +3452,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf4fbf44d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf4fbf44d).into()), scrollbar_thumb_border: Some(rgba(0x1d201dff).into()), + scrollbar_track_background: Some(rgba(0x131513ff).into()), scrollbar_track_border: Some(rgba(0x1d201dff).into()), editor_foreground: Some(rgba(0xcfe8cfff).into()), editor_background: Some(rgba(0x131513ff).into()), @@ -3665,19 +3836,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xcbc8d1ff).into()), - border_variant: Some(rgba(0xe8e5edff).into()), + border: Some(rgba(0x8f8b96ff).into()), + border_variant: Some(rgba(0x8f8b96ff).into()), + border_focused: Some(rgba(0xc9c8f3ff).into()), + border_selected: Some(rgba(0xc9c8f3ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xa7a3adff).into()), elevated_surface_background: Some(rgba(0xe6e3ebff).into()), + surface_background: Some(rgba(0xe6e3ebff).into()), background: Some(rgba(0xbfbcc5ff).into()), panel_background: Some(rgba(0xe6e3ebff).into()), + element_background: Some(rgba(0xe6e3ebff).into()), element_hover: Some(rgba(0x8f8b9680).into()), + element_active: Some(rgba(0x918d98ff).into()), element_selected: Some(rgba(0x837e8b80).into()), + element_disabled: Some(rgba(0xe6e3ebff).into()), drop_target_background: Some(rgba(0x5a546280).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x8f8b9680).into()), + ghost_element_active: Some(rgba(0x918d98ff).into()), + ghost_element_selected: Some(rgba(0x837e8b80).into()), + ghost_element_disabled: Some(rgba(0xe6e3ebff).into()), text: Some(rgba(0x19171cff).into()), text_muted: Some(rgba(0x5a5462ff).into()), text_placeholder: Some(rgba(0x7e7987ff).into()), text_disabled: Some(rgba(0x19171cff).into()), text_accent: Some(rgba(0x586ddaff).into()), + icon: Some(rgba(0x19171cff).into()), + icon_muted: Some(rgba(0x5a5462ff).into()), + icon_disabled: Some(rgba(0x6e6876ff).into()), + icon_placeholder: Some(rgba(0x5a5462ff).into()), + icon_accent: Some(rgba(0x586ddaff).into()), status_bar_background: Some(rgba(0xbfbcc5ff).into()), title_bar_background: Some(rgba(0xbfbcc5ff).into()), toolbar_background: Some(rgba(0xefecf4ff).into()), @@ -3687,6 +3876,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x19171c4d).into()), scrollbar_thumb_hover_background: Some(rgba(0x19171c4d).into()), scrollbar_thumb_border: Some(rgba(0xe8e5edff).into()), + scrollbar_track_background: Some(rgba(0xefecf4ff).into()), scrollbar_track_border: Some(rgba(0xe8e5edff).into()), editor_foreground: Some(rgba(0x26232aff).into()), editor_background: Some(rgba(0xefecf4ff).into()), @@ -4070,19 +4260,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x352f2fff).into()), - border_variant: Some(rgba(0x231f1fff).into()), + border: Some(rgba(0x564e4eff).into()), + border_variant: Some(rgba(0x564e4eff).into()), + border_focused: Some(rgba(0x2c2b45ff).into()), + border_selected: Some(rgba(0x2c2b45ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x494242ff).into()), elevated_surface_background: Some(rgba(0x252020ff).into()), + surface_background: Some(rgba(0x252020ff).into()), background: Some(rgba(0x3b3535ff).into()), panel_background: Some(rgba(0x252020ff).into()), + element_background: Some(rgba(0x252020ff).into()), element_hover: Some(rgba(0x564e4e80).into()), + element_active: Some(rgba(0x554d4dff).into()), element_selected: Some(rgba(0x60585880).into()), + element_disabled: Some(rgba(0x252020ff).into()), drop_target_background: Some(rgba(0x89838380).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x564e4e80).into()), + ghost_element_active: Some(rgba(0x554d4dff).into()), + ghost_element_selected: Some(rgba(0x60585880).into()), + ghost_element_disabled: Some(rgba(0x252020ff).into()), text: Some(rgba(0xf4ececff).into()), text_muted: Some(rgba(0x898383ff).into()), text_placeholder: Some(rgba(0x655d5dff).into()), text_disabled: Some(rgba(0xf4ececff).into()), text_accent: Some(rgba(0x7272caff).into()), + icon: Some(rgba(0xf4ececff).into()), + icon_muted: Some(rgba(0x898383ff).into()), + icon_disabled: Some(rgba(0x756e6eff).into()), + icon_placeholder: Some(rgba(0x898383ff).into()), + icon_accent: Some(rgba(0x7272caff).into()), status_bar_background: Some(rgba(0x3b3535ff).into()), title_bar_background: Some(rgba(0x3b3535ff).into()), toolbar_background: Some(rgba(0x1b1818ff).into()), @@ -4092,6 +4300,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf4ecec4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf4ecec4d).into()), scrollbar_thumb_border: Some(rgba(0x231f1fff).into()), + scrollbar_track_background: Some(rgba(0x1b1818ff).into()), scrollbar_track_border: Some(rgba(0x231f1fff).into()), editor_foreground: Some(rgba(0xe7dfdfff).into()), editor_background: Some(rgba(0x1b1818ff).into()), @@ -4475,19 +4684,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x393239ff).into()), - border_variant: Some(rgba(0x231e23ff).into()), + border: Some(rgba(0x675b67ff).into()), + border_variant: Some(rgba(0x675b67ff).into()), + border_focused: Some(rgba(0x1a2961ff).into()), + border_selected: Some(rgba(0x1a2961ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x554a55ff).into()), elevated_surface_background: Some(rgba(0x252025ff).into()), + surface_background: Some(rgba(0x252025ff).into()), background: Some(rgba(0x433a43ff).into()), panel_background: Some(rgba(0x252025ff).into()), + element_background: Some(rgba(0x252025ff).into()), element_hover: Some(rgba(0x675b6780).into()), + element_active: Some(rgba(0x655965ff).into()), element_selected: Some(rgba(0x72647280).into()), + element_disabled: Some(rgba(0x252025ff).into()), drop_target_background: Some(rgba(0xa99aa980).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x675b6780).into()), + ghost_element_active: Some(rgba(0x655965ff).into()), + ghost_element_selected: Some(rgba(0x72647280).into()), + ghost_element_disabled: Some(rgba(0x252025ff).into()), text: Some(rgba(0xf7f3f7ff).into()), text_muted: Some(rgba(0xa99aa9ff).into()), text_placeholder: Some(rgba(0x776977ff).into()), text_disabled: Some(rgba(0xf7f3f7ff).into()), text_accent: Some(rgba(0x526aebff).into()), + icon: Some(rgba(0xf7f3f7ff).into()), + icon_muted: Some(rgba(0xa99aa9ff).into()), + icon_disabled: Some(rgba(0x908190ff).into()), + icon_placeholder: Some(rgba(0xa99aa9ff).into()), + icon_accent: Some(rgba(0x526aebff).into()), status_bar_background: Some(rgba(0x433a43ff).into()), title_bar_background: Some(rgba(0x433a43ff).into()), toolbar_background: Some(rgba(0x1b181bff).into()), @@ -4497,6 +4724,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf7f3f74d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf7f3f74d).into()), scrollbar_thumb_border: Some(rgba(0x231e23ff).into()), + scrollbar_track_background: Some(rgba(0x1b181bff).into()), scrollbar_track_border: Some(rgba(0x231e23ff).into()), editor_foreground: Some(rgba(0xd8cad8ff).into()), editor_background: Some(rgba(0x1b181bff).into()), @@ -4880,19 +5108,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x2c3b42ff).into()), - border_variant: Some(rgba(0x1b2327ff).into()), + border: Some(rgba(0x4f6b78ff).into()), + border_variant: Some(rgba(0x4f6b78ff).into()), + border_focused: Some(rgba(0x1a2f3cff).into()), + border_selected: Some(rgba(0x1a2f3cff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x415763ff).into()), elevated_surface_background: Some(rgba(0x1c2529ff).into()), + surface_background: Some(rgba(0x1c2529ff).into()), background: Some(rgba(0x33444dff).into()), panel_background: Some(rgba(0x1c2529ff).into()), + element_background: Some(rgba(0x1c2529ff).into()), element_hover: Some(rgba(0x4f6b7880).into()), + element_active: Some(rgba(0x4d6976ff).into()), element_selected: Some(rgba(0x57768580).into()), + element_disabled: Some(rgba(0x1c2529ff).into()), drop_target_background: Some(rgba(0x7ca0b380).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x4f6b7880).into()), + ghost_element_active: Some(rgba(0x4d6976ff).into()), + ghost_element_selected: Some(rgba(0x57768580).into()), + ghost_element_disabled: Some(rgba(0x1c2529ff).into()), text: Some(rgba(0xebf8ffff).into()), text_muted: Some(rgba(0x7ca0b3ff).into()), text_placeholder: Some(rgba(0x5a7b8bff).into()), text_disabled: Some(rgba(0xebf8ffff).into()), text_accent: Some(rgba(0x277fadff).into()), + icon: Some(rgba(0xebf8ffff).into()), + icon_muted: Some(rgba(0x7ca0b3ff).into()), + icon_disabled: Some(rgba(0x698c9eff).into()), + icon_placeholder: Some(rgba(0x7ca0b3ff).into()), + icon_accent: Some(rgba(0x277fadff).into()), status_bar_background: Some(rgba(0x33444dff).into()), title_bar_background: Some(rgba(0x33444dff).into()), toolbar_background: Some(rgba(0x161b1dff).into()), @@ -4902,6 +5148,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xebf8ff4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xebf8ff4d).into()), scrollbar_thumb_border: Some(rgba(0x1b2327ff).into()), + scrollbar_track_background: Some(rgba(0x161b1dff).into()), scrollbar_track_border: Some(rgba(0x1b2327ff).into()), editor_foreground: Some(rgba(0xc1e4f6ff).into()), editor_background: Some(rgba(0x161b1dff).into()), @@ -5285,19 +5532,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xd6d1cfff).into()), - border_variant: Some(rgba(0xebe8e6ff).into()), + border: Some(rgba(0xaaa3a1ff).into()), + border_variant: Some(rgba(0xaaa3a1ff).into()), + border_focused: Some(rgba(0xc6cef7ff).into()), + border_selected: Some(rgba(0xc6cef7ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xbcb6b4ff).into()), elevated_surface_background: Some(rgba(0xe9e6e4ff).into()), + surface_background: Some(rgba(0xe9e6e4ff).into()), background: Some(rgba(0xcdc8c6ff).into()), panel_background: Some(rgba(0xe9e6e4ff).into()), + element_background: Some(rgba(0xe9e6e4ff).into()), element_hover: Some(rgba(0xaaa3a180).into()), + element_active: Some(rgba(0xaca5a3ff).into()), element_selected: Some(rgba(0xa1999680).into()), + element_disabled: Some(rgba(0xe9e6e4ff).into()), drop_target_background: Some(rgba(0x6a636080).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xaaa3a180).into()), + ghost_element_active: Some(rgba(0xaca5a3ff).into()), + ghost_element_selected: Some(rgba(0xa1999680).into()), + ghost_element_disabled: Some(rgba(0xe9e6e4ff).into()), text: Some(rgba(0x1b1918ff).into()), text_muted: Some(rgba(0x6a6360ff).into()), text_placeholder: Some(rgba(0x9c9491ff).into()), text_disabled: Some(rgba(0x1b1918ff).into()), text_accent: Some(rgba(0x417ee6ff).into()), + icon: Some(rgba(0x1b1918ff).into()), + icon_muted: Some(rgba(0x6a6360ff).into()), + icon_disabled: Some(rgba(0x847c79ff).into()), + icon_placeholder: Some(rgba(0x6a6360ff).into()), + icon_accent: Some(rgba(0x417ee6ff).into()), status_bar_background: Some(rgba(0xcdc8c6ff).into()), title_bar_background: Some(rgba(0xcdc8c6ff).into()), toolbar_background: Some(rgba(0xf1efeeff).into()), @@ -5307,6 +5572,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x1b19184d).into()), scrollbar_thumb_hover_background: Some(rgba(0x1b19184d).into()), scrollbar_thumb_border: Some(rgba(0xebe8e6ff).into()), + scrollbar_track_background: Some(rgba(0xf1efeeff).into()), scrollbar_track_border: Some(rgba(0xebe8e6ff).into()), editor_foreground: Some(rgba(0x2c2421ff).into()), editor_background: Some(rgba(0xf1efeeff).into()), @@ -5690,19 +5956,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xd7d3beff).into()), - border_variant: Some(rgba(0xf2eedcff).into()), + border: Some(rgba(0xa8a48eff).into()), + border_variant: Some(rgba(0xa8a48eff).into()), + border_focused: Some(rgba(0xcdd1f5ff).into()), + border_selected: Some(rgba(0xcdd1f5ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xbbb7a1ff).into()), elevated_surface_background: Some(rgba(0xeeebd7ff).into()), + surface_background: Some(rgba(0xeeebd7ff).into()), background: Some(rgba(0xcecab4ff).into()), panel_background: Some(rgba(0xeeebd7ff).into()), + element_background: Some(rgba(0xeeebd7ff).into()), element_hover: Some(rgba(0xa8a48e80).into()), + element_active: Some(rgba(0xaaa690ff).into()), element_selected: Some(rgba(0x9e9a8580).into()), + element_disabled: Some(rgba(0xeeebd7ff).into()), drop_target_background: Some(rgba(0x706d5f80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xa8a48e80).into()), + ghost_element_active: Some(rgba(0xaaa690ff).into()), + ghost_element_selected: Some(rgba(0x9e9a8580).into()), + ghost_element_disabled: Some(rgba(0xeeebd7ff).into()), text: Some(rgba(0x20201dff).into()), text_muted: Some(rgba(0x706d5fff).into()), text_placeholder: Some(rgba(0x999580ff).into()), text_disabled: Some(rgba(0x20201dff).into()), text_accent: Some(rgba(0x6784e0ff).into()), + icon: Some(rgba(0x20201dff).into()), + icon_muted: Some(rgba(0x706d5fff).into()), + icon_disabled: Some(rgba(0x878471ff).into()), + icon_placeholder: Some(rgba(0x706d5fff).into()), + icon_accent: Some(rgba(0x6784e0ff).into()), status_bar_background: Some(rgba(0xcecab4ff).into()), title_bar_background: Some(rgba(0xcecab4ff).into()), toolbar_background: Some(rgba(0xfefbecff).into()), @@ -5712,6 +5996,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x20201d4d).into()), scrollbar_thumb_hover_background: Some(rgba(0x20201d4d).into()), scrollbar_thumb_border: Some(rgba(0xf2eedcff).into()), + scrollbar_track_background: Some(rgba(0xfefbecff).into()), scrollbar_track_border: Some(rgba(0xf2eedcff).into()), editor_foreground: Some(rgba(0x292824ff).into()), editor_background: Some(rgba(0xfefbecff).into()), @@ -6095,19 +6380,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xcfc7c7ff).into()), - border_variant: Some(rgba(0xede5e5ff).into()), + border: Some(rgba(0x8e8989ff).into()), + border_variant: Some(rgba(0x8e8989ff).into()), + border_focused: Some(rgba(0xcecaecff).into()), + border_selected: Some(rgba(0xcecaecff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xa8a2a2ff).into()), elevated_surface_background: Some(rgba(0xebe3e3ff).into()), + surface_background: Some(rgba(0xebe3e3ff).into()), background: Some(rgba(0xc1bbbbff).into()), panel_background: Some(rgba(0xebe3e3ff).into()), + element_background: Some(rgba(0xebe3e3ff).into()), element_hover: Some(rgba(0x8e898980).into()), + element_active: Some(rgba(0x908b8bff).into()), element_selected: Some(rgba(0x837c7c80).into()), + element_disabled: Some(rgba(0xebe3e3ff).into()), drop_target_background: Some(rgba(0x5a525280).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x8e898980).into()), + ghost_element_active: Some(rgba(0x908b8bff).into()), + ghost_element_selected: Some(rgba(0x837c7c80).into()), + ghost_element_disabled: Some(rgba(0xebe3e3ff).into()), text: Some(rgba(0x1b1818ff).into()), text_muted: Some(rgba(0x5a5252ff).into()), text_placeholder: Some(rgba(0x7e7777ff).into()), text_disabled: Some(rgba(0x1b1818ff).into()), text_accent: Some(rgba(0x7372caff).into()), + icon: Some(rgba(0x1b1818ff).into()), + icon_muted: Some(rgba(0x5a5252ff).into()), + icon_disabled: Some(rgba(0x6e6666ff).into()), + icon_placeholder: Some(rgba(0x5a5252ff).into()), + icon_accent: Some(rgba(0x7372caff).into()), status_bar_background: Some(rgba(0xc1bbbbff).into()), title_bar_background: Some(rgba(0xc1bbbbff).into()), toolbar_background: Some(rgba(0xf4ececff).into()), @@ -6117,6 +6420,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x1b18184d).into()), scrollbar_thumb_hover_background: Some(rgba(0x1b18184d).into()), scrollbar_thumb_border: Some(rgba(0xede5e5ff).into()), + scrollbar_track_background: Some(rgba(0xf4ececff).into()), scrollbar_track_border: Some(rgba(0xede5e5ff).into()), editor_foreground: Some(rgba(0x292424ff).into()), editor_background: Some(rgba(0xf4ececff).into()), @@ -6500,19 +6804,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xbed7beff).into()), - border_variant: Some(rgba(0xdff0dfff).into()), + border: Some(rgba(0x8ea88eff).into()), + border_variant: Some(rgba(0x8ea88eff).into()), + border_focused: Some(rgba(0xc9c4fdff).into()), + border_selected: Some(rgba(0xc9c4fdff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xa1bba1ff).into()), elevated_surface_background: Some(rgba(0xdaeedaff).into()), + surface_background: Some(rgba(0xdaeedaff).into()), background: Some(rgba(0xb4ceb4ff).into()), panel_background: Some(rgba(0xdaeedaff).into()), + element_background: Some(rgba(0xdaeedaff).into()), element_hover: Some(rgba(0x8ea88e80).into()), + element_active: Some(rgba(0x90aa90ff).into()), element_selected: Some(rgba(0x859e8580).into()), + element_disabled: Some(rgba(0xdaeedaff).into()), drop_target_background: Some(rgba(0x5f705f80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x8ea88e80).into()), + ghost_element_active: Some(rgba(0x90aa90ff).into()), + ghost_element_selected: Some(rgba(0x859e8580).into()), + ghost_element_disabled: Some(rgba(0xdaeedaff).into()), text: Some(rgba(0x131513ff).into()), text_muted: Some(rgba(0x5f705fff).into()), text_placeholder: Some(rgba(0x809980ff).into()), text_disabled: Some(rgba(0x131513ff).into()), text_accent: Some(rgba(0x3f62f4ff).into()), + icon: Some(rgba(0x131513ff).into()), + icon_muted: Some(rgba(0x5f705fff).into()), + icon_disabled: Some(rgba(0x718771ff).into()), + icon_placeholder: Some(rgba(0x5f705fff).into()), + icon_accent: Some(rgba(0x3f62f4ff).into()), status_bar_background: Some(rgba(0xb4ceb4ff).into()), title_bar_background: Some(rgba(0xb4ceb4ff).into()), toolbar_background: Some(rgba(0xf4fbf4ff).into()), @@ -6522,6 +6844,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x1315134d).into()), scrollbar_thumb_hover_background: Some(rgba(0x1315134d).into()), scrollbar_thumb_border: Some(rgba(0xdff0dfff).into()), + scrollbar_track_background: Some(rgba(0xf4fbf4ff).into()), scrollbar_track_border: Some(rgba(0xdff0dfff).into()), editor_foreground: Some(rgba(0x242924ff).into()), editor_background: Some(rgba(0xf4fbf4ff).into()), @@ -6905,19 +7228,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x2f3832ff).into()), - border_variant: Some(rgba(0x1e2420ff).into()), + border: Some(rgba(0x505e55ff).into()), + border_variant: Some(rgba(0x505e55ff).into()), + border_focused: Some(rgba(0x1f3233ff).into()), + border_selected: Some(rgba(0x1f3233ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x434f47ff).into()), elevated_surface_background: Some(rgba(0x1f2621ff).into()), + surface_background: Some(rgba(0x1f2621ff).into()), background: Some(rgba(0x353f39ff).into()), panel_background: Some(rgba(0x1f2621ff).into()), + element_background: Some(rgba(0x1f2621ff).into()), element_hover: Some(rgba(0x505e5580).into()), + element_active: Some(rgba(0x4f5c53ff).into()), element_selected: Some(rgba(0x5a685f80).into()), + element_disabled: Some(rgba(0x1f2621ff).into()), drop_target_background: Some(rgba(0x85918880).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x505e5580).into()), + ghost_element_active: Some(rgba(0x4f5c53ff).into()), + ghost_element_selected: Some(rgba(0x5a685f80).into()), + ghost_element_disabled: Some(rgba(0x1f2621ff).into()), text: Some(rgba(0xecf4eeff).into()), text_muted: Some(rgba(0x859188ff).into()), text_placeholder: Some(rgba(0x5f6d64ff).into()), text_disabled: Some(rgba(0xecf4eeff).into()), text_accent: Some(rgba(0x478c90ff).into()), + icon: Some(rgba(0xecf4eeff).into()), + icon_muted: Some(rgba(0x859188ff).into()), + icon_disabled: Some(rgba(0x6f7e74ff).into()), + icon_placeholder: Some(rgba(0x859188ff).into()), + icon_accent: Some(rgba(0x478c90ff).into()), status_bar_background: Some(rgba(0x353f39ff).into()), title_bar_background: Some(rgba(0x353f39ff).into()), toolbar_background: Some(rgba(0x171c19ff).into()), @@ -6927,6 +7268,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xecf4ee4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xecf4ee4d).into()), scrollbar_thumb_border: Some(rgba(0x1e2420ff).into()), + scrollbar_track_background: Some(rgba(0x171c19ff).into()), scrollbar_track_border: Some(rgba(0x1e2420ff).into()), editor_foreground: Some(rgba(0xdfe7e2ff).into()), editor_background: Some(rgba(0x171c19ff).into()), @@ -7310,19 +7652,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xcdbecdff).into()), - border_variant: Some(rgba(0xe5dce5ff).into()), + border: Some(rgba(0xad9dadff).into()), + border_variant: Some(rgba(0xad9dadff).into()), + border_focused: Some(rgba(0xcac7faff).into()), + border_selected: Some(rgba(0xcac7faff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xbaaabaff).into()), elevated_surface_background: Some(rgba(0xe1d6e1ff).into()), + surface_background: Some(rgba(0xe1d6e1ff).into()), background: Some(rgba(0xc6b8c6ff).into()), panel_background: Some(rgba(0xe1d6e1ff).into()), + element_background: Some(rgba(0xe1d6e1ff).into()), element_hover: Some(rgba(0xad9dad80).into()), + element_active: Some(rgba(0xae9eaeff).into()), element_selected: Some(rgba(0xa394a380).into()), + element_disabled: Some(rgba(0xe1d6e1ff).into()), drop_target_background: Some(rgba(0x6b5e6b80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xad9dad80).into()), + ghost_element_active: Some(rgba(0xae9eaeff).into()), + ghost_element_selected: Some(rgba(0xa394a380).into()), + ghost_element_disabled: Some(rgba(0xe1d6e1ff).into()), text: Some(rgba(0x1b181bff).into()), text_muted: Some(rgba(0x6b5e6bff).into()), text_placeholder: Some(rgba(0x9e8f9eff).into()), text_disabled: Some(rgba(0x1b181bff).into()), text_accent: Some(rgba(0x526aebff).into()), + icon: Some(rgba(0x1b181bff).into()), + icon_muted: Some(rgba(0x6b5e6bff).into()), + icon_disabled: Some(rgba(0x857785ff).into()), + icon_placeholder: Some(rgba(0x6b5e6bff).into()), + icon_accent: Some(rgba(0x526aebff).into()), status_bar_background: Some(rgba(0xc6b8c6ff).into()), title_bar_background: Some(rgba(0xc6b8c6ff).into()), toolbar_background: Some(rgba(0xf7f3f7ff).into()), @@ -7332,6 +7692,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x1b181b4d).into()), scrollbar_thumb_hover_background: Some(rgba(0x1b181b4d).into()), scrollbar_thumb_border: Some(rgba(0xe5dce5ff).into()), + scrollbar_track_background: Some(rgba(0xf7f3f7ff).into()), scrollbar_track_border: Some(rgba(0xe5dce5ff).into()), editor_foreground: Some(rgba(0x292329ff).into()), editor_background: Some(rgba(0xf7f3f7ff).into()), @@ -7715,19 +8076,37 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xb0d3e5ff).into()), - border_variant: Some(rgba(0xd3edfaff).into()), + border: Some(rgba(0x80a4b6ff).into()), + border_variant: Some(rgba(0x80a4b6ff).into()), + border_focused: Some(rgba(0xbacfe1ff).into()), + border_selected: Some(rgba(0xbacfe1ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x93b7c9ff).into()), elevated_surface_background: Some(rgba(0xcdeaf9ff).into()), + surface_background: Some(rgba(0xcdeaf9ff).into()), background: Some(rgba(0xa6cadcff).into()), panel_background: Some(rgba(0xcdeaf9ff).into()), + element_background: Some(rgba(0xcdeaf9ff).into()), element_hover: Some(rgba(0x80a4b680).into()), + element_active: Some(rgba(0x82a6b8ff).into()), element_selected: Some(rgba(0x769aad80).into()), + element_disabled: Some(rgba(0xcdeaf9ff).into()), drop_target_background: Some(rgba(0x526f7d80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x80a4b680).into()), + ghost_element_active: Some(rgba(0x82a6b8ff).into()), + ghost_element_selected: Some(rgba(0x769aad80).into()), + ghost_element_disabled: Some(rgba(0xcdeaf9ff).into()), text: Some(rgba(0x161b1dff).into()), text_muted: Some(rgba(0x526f7dff).into()), text_placeholder: Some(rgba(0x7195a8ff).into()), text_disabled: Some(rgba(0x161b1dff).into()), text_accent: Some(rgba(0x277fadff).into()), + icon: Some(rgba(0x161b1dff).into()), + icon_muted: Some(rgba(0x526f7dff).into()), + icon_disabled: Some(rgba(0x628496ff).into()), + icon_placeholder: Some(rgba(0x526f7dff).into()), + icon_accent: Some(rgba(0x277fadff).into()), status_bar_background: Some(rgba(0xa6cadcff).into()), title_bar_background: Some(rgba(0xa6cadcff).into()), toolbar_background: Some(rgba(0xebf8ffff).into()), @@ -7737,6 +8116,7 @@ pub fn atelier() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x161b1d4d).into()), scrollbar_thumb_hover_background: Some(rgba(0x161b1d4d).into()), scrollbar_thumb_border: Some(rgba(0xd3edfaff).into()), + scrollbar_track_background: Some(rgba(0xebf8ffff).into()), scrollbar_track_border: Some(rgba(0xd3edfaff).into()), editor_foreground: Some(rgba(0x1f292eff).into()), editor_background: Some(rgba(0xebf8ffff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index ad1dbec17ae86929441dcc0c347372dba9fad42a..a51f5fca4718c5f1ef618302f9068105c6b48646 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -20,19 +20,37 @@ pub fn ayu() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x2d2f34ff).into()), - border_variant: Some(rgba(0x1b1e24ff).into()), + border: Some(rgba(0x3f4043ff).into()), + border_variant: Some(rgba(0x3f4043ff).into()), + border_focused: Some(rgba(0x1b4a6eff).into()), + border_selected: Some(rgba(0x1b4a6eff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x383a3eff).into()), elevated_surface_background: Some(rgba(0x1f2127ff).into()), + surface_background: Some(rgba(0x1f2127ff).into()), background: Some(rgba(0x313337ff).into()), panel_background: Some(rgba(0x1f2127ff).into()), + element_background: Some(rgba(0x1f2127ff).into()), element_hover: Some(rgba(0x3f404380).into()), + element_active: Some(rgba(0x3e4043ff).into()), element_selected: Some(rgba(0x50515280).into()), + element_disabled: Some(rgba(0x1f2127ff).into()), drop_target_background: Some(rgba(0x8a898680).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x3f404380).into()), + ghost_element_active: Some(rgba(0x3e4043ff).into()), + ghost_element_selected: Some(rgba(0x50515280).into()), + ghost_element_disabled: Some(rgba(0x1f2127ff).into()), text: Some(rgba(0xbfbdb6ff).into()), text_muted: Some(rgba(0x8a8986ff).into()), text_placeholder: Some(rgba(0x58595aff).into()), text_disabled: Some(rgba(0xbfbdb6ff).into()), text_accent: Some(rgba(0x5ac2feff).into()), + icon: Some(rgba(0xbfbdb6ff).into()), + icon_muted: Some(rgba(0x8a8986ff).into()), + icon_disabled: Some(rgba(0x696a6aff).into()), + icon_placeholder: Some(rgba(0x8a8986ff).into()), + icon_accent: Some(rgba(0x5ac2feff).into()), status_bar_background: Some(rgba(0x313337ff).into()), title_bar_background: Some(rgba(0x313337ff).into()), toolbar_background: Some(rgba(0x0d1017ff).into()), @@ -42,6 +60,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xbfbdb64d).into()), scrollbar_thumb_hover_background: Some(rgba(0xbfbdb64d).into()), scrollbar_thumb_border: Some(rgba(0x1b1e24ff).into()), + scrollbar_track_background: Some(rgba(0x0d1017ff).into()), scrollbar_track_border: Some(rgba(0x1b1e24ff).into()), editor_foreground: Some(rgba(0xbfbdb6ff).into()), editor_background: Some(rgba(0x0d1017ff).into()), @@ -404,19 +423,37 @@ pub fn ayu() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xdfe0e1ff).into()), - border_variant: Some(rgba(0xefeff0ff).into()), + border: Some(rgba(0xcfd1d2ff).into()), + border_variant: Some(rgba(0xcfd1d2ff).into()), + border_focused: Some(rgba(0xc4daf6ff).into()), + border_selected: Some(rgba(0xc4daf6ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xd5d6d8ff).into()), elevated_surface_background: Some(rgba(0xececedff).into()), + surface_background: Some(rgba(0xececedff).into()), background: Some(rgba(0xdcdddeff).into()), panel_background: Some(rgba(0xececedff).into()), + element_background: Some(rgba(0xececedff).into()), element_hover: Some(rgba(0xcfd1d280).into()), + element_active: Some(rgba(0xd0d1d3ff).into()), element_selected: Some(rgba(0xc0c2c480).into()), + element_disabled: Some(rgba(0xececedff).into()), drop_target_background: Some(rgba(0x8c8f9380).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xcfd1d280).into()), + ghost_element_active: Some(rgba(0xd0d1d3ff).into()), + ghost_element_selected: Some(rgba(0xc0c2c480).into()), + ghost_element_disabled: Some(rgba(0xececedff).into()), text: Some(rgba(0x5c6166ff).into()), text_muted: Some(rgba(0x8c8f93ff).into()), text_placeholder: Some(rgba(0xb9bbbdff).into()), text_disabled: Some(rgba(0x5c6166ff).into()), text_accent: Some(rgba(0x3b9ee5ff).into()), + icon: Some(rgba(0x5c6166ff).into()), + icon_muted: Some(rgba(0x8c8f93ff).into()), + icon_disabled: Some(rgba(0xa9acaeff).into()), + icon_placeholder: Some(rgba(0x8c8f93ff).into()), + icon_accent: Some(rgba(0x3b9ee5ff).into()), status_bar_background: Some(rgba(0xdcdddeff).into()), title_bar_background: Some(rgba(0xdcdddeff).into()), toolbar_background: Some(rgba(0xfcfcfcff).into()), @@ -426,6 +463,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x5c61664d).into()), scrollbar_thumb_hover_background: Some(rgba(0x5c61664d).into()), scrollbar_thumb_border: Some(rgba(0xefeff0ff).into()), + scrollbar_track_background: Some(rgba(0xfcfcfcff).into()), scrollbar_track_border: Some(rgba(0xefeff0ff).into()), editor_foreground: Some(rgba(0x5c6166ff).into()), editor_background: Some(rgba(0xfcfcfcff).into()), @@ -788,19 +826,37 @@ pub fn ayu() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x43464fff).into()), - border_variant: Some(rgba(0x323641ff).into()), + border: Some(rgba(0x53565dff).into()), + border_variant: Some(rgba(0x53565dff).into()), + border_focused: Some(rgba(0x24556fff).into()), + border_selected: Some(rgba(0x24556fff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x4d5058ff).into()), elevated_surface_background: Some(rgba(0x353944ff).into()), + surface_background: Some(rgba(0x353944ff).into()), background: Some(rgba(0x464a52ff).into()), panel_background: Some(rgba(0x353944ff).into()), + element_background: Some(rgba(0x353944ff).into()), element_hover: Some(rgba(0x53565d80).into()), + element_active: Some(rgba(0x53565dff).into()), element_selected: Some(rgba(0x63656a80).into()), + element_disabled: Some(rgba(0x353944ff).into()), drop_target_background: Some(rgba(0x9a9a9880).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x53565d80).into()), + ghost_element_active: Some(rgba(0x53565dff).into()), + ghost_element_selected: Some(rgba(0x63656a80).into()), + ghost_element_disabled: Some(rgba(0x353944ff).into()), text: Some(rgba(0xcccac2ff).into()), text_muted: Some(rgba(0x9a9a98ff).into()), text_placeholder: Some(rgba(0x6b6d71ff).into()), text_disabled: Some(rgba(0xcccac2ff).into()), text_accent: Some(rgba(0x73cffeff).into()), + icon: Some(rgba(0xcccac2ff).into()), + icon_muted: Some(rgba(0x9a9a98ff).into()), + icon_disabled: Some(rgba(0x7b7d7fff).into()), + icon_placeholder: Some(rgba(0x9a9a98ff).into()), + icon_accent: Some(rgba(0x73cffeff).into()), status_bar_background: Some(rgba(0x464a52ff).into()), title_bar_background: Some(rgba(0x464a52ff).into()), toolbar_background: Some(rgba(0x242936ff).into()), @@ -810,6 +866,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xcccac24d).into()), scrollbar_thumb_hover_background: Some(rgba(0xcccac24d).into()), scrollbar_thumb_border: Some(rgba(0x323641ff).into()), + scrollbar_track_background: Some(rgba(0x242936ff).into()), scrollbar_track_border: Some(rgba(0x323641ff).into()), editor_foreground: Some(rgba(0xcccac2ff).into()), editor_background: Some(rgba(0x242936ff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 4f337894816c171ca4dec36648de73a032e0ba75..ce4b6126f337f091aee826548a93145ee5f2e740 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -20,19 +20,37 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xddcca7ff).into()), - border_variant: Some(rgba(0xefe2bcff).into()), + border: Some(rgba(0xc9b99aff).into()), + border_variant: Some(rgba(0xc9b99aff).into()), + border_focused: Some(rgba(0xaec6cdff).into()), + border_selected: Some(rgba(0xaec6cdff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xd1c09eff).into()), elevated_surface_background: Some(rgba(0xecddb5ff).into()), + surface_background: Some(rgba(0xecddb5ff).into()), background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecddb5ff).into()), + element_background: Some(rgba(0xecddb5ff).into()), element_hover: Some(rgba(0xc9b99a80).into()), + element_active: Some(rgba(0xc9b99aff).into()), element_selected: Some(rgba(0xb5a68e80).into()), + element_disabled: Some(rgba(0xecddb5ff).into()), drop_target_background: Some(rgba(0x5f565080).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xc9b99a80).into()), + ghost_element_active: Some(rgba(0xc9b99aff).into()), + ghost_element_selected: Some(rgba(0xb5a68e80).into()), + ghost_element_disabled: Some(rgba(0xecddb5ff).into()), text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0x5f5650ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), text_accent: Some(rgba(0x0b6678ff).into()), + icon: Some(rgba(0x282828ff).into()), + icon_muted: Some(rgba(0x5f5650ff).into()), + icon_disabled: Some(rgba(0x8a7c6fff).into()), + icon_placeholder: Some(rgba(0x5f5650ff).into()), + icon_accent: Some(rgba(0x0b6678ff).into()), status_bar_background: Some(rgba(0xd9c8a4ff).into()), title_bar_background: Some(rgba(0xd9c8a4ff).into()), toolbar_background: Some(rgba(0xf9f5d7ff).into()), @@ -42,6 +60,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x2828284d).into()), scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()), scrollbar_thumb_border: Some(rgba(0xefe2bcff).into()), + scrollbar_track_background: Some(rgba(0xf9f5d7ff).into()), scrollbar_track_border: Some(rgba(0xefe2bcff).into()), editor_foreground: Some(rgba(0x282828ff).into()), editor_background: Some(rgba(0xf9f5d7ff).into()), @@ -411,19 +430,37 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x494340ff).into()), - border_variant: Some(rgba(0x393634ff).into()), + border: Some(rgba(0x5b534dff).into()), + border_variant: Some(rgba(0x5b534dff).into()), + border_focused: Some(rgba(0x303a36ff).into()), + border_selected: Some(rgba(0x303a36ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x544c48ff).into()), elevated_surface_background: Some(rgba(0x3b3735ff).into()), + surface_background: Some(rgba(0x3b3735ff).into()), background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x3b3735ff).into()), + element_background: Some(rgba(0x3b3735ff).into()), element_hover: Some(rgba(0x5b534d80).into()), + element_active: Some(rgba(0x5b524cff).into()), element_selected: Some(rgba(0x6e635a80).into()), + element_disabled: Some(rgba(0x3b3735ff).into()), drop_target_background: Some(rgba(0xc5b59780).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x5b534d80).into()), + ghost_element_active: Some(rgba(0x5b524cff).into()), + ghost_element_selected: Some(rgba(0x6e635a80).into()), + ghost_element_disabled: Some(rgba(0x3b3735ff).into()), text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0xc5b597ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), text_accent: Some(rgba(0x83a598ff).into()), + icon: Some(rgba(0xfbf1c7ff).into()), + icon_muted: Some(rgba(0xc5b597ff).into()), + icon_disabled: Some(rgba(0x9a8c79ff).into()), + icon_placeholder: Some(rgba(0xc5b597ff).into()), + icon_accent: Some(rgba(0x83a598ff).into()), status_bar_background: Some(rgba(0x4c4642ff).into()), title_bar_background: Some(rgba(0x4c4642ff).into()), toolbar_background: Some(rgba(0x32302fff).into()), @@ -433,6 +470,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xfbf1c74d).into()), scrollbar_thumb_hover_background: Some(rgba(0xfbf1c74d).into()), scrollbar_thumb_border: Some(rgba(0x393634ff).into()), + scrollbar_track_background: Some(rgba(0x32302fff).into()), scrollbar_track_border: Some(rgba(0x393634ff).into()), editor_foreground: Some(rgba(0xebdbb2ff).into()), editor_background: Some(rgba(0x32302fff).into()), @@ -802,19 +840,37 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xddcca7ff).into()), - border_variant: Some(rgba(0xefe1b8ff).into()), + border: Some(rgba(0xc9b99aff).into()), + border_variant: Some(rgba(0xc9b99aff).into()), + border_focused: Some(rgba(0xaec6cdff).into()), + border_selected: Some(rgba(0xaec6cdff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xd1c09eff).into()), elevated_surface_background: Some(rgba(0xecddb4ff).into()), + surface_background: Some(rgba(0xecddb4ff).into()), background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecddb4ff).into()), + element_background: Some(rgba(0xecddb4ff).into()), element_hover: Some(rgba(0xc9b99a80).into()), + element_active: Some(rgba(0xc9b99aff).into()), element_selected: Some(rgba(0xb5a68e80).into()), + element_disabled: Some(rgba(0xecddb4ff).into()), drop_target_background: Some(rgba(0x5f565080).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xc9b99a80).into()), + ghost_element_active: Some(rgba(0xc9b99aff).into()), + ghost_element_selected: Some(rgba(0xb5a68e80).into()), + ghost_element_disabled: Some(rgba(0xecddb4ff).into()), text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0x5f5650ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), text_accent: Some(rgba(0x0b6678ff).into()), + icon: Some(rgba(0x282828ff).into()), + icon_muted: Some(rgba(0x5f5650ff).into()), + icon_disabled: Some(rgba(0x8a7c6fff).into()), + icon_placeholder: Some(rgba(0x5f5650ff).into()), + icon_accent: Some(rgba(0x0b6678ff).into()), status_bar_background: Some(rgba(0xd9c8a4ff).into()), title_bar_background: Some(rgba(0xd9c8a4ff).into()), toolbar_background: Some(rgba(0xfbf1c7ff).into()), @@ -824,6 +880,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x2828284d).into()), scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()), scrollbar_thumb_border: Some(rgba(0xefe1b8ff).into()), + scrollbar_track_background: Some(rgba(0xfbf1c7ff).into()), scrollbar_track_border: Some(rgba(0xefe1b8ff).into()), editor_foreground: Some(rgba(0x282828ff).into()), editor_background: Some(rgba(0xfbf1c7ff).into()), @@ -1193,19 +1250,37 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x494340ff).into()), - border_variant: Some(rgba(0x373432ff).into()), + border: Some(rgba(0x5b534dff).into()), + border_variant: Some(rgba(0x5b534dff).into()), + border_focused: Some(rgba(0x303a36ff).into()), + border_selected: Some(rgba(0x303a36ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x544c48ff).into()), elevated_surface_background: Some(rgba(0x3a3735ff).into()), + surface_background: Some(rgba(0x3a3735ff).into()), background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x3a3735ff).into()), + element_background: Some(rgba(0x3a3735ff).into()), element_hover: Some(rgba(0x5b534d80).into()), + element_active: Some(rgba(0x5b524cff).into()), element_selected: Some(rgba(0x6e635a80).into()), + element_disabled: Some(rgba(0x3a3735ff).into()), drop_target_background: Some(rgba(0xc5b59780).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x5b534d80).into()), + ghost_element_active: Some(rgba(0x5b524cff).into()), + ghost_element_selected: Some(rgba(0x6e635a80).into()), + ghost_element_disabled: Some(rgba(0x3a3735ff).into()), text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0xc5b597ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), text_accent: Some(rgba(0x83a598ff).into()), + icon: Some(rgba(0xfbf1c7ff).into()), + icon_muted: Some(rgba(0xc5b597ff).into()), + icon_disabled: Some(rgba(0x9a8c79ff).into()), + icon_placeholder: Some(rgba(0xc5b597ff).into()), + icon_accent: Some(rgba(0x83a598ff).into()), status_bar_background: Some(rgba(0x4c4642ff).into()), title_bar_background: Some(rgba(0x4c4642ff).into()), toolbar_background: Some(rgba(0x282828ff).into()), @@ -1215,6 +1290,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xfbf1c74d).into()), scrollbar_thumb_hover_background: Some(rgba(0xfbf1c74d).into()), scrollbar_thumb_border: Some(rgba(0x373432ff).into()), + scrollbar_track_background: Some(rgba(0x282828ff).into()), scrollbar_track_border: Some(rgba(0x373432ff).into()), editor_foreground: Some(rgba(0xebdbb2ff).into()), editor_background: Some(rgba(0x282828ff).into()), @@ -1584,19 +1660,37 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xddcca7ff).into()), - border_variant: Some(rgba(0xeddeb5ff).into()), + border: Some(rgba(0xc9b99aff).into()), + border_variant: Some(rgba(0xc9b99aff).into()), + border_focused: Some(rgba(0xaec6cdff).into()), + border_selected: Some(rgba(0xaec6cdff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xd1c09eff).into()), elevated_surface_background: Some(rgba(0xecdcb3ff).into()), + surface_background: Some(rgba(0xecdcb3ff).into()), background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecdcb3ff).into()), + element_background: Some(rgba(0xecdcb3ff).into()), element_hover: Some(rgba(0xc9b99a80).into()), + element_active: Some(rgba(0xc9b99aff).into()), element_selected: Some(rgba(0xb5a68e80).into()), + element_disabled: Some(rgba(0xecdcb3ff).into()), drop_target_background: Some(rgba(0x5f565080).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xc9b99a80).into()), + ghost_element_active: Some(rgba(0xc9b99aff).into()), + ghost_element_selected: Some(rgba(0xb5a68e80).into()), + ghost_element_disabled: Some(rgba(0xecdcb3ff).into()), text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0x5f5650ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), text_accent: Some(rgba(0x0b6678ff).into()), + icon: Some(rgba(0x282828ff).into()), + icon_muted: Some(rgba(0x5f5650ff).into()), + icon_disabled: Some(rgba(0x8a7c6fff).into()), + icon_placeholder: Some(rgba(0x5f5650ff).into()), + icon_accent: Some(rgba(0x0b6678ff).into()), status_bar_background: Some(rgba(0xd9c8a4ff).into()), title_bar_background: Some(rgba(0xd9c8a4ff).into()), toolbar_background: Some(rgba(0xf2e5bcff).into()), @@ -1606,6 +1700,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x2828284d).into()), scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()), scrollbar_thumb_border: Some(rgba(0xeddeb5ff).into()), + scrollbar_track_background: Some(rgba(0xf2e5bcff).into()), scrollbar_track_border: Some(rgba(0xeddeb5ff).into()), editor_foreground: Some(rgba(0x282828ff).into()), editor_background: Some(rgba(0xf2e5bcff).into()), @@ -1975,19 +2070,37 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x494340ff).into()), - border_variant: Some(rgba(0x343130ff).into()), + border: Some(rgba(0x5b534dff).into()), + border_variant: Some(rgba(0x5b534dff).into()), + border_focused: Some(rgba(0x303a36ff).into()), + border_selected: Some(rgba(0x303a36ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x544c48ff).into()), elevated_surface_background: Some(rgba(0x393634ff).into()), + surface_background: Some(rgba(0x393634ff).into()), background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x393634ff).into()), + element_background: Some(rgba(0x393634ff).into()), element_hover: Some(rgba(0x5b534d80).into()), + element_active: Some(rgba(0x5b524cff).into()), element_selected: Some(rgba(0x6e635a80).into()), + element_disabled: Some(rgba(0x393634ff).into()), drop_target_background: Some(rgba(0xc5b59780).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x5b534d80).into()), + ghost_element_active: Some(rgba(0x5b524cff).into()), + ghost_element_selected: Some(rgba(0x6e635a80).into()), + ghost_element_disabled: Some(rgba(0x393634ff).into()), text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0xc5b597ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), text_accent: Some(rgba(0x83a598ff).into()), + icon: Some(rgba(0xfbf1c7ff).into()), + icon_muted: Some(rgba(0xc5b597ff).into()), + icon_disabled: Some(rgba(0x9a8c79ff).into()), + icon_placeholder: Some(rgba(0xc5b597ff).into()), + icon_accent: Some(rgba(0x83a598ff).into()), status_bar_background: Some(rgba(0x4c4642ff).into()), title_bar_background: Some(rgba(0x4c4642ff).into()), toolbar_background: Some(rgba(0x1d2021ff).into()), @@ -1997,6 +2110,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xfbf1c74d).into()), scrollbar_thumb_hover_background: Some(rgba(0xfbf1c74d).into()), scrollbar_thumb_border: Some(rgba(0x343130ff).into()), + scrollbar_track_background: Some(rgba(0x1d2021ff).into()), scrollbar_track_border: Some(rgba(0x343130ff).into()), editor_foreground: Some(rgba(0xebdbb2ff).into()), editor_background: Some(rgba(0x1d2021ff).into()), diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs index cd9db3ca0439e6dda5c5edb6be27746f01548357..d80b189579136b3dcc3dd3e783563c6afe2ee240 100644 --- a/crates/theme2/src/themes/one.rs +++ b/crates/theme2/src/themes/one.rs @@ -20,19 +20,37 @@ pub fn one() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xdfdfe0ff).into()), - border_variant: Some(rgba(0xeeeeeeff).into()), + border: Some(rgba(0xc9c9caff).into()), + border_variant: Some(rgba(0xc9c9caff).into()), + border_focused: Some(rgba(0xcbcdf6ff).into()), + border_selected: Some(rgba(0xcbcdf6ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xd3d3d4ff).into()), elevated_surface_background: Some(rgba(0xebebecff).into()), + surface_background: Some(rgba(0xebebecff).into()), background: Some(rgba(0xdcdcddff).into()), panel_background: Some(rgba(0xebebecff).into()), + element_background: Some(rgba(0xebebecff).into()), element_hover: Some(rgba(0xc9c9ca80).into()), + element_active: Some(rgba(0xcacacaff).into()), element_selected: Some(rgba(0xafafaf80).into()), + element_disabled: Some(rgba(0xebebecff).into()), drop_target_background: Some(rgba(0x7f818880).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xc9c9ca80).into()), + ghost_element_active: Some(rgba(0xcacacaff).into()), + ghost_element_selected: Some(rgba(0xafafaf80).into()), + ghost_element_disabled: Some(rgba(0xebebecff).into()), text: Some(rgba(0x383a41ff).into()), text_muted: Some(rgba(0x7f8188ff).into()), text_placeholder: Some(rgba(0xa7a7a8ff).into()), text_disabled: Some(rgba(0x383a41ff).into()), text_accent: Some(rgba(0x5c79e2ff).into()), + icon: Some(rgba(0x383a41ff).into()), + icon_muted: Some(rgba(0x7f8188ff).into()), + icon_disabled: Some(rgba(0xa1a1a3ff).into()), + icon_placeholder: Some(rgba(0x7f8188ff).into()), + icon_accent: Some(rgba(0x5c79e2ff).into()), status_bar_background: Some(rgba(0xdcdcddff).into()), title_bar_background: Some(rgba(0xdcdcddff).into()), toolbar_background: Some(rgba(0xfafafaff).into()), @@ -42,6 +60,7 @@ pub fn one() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x383a414d).into()), scrollbar_thumb_hover_background: Some(rgba(0x383a414d).into()), scrollbar_thumb_border: Some(rgba(0xeeeeeeff).into()), + scrollbar_track_background: Some(rgba(0xfafafaff).into()), scrollbar_track_border: Some(rgba(0xeeeeeeff).into()), editor_foreground: Some(rgba(0x383a41ff).into()), editor_background: Some(rgba(0xfafafaff).into()), @@ -411,19 +430,37 @@ pub fn one() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x363c46ff).into()), - border_variant: Some(rgba(0x2e333cff).into()), + border: Some(rgba(0x464b57ff).into()), + border_variant: Some(rgba(0x464b57ff).into()), + border_focused: Some(rgba(0x293c5bff).into()), + border_selected: Some(rgba(0x293c5bff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x414754ff).into()), elevated_surface_background: Some(rgba(0x2f343eff).into()), + surface_background: Some(rgba(0x2f343eff).into()), background: Some(rgba(0x3b414dff).into()), panel_background: Some(rgba(0x2f343eff).into()), + element_background: Some(rgba(0x2f343eff).into()), element_hover: Some(rgba(0x464b5780).into()), + element_active: Some(rgba(0x454a56ff).into()), element_selected: Some(rgba(0x4f545e80).into()), + element_disabled: Some(rgba(0x2f343eff).into()), drop_target_background: Some(rgba(0x83899480).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x464b5780).into()), + ghost_element_active: Some(rgba(0x454a56ff).into()), + ghost_element_selected: Some(rgba(0x4f545e80).into()), + ghost_element_disabled: Some(rgba(0x2f343eff).into()), text: Some(rgba(0xc8ccd4ff).into()), text_muted: Some(rgba(0x838994ff).into()), text_placeholder: Some(rgba(0x545862ff).into()), text_disabled: Some(rgba(0xc8ccd4ff).into()), text_accent: Some(rgba(0x74ade8ff).into()), + icon: Some(rgba(0xc8ccd4ff).into()), + icon_muted: Some(rgba(0x838994ff).into()), + icon_disabled: Some(rgba(0x555a63ff).into()), + icon_placeholder: Some(rgba(0x838994ff).into()), + icon_accent: Some(rgba(0x74ade8ff).into()), status_bar_background: Some(rgba(0x3b414dff).into()), title_bar_background: Some(rgba(0x3b414dff).into()), toolbar_background: Some(rgba(0x282c34ff).into()), @@ -433,6 +470,7 @@ pub fn one() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xc8ccd44d).into()), scrollbar_thumb_hover_background: Some(rgba(0xc8ccd44d).into()), scrollbar_thumb_border: Some(rgba(0x2e333cff).into()), + scrollbar_track_background: Some(rgba(0x282c34ff).into()), scrollbar_track_border: Some(rgba(0x2e333cff).into()), editor_foreground: Some(rgba(0xacb2beff).into()), editor_background: Some(rgba(0x282c34ff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 71dce716570e6ad300f1fa046a4428bd2cd9f10c..0d310050c4e25b3b52db57e564d2424e8d52d2ae 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -20,19 +20,37 @@ pub fn rose_pine() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xe5e0dfff).into()), - border_variant: Some(rgba(0xfdf8f1ff).into()), + border: Some(rgba(0xdcd6d5ff).into()), + border_variant: Some(rgba(0xdcd6d5ff).into()), + border_focused: Some(rgba(0xc3d7dbff).into()), + border_selected: Some(rgba(0xc3d7dbff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xd0cccfff).into()), elevated_surface_background: Some(rgba(0xfef9f2ff).into()), + surface_background: Some(rgba(0xfef9f2ff).into()), background: Some(rgba(0xdcd8d8ff).into()), panel_background: Some(rgba(0xfef9f2ff).into()), + element_background: Some(rgba(0xfef9f2ff).into()), element_hover: Some(rgba(0xdcd6d580).into()), + element_active: Some(rgba(0xdbd5d4ff).into()), element_selected: Some(rgba(0xc1bac180).into()), + element_disabled: Some(rgba(0xfef9f2ff).into()), drop_target_background: Some(rgba(0x706c8c80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0xdcd6d580).into()), + ghost_element_active: Some(rgba(0xdbd5d4ff).into()), + ghost_element_selected: Some(rgba(0xc1bac180).into()), + ghost_element_disabled: Some(rgba(0xfef9f2ff).into()), text: Some(rgba(0x575279ff).into()), text_muted: Some(rgba(0x706c8cff).into()), text_placeholder: Some(rgba(0xb1abb5ff).into()), text_disabled: Some(rgba(0x575279ff).into()), text_accent: Some(rgba(0x57949fff).into()), + icon: Some(rgba(0x575279ff).into()), + icon_muted: Some(rgba(0x706c8cff).into()), + icon_disabled: Some(rgba(0x938fa3ff).into()), + icon_placeholder: Some(rgba(0x706c8cff).into()), + icon_accent: Some(rgba(0x57949fff).into()), status_bar_background: Some(rgba(0xdcd8d8ff).into()), title_bar_background: Some(rgba(0xdcd8d8ff).into()), toolbar_background: Some(rgba(0xfaf4edff).into()), @@ -42,6 +60,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x5752794d).into()), scrollbar_thumb_hover_background: Some(rgba(0x5752794d).into()), scrollbar_thumb_border: Some(rgba(0xfdf8f1ff).into()), + scrollbar_track_background: Some(rgba(0xfaf4edff).into()), scrollbar_track_border: Some(rgba(0xfdf8f1ff).into()), editor_foreground: Some(rgba(0x575279ff).into()), editor_background: Some(rgba(0xfaf4edff).into()), @@ -418,19 +437,37 @@ pub fn rose_pine() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x322f48ff).into()), - border_variant: Some(rgba(0x27243bff).into()), + border: Some(rgba(0x504c68ff).into()), + border_variant: Some(rgba(0x504c68ff).into()), + border_focused: Some(rgba(0x435255ff).into()), + border_selected: Some(rgba(0x435255ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x44415bff).into()), elevated_surface_background: Some(rgba(0x28253cff).into()), + surface_background: Some(rgba(0x28253cff).into()), background: Some(rgba(0x38354eff).into()), panel_background: Some(rgba(0x28253cff).into()), + element_background: Some(rgba(0x28253cff).into()), element_hover: Some(rgba(0x504c6880).into()), + element_active: Some(rgba(0x4f4b66ff).into()), element_selected: Some(rgba(0x45415d80).into()), + element_disabled: Some(rgba(0x28253cff).into()), drop_target_background: Some(rgba(0x85819e80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x504c6880).into()), + ghost_element_active: Some(rgba(0x4f4b66ff).into()), + ghost_element_selected: Some(rgba(0x45415d80).into()), + ghost_element_disabled: Some(rgba(0x28253cff).into()), text: Some(rgba(0xe0def4ff).into()), text_muted: Some(rgba(0x85819eff).into()), text_placeholder: Some(rgba(0x3a3653ff).into()), text_disabled: Some(rgba(0xe0def4ff).into()), text_accent: Some(rgba(0x9cced7ff).into()), + icon: Some(rgba(0xe0def4ff).into()), + icon_muted: Some(rgba(0x85819eff).into()), + icon_disabled: Some(rgba(0x615d7aff).into()), + icon_placeholder: Some(rgba(0x85819eff).into()), + icon_accent: Some(rgba(0x9cced7ff).into()), status_bar_background: Some(rgba(0x38354eff).into()), title_bar_background: Some(rgba(0x38354eff).into()), toolbar_background: Some(rgba(0x232136ff).into()), @@ -440,6 +477,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xe0def44d).into()), scrollbar_thumb_hover_background: Some(rgba(0xe0def44d).into()), scrollbar_thumb_border: Some(rgba(0x27243bff).into()), + scrollbar_track_background: Some(rgba(0x232136ff).into()), scrollbar_track_border: Some(rgba(0x27243bff).into()), editor_foreground: Some(rgba(0xe0def4ff).into()), editor_background: Some(rgba(0x232136ff).into()), @@ -816,19 +854,37 @@ pub fn rose_pine() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x232132ff).into()), - border_variant: Some(rgba(0x1c1a29ff).into()), + border: Some(rgba(0x423f55ff).into()), + border_variant: Some(rgba(0x423f55ff).into()), + border_focused: Some(rgba(0x435255ff).into()), + border_selected: Some(rgba(0x435255ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x353347ff).into()), elevated_surface_background: Some(rgba(0x1d1b2aff).into()), + surface_background: Some(rgba(0x1d1b2aff).into()), background: Some(rgba(0x292739ff).into()), panel_background: Some(rgba(0x1d1b2aff).into()), + element_background: Some(rgba(0x1d1b2aff).into()), element_hover: Some(rgba(0x423f5580).into()), + element_active: Some(rgba(0x403e53ff).into()), element_selected: Some(rgba(0x47445b80).into()), + element_disabled: Some(rgba(0x1d1b2aff).into()), drop_target_background: Some(rgba(0x75718e80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x423f5580).into()), + ghost_element_active: Some(rgba(0x403e53ff).into()), + ghost_element_selected: Some(rgba(0x47445b80).into()), + ghost_element_disabled: Some(rgba(0x1d1b2aff).into()), text: Some(rgba(0xe0def4ff).into()), text_muted: Some(rgba(0x75718eff).into()), text_placeholder: Some(rgba(0x3b384fff).into()), text_disabled: Some(rgba(0xe0def4ff).into()), text_accent: Some(rgba(0x9cced7ff).into()), + icon: Some(rgba(0xe0def4ff).into()), + icon_muted: Some(rgba(0x75718eff).into()), + icon_disabled: Some(rgba(0x2f2b43ff).into()), + icon_placeholder: Some(rgba(0x75718eff).into()), + icon_accent: Some(rgba(0x9cced7ff).into()), status_bar_background: Some(rgba(0x292739ff).into()), title_bar_background: Some(rgba(0x292739ff).into()), toolbar_background: Some(rgba(0x191724ff).into()), @@ -838,6 +894,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xe0def44d).into()), scrollbar_thumb_hover_background: Some(rgba(0xe0def44d).into()), scrollbar_thumb_border: Some(rgba(0x1c1a29ff).into()), + scrollbar_track_background: Some(rgba(0x191724ff).into()), scrollbar_track_border: Some(rgba(0x1c1a29ff).into()), editor_foreground: Some(rgba(0xe0def4ff).into()), editor_background: Some(rgba(0x191724ff).into()), diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs index 74714060bbd84ce5bc6ac0ac24b1536d905fc80b..012c17be8271294bdef7035b7f7a97b0768f5b3a 100644 --- a/crates/theme2/src/themes/sandcastle.rs +++ b/crates/theme2/src/themes/sandcastle.rs @@ -19,19 +19,37 @@ pub fn sandcastle() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x313741ff).into()), - border_variant: Some(rgba(0x2a2f38ff).into()), + border: Some(rgba(0x3d4350ff).into()), + border_variant: Some(rgba(0x3d4350ff).into()), + border_focused: Some(rgba(0x223232ff).into()), + border_selected: Some(rgba(0x223232ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x393f4aff).into()), elevated_surface_background: Some(rgba(0x2b3039ff).into()), + surface_background: Some(rgba(0x2b3039ff).into()), background: Some(rgba(0x333944ff).into()), panel_background: Some(rgba(0x2b3039ff).into()), + element_background: Some(rgba(0x2b3039ff).into()), element_hover: Some(rgba(0x3d435080).into()), + element_active: Some(rgba(0x3d4350ff).into()), element_selected: Some(rgba(0x57535380).into()), + element_disabled: Some(rgba(0x2b3039ff).into()), drop_target_background: Some(rgba(0xa6978280).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x3d435080).into()), + ghost_element_active: Some(rgba(0x3d4350ff).into()), + ghost_element_selected: Some(rgba(0x57535380).into()), + ghost_element_disabled: Some(rgba(0x2b3039ff).into()), text: Some(rgba(0xfdf4c1ff).into()), text_muted: Some(rgba(0xa69782ff).into()), text_placeholder: Some(rgba(0x645b54ff).into()), text_disabled: Some(rgba(0xfdf4c1ff).into()), text_accent: Some(rgba(0x528b8bff).into()), + icon: Some(rgba(0xfdf4c1ff).into()), + icon_muted: Some(rgba(0xa69782ff).into()), + icon_disabled: Some(rgba(0x827568ff).into()), + icon_placeholder: Some(rgba(0xa69782ff).into()), + icon_accent: Some(rgba(0x528b8bff).into()), status_bar_background: Some(rgba(0x333944ff).into()), title_bar_background: Some(rgba(0x333944ff).into()), toolbar_background: Some(rgba(0x282c34ff).into()), @@ -41,6 +59,7 @@ pub fn sandcastle() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xfdf4c14d).into()), scrollbar_thumb_hover_background: Some(rgba(0xfdf4c14d).into()), scrollbar_thumb_border: Some(rgba(0x2a2f38ff).into()), + scrollbar_track_background: Some(rgba(0x282c34ff).into()), scrollbar_track_border: Some(rgba(0x2a2f38ff).into()), editor_foreground: Some(rgba(0xfdf4c1ff).into()), editor_background: Some(rgba(0x282c34ff).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index fd37545258ed7dcd718ab475ad357c94d0d9fdb0..49e26d2586a58390bc03b53308fb487bc1a81919 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -20,19 +20,37 @@ pub fn solarized() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xdcdacbff).into()), - border_variant: Some(rgba(0xf5eedbff).into()), + border: Some(rgba(0x9faaa8ff).into()), + border_variant: Some(rgba(0x9faaa8ff).into()), + border_focused: Some(rgba(0xbfd3efff).into()), + border_selected: Some(rgba(0xbfd3efff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0xb7bdb6ff).into()), elevated_surface_background: Some(rgba(0xf3eddaff).into()), + surface_background: Some(rgba(0xf3eddaff).into()), background: Some(rgba(0xcfd0c4ff).into()), panel_background: Some(rgba(0xf3eddaff).into()), + element_background: Some(rgba(0xf3eddaff).into()), element_hover: Some(rgba(0x9faaa880).into()), + element_active: Some(rgba(0xa2aca9ff).into()), element_selected: Some(rgba(0x7f919480).into()), + element_disabled: Some(rgba(0xf3eddaff).into()), drop_target_background: Some(rgba(0x34555e80).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x9faaa880).into()), + ghost_element_active: Some(rgba(0xa2aca9ff).into()), + ghost_element_selected: Some(rgba(0x7f919480).into()), + ghost_element_disabled: Some(rgba(0xf3eddaff).into()), text: Some(rgba(0x002b36ff).into()), text_muted: Some(rgba(0x34555eff).into()), text_placeholder: Some(rgba(0x788b8fff).into()), text_disabled: Some(rgba(0x002b36ff).into()), text_accent: Some(rgba(0x298bd1ff).into()), + icon: Some(rgba(0x002b36ff).into()), + icon_muted: Some(rgba(0x34555eff).into()), + icon_disabled: Some(rgba(0x6a7f86ff).into()), + icon_placeholder: Some(rgba(0x34555eff).into()), + icon_accent: Some(rgba(0x298bd1ff).into()), status_bar_background: Some(rgba(0xcfd0c4ff).into()), title_bar_background: Some(rgba(0xcfd0c4ff).into()), toolbar_background: Some(rgba(0xfdf6e3ff).into()), @@ -42,6 +60,7 @@ pub fn solarized() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x002b364d).into()), scrollbar_thumb_hover_background: Some(rgba(0x002b364d).into()), scrollbar_thumb_border: Some(rgba(0xf5eedbff).into()), + scrollbar_track_background: Some(rgba(0xfdf6e3ff).into()), scrollbar_track_border: Some(rgba(0xf5eedbff).into()), editor_foreground: Some(rgba(0x002b36ff).into()), editor_background: Some(rgba(0xfdf6e3ff).into()), @@ -404,19 +423,37 @@ pub fn solarized() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x063541ff).into()), - border_variant: Some(rgba(0x032f3bff).into()), + border: Some(rgba(0x2b4f58ff).into()), + border_variant: Some(rgba(0x2b4f58ff).into()), + border_focused: Some(rgba(0x1c3249ff).into()), + border_selected: Some(rgba(0x1c3249ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x19424dff).into()), elevated_surface_background: Some(rgba(0x04313cff).into()), + surface_background: Some(rgba(0x04313cff).into()), background: Some(rgba(0x083743ff).into()), panel_background: Some(rgba(0x04313cff).into()), + element_background: Some(rgba(0x04313cff).into()), element_hover: Some(rgba(0x2b4f5880).into()), + element_active: Some(rgba(0x294e58ff).into()), element_selected: Some(rgba(0x566d7480).into()), + element_disabled: Some(rgba(0x04313cff).into()), drop_target_background: Some(rgba(0x93a1a180).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x2b4f5880).into()), + ghost_element_active: Some(rgba(0x294e58ff).into()), + ghost_element_selected: Some(rgba(0x566d7480).into()), + ghost_element_disabled: Some(rgba(0x04313cff).into()), text: Some(rgba(0xfdf6e3ff).into()), text_muted: Some(rgba(0x93a1a1ff).into()), text_placeholder: Some(rgba(0x5f757dff).into()), text_disabled: Some(rgba(0xfdf6e3ff).into()), text_accent: Some(rgba(0x288bd1ff).into()), + icon: Some(rgba(0xfdf6e3ff).into()), + icon_muted: Some(rgba(0x93a1a1ff).into()), + icon_disabled: Some(rgba(0x6f8389ff).into()), + icon_placeholder: Some(rgba(0x93a1a1ff).into()), + icon_accent: Some(rgba(0x288bd1ff).into()), status_bar_background: Some(rgba(0x083743ff).into()), title_bar_background: Some(rgba(0x083743ff).into()), toolbar_background: Some(rgba(0x002b36ff).into()), @@ -426,6 +463,7 @@ pub fn solarized() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xfdf6e34d).into()), scrollbar_thumb_hover_background: Some(rgba(0xfdf6e34d).into()), scrollbar_thumb_border: Some(rgba(0x032f3bff).into()), + scrollbar_track_background: Some(rgba(0x002b36ff).into()), scrollbar_track_border: Some(rgba(0x032f3bff).into()), editor_foreground: Some(rgba(0xfdf6e3ff).into()), editor_background: Some(rgba(0x002b36ff).into()), diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs index 72cf24fa4769ac8851f11c4fadb277372f690e2a..1dd42803a349f6084ab5ce759f29ccc15554d5ae 100644 --- a/crates/theme2/src/themes/summercamp.rs +++ b/crates/theme2/src/themes/summercamp.rs @@ -19,19 +19,37 @@ pub fn summercamp() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x29251bff).into()), - border_variant: Some(rgba(0x221e15ff).into()), + border: Some(rgba(0x312d21ff).into()), + border_variant: Some(rgba(0x312d21ff).into()), + border_focused: Some(rgba(0x193761ff).into()), + border_selected: Some(rgba(0x193761ff).into()), + border_transparent: Some(rgba(0x00000000).into()), + border_disabled: Some(rgba(0x2e2a1fff).into()), elevated_surface_background: Some(rgba(0x231f16ff).into()), + surface_background: Some(rgba(0x231f16ff).into()), background: Some(rgba(0x2a261cff).into()), panel_background: Some(rgba(0x231f16ff).into()), + element_background: Some(rgba(0x231f16ff).into()), element_hover: Some(rgba(0x312d2180).into()), + element_active: Some(rgba(0x302c20ff).into()), element_selected: Some(rgba(0x39342780).into()), + element_disabled: Some(rgba(0x231f16ff).into()), drop_target_background: Some(rgba(0x736e5580).into()), + ghost_element_background: Some(rgba(0x00000000).into()), + ghost_element_hover: Some(rgba(0x312d2180).into()), + ghost_element_active: Some(rgba(0x302c20ff).into()), + ghost_element_selected: Some(rgba(0x39342780).into()), + ghost_element_disabled: Some(rgba(0x231f16ff).into()), text: Some(rgba(0xf8f5deff).into()), text_muted: Some(rgba(0x736e55ff).into()), text_placeholder: Some(rgba(0x3d382aff).into()), text_disabled: Some(rgba(0xf8f5deff).into()), text_accent: Some(rgba(0x499befff).into()), + icon: Some(rgba(0xf8f5deff).into()), + icon_muted: Some(rgba(0x736e55ff).into()), + icon_disabled: Some(rgba(0x4c4735ff).into()), + icon_placeholder: Some(rgba(0x736e55ff).into()), + icon_accent: Some(rgba(0x499befff).into()), status_bar_background: Some(rgba(0x2a261cff).into()), title_bar_background: Some(rgba(0x2a261cff).into()), toolbar_background: Some(rgba(0x1c1810ff).into()), @@ -41,6 +59,7 @@ pub fn summercamp() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xf8f5de4d).into()), scrollbar_thumb_hover_background: Some(rgba(0xf8f5de4d).into()), scrollbar_thumb_border: Some(rgba(0x221e15ff).into()), + scrollbar_track_background: Some(rgba(0x1c1810ff).into()), scrollbar_track_border: Some(rgba(0x221e15ff).into()), editor_foreground: Some(rgba(0xf8f5deff).into()), editor_background: Some(rgba(0x1c1810ff).into()), diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 6b9f22e99d4bb171436b3aed115e0e96b3366d8e..623ac8f5880d0271b5554bbbd5b4b1d4e2369582 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -1,5 +1,5 @@ -use anyhow::Result; -use gpui::{Hsla, Rgba}; +use anyhow::{Context, Result}; +use gpui::{serde_json, Hsla, Rgba}; use gpui1::color::Color as Zed1Color; use gpui1::fonts::HighlightStyle as Zed1HighlightStyle; use theme::{ @@ -7,7 +7,7 @@ use theme::{ UserFontStyle, UserFontWeight, UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeStylesRefinement, }; -use theme1::Theme as Zed1Theme; +use theme1::{ColorScheme, Theme as Zed1Theme}; fn zed1_color_to_hsla(color: Zed1Color) -> Hsla { let r = color.r as f32 / 255.; @@ -118,6 +118,13 @@ impl Zed1ThemeConverter { Some(zed1_color_to_hsla(color)) } + let base_theme: ColorScheme = serde_json::from_value(self.theme.base_theme.clone()) + .with_context(|| "failed to parse `theme.base_theme`")?; + + let lowest = &base_theme.lowest; + let middle = &base_theme.middle; + let highest = &base_theme.highest; + let picker = &self.theme.picker; let title_bar = &self.theme.titlebar; let status_bar = &self.theme.workspace.status_bar; @@ -131,57 +138,93 @@ impl Zed1ThemeConverter { let terminal = &self.theme.terminal; Ok(ThemeColorsRefinement { - border: convert(active_tab.container.border.color), - border_variant: convert(toolbar.container.border.color), - background: convert(self.theme.workspace.background), + border: convert(lowest.base.default.border), + border_variant: convert(lowest.variant.default.border), + border_focused: convert(lowest.accent.hovered.border), + border_selected: convert(lowest.accent.default.border), + border_transparent: Some(gpui::transparent_black()), + border_disabled: convert(lowest.base.disabled.border), elevated_surface_background: editor .hover_popover .container .background_color .map(zed1_color_to_hsla), - title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla), - status_bar_background: status_bar + surface_background: convert(middle.base.default.background), + background: convert(self.theme.workspace.background), + element_background: convert(lowest.on.default.background), + element_hover: picker + .item + .hovered + .as_ref() + .and_then(|hovered| hovered.container.background_color) + .map(zed1_color_to_hsla), + element_active: convert(lowest.on.active.background), + element_selected: picker + .item + .active_state() .container .background_color - .map(zed1_color_to_hsla) - .or_else(|| title_bar.container.background_color.map(zed1_color_to_hsla)), - panel_background: project_panel + .map(zed1_color_to_hsla), + element_disabled: convert(lowest.on.disabled.background), + drop_target_background: convert(self.theme.workspace.drop_target_overlay_color), + ghost_element_background: Some(gpui::transparent_black()), + ghost_element_hover: picker + .item + .hovered + .as_ref() + .and_then(|hovered| hovered.container.background_color) + .map(zed1_color_to_hsla), + ghost_element_active: convert(lowest.on.active.background), + ghost_element_selected: picker + .item + .active_state() .container .background_color .map(zed1_color_to_hsla), + 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(self.theme.collab_panel.channel_name.text.color), text_muted: convert(tab_bar.pane_button.default_style().color), - text_accent: convert(status_bar.panel_buttons.button.active_state().icon_color), - text_disabled: convert(status_bar.panel_buttons.button.disabled_style().icon_color), text_placeholder: picker .empty_input_editor .placeholder_text .as_ref() .map(|placeholder_text| placeholder_text.color) .map(zed1_color_to_hsla), - element_hover: picker - .item - .hovered - .as_ref() - .and_then(|hovered| hovered.container.background_color) - .map(zed1_color_to_hsla), - element_selected: picker - .item - .active_state() + text_disabled: convert(status_bar.panel_buttons.button.disabled_style().icon_color), + text_accent: convert(status_bar.panel_buttons.button.active_state().icon_color), + status_bar_background: status_bar .container .background_color - .map(zed1_color_to_hsla), + .map(zed1_color_to_hsla) + .or_else(|| title_bar.container.background_color.map(zed1_color_to_hsla)), + title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla), + toolbar_background: toolbar.container.background_color.map(zed1_color_to_hsla), tab_bar_background: tab_bar.container.background_color.map(zed1_color_to_hsla), + tab_inactive_background: inactive_tab + .container + .background_color + .map(zed1_color_to_hsla), tab_active_background: active_tab .container .background_color .map(zed1_color_to_hsla), - tab_inactive_background: inactive_tab + panel_background: project_panel .container .background_color .map(zed1_color_to_hsla), - drop_target_background: convert(self.theme.workspace.drop_target_overlay_color), - toolbar_background: toolbar.container.background_color.map(zed1_color_to_hsla), + scrollbar_thumb_background: scrollbar.thumb.background_color.map(zed1_color_to_hsla), + scrollbar_thumb_hover_background: scrollbar + .thumb + .background_color + .map(zed1_color_to_hsla), + scrollbar_thumb_border: convert(scrollbar.thumb.border.color), + scrollbar_track_background: convert(highest.base.default.background), + scrollbar_track_border: convert(scrollbar.track.border.color), editor_foreground: convert(editor.text_color), editor_background: convert(editor.background), editor_gutter_background: convert(editor.gutter_background), @@ -189,14 +232,6 @@ impl Zed1ThemeConverter { editor_active_line_number: convert(editor.line_number_active), editor_wrap_guide: convert(editor.wrap_guide), editor_active_wrap_guide: convert(editor.active_wrap_guide), - scrollbar_track_background: scrollbar.track.background_color.map(zed1_color_to_hsla), - scrollbar_track_border: convert(scrollbar.track.border.color), - scrollbar_thumb_background: scrollbar.thumb.background_color.map(zed1_color_to_hsla), - scrollbar_thumb_border: convert(scrollbar.thumb.border.color), - scrollbar_thumb_hover_background: scrollbar - .thumb - .background_color - .map(zed1_color_to_hsla), terminal_background: convert(terminal.background), terminal_ansi_bright_black: convert(terminal.bright_black), terminal_ansi_bright_red: convert(terminal.bright_red), diff --git a/styles/src/style_tree/app.ts b/styles/src/style_tree/app.ts index aff934e9c6004eb7fa8cb8faf9438a066fe7292a..61125a15c0355e5f978f256b21f0e61996940dce 100644 --- a/styles/src/style_tree/app.ts +++ b/styles/src/style_tree/app.ts @@ -60,5 +60,6 @@ export default function app(): any { chat_panel: chat_panel(), notification_panel: notification_panel(), component_test: component_test(), + base_theme: theme, } } From 9c91b65ce223e8938881cd461f1b519db2799c60 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Tue, 2 Jan 2024 14:30:11 -0500 Subject: [PATCH 2/4] Use mostly base theme Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com> --- crates/theme2/src/themes/andromeda.rs | 18 +- crates/theme2/src/themes/atelier.rs | 360 ++++++++++---------- crates/theme2/src/themes/ayu.rs | 54 +-- crates/theme2/src/themes/gruvbox.rs | 108 +++--- crates/theme2/src/themes/one.rs | 36 +- crates/theme2/src/themes/rose_pine.rs | 54 +-- crates/theme2/src/themes/sandcastle.rs | 18 +- crates/theme2/src/themes/solarized.rs | 36 +- crates/theme2/src/themes/summercamp.rs | 18 +- crates/theme_importer/src/zed1/converter.rs | 98 ++---- 10 files changed, 373 insertions(+), 427 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 7541784b0779aa3aebd892f1a05b0521d57cecc5..a0518aea83d80e926156149f29aff5c68963c88d 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -30,20 +30,20 @@ pub fn andromeda() -> UserThemeFamily { background: Some(rgba(0x262a33ff).into()), panel_background: Some(rgba(0x21242bff).into()), element_background: Some(rgba(0x21242bff).into()), - element_hover: Some(rgba(0x2b2f3980).into()), + element_hover: Some(rgba(0x252931ff).into()), element_active: Some(rgba(0x2a2f39ff).into()), - element_selected: Some(rgba(0x383b4580).into()), + element_selected: Some(rgba(0x2a2f39ff).into()), element_disabled: Some(rgba(0x21242bff).into()), drop_target_background: Some(rgba(0xaca8ae80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x2b2f3980).into()), + ghost_element_hover: Some(rgba(0x252931ff).into()), ghost_element_active: Some(rgba(0x2a2f39ff).into()), - ghost_element_selected: Some(rgba(0x383b4580).into()), + ghost_element_selected: Some(rgba(0x2a2f39ff).into()), ghost_element_disabled: Some(rgba(0x21242bff).into()), text: Some(rgba(0xf7f7f8ff).into()), text_muted: Some(rgba(0xaca8aeff).into()), - text_placeholder: Some(rgba(0x474a53ff).into()), - text_disabled: Some(rgba(0xf7f7f8ff).into()), + text_placeholder: Some(rgba(0x6b6b73ff).into()), + text_disabled: Some(rgba(0x6b6b73ff).into()), text_accent: Some(rgba(0x11a793ff).into()), icon: Some(rgba(0xf7f7f8ff).into()), icon_muted: Some(rgba(0xaca8aeff).into()), @@ -56,9 +56,9 @@ pub fn andromeda() -> UserThemeFamily { 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_thumb_background: Some(rgba(0x21242bff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x252931ff).into()), + scrollbar_thumb_border: Some(rgba(0x252931ff).into()), scrollbar_track_background: Some(rgba(0x1e2025ff).into()), scrollbar_track_border: Some(rgba(0x21232aff).into()), editor_foreground: Some(rgba(0xf7f7f8ff).into()), diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs index 7d2f855c5f29c155acbb5bb1f326ebec1e044323..e6464cc2c105350102cfe0218f537fe8846c1bd2 100644 --- a/crates/theme2/src/themes/atelier.rs +++ b/crates/theme2/src/themes/atelier.rs @@ -31,20 +31,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xc5c4b9ff).into()), panel_background: Some(rgba(0xebeae3ff).into()), element_background: Some(rgba(0xebeae3ff).into()), - element_hover: Some(rgba(0x96958580).into()), + element_hover: Some(rgba(0xd1d0c6ff).into()), element_active: Some(rgba(0x989788ff).into()), - element_selected: Some(rgba(0x8b8a7880).into()), + element_selected: Some(rgba(0x989788ff).into()), element_disabled: Some(rgba(0xebeae3ff).into()), drop_target_background: Some(rgba(0x61604f80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x96958580).into()), + ghost_element_hover: Some(rgba(0xd1d0c6ff).into()), ghost_element_active: Some(rgba(0x989788ff).into()), - ghost_element_selected: Some(rgba(0x8b8a7880).into()), + ghost_element_selected: Some(rgba(0x989788ff).into()), ghost_element_disabled: Some(rgba(0xebeae3ff).into()), text: Some(rgba(0x22221bff).into()), text_muted: Some(rgba(0x61604fff).into()), - text_placeholder: Some(rgba(0x878573ff).into()), - text_disabled: Some(rgba(0x22221bff).into()), + text_placeholder: Some(rgba(0x767463ff).into()), + text_disabled: Some(rgba(0x767463ff).into()), text_accent: Some(rgba(0x38a166ff).into()), icon: Some(rgba(0x22221bff).into()), icon_muted: Some(rgba(0x61604fff).into()), @@ -57,9 +57,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xebeae3ff).into()), tab_inactive_background: Some(rgba(0xebeae3ff).into()), tab_active_background: Some(rgba(0xf4f3ecff).into()), - scrollbar_thumb_background: Some(rgba(0x22221b4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x22221b4d).into()), - scrollbar_thumb_border: Some(rgba(0xedece5ff).into()), + scrollbar_thumb_background: Some(rgba(0xebeae3ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xd1d0c6ff).into()), + scrollbar_thumb_border: Some(rgba(0xd1d0c6ff).into()), scrollbar_track_background: Some(rgba(0xf4f3ecff).into()), scrollbar_track_border: Some(rgba(0xedece5ff).into()), editor_foreground: Some(rgba(0x302f27ff).into()), @@ -455,20 +455,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x443c39ff).into()), panel_background: Some(rgba(0x27211eff).into()), element_background: Some(rgba(0x27211eff).into()), - element_hover: Some(rgba(0x665f5c80).into()), + element_hover: Some(rgba(0x3b3431ff).into()), element_active: Some(rgba(0x645d5aff).into()), - element_selected: Some(rgba(0x71696680).into()), + element_selected: Some(rgba(0x645d5aff).into()), element_disabled: Some(rgba(0x27211eff).into()), drop_target_background: Some(rgba(0xa79f9d80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x665f5c80).into()), + ghost_element_hover: Some(rgba(0x3b3431ff).into()), ghost_element_active: Some(rgba(0x645d5aff).into()), - ghost_element_selected: Some(rgba(0x71696680).into()), + ghost_element_selected: Some(rgba(0x645d5aff).into()), ghost_element_disabled: Some(rgba(0x27211eff).into()), text: Some(rgba(0xf1efeeff).into()), text_muted: Some(rgba(0xa79f9dff).into()), - text_placeholder: Some(rgba(0x766e6bff).into()), - text_disabled: Some(rgba(0xf1efeeff).into()), + text_placeholder: Some(rgba(0x8e8683ff).into()), + text_disabled: Some(rgba(0x8e8683ff).into()), text_accent: Some(rgba(0x417ee6ff).into()), icon: Some(rgba(0xf1efeeff).into()), icon_muted: Some(rgba(0xa79f9dff).into()), @@ -481,9 +481,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x27211eff).into()), tab_inactive_background: Some(rgba(0x27211eff).into()), tab_active_background: Some(rgba(0x1b1918ff).into()), - scrollbar_thumb_background: Some(rgba(0xf1efee4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xf1efee4d).into()), - scrollbar_thumb_border: Some(rgba(0x251f1dff).into()), + scrollbar_thumb_background: Some(rgba(0x27211eff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x3b3431ff).into()), + scrollbar_thumb_border: Some(rgba(0x3b3431ff).into()), scrollbar_track_background: Some(rgba(0x1b1918ff).into()), scrollbar_track_border: Some(rgba(0x251f1dff).into()), editor_foreground: Some(rgba(0xe6e2e0ff).into()), @@ -879,20 +879,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xbcc5bfff).into()), panel_background: Some(rgba(0xe3ebe6ff).into()), element_background: Some(rgba(0xe3ebe6ff).into()), - element_hover: Some(rgba(0x8b968e80).into()), + element_hover: Some(rgba(0xc8d1cbff).into()), element_active: Some(rgba(0x8d9890ff).into()), - element_selected: Some(rgba(0x7e8b8280).into()), + element_selected: Some(rgba(0x8d9890ff).into()), element_disabled: Some(rgba(0xe3ebe6ff).into()), drop_target_background: Some(rgba(0x54625980).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x8b968e80).into()), + ghost_element_hover: Some(rgba(0xc8d1cbff).into()), ghost_element_active: Some(rgba(0x8d9890ff).into()), - ghost_element_selected: Some(rgba(0x7e8b8280).into()), + ghost_element_selected: Some(rgba(0x8d9890ff).into()), ghost_element_disabled: Some(rgba(0xe3ebe6ff).into()), text: Some(rgba(0x171c19ff).into()), text_muted: Some(rgba(0x546259ff).into()), - text_placeholder: Some(rgba(0x79877dff).into()), - text_disabled: Some(rgba(0x171c19ff).into()), + text_placeholder: Some(rgba(0x68766dff).into()), + text_disabled: Some(rgba(0x68766dff).into()), text_accent: Some(rgba(0x488c90ff).into()), icon: Some(rgba(0x171c19ff).into()), icon_muted: Some(rgba(0x546259ff).into()), @@ -905,9 +905,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xe3ebe6ff).into()), tab_inactive_background: Some(rgba(0xe3ebe6ff).into()), tab_active_background: Some(rgba(0xecf4eeff).into()), - scrollbar_thumb_background: Some(rgba(0x171c194d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x171c194d).into()), - scrollbar_thumb_border: Some(rgba(0xe5ede7ff).into()), + scrollbar_thumb_background: Some(rgba(0xe3ebe6ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xc8d1cbff).into()), + scrollbar_thumb_border: Some(rgba(0xc8d1cbff).into()), scrollbar_track_background: Some(rgba(0xecf4eeff).into()), scrollbar_track_border: Some(rgba(0xe5ede7ff).into()), editor_foreground: Some(rgba(0x232a25ff).into()), @@ -1303,20 +1303,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x3a353fff).into()), panel_background: Some(rgba(0x221f26ff).into()), element_background: Some(rgba(0x221f26ff).into()), - element_hover: Some(rgba(0x56505e80).into()), + element_hover: Some(rgba(0x332f38ff).into()), element_active: Some(rgba(0x544f5cff).into()), - element_selected: Some(rgba(0x605a6880).into()), + element_selected: Some(rgba(0x544f5cff).into()), element_disabled: Some(rgba(0x221f26ff).into()), drop_target_background: Some(rgba(0x89859180).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x56505e80).into()), + ghost_element_hover: Some(rgba(0x332f38ff).into()), ghost_element_active: Some(rgba(0x544f5cff).into()), - ghost_element_selected: Some(rgba(0x605a6880).into()), + ghost_element_selected: Some(rgba(0x544f5cff).into()), ghost_element_disabled: Some(rgba(0x221f26ff).into()), text: Some(rgba(0xefecf4ff).into()), text_muted: Some(rgba(0x898591ff).into()), - text_placeholder: Some(rgba(0x655f6dff).into()), - text_disabled: Some(rgba(0xefecf4ff).into()), + text_placeholder: Some(rgba(0x756f7eff).into()), + text_disabled: Some(rgba(0x756f7eff).into()), text_accent: Some(rgba(0x576ddaff).into()), icon: Some(rgba(0xefecf4ff).into()), icon_muted: Some(rgba(0x898591ff).into()), @@ -1329,9 +1329,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x221f26ff).into()), tab_inactive_background: Some(rgba(0x221f26ff).into()), tab_active_background: Some(rgba(0x19171cff).into()), - scrollbar_thumb_background: Some(rgba(0xefecf44d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xefecf44d).into()), - scrollbar_thumb_border: Some(rgba(0x201e24ff).into()), + scrollbar_thumb_background: Some(rgba(0x221f26ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x332f38ff).into()), + scrollbar_thumb_border: Some(rgba(0x332f38ff).into()), scrollbar_track_background: Some(rgba(0x19171cff).into()), scrollbar_track_border: Some(rgba(0x201e24ff).into()), editor_foreground: Some(rgba(0xe2dfe7ff).into()), @@ -1727,20 +1727,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x424136ff).into()), panel_background: Some(rgba(0x2c2b23ff).into()), element_background: Some(rgba(0x2c2b23ff).into()), - element_hover: Some(rgba(0x5d5c4c80).into()), + element_hover: Some(rgba(0x3c3b31ff).into()), element_active: Some(rgba(0x5c5b4bff).into()), - element_selected: Some(rgba(0x67665580).into()), + element_selected: Some(rgba(0x5c5b4bff).into()), element_disabled: Some(rgba(0x2c2b23ff).into()), drop_target_background: Some(rgba(0x91907f80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x5d5c4c80).into()), + ghost_element_hover: Some(rgba(0x3c3b31ff).into()), ghost_element_active: Some(rgba(0x5c5b4bff).into()), - ghost_element_selected: Some(rgba(0x67665580).into()), + ghost_element_selected: Some(rgba(0x5c5b4bff).into()), ghost_element_disabled: Some(rgba(0x2c2b23ff).into()), text: Some(rgba(0xf4f3ecff).into()), text_muted: Some(rgba(0x91907fff).into()), - text_placeholder: Some(rgba(0x6c6b5aff).into()), - text_disabled: Some(rgba(0xf4f3ecff).into()), + text_placeholder: Some(rgba(0x7d7c6aff).into()), + text_disabled: Some(rgba(0x7d7c6aff).into()), text_accent: Some(rgba(0x37a166ff).into()), icon: Some(rgba(0xf4f3ecff).into()), icon_muted: Some(rgba(0x91907fff).into()), @@ -1753,9 +1753,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x2c2b23ff).into()), tab_inactive_background: Some(rgba(0x2c2b23ff).into()), tab_active_background: Some(rgba(0x22221bff).into()), - scrollbar_thumb_background: Some(rgba(0xf4f3ec4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xf4f3ec4d).into()), - scrollbar_thumb_border: Some(rgba(0x2a2922ff).into()), + scrollbar_thumb_background: Some(rgba(0x2c2b23ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x3c3b31ff).into()), + scrollbar_thumb_border: Some(rgba(0x3c3b31ff).into()), scrollbar_track_background: Some(rgba(0x22221bff).into()), scrollbar_track_border: Some(rgba(0x2a2922ff).into()), editor_foreground: Some(rgba(0xe7e6dfff).into()), @@ -2151,20 +2151,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x3e4769ff).into()), panel_background: Some(rgba(0x262f51ff).into()), element_background: Some(rgba(0x262f51ff).into()), - element_hover: Some(rgba(0x5c648580).into()), + element_hover: Some(rgba(0x363f62ff).into()), element_active: Some(rgba(0x5a6284ff).into()), - element_selected: Some(rgba(0x666e8f80).into()), + element_selected: Some(rgba(0x5a6284ff).into()), element_disabled: Some(rgba(0x262f51ff).into()), drop_target_background: Some(rgba(0x959bb280).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x5c648580).into()), + ghost_element_hover: Some(rgba(0x363f62ff).into()), ghost_element_active: Some(rgba(0x5a6284ff).into()), - ghost_element_selected: Some(rgba(0x666e8f80).into()), + ghost_element_selected: Some(rgba(0x5a6284ff).into()), ghost_element_disabled: Some(rgba(0x262f51ff).into()), text: Some(rgba(0xf5f7ffff).into()), text_muted: Some(rgba(0x959bb2ff).into()), - text_placeholder: Some(rgba(0x6b7394ff).into()), - text_disabled: Some(rgba(0xf5f7ffff).into()), + text_placeholder: Some(rgba(0x7e849eff).into()), + text_disabled: Some(rgba(0x7e849eff).into()), text_accent: Some(rgba(0x3e8fd0ff).into()), icon: Some(rgba(0xf5f7ffff).into()), icon_muted: Some(rgba(0x959bb2ff).into()), @@ -2177,9 +2177,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x262f51ff).into()), tab_inactive_background: Some(rgba(0x262f51ff).into()), tab_active_background: Some(rgba(0x202746ff).into()), - scrollbar_thumb_background: Some(rgba(0xf5f7ff4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xf5f7ff4d).into()), - scrollbar_thumb_border: Some(rgba(0x252d4fff).into()), + scrollbar_thumb_background: Some(rgba(0x262f51ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x363f62ff).into()), + scrollbar_thumb_border: Some(rgba(0x363f62ff).into()), scrollbar_track_background: Some(rgba(0x202746ff).into()), scrollbar_track_border: Some(rgba(0x252d4fff).into()), editor_foreground: Some(rgba(0xdfe2f1ff).into()), @@ -2575,20 +2575,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xc2c6d9ff).into()), panel_background: Some(rgba(0xe5e8f5ff).into()), element_background: Some(rgba(0xe5e8f5ff).into()), - element_hover: Some(rgba(0x9a9fb680).into()), + element_hover: Some(rgba(0xccd0e1ff).into()), element_active: Some(rgba(0x9ca1b8ff).into()), - element_selected: Some(rgba(0x8e94aa80).into()), + element_selected: Some(rgba(0x9ca1b8ff).into()), element_disabled: Some(rgba(0xe5e8f5ff).into()), drop_target_background: Some(rgba(0x60688980).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x9a9fb680).into()), + ghost_element_hover: Some(rgba(0xccd0e1ff).into()), ghost_element_active: Some(rgba(0x9ca1b8ff).into()), - ghost_element_selected: Some(rgba(0x8e94aa80).into()), + ghost_element_selected: Some(rgba(0x9ca1b8ff).into()), ghost_element_disabled: Some(rgba(0xe5e8f5ff).into()), text: Some(rgba(0x202746ff).into()), text_muted: Some(rgba(0x606889ff).into()), - text_placeholder: Some(rgba(0x898fa5ff).into()), - text_disabled: Some(rgba(0x202746ff).into()), + text_placeholder: Some(rgba(0x767d9aff).into()), + text_disabled: Some(rgba(0x767d9aff).into()), text_accent: Some(rgba(0x3f8fd0ff).into()), icon: Some(rgba(0x202746ff).into()), icon_muted: Some(rgba(0x606889ff).into()), @@ -2601,9 +2601,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xe5e8f5ff).into()), tab_inactive_background: Some(rgba(0xe5e8f5ff).into()), tab_active_background: Some(rgba(0xf5f7ffff).into()), - scrollbar_thumb_background: Some(rgba(0x2027464d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x2027464d).into()), - scrollbar_thumb_border: Some(rgba(0xe9ebf7ff).into()), + scrollbar_thumb_background: Some(rgba(0xe5e8f5ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xccd0e1ff).into()), + scrollbar_thumb_border: Some(rgba(0xccd0e1ff).into()), scrollbar_track_background: Some(rgba(0xf5f7ffff).into()), scrollbar_track_border: Some(rgba(0xe9ebf7ff).into()), editor_foreground: Some(rgba(0x293256ff).into()), @@ -2999,20 +2999,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x45433bff).into()), panel_background: Some(rgba(0x262622ff).into()), element_background: Some(rgba(0x262622ff).into()), - element_hover: Some(rgba(0x6c695c80).into()), + element_hover: Some(rgba(0x3b3933ff).into()), element_active: Some(rgba(0x6a675aff).into()), - element_selected: Some(rgba(0x77746480).into()), + element_selected: Some(rgba(0x6a675aff).into()), element_disabled: Some(rgba(0x262622ff).into()), drop_target_background: Some(rgba(0xa4a08b80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x6c695c80).into()), + ghost_element_hover: Some(rgba(0x3b3933ff).into()), ghost_element_active: Some(rgba(0x6a675aff).into()), - ghost_element_selected: Some(rgba(0x77746480).into()), + ghost_element_selected: Some(rgba(0x6a675aff).into()), ghost_element_disabled: Some(rgba(0x262622ff).into()), text: Some(rgba(0xfefbecff).into()), text_muted: Some(rgba(0xa4a08bff).into()), - text_placeholder: Some(rgba(0x7c7968ff).into()), - text_disabled: Some(rgba(0xfefbecff).into()), + text_placeholder: Some(rgba(0x8f8b77ff).into()), + text_disabled: Some(rgba(0x8f8b77ff).into()), text_accent: Some(rgba(0x6684e0ff).into()), icon: Some(rgba(0xfefbecff).into()), icon_muted: Some(rgba(0xa4a08bff).into()), @@ -3025,9 +3025,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x262622ff).into()), tab_inactive_background: Some(rgba(0x262622ff).into()), tab_active_background: Some(rgba(0x20201dff).into()), - scrollbar_thumb_background: Some(rgba(0xfefbec4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xfefbec4d).into()), - scrollbar_thumb_border: Some(rgba(0x252521ff).into()), + scrollbar_thumb_background: Some(rgba(0x262622ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x3b3933ff).into()), + scrollbar_thumb_border: Some(rgba(0x3b3933ff).into()), scrollbar_track_background: Some(rgba(0x20201dff).into()), scrollbar_track_border: Some(rgba(0x252521ff).into()), editor_foreground: Some(rgba(0xe8e4cfff).into()), @@ -3423,20 +3423,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x3b453bff).into()), panel_background: Some(rgba(0x1f231fff).into()), element_background: Some(rgba(0x1f231fff).into()), - element_hover: Some(rgba(0x5c6c5c80).into()), + element_hover: Some(rgba(0x333b33ff).into()), element_active: Some(rgba(0x5a6a5aff).into()), - element_selected: Some(rgba(0x64776480).into()), + element_selected: Some(rgba(0x5a6a5aff).into()), element_disabled: Some(rgba(0x1f231fff).into()), drop_target_background: Some(rgba(0x8ba48b80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x5c6c5c80).into()), + ghost_element_hover: Some(rgba(0x333b33ff).into()), ghost_element_active: Some(rgba(0x5a6a5aff).into()), - ghost_element_selected: Some(rgba(0x64776480).into()), + ghost_element_selected: Some(rgba(0x5a6a5aff).into()), ghost_element_disabled: Some(rgba(0x1f231fff).into()), text: Some(rgba(0xf4fbf4ff).into()), text_muted: Some(rgba(0x8ba48bff).into()), - text_placeholder: Some(rgba(0x687c68ff).into()), - text_disabled: Some(rgba(0xf4fbf4ff).into()), + text_placeholder: Some(rgba(0x778f77ff).into()), + text_disabled: Some(rgba(0x778f77ff).into()), text_accent: Some(rgba(0x3e62f4ff).into()), icon: Some(rgba(0xf4fbf4ff).into()), icon_muted: Some(rgba(0x8ba48bff).into()), @@ -3449,9 +3449,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x1f231fff).into()), tab_inactive_background: Some(rgba(0x1f231fff).into()), tab_active_background: Some(rgba(0x131513ff).into()), - scrollbar_thumb_background: Some(rgba(0xf4fbf44d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xf4fbf44d).into()), - scrollbar_thumb_border: Some(rgba(0x1d201dff).into()), + scrollbar_thumb_background: Some(rgba(0x1f231fff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x333b33ff).into()), + scrollbar_thumb_border: Some(rgba(0x333b33ff).into()), scrollbar_track_background: Some(rgba(0x131513ff).into()), scrollbar_track_border: Some(rgba(0x1d201dff).into()), editor_foreground: Some(rgba(0xcfe8cfff).into()), @@ -3847,20 +3847,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xbfbcc5ff).into()), panel_background: Some(rgba(0xe6e3ebff).into()), element_background: Some(rgba(0xe6e3ebff).into()), - element_hover: Some(rgba(0x8f8b9680).into()), + element_hover: Some(rgba(0xcbc8d1ff).into()), element_active: Some(rgba(0x918d98ff).into()), - element_selected: Some(rgba(0x837e8b80).into()), + element_selected: Some(rgba(0x918d98ff).into()), element_disabled: Some(rgba(0xe6e3ebff).into()), drop_target_background: Some(rgba(0x5a546280).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x8f8b9680).into()), + ghost_element_hover: Some(rgba(0xcbc8d1ff).into()), ghost_element_active: Some(rgba(0x918d98ff).into()), - ghost_element_selected: Some(rgba(0x837e8b80).into()), + ghost_element_selected: Some(rgba(0x918d98ff).into()), ghost_element_disabled: Some(rgba(0xe6e3ebff).into()), text: Some(rgba(0x19171cff).into()), text_muted: Some(rgba(0x5a5462ff).into()), - text_placeholder: Some(rgba(0x7e7987ff).into()), - text_disabled: Some(rgba(0x19171cff).into()), + text_placeholder: Some(rgba(0x6e6876ff).into()), + text_disabled: Some(rgba(0x6e6876ff).into()), text_accent: Some(rgba(0x586ddaff).into()), icon: Some(rgba(0x19171cff).into()), icon_muted: Some(rgba(0x5a5462ff).into()), @@ -3873,9 +3873,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xe6e3ebff).into()), tab_inactive_background: Some(rgba(0xe6e3ebff).into()), tab_active_background: Some(rgba(0xefecf4ff).into()), - scrollbar_thumb_background: Some(rgba(0x19171c4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x19171c4d).into()), - scrollbar_thumb_border: Some(rgba(0xe8e5edff).into()), + scrollbar_thumb_background: Some(rgba(0xe6e3ebff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xcbc8d1ff).into()), + scrollbar_thumb_border: Some(rgba(0xcbc8d1ff).into()), scrollbar_track_background: Some(rgba(0xefecf4ff).into()), scrollbar_track_border: Some(rgba(0xe8e5edff).into()), editor_foreground: Some(rgba(0x26232aff).into()), @@ -4271,20 +4271,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x3b3535ff).into()), panel_background: Some(rgba(0x252020ff).into()), element_background: Some(rgba(0x252020ff).into()), - element_hover: Some(rgba(0x564e4e80).into()), + element_hover: Some(rgba(0x352f2fff).into()), element_active: Some(rgba(0x554d4dff).into()), - element_selected: Some(rgba(0x60585880).into()), + element_selected: Some(rgba(0x554d4dff).into()), element_disabled: Some(rgba(0x252020ff).into()), drop_target_background: Some(rgba(0x89838380).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x564e4e80).into()), + ghost_element_hover: Some(rgba(0x352f2fff).into()), ghost_element_active: Some(rgba(0x554d4dff).into()), - ghost_element_selected: Some(rgba(0x60585880).into()), + ghost_element_selected: Some(rgba(0x554d4dff).into()), ghost_element_disabled: Some(rgba(0x252020ff).into()), text: Some(rgba(0xf4ececff).into()), text_muted: Some(rgba(0x898383ff).into()), - text_placeholder: Some(rgba(0x655d5dff).into()), - text_disabled: Some(rgba(0xf4ececff).into()), + text_placeholder: Some(rgba(0x756e6eff).into()), + text_disabled: Some(rgba(0x756e6eff).into()), text_accent: Some(rgba(0x7272caff).into()), icon: Some(rgba(0xf4ececff).into()), icon_muted: Some(rgba(0x898383ff).into()), @@ -4297,9 +4297,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x252020ff).into()), tab_inactive_background: Some(rgba(0x252020ff).into()), tab_active_background: Some(rgba(0x1b1818ff).into()), - scrollbar_thumb_background: Some(rgba(0xf4ecec4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xf4ecec4d).into()), - scrollbar_thumb_border: Some(rgba(0x231f1fff).into()), + scrollbar_thumb_background: Some(rgba(0x252020ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x352f2fff).into()), + scrollbar_thumb_border: Some(rgba(0x352f2fff).into()), scrollbar_track_background: Some(rgba(0x1b1818ff).into()), scrollbar_track_border: Some(rgba(0x231f1fff).into()), editor_foreground: Some(rgba(0xe7dfdfff).into()), @@ -4695,20 +4695,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x433a43ff).into()), panel_background: Some(rgba(0x252025ff).into()), element_background: Some(rgba(0x252025ff).into()), - element_hover: Some(rgba(0x675b6780).into()), + element_hover: Some(rgba(0x393239ff).into()), element_active: Some(rgba(0x655965ff).into()), - element_selected: Some(rgba(0x72647280).into()), + element_selected: Some(rgba(0x655965ff).into()), element_disabled: Some(rgba(0x252025ff).into()), drop_target_background: Some(rgba(0xa99aa980).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x675b6780).into()), + ghost_element_hover: Some(rgba(0x393239ff).into()), ghost_element_active: Some(rgba(0x655965ff).into()), - ghost_element_selected: Some(rgba(0x72647280).into()), + ghost_element_selected: Some(rgba(0x655965ff).into()), ghost_element_disabled: Some(rgba(0x252025ff).into()), text: Some(rgba(0xf7f3f7ff).into()), text_muted: Some(rgba(0xa99aa9ff).into()), - text_placeholder: Some(rgba(0x776977ff).into()), - text_disabled: Some(rgba(0xf7f3f7ff).into()), + text_placeholder: Some(rgba(0x908190ff).into()), + text_disabled: Some(rgba(0x908190ff).into()), text_accent: Some(rgba(0x526aebff).into()), icon: Some(rgba(0xf7f3f7ff).into()), icon_muted: Some(rgba(0xa99aa9ff).into()), @@ -4721,9 +4721,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x252025ff).into()), tab_inactive_background: Some(rgba(0x252025ff).into()), tab_active_background: Some(rgba(0x1b181bff).into()), - scrollbar_thumb_background: Some(rgba(0xf7f3f74d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xf7f3f74d).into()), - scrollbar_thumb_border: Some(rgba(0x231e23ff).into()), + scrollbar_thumb_background: Some(rgba(0x252025ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x393239ff).into()), + scrollbar_thumb_border: Some(rgba(0x393239ff).into()), scrollbar_track_background: Some(rgba(0x1b181bff).into()), scrollbar_track_border: Some(rgba(0x231e23ff).into()), editor_foreground: Some(rgba(0xd8cad8ff).into()), @@ -5119,20 +5119,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x33444dff).into()), panel_background: Some(rgba(0x1c2529ff).into()), element_background: Some(rgba(0x1c2529ff).into()), - element_hover: Some(rgba(0x4f6b7880).into()), + element_hover: Some(rgba(0x2c3b42ff).into()), element_active: Some(rgba(0x4d6976ff).into()), - element_selected: Some(rgba(0x57768580).into()), + element_selected: Some(rgba(0x4d6976ff).into()), element_disabled: Some(rgba(0x1c2529ff).into()), drop_target_background: Some(rgba(0x7ca0b380).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x4f6b7880).into()), + ghost_element_hover: Some(rgba(0x2c3b42ff).into()), ghost_element_active: Some(rgba(0x4d6976ff).into()), - ghost_element_selected: Some(rgba(0x57768580).into()), + ghost_element_selected: Some(rgba(0x4d6976ff).into()), ghost_element_disabled: Some(rgba(0x1c2529ff).into()), text: Some(rgba(0xebf8ffff).into()), text_muted: Some(rgba(0x7ca0b3ff).into()), - text_placeholder: Some(rgba(0x5a7b8bff).into()), - text_disabled: Some(rgba(0xebf8ffff).into()), + text_placeholder: Some(rgba(0x698c9eff).into()), + text_disabled: Some(rgba(0x698c9eff).into()), text_accent: Some(rgba(0x277fadff).into()), icon: Some(rgba(0xebf8ffff).into()), icon_muted: Some(rgba(0x7ca0b3ff).into()), @@ -5145,9 +5145,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x1c2529ff).into()), tab_inactive_background: Some(rgba(0x1c2529ff).into()), tab_active_background: Some(rgba(0x161b1dff).into()), - scrollbar_thumb_background: Some(rgba(0xebf8ff4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xebf8ff4d).into()), - scrollbar_thumb_border: Some(rgba(0x1b2327ff).into()), + scrollbar_thumb_background: Some(rgba(0x1c2529ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x2c3b42ff).into()), + scrollbar_thumb_border: Some(rgba(0x2c3b42ff).into()), scrollbar_track_background: Some(rgba(0x161b1dff).into()), scrollbar_track_border: Some(rgba(0x1b2327ff).into()), editor_foreground: Some(rgba(0xc1e4f6ff).into()), @@ -5543,20 +5543,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xcdc8c6ff).into()), panel_background: Some(rgba(0xe9e6e4ff).into()), element_background: Some(rgba(0xe9e6e4ff).into()), - element_hover: Some(rgba(0xaaa3a180).into()), + element_hover: Some(rgba(0xd6d1cfff).into()), element_active: Some(rgba(0xaca5a3ff).into()), - element_selected: Some(rgba(0xa1999680).into()), + element_selected: Some(rgba(0xaca5a3ff).into()), element_disabled: Some(rgba(0xe9e6e4ff).into()), drop_target_background: Some(rgba(0x6a636080).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xaaa3a180).into()), + ghost_element_hover: Some(rgba(0xd6d1cfff).into()), ghost_element_active: Some(rgba(0xaca5a3ff).into()), - ghost_element_selected: Some(rgba(0xa1999680).into()), + ghost_element_selected: Some(rgba(0xaca5a3ff).into()), ghost_element_disabled: Some(rgba(0xe9e6e4ff).into()), text: Some(rgba(0x1b1918ff).into()), text_muted: Some(rgba(0x6a6360ff).into()), - text_placeholder: Some(rgba(0x9c9491ff).into()), - text_disabled: Some(rgba(0x1b1918ff).into()), + text_placeholder: Some(rgba(0x847c79ff).into()), + text_disabled: Some(rgba(0x847c79ff).into()), text_accent: Some(rgba(0x417ee6ff).into()), icon: Some(rgba(0x1b1918ff).into()), icon_muted: Some(rgba(0x6a6360ff).into()), @@ -5569,9 +5569,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xe9e6e4ff).into()), tab_inactive_background: Some(rgba(0xe9e6e4ff).into()), tab_active_background: Some(rgba(0xf1efeeff).into()), - scrollbar_thumb_background: Some(rgba(0x1b19184d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x1b19184d).into()), - scrollbar_thumb_border: Some(rgba(0xebe8e6ff).into()), + scrollbar_thumb_background: Some(rgba(0xe9e6e4ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xd6d1cfff).into()), + scrollbar_thumb_border: Some(rgba(0xd6d1cfff).into()), scrollbar_track_background: Some(rgba(0xf1efeeff).into()), scrollbar_track_border: Some(rgba(0xebe8e6ff).into()), editor_foreground: Some(rgba(0x2c2421ff).into()), @@ -5967,20 +5967,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xcecab4ff).into()), panel_background: Some(rgba(0xeeebd7ff).into()), element_background: Some(rgba(0xeeebd7ff).into()), - element_hover: Some(rgba(0xa8a48e80).into()), + element_hover: Some(rgba(0xd7d3beff).into()), element_active: Some(rgba(0xaaa690ff).into()), - element_selected: Some(rgba(0x9e9a8580).into()), + element_selected: Some(rgba(0xaaa690ff).into()), element_disabled: Some(rgba(0xeeebd7ff).into()), drop_target_background: Some(rgba(0x706d5f80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xa8a48e80).into()), + ghost_element_hover: Some(rgba(0xd7d3beff).into()), ghost_element_active: Some(rgba(0xaaa690ff).into()), - ghost_element_selected: Some(rgba(0x9e9a8580).into()), + ghost_element_selected: Some(rgba(0xaaa690ff).into()), ghost_element_disabled: Some(rgba(0xeeebd7ff).into()), text: Some(rgba(0x20201dff).into()), text_muted: Some(rgba(0x706d5fff).into()), - text_placeholder: Some(rgba(0x999580ff).into()), - text_disabled: Some(rgba(0x20201dff).into()), + text_placeholder: Some(rgba(0x878471ff).into()), + text_disabled: Some(rgba(0x878471ff).into()), text_accent: Some(rgba(0x6784e0ff).into()), icon: Some(rgba(0x20201dff).into()), icon_muted: Some(rgba(0x706d5fff).into()), @@ -5993,9 +5993,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xeeebd7ff).into()), tab_inactive_background: Some(rgba(0xeeebd7ff).into()), tab_active_background: Some(rgba(0xfefbecff).into()), - scrollbar_thumb_background: Some(rgba(0x20201d4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x20201d4d).into()), - scrollbar_thumb_border: Some(rgba(0xf2eedcff).into()), + scrollbar_thumb_background: Some(rgba(0xeeebd7ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xd7d3beff).into()), + scrollbar_thumb_border: Some(rgba(0xd7d3beff).into()), scrollbar_track_background: Some(rgba(0xfefbecff).into()), scrollbar_track_border: Some(rgba(0xf2eedcff).into()), editor_foreground: Some(rgba(0x292824ff).into()), @@ -6391,20 +6391,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xc1bbbbff).into()), panel_background: Some(rgba(0xebe3e3ff).into()), element_background: Some(rgba(0xebe3e3ff).into()), - element_hover: Some(rgba(0x8e898980).into()), + element_hover: Some(rgba(0xcfc7c7ff).into()), element_active: Some(rgba(0x908b8bff).into()), - element_selected: Some(rgba(0x837c7c80).into()), + element_selected: Some(rgba(0x908b8bff).into()), element_disabled: Some(rgba(0xebe3e3ff).into()), drop_target_background: Some(rgba(0x5a525280).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x8e898980).into()), + ghost_element_hover: Some(rgba(0xcfc7c7ff).into()), ghost_element_active: Some(rgba(0x908b8bff).into()), - ghost_element_selected: Some(rgba(0x837c7c80).into()), + ghost_element_selected: Some(rgba(0x908b8bff).into()), ghost_element_disabled: Some(rgba(0xebe3e3ff).into()), text: Some(rgba(0x1b1818ff).into()), text_muted: Some(rgba(0x5a5252ff).into()), - text_placeholder: Some(rgba(0x7e7777ff).into()), - text_disabled: Some(rgba(0x1b1818ff).into()), + text_placeholder: Some(rgba(0x6e6666ff).into()), + text_disabled: Some(rgba(0x6e6666ff).into()), text_accent: Some(rgba(0x7372caff).into()), icon: Some(rgba(0x1b1818ff).into()), icon_muted: Some(rgba(0x5a5252ff).into()), @@ -6417,9 +6417,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xebe3e3ff).into()), tab_inactive_background: Some(rgba(0xebe3e3ff).into()), tab_active_background: Some(rgba(0xf4ececff).into()), - scrollbar_thumb_background: Some(rgba(0x1b18184d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x1b18184d).into()), - scrollbar_thumb_border: Some(rgba(0xede5e5ff).into()), + scrollbar_thumb_background: Some(rgba(0xebe3e3ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xcfc7c7ff).into()), + scrollbar_thumb_border: Some(rgba(0xcfc7c7ff).into()), scrollbar_track_background: Some(rgba(0xf4ececff).into()), scrollbar_track_border: Some(rgba(0xede5e5ff).into()), editor_foreground: Some(rgba(0x292424ff).into()), @@ -6815,20 +6815,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xb4ceb4ff).into()), panel_background: Some(rgba(0xdaeedaff).into()), element_background: Some(rgba(0xdaeedaff).into()), - element_hover: Some(rgba(0x8ea88e80).into()), + element_hover: Some(rgba(0xbed7beff).into()), element_active: Some(rgba(0x90aa90ff).into()), - element_selected: Some(rgba(0x859e8580).into()), + element_selected: Some(rgba(0x90aa90ff).into()), element_disabled: Some(rgba(0xdaeedaff).into()), drop_target_background: Some(rgba(0x5f705f80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x8ea88e80).into()), + ghost_element_hover: Some(rgba(0xbed7beff).into()), ghost_element_active: Some(rgba(0x90aa90ff).into()), - ghost_element_selected: Some(rgba(0x859e8580).into()), + ghost_element_selected: Some(rgba(0x90aa90ff).into()), ghost_element_disabled: Some(rgba(0xdaeedaff).into()), text: Some(rgba(0x131513ff).into()), text_muted: Some(rgba(0x5f705fff).into()), - text_placeholder: Some(rgba(0x809980ff).into()), - text_disabled: Some(rgba(0x131513ff).into()), + text_placeholder: Some(rgba(0x718771ff).into()), + text_disabled: Some(rgba(0x718771ff).into()), text_accent: Some(rgba(0x3f62f4ff).into()), icon: Some(rgba(0x131513ff).into()), icon_muted: Some(rgba(0x5f705fff).into()), @@ -6841,9 +6841,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xdaeedaff).into()), tab_inactive_background: Some(rgba(0xdaeedaff).into()), tab_active_background: Some(rgba(0xf4fbf4ff).into()), - scrollbar_thumb_background: Some(rgba(0x1315134d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x1315134d).into()), - scrollbar_thumb_border: Some(rgba(0xdff0dfff).into()), + scrollbar_thumb_background: Some(rgba(0xdaeedaff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xbed7beff).into()), + scrollbar_thumb_border: Some(rgba(0xbed7beff).into()), scrollbar_track_background: Some(rgba(0xf4fbf4ff).into()), scrollbar_track_border: Some(rgba(0xdff0dfff).into()), editor_foreground: Some(rgba(0x242924ff).into()), @@ -7239,20 +7239,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0x353f39ff).into()), panel_background: Some(rgba(0x1f2621ff).into()), element_background: Some(rgba(0x1f2621ff).into()), - element_hover: Some(rgba(0x505e5580).into()), + element_hover: Some(rgba(0x2f3832ff).into()), element_active: Some(rgba(0x4f5c53ff).into()), - element_selected: Some(rgba(0x5a685f80).into()), + element_selected: Some(rgba(0x4f5c53ff).into()), element_disabled: Some(rgba(0x1f2621ff).into()), drop_target_background: Some(rgba(0x85918880).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x505e5580).into()), + ghost_element_hover: Some(rgba(0x2f3832ff).into()), ghost_element_active: Some(rgba(0x4f5c53ff).into()), - ghost_element_selected: Some(rgba(0x5a685f80).into()), + ghost_element_selected: Some(rgba(0x4f5c53ff).into()), ghost_element_disabled: Some(rgba(0x1f2621ff).into()), text: Some(rgba(0xecf4eeff).into()), text_muted: Some(rgba(0x859188ff).into()), - text_placeholder: Some(rgba(0x5f6d64ff).into()), - text_disabled: Some(rgba(0xecf4eeff).into()), + text_placeholder: Some(rgba(0x6f7e74ff).into()), + text_disabled: Some(rgba(0x6f7e74ff).into()), text_accent: Some(rgba(0x478c90ff).into()), icon: Some(rgba(0xecf4eeff).into()), icon_muted: Some(rgba(0x859188ff).into()), @@ -7265,9 +7265,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0x1f2621ff).into()), tab_inactive_background: Some(rgba(0x1f2621ff).into()), tab_active_background: Some(rgba(0x171c19ff).into()), - scrollbar_thumb_background: Some(rgba(0xecf4ee4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xecf4ee4d).into()), - scrollbar_thumb_border: Some(rgba(0x1e2420ff).into()), + scrollbar_thumb_background: Some(rgba(0x1f2621ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x2f3832ff).into()), + scrollbar_thumb_border: Some(rgba(0x2f3832ff).into()), scrollbar_track_background: Some(rgba(0x171c19ff).into()), scrollbar_track_border: Some(rgba(0x1e2420ff).into()), editor_foreground: Some(rgba(0xdfe7e2ff).into()), @@ -7663,20 +7663,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xc6b8c6ff).into()), panel_background: Some(rgba(0xe1d6e1ff).into()), element_background: Some(rgba(0xe1d6e1ff).into()), - element_hover: Some(rgba(0xad9dad80).into()), + element_hover: Some(rgba(0xcdbecdff).into()), element_active: Some(rgba(0xae9eaeff).into()), - element_selected: Some(rgba(0xa394a380).into()), + element_selected: Some(rgba(0xae9eaeff).into()), element_disabled: Some(rgba(0xe1d6e1ff).into()), drop_target_background: Some(rgba(0x6b5e6b80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xad9dad80).into()), + ghost_element_hover: Some(rgba(0xcdbecdff).into()), ghost_element_active: Some(rgba(0xae9eaeff).into()), - ghost_element_selected: Some(rgba(0xa394a380).into()), + ghost_element_selected: Some(rgba(0xae9eaeff).into()), ghost_element_disabled: Some(rgba(0xe1d6e1ff).into()), text: Some(rgba(0x1b181bff).into()), text_muted: Some(rgba(0x6b5e6bff).into()), - text_placeholder: Some(rgba(0x9e8f9eff).into()), - text_disabled: Some(rgba(0x1b181bff).into()), + text_placeholder: Some(rgba(0x857785ff).into()), + text_disabled: Some(rgba(0x857785ff).into()), text_accent: Some(rgba(0x526aebff).into()), icon: Some(rgba(0x1b181bff).into()), icon_muted: Some(rgba(0x6b5e6bff).into()), @@ -7689,9 +7689,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xe1d6e1ff).into()), tab_inactive_background: Some(rgba(0xe1d6e1ff).into()), tab_active_background: Some(rgba(0xf7f3f7ff).into()), - scrollbar_thumb_background: Some(rgba(0x1b181b4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x1b181b4d).into()), - scrollbar_thumb_border: Some(rgba(0xe5dce5ff).into()), + scrollbar_thumb_background: Some(rgba(0xe1d6e1ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xcdbecdff).into()), + scrollbar_thumb_border: Some(rgba(0xcdbecdff).into()), scrollbar_track_background: Some(rgba(0xf7f3f7ff).into()), scrollbar_track_border: Some(rgba(0xe5dce5ff).into()), editor_foreground: Some(rgba(0x292329ff).into()), @@ -8087,20 +8087,20 @@ pub fn atelier() -> UserThemeFamily { background: Some(rgba(0xa6cadcff).into()), panel_background: Some(rgba(0xcdeaf9ff).into()), element_background: Some(rgba(0xcdeaf9ff).into()), - element_hover: Some(rgba(0x80a4b680).into()), + element_hover: Some(rgba(0xb0d3e5ff).into()), element_active: Some(rgba(0x82a6b8ff).into()), - element_selected: Some(rgba(0x769aad80).into()), + element_selected: Some(rgba(0x82a6b8ff).into()), element_disabled: Some(rgba(0xcdeaf9ff).into()), drop_target_background: Some(rgba(0x526f7d80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x80a4b680).into()), + ghost_element_hover: Some(rgba(0xb0d3e5ff).into()), ghost_element_active: Some(rgba(0x82a6b8ff).into()), - ghost_element_selected: Some(rgba(0x769aad80).into()), + ghost_element_selected: Some(rgba(0x82a6b8ff).into()), ghost_element_disabled: Some(rgba(0xcdeaf9ff).into()), text: Some(rgba(0x161b1dff).into()), text_muted: Some(rgba(0x526f7dff).into()), - text_placeholder: Some(rgba(0x7195a8ff).into()), - text_disabled: Some(rgba(0x161b1dff).into()), + text_placeholder: Some(rgba(0x628496ff).into()), + text_disabled: Some(rgba(0x628496ff).into()), text_accent: Some(rgba(0x277fadff).into()), icon: Some(rgba(0x161b1dff).into()), icon_muted: Some(rgba(0x526f7dff).into()), @@ -8113,9 +8113,9 @@ pub fn atelier() -> UserThemeFamily { tab_bar_background: Some(rgba(0xcdeaf9ff).into()), tab_inactive_background: Some(rgba(0xcdeaf9ff).into()), tab_active_background: Some(rgba(0xebf8ffff).into()), - scrollbar_thumb_background: Some(rgba(0x161b1d4d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x161b1d4d).into()), - scrollbar_thumb_border: Some(rgba(0xd3edfaff).into()), + scrollbar_thumb_background: Some(rgba(0xcdeaf9ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xb0d3e5ff).into()), + scrollbar_thumb_border: Some(rgba(0xb0d3e5ff).into()), scrollbar_track_background: Some(rgba(0xebf8ffff).into()), scrollbar_track_border: Some(rgba(0xd3edfaff).into()), editor_foreground: Some(rgba(0x1f292eff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index a51f5fca4718c5f1ef618302f9068105c6b48646..4b7fdf8b1999600df8a16c6e65039cc1f1b3b235 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -31,20 +31,20 @@ pub fn ayu() -> UserThemeFamily { background: Some(rgba(0x313337ff).into()), panel_background: Some(rgba(0x1f2127ff).into()), element_background: Some(rgba(0x1f2127ff).into()), - element_hover: Some(rgba(0x3f404380).into()), + element_hover: Some(rgba(0x2d2f34ff).into()), element_active: Some(rgba(0x3e4043ff).into()), - element_selected: Some(rgba(0x50515280).into()), + element_selected: Some(rgba(0x3e4043ff).into()), element_disabled: Some(rgba(0x1f2127ff).into()), drop_target_background: Some(rgba(0x8a898680).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x3f404380).into()), + ghost_element_hover: Some(rgba(0x2d2f34ff).into()), ghost_element_active: Some(rgba(0x3e4043ff).into()), - ghost_element_selected: Some(rgba(0x50515280).into()), + ghost_element_selected: Some(rgba(0x3e4043ff).into()), ghost_element_disabled: Some(rgba(0x1f2127ff).into()), text: Some(rgba(0xbfbdb6ff).into()), text_muted: Some(rgba(0x8a8986ff).into()), - text_placeholder: Some(rgba(0x58595aff).into()), - text_disabled: Some(rgba(0xbfbdb6ff).into()), + text_placeholder: Some(rgba(0x696a6aff).into()), + text_disabled: Some(rgba(0x696a6aff).into()), text_accent: Some(rgba(0x5ac2feff).into()), icon: Some(rgba(0xbfbdb6ff).into()), icon_muted: Some(rgba(0x8a8986ff).into()), @@ -57,9 +57,9 @@ pub fn ayu() -> UserThemeFamily { tab_bar_background: Some(rgba(0x1f2127ff).into()), tab_inactive_background: Some(rgba(0x1f2127ff).into()), tab_active_background: Some(rgba(0x0d1017ff).into()), - scrollbar_thumb_background: Some(rgba(0xbfbdb64d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xbfbdb64d).into()), - scrollbar_thumb_border: Some(rgba(0x1b1e24ff).into()), + scrollbar_thumb_background: Some(rgba(0x1f2127ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x2d2f34ff).into()), + scrollbar_thumb_border: Some(rgba(0x2d2f34ff).into()), scrollbar_track_background: Some(rgba(0x0d1017ff).into()), scrollbar_track_border: Some(rgba(0x1b1e24ff).into()), editor_foreground: Some(rgba(0xbfbdb6ff).into()), @@ -434,20 +434,20 @@ pub fn ayu() -> UserThemeFamily { background: Some(rgba(0xdcdddeff).into()), panel_background: Some(rgba(0xececedff).into()), element_background: Some(rgba(0xececedff).into()), - element_hover: Some(rgba(0xcfd1d280).into()), + element_hover: Some(rgba(0xdfe0e1ff).into()), element_active: Some(rgba(0xd0d1d3ff).into()), - element_selected: Some(rgba(0xc0c2c480).into()), + element_selected: Some(rgba(0xd0d1d3ff).into()), element_disabled: Some(rgba(0xececedff).into()), drop_target_background: Some(rgba(0x8c8f9380).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xcfd1d280).into()), + ghost_element_hover: Some(rgba(0xdfe0e1ff).into()), ghost_element_active: Some(rgba(0xd0d1d3ff).into()), - ghost_element_selected: Some(rgba(0xc0c2c480).into()), + ghost_element_selected: Some(rgba(0xd0d1d3ff).into()), ghost_element_disabled: Some(rgba(0xececedff).into()), text: Some(rgba(0x5c6166ff).into()), text_muted: Some(rgba(0x8c8f93ff).into()), - text_placeholder: Some(rgba(0xb9bbbdff).into()), - text_disabled: Some(rgba(0x5c6166ff).into()), + text_placeholder: Some(rgba(0xa9acaeff).into()), + text_disabled: Some(rgba(0xa9acaeff).into()), text_accent: Some(rgba(0x3b9ee5ff).into()), icon: Some(rgba(0x5c6166ff).into()), icon_muted: Some(rgba(0x8c8f93ff).into()), @@ -460,9 +460,9 @@ pub fn ayu() -> UserThemeFamily { tab_bar_background: Some(rgba(0xececedff).into()), tab_inactive_background: Some(rgba(0xececedff).into()), tab_active_background: Some(rgba(0xfcfcfcff).into()), - scrollbar_thumb_background: Some(rgba(0x5c61664d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x5c61664d).into()), - scrollbar_thumb_border: Some(rgba(0xefeff0ff).into()), + scrollbar_thumb_background: Some(rgba(0xececedff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xdfe0e1ff).into()), + scrollbar_thumb_border: Some(rgba(0xdfe0e1ff).into()), scrollbar_track_background: Some(rgba(0xfcfcfcff).into()), scrollbar_track_border: Some(rgba(0xefeff0ff).into()), editor_foreground: Some(rgba(0x5c6166ff).into()), @@ -837,20 +837,20 @@ pub fn ayu() -> UserThemeFamily { background: Some(rgba(0x464a52ff).into()), panel_background: Some(rgba(0x353944ff).into()), element_background: Some(rgba(0x353944ff).into()), - element_hover: Some(rgba(0x53565d80).into()), + element_hover: Some(rgba(0x43464fff).into()), element_active: Some(rgba(0x53565dff).into()), - element_selected: Some(rgba(0x63656a80).into()), + element_selected: Some(rgba(0x53565dff).into()), element_disabled: Some(rgba(0x353944ff).into()), drop_target_background: Some(rgba(0x9a9a9880).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x53565d80).into()), + ghost_element_hover: Some(rgba(0x43464fff).into()), ghost_element_active: Some(rgba(0x53565dff).into()), - ghost_element_selected: Some(rgba(0x63656a80).into()), + ghost_element_selected: Some(rgba(0x53565dff).into()), ghost_element_disabled: Some(rgba(0x353944ff).into()), text: Some(rgba(0xcccac2ff).into()), text_muted: Some(rgba(0x9a9a98ff).into()), - text_placeholder: Some(rgba(0x6b6d71ff).into()), - text_disabled: Some(rgba(0xcccac2ff).into()), + text_placeholder: Some(rgba(0x7b7d7fff).into()), + text_disabled: Some(rgba(0x7b7d7fff).into()), text_accent: Some(rgba(0x73cffeff).into()), icon: Some(rgba(0xcccac2ff).into()), icon_muted: Some(rgba(0x9a9a98ff).into()), @@ -863,9 +863,9 @@ pub fn ayu() -> UserThemeFamily { tab_bar_background: Some(rgba(0x353944ff).into()), tab_inactive_background: Some(rgba(0x353944ff).into()), tab_active_background: Some(rgba(0x242936ff).into()), - scrollbar_thumb_background: Some(rgba(0xcccac24d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xcccac24d).into()), - scrollbar_thumb_border: Some(rgba(0x323641ff).into()), + scrollbar_thumb_background: Some(rgba(0x353944ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x43464fff).into()), + scrollbar_thumb_border: Some(rgba(0x43464fff).into()), scrollbar_track_background: Some(rgba(0x242936ff).into()), scrollbar_track_border: Some(rgba(0x323641ff).into()), editor_foreground: Some(rgba(0xcccac2ff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index ce4b6126f337f091aee826548a93145ee5f2e740..2a9b171f41ff53c3d86df2480b7fddf7284cf176 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -31,20 +31,20 @@ pub fn gruvbox() -> UserThemeFamily { background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecddb5ff).into()), element_background: Some(rgba(0xecddb5ff).into()), - element_hover: Some(rgba(0xc9b99a80).into()), + element_hover: Some(rgba(0xddcca7ff).into()), element_active: Some(rgba(0xc9b99aff).into()), - element_selected: Some(rgba(0xb5a68e80).into()), + element_selected: Some(rgba(0xc9b99aff).into()), element_disabled: Some(rgba(0xecddb5ff).into()), drop_target_background: Some(rgba(0x5f565080).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xc9b99a80).into()), + ghost_element_hover: Some(rgba(0xddcca7ff).into()), ghost_element_active: Some(rgba(0xc9b99aff).into()), - ghost_element_selected: Some(rgba(0xb5a68e80).into()), + ghost_element_selected: Some(rgba(0xc9b99aff).into()), ghost_element_disabled: Some(rgba(0xecddb5ff).into()), text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0x5f5650ff).into()), - text_placeholder: Some(rgba(0xad9e87ff).into()), - text_disabled: Some(rgba(0x282828ff).into()), + text_placeholder: Some(rgba(0x8a7c6fff).into()), + text_disabled: Some(rgba(0x8a7c6fff).into()), text_accent: Some(rgba(0x0b6678ff).into()), icon: Some(rgba(0x282828ff).into()), icon_muted: Some(rgba(0x5f5650ff).into()), @@ -57,9 +57,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_bar_background: Some(rgba(0xecddb5ff).into()), tab_inactive_background: Some(rgba(0xecddb5ff).into()), tab_active_background: Some(rgba(0xf9f5d7ff).into()), - scrollbar_thumb_background: Some(rgba(0x2828284d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()), - scrollbar_thumb_border: Some(rgba(0xefe2bcff).into()), + scrollbar_thumb_background: Some(rgba(0xecddb5ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()), + scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()), scrollbar_track_background: Some(rgba(0xf9f5d7ff).into()), scrollbar_track_border: Some(rgba(0xefe2bcff).into()), editor_foreground: Some(rgba(0x282828ff).into()), @@ -441,20 +441,20 @@ pub fn gruvbox() -> UserThemeFamily { background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x3b3735ff).into()), element_background: Some(rgba(0x3b3735ff).into()), - element_hover: Some(rgba(0x5b534d80).into()), + element_hover: Some(rgba(0x494340ff).into()), element_active: Some(rgba(0x5b524cff).into()), - element_selected: Some(rgba(0x6e635a80).into()), + element_selected: Some(rgba(0x5b524cff).into()), element_disabled: Some(rgba(0x3b3735ff).into()), drop_target_background: Some(rgba(0xc5b59780).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x5b534d80).into()), + ghost_element_hover: Some(rgba(0x494340ff).into()), ghost_element_active: Some(rgba(0x5b524cff).into()), - ghost_element_selected: Some(rgba(0x6e635a80).into()), + ghost_element_selected: Some(rgba(0x5b524cff).into()), ghost_element_disabled: Some(rgba(0x3b3735ff).into()), text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0xc5b597ff).into()), - text_placeholder: Some(rgba(0x776b61ff).into()), - text_disabled: Some(rgba(0xfbf1c7ff).into()), + text_placeholder: Some(rgba(0x9a8c79ff).into()), + text_disabled: Some(rgba(0x9a8c79ff).into()), text_accent: Some(rgba(0x83a598ff).into()), icon: Some(rgba(0xfbf1c7ff).into()), icon_muted: Some(rgba(0xc5b597ff).into()), @@ -467,9 +467,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_bar_background: Some(rgba(0x3b3735ff).into()), tab_inactive_background: Some(rgba(0x3b3735ff).into()), tab_active_background: Some(rgba(0x32302fff).into()), - scrollbar_thumb_background: Some(rgba(0xfbf1c74d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xfbf1c74d).into()), - scrollbar_thumb_border: Some(rgba(0x393634ff).into()), + scrollbar_thumb_background: Some(rgba(0x3b3735ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()), + scrollbar_thumb_border: Some(rgba(0x494340ff).into()), scrollbar_track_background: Some(rgba(0x32302fff).into()), scrollbar_track_border: Some(rgba(0x393634ff).into()), editor_foreground: Some(rgba(0xebdbb2ff).into()), @@ -851,20 +851,20 @@ pub fn gruvbox() -> UserThemeFamily { background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecddb4ff).into()), element_background: Some(rgba(0xecddb4ff).into()), - element_hover: Some(rgba(0xc9b99a80).into()), + element_hover: Some(rgba(0xddcca7ff).into()), element_active: Some(rgba(0xc9b99aff).into()), - element_selected: Some(rgba(0xb5a68e80).into()), + element_selected: Some(rgba(0xc9b99aff).into()), element_disabled: Some(rgba(0xecddb4ff).into()), drop_target_background: Some(rgba(0x5f565080).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xc9b99a80).into()), + ghost_element_hover: Some(rgba(0xddcca7ff).into()), ghost_element_active: Some(rgba(0xc9b99aff).into()), - ghost_element_selected: Some(rgba(0xb5a68e80).into()), + ghost_element_selected: Some(rgba(0xc9b99aff).into()), ghost_element_disabled: Some(rgba(0xecddb4ff).into()), text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0x5f5650ff).into()), - text_placeholder: Some(rgba(0xad9e87ff).into()), - text_disabled: Some(rgba(0x282828ff).into()), + text_placeholder: Some(rgba(0x8a7c6fff).into()), + text_disabled: Some(rgba(0x8a7c6fff).into()), text_accent: Some(rgba(0x0b6678ff).into()), icon: Some(rgba(0x282828ff).into()), icon_muted: Some(rgba(0x5f5650ff).into()), @@ -877,9 +877,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_bar_background: Some(rgba(0xecddb4ff).into()), tab_inactive_background: Some(rgba(0xecddb4ff).into()), tab_active_background: Some(rgba(0xfbf1c7ff).into()), - scrollbar_thumb_background: Some(rgba(0x2828284d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()), - scrollbar_thumb_border: Some(rgba(0xefe1b8ff).into()), + scrollbar_thumb_background: Some(rgba(0xecddb4ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()), + scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()), scrollbar_track_background: Some(rgba(0xfbf1c7ff).into()), scrollbar_track_border: Some(rgba(0xefe1b8ff).into()), editor_foreground: Some(rgba(0x282828ff).into()), @@ -1261,20 +1261,20 @@ pub fn gruvbox() -> UserThemeFamily { background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x3a3735ff).into()), element_background: Some(rgba(0x3a3735ff).into()), - element_hover: Some(rgba(0x5b534d80).into()), + element_hover: Some(rgba(0x494340ff).into()), element_active: Some(rgba(0x5b524cff).into()), - element_selected: Some(rgba(0x6e635a80).into()), + element_selected: Some(rgba(0x5b524cff).into()), element_disabled: Some(rgba(0x3a3735ff).into()), drop_target_background: Some(rgba(0xc5b59780).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x5b534d80).into()), + ghost_element_hover: Some(rgba(0x494340ff).into()), ghost_element_active: Some(rgba(0x5b524cff).into()), - ghost_element_selected: Some(rgba(0x6e635a80).into()), + ghost_element_selected: Some(rgba(0x5b524cff).into()), ghost_element_disabled: Some(rgba(0x3a3735ff).into()), text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0xc5b597ff).into()), - text_placeholder: Some(rgba(0x776b61ff).into()), - text_disabled: Some(rgba(0xfbf1c7ff).into()), + text_placeholder: Some(rgba(0x9a8c79ff).into()), + text_disabled: Some(rgba(0x9a8c79ff).into()), text_accent: Some(rgba(0x83a598ff).into()), icon: Some(rgba(0xfbf1c7ff).into()), icon_muted: Some(rgba(0xc5b597ff).into()), @@ -1287,9 +1287,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_bar_background: Some(rgba(0x3a3735ff).into()), tab_inactive_background: Some(rgba(0x3a3735ff).into()), tab_active_background: Some(rgba(0x282828ff).into()), - scrollbar_thumb_background: Some(rgba(0xfbf1c74d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xfbf1c74d).into()), - scrollbar_thumb_border: Some(rgba(0x373432ff).into()), + scrollbar_thumb_background: Some(rgba(0x3a3735ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()), + scrollbar_thumb_border: Some(rgba(0x494340ff).into()), scrollbar_track_background: Some(rgba(0x282828ff).into()), scrollbar_track_border: Some(rgba(0x373432ff).into()), editor_foreground: Some(rgba(0xebdbb2ff).into()), @@ -1671,20 +1671,20 @@ pub fn gruvbox() -> UserThemeFamily { background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecdcb3ff).into()), element_background: Some(rgba(0xecdcb3ff).into()), - element_hover: Some(rgba(0xc9b99a80).into()), + element_hover: Some(rgba(0xddcca7ff).into()), element_active: Some(rgba(0xc9b99aff).into()), - element_selected: Some(rgba(0xb5a68e80).into()), + element_selected: Some(rgba(0xc9b99aff).into()), element_disabled: Some(rgba(0xecdcb3ff).into()), drop_target_background: Some(rgba(0x5f565080).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xc9b99a80).into()), + ghost_element_hover: Some(rgba(0xddcca7ff).into()), ghost_element_active: Some(rgba(0xc9b99aff).into()), - ghost_element_selected: Some(rgba(0xb5a68e80).into()), + ghost_element_selected: Some(rgba(0xc9b99aff).into()), ghost_element_disabled: Some(rgba(0xecdcb3ff).into()), text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0x5f5650ff).into()), - text_placeholder: Some(rgba(0xad9e87ff).into()), - text_disabled: Some(rgba(0x282828ff).into()), + text_placeholder: Some(rgba(0x8a7c6fff).into()), + text_disabled: Some(rgba(0x8a7c6fff).into()), text_accent: Some(rgba(0x0b6678ff).into()), icon: Some(rgba(0x282828ff).into()), icon_muted: Some(rgba(0x5f5650ff).into()), @@ -1697,9 +1697,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_bar_background: Some(rgba(0xecdcb3ff).into()), tab_inactive_background: Some(rgba(0xecdcb3ff).into()), tab_active_background: Some(rgba(0xf2e5bcff).into()), - scrollbar_thumb_background: Some(rgba(0x2828284d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()), - scrollbar_thumb_border: Some(rgba(0xeddeb5ff).into()), + scrollbar_thumb_background: Some(rgba(0xecdcb3ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()), + scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()), scrollbar_track_background: Some(rgba(0xf2e5bcff).into()), scrollbar_track_border: Some(rgba(0xeddeb5ff).into()), editor_foreground: Some(rgba(0x282828ff).into()), @@ -2081,20 +2081,20 @@ pub fn gruvbox() -> UserThemeFamily { background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x393634ff).into()), element_background: Some(rgba(0x393634ff).into()), - element_hover: Some(rgba(0x5b534d80).into()), + element_hover: Some(rgba(0x494340ff).into()), element_active: Some(rgba(0x5b524cff).into()), - element_selected: Some(rgba(0x6e635a80).into()), + element_selected: Some(rgba(0x5b524cff).into()), element_disabled: Some(rgba(0x393634ff).into()), drop_target_background: Some(rgba(0xc5b59780).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x5b534d80).into()), + ghost_element_hover: Some(rgba(0x494340ff).into()), ghost_element_active: Some(rgba(0x5b524cff).into()), - ghost_element_selected: Some(rgba(0x6e635a80).into()), + ghost_element_selected: Some(rgba(0x5b524cff).into()), ghost_element_disabled: Some(rgba(0x393634ff).into()), text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0xc5b597ff).into()), - text_placeholder: Some(rgba(0x776b61ff).into()), - text_disabled: Some(rgba(0xfbf1c7ff).into()), + text_placeholder: Some(rgba(0x9a8c79ff).into()), + text_disabled: Some(rgba(0x9a8c79ff).into()), text_accent: Some(rgba(0x83a598ff).into()), icon: Some(rgba(0xfbf1c7ff).into()), icon_muted: Some(rgba(0xc5b597ff).into()), @@ -2107,9 +2107,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_bar_background: Some(rgba(0x393634ff).into()), tab_inactive_background: Some(rgba(0x393634ff).into()), tab_active_background: Some(rgba(0x1d2021ff).into()), - scrollbar_thumb_background: Some(rgba(0xfbf1c74d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xfbf1c74d).into()), - scrollbar_thumb_border: Some(rgba(0x343130ff).into()), + scrollbar_thumb_background: Some(rgba(0x393634ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()), + scrollbar_thumb_border: Some(rgba(0x494340ff).into()), scrollbar_track_background: Some(rgba(0x1d2021ff).into()), scrollbar_track_border: Some(rgba(0x343130ff).into()), editor_foreground: Some(rgba(0xebdbb2ff).into()), diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs index d80b189579136b3dcc3dd3e783563c6afe2ee240..c2c061c8f57de58bc18ec6948537af48c78639a8 100644 --- a/crates/theme2/src/themes/one.rs +++ b/crates/theme2/src/themes/one.rs @@ -31,20 +31,20 @@ pub fn one() -> UserThemeFamily { background: Some(rgba(0xdcdcddff).into()), panel_background: Some(rgba(0xebebecff).into()), element_background: Some(rgba(0xebebecff).into()), - element_hover: Some(rgba(0xc9c9ca80).into()), + element_hover: Some(rgba(0xdfdfe0ff).into()), element_active: Some(rgba(0xcacacaff).into()), - element_selected: Some(rgba(0xafafaf80).into()), + element_selected: Some(rgba(0xcacacaff).into()), element_disabled: Some(rgba(0xebebecff).into()), drop_target_background: Some(rgba(0x7f818880).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xc9c9ca80).into()), + ghost_element_hover: Some(rgba(0xdfdfe0ff).into()), ghost_element_active: Some(rgba(0xcacacaff).into()), - ghost_element_selected: Some(rgba(0xafafaf80).into()), + ghost_element_selected: Some(rgba(0xcacacaff).into()), ghost_element_disabled: Some(rgba(0xebebecff).into()), text: Some(rgba(0x383a41ff).into()), text_muted: Some(rgba(0x7f8188ff).into()), - text_placeholder: Some(rgba(0xa7a7a8ff).into()), - text_disabled: Some(rgba(0x383a41ff).into()), + text_placeholder: Some(rgba(0xa1a1a3ff).into()), + text_disabled: Some(rgba(0xa1a1a3ff).into()), text_accent: Some(rgba(0x5c79e2ff).into()), icon: Some(rgba(0x383a41ff).into()), icon_muted: Some(rgba(0x7f8188ff).into()), @@ -57,9 +57,9 @@ pub fn one() -> UserThemeFamily { tab_bar_background: Some(rgba(0xebebecff).into()), tab_inactive_background: Some(rgba(0xebebecff).into()), tab_active_background: Some(rgba(0xfafafaff).into()), - scrollbar_thumb_background: Some(rgba(0x383a414d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x383a414d).into()), - scrollbar_thumb_border: Some(rgba(0xeeeeeeff).into()), + scrollbar_thumb_background: Some(rgba(0xebebecff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xdfdfe0ff).into()), + scrollbar_thumb_border: Some(rgba(0xdfdfe0ff).into()), scrollbar_track_background: Some(rgba(0xfafafaff).into()), scrollbar_track_border: Some(rgba(0xeeeeeeff).into()), editor_foreground: Some(rgba(0x383a41ff).into()), @@ -441,20 +441,20 @@ pub fn one() -> UserThemeFamily { background: Some(rgba(0x3b414dff).into()), panel_background: Some(rgba(0x2f343eff).into()), element_background: Some(rgba(0x2f343eff).into()), - element_hover: Some(rgba(0x464b5780).into()), + element_hover: Some(rgba(0x363c46ff).into()), element_active: Some(rgba(0x454a56ff).into()), - element_selected: Some(rgba(0x4f545e80).into()), + element_selected: Some(rgba(0x454a56ff).into()), element_disabled: Some(rgba(0x2f343eff).into()), drop_target_background: Some(rgba(0x83899480).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x464b5780).into()), + ghost_element_hover: Some(rgba(0x363c46ff).into()), ghost_element_active: Some(rgba(0x454a56ff).into()), - ghost_element_selected: Some(rgba(0x4f545e80).into()), + ghost_element_selected: Some(rgba(0x454a56ff).into()), ghost_element_disabled: Some(rgba(0x2f343eff).into()), text: Some(rgba(0xc8ccd4ff).into()), text_muted: Some(rgba(0x838994ff).into()), - text_placeholder: Some(rgba(0x545862ff).into()), - text_disabled: Some(rgba(0xc8ccd4ff).into()), + text_placeholder: Some(rgba(0x555a63ff).into()), + text_disabled: Some(rgba(0x555a63ff).into()), text_accent: Some(rgba(0x74ade8ff).into()), icon: Some(rgba(0xc8ccd4ff).into()), icon_muted: Some(rgba(0x838994ff).into()), @@ -467,9 +467,9 @@ pub fn one() -> UserThemeFamily { tab_bar_background: Some(rgba(0x2f343eff).into()), tab_inactive_background: Some(rgba(0x2f343eff).into()), tab_active_background: Some(rgba(0x282c34ff).into()), - scrollbar_thumb_background: Some(rgba(0xc8ccd44d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xc8ccd44d).into()), - scrollbar_thumb_border: Some(rgba(0x2e333cff).into()), + scrollbar_thumb_background: Some(rgba(0x2f343eff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x363c46ff).into()), + scrollbar_thumb_border: Some(rgba(0x363c46ff).into()), scrollbar_track_background: Some(rgba(0x282c34ff).into()), scrollbar_track_border: Some(rgba(0x2e333cff).into()), editor_foreground: Some(rgba(0xacb2beff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 0d310050c4e25b3b52db57e564d2424e8d52d2ae..c7ea51ea25843ba03b946a688194e554db39f6ea 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -31,20 +31,20 @@ pub fn rose_pine() -> UserThemeFamily { background: Some(rgba(0xdcd8d8ff).into()), panel_background: Some(rgba(0xfef9f2ff).into()), element_background: Some(rgba(0xfef9f2ff).into()), - element_hover: Some(rgba(0xdcd6d580).into()), + element_hover: Some(rgba(0xe5e0dfff).into()), element_active: Some(rgba(0xdbd5d4ff).into()), - element_selected: Some(rgba(0xc1bac180).into()), + element_selected: Some(rgba(0xdbd5d4ff).into()), element_disabled: Some(rgba(0xfef9f2ff).into()), drop_target_background: Some(rgba(0x706c8c80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0xdcd6d580).into()), + ghost_element_hover: Some(rgba(0xe5e0dfff).into()), ghost_element_active: Some(rgba(0xdbd5d4ff).into()), - ghost_element_selected: Some(rgba(0xc1bac180).into()), + ghost_element_selected: Some(rgba(0xdbd5d4ff).into()), ghost_element_disabled: Some(rgba(0xfef9f2ff).into()), text: Some(rgba(0x575279ff).into()), text_muted: Some(rgba(0x706c8cff).into()), - text_placeholder: Some(rgba(0xb1abb5ff).into()), - text_disabled: Some(rgba(0x575279ff).into()), + text_placeholder: Some(rgba(0x938fa3ff).into()), + text_disabled: Some(rgba(0x938fa3ff).into()), text_accent: Some(rgba(0x57949fff).into()), icon: Some(rgba(0x575279ff).into()), icon_muted: Some(rgba(0x706c8cff).into()), @@ -57,9 +57,9 @@ pub fn rose_pine() -> UserThemeFamily { tab_bar_background: Some(rgba(0xfef9f2ff).into()), tab_inactive_background: Some(rgba(0xfef9f2ff).into()), tab_active_background: Some(rgba(0xfaf4edff).into()), - scrollbar_thumb_background: Some(rgba(0x5752794d).into()), - scrollbar_thumb_hover_background: Some(rgba(0x5752794d).into()), - scrollbar_thumb_border: Some(rgba(0xfdf8f1ff).into()), + scrollbar_thumb_background: Some(rgba(0xfef9f2ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xe5e0dfff).into()), + scrollbar_thumb_border: Some(rgba(0xe5e0dfff).into()), scrollbar_track_background: Some(rgba(0xfaf4edff).into()), scrollbar_track_border: Some(rgba(0xfdf8f1ff).into()), editor_foreground: Some(rgba(0x575279ff).into()), @@ -448,20 +448,20 @@ pub fn rose_pine() -> UserThemeFamily { background: Some(rgba(0x38354eff).into()), panel_background: Some(rgba(0x28253cff).into()), element_background: Some(rgba(0x28253cff).into()), - element_hover: Some(rgba(0x504c6880).into()), + element_hover: Some(rgba(0x322f48ff).into()), element_active: Some(rgba(0x4f4b66ff).into()), - element_selected: Some(rgba(0x45415d80).into()), + element_selected: Some(rgba(0x4f4b66ff).into()), element_disabled: Some(rgba(0x28253cff).into()), drop_target_background: Some(rgba(0x85819e80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x504c6880).into()), + ghost_element_hover: Some(rgba(0x322f48ff).into()), ghost_element_active: Some(rgba(0x4f4b66ff).into()), - ghost_element_selected: Some(rgba(0x45415d80).into()), + ghost_element_selected: Some(rgba(0x4f4b66ff).into()), ghost_element_disabled: Some(rgba(0x28253cff).into()), text: Some(rgba(0xe0def4ff).into()), text_muted: Some(rgba(0x85819eff).into()), - text_placeholder: Some(rgba(0x3a3653ff).into()), - text_disabled: Some(rgba(0xe0def4ff).into()), + text_placeholder: Some(rgba(0x615d7aff).into()), + text_disabled: Some(rgba(0x615d7aff).into()), text_accent: Some(rgba(0x9cced7ff).into()), icon: Some(rgba(0xe0def4ff).into()), icon_muted: Some(rgba(0x85819eff).into()), @@ -474,9 +474,9 @@ pub fn rose_pine() -> UserThemeFamily { tab_bar_background: Some(rgba(0x28253cff).into()), tab_inactive_background: Some(rgba(0x28253cff).into()), tab_active_background: Some(rgba(0x232136ff).into()), - scrollbar_thumb_background: Some(rgba(0xe0def44d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xe0def44d).into()), - scrollbar_thumb_border: Some(rgba(0x27243bff).into()), + scrollbar_thumb_background: Some(rgba(0x28253cff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x322f48ff).into()), + scrollbar_thumb_border: Some(rgba(0x322f48ff).into()), scrollbar_track_background: Some(rgba(0x232136ff).into()), scrollbar_track_border: Some(rgba(0x27243bff).into()), editor_foreground: Some(rgba(0xe0def4ff).into()), @@ -865,20 +865,20 @@ pub fn rose_pine() -> UserThemeFamily { background: Some(rgba(0x292739ff).into()), panel_background: Some(rgba(0x1d1b2aff).into()), element_background: Some(rgba(0x1d1b2aff).into()), - element_hover: Some(rgba(0x423f5580).into()), + element_hover: Some(rgba(0x232132ff).into()), element_active: Some(rgba(0x403e53ff).into()), - element_selected: Some(rgba(0x47445b80).into()), + element_selected: Some(rgba(0x403e53ff).into()), element_disabled: Some(rgba(0x1d1b2aff).into()), drop_target_background: Some(rgba(0x75718e80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x423f5580).into()), + ghost_element_hover: Some(rgba(0x232132ff).into()), ghost_element_active: Some(rgba(0x403e53ff).into()), - ghost_element_selected: Some(rgba(0x47445b80).into()), + ghost_element_selected: Some(rgba(0x403e53ff).into()), ghost_element_disabled: Some(rgba(0x1d1b2aff).into()), text: Some(rgba(0xe0def4ff).into()), text_muted: Some(rgba(0x75718eff).into()), - text_placeholder: Some(rgba(0x3b384fff).into()), - text_disabled: Some(rgba(0xe0def4ff).into()), + text_placeholder: Some(rgba(0x2f2b43ff).into()), + text_disabled: Some(rgba(0x2f2b43ff).into()), text_accent: Some(rgba(0x9cced7ff).into()), icon: Some(rgba(0xe0def4ff).into()), icon_muted: Some(rgba(0x75718eff).into()), @@ -891,9 +891,9 @@ pub fn rose_pine() -> UserThemeFamily { tab_bar_background: Some(rgba(0x1d1b2aff).into()), tab_inactive_background: Some(rgba(0x1d1b2aff).into()), tab_active_background: Some(rgba(0x191724ff).into()), - scrollbar_thumb_background: Some(rgba(0xe0def44d).into()), - scrollbar_thumb_hover_background: Some(rgba(0xe0def44d).into()), - scrollbar_thumb_border: Some(rgba(0x1c1a29ff).into()), + scrollbar_thumb_background: Some(rgba(0x1d1b2aff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x232132ff).into()), + scrollbar_thumb_border: Some(rgba(0x232132ff).into()), scrollbar_track_background: Some(rgba(0x191724ff).into()), scrollbar_track_border: Some(rgba(0x1c1a29ff).into()), editor_foreground: Some(rgba(0xe0def4ff).into()), diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs index 012c17be8271294bdef7035b7f7a97b0768f5b3a..7682b5307def77fd1e2399f853ed3be48611cdc0 100644 --- a/crates/theme2/src/themes/sandcastle.rs +++ b/crates/theme2/src/themes/sandcastle.rs @@ -30,20 +30,20 @@ pub fn sandcastle() -> UserThemeFamily { background: Some(rgba(0x333944ff).into()), panel_background: Some(rgba(0x2b3039ff).into()), element_background: Some(rgba(0x2b3039ff).into()), - element_hover: Some(rgba(0x3d435080).into()), + element_hover: Some(rgba(0x313741ff).into()), element_active: Some(rgba(0x3d4350ff).into()), - element_selected: Some(rgba(0x57535380).into()), + element_selected: Some(rgba(0x3d4350ff).into()), element_disabled: Some(rgba(0x2b3039ff).into()), drop_target_background: Some(rgba(0xa6978280).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x3d435080).into()), + ghost_element_hover: Some(rgba(0x313741ff).into()), ghost_element_active: Some(rgba(0x3d4350ff).into()), - ghost_element_selected: Some(rgba(0x57535380).into()), + ghost_element_selected: Some(rgba(0x3d4350ff).into()), ghost_element_disabled: Some(rgba(0x2b3039ff).into()), text: Some(rgba(0xfdf4c1ff).into()), text_muted: Some(rgba(0xa69782ff).into()), - text_placeholder: Some(rgba(0x645b54ff).into()), - text_disabled: Some(rgba(0xfdf4c1ff).into()), + text_placeholder: Some(rgba(0x827568ff).into()), + text_disabled: Some(rgba(0x827568ff).into()), text_accent: Some(rgba(0x528b8bff).into()), icon: Some(rgba(0xfdf4c1ff).into()), icon_muted: Some(rgba(0xa69782ff).into()), @@ -56,9 +56,9 @@ pub fn sandcastle() -> UserThemeFamily { 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_thumb_background: Some(rgba(0x2b3039ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x313741ff).into()), + scrollbar_thumb_border: Some(rgba(0x313741ff).into()), scrollbar_track_background: Some(rgba(0x282c34ff).into()), scrollbar_track_border: Some(rgba(0x2a2f38ff).into()), editor_foreground: Some(rgba(0xfdf4c1ff).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 49e26d2586a58390bc03b53308fb487bc1a81919..942249cbf1a02f65fd87aa3880c3ff444e9981c3 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -31,20 +31,20 @@ pub fn solarized() -> UserThemeFamily { background: Some(rgba(0xcfd0c4ff).into()), panel_background: Some(rgba(0xf3eddaff).into()), element_background: Some(rgba(0xf3eddaff).into()), - element_hover: Some(rgba(0x9faaa880).into()), + element_hover: Some(rgba(0xdcdacbff).into()), element_active: Some(rgba(0xa2aca9ff).into()), - element_selected: Some(rgba(0x7f919480).into()), + element_selected: Some(rgba(0xa2aca9ff).into()), element_disabled: Some(rgba(0xf3eddaff).into()), drop_target_background: Some(rgba(0x34555e80).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x9faaa880).into()), + ghost_element_hover: Some(rgba(0xdcdacbff).into()), ghost_element_active: Some(rgba(0xa2aca9ff).into()), - ghost_element_selected: Some(rgba(0x7f919480).into()), + ghost_element_selected: Some(rgba(0xa2aca9ff).into()), ghost_element_disabled: Some(rgba(0xf3eddaff).into()), text: Some(rgba(0x002b36ff).into()), text_muted: Some(rgba(0x34555eff).into()), - text_placeholder: Some(rgba(0x788b8fff).into()), - text_disabled: Some(rgba(0x002b36ff).into()), + text_placeholder: Some(rgba(0x6a7f86ff).into()), + text_disabled: Some(rgba(0x6a7f86ff).into()), text_accent: Some(rgba(0x298bd1ff).into()), icon: Some(rgba(0x002b36ff).into()), icon_muted: Some(rgba(0x34555eff).into()), @@ -57,9 +57,9 @@ pub fn solarized() -> UserThemeFamily { 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_thumb_background: Some(rgba(0xf3eddaff).into()), + scrollbar_thumb_hover_background: Some(rgba(0xdcdacbff).into()), + scrollbar_thumb_border: Some(rgba(0xdcdacbff).into()), scrollbar_track_background: Some(rgba(0xfdf6e3ff).into()), scrollbar_track_border: Some(rgba(0xf5eedbff).into()), editor_foreground: Some(rgba(0x002b36ff).into()), @@ -434,20 +434,20 @@ pub fn solarized() -> UserThemeFamily { background: Some(rgba(0x083743ff).into()), panel_background: Some(rgba(0x04313cff).into()), element_background: Some(rgba(0x04313cff).into()), - element_hover: Some(rgba(0x2b4f5880).into()), + element_hover: Some(rgba(0x063541ff).into()), element_active: Some(rgba(0x294e58ff).into()), - element_selected: Some(rgba(0x566d7480).into()), + element_selected: Some(rgba(0x294e58ff).into()), element_disabled: Some(rgba(0x04313cff).into()), drop_target_background: Some(rgba(0x93a1a180).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x2b4f5880).into()), + ghost_element_hover: Some(rgba(0x063541ff).into()), ghost_element_active: Some(rgba(0x294e58ff).into()), - ghost_element_selected: Some(rgba(0x566d7480).into()), + ghost_element_selected: Some(rgba(0x294e58ff).into()), ghost_element_disabled: Some(rgba(0x04313cff).into()), text: Some(rgba(0xfdf6e3ff).into()), text_muted: Some(rgba(0x93a1a1ff).into()), - text_placeholder: Some(rgba(0x5f757dff).into()), - text_disabled: Some(rgba(0xfdf6e3ff).into()), + text_placeholder: Some(rgba(0x6f8389ff).into()), + text_disabled: Some(rgba(0x6f8389ff).into()), text_accent: Some(rgba(0x288bd1ff).into()), icon: Some(rgba(0xfdf6e3ff).into()), icon_muted: Some(rgba(0x93a1a1ff).into()), @@ -460,9 +460,9 @@ pub fn solarized() -> UserThemeFamily { 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_thumb_background: Some(rgba(0x04313cff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x063541ff).into()), + scrollbar_thumb_border: Some(rgba(0x063541ff).into()), scrollbar_track_background: Some(rgba(0x002b36ff).into()), scrollbar_track_border: Some(rgba(0x032f3bff).into()), editor_foreground: Some(rgba(0xfdf6e3ff).into()), diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs index 1dd42803a349f6084ab5ce759f29ccc15554d5ae..cea8ae66f13849e809d30f30247f3916aeda16be 100644 --- a/crates/theme2/src/themes/summercamp.rs +++ b/crates/theme2/src/themes/summercamp.rs @@ -30,20 +30,20 @@ pub fn summercamp() -> UserThemeFamily { background: Some(rgba(0x2a261cff).into()), panel_background: Some(rgba(0x231f16ff).into()), element_background: Some(rgba(0x231f16ff).into()), - element_hover: Some(rgba(0x312d2180).into()), + element_hover: Some(rgba(0x29251bff).into()), element_active: Some(rgba(0x302c20ff).into()), - element_selected: Some(rgba(0x39342780).into()), + element_selected: Some(rgba(0x302c20ff).into()), element_disabled: Some(rgba(0x231f16ff).into()), drop_target_background: Some(rgba(0x736e5580).into()), ghost_element_background: Some(rgba(0x00000000).into()), - ghost_element_hover: Some(rgba(0x312d2180).into()), + ghost_element_hover: Some(rgba(0x29251bff).into()), ghost_element_active: Some(rgba(0x302c20ff).into()), - ghost_element_selected: Some(rgba(0x39342780).into()), + ghost_element_selected: Some(rgba(0x302c20ff).into()), ghost_element_disabled: Some(rgba(0x231f16ff).into()), text: Some(rgba(0xf8f5deff).into()), text_muted: Some(rgba(0x736e55ff).into()), - text_placeholder: Some(rgba(0x3d382aff).into()), - text_disabled: Some(rgba(0xf8f5deff).into()), + text_placeholder: Some(rgba(0x4c4735ff).into()), + text_disabled: Some(rgba(0x4c4735ff).into()), text_accent: Some(rgba(0x499befff).into()), icon: Some(rgba(0xf8f5deff).into()), icon_muted: Some(rgba(0x736e55ff).into()), @@ -56,9 +56,9 @@ pub fn summercamp() -> UserThemeFamily { 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_thumb_background: Some(rgba(0x231f16ff).into()), + scrollbar_thumb_hover_background: Some(rgba(0x29251bff).into()), + scrollbar_thumb_border: Some(rgba(0x29251bff).into()), scrollbar_track_background: Some(rgba(0x1c1810ff).into()), scrollbar_track_border: Some(rgba(0x221e15ff).into()), editor_foreground: Some(rgba(0xf8f5deff).into()), diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 623ac8f5880d0271b5554bbbd5b4b1d4e2369582..76b2248b10cfc3fc40a163e704d1ae577f25aa73 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -125,16 +125,7 @@ impl Zed1ThemeConverter { let middle = &base_theme.middle; let highest = &base_theme.highest; - let picker = &self.theme.picker; - let title_bar = &self.theme.titlebar; - let status_bar = &self.theme.workspace.status_bar; - let project_panel = &self.theme.project_panel; - 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 editor = &self.theme.editor; - let scrollbar = &self.theme.editor.scrollbar; let terminal = &self.theme.terminal; Ok(ThemeColorsRefinement { @@ -144,87 +135,42 @@ impl Zed1ThemeConverter { border_selected: convert(lowest.accent.default.border), border_transparent: Some(gpui::transparent_black()), border_disabled: convert(lowest.base.disabled.border), - elevated_surface_background: editor - .hover_popover - .container - .background_color - .map(zed1_color_to_hsla), + elevated_surface_background: convert(middle.base.default.background), surface_background: convert(middle.base.default.background), - background: convert(self.theme.workspace.background), + background: convert(lowest.base.default.background), element_background: convert(lowest.on.default.background), - element_hover: picker - .item - .hovered - .as_ref() - .and_then(|hovered| hovered.container.background_color) - .map(zed1_color_to_hsla), + element_hover: convert(lowest.on.hovered.background), element_active: convert(lowest.on.active.background), - element_selected: picker - .item - .active_state() - .container - .background_color - .map(zed1_color_to_hsla), + element_selected: convert(lowest.on.active.background), // TODO: Check what this should be element_disabled: convert(lowest.on.disabled.background), drop_target_background: convert(self.theme.workspace.drop_target_overlay_color), ghost_element_background: Some(gpui::transparent_black()), - ghost_element_hover: picker - .item - .hovered - .as_ref() - .and_then(|hovered| hovered.container.background_color) - .map(zed1_color_to_hsla), + ghost_element_hover: convert(lowest.on.hovered.background), ghost_element_active: convert(lowest.on.active.background), - ghost_element_selected: picker - .item - .active_state() - .container - .background_color - .map(zed1_color_to_hsla), + 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(self.theme.collab_panel.channel_name.text.color), - text_muted: convert(tab_bar.pane_button.default_style().color), - text_placeholder: picker - .empty_input_editor - .placeholder_text - .as_ref() - .map(|placeholder_text| placeholder_text.color) - .map(zed1_color_to_hsla), - text_disabled: convert(status_bar.panel_buttons.button.disabled_style().icon_color), - text_accent: convert(status_bar.panel_buttons.button.active_state().icon_color), - status_bar_background: status_bar - .container - .background_color - .map(zed1_color_to_hsla) - .or_else(|| title_bar.container.background_color.map(zed1_color_to_hsla)), - title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla), - toolbar_background: toolbar.container.background_color.map(zed1_color_to_hsla), - tab_bar_background: tab_bar.container.background_color.map(zed1_color_to_hsla), - tab_inactive_background: inactive_tab - .container - .background_color - .map(zed1_color_to_hsla), - tab_active_background: active_tab - .container - .background_color - .map(zed1_color_to_hsla), - panel_background: project_panel - .container - .background_color - .map(zed1_color_to_hsla), - scrollbar_thumb_background: scrollbar.thumb.background_color.map(zed1_color_to_hsla), - scrollbar_thumb_hover_background: scrollbar - .thumb - .background_color - .map(zed1_color_to_hsla), - scrollbar_thumb_border: convert(scrollbar.thumb.border.color), + text: convert(lowest.base.default.foreground), + text_muted: convert(lowest.variant.default.foreground), + text_placeholder: convert(lowest.base.disabled.foreground), + text_disabled: convert(lowest.base.disabled.foreground), + text_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), + panel_background: convert(middle.base.default.background), + 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), scrollbar_track_background: convert(highest.base.default.background), - scrollbar_track_border: convert(scrollbar.track.border.color), + scrollbar_track_border: convert(highest.variant.default.border), editor_foreground: convert(editor.text_color), editor_background: convert(editor.background), editor_gutter_background: convert(editor.gutter_background), From ff74c9367aa1f508fd26d8b234a9e82744699e62 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Tue, 2 Jan 2024 14:47:46 -0500 Subject: [PATCH 3/4] Get zed1 theme importer down to no warnings Note: We removed some unused theme colors Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com> --- crates/theme2/src/default_colors.rs | 230 +++++++++----------- crates/theme2/src/one_themes.rs | 10 - crates/theme2/src/styles/colors.rs | 9 - crates/theme2/src/themes/andromeda.rs | 7 + crates/theme2/src/themes/atelier.rs | 140 ++++++++++++ crates/theme2/src/themes/ayu.rs | 21 ++ crates/theme2/src/themes/gruvbox.rs | 42 ++++ crates/theme2/src/themes/one.rs | 14 ++ crates/theme2/src/themes/rose_pine.rs | 21 ++ crates/theme2/src/themes/sandcastle.rs | 7 + crates/theme2/src/themes/solarized.rs | 14 ++ crates/theme2/src/themes/summercamp.rs | 7 + crates/theme_importer/src/theme_printer.rs | 9 - crates/theme_importer/src/zed1/converter.rs | 27 ++- 14 files changed, 399 insertions(+), 159 deletions(-) diff --git a/crates/theme2/src/default_colors.rs b/crates/theme2/src/default_colors.rs index 8150015311a789a12420d064f4c1926c04118e89..8cbfc23fa34655283ddaa5418e15922929c1b5bc 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(), + border_disabled: neutral().light().step_3(), + elevated_surface_background: neutral().light().step_2(), + surface_background: neutral().light().step_2(), + background: neutral().light().step_1(), element_background: neutral().light().step_3(), - element_disabled: neutral().light_alpha().step_3(), - element_hover: neutral().light_alpha().step_4(), + 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(), - 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(), + 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(), - headline: blue().light().step_9(), + ghost_element_disabled: neutral().light_alpha().step_3(), + text: neutral().light().step_12(), + 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_accent: blue().light().step_11(), - icon_disabled: neutral().light().step_9(), icon_muted: neutral().light().step_10(), + icon_disabled: neutral().light().step_9(), 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(), + 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(), - paragraph: neutral().light().step_12(), + pane_focused_border: blue().light().step_5(), scrollbar_thumb_background: neutral().light_alpha().step_3(), - scrollbar_thumb_border: gpui::transparent_black(), 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(), - 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(), + 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_blue: blue().light().step_10(), - terminal_ansi_bright_cyan: cyan().light().step_10(), + 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_red: red().light().step_10(), + terminal_ansi_bright_cyan: cyan().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_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_red: red().light().step_11(), + terminal_ansi_cyan: cyan().light().step_11(), terminal_ansi_white: neutral().light().step_12(), - terminal_ansi_yellow: yellow().light().step_11(), - terminal_background: neutral().light().step_1(), - 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(), - title_bar_background: neutral().light().step_2(), - toolbar_background: neutral().light().step_1(), + 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(), + surface_background: neutral().dark().step_2(), + 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_disabled: neutral().dark_alpha().step_3(), - ghost_element_hover: neutral().dark_alpha().step_4(), + 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(), - headline: blue().dark().step_9(), + 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_accent: blue().dark().step_11(), - icon_disabled: neutral().dark().step_9(), icon_muted: neutral().dark().step_10(), + icon_disabled: neutral().dark().step_9(), 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(), + 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(), - paragraph: neutral().dark().step_12(), + pane_focused_border: blue().dark().step_5(), scrollbar_thumb_background: neutral().dark_alpha().step_3(), - scrollbar_thumb_border: gpui::transparent_black(), 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(), - 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(), + 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_blue: blue().dark().step_10(), - terminal_ansi_bright_cyan: cyan().dark().step_10(), + 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_red: red().dark().step_10(), + terminal_ansi_bright_cyan: cyan().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_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_red: red().dark().step_11(), + terminal_ansi_cyan: cyan().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(), - text_muted: neutral().dark().step_11(), - text_placeholder: neutral().dark().step_10(), - title_bar_background: neutral().dark().step_2(), - toolbar_background: neutral().dark().step_1(), + link_text_hover: orange().dark().step_10(), } } } diff --git a/crates/theme2/src/one_themes.rs b/crates/theme2/src/one_themes.rs index 72411dc40c374582025725ce827d8654a8987871..498a9ef84d61e242c821516426cc13c7af1cb6dc 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 0b548c5a743ae5455b1b9161ea1399fea5dcf4b9..5f2295866535deefbe5ff29f51662847b241692e 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 a0518aea83d80e926156149f29aff5c68963c88d..c50961cb72a4010eb5d7707d55b746dd45073cbe 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 e6464cc2c105350102cfe0218f537fe8846c1bd2..460af35963995df313e6a585cf8ba8260cf57e1b 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 4b7fdf8b1999600df8a16c6e65039cc1f1b3b235..cf23d5c8deede2c4918a581548851a44057b2139 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 2a9b171f41ff53c3d86df2480b7fddf7284cf176..7d23075c6ae9017be896e80b25f0dcd798db60f9 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 c2c061c8f57de58bc18ec6948537af48c78639a8..39dc20e51731849e4e251050f9268fdeb9a42323 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 c7ea51ea25843ba03b946a688194e554db39f6ea..0eb5bafa194892c74295568bf626948217a9e77e 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 7682b5307def77fd1e2399f853ed3be48611cdc0..3b71f5e4f888ca6a1cdc1df9dc7087268a9a967c 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 942249cbf1a02f65fd87aa3880c3ff444e9981c3..4c839f010128f95937d6ef792ce9ebbcbd73195a 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 cea8ae66f13849e809d30f30247f3916aeda16be..d46aa776faa7eebc87a9435ab835dfd2babc6e7c 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 54f99e3b4ccb539ab007eb28002e40bfcfcdf942..e760327582bf9dd8bec269d7f8b91b404365eea2 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 76b2248b10cfc3fc40a163e704d1ae577f25aa73..1b1c5795a0a62a1e95808272631fe9185757da0b 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), }) } From 711b099ea0788b12a10cfd52fcb8d0ebab70fcc0 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Tue, 2 Jan 2024 14:53:51 -0500 Subject: [PATCH 4/4] Update status colors in zed1 importer Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com> --- crates/theme2/src/themes/andromeda.rs | 14 +- crates/theme2/src/themes/atelier.rs | 280 ++++++++++++++------ crates/theme2/src/themes/ayu.rs | 42 ++- crates/theme2/src/themes/gruvbox.rs | 84 ++++-- crates/theme2/src/themes/one.rs | 28 +- crates/theme2/src/themes/rose_pine.rs | 42 ++- crates/theme2/src/themes/sandcastle.rs | 14 +- crates/theme2/src/themes/solarized.rs | 28 +- crates/theme2/src/themes/summercamp.rs | 14 +- crates/theme_importer/src/zed1/converter.rs | 30 ++- 10 files changed, 408 insertions(+), 168 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index c50961cb72a4010eb5d7707d55b746dd45073cbe..766de3faac3668b8c3f4c3dd2a07405378612ae8 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -95,13 +95,19 @@ pub fn andromeda() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xfee56dff).into()), created: Some(rgba(0x96df72ff).into()), - deleted: Some(rgba(0xcd1d5aff).into()), + deleted: Some(rgba(0xf82872ff).into()), error: Some(rgba(0xf82872ff).into()), - hint: Some(rgba(0x618399ff).into()), + hidden: Some(rgba(0x6b6b73ff).into()), + hint: Some(rgba(0x11a793ff).into()), + ignored: Some(rgba(0xaca8aeff).into()), + info: Some(rgba(0x11a793ff).into()), modified: Some(rgba(0xfee56dff).into()), - predictive: Some(rgba(0x315f70ff).into()), - success: Some(rgba(0xf7f7f8ff).into()), + predictive: Some(rgba(0x96df72ff).into()), + renamed: Some(rgba(0x11a793ff).into()), + success: Some(rgba(0x96df72ff).into()), + unreachable: Some(rgba(0xaca8aeff).into()), warning: Some(rgba(0xfee56dff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs index 460af35963995df313e6a585cf8ba8260cf57e1b..ff4c212bc499175af88741bcad1a109aa18f925f 100644 --- a/crates/theme2/src/themes/atelier.rs +++ b/crates/theme2/src/themes/atelier.rs @@ -96,13 +96,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x98ab54ff).into()), + conflict: Some(rgba(0xa59810ff).into()), + created: Some(rgba(0x7d9728ff).into()), deleted: Some(rgba(0xba6337ff).into()), error: Some(rgba(0xba6337ff).into()), - hint: Some(rgba(0x768962ff).into()), + hidden: Some(rgba(0x767463ff).into()), + hint: Some(rgba(0x38a166ff).into()), + ignored: Some(rgba(0x61604fff).into()), + info: Some(rgba(0x38a166ff).into()), modified: Some(rgba(0xa59810ff).into()), - predictive: Some(rgba(0x879a72ff).into()), - success: Some(rgba(0x22221bff).into()), + predictive: Some(rgba(0x7d9728ff).into()), + renamed: Some(rgba(0x38a166ff).into()), + success: Some(rgba(0x7d9728ff).into()), + unreachable: Some(rgba(0x61604fff).into()), warning: Some(rgba(0xa59810ff).into()), ..Default::default() }, @@ -527,13 +533,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xc38419ff).into()), created: Some(rgba(0x7b9727ff).into()), - deleted: Some(rgba(0xc82234ff).into()), + deleted: Some(rgba(0xf22d40ff).into()), error: Some(rgba(0xf22d40ff).into()), - hint: Some(rgba(0xa87187ff).into()), + hidden: Some(rgba(0x8e8683ff).into()), + hint: Some(rgba(0x417ee6ff).into()), + ignored: Some(rgba(0xa79f9dff).into()), + info: Some(rgba(0x417ee6ff).into()), modified: Some(rgba(0xc38419ff).into()), - predictive: Some(rgba(0x8f5b71ff).into()), - success: Some(rgba(0xf1efeeff).into()), + predictive: Some(rgba(0x7b9727ff).into()), + renamed: Some(rgba(0x417ee6ff).into()), + success: Some(rgba(0x7b9727ff).into()), + unreachable: Some(rgba(0xa79f9dff).into()), warning: Some(rgba(0xc38419ff).into()), ..Default::default() }, @@ -958,13 +970,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x6fae80ff).into()), + conflict: Some(rgba(0xa07e3cff).into()), + created: Some(rgba(0x499963ff).into()), deleted: Some(rgba(0xb1623aff).into()), error: Some(rgba(0xb1623aff).into()), - hint: Some(rgba(0x66847cff).into()), + hidden: Some(rgba(0x68766dff).into()), + hint: Some(rgba(0x488c90ff).into()), + ignored: Some(rgba(0x546259ff).into()), + info: Some(rgba(0x488c90ff).into()), modified: Some(rgba(0xa07e3cff).into()), - predictive: Some(rgba(0x76958cff).into()), - success: Some(rgba(0x171c19ff).into()), + predictive: Some(rgba(0x499963ff).into()), + renamed: Some(rgba(0x488c90ff).into()), + success: Some(rgba(0x499963ff).into()), + unreachable: Some(rgba(0x546259ff).into()), warning: Some(rgba(0xa07e3cff).into()), ..Default::default() }, @@ -1389,13 +1407,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xa06e3bff).into()), created: Some(rgba(0x2c9292ff).into()), - deleted: Some(rgba(0x953a5fff).into()), + deleted: Some(rgba(0xbe4678ff).into()), error: Some(rgba(0xbe4678ff).into()), - hint: Some(rgba(0x716998ff).into()), + hidden: Some(rgba(0x756f7eff).into()), + hint: Some(rgba(0x576ddaff).into()), + ignored: Some(rgba(0x898591ff).into()), + info: Some(rgba(0x576ddaff).into()), modified: Some(rgba(0xa06e3bff).into()), - predictive: Some(rgba(0x625887ff).into()), - success: Some(rgba(0xefecf4ff).into()), + predictive: Some(rgba(0x2c9292ff).into()), + renamed: Some(rgba(0x576ddaff).into()), + success: Some(rgba(0x2c9292ff).into()), + unreachable: Some(rgba(0x898591ff).into()), warning: Some(rgba(0xa06e3bff).into()), ..Default::default() }, @@ -1820,13 +1844,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xa59810ff).into()), created: Some(rgba(0x7d9727ff).into()), - deleted: Some(rgba(0x934e2dff).into()), + deleted: Some(rgba(0xba6237ff).into()), error: Some(rgba(0xba6237ff).into()), - hint: Some(rgba(0x70825bff).into()), + hidden: Some(rgba(0x7d7c6aff).into()), + hint: Some(rgba(0x37a166ff).into()), + ignored: Some(rgba(0x91907fff).into()), + info: Some(rgba(0x37a166ff).into()), modified: Some(rgba(0xa59810ff).into()), - predictive: Some(rgba(0x5f724cff).into()), - success: Some(rgba(0xf4f3ecff).into()), + predictive: Some(rgba(0x7d9727ff).into()), + renamed: Some(rgba(0x37a166ff).into()), + success: Some(rgba(0x7d9727ff).into()), + unreachable: Some(rgba(0x91907fff).into()), warning: Some(rgba(0xa59810ff).into()), ..Default::default() }, @@ -2251,13 +2281,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xc08b31ff).into()), created: Some(rgba(0xac973aff).into()), - deleted: Some(rgba(0xa33a1eff).into()), + deleted: Some(rgba(0xc94923ff).into()), error: Some(rgba(0xc94923ff).into()), - hint: Some(rgba(0x6d82a6ff).into()), + hidden: Some(rgba(0x7e849eff).into()), + hint: Some(rgba(0x3e8fd0ff).into()), + ignored: Some(rgba(0x959bb2ff).into()), + info: Some(rgba(0x3e8fd0ff).into()), modified: Some(rgba(0xc08b31ff).into()), - predictive: Some(rgba(0x58709aff).into()), - success: Some(rgba(0xf5f7ffff).into()), + predictive: Some(rgba(0xac973aff).into()), + renamed: Some(rgba(0x3e8fd0ff).into()), + success: Some(rgba(0xac973aff).into()), + unreachable: Some(rgba(0x959bb2ff).into()), warning: Some(rgba(0xc08b31ff).into()), ..Default::default() }, @@ -2682,13 +2718,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0xbfab61ff).into()), + conflict: Some(rgba(0xc08b31ff).into()), + created: Some(rgba(0xac973aff).into()), deleted: Some(rgba(0xc94a23ff).into()), error: Some(rgba(0xc94a23ff).into()), - hint: Some(rgba(0x7087b2ff).into()), + hidden: Some(rgba(0x767d9aff).into()), + hint: Some(rgba(0x3f8fd0ff).into()), + ignored: Some(rgba(0x606889ff).into()), + info: Some(rgba(0x3f8fd0ff).into()), modified: Some(rgba(0xc08b31ff).into()), - predictive: Some(rgba(0x8599beff).into()), - success: Some(rgba(0x202746ff).into()), + predictive: Some(rgba(0xac973aff).into()), + renamed: Some(rgba(0x3f8fd0ff).into()), + success: Some(rgba(0xac973aff).into()), + unreachable: Some(rgba(0x606889ff).into()), warning: Some(rgba(0xc08b31ff).into()), ..Default::default() }, @@ -3113,13 +3155,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xae9515ff).into()), created: Some(rgba(0x60ac3aff).into()), - deleted: Some(rgba(0xaf2c2eff).into()), + deleted: Some(rgba(0xd73837ff).into()), error: Some(rgba(0xd73837ff).into()), - hint: Some(rgba(0xb17272ff).into()), + hidden: Some(rgba(0x8f8b77ff).into()), + hint: Some(rgba(0x6684e0ff).into()), + ignored: Some(rgba(0xa4a08bff).into()), + info: Some(rgba(0x6684e0ff).into()), modified: Some(rgba(0xae9515ff).into()), - predictive: Some(rgba(0x9c6262ff).into()), - success: Some(rgba(0xfefbecff).into()), + predictive: Some(rgba(0x60ac3aff).into()), + renamed: Some(rgba(0x6684e0ff).into()), + success: Some(rgba(0x60ac3aff).into()), + unreachable: Some(rgba(0xa4a08bff).into()), warning: Some(rgba(0xae9515ff).into()), ..Default::default() }, @@ -3544,13 +3592,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0x98981cff).into()), created: Some(rgba(0x2ba32aff).into()), - deleted: Some(rgba(0xbd1331ff).into()), + deleted: Some(rgba(0xe61c3cff).into()), error: Some(rgba(0xe61c3cff).into()), - hint: Some(rgba(0x008b9fff).into()), + hidden: Some(rgba(0x778f77ff).into()), + hint: Some(rgba(0x3e62f4ff).into()), + ignored: Some(rgba(0x8ba48bff).into()), + info: Some(rgba(0x3e62f4ff).into()), modified: Some(rgba(0x98981cff).into()), - predictive: Some(rgba(0x00788bff).into()), - success: Some(rgba(0xf4fbf4ff).into()), + predictive: Some(rgba(0x2ba32aff).into()), + renamed: Some(rgba(0x3e62f4ff).into()), + success: Some(rgba(0x2ba32aff).into()), + unreachable: Some(rgba(0x8ba48bff).into()), warning: Some(rgba(0x98981cff).into()), ..Default::default() }, @@ -3975,13 +4029,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x5fa8a7ff).into()), + conflict: Some(rgba(0xa06e3cff).into()), + created: Some(rgba(0x2c9292ff).into()), deleted: Some(rgba(0xbe4778ff).into()), error: Some(rgba(0xbe4778ff).into()), - hint: Some(rgba(0x786e9dff).into()), + hidden: Some(rgba(0x6e6876ff).into()), + hint: Some(rgba(0x586ddaff).into()), + ignored: Some(rgba(0x5a5462ff).into()), + info: Some(rgba(0x586ddaff).into()), modified: Some(rgba(0xa06e3cff).into()), - predictive: Some(rgba(0x887fafff).into()), - success: Some(rgba(0x19171cff).into()), + predictive: Some(rgba(0x2c9292ff).into()), + renamed: Some(rgba(0x586ddaff).into()), + success: Some(rgba(0x2c9292ff).into()), + unreachable: Some(rgba(0x5a5462ff).into()), warning: Some(rgba(0xa06e3cff).into()), ..Default::default() }, @@ -4406,13 +4466,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xa06e3bff).into()), created: Some(rgba(0x4b8b8bff).into()), - deleted: Some(rgba(0xa23b3bff).into()), + deleted: Some(rgba(0xca4949ff).into()), error: Some(rgba(0xca4949ff).into()), - hint: Some(rgba(0x8a647aff).into()), + hidden: Some(rgba(0x756e6eff).into()), + hint: Some(rgba(0x7272caff).into()), + ignored: Some(rgba(0x898383ff).into()), + info: Some(rgba(0x7272caff).into()), modified: Some(rgba(0xa06e3bff).into()), - predictive: Some(rgba(0x795369ff).into()), - success: Some(rgba(0xf4ececff).into()), + predictive: Some(rgba(0x4b8b8bff).into()), + renamed: Some(rgba(0x7272caff).into()), + success: Some(rgba(0x4b8b8bff).into()), + unreachable: Some(rgba(0x898383ff).into()), warning: Some(rgba(0xa06e3bff).into()), ..Default::default() }, @@ -4837,13 +4903,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xbb8a36ff).into()), created: Some(rgba(0x918b3bff).into()), - deleted: Some(rgba(0xa43424ff).into()), + deleted: Some(rgba(0xca402cff).into()), error: Some(rgba(0xca402cff).into()), - hint: Some(rgba(0x8d70a8ff).into()), + hidden: Some(rgba(0x908190ff).into()), + hint: Some(rgba(0x526aebff).into()), + ignored: Some(rgba(0xa99aa9ff).into()), + info: Some(rgba(0x526aebff).into()), modified: Some(rgba(0xbb8a36ff).into()), - predictive: Some(rgba(0x765990ff).into()), - success: Some(rgba(0xf7f3f7ff).into()), + predictive: Some(rgba(0x918b3bff).into()), + renamed: Some(rgba(0x526aebff).into()), + success: Some(rgba(0x918b3bff).into()), + unreachable: Some(rgba(0xa99aa9ff).into()), warning: Some(rgba(0xbb8a36ff).into()), ..Default::default() }, @@ -5268,13 +5340,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0x8a8a11ff).into()), created: Some(rgba(0x568c3bff).into()), - deleted: Some(rgba(0xa9275aff).into()), + deleted: Some(rgba(0xd22e72ff).into()), error: Some(rgba(0xd22e72ff).into()), - hint: Some(rgba(0x52809aff).into()), + hidden: Some(rgba(0x698c9eff).into()), + hint: Some(rgba(0x277fadff).into()), + ignored: Some(rgba(0x7ca0b3ff).into()), + info: Some(rgba(0x277fadff).into()), modified: Some(rgba(0x8a8a11ff).into()), - predictive: Some(rgba(0x427088ff).into()), - success: Some(rgba(0xebf8ffff).into()), + predictive: Some(rgba(0x568c3bff).into()), + renamed: Some(rgba(0x277fadff).into()), + success: Some(rgba(0x568c3bff).into()), + unreachable: Some(rgba(0x7ca0b3ff).into()), warning: Some(rgba(0x8a8a11ff).into()), ..Default::default() }, @@ -5699,13 +5777,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x97ab54ff).into()), + conflict: Some(rgba(0xc3841aff).into()), + created: Some(rgba(0x7b9728ff).into()), deleted: Some(rgba(0xf22e41ff).into()), error: Some(rgba(0xf22e41ff).into()), - hint: Some(rgba(0xa67287ff).into()), + hidden: Some(rgba(0x847c79ff).into()), + hint: Some(rgba(0x417ee6ff).into()), + ignored: Some(rgba(0x6a6360ff).into()), + info: Some(rgba(0x417ee6ff).into()), modified: Some(rgba(0xc3841aff).into()), - predictive: Some(rgba(0xbe899eff).into()), - success: Some(rgba(0x1b1918ff).into()), + predictive: Some(rgba(0x7b9728ff).into()), + renamed: Some(rgba(0x417ee6ff).into()), + success: Some(rgba(0x7b9728ff).into()), + unreachable: Some(rgba(0x6a6360ff).into()), warning: Some(rgba(0xc3841aff).into()), ..Default::default() }, @@ -6130,13 +6214,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x83bd62ff).into()), + conflict: Some(rgba(0xae9515ff).into()), + created: Some(rgba(0x61ac3aff).into()), deleted: Some(rgba(0xd73838ff).into()), error: Some(rgba(0xd73838ff).into()), - hint: Some(rgba(0xb37979ff).into()), + hidden: Some(rgba(0x878471ff).into()), + hint: Some(rgba(0x6784e0ff).into()), + ignored: Some(rgba(0x706d5fff).into()), + info: Some(rgba(0x6784e0ff).into()), modified: Some(rgba(0xae9515ff).into()), - predictive: Some(rgba(0xc88a8aff).into()), - success: Some(rgba(0x20201dff).into()), + predictive: Some(rgba(0x61ac3aff).into()), + renamed: Some(rgba(0x6784e0ff).into()), + success: Some(rgba(0x61ac3aff).into()), + unreachable: Some(rgba(0x706d5fff).into()), warning: Some(rgba(0xae9515ff).into()), ..Default::default() }, @@ -6561,13 +6651,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x70a2a1ff).into()), + conflict: Some(rgba(0xa06e3cff).into()), + created: Some(rgba(0x4c8b8bff).into()), deleted: Some(rgba(0xca4a4aff).into()), error: Some(rgba(0xca4a4aff).into()), - hint: Some(rgba(0x916a80ff).into()), + hidden: Some(rgba(0x6e6666ff).into()), + hint: Some(rgba(0x7372caff).into()), + ignored: Some(rgba(0x5a5252ff).into()), + info: Some(rgba(0x7372caff).into()), modified: Some(rgba(0xa06e3cff).into()), - predictive: Some(rgba(0xa27a91ff).into()), - success: Some(rgba(0x1b1818ff).into()), + predictive: Some(rgba(0x4c8b8bff).into()), + renamed: Some(rgba(0x7372caff).into()), + success: Some(rgba(0x4c8b8bff).into()), + unreachable: Some(rgba(0x5a5252ff).into()), warning: Some(rgba(0xa06e3cff).into()), ..Default::default() }, @@ -6992,13 +7088,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x61b656ff).into()), + conflict: Some(rgba(0x98981dff).into()), + created: Some(rgba(0x2ba32bff).into()), deleted: Some(rgba(0xe61c3dff).into()), error: Some(rgba(0xe61c3dff).into()), - hint: Some(rgba(0x008fa1ff).into()), + hidden: Some(rgba(0x718771ff).into()), + hint: Some(rgba(0x3f62f4ff).into()), + ignored: Some(rgba(0x5f705fff).into()), + info: Some(rgba(0x3f62f4ff).into()), modified: Some(rgba(0x98981dff).into()), - predictive: Some(rgba(0x00a2b5ff).into()), - success: Some(rgba(0x131513ff).into()), + predictive: Some(rgba(0x2ba32bff).into()), + renamed: Some(rgba(0x3f62f4ff).into()), + success: Some(rgba(0x2ba32bff).into()), + unreachable: Some(rgba(0x5f705fff).into()), warning: Some(rgba(0x98981dff).into()), ..Default::default() }, @@ -7423,13 +7525,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xa07e3bff).into()), created: Some(rgba(0x489963ff).into()), - deleted: Some(rgba(0x8b4d2fff).into()), + deleted: Some(rgba(0xb16139ff).into()), error: Some(rgba(0xb16139ff).into()), - hint: Some(rgba(0x607e76ff).into()), + hidden: Some(rgba(0x6f7e74ff).into()), + hint: Some(rgba(0x478c90ff).into()), + ignored: Some(rgba(0x859188ff).into()), + info: Some(rgba(0x478c90ff).into()), modified: Some(rgba(0xa07e3bff).into()), - predictive: Some(rgba(0x506d66ff).into()), - success: Some(rgba(0xecf4eeff).into()), + predictive: Some(rgba(0x489963ff).into()), + renamed: Some(rgba(0x478c90ff).into()), + success: Some(rgba(0x489963ff).into()), + unreachable: Some(rgba(0x859188ff).into()), warning: Some(rgba(0xa07e3bff).into()), ..Default::default() }, @@ -7854,13 +7962,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0xa8a161ff).into()), + conflict: Some(rgba(0xbb8a36ff).into()), + created: Some(rgba(0x918b3cff).into()), deleted: Some(rgba(0xca412cff).into()), error: Some(rgba(0xca412cff).into()), - hint: Some(rgba(0x8c70a6ff).into()), + hidden: Some(rgba(0x857785ff).into()), + hint: Some(rgba(0x526aebff).into()), + ignored: Some(rgba(0x6b5e6bff).into()), + info: Some(rgba(0x526aebff).into()), modified: Some(rgba(0xbb8a36ff).into()), - predictive: Some(rgba(0xa587bfff).into()), - success: Some(rgba(0x1b181bff).into()), + predictive: Some(rgba(0x918b3cff).into()), + renamed: Some(rgba(0x526aebff).into()), + success: Some(rgba(0x918b3cff).into()), + unreachable: Some(rgba(0x6b5e6bff).into()), warning: Some(rgba(0xbb8a36ff).into()), ..Default::default() }, @@ -8285,13 +8399,19 @@ pub fn atelier() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x78a361ff).into()), + conflict: Some(rgba(0x8a8a11ff).into()), + created: Some(rgba(0x578c3cff).into()), deleted: Some(rgba(0xd22f72ff).into()), error: Some(rgba(0xd22f72ff).into()), - hint: Some(rgba(0x5a87a0ff).into()), + hidden: Some(rgba(0x628496ff).into()), + hint: Some(rgba(0x277fadff).into()), + ignored: Some(rgba(0x526f7dff).into()), + info: Some(rgba(0x277fadff).into()), modified: Some(rgba(0x8a8a11ff).into()), - predictive: Some(rgba(0x6a97b2ff).into()), - success: Some(rgba(0x161b1dff).into()), + predictive: Some(rgba(0x578c3cff).into()), + renamed: Some(rgba(0x277fadff).into()), + success: Some(rgba(0x578c3cff).into()), + unreachable: Some(rgba(0x526f7dff).into()), warning: Some(rgba(0x8a8a11ff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index cf23d5c8deede2c4918a581548851a44057b2139..0a47c22fbdf9e818a96c4a88da69c8ab825f636d 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -96,13 +96,19 @@ pub fn ayu() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xfeb454ff).into()), created: Some(rgba(0xaad84cff).into()), - deleted: Some(rgba(0xc3595fff).into()), + deleted: Some(rgba(0xef7178ff).into()), error: Some(rgba(0xef7178ff).into()), - hint: Some(rgba(0x638c81ff).into()), + hidden: Some(rgba(0x696a6aff).into()), + hint: Some(rgba(0x5ac2feff).into()), + ignored: Some(rgba(0x8a8986ff).into()), + info: Some(rgba(0x5ac2feff).into()), modified: Some(rgba(0xfeb454ff).into()), - predictive: Some(rgba(0x5b728cff).into()), - success: Some(rgba(0xbfbdb6ff).into()), + predictive: Some(rgba(0xaad84cff).into()), + renamed: Some(rgba(0x5ac2feff).into()), + success: Some(rgba(0xaad84cff).into()), + unreachable: Some(rgba(0x8a8986ff).into()), warning: Some(rgba(0xfeb454ff).into()), ..Default::default() }, @@ -506,13 +512,19 @@ pub fn ayu() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0xa1c24bff).into()), + conflict: Some(rgba(0xf1ae4aff).into()), + created: Some(rgba(0x86b305ff).into()), deleted: Some(rgba(0xef7271ff).into()), error: Some(rgba(0xef7271ff).into()), - hint: Some(rgba(0x8ca7c2ff).into()), + hidden: Some(rgba(0xa9acaeff).into()), + hint: Some(rgba(0x3b9ee5ff).into()), + ignored: Some(rgba(0x8c8f93ff).into()), + info: Some(rgba(0x3b9ee5ff).into()), modified: Some(rgba(0xf1ae4aff).into()), - predictive: Some(rgba(0x9eb9d3ff).into()), - success: Some(rgba(0x5c6166ff).into()), + predictive: Some(rgba(0x86b305ff).into()), + renamed: Some(rgba(0x3b9ee5ff).into()), + success: Some(rgba(0x86b305ff).into()), + unreachable: Some(rgba(0x8c8f93ff).into()), warning: Some(rgba(0xf1ae4aff).into()), ..Default::default() }, @@ -916,13 +928,19 @@ pub fn ayu() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xfed073ff).into()), created: Some(rgba(0xd5fe80ff).into()), - deleted: Some(rgba(0xc46a60ff).into()), + deleted: Some(rgba(0xf18779ff).into()), error: Some(rgba(0xf18779ff).into()), - hint: Some(rgba(0x7399a3ff).into()), + hidden: Some(rgba(0x7b7d7fff).into()), + hint: Some(rgba(0x73cffeff).into()), + ignored: Some(rgba(0x9a9a98ff).into()), + info: Some(rgba(0x73cffeff).into()), modified: Some(rgba(0xfed073ff).into()), - predictive: Some(rgba(0x6d839bff).into()), - success: Some(rgba(0xcccac2ff).into()), + predictive: Some(rgba(0xd5fe80ff).into()), + renamed: Some(rgba(0x73cffeff).into()), + success: Some(rgba(0xd5fe80ff).into()), + unreachable: Some(rgba(0x9a9a98ff).into()), warning: Some(rgba(0xfed073ff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 7d23075c6ae9017be896e80b25f0dcd798db60f9..5ac9438ad8009d3b17b2de933da6f0a098e9b99c 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -96,13 +96,19 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x958e43ff).into()), + conflict: Some(rgba(0xb57616ff).into()), + created: Some(rgba(0x797410ff).into()), deleted: Some(rgba(0x9d0408ff).into()), error: Some(rgba(0x9d0408ff).into()), - hint: Some(rgba(0x677562ff).into()), + hidden: Some(rgba(0x8a7c6fff).into()), + hint: Some(rgba(0x0b6678ff).into()), + ignored: Some(rgba(0x5f5650ff).into()), + info: Some(rgba(0x0b6678ff).into()), modified: Some(rgba(0xb57616ff).into()), - predictive: Some(rgba(0x7d9881ff).into()), - success: Some(rgba(0x282828ff).into()), + predictive: Some(rgba(0x797410ff).into()), + renamed: Some(rgba(0x0b6678ff).into()), + success: Some(rgba(0x797410ff).into()), + unreachable: Some(rgba(0x5f5650ff).into()), warning: Some(rgba(0xb57616ff).into()), ..Default::default() }, @@ -513,13 +519,19 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xf9bd30ff).into()), created: Some(rgba(0xb8bb27ff).into()), - deleted: Some(rgba(0xd0382bff).into()), + deleted: Some(rgba(0xfb4a35ff).into()), error: Some(rgba(0xfb4a35ff).into()), - hint: Some(rgba(0x8d957eff).into()), + hidden: Some(rgba(0x9a8c79ff).into()), + hint: Some(rgba(0x83a598ff).into()), + ignored: Some(rgba(0xc5b597ff).into()), + info: Some(rgba(0x83a598ff).into()), modified: Some(rgba(0xf9bd30ff).into()), - predictive: Some(rgba(0x717363ff).into()), - success: Some(rgba(0xfbf1c7ff).into()), + predictive: Some(rgba(0xb8bb27ff).into()), + renamed: Some(rgba(0x83a598ff).into()), + success: Some(rgba(0xb8bb27ff).into()), + unreachable: Some(rgba(0xc5b597ff).into()), warning: Some(rgba(0xf9bd30ff).into()), ..Default::default() }, @@ -930,13 +942,19 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x958e43ff).into()), + conflict: Some(rgba(0xb57616ff).into()), + created: Some(rgba(0x797410ff).into()), deleted: Some(rgba(0x9d0408ff).into()), error: Some(rgba(0x9d0408ff).into()), - hint: Some(rgba(0x677562ff).into()), + hidden: Some(rgba(0x8a7c6fff).into()), + hint: Some(rgba(0x0b6678ff).into()), + ignored: Some(rgba(0x5f5650ff).into()), + info: Some(rgba(0x0b6678ff).into()), modified: Some(rgba(0xb57616ff).into()), - predictive: Some(rgba(0x7d9881ff).into()), - success: Some(rgba(0x282828ff).into()), + predictive: Some(rgba(0x797410ff).into()), + renamed: Some(rgba(0x0b6678ff).into()), + success: Some(rgba(0x797410ff).into()), + unreachable: Some(rgba(0x5f5650ff).into()), warning: Some(rgba(0xb57616ff).into()), ..Default::default() }, @@ -1347,13 +1365,19 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xf9bd30ff).into()), created: Some(rgba(0xb8bb27ff).into()), - deleted: Some(rgba(0xd0382bff).into()), + deleted: Some(rgba(0xfb4a35ff).into()), error: Some(rgba(0xfb4a35ff).into()), - hint: Some(rgba(0x8d957eff).into()), + hidden: Some(rgba(0x9a8c79ff).into()), + hint: Some(rgba(0x83a598ff).into()), + ignored: Some(rgba(0xc5b597ff).into()), + info: Some(rgba(0x83a598ff).into()), modified: Some(rgba(0xf9bd30ff).into()), - predictive: Some(rgba(0x717363ff).into()), - success: Some(rgba(0xfbf1c7ff).into()), + predictive: Some(rgba(0xb8bb27ff).into()), + renamed: Some(rgba(0x83a598ff).into()), + success: Some(rgba(0xb8bb27ff).into()), + unreachable: Some(rgba(0xc5b597ff).into()), warning: Some(rgba(0xf9bd30ff).into()), ..Default::default() }, @@ -1764,13 +1788,19 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x958e43ff).into()), + conflict: Some(rgba(0xb57616ff).into()), + created: Some(rgba(0x797410ff).into()), deleted: Some(rgba(0x9d0408ff).into()), error: Some(rgba(0x9d0408ff).into()), - hint: Some(rgba(0x677562ff).into()), + hidden: Some(rgba(0x8a7c6fff).into()), + hint: Some(rgba(0x0b6678ff).into()), + ignored: Some(rgba(0x5f5650ff).into()), + info: Some(rgba(0x0b6678ff).into()), modified: Some(rgba(0xb57616ff).into()), - predictive: Some(rgba(0x7d9881ff).into()), - success: Some(rgba(0x282828ff).into()), + predictive: Some(rgba(0x797410ff).into()), + renamed: Some(rgba(0x0b6678ff).into()), + success: Some(rgba(0x797410ff).into()), + unreachable: Some(rgba(0x5f5650ff).into()), warning: Some(rgba(0xb57616ff).into()), ..Default::default() }, @@ -2181,13 +2211,19 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xf9bd30ff).into()), created: Some(rgba(0xb8bb27ff).into()), - deleted: Some(rgba(0xd0382bff).into()), + deleted: Some(rgba(0xfb4a35ff).into()), error: Some(rgba(0xfb4a35ff).into()), - hint: Some(rgba(0x8d957eff).into()), + hidden: Some(rgba(0x9a8c79ff).into()), + hint: Some(rgba(0x83a598ff).into()), + ignored: Some(rgba(0xc5b597ff).into()), + info: Some(rgba(0x83a598ff).into()), modified: Some(rgba(0xf9bd30ff).into()), - predictive: Some(rgba(0x717363ff).into()), - success: Some(rgba(0xfbf1c7ff).into()), + predictive: Some(rgba(0xb8bb27ff).into()), + renamed: Some(rgba(0x83a598ff).into()), + success: Some(rgba(0xb8bb27ff).into()), + unreachable: Some(rgba(0xc5b597ff).into()), warning: Some(rgba(0xf9bd30ff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs index 39dc20e51731849e4e251050f9268fdeb9a42323..6bf05bda0f84d70813c892a7b4758387c9556792 100644 --- a/crates/theme2/src/themes/one.rs +++ b/crates/theme2/src/themes/one.rs @@ -96,13 +96,19 @@ pub fn one() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x84b278ff).into()), + conflict: Some(rgba(0xdec184ff).into()), + created: Some(rgba(0x669f59ff).into()), deleted: Some(rgba(0xd36151ff).into()), error: Some(rgba(0xd36151ff).into()), - hint: Some(rgba(0x9295beff).into()), + hidden: Some(rgba(0xa1a1a3ff).into()), + hint: Some(rgba(0x5c79e2ff).into()), + ignored: Some(rgba(0x7f8188ff).into()), + info: Some(rgba(0x5c79e2ff).into()), modified: Some(rgba(0xdec184ff).into()), - predictive: Some(rgba(0x9c9fc7ff).into()), - success: Some(rgba(0x383a41ff).into()), + predictive: Some(rgba(0x669f59ff).into()), + renamed: Some(rgba(0x5c79e2ff).into()), + success: Some(rgba(0x669f59ff).into()), + unreachable: Some(rgba(0x7f8188ff).into()), warning: Some(rgba(0xdec184ff).into()), ..Default::default() }, @@ -513,13 +519,19 @@ pub fn one() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xdec184ff).into()), created: Some(rgba(0xa1c181ff).into()), - deleted: Some(rgba(0xa45a5eff).into()), + deleted: Some(rgba(0xd07277ff).into()), error: Some(rgba(0xd07277ff).into()), - hint: Some(rgba(0x5b708aff).into()), + hidden: Some(rgba(0x555a63ff).into()), + hint: Some(rgba(0x74ade8ff).into()), + ignored: Some(rgba(0x838994ff).into()), + info: Some(rgba(0x74ade8ff).into()), modified: Some(rgba(0xdec184ff).into()), - predictive: Some(rgba(0x5b6b88ff).into()), - success: Some(rgba(0xc8ccd4ff).into()), + predictive: Some(rgba(0xa1c181ff).into()), + renamed: Some(rgba(0x74ade8ff).into()), + success: Some(rgba(0xa1c181ff).into()), + unreachable: Some(rgba(0x838994ff).into()), warning: Some(rgba(0xdec184ff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 0eb5bafa194892c74295568bf626948217a9e77e..0a8fbdec0f655813a16fdecac9de0affc7ba2cf8 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -96,13 +96,19 @@ pub fn rose_pine() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0x6bbca3ff).into()), + conflict: Some(rgba(0xe99d35ff).into()), + created: Some(rgba(0x3eaa8eff).into()), deleted: Some(rgba(0xb4647aff).into()), error: Some(rgba(0xb4647aff).into()), - hint: Some(rgba(0x7a92aaff).into()), + hidden: Some(rgba(0x938fa3ff).into()), + hint: Some(rgba(0x57949fff).into()), + ignored: Some(rgba(0x706c8cff).into()), + info: Some(rgba(0x57949fff).into()), modified: Some(rgba(0xe99d35ff).into()), - predictive: Some(rgba(0xa2acbeff).into()), - success: Some(rgba(0x575279ff).into()), + predictive: Some(rgba(0x3eaa8eff).into()), + renamed: Some(rgba(0x57949fff).into()), + success: Some(rgba(0x3eaa8eff).into()), + unreachable: Some(rgba(0x706c8cff).into()), warning: Some(rgba(0xe99d35ff).into()), ..Default::default() }, @@ -520,13 +526,19 @@ pub fn rose_pine() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xf5c177ff).into()), created: Some(rgba(0x5dc2a3ff).into()), - deleted: Some(rgba(0xbe5773ff).into()), + deleted: Some(rgba(0xea6f92ff).into()), error: Some(rgba(0xea6f92ff).into()), - hint: Some(rgba(0x728aa2ff).into()), + hidden: Some(rgba(0x615d7aff).into()), + hint: Some(rgba(0x9cced7ff).into()), + ignored: Some(rgba(0x85819eff).into()), + info: Some(rgba(0x9cced7ff).into()), modified: Some(rgba(0xf5c177ff).into()), - predictive: Some(rgba(0x516b83ff).into()), - success: Some(rgba(0xe0def4ff).into()), + predictive: Some(rgba(0x5dc2a3ff).into()), + renamed: Some(rgba(0x9cced7ff).into()), + success: Some(rgba(0x5dc2a3ff).into()), + unreachable: Some(rgba(0x85819eff).into()), warning: Some(rgba(0xf5c177ff).into()), ..Default::default() }, @@ -944,13 +956,19 @@ pub fn rose_pine() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xf5c177ff).into()), created: Some(rgba(0x5dc2a3ff).into()), - deleted: Some(rgba(0xbe5773ff).into()), + deleted: Some(rgba(0xea6f92ff).into()), error: Some(rgba(0xea6f92ff).into()), - hint: Some(rgba(0x5e768cff).into()), + hidden: Some(rgba(0x2f2b43ff).into()), + hint: Some(rgba(0x9cced7ff).into()), + ignored: Some(rgba(0x75718eff).into()), + info: Some(rgba(0x9cced7ff).into()), modified: Some(rgba(0xf5c177ff).into()), - predictive: Some(rgba(0x556b81ff).into()), - success: Some(rgba(0xe0def4ff).into()), + predictive: Some(rgba(0x5dc2a3ff).into()), + renamed: Some(rgba(0x9cced7ff).into()), + success: Some(rgba(0x5dc2a3ff).into()), + unreachable: Some(rgba(0x75718eff).into()), warning: Some(rgba(0xf5c177ff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs index 3b71f5e4f888ca6a1cdc1df9dc7087268a9a967c..df1f7496cedbc7ae48e571501ccb92857a058d42 100644 --- a/crates/theme2/src/themes/sandcastle.rs +++ b/crates/theme2/src/themes/sandcastle.rs @@ -95,13 +95,19 @@ pub fn sandcastle() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xa07e3bff).into()), created: Some(rgba(0x83a598ff).into()), - deleted: Some(rgba(0x8d4f61ff).into()), + deleted: Some(rgba(0xb4637aff).into()), error: Some(rgba(0xb4637aff).into()), - hint: Some(rgba(0x727d68ff).into()), + hidden: Some(rgba(0x827568ff).into()), + hint: Some(rgba(0x528b8bff).into()), + ignored: Some(rgba(0xa69782ff).into()), + info: Some(rgba(0x528b8bff).into()), modified: Some(rgba(0xa07e3bff).into()), - predictive: Some(rgba(0x5c6152ff).into()), - success: Some(rgba(0xfdf4c1ff).into()), + predictive: Some(rgba(0x83a598ff).into()), + renamed: Some(rgba(0x528b8bff).into()), + success: Some(rgba(0x83a598ff).into()), + unreachable: Some(rgba(0xa69782ff).into()), warning: Some(rgba(0xa07e3bff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 4c839f010128f95937d6ef792ce9ebbcbd73195a..b52fe34467804b1f25c89423d097a124158e5394 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -96,13 +96,19 @@ pub fn solarized() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - created: Some(rgba(0xa0ad46ff).into()), + conflict: Some(rgba(0xb58904ff).into()), + created: Some(rgba(0x859904ff).into()), deleted: Some(rgba(0xdc3330ff).into()), error: Some(rgba(0xdc3330ff).into()), - hint: Some(rgba(0x5889a3ff).into()), + hidden: Some(rgba(0x6a7f86ff).into()), + hint: Some(rgba(0x298bd1ff).into()), + ignored: Some(rgba(0x34555eff).into()), + info: Some(rgba(0x298bd1ff).into()), modified: Some(rgba(0xb58904ff).into()), - predictive: Some(rgba(0x679aafff).into()), - success: Some(rgba(0x002b36ff).into()), + predictive: Some(rgba(0x859904ff).into()), + renamed: Some(rgba(0x298bd1ff).into()), + success: Some(rgba(0x859904ff).into()), + unreachable: Some(rgba(0x34555eff).into()), warning: Some(rgba(0xb58904ff).into()), ..Default::default() }, @@ -506,13 +512,19 @@ pub fn solarized() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xb58903ff).into()), created: Some(rgba(0x859904ff).into()), - deleted: Some(rgba(0xb52727ff).into()), + deleted: Some(rgba(0xdc3330ff).into()), error: Some(rgba(0xdc3330ff).into()), - hint: Some(rgba(0x4f8297ff).into()), + hidden: Some(rgba(0x6f8389ff).into()), + hint: Some(rgba(0x288bd1ff).into()), + ignored: Some(rgba(0x93a1a1ff).into()), + info: Some(rgba(0x288bd1ff).into()), modified: Some(rgba(0xb58903ff).into()), - predictive: Some(rgba(0x40728bff).into()), - success: Some(rgba(0xfdf6e3ff).into()), + predictive: Some(rgba(0x859904ff).into()), + renamed: Some(rgba(0x288bd1ff).into()), + success: Some(rgba(0x859904ff).into()), + unreachable: Some(rgba(0x93a1a1ff).into()), warning: Some(rgba(0xb58903ff).into()), ..Default::default() }, diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs index d46aa776faa7eebc87a9435ab835dfd2babc6e7c..cd27fc1db8bfe749cc599d4c18a86cc4b776cf97 100644 --- a/crates/theme2/src/themes/summercamp.rs +++ b/crates/theme2/src/themes/summercamp.rs @@ -95,13 +95,19 @@ pub fn summercamp() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { + conflict: Some(rgba(0xf1fe29ff).into()), created: Some(rgba(0x5dea5aff).into()), - deleted: Some(rgba(0xb93f36ff).into()), + deleted: Some(rgba(0xe35142ff).into()), error: Some(rgba(0xe35142ff).into()), - hint: Some(rgba(0x246e61ff).into()), + hidden: Some(rgba(0x4c4735ff).into()), + hint: Some(rgba(0x499befff).into()), + ignored: Some(rgba(0x736e55ff).into()), + info: Some(rgba(0x499befff).into()), modified: Some(rgba(0xf1fe29ff).into()), - predictive: Some(rgba(0x79434bff).into()), - success: Some(rgba(0xf8f5deff).into()), + predictive: Some(rgba(0x5dea5aff).into()), + renamed: Some(rgba(0x499befff).into()), + success: Some(rgba(0x5dea5aff).into()), + unreachable: Some(rgba(0x736e55ff).into()), warning: Some(rgba(0xf1fe29ff).into()), ..Default::default() }, diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 1b1c5795a0a62a1e95808272631fe9185757da0b..c89b88493a6aeb737fc43600eb6cb025a03800a8 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -71,20 +71,26 @@ impl Zed1ThemeConverter { Some(zed1_color_to_hsla(color)) } - let editor = &self.theme.editor; - let diff_style = &self.theme.editor.diff; - let diagnostic_summary = &self.theme.workspace.status_bar.diagnostic_summary; + let base_theme: ColorScheme = serde_json::from_value(self.theme.base_theme.clone()) + .with_context(|| "failed to parse `theme.base_theme`")?; + + let lowest = &base_theme.lowest; 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), - hint: editor.hint.color.map(zed1_color_to_hsla), - predictive: editor.suggestion.color.map(zed1_color_to_hsla), - ..Default::default() + created: convert(lowest.positive.default.foreground), + modified: convert(lowest.warning.default.foreground), + deleted: convert(lowest.negative.default.foreground), + success: convert(lowest.positive.default.foreground), + warning: convert(lowest.warning.default.foreground), + error: convert(lowest.negative.default.foreground), + hint: convert(lowest.accent.default.foreground), + predictive: convert(lowest.positive.default.foreground), + conflict: convert(lowest.warning.default.foreground), + hidden: convert(lowest.base.disabled.foreground), + ignored: convert(lowest.variant.default.foreground), + info: convert(lowest.accent.default.foreground), + renamed: convert(lowest.accent.default.foreground), + unreachable: convert(lowest.variant.default.foreground), // TODO: Should this be transparent? }) }