From c7e19c0bcde8d38839ce870a2eaca64d0a57f301 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Thu, 7 Dec 2023 18:34:03 -0500 Subject: [PATCH] Emit accurate hex colors in generated themes (#3547) This PR fixes an issues where the hex colors in the generated themes were not correct. We're using the [`palette`](https://crates.io/crates/palette) crate to perform the conversions, as this gives us accurate hex codes that match the VS Code source themes. Release Notes: - N/A --- Cargo.lock | 60 +- crates/theme2/src/themes/andromeda.rs | 96 +-- crates/theme2/src/themes/ayu.rs | 158 ++-- crates/theme2/src/themes/dracula.rs | 24 +- crates/theme2/src/themes/gruvbox.rs | 258 +++---- crates/theme2/src/themes/night_owl.rs | 94 +-- crates/theme2/src/themes/noctis.rs | 682 +++++++++--------- crates/theme2/src/themes/nord.rs | 18 +- crates/theme2/src/themes/palenight.rs | 132 ++-- crates/theme2/src/themes/rose_pine.rs | 84 +-- crates/theme2/src/themes/solarized.rs | 106 +-- crates/theme2/src/themes/synthwave_84.rs | 64 +- crates/theme_importer/Cargo.toml | 1 + crates/theme_importer/src/color.rs | 54 ++ crates/theme_importer/src/main.rs | 1 + crates/theme_importer/src/theme_printer.rs | 6 +- crates/theme_importer/src/vscode/converter.rs | 7 +- 17 files changed, 974 insertions(+), 871 deletions(-) create mode 100644 crates/theme_importer/src/color.rs diff --git a/Cargo.lock b/Cargo.lock index 1f15c9c8e6..841812e19e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -312,6 +312,15 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -1378,10 +1387,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.84" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ + "jobserver", "libc", ] @@ -3162,6 +3172,12 @@ dependencies = [ "regex", ] +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + [[package]] name = "fastrand" version = "1.9.0" @@ -4654,6 +4670,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + [[package]] name = "journal" version = "0.1.0" @@ -5029,18 +5054,18 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linkme" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" +checksum = "b1e6b0bb9ca88d3c5ae88240beb9683821f903b824ee8381ef9ab4e8522fbfa9" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" +checksum = "b3b3f61e557a617ec6ba36c79431e1f3b5e100d67cfbdb61ed6ef384298af016" dependencies = [ "proc-macro2", "quote", @@ -6263,6 +6288,28 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + [[package]] name = "parity-tokio-ipc" version = "0.9.0" @@ -9695,6 +9742,7 @@ dependencies = [ "indexmap 1.9.3", "json_comments", "log", + "palette", "rust-embed", "serde", "simplelog", diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 16b2fa9632..fb606c1650 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -33,30 +33,30 @@ pub fn andromeda() -> UserThemeFamily { element_selected: Some(rgba(0x23262eff).into()), drop_target_background: Some(rgba(0x3a404eff).into()), ghost_element_hover: Some(rgba(0x23262eff).into()), - text: Some(rgba(0xd4cdd8ff).into()), + text: Some(rgba(0xd5ced9ff).into()), tab_inactive_background: Some(rgba(0x23262eff).into()), tab_active_background: Some(rgba(0x23262eff).into()), editor_background: Some(rgba(0x23262eff).into()), editor_gutter_background: Some(rgba(0x23262eff).into()), editor_line_number: Some(rgba(0x746f77ff).into()), - editor_active_line_number: Some(rgba(0xd4cdd8ff).into()), - terminal_ansi_bright_red: Some(rgba(0xee5d42ff).into()), - terminal_ansi_bright_green: Some(rgba(0x95e072ff).into()), + editor_active_line_number: Some(rgba(0xd5ced9ff).into()), + terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()), + terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()), - terminal_ansi_bright_blue: Some(rgba(0x7bb7ffff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xff00a9ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()), terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()), - terminal_ansi_red: Some(rgba(0xee5d42ff).into()), - terminal_ansi_green: Some(rgba(0x95e072ff).into()), + terminal_ansi_red: Some(rgba(0xee5d43ff).into()), + terminal_ansi_green: Some(rgba(0x96e072ff).into()), terminal_ansi_yellow: Some(rgba(0xffe66dff).into()), - terminal_ansi_blue: Some(rgba(0x7bb7ffff).into()), - terminal_ansi_magenta: Some(rgba(0xff00a9ff).into()), + terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()), + terminal_ansi_magenta: Some(rgba(0xff00aaff).into()), terminal_ansi_cyan: Some(rgba(0x00e8c6ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xfc634cff).into()), - error: Some(rgba(0xfc634cff).into()), + deleted: Some(rgba(0xfc644dff).into()), + error: Some(rgba(0xfc644dff).into()), hidden: Some(rgba(0x746f77ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() @@ -66,28 +66,28 @@ pub fn andromeda() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xf39c11ff).into()), + color: Some(rgba(0xf39c12ff).into()), ..Default::default() }, ), ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x9fa0a6cc).into()), + color: Some(rgba(0xa0a1a7cc).into()), ..Default::default() }, ), ( "emphasis".into(), UserHighlightStyle { - color: Some(rgba(0xc64dedff).into()), + color: Some(rgba(0xc74dedff).into()), ..Default::default() }, ), ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xf39c11ff).into()), + color: Some(rgba(0xf39c12ff).into()), ..Default::default() }, ), @@ -101,42 +101,42 @@ pub fn andromeda() -> UserThemeFamily { ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xc64dedff).into()), + color: Some(rgba(0xc74dedff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xf39c11ff).into()), + color: Some(rgba(0xf39c12ff).into()), ..Default::default() }, ), ( "operator".into(), UserHighlightStyle { - color: Some(rgba(0xee5d42ff).into()), + color: Some(rgba(0xee5d43ff).into()), ..Default::default() }, ), ( "string".into(), UserHighlightStyle { - color: Some(rgba(0x95e072ff).into()), + color: Some(rgba(0x96e072ff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xf92571ff).into()), + color: Some(rgba(0xf92672ff).into()), ..Default::default() }, ), ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0x95e072ff).into()), + color: Some(rgba(0x96e072ff).into()), ..Default::default() }, ), @@ -171,36 +171,36 @@ pub fn andromeda() -> UserThemeFamily { border_disabled: Some(rgba(0x1b1d23ff).into()), elevated_surface_background: Some(rgba(0x23262eff).into()), surface_background: Some(rgba(0x23262eff).into()), - background: Some(rgba(0x262933ff).into()), + background: Some(rgba(0x262a33ff).into()), element_background: Some(rgba(0x00e8c5cc).into()), element_hover: Some(rgba(0x23262eff).into()), element_selected: Some(rgba(0x23262eff).into()), drop_target_background: Some(rgba(0x3a404eff).into()), ghost_element_hover: Some(rgba(0x23262eff).into()), - text: Some(rgba(0xd4cdd8ff).into()), + text: Some(rgba(0xd5ced9ff).into()), tab_inactive_background: Some(rgba(0x23262eff).into()), - tab_active_background: Some(rgba(0x262933ff).into()), - editor_background: Some(rgba(0x262933ff).into()), - editor_gutter_background: Some(rgba(0x262933ff).into()), + tab_active_background: Some(rgba(0x262a33ff).into()), + editor_background: Some(rgba(0x262a33ff).into()), + editor_gutter_background: Some(rgba(0x262a33ff).into()), editor_line_number: Some(rgba(0x746f77ff).into()), - editor_active_line_number: Some(rgba(0xd4cdd8ff).into()), - terminal_ansi_bright_red: Some(rgba(0xee5d42ff).into()), - terminal_ansi_bright_green: Some(rgba(0x95e072ff).into()), + editor_active_line_number: Some(rgba(0xd5ced9ff).into()), + terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()), + terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()), - terminal_ansi_bright_blue: Some(rgba(0x7bb7ffff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xff00a9ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()), terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()), - terminal_ansi_red: Some(rgba(0xee5d42ff).into()), - terminal_ansi_green: Some(rgba(0x95e072ff).into()), + terminal_ansi_red: Some(rgba(0xee5d43ff).into()), + terminal_ansi_green: Some(rgba(0x96e072ff).into()), terminal_ansi_yellow: Some(rgba(0xffe66dff).into()), - terminal_ansi_blue: Some(rgba(0x7bb7ffff).into()), - terminal_ansi_magenta: Some(rgba(0xff00a9ff).into()), + terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()), + terminal_ansi_magenta: Some(rgba(0xff00aaff).into()), terminal_ansi_cyan: Some(rgba(0x00e8c6ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xfc634cff).into()), - error: Some(rgba(0xfc634cff).into()), + deleted: Some(rgba(0xfc644dff).into()), + error: Some(rgba(0xfc644dff).into()), hidden: Some(rgba(0x746f77ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() @@ -210,28 +210,28 @@ pub fn andromeda() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xf39c11ff).into()), + color: Some(rgba(0xf39c12ff).into()), ..Default::default() }, ), ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x9fa0a6cc).into()), + color: Some(rgba(0xa0a1a7cc).into()), ..Default::default() }, ), ( "emphasis".into(), UserHighlightStyle { - color: Some(rgba(0xc64dedff).into()), + color: Some(rgba(0xc74dedff).into()), ..Default::default() }, ), ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xf39c11ff).into()), + color: Some(rgba(0xf39c12ff).into()), ..Default::default() }, ), @@ -245,42 +245,42 @@ pub fn andromeda() -> UserThemeFamily { ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xc64dedff).into()), + color: Some(rgba(0xc74dedff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xf39c11ff).into()), + color: Some(rgba(0xf39c12ff).into()), ..Default::default() }, ), ( "operator".into(), UserHighlightStyle { - color: Some(rgba(0xee5d42ff).into()), + color: Some(rgba(0xee5d43ff).into()), ..Default::default() }, ), ( "string".into(), UserHighlightStyle { - color: Some(rgba(0x95e072ff).into()), + color: Some(rgba(0x96e072ff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xf92571ff).into()), + color: Some(rgba(0xf92672ff).into()), ..Default::default() }, ), ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0x95e072ff).into()), + color: Some(rgba(0x96e072ff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index 8651ee2028..39ac2660e6 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -21,17 +21,17 @@ pub fn ayu() -> UserThemeFamily { colors: ThemeColorsRefinement { border: Some(rgba(0x6b7d8f1f).into()), border_variant: Some(rgba(0x6b7d8f1f).into()), - border_focused: Some(rgba(0xffaa32b3).into()), + border_focused: Some(rgba(0xffaa33b3).into()), border_selected: Some(rgba(0x6b7d8f1f).into()), border_transparent: Some(rgba(0x6b7d8f1f).into()), border_disabled: Some(rgba(0x6b7d8f1f).into()), elevated_surface_background: Some(rgba(0xf8f9faff).into()), surface_background: Some(rgba(0xf8f9faff).into()), background: Some(rgba(0xf8f9faff).into()), - element_background: Some(rgba(0xffaa32ff).into()), - element_hover: Some(rgba(0x55728f1f).into()), - element_selected: Some(rgba(0x55728f1f).into()), - ghost_element_hover: Some(rgba(0x55728f1f).into()), + element_background: Some(rgba(0xffaa33ff).into()), + element_hover: Some(rgba(0x56728f1f).into()), + element_selected: Some(rgba(0x56728f1f).into()), + ghost_element_hover: Some(rgba(0x56728f1f).into()), text: Some(rgba(0x8a9199ff).into()), tab_inactive_background: Some(rgba(0xf8f9faff).into()), tab_active_background: Some(rgba(0xf8f9faff).into()), @@ -41,18 +41,18 @@ pub fn ayu() -> UserThemeFamily { editor_active_line_number: Some(rgba(0x5c6166ff).into()), terminal_background: Some(rgba(0xf8f9faff).into()), terminal_ansi_bright_black: Some(rgba(0x686868ff).into()), - terminal_ansi_bright_red: Some(rgba(0xef7070ff).into()), + terminal_ansi_bright_red: Some(rgba(0xf07171ff).into()), terminal_ansi_bright_green: Some(rgba(0x86b300ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xf2ad48ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x389ee6ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xf2ae49ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x399ee6ff).into()), terminal_ansi_bright_magenta: Some(rgba(0xa37accff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x4bbf98ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x4cbf99ff).into()), terminal_ansi_bright_white: Some(rgba(0xd1d1d1ff).into()), terminal_ansi_black: Some(rgba(0x000000ff).into()), terminal_ansi_red: Some(rgba(0xea6c6dff).into()), terminal_ansi_green: Some(rgba(0x6cbf43ff).into()), terminal_ansi_yellow: Some(rgba(0xeca944ff).into()), - terminal_ansi_blue: Some(rgba(0x3198e1ff).into()), + terminal_ansi_blue: Some(rgba(0x3199e1ff).into()), terminal_ansi_magenta: Some(rgba(0x9e75c7ff).into()), terminal_ansi_cyan: Some(rgba(0x46ba94ff).into()), terminal_ansi_white: Some(rgba(0xc7c7c7ff).into()), @@ -70,7 +70,7 @@ pub fn ayu() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xf2ad48ff).into()), + color: Some(rgba(0xf2ae49ff).into()), ..Default::default() }, ), @@ -92,7 +92,7 @@ pub fn ayu() -> UserThemeFamily { ( "constant".into(), UserHighlightStyle { - color: Some(rgba(0x4bbf98ff).into()), + color: Some(rgba(0x4cbf99ff).into()), ..Default::default() }, ), @@ -106,7 +106,7 @@ pub fn ayu() -> UserThemeFamily { ( "emphasis".into(), UserHighlightStyle { - color: Some(rgba(0xef7070ff).into()), + color: Some(rgba(0xf07171ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -114,7 +114,7 @@ pub fn ayu() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xef7070ff).into()), + color: Some(rgba(0xf07171ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -122,7 +122,7 @@ pub fn ayu() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xf2ad48ff).into()), + color: Some(rgba(0xf2ae49ff).into()), ..Default::default() }, ), @@ -143,14 +143,14 @@ pub fn ayu() -> UserThemeFamily { ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x55b4d3ff).into()), + color: Some(rgba(0x55b4d4ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x55b4d3ff).into()), + color: Some(rgba(0x55b4d4ff).into()), ..Default::default() }, ), @@ -164,14 +164,14 @@ pub fn ayu() -> UserThemeFamily { ( "operator".into(), UserHighlightStyle { - color: Some(rgba(0xed9365ff).into()), + color: Some(rgba(0xed9366ff).into()), ..Default::default() }, ), ( "property".into(), UserHighlightStyle { - color: Some(rgba(0xef7070ff).into()), + color: Some(rgba(0xf07171ff).into()), ..Default::default() }, ), @@ -185,7 +185,7 @@ pub fn ayu() -> UserThemeFamily { ( "punctuation.bracket".into(), UserHighlightStyle { - color: Some(rgba(0x55b4d380).into()), + color: Some(rgba(0x55b4d480).into()), ..Default::default() }, ), @@ -199,7 +199,7 @@ pub fn ayu() -> UserThemeFamily { ( "punctuation.list_marker".into(), UserHighlightStyle { - color: Some(rgba(0xf2ad48ff).into()), + color: Some(rgba(0xf2ae49ff).into()), ..Default::default() }, ), @@ -213,7 +213,7 @@ pub fn ayu() -> UserThemeFamily { ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0x4bbf98ff).into()), + color: Some(rgba(0x4cbf99ff).into()), ..Default::default() }, ), @@ -234,7 +234,7 @@ pub fn ayu() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0x55b4d3ff).into()), + color: Some(rgba(0x55b4d4ff).into()), ..Default::default() }, ), @@ -248,14 +248,14 @@ pub fn ayu() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x389ee6ff).into()), + color: Some(rgba(0x399ee6ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x55b4d3ff).into()), + color: Some(rgba(0x55b4d4ff).into()), ..Default::default() }, ), @@ -269,7 +269,7 @@ pub fn ayu() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xef7070ff).into()), + color: Some(rgba(0xf07171ff).into()), ..Default::default() }, ), @@ -282,16 +282,16 @@ pub fn ayu() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x171a24ff).into()), - border_variant: Some(rgba(0x171a24ff).into()), - border_focused: Some(rgba(0xffcb65b3).into()), - border_selected: Some(rgba(0x171a24ff).into()), - border_transparent: Some(rgba(0x171a24ff).into()), - border_disabled: Some(rgba(0x171a24ff).into()), + border: Some(rgba(0x171b24ff).into()), + border_variant: Some(rgba(0x171b24ff).into()), + border_focused: Some(rgba(0xffcc66b3).into()), + border_selected: Some(rgba(0x171b24ff).into()), + border_transparent: Some(rgba(0x171b24ff).into()), + border_disabled: Some(rgba(0x171b24ff).into()), elevated_surface_background: Some(rgba(0x1f2430ff).into()), surface_background: Some(rgba(0x1f2430ff).into()), background: Some(rgba(0x1f2430ff).into()), - element_background: Some(rgba(0xffcb65ff).into()), + element_background: Some(rgba(0xffcc66ff).into()), element_hover: Some(rgba(0x63759926).into()), element_selected: Some(rgba(0x63759926).into()), ghost_element_hover: Some(rgba(0x63759926).into()), @@ -304,26 +304,26 @@ pub fn ayu() -> UserThemeFamily { editor_active_line_number: Some(rgba(0xcccac2ff).into()), terminal_background: Some(rgba(0x1f2430ff).into()), terminal_ansi_bright_black: Some(rgba(0x686868ff).into()), - terminal_ansi_bright_red: Some(rgba(0xf18678ff).into()), - terminal_ansi_bright_green: Some(rgba(0xd4fe7fff).into()), + terminal_ansi_bright_red: Some(rgba(0xf28779ff).into()), + terminal_ansi_bright_green: Some(rgba(0xd5ff80ff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffd173ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x73cfffff).into()), + terminal_ansi_bright_blue: Some(rgba(0x73d0ffff).into()), terminal_ansi_bright_magenta: Some(rgba(0xdfbfffff).into()), terminal_ansi_bright_cyan: Some(rgba(0x95e6cbff).into()), terminal_ansi_bright_white: Some(rgba(0xffffffff).into()), - terminal_ansi_black: Some(rgba(0x171a24ff).into()), - terminal_ansi_red: Some(rgba(0xed8173ff).into()), - terminal_ansi_green: Some(rgba(0x86d96bff).into()), + terminal_ansi_black: Some(rgba(0x171b24ff).into()), + terminal_ansi_red: Some(rgba(0xed8274ff).into()), + terminal_ansi_green: Some(rgba(0x87d96cff).into()), terminal_ansi_yellow: Some(rgba(0xfacc6eff).into()), - terminal_ansi_blue: Some(rgba(0x6ccafaff).into()), + terminal_ansi_blue: Some(rgba(0x6dcbfaff).into()), terminal_ansi_magenta: Some(rgba(0xdabafaff).into()), terminal_ansi_cyan: Some(rgba(0x90e1c6ff).into()), terminal_ansi_white: Some(rgba(0xc7c7c7ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xff6565ff).into()), - error: Some(rgba(0xff6565ff).into()), + deleted: Some(rgba(0xff6666ff).into()), + error: Some(rgba(0xff6666ff).into()), hidden: Some(rgba(0x707a8cff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() @@ -369,7 +369,7 @@ pub fn ayu() -> UserThemeFamily { ( "emphasis".into(), UserHighlightStyle { - color: Some(rgba(0xf18678ff).into()), + color: Some(rgba(0xf28779ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -377,7 +377,7 @@ pub fn ayu() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xf18678ff).into()), + color: Some(rgba(0xf28779ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -392,14 +392,14 @@ pub fn ayu() -> UserThemeFamily { ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xffad65ff).into()), + color: Some(rgba(0xffad66ff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xd4fe7fff).into()), + color: Some(rgba(0xd5ff80ff).into()), ..Default::default() }, ), @@ -434,7 +434,7 @@ pub fn ayu() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0xf18678ff).into()), + color: Some(rgba(0xf28779ff).into()), ..Default::default() }, ), @@ -469,7 +469,7 @@ pub fn ayu() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0xd4fe7fff).into()), + color: Some(rgba(0xd5ff80ff).into()), ..Default::default() }, ), @@ -483,14 +483,14 @@ pub fn ayu() -> UserThemeFamily { ( "string.special".into(), UserHighlightStyle { - color: Some(rgba(0xd4fe7fff).into()), + color: Some(rgba(0xd5ff80ff).into()), ..Default::default() }, ), ( "string.special.symbol".into(), UserHighlightStyle { - color: Some(rgba(0xd4fe7fff).into()), + color: Some(rgba(0xd5ff80ff).into()), ..Default::default() }, ), @@ -504,14 +504,14 @@ pub fn ayu() -> UserThemeFamily { ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0xd4fe7fff).into()), + color: Some(rgba(0xd5ff80ff).into()), ..Default::default() }, ), ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x73cfffff).into()), + color: Some(rgba(0x73d0ffff).into()), ..Default::default() }, ), @@ -532,7 +532,7 @@ pub fn ayu() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xf18678ff).into()), + color: Some(rgba(0xf28779ff).into()), ..Default::default() }, ), @@ -567,19 +567,19 @@ pub fn ayu() -> UserThemeFamily { editor_active_line_number: Some(rgba(0xbfbdb6ff).into()), terminal_background: Some(rgba(0x0b0e14ff).into()), terminal_ansi_bright_black: Some(rgba(0x686868ff).into()), - terminal_ansi_bright_red: Some(rgba(0xef7077ff).into()), - terminal_ansi_bright_green: Some(rgba(0xa9d94bff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xffb353ff).into()), + terminal_ansi_bright_red: Some(rgba(0xf07178ff).into()), + terminal_ansi_bright_green: Some(rgba(0xaad94cff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xffb454ff).into()), terminal_ansi_bright_blue: Some(rgba(0x59c2ffff).into()), terminal_ansi_bright_magenta: Some(rgba(0xd2a6ffff).into()), terminal_ansi_bright_cyan: Some(rgba(0x95e6cbff).into()), terminal_ansi_bright_white: Some(rgba(0xffffffff).into()), terminal_ansi_black: Some(rgba(0x1e232bff).into()), - terminal_ansi_red: Some(rgba(0xea6c72ff).into()), - terminal_ansi_green: Some(rgba(0x7ed962ff).into()), + terminal_ansi_red: Some(rgba(0xea6c73ff).into()), + terminal_ansi_green: Some(rgba(0x7fd962ff).into()), terminal_ansi_yellow: Some(rgba(0xf9af4fff).into()), - terminal_ansi_blue: Some(rgba(0x52bdfaff).into()), - terminal_ansi_magenta: Some(rgba(0xcca1faff).into()), + terminal_ansi_blue: Some(rgba(0x53bdfaff).into()), + terminal_ansi_magenta: Some(rgba(0xcda1faff).into()), terminal_ansi_cyan: Some(rgba(0x90e1c6ff).into()), terminal_ansi_white: Some(rgba(0xc7c7c7ff).into()), ..Default::default() @@ -596,7 +596,7 @@ pub fn ayu() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xffb353ff).into()), + color: Some(rgba(0xffb454ff).into()), ..Default::default() }, ), @@ -610,7 +610,7 @@ pub fn ayu() -> UserThemeFamily { ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0xabb5be8c).into()), + color: Some(rgba(0xacb6bf8c).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -632,7 +632,7 @@ pub fn ayu() -> UserThemeFamily { ( "emphasis".into(), UserHighlightStyle { - color: Some(rgba(0xef7077ff).into()), + color: Some(rgba(0xf07178ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -640,7 +640,7 @@ pub fn ayu() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xef7077ff).into()), + color: Some(rgba(0xf07178ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -648,35 +648,35 @@ pub fn ayu() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xffb353ff).into()), + color: Some(rgba(0xffb454ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xff8f3fff).into()), + color: Some(rgba(0xff8f40ff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xa9d94bff).into()), + color: Some(rgba(0xaad94cff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x38b9e6ff).into()), + color: Some(rgba(0x39bae6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x38b9e6ff).into()), + color: Some(rgba(0x39bae6ff).into()), ..Default::default() }, ), @@ -697,7 +697,7 @@ pub fn ayu() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0xef7077ff).into()), + color: Some(rgba(0xf07178ff).into()), ..Default::default() }, ), @@ -711,7 +711,7 @@ pub fn ayu() -> UserThemeFamily { ( "punctuation.bracket".into(), UserHighlightStyle { - color: Some(rgba(0x38b9e680).into()), + color: Some(rgba(0x39bae680).into()), ..Default::default() }, ), @@ -725,14 +725,14 @@ pub fn ayu() -> UserThemeFamily { ( "punctuation.list_marker".into(), UserHighlightStyle { - color: Some(rgba(0xffb353ff).into()), + color: Some(rgba(0xffb454ff).into()), ..Default::default() }, ), ( "string".into(), UserHighlightStyle { - color: Some(rgba(0xa9d94bff).into()), + color: Some(rgba(0xaad94cff).into()), ..Default::default() }, ), @@ -746,28 +746,28 @@ pub fn ayu() -> UserThemeFamily { ( "string.special".into(), UserHighlightStyle { - color: Some(rgba(0xa9d94bff).into()), + color: Some(rgba(0xaad94cff).into()), ..Default::default() }, ), ( "string.special.symbol".into(), UserHighlightStyle { - color: Some(rgba(0xa9d94bff).into()), + color: Some(rgba(0xaad94cff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0x38b9e6ff).into()), + color: Some(rgba(0x39bae6ff).into()), ..Default::default() }, ), ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0xa9d94bff).into()), + color: Some(rgba(0xaad94cff).into()), ..Default::default() }, ), @@ -781,7 +781,7 @@ pub fn ayu() -> UserThemeFamily { ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x38b9e6ff).into()), + color: Some(rgba(0x39bae6ff).into()), ..Default::default() }, ), @@ -795,7 +795,7 @@ pub fn ayu() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xef7077ff).into()), + color: Some(rgba(0xf07178ff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index b5cf0e879f..49caf3cff9 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -24,9 +24,9 @@ pub fn dracula() -> UserThemeFamily { border_selected: Some(rgba(0xbd93f9ff).into()), border_transparent: Some(rgba(0xbd93f9ff).into()), border_disabled: Some(rgba(0xbd93f9ff).into()), - elevated_surface_background: Some(rgba(0x282a35ff).into()), - surface_background: Some(rgba(0x282a35ff).into()), - background: Some(rgba(0x282a35ff).into()), + elevated_surface_background: Some(rgba(0x282a36ff).into()), + surface_background: Some(rgba(0x282a36ff).into()), + background: Some(rgba(0x282a36ff).into()), element_background: Some(rgba(0x44475aff).into()), element_hover: Some(rgba(0x44475a75).into()), element_selected: Some(rgba(0x44475aff).into()), @@ -34,19 +34,19 @@ pub fn dracula() -> UserThemeFamily { ghost_element_hover: Some(rgba(0x44475a75).into()), text: Some(rgba(0xf8f8f2ff).into()), tab_inactive_background: Some(rgba(0x21222cff).into()), - tab_active_background: Some(rgba(0x282a35ff).into()), - editor_background: Some(rgba(0x282a35ff).into()), - editor_gutter_background: Some(rgba(0x282a35ff).into()), + tab_active_background: Some(rgba(0x282a36ff).into()), + editor_background: Some(rgba(0x282a36ff).into()), + editor_gutter_background: Some(rgba(0x282a36ff).into()), editor_line_number: Some(rgba(0x6272a4ff).into()), editor_active_line_number: Some(rgba(0xf8f8f2ff).into()), - terminal_background: Some(rgba(0x282a35ff).into()), + terminal_background: Some(rgba(0x282a36ff).into()), terminal_ansi_bright_black: Some(rgba(0x6272a4ff).into()), - terminal_ansi_bright_red: Some(rgba(0xff6d6dff).into()), + terminal_ansi_bright_red: Some(rgba(0xff6e6eff).into()), terminal_ansi_bright_green: Some(rgba(0x69ff94ff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffffa5ff).into()), - terminal_ansi_bright_blue: Some(rgba(0xd6abfeff).into()), + terminal_ansi_bright_blue: Some(rgba(0xd6acffff).into()), terminal_ansi_bright_magenta: Some(rgba(0xff92dfff).into()), - terminal_ansi_bright_cyan: Some(rgba(0xa3fefeff).into()), + terminal_ansi_bright_cyan: Some(rgba(0xa4ffffff).into()), terminal_ansi_bright_white: Some(rgba(0xffffffff).into()), terminal_ansi_black: Some(rgba(0x21222cff).into()), terminal_ansi_red: Some(rgba(0xff5555ff).into()), @@ -63,7 +63,7 @@ pub fn dracula() -> UserThemeFamily { error: Some(rgba(0xff5555ff).into()), hidden: Some(rgba(0x6272a4ff).into()), hint: Some(rgba(0x969696ff).into()), - warning: Some(rgba(0xffb76bff).into()), + warning: Some(rgba(0xffb86cff).into()), ..Default::default() }, syntax: Some(UserSyntaxTheme { @@ -94,7 +94,7 @@ pub fn dracula() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xffb76bff).into()), + color: Some(rgba(0xffb86cff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 16957b3597..7de52df753 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -26,7 +26,7 @@ pub fn gruvbox() -> UserThemeFamily { border_transparent: Some(rgba(0x3c3836ff).into()), border_disabled: Some(rgba(0x3c3836ff).into()), background: Some(rgba(0x1d2021ff).into()), - element_background: Some(rgba(0x44858780).into()), + element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0x3c383680).into()), element_selected: Some(rgba(0x3c383680).into()), drop_target_background: Some(rgba(0x3c3836ff).into()), @@ -40,26 +40,26 @@ pub fn gruvbox() -> UserThemeFamily { editor_active_line_number: Some(rgba(0xebdbb2ff).into()), terminal_background: Some(rgba(0x1d2021ff).into()), terminal_ansi_bright_black: Some(rgba(0x928374ff).into()), - terminal_ansi_bright_red: Some(rgba(0xfb4833ff).into()), - terminal_ansi_bright_green: Some(rgba(0xb8bb25ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xfabd2eff).into()), + terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()), + terminal_ansi_bright_green: Some(rgba(0xb8bb26ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xfabd2fff).into()), terminal_ansi_bright_blue: Some(rgba(0x83a598ff).into()), terminal_ansi_bright_magenta: Some(rgba(0xd3869bff).into()), terminal_ansi_bright_cyan: Some(rgba(0x8ec07cff).into()), terminal_ansi_bright_white: Some(rgba(0xebdbb2ff).into()), terminal_ansi_black: Some(rgba(0x3c3836ff).into()), - terminal_ansi_red: Some(rgba(0xcc241cff).into()), - terminal_ansi_green: Some(rgba(0x989719ff).into()), - terminal_ansi_yellow: Some(rgba(0xd79920ff).into()), - terminal_ansi_blue: Some(rgba(0x448587ff).into()), - terminal_ansi_magenta: Some(rgba(0xb16185ff).into()), - terminal_ansi_cyan: Some(rgba(0x679d6aff).into()), + terminal_ansi_red: Some(rgba(0xcc241dff).into()), + terminal_ansi_green: Some(rgba(0x98971aff).into()), + terminal_ansi_yellow: Some(rgba(0xd79921ff).into()), + terminal_ansi_blue: Some(rgba(0x458588ff).into()), + terminal_ansi_magenta: Some(rgba(0xb16286ff).into()), + terminal_ansi_cyan: Some(rgba(0x689d6aff).into()), terminal_ansi_white: Some(rgba(0xa89984ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xfb4833ff).into()), - error: Some(rgba(0xfb4833ff).into()), + deleted: Some(rgba(0xfb4934ff).into()), + error: Some(rgba(0xfb4934ff).into()), hidden: Some(rgba(0xa89984ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() @@ -69,7 +69,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -91,7 +91,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xfe7f18ff).into()), + color: Some(rgba(0xfe8019ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -99,21 +99,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xfb4833ff).into()), + color: Some(rgba(0xfb4934ff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -141,7 +141,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x679d6aff).into()), + color: Some(rgba(0x689d6aff).into()), ..Default::default() }, ), @@ -155,14 +155,14 @@ pub fn gruvbox() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0xb8bb25ff).into()), + color: Some(rgba(0xb8bb26ff).into()), ..Default::default() }, ), ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xfb4833ff).into()), + color: Some(rgba(0xfb4934ff).into()), ..Default::default() }, ), @@ -176,21 +176,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0xb8bb25ff).into()), + color: Some(rgba(0xb8bb26ff).into()), ..Default::default() }, ), ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -217,7 +217,7 @@ pub fn gruvbox() -> UserThemeFamily { border_transparent: Some(rgba(0x3c3836ff).into()), border_disabled: Some(rgba(0x3c3836ff).into()), background: Some(rgba(0x282828ff).into()), - element_background: Some(rgba(0x44858780).into()), + element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0x3c383680).into()), element_selected: Some(rgba(0x3c383680).into()), drop_target_background: Some(rgba(0x3c3836ff).into()), @@ -231,26 +231,26 @@ pub fn gruvbox() -> UserThemeFamily { editor_active_line_number: Some(rgba(0xebdbb2ff).into()), terminal_background: Some(rgba(0x282828ff).into()), terminal_ansi_bright_black: Some(rgba(0x928374ff).into()), - terminal_ansi_bright_red: Some(rgba(0xfb4833ff).into()), - terminal_ansi_bright_green: Some(rgba(0xb8bb25ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xfabd2eff).into()), + terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()), + terminal_ansi_bright_green: Some(rgba(0xb8bb26ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xfabd2fff).into()), terminal_ansi_bright_blue: Some(rgba(0x83a598ff).into()), terminal_ansi_bright_magenta: Some(rgba(0xd3869bff).into()), terminal_ansi_bright_cyan: Some(rgba(0x8ec07cff).into()), terminal_ansi_bright_white: Some(rgba(0xebdbb2ff).into()), terminal_ansi_black: Some(rgba(0x3c3836ff).into()), - terminal_ansi_red: Some(rgba(0xcc241cff).into()), - terminal_ansi_green: Some(rgba(0x989719ff).into()), - terminal_ansi_yellow: Some(rgba(0xd79920ff).into()), - terminal_ansi_blue: Some(rgba(0x448587ff).into()), - terminal_ansi_magenta: Some(rgba(0xb16185ff).into()), - terminal_ansi_cyan: Some(rgba(0x679d6aff).into()), + terminal_ansi_red: Some(rgba(0xcc241dff).into()), + terminal_ansi_green: Some(rgba(0x98971aff).into()), + terminal_ansi_yellow: Some(rgba(0xd79921ff).into()), + terminal_ansi_blue: Some(rgba(0x458588ff).into()), + terminal_ansi_magenta: Some(rgba(0xb16286ff).into()), + terminal_ansi_cyan: Some(rgba(0x689d6aff).into()), terminal_ansi_white: Some(rgba(0xa89984ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xfb4833ff).into()), - error: Some(rgba(0xfb4833ff).into()), + deleted: Some(rgba(0xfb4934ff).into()), + error: Some(rgba(0xfb4934ff).into()), hidden: Some(rgba(0xa89984ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() @@ -260,7 +260,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -282,7 +282,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xfe7f18ff).into()), + color: Some(rgba(0xfe8019ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -290,21 +290,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xfb4833ff).into()), + color: Some(rgba(0xfb4934ff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -332,7 +332,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x679d6aff).into()), + color: Some(rgba(0x689d6aff).into()), ..Default::default() }, ), @@ -346,14 +346,14 @@ pub fn gruvbox() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0xb8bb25ff).into()), + color: Some(rgba(0xb8bb26ff).into()), ..Default::default() }, ), ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xfb4833ff).into()), + color: Some(rgba(0xfb4934ff).into()), ..Default::default() }, ), @@ -367,21 +367,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0xb8bb25ff).into()), + color: Some(rgba(0xb8bb26ff).into()), ..Default::default() }, ), ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -408,7 +408,7 @@ pub fn gruvbox() -> UserThemeFamily { border_transparent: Some(rgba(0x3c3836ff).into()), border_disabled: Some(rgba(0x3c3836ff).into()), background: Some(rgba(0x32302fff).into()), - element_background: Some(rgba(0x44858780).into()), + element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0x3c383680).into()), element_selected: Some(rgba(0x3c383680).into()), drop_target_background: Some(rgba(0x3c3836ff).into()), @@ -422,26 +422,26 @@ pub fn gruvbox() -> UserThemeFamily { editor_active_line_number: Some(rgba(0xebdbb2ff).into()), terminal_background: Some(rgba(0x32302fff).into()), terminal_ansi_bright_black: Some(rgba(0x928374ff).into()), - terminal_ansi_bright_red: Some(rgba(0xfb4833ff).into()), - terminal_ansi_bright_green: Some(rgba(0xb8bb25ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xfabd2eff).into()), + terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()), + terminal_ansi_bright_green: Some(rgba(0xb8bb26ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xfabd2fff).into()), terminal_ansi_bright_blue: Some(rgba(0x83a598ff).into()), terminal_ansi_bright_magenta: Some(rgba(0xd3869bff).into()), terminal_ansi_bright_cyan: Some(rgba(0x8ec07cff).into()), terminal_ansi_bright_white: Some(rgba(0xebdbb2ff).into()), terminal_ansi_black: Some(rgba(0x3c3836ff).into()), - terminal_ansi_red: Some(rgba(0xcc241cff).into()), - terminal_ansi_green: Some(rgba(0x989719ff).into()), - terminal_ansi_yellow: Some(rgba(0xd79920ff).into()), - terminal_ansi_blue: Some(rgba(0x448587ff).into()), - terminal_ansi_magenta: Some(rgba(0xb16185ff).into()), - terminal_ansi_cyan: Some(rgba(0x679d6aff).into()), + terminal_ansi_red: Some(rgba(0xcc241dff).into()), + terminal_ansi_green: Some(rgba(0x98971aff).into()), + terminal_ansi_yellow: Some(rgba(0xd79921ff).into()), + terminal_ansi_blue: Some(rgba(0x458588ff).into()), + terminal_ansi_magenta: Some(rgba(0xb16286ff).into()), + terminal_ansi_cyan: Some(rgba(0x689d6aff).into()), terminal_ansi_white: Some(rgba(0xa89984ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xfb4833ff).into()), - error: Some(rgba(0xfb4833ff).into()), + deleted: Some(rgba(0xfb4934ff).into()), + error: Some(rgba(0xfb4934ff).into()), hidden: Some(rgba(0xa89984ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() @@ -451,7 +451,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -473,7 +473,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xfe7f18ff).into()), + color: Some(rgba(0xfe8019ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -481,21 +481,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xfb4833ff).into()), + color: Some(rgba(0xfb4934ff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -523,7 +523,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x679d6aff).into()), + color: Some(rgba(0x689d6aff).into()), ..Default::default() }, ), @@ -537,14 +537,14 @@ pub fn gruvbox() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0xb8bb25ff).into()), + color: Some(rgba(0xb8bb26ff).into()), ..Default::default() }, ), ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xfb4833ff).into()), + color: Some(rgba(0xfb4934ff).into()), ..Default::default() }, ), @@ -558,21 +558,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0xb8bb25ff).into()), + color: Some(rgba(0xb8bb26ff).into()), ..Default::default() }, ), ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xfabd2eff).into()), + color: Some(rgba(0xfabd2fff).into()), ..Default::default() }, ), @@ -599,7 +599,7 @@ pub fn gruvbox() -> UserThemeFamily { border_transparent: Some(rgba(0xebdbb2ff).into()), border_disabled: Some(rgba(0xebdbb2ff).into()), background: Some(rgba(0xf9f5d7ff).into()), - element_background: Some(rgba(0x44858780).into()), + element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0xebdbb280).into()), element_selected: Some(rgba(0xebdbb280).into()), drop_target_background: Some(rgba(0xebdbb2ff).into()), @@ -615,18 +615,18 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_bright_black: Some(rgba(0x928374ff).into()), terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()), terminal_ansi_bright_green: Some(rgba(0x79740eff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xb57613ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x066578ff).into()), - terminal_ansi_bright_magenta: Some(rgba(0x8f3e71ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xb57614ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x076678ff).into()), + terminal_ansi_bright_magenta: Some(rgba(0x8f3f71ff).into()), terminal_ansi_bright_cyan: Some(rgba(0x427b58ff).into()), terminal_ansi_bright_white: Some(rgba(0x3c3836ff).into()), terminal_ansi_black: Some(rgba(0xebdbb2ff).into()), - terminal_ansi_red: Some(rgba(0xcc241cff).into()), - terminal_ansi_green: Some(rgba(0x989719ff).into()), - terminal_ansi_yellow: Some(rgba(0xd79920ff).into()), - terminal_ansi_blue: Some(rgba(0x448587ff).into()), - terminal_ansi_magenta: Some(rgba(0xb16185ff).into()), - terminal_ansi_cyan: Some(rgba(0x679d6aff).into()), + terminal_ansi_red: Some(rgba(0xcc241dff).into()), + terminal_ansi_green: Some(rgba(0x98971aff).into()), + terminal_ansi_yellow: Some(rgba(0xd79921ff).into()), + terminal_ansi_blue: Some(rgba(0x458588ff).into()), + terminal_ansi_magenta: Some(rgba(0xb16286ff).into()), + terminal_ansi_cyan: Some(rgba(0x689d6aff).into()), terminal_ansi_white: Some(rgba(0x7c6f64ff).into()), ..Default::default() }, @@ -642,7 +642,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), @@ -664,7 +664,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xaf3a02ff).into()), + color: Some(rgba(0xaf3a03ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -672,7 +672,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), @@ -686,21 +686,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x8f3e71ff).into()), + color: Some(rgba(0x8f3f71ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x8f3e71ff).into()), + color: Some(rgba(0x8f3f71ff).into()), ..Default::default() }, ), @@ -714,7 +714,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x679d6aff).into()), + color: Some(rgba(0x689d6aff).into()), ..Default::default() }, ), @@ -756,21 +756,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "variable".into(), UserHighlightStyle { - color: Some(rgba(0x066578ff).into()), + color: Some(rgba(0x076678ff).into()), ..Default::default() }, ), @@ -790,7 +790,7 @@ pub fn gruvbox() -> UserThemeFamily { border_transparent: Some(rgba(0xebdbb2ff).into()), border_disabled: Some(rgba(0xebdbb2ff).into()), background: Some(rgba(0xfbf1c7ff).into()), - element_background: Some(rgba(0x44858780).into()), + element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0xebdbb280).into()), element_selected: Some(rgba(0xebdbb280).into()), drop_target_background: Some(rgba(0xebdbb2ff).into()), @@ -806,18 +806,18 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_bright_black: Some(rgba(0x928374ff).into()), terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()), terminal_ansi_bright_green: Some(rgba(0x79740eff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xb57613ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x066578ff).into()), - terminal_ansi_bright_magenta: Some(rgba(0x8f3e71ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xb57614ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x076678ff).into()), + terminal_ansi_bright_magenta: Some(rgba(0x8f3f71ff).into()), terminal_ansi_bright_cyan: Some(rgba(0x427b58ff).into()), terminal_ansi_bright_white: Some(rgba(0x3c3836ff).into()), terminal_ansi_black: Some(rgba(0xebdbb2ff).into()), - terminal_ansi_red: Some(rgba(0xcc241cff).into()), - terminal_ansi_green: Some(rgba(0x989719ff).into()), - terminal_ansi_yellow: Some(rgba(0xd79920ff).into()), - terminal_ansi_blue: Some(rgba(0x448587ff).into()), - terminal_ansi_magenta: Some(rgba(0xb16185ff).into()), - terminal_ansi_cyan: Some(rgba(0x679d6aff).into()), + terminal_ansi_red: Some(rgba(0xcc241dff).into()), + terminal_ansi_green: Some(rgba(0x98971aff).into()), + terminal_ansi_yellow: Some(rgba(0xd79921ff).into()), + terminal_ansi_blue: Some(rgba(0x458588ff).into()), + terminal_ansi_magenta: Some(rgba(0xb16286ff).into()), + terminal_ansi_cyan: Some(rgba(0x689d6aff).into()), terminal_ansi_white: Some(rgba(0x7c6f64ff).into()), ..Default::default() }, @@ -833,7 +833,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), @@ -855,7 +855,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xaf3a02ff).into()), + color: Some(rgba(0xaf3a03ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -863,7 +863,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), @@ -877,21 +877,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x8f3e71ff).into()), + color: Some(rgba(0x8f3f71ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x8f3e71ff).into()), + color: Some(rgba(0x8f3f71ff).into()), ..Default::default() }, ), @@ -905,7 +905,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x679d6aff).into()), + color: Some(rgba(0x689d6aff).into()), ..Default::default() }, ), @@ -947,21 +947,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "variable".into(), UserHighlightStyle { - color: Some(rgba(0x066578ff).into()), + color: Some(rgba(0x076678ff).into()), ..Default::default() }, ), @@ -981,7 +981,7 @@ pub fn gruvbox() -> UserThemeFamily { border_transparent: Some(rgba(0xebdbb2ff).into()), border_disabled: Some(rgba(0xebdbb2ff).into()), background: Some(rgba(0xf2e5bcff).into()), - element_background: Some(rgba(0x44858780).into()), + element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0xebdbb280).into()), element_selected: Some(rgba(0xebdbb280).into()), drop_target_background: Some(rgba(0xebdbb2ff).into()), @@ -997,18 +997,18 @@ pub fn gruvbox() -> UserThemeFamily { terminal_ansi_bright_black: Some(rgba(0x928374ff).into()), terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()), terminal_ansi_bright_green: Some(rgba(0x79740eff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xb57613ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x066578ff).into()), - terminal_ansi_bright_magenta: Some(rgba(0x8f3e71ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xb57614ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x076678ff).into()), + terminal_ansi_bright_magenta: Some(rgba(0x8f3f71ff).into()), terminal_ansi_bright_cyan: Some(rgba(0x427b58ff).into()), terminal_ansi_bright_white: Some(rgba(0x3c3836ff).into()), terminal_ansi_black: Some(rgba(0xebdbb2ff).into()), - terminal_ansi_red: Some(rgba(0xcc241cff).into()), - terminal_ansi_green: Some(rgba(0x989719ff).into()), - terminal_ansi_yellow: Some(rgba(0xd79920ff).into()), - terminal_ansi_blue: Some(rgba(0x448587ff).into()), - terminal_ansi_magenta: Some(rgba(0xb16185ff).into()), - terminal_ansi_cyan: Some(rgba(0x679d6aff).into()), + terminal_ansi_red: Some(rgba(0xcc241dff).into()), + terminal_ansi_green: Some(rgba(0x98971aff).into()), + terminal_ansi_yellow: Some(rgba(0xd79921ff).into()), + terminal_ansi_blue: Some(rgba(0x458588ff).into()), + terminal_ansi_magenta: Some(rgba(0xb16286ff).into()), + terminal_ansi_cyan: Some(rgba(0x689d6aff).into()), terminal_ansi_white: Some(rgba(0x7c6f64ff).into()), ..Default::default() }, @@ -1024,7 +1024,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), @@ -1046,7 +1046,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xaf3a02ff).into()), + color: Some(rgba(0xaf3a03ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, @@ -1054,7 +1054,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), @@ -1068,21 +1068,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x8f3e71ff).into()), + color: Some(rgba(0x8f3f71ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x8f3e71ff).into()), + color: Some(rgba(0x8f3f71ff).into()), ..Default::default() }, ), @@ -1096,7 +1096,7 @@ pub fn gruvbox() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x679d6aff).into()), + color: Some(rgba(0x689d6aff).into()), ..Default::default() }, ), @@ -1138,21 +1138,21 @@ pub fn gruvbox() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xb57613ff).into()), + color: Some(rgba(0xb57614ff).into()), ..Default::default() }, ), ( "variable".into(), UserHighlightStyle { - color: Some(rgba(0x066578ff).into()), + color: Some(rgba(0x076678ff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs index c84ea7ed09..ef9b8c59a0 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -25,42 +25,42 @@ pub fn night_owl() -> UserThemeFamily { border_selected: Some(rgba(0x5f7e97ff).into()), border_transparent: Some(rgba(0x5f7e97ff).into()), border_disabled: Some(rgba(0x5f7e97ff).into()), - elevated_surface_background: Some(rgba(0x011526ff).into()), - surface_background: Some(rgba(0x011526ff).into()), - background: Some(rgba(0x011526ff).into()), - element_background: Some(rgba(0x7d56c1cc).into()), - element_hover: Some(rgba(0x011526ff).into()), - element_selected: Some(rgba(0x234c708c).into()), - drop_target_background: Some(rgba(0x011526ff).into()), - ghost_element_hover: Some(rgba(0x011526ff).into()), + elevated_surface_background: Some(rgba(0x011627ff).into()), + surface_background: Some(rgba(0x011627ff).into()), + background: Some(rgba(0x011627ff).into()), + element_background: Some(rgba(0x7e57c2cc).into()), + element_hover: Some(rgba(0x011627ff).into()), + element_selected: Some(rgba(0x234d708c).into()), + drop_target_background: Some(rgba(0x011627ff).into()), + ghost_element_hover: Some(rgba(0x011627ff).into()), text: Some(rgba(0xd6deebff).into()), - tab_inactive_background: Some(rgba(0x01101cff).into()), - tab_active_background: Some(rgba(0x0a2842ff).into()), - editor_background: Some(rgba(0x011526ff).into()), - editor_gutter_background: Some(rgba(0x011526ff).into()), + tab_inactive_background: Some(rgba(0x01111dff).into()), + tab_active_background: Some(rgba(0x0b2942ff).into()), + editor_background: Some(rgba(0x011627ff).into()), + editor_gutter_background: Some(rgba(0x011627ff).into()), editor_line_number: Some(rgba(0x4b6479ff).into()), editor_active_line_number: Some(rgba(0xd6deebff).into()), terminal_ansi_bright_black: Some(rgba(0x575656ff).into()), - terminal_ansi_bright_red: Some(rgba(0xef524fff).into()), - terminal_ansi_bright_green: Some(rgba(0x21da6eff).into()), + terminal_ansi_bright_red: Some(rgba(0xef5350ff).into()), + terminal_ansi_bright_green: Some(rgba(0x22da6eff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffeb95ff).into()), terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()), terminal_ansi_bright_magenta: Some(rgba(0xc792eaff).into()), terminal_ansi_bright_cyan: Some(rgba(0x7fdbcaff).into()), terminal_ansi_bright_white: Some(rgba(0xffffffff).into()), - terminal_ansi_black: Some(rgba(0x011526ff).into()), - terminal_ansi_red: Some(rgba(0xef524fff).into()), - terminal_ansi_green: Some(rgba(0x21da6eff).into()), + terminal_ansi_black: Some(rgba(0x011627ff).into()), + terminal_ansi_red: Some(rgba(0xef5350ff).into()), + terminal_ansi_green: Some(rgba(0x22da6eff).into()), terminal_ansi_yellow: Some(rgba(0xc5e478ff).into()), terminal_ansi_blue: Some(rgba(0x82aaffff).into()), terminal_ansi_magenta: Some(rgba(0xc792eaff).into()), - terminal_ansi_cyan: Some(rgba(0x20c7a7ff).into()), + terminal_ansi_cyan: Some(rgba(0x21c7a8ff).into()), terminal_ansi_white: Some(rgba(0xffffffff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xef524fff).into()), - error: Some(rgba(0xef524fff).into()), + deleted: Some(rgba(0xef5350ff).into()), + error: Some(rgba(0xef5350ff).into()), hidden: Some(rgba(0x5f7e97ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() @@ -116,7 +116,7 @@ pub fn night_owl() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xf78b6bff).into()), + color: Some(rgba(0xf78c6cff).into()), ..Default::default() }, ), @@ -130,7 +130,7 @@ pub fn night_owl() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x7fcac3ff).into()), + color: Some(rgba(0x80cbc4ff).into()), ..Default::default() }, ), @@ -209,10 +209,10 @@ pub fn night_owl() -> UserThemeFamily { elevated_surface_background: Some(rgba(0xf0f0f0ff).into()), surface_background: Some(rgba(0xf0f0f0ff).into()), background: Some(rgba(0xfbfbfbff).into()), - element_background: Some(rgba(0x29a298ff).into()), - element_hover: Some(rgba(0xd3e7f8ff).into()), - element_selected: Some(rgba(0xd3e7f8ff).into()), - ghost_element_hover: Some(rgba(0xd3e7f8ff).into()), + element_background: Some(rgba(0x2aa298ff).into()), + element_hover: Some(rgba(0xd3e8f8ff).into()), + element_selected: Some(rgba(0xd3e8f8ff).into()), + ghost_element_hover: Some(rgba(0xd3e8f8ff).into()), text: Some(rgba(0x403f53ff).into()), tab_inactive_background: Some(rgba(0xf0f0f0ff).into()), tab_active_background: Some(rgba(0xf6f6f6ff).into()), @@ -222,20 +222,20 @@ pub fn night_owl() -> UserThemeFamily { editor_active_line_number: Some(rgba(0x403f53ff).into()), terminal_background: Some(rgba(0xf6f6f6ff).into()), terminal_ansi_bright_black: Some(rgba(0x403f53ff).into()), - terminal_ansi_bright_red: Some(rgba(0xde3c3aff).into()), - terminal_ansi_bright_green: Some(rgba(0x07916aff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xdaa900ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x278dd7ff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xd64289ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x29a298ff).into()), + terminal_ansi_bright_red: Some(rgba(0xde3d3bff).into()), + terminal_ansi_bright_green: Some(rgba(0x08916aff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xdaaa01ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x288ed7ff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xd6438aff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x2aa298ff).into()), terminal_ansi_bright_white: Some(rgba(0xf0f0f0ff).into()), terminal_ansi_black: Some(rgba(0x403f53ff).into()), - terminal_ansi_red: Some(rgba(0xde3c3aff).into()), - terminal_ansi_green: Some(rgba(0x07916aff).into()), - terminal_ansi_yellow: Some(rgba(0xe0ae01ff).into()), - terminal_ansi_blue: Some(rgba(0x278dd7ff).into()), - terminal_ansi_magenta: Some(rgba(0xd64289ff).into()), - terminal_ansi_cyan: Some(rgba(0x29a298ff).into()), + terminal_ansi_red: Some(rgba(0xde3d3bff).into()), + terminal_ansi_green: Some(rgba(0x08916aff).into()), + terminal_ansi_yellow: Some(rgba(0xe0af02ff).into()), + terminal_ansi_blue: Some(rgba(0x288ed7ff).into()), + terminal_ansi_magenta: Some(rgba(0xd6438aff).into()), + terminal_ansi_cyan: Some(rgba(0x2aa298ff).into()), terminal_ansi_white: Some(rgba(0xf0f0f0ff).into()), ..Default::default() }, @@ -244,7 +244,7 @@ pub fn night_owl() -> UserThemeFamily { error: Some(rgba(0x403f53ff).into()), hidden: Some(rgba(0x403f53ff).into()), hint: Some(rgba(0x969696ff).into()), - warning: Some(rgba(0xdaa900ff).into()), + warning: Some(rgba(0xdaaa01ff).into()), ..Default::default() }, syntax: Some(UserSyntaxTheme { @@ -282,7 +282,7 @@ pub fn night_owl() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x994bc3ff).into()), + color: Some(rgba(0x994cc3ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -290,7 +290,7 @@ pub fn night_owl() -> UserThemeFamily { ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0x994bc3ff).into()), + color: Some(rgba(0x994cc3ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -298,28 +298,28 @@ pub fn night_owl() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xaa0881ff).into()), + color: Some(rgba(0xaa0982ff).into()), ..Default::default() }, ), ( "operator".into(), UserHighlightStyle { - color: Some(rgba(0x0b969bff).into()), + color: Some(rgba(0x0c969bff).into()), ..Default::default() }, ), ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x0b969bff).into()), + color: Some(rgba(0x0c969bff).into()), ..Default::default() }, ), ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x994bc3ff).into()), + color: Some(rgba(0x994cc3ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -341,7 +341,7 @@ pub fn night_owl() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0x994bc3ff).into()), + color: Some(rgba(0x994cc3ff).into()), ..Default::default() }, ), @@ -369,7 +369,7 @@ pub fn night_owl() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0x0b969bff).into()), + color: Some(rgba(0x0c969bff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs index 416907c305..5598635ff2 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -19,49 +19,49 @@ pub fn noctis() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x1579b6ff).into()), - border_variant: Some(rgba(0x1579b6ff).into()), - border_focused: Some(rgba(0x08324eff).into()), - border_selected: Some(rgba(0x1579b6ff).into()), - border_transparent: Some(rgba(0x1579b6ff).into()), - border_disabled: Some(rgba(0x1579b6ff).into()), - elevated_surface_background: Some(rgba(0x051b28ff).into()), - surface_background: Some(rgba(0x051b28ff).into()), - background: Some(rgba(0x07263aff).into()), - element_background: Some(rgba(0x007e99ff).into()), + border: Some(rgba(0x1679b6ff).into()), + border_variant: Some(rgba(0x1679b6ff).into()), + border_focused: Some(rgba(0x09334eff).into()), + border_selected: Some(rgba(0x1679b6ff).into()), + border_transparent: Some(rgba(0x1679b6ff).into()), + border_disabled: Some(rgba(0x1679b6ff).into()), + elevated_surface_background: Some(rgba(0x051b29ff).into()), + surface_background: Some(rgba(0x051b29ff).into()), + background: Some(rgba(0x07273bff).into()), + element_background: Some(rgba(0x007f99ff).into()), element_hover: Some(rgba(0x00558a65).into()), - element_selected: Some(rgba(0x0b3f5fff).into()), - drop_target_background: Some(rgba(0x00294dff).into()), + element_selected: Some(rgba(0x0c3f5fff).into()), + drop_target_background: Some(rgba(0x002a4dff).into()), ghost_element_hover: Some(rgba(0x00558a65).into()), text: Some(rgba(0xbecfdaff).into()), - tab_inactive_background: Some(rgba(0x08324eff).into()), - tab_active_background: Some(rgba(0x07263aff).into()), - editor_background: Some(rgba(0x07263aff).into()), - editor_gutter_background: Some(rgba(0x07263aff).into()), - editor_line_number: Some(rgba(0x4c6b7fff).into()), + tab_inactive_background: Some(rgba(0x09334eff).into()), + tab_active_background: Some(rgba(0x07273bff).into()), + editor_background: Some(rgba(0x07273bff).into()), + editor_gutter_background: Some(rgba(0x07273bff).into()), + editor_line_number: Some(rgba(0x4d6c80ff).into()), editor_active_line_number: Some(rgba(0xbecfdaff).into()), - terminal_background: Some(rgba(0x051b28ff).into()), + terminal_background: Some(rgba(0x051b29ff).into()), terminal_ansi_bright_black: Some(rgba(0x475e6cff).into()), terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()), - terminal_ansi_bright_green: Some(rgba(0x5febb1ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xe69532ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x5fb5ebff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xe697b2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x5fdaebff).into()), + terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()), terminal_ansi_bright_white: Some(rgba(0xbecfdaff).into()), - terminal_ansi_black: Some(rgba(0x28343dff).into()), - terminal_ansi_red: Some(rgba(0xe66432ff).into()), + terminal_ansi_black: Some(rgba(0x28353eff).into()), + terminal_ansi_red: Some(rgba(0xe66533ff).into()), terminal_ansi_green: Some(rgba(0x49e9a6ff).into()), terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()), terminal_ansi_blue: Some(rgba(0x49ace9ff).into()), - terminal_ansi_magenta: Some(rgba(0xdf759aff).into()), - terminal_ansi_cyan: Some(rgba(0x49d5e9ff).into()), + terminal_ansi_magenta: Some(rgba(0xdf769bff).into()), + terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()), terminal_ansi_white: Some(rgba(0xaec3d0ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xe34d1bff).into()), - error: Some(rgba(0xe34d1bff).into()), + deleted: Some(rgba(0xe34e1cff).into()), + error: Some(rgba(0xe34e1cff).into()), hidden: Some(rgba(0x9fb6c6ff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa857ff).into()), @@ -72,14 +72,14 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x5888a5ff).into()), + color: Some(rgba(0x5988a6ff).into()), ..Default::default() }, ), @@ -107,42 +107,42 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -156,14 +156,14 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x5888a5ff).into()), + color: Some(rgba(0x5988a6ff).into()), ..Default::default() }, ), @@ -191,7 +191,7 @@ pub fn noctis() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), @@ -205,14 +205,14 @@ pub fn noctis() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), @@ -226,7 +226,7 @@ pub fn noctis() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xe66432ff).into()), + color: Some(rgba(0xe66533ff).into()), ..Default::default() }, ), @@ -248,7 +248,7 @@ pub fn noctis() -> UserThemeFamily { elevated_surface_background: Some(rgba(0x272022ff).into()), surface_background: Some(rgba(0x272022ff).into()), background: Some(rgba(0x322a2dff).into()), - element_background: Some(rgba(0x007e99ff).into()), + element_background: Some(rgba(0x007f99ff).into()), element_hover: Some(rgba(0x533641ff).into()), element_selected: Some(rgba(0x5c2e3e99).into()), drop_target_background: Some(rgba(0x38292eff).into()), @@ -263,25 +263,25 @@ pub fn noctis() -> UserThemeFamily { terminal_background: Some(rgba(0x272022ff).into()), terminal_ansi_bright_black: Some(rgba(0x69545bff).into()), terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()), - terminal_ansi_bright_green: Some(rgba(0x5febb1ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xe69532ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x5fb5ebff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xe697b2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x5fdaebff).into()), + terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()), terminal_ansi_bright_white: Some(rgba(0xcbbec2ff).into()), terminal_ansi_black: Some(rgba(0x47393eff).into()), - terminal_ansi_red: Some(rgba(0xe66432ff).into()), + terminal_ansi_red: Some(rgba(0xe66533ff).into()), terminal_ansi_green: Some(rgba(0x49e9a6ff).into()), terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()), terminal_ansi_blue: Some(rgba(0x49ace9ff).into()), - terminal_ansi_magenta: Some(rgba(0xdf759aff).into()), - terminal_ansi_cyan: Some(rgba(0x49d5e9ff).into()), + terminal_ansi_magenta: Some(rgba(0xdf769bff).into()), + terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()), terminal_ansi_white: Some(rgba(0xb9acb0ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xe34d1bff).into()), - error: Some(rgba(0xe34d1bff).into()), + deleted: Some(rgba(0xe34e1cff).into()), + error: Some(rgba(0xe34e1cff).into()), hidden: Some(rgba(0xbbaab0ff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa857ff).into()), @@ -292,14 +292,14 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x8b737bff).into()), + color: Some(rgba(0x8b747cff).into()), ..Default::default() }, ), @@ -327,42 +327,42 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -376,14 +376,14 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x8b737bff).into()), + color: Some(rgba(0x8b747cff).into()), ..Default::default() }, ), @@ -411,7 +411,7 @@ pub fn noctis() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), @@ -425,14 +425,14 @@ pub fn noctis() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), @@ -446,7 +446,7 @@ pub fn noctis() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xe66432ff).into()), + color: Some(rgba(0xe66533ff).into()), ..Default::default() }, ), @@ -468,10 +468,10 @@ pub fn noctis() -> UserThemeFamily { elevated_surface_background: Some(rgba(0xe1eeefff).into()), surface_background: Some(rgba(0xe1eeefff).into()), background: Some(rgba(0xf4f6f6ff).into()), - element_background: Some(rgba(0x089099ff).into()), + element_background: Some(rgba(0x099099ff).into()), element_hover: Some(rgba(0xd1eafaff).into()), element_selected: Some(rgba(0xb6e1e7ff).into()), - drop_target_background: Some(rgba(0xb1c9ccff).into()), + drop_target_background: Some(rgba(0xb2cacdff).into()), ghost_element_hover: Some(rgba(0xd1eafaff).into()), text: Some(rgba(0x005661ff).into()), tab_inactive_background: Some(rgba(0xcaedf2ff).into()), @@ -482,17 +482,17 @@ pub fn noctis() -> UserThemeFamily { editor_active_line_number: Some(rgba(0x005661ff).into()), terminal_background: Some(rgba(0xe1eeefff).into()), terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()), - terminal_ansi_bright_red: Some(rgba(0xff3f00ff).into()), + terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()), terminal_ansi_bright_green: Some(rgba(0x00d17aff).into()), terminal_ansi_bright_yellow: Some(rgba(0xff8c00ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x0ea3ffff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xff6b9eff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x00cae6ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x0fa3ffff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xff6b9fff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x00cbe6ff).into()), terminal_ansi_bright_white: Some(rgba(0xbbc3c4ff).into()), - terminal_ansi_black: Some(rgba(0x003b41ff).into()), - terminal_ansi_red: Some(rgba(0xe34d1bff).into()), + terminal_ansi_black: Some(rgba(0x003b42ff).into()), + terminal_ansi_red: Some(rgba(0xe34e1cff).into()), terminal_ansi_green: Some(rgba(0x00b368ff).into()), - terminal_ansi_yellow: Some(rgba(0xf49724ff).into()), + terminal_ansi_yellow: Some(rgba(0xf49725ff).into()), terminal_ansi_blue: Some(rgba(0x0094f0ff).into()), terminal_ansi_magenta: Some(rgba(0xff5792ff).into()), terminal_ansi_cyan: Some(rgba(0x00bdd6ff).into()), @@ -500,9 +500,9 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xff3f00ff).into()), - error: Some(rgba(0xff3f00ff).into()), - hidden: Some(rgba(0x70838dff).into()), + deleted: Some(rgba(0xff4000ff).into()), + error: Some(rgba(0xff4000ff).into()), + hidden: Some(rgba(0x71838eff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xe07a52ff).into()), ..Default::default() @@ -512,7 +512,7 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x5841ffff).into()), + color: Some(rgba(0x5842ffff).into()), ..Default::default() }, ), @@ -547,7 +547,7 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), @@ -568,21 +568,21 @@ pub fn noctis() -> UserThemeFamily { ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x5841ffff).into()), + color: Some(rgba(0x5842ffff).into()), ..Default::default() }, ), @@ -596,7 +596,7 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), @@ -688,31 +688,31 @@ pub fn noctis() -> UserThemeFamily { elevated_surface_background: Some(rgba(0xe9e7f3ff).into()), surface_background: Some(rgba(0xe9e7f3ff).into()), background: Some(rgba(0xf2f1f8ff).into()), - element_background: Some(rgba(0x8d7ffeff).into()), - element_hover: Some(rgba(0xd1cbfeff).into()), + element_background: Some(rgba(0x8e80ffff).into()), + element_hover: Some(rgba(0xd2ccffff).into()), element_selected: Some(rgba(0xbcb6e7ff).into()), drop_target_background: Some(rgba(0xafaad4aa).into()), - ghost_element_hover: Some(rgba(0xd1cbfeff).into()), + ghost_element_hover: Some(rgba(0xd2ccffff).into()), text: Some(rgba(0x0c006bff).into()), tab_inactive_background: Some(rgba(0xe2dff6ff).into()), tab_active_background: Some(rgba(0xf2f1f8ff).into()), editor_background: Some(rgba(0xf2f1f8ff).into()), editor_gutter_background: Some(rgba(0xf2f1f8ff).into()), - editor_line_number: Some(rgba(0x9c99b0ff).into()), + editor_line_number: Some(rgba(0x9d9ab1ff).into()), editor_active_line_number: Some(rgba(0x0c006bff).into()), terminal_background: Some(rgba(0xe9e7f3ff).into()), terminal_ansi_bright_black: Some(rgba(0x0f0080ff).into()), - terminal_ansi_bright_red: Some(rgba(0xff3f00ff).into()), + terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()), terminal_ansi_bright_green: Some(rgba(0x00d17aff).into()), terminal_ansi_bright_yellow: Some(rgba(0xff8c00ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x0ea3ffff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xff6b9eff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x00cae6ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x0fa3ffff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xff6b9fff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x00cbe6ff).into()), terminal_ansi_bright_white: Some(rgba(0xbbc3c4ff).into()), terminal_ansi_black: Some(rgba(0x0c006bff).into()), - terminal_ansi_red: Some(rgba(0xe34d1bff).into()), + terminal_ansi_red: Some(rgba(0xe34e1cff).into()), terminal_ansi_green: Some(rgba(0x00b368ff).into()), - terminal_ansi_yellow: Some(rgba(0xf49724ff).into()), + terminal_ansi_yellow: Some(rgba(0xf49725ff).into()), terminal_ansi_blue: Some(rgba(0x0094f0ff).into()), terminal_ansi_magenta: Some(rgba(0xff5792ff).into()), terminal_ansi_cyan: Some(rgba(0x00bdd6ff).into()), @@ -720,9 +720,9 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xff3f00ff).into()), - error: Some(rgba(0xff3f00ff).into()), - hidden: Some(rgba(0x74708dff).into()), + deleted: Some(rgba(0xff4000ff).into()), + error: Some(rgba(0xff4000ff).into()), + hidden: Some(rgba(0x75718eff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xe07a52ff).into()), ..Default::default() @@ -732,7 +732,7 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x5841ffff).into()), + color: Some(rgba(0x5842ffff).into()), ..Default::default() }, ), @@ -767,7 +767,7 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), @@ -788,21 +788,21 @@ pub fn noctis() -> UserThemeFamily { ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x5841ffff).into()), + color: Some(rgba(0x5842ffff).into()), ..Default::default() }, ), @@ -816,7 +816,7 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), @@ -908,11 +908,11 @@ pub fn noctis() -> UserThemeFamily { elevated_surface_background: Some(rgba(0xf6eddaff).into()), surface_background: Some(rgba(0xf6eddaff).into()), background: Some(rgba(0xfef8ecff).into()), - element_background: Some(rgba(0x089099ff).into()), - element_hover: Some(rgba(0xd1f2f8ff).into()), + element_background: Some(rgba(0x099099ff).into()), + element_hover: Some(rgba(0xd2f3f9ff).into()), element_selected: Some(rgba(0xb6e1e7ff).into()), - drop_target_background: Some(rgba(0xcccab1ff).into()), - ghost_element_hover: Some(rgba(0xd1f2f8ff).into()), + drop_target_background: Some(rgba(0xcdcbb2ff).into()), + ghost_element_hover: Some(rgba(0xd2f3f9ff).into()), text: Some(rgba(0x005661ff).into()), tab_inactive_background: Some(rgba(0xf0e9d6ff).into()), tab_active_background: Some(rgba(0xfef8ecff).into()), @@ -922,17 +922,17 @@ pub fn noctis() -> UserThemeFamily { editor_active_line_number: Some(rgba(0x005661ff).into()), terminal_background: Some(rgba(0xf6eddaff).into()), terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()), - terminal_ansi_bright_red: Some(rgba(0xff3f00ff).into()), + terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()), terminal_ansi_bright_green: Some(rgba(0x00d17aff).into()), terminal_ansi_bright_yellow: Some(rgba(0xff8c00ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x0ea3ffff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xff6b9eff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x00cae6ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x0fa3ffff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xff6b9fff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x00cbe6ff).into()), terminal_ansi_bright_white: Some(rgba(0xbbc3c4ff).into()), - terminal_ansi_black: Some(rgba(0x003b41ff).into()), - terminal_ansi_red: Some(rgba(0xe34d1bff).into()), + terminal_ansi_black: Some(rgba(0x003b42ff).into()), + terminal_ansi_red: Some(rgba(0xe34e1cff).into()), terminal_ansi_green: Some(rgba(0x00b368ff).into()), - terminal_ansi_yellow: Some(rgba(0xf49724ff).into()), + terminal_ansi_yellow: Some(rgba(0xf49725ff).into()), terminal_ansi_blue: Some(rgba(0x0094f0ff).into()), terminal_ansi_magenta: Some(rgba(0xff5792ff).into()), terminal_ansi_cyan: Some(rgba(0x00bdd6ff).into()), @@ -940,9 +940,9 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xff3f00ff).into()), - error: Some(rgba(0xff3f00ff).into()), - hidden: Some(rgba(0x878476ff).into()), + deleted: Some(rgba(0xff4000ff).into()), + error: Some(rgba(0xff4000ff).into()), + hidden: Some(rgba(0x888477ff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xe07a52ff).into()), ..Default::default() @@ -952,7 +952,7 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x5841ffff).into()), + color: Some(rgba(0x5842ffff).into()), ..Default::default() }, ), @@ -987,7 +987,7 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), @@ -1008,21 +1008,21 @@ pub fn noctis() -> UserThemeFamily { ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x5841ffff).into()), + color: Some(rgba(0x5842ffff).into()), ..Default::default() }, ), @@ -1036,7 +1036,7 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x0094a8ff).into()), + color: Some(rgba(0x0095a8ff).into()), ..Default::default() }, ), @@ -1119,22 +1119,22 @@ pub fn noctis() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x496c83ff).into()), - border_variant: Some(rgba(0x496c83ff).into()), - border_focused: Some(rgba(0x202d37ff).into()), - border_selected: Some(rgba(0x496c83ff).into()), - border_transparent: Some(rgba(0x496c83ff).into()), - border_disabled: Some(rgba(0x496c83ff).into()), + border: Some(rgba(0x496d83ff).into()), + border_variant: Some(rgba(0x496d83ff).into()), + border_focused: Some(rgba(0x202e37ff).into()), + border_selected: Some(rgba(0x496d83ff).into()), + border_transparent: Some(rgba(0x496d83ff).into()), + border_disabled: Some(rgba(0x496d83ff).into()), elevated_surface_background: Some(rgba(0x0e1920ff).into()), surface_background: Some(rgba(0x0e1920ff).into()), background: Some(rgba(0x1b2932ff).into()), element_background: Some(rgba(0x2e616bff).into()), element_hover: Some(rgba(0x00558aff).into()), element_selected: Some(rgba(0x2c414eff).into()), - drop_target_background: Some(rgba(0x152836ff).into()), + drop_target_background: Some(rgba(0x152837ff).into()), ghost_element_hover: Some(rgba(0x00558aff).into()), text: Some(rgba(0xc5cdd3ff).into()), - tab_inactive_background: Some(rgba(0x202d37ff).into()), + tab_inactive_background: Some(rgba(0x202e37ff).into()), tab_active_background: Some(rgba(0x1b2932ff).into()), editor_background: Some(rgba(0x1b2932ff).into()), editor_gutter_background: Some(rgba(0x1b2932ff).into()), @@ -1147,21 +1147,21 @@ pub fn noctis() -> UserThemeFamily { terminal_ansi_bright_yellow: Some(rgba(0xd1aa7bff).into()), terminal_ansi_bright_blue: Some(rgba(0x68a4caff).into()), terminal_ansi_bright_magenta: Some(rgba(0xc88da2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x84bfc8ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x84c0c8ff).into()), terminal_ansi_bright_white: Some(rgba(0xc5d1d3ff).into()), - terminal_ansi_black: Some(rgba(0x182935ff).into()), + terminal_ansi_black: Some(rgba(0x182a35ff).into()), terminal_ansi_red: Some(rgba(0xc08872ff).into()), terminal_ansi_green: Some(rgba(0x72c09fff).into()), terminal_ansi_yellow: Some(rgba(0xc8a984ff).into()), - terminal_ansi_blue: Some(rgba(0x6095b7ff).into()), + terminal_ansi_blue: Some(rgba(0x6196b8ff).into()), terminal_ansi_magenta: Some(rgba(0xc28097ff).into()), terminal_ansi_cyan: Some(rgba(0x72b7c0ff).into()), terminal_ansi_white: Some(rgba(0xc5cdd3ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xb96245ff).into()), - error: Some(rgba(0xb96245ff).into()), + deleted: Some(rgba(0xb96346ff).into()), + error: Some(rgba(0xb96346ff).into()), hidden: Some(rgba(0x96a8b6ff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa857ff).into()), @@ -1172,14 +1172,14 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x7067b1ff).into()), + color: Some(rgba(0x7068b1ff).into()), ..Default::default() }, ), ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x5d7787ff).into()), + color: Some(rgba(0x5e7887ff).into()), ..Default::default() }, ), @@ -1207,7 +1207,7 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x3e848dff).into()), + color: Some(rgba(0x3f848dff).into()), ..Default::default() }, ), @@ -1228,21 +1228,21 @@ pub fn noctis() -> UserThemeFamily { ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x3e848dff).into()), + color: Some(rgba(0x3f848dff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x3e848dff).into()), + color: Some(rgba(0x3f848dff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x7067b1ff).into()), + color: Some(rgba(0x7068b1ff).into()), ..Default::default() }, ), @@ -1256,14 +1256,14 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x3e848dff).into()), + color: Some(rgba(0x3f848dff).into()), ..Default::default() }, ), ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x5d7787ff).into()), + color: Some(rgba(0x5e7887ff).into()), ..Default::default() }, ), @@ -1339,49 +1339,49 @@ pub fn noctis() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x0d6571ff).into()), - border_variant: Some(rgba(0x0d6571ff).into()), - border_focused: Some(rgba(0x063940ff).into()), - border_selected: Some(rgba(0x0d6571ff).into()), - border_transparent: Some(rgba(0x0d6571ff).into()), - border_disabled: Some(rgba(0x0d6571ff).into()), - elevated_surface_background: Some(rgba(0x03181aff).into()), - surface_background: Some(rgba(0x03181aff).into()), - background: Some(rgba(0x052428ff).into()), - element_background: Some(rgba(0x089099ff).into()), - element_hover: Some(rgba(0x0b505aff).into()), - element_selected: Some(rgba(0x0d6571ff).into()), + border: Some(rgba(0x0e6671ff).into()), + border_variant: Some(rgba(0x0e6671ff).into()), + border_focused: Some(rgba(0x073940ff).into()), + border_selected: Some(rgba(0x0e6671ff).into()), + border_transparent: Some(rgba(0x0e6671ff).into()), + border_disabled: Some(rgba(0x0e6671ff).into()), + elevated_surface_background: Some(rgba(0x03191bff).into()), + surface_background: Some(rgba(0x03191bff).into()), + background: Some(rgba(0x052529ff).into()), + element_background: Some(rgba(0x099099ff).into()), + element_hover: Some(rgba(0x0b515bff).into()), + element_selected: Some(rgba(0x0e6671ff).into()), drop_target_background: Some(rgba(0x00404dff).into()), - ghost_element_hover: Some(rgba(0x0b505aff).into()), - text: Some(rgba(0xb1c9ccff).into()), - tab_inactive_background: Some(rgba(0x052e32ff).into()), - tab_active_background: Some(rgba(0x052428ff).into()), - editor_background: Some(rgba(0x052428ff).into()), - editor_gutter_background: Some(rgba(0x052428ff).into()), + ghost_element_hover: Some(rgba(0x0b515bff).into()), + text: Some(rgba(0xb2cacdff).into()), + tab_inactive_background: Some(rgba(0x062e32ff).into()), + tab_active_background: Some(rgba(0x052529ff).into()), + editor_background: Some(rgba(0x052529ff).into()), + editor_gutter_background: Some(rgba(0x052529ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), - editor_active_line_number: Some(rgba(0xb1c9ccff).into()), - terminal_background: Some(rgba(0x03181aff).into()), + editor_active_line_number: Some(rgba(0xb2cacdff).into()), + terminal_background: Some(rgba(0x03191bff).into()), terminal_ansi_bright_black: Some(rgba(0x47686cff).into()), terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()), - terminal_ansi_bright_green: Some(rgba(0x5febb1ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xe69532ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x5fb5ebff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xe697b2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x5fdaebff).into()), + terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()), terminal_ansi_bright_white: Some(rgba(0xc1d4d7ff).into()), terminal_ansi_black: Some(rgba(0x324a4dff).into()), - terminal_ansi_red: Some(rgba(0xe66432ff).into()), + terminal_ansi_red: Some(rgba(0xe66533ff).into()), terminal_ansi_green: Some(rgba(0x49e9a6ff).into()), terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()), terminal_ansi_blue: Some(rgba(0x49ace9ff).into()), - terminal_ansi_magenta: Some(rgba(0xdf759aff).into()), - terminal_ansi_cyan: Some(rgba(0x49d5e9ff).into()), - terminal_ansi_white: Some(rgba(0xb1c9ccff).into()), + terminal_ansi_magenta: Some(rgba(0xdf769bff).into()), + terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()), + terminal_ansi_white: Some(rgba(0xb2cacdff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xe34d1bff).into()), - error: Some(rgba(0xe34d1bff).into()), + deleted: Some(rgba(0xe34e1cff).into()), + error: Some(rgba(0xe34e1cff).into()), hidden: Some(rgba(0x87a7abff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa487ff).into()), @@ -1392,7 +1392,7 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -1406,7 +1406,7 @@ pub fn noctis() -> UserThemeFamily { ( "constant".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), @@ -1427,42 +1427,42 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -1476,7 +1476,7 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), @@ -1490,7 +1490,7 @@ pub fn noctis() -> UserThemeFamily { ( "punctuation.delimiter".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), @@ -1504,14 +1504,14 @@ pub fn noctis() -> UserThemeFamily { ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), @@ -1525,14 +1525,14 @@ pub fn noctis() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), @@ -1546,7 +1546,7 @@ pub fn noctis() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xe66432ff).into()), + color: Some(rgba(0xe66533ff).into()), ..Default::default() }, ), @@ -1559,49 +1559,49 @@ pub fn noctis() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x0d6571ff).into()), - border_variant: Some(rgba(0x0d6571ff).into()), - border_focused: Some(rgba(0x052e32ff).into()), - border_selected: Some(rgba(0x0d6571ff).into()), - border_transparent: Some(rgba(0x0d6571ff).into()), - border_disabled: Some(rgba(0x0d6571ff).into()), + border: Some(rgba(0x0e6671ff).into()), + border_variant: Some(rgba(0x0e6671ff).into()), + border_focused: Some(rgba(0x062e32ff).into()), + border_selected: Some(rgba(0x0e6671ff).into()), + border_transparent: Some(rgba(0x0e6671ff).into()), + border_disabled: Some(rgba(0x0e6671ff).into()), elevated_surface_background: Some(rgba(0x020c0eff).into()), surface_background: Some(rgba(0x020c0eff).into()), - background: Some(rgba(0x031316ff).into()), - element_background: Some(rgba(0x089099ff).into()), - element_hover: Some(rgba(0x0b505aff).into()), - element_selected: Some(rgba(0x0d6571ff).into()), + background: Some(rgba(0x031417ff).into()), + element_background: Some(rgba(0x099099ff).into()), + element_hover: Some(rgba(0x0b515bff).into()), + element_selected: Some(rgba(0x0e6671ff).into()), drop_target_background: Some(rgba(0x00404dff).into()), - ghost_element_hover: Some(rgba(0x0b505aff).into()), - text: Some(rgba(0xb1c9ccff).into()), - tab_inactive_background: Some(rgba(0x052e32ff).into()), - tab_active_background: Some(rgba(0x031316ff).into()), - editor_background: Some(rgba(0x031316ff).into()), - editor_gutter_background: Some(rgba(0x031316ff).into()), + ghost_element_hover: Some(rgba(0x0b515bff).into()), + text: Some(rgba(0xb2cacdff).into()), + tab_inactive_background: Some(rgba(0x062e32ff).into()), + tab_active_background: Some(rgba(0x031417ff).into()), + editor_background: Some(rgba(0x031417ff).into()), + editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), - editor_active_line_number: Some(rgba(0xb1c9ccff).into()), + editor_active_line_number: Some(rgba(0xb2cacdff).into()), terminal_background: Some(rgba(0x020c0eff).into()), terminal_ansi_bright_black: Some(rgba(0x47686cff).into()), terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()), - terminal_ansi_bright_green: Some(rgba(0x5febb1ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xe69532ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x5fb5ebff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xe697b2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x5fdaebff).into()), + terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()), terminal_ansi_bright_white: Some(rgba(0xc1d4d7ff).into()), terminal_ansi_black: Some(rgba(0x324a4dff).into()), - terminal_ansi_red: Some(rgba(0xe66432ff).into()), + terminal_ansi_red: Some(rgba(0xe66533ff).into()), terminal_ansi_green: Some(rgba(0x49e9a6ff).into()), terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()), terminal_ansi_blue: Some(rgba(0x49ace9ff).into()), - terminal_ansi_magenta: Some(rgba(0xdf759aff).into()), - terminal_ansi_cyan: Some(rgba(0x49d5e9ff).into()), - terminal_ansi_white: Some(rgba(0xb1c9ccff).into()), + terminal_ansi_magenta: Some(rgba(0xdf769bff).into()), + terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()), + terminal_ansi_white: Some(rgba(0xb2cacdff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xe34d1bff).into()), - error: Some(rgba(0xe34d1bff).into()), + deleted: Some(rgba(0xe34e1cff).into()), + error: Some(rgba(0xe34e1cff).into()), hidden: Some(rgba(0x87a7abff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa487ff).into()), @@ -1612,7 +1612,7 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -1626,7 +1626,7 @@ pub fn noctis() -> UserThemeFamily { ( "constant".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), @@ -1647,42 +1647,42 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -1696,7 +1696,7 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), @@ -1710,7 +1710,7 @@ pub fn noctis() -> UserThemeFamily { ( "punctuation.delimiter".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), @@ -1724,14 +1724,14 @@ pub fn noctis() -> UserThemeFamily { ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), @@ -1745,14 +1745,14 @@ pub fn noctis() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), @@ -1766,7 +1766,7 @@ pub fn noctis() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xe66432ff).into()), + color: Some(rgba(0xe66533ff).into()), ..Default::default() }, ), @@ -1779,49 +1779,49 @@ pub fn noctis() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x0d6571ff).into()), - border_variant: Some(rgba(0x0d6571ff).into()), - border_focused: Some(rgba(0x052e32ff).into()), - border_selected: Some(rgba(0x0d6571ff).into()), - border_transparent: Some(rgba(0x0d6571ff).into()), - border_disabled: Some(rgba(0x0d6571ff).into()), + border: Some(rgba(0x0e6671ff).into()), + border_variant: Some(rgba(0x0e6671ff).into()), + border_focused: Some(rgba(0x062e32ff).into()), + border_selected: Some(rgba(0x0e6671ff).into()), + border_transparent: Some(rgba(0x0e6671ff).into()), + border_disabled: Some(rgba(0x0e6671ff).into()), elevated_surface_background: Some(rgba(0x020c0eff).into()), surface_background: Some(rgba(0x020c0eff).into()), - background: Some(rgba(0x031316ff).into()), - element_background: Some(rgba(0x089099ff).into()), - element_hover: Some(rgba(0x0b505aff).into()), - element_selected: Some(rgba(0x0d6571ff).into()), + background: Some(rgba(0x031417ff).into()), + element_background: Some(rgba(0x099099ff).into()), + element_hover: Some(rgba(0x0b515bff).into()), + element_selected: Some(rgba(0x0e6671ff).into()), drop_target_background: Some(rgba(0x00404dff).into()), - ghost_element_hover: Some(rgba(0x0b505aff).into()), - text: Some(rgba(0xb1c9ccff).into()), - tab_inactive_background: Some(rgba(0x052e32ff).into()), - tab_active_background: Some(rgba(0x031316ff).into()), - editor_background: Some(rgba(0x031316ff).into()), - editor_gutter_background: Some(rgba(0x031316ff).into()), + ghost_element_hover: Some(rgba(0x0b515bff).into()), + text: Some(rgba(0xb2cacdff).into()), + tab_inactive_background: Some(rgba(0x062e32ff).into()), + tab_active_background: Some(rgba(0x031417ff).into()), + editor_background: Some(rgba(0x031417ff).into()), + editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), - editor_active_line_number: Some(rgba(0xb1c9ccff).into()), + editor_active_line_number: Some(rgba(0xb2cacdff).into()), terminal_background: Some(rgba(0x020c0eff).into()), terminal_ansi_bright_black: Some(rgba(0x47686cff).into()), terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()), - terminal_ansi_bright_green: Some(rgba(0x5febb1ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xe69532ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x5fb5ebff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xe697b2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x5fdaebff).into()), + terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()), terminal_ansi_bright_white: Some(rgba(0xc1d4d7ff).into()), terminal_ansi_black: Some(rgba(0x324a4dff).into()), - terminal_ansi_red: Some(rgba(0xe66432ff).into()), + terminal_ansi_red: Some(rgba(0xe66533ff).into()), terminal_ansi_green: Some(rgba(0x49e9a6ff).into()), terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()), terminal_ansi_blue: Some(rgba(0x49ace9ff).into()), - terminal_ansi_magenta: Some(rgba(0xdf759aff).into()), - terminal_ansi_cyan: Some(rgba(0x49d5e9ff).into()), - terminal_ansi_white: Some(rgba(0xb1c9ccff).into()), + terminal_ansi_magenta: Some(rgba(0xdf769bff).into()), + terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()), + terminal_ansi_white: Some(rgba(0xb2cacdff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xe34d1bff).into()), - error: Some(rgba(0xe34d1bff).into()), + deleted: Some(rgba(0xe34e1cff).into()), + error: Some(rgba(0xe34e1cff).into()), hidden: Some(rgba(0x87a7abff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa487ff).into()), @@ -1832,7 +1832,7 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -1846,7 +1846,7 @@ pub fn noctis() -> UserThemeFamily { ( "constant".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), @@ -1867,42 +1867,42 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -1916,7 +1916,7 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), @@ -1930,7 +1930,7 @@ pub fn noctis() -> UserThemeFamily { ( "punctuation.delimiter".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), @@ -1944,14 +1944,14 @@ pub fn noctis() -> UserThemeFamily { ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xb1c9ccff).into()), + color: Some(rgba(0xb2cacdff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), @@ -1965,14 +1965,14 @@ pub fn noctis() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), @@ -1986,7 +1986,7 @@ pub fn noctis() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xe66432ff).into()), + color: Some(rgba(0xe66533ff).into()), ..Default::default() }, ), @@ -1999,18 +1999,18 @@ pub fn noctis() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x6d66a7ff).into()), - border_variant: Some(rgba(0x6d66a7ff).into()), + border: Some(rgba(0x6e67a8ff).into()), + border_variant: Some(rgba(0x6e67a8ff).into()), border_focused: Some(rgba(0x2f2c49ff).into()), - border_selected: Some(rgba(0x6d66a7ff).into()), - border_transparent: Some(rgba(0x6d66a7ff).into()), - border_disabled: Some(rgba(0x6d66a7ff).into()), + border_selected: Some(rgba(0x6e67a8ff).into()), + border_transparent: Some(rgba(0x6e67a8ff).into()), + border_disabled: Some(rgba(0x6e67a8ff).into()), elevated_surface_background: Some(rgba(0x1f1d30ff).into()), surface_background: Some(rgba(0x1f1d30ff).into()), background: Some(rgba(0x292640ff).into()), - element_background: Some(rgba(0x007e99ff).into()), + element_background: Some(rgba(0x007f99ff).into()), element_hover: Some(rgba(0x383866ff).into()), - element_selected: Some(rgba(0x322e5cff).into()), + element_selected: Some(rgba(0x332e5cff).into()), drop_target_background: Some(rgba(0x202040ff).into()), ghost_element_hover: Some(rgba(0x383866ff).into()), text: Some(rgba(0xc5c2d6ff).into()), @@ -2023,25 +2023,25 @@ pub fn noctis() -> UserThemeFamily { terminal_background: Some(rgba(0x1f1d30ff).into()), terminal_ansi_bright_black: Some(rgba(0x504e65ff).into()), terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()), - terminal_ansi_bright_green: Some(rgba(0x5febb1ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xe69532ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x5fb5ebff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xe697b2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x5fdaebff).into()), + terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()), terminal_ansi_bright_white: Some(rgba(0xc5c2d6ff).into()), terminal_ansi_black: Some(rgba(0x302f3dff).into()), - terminal_ansi_red: Some(rgba(0xe66432ff).into()), + terminal_ansi_red: Some(rgba(0xe66533ff).into()), terminal_ansi_green: Some(rgba(0x49e9a6ff).into()), terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()), terminal_ansi_blue: Some(rgba(0x49ace9ff).into()), - terminal_ansi_magenta: Some(rgba(0xdf759aff).into()), - terminal_ansi_cyan: Some(rgba(0x49d5e9ff).into()), + terminal_ansi_magenta: Some(rgba(0xdf769bff).into()), + terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()), terminal_ansi_white: Some(rgba(0xb6b3ccff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xe34d1bff).into()), - error: Some(rgba(0xe34d1bff).into()), + deleted: Some(rgba(0xe34e1cff).into()), + error: Some(rgba(0xe34e1cff).into()), hidden: Some(rgba(0xa9a5c0ff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa857ff).into()), @@ -2052,14 +2052,14 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x716b93ff).into()), + color: Some(rgba(0x716c93ff).into()), ..Default::default() }, ), @@ -2087,42 +2087,42 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -2136,14 +2136,14 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x716b93ff).into()), + color: Some(rgba(0x716c93ff).into()), ..Default::default() }, ), @@ -2171,7 +2171,7 @@ pub fn noctis() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), @@ -2185,14 +2185,14 @@ pub fn noctis() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), @@ -2206,7 +2206,7 @@ pub fn noctis() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xe66432ff).into()), + color: Some(rgba(0xe66533ff).into()), ..Default::default() }, ), @@ -2219,20 +2219,20 @@ pub fn noctis() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x8666a7ff).into()), - border_variant: Some(rgba(0x8666a7ff).into()), + border: Some(rgba(0x8767a8ff).into()), + border_variant: Some(rgba(0x8767a8ff).into()), border_focused: Some(rgba(0x3d2e4dff).into()), - border_selected: Some(rgba(0x8666a7ff).into()), - border_transparent: Some(rgba(0x8666a7ff).into()), - border_disabled: Some(rgba(0x8666a7ff).into()), + border_selected: Some(rgba(0x8767a8ff).into()), + border_transparent: Some(rgba(0x8767a8ff).into()), + border_disabled: Some(rgba(0x8767a8ff).into()), elevated_surface_background: Some(rgba(0x291d35ff).into()), surface_background: Some(rgba(0x291d35ff).into()), background: Some(rgba(0x30243dff).into()), - element_background: Some(rgba(0x007e99ff).into()), - element_hover: Some(rgba(0x69438dff).into()), + element_background: Some(rgba(0x007f99ff).into()), + element_hover: Some(rgba(0x6a448dff).into()), element_selected: Some(rgba(0x472e60ff).into()), drop_target_background: Some(rgba(0x302040ff).into()), - ghost_element_hover: Some(rgba(0x69438dff).into()), + ghost_element_hover: Some(rgba(0x6a448dff).into()), text: Some(rgba(0xccbfd9ff).into()), tab_inactive_background: Some(rgba(0x3d2e4dff).into()), tab_active_background: Some(rgba(0x30243dff).into()), @@ -2243,25 +2243,25 @@ pub fn noctis() -> UserThemeFamily { terminal_background: Some(rgba(0x291d35ff).into()), terminal_ansi_bright_black: Some(rgba(0x594e65ff).into()), terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()), - terminal_ansi_bright_green: Some(rgba(0x5febb1ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xe69532ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x5fb5ebff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xe697b2ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x5fdaebff).into()), + terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()), + terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()), terminal_ansi_bright_white: Some(rgba(0xccbfd9ff).into()), terminal_ansi_black: Some(rgba(0x362f3dff).into()), - terminal_ansi_red: Some(rgba(0xe66432ff).into()), + terminal_ansi_red: Some(rgba(0xe66533ff).into()), terminal_ansi_green: Some(rgba(0x49e9a6ff).into()), terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()), terminal_ansi_blue: Some(rgba(0x49ace9ff).into()), - terminal_ansi_magenta: Some(rgba(0xdf759aff).into()), - terminal_ansi_cyan: Some(rgba(0x49d5e9ff).into()), + terminal_ansi_magenta: Some(rgba(0xdf769bff).into()), + terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()), terminal_ansi_white: Some(rgba(0xbfafcfff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xe34d1bff).into()), - error: Some(rgba(0xe34d1bff).into()), + deleted: Some(rgba(0xe34e1cff).into()), + error: Some(rgba(0xe34e1cff).into()), hidden: Some(rgba(0xb3a5c0ff).into()), hint: Some(rgba(0x969696ff).into()), warning: Some(rgba(0xffa857ff).into()), @@ -2272,14 +2272,14 @@ pub fn noctis() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x7e6499ff).into()), + color: Some(rgba(0x7f659aff).into()), ..Default::default() }, ), @@ -2307,42 +2307,42 @@ pub fn noctis() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "link_text".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "link_uri".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0x705febff).into()), + color: Some(rgba(0x7060ebff).into()), ..Default::default() }, ), @@ -2356,14 +2356,14 @@ pub fn noctis() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x15a2b6ff).into()), + color: Some(rgba(0x16a3b6ff).into()), ..Default::default() }, ), ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x7e6499ff).into()), + color: Some(rgba(0x7f659aff).into()), ..Default::default() }, ), @@ -2391,7 +2391,7 @@ pub fn noctis() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xdf759aff).into()), + color: Some(rgba(0xdf769bff).into()), ..Default::default() }, ), @@ -2405,14 +2405,14 @@ pub fn noctis() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x49d5e9ff).into()), + color: Some(rgba(0x49d6e9ff).into()), ..Default::default() }, ), @@ -2426,7 +2426,7 @@ pub fn noctis() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xe66432ff).into()), + color: Some(rgba(0xe66533ff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index 0c40275617..e1c4e35f58 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -27,10 +27,10 @@ pub fn nord() -> UserThemeFamily { elevated_surface_background: Some(rgba(0x2e3440ff).into()), surface_background: Some(rgba(0x2e3440ff).into()), background: Some(rgba(0x2e3440ff).into()), - element_background: Some(rgba(0x88bfd0ee).into()), + element_background: Some(rgba(0x88c0d0ee).into()), element_hover: Some(rgba(0x3b4252ff).into()), - element_selected: Some(rgba(0x88bfd0ff).into()), - drop_target_background: Some(rgba(0x88bfd099).into()), + element_selected: Some(rgba(0x88c0d0ff).into()), + drop_target_background: Some(rgba(0x88c0d099).into()), ghost_element_hover: Some(rgba(0x3b4252ff).into()), text: Some(rgba(0xd8dee9ff).into()), tab_inactive_background: Some(rgba(0x2e3440ff).into()), @@ -45,7 +45,7 @@ pub fn nord() -> UserThemeFamily { terminal_ansi_bright_green: Some(rgba(0xa3be8cff).into()), terminal_ansi_bright_yellow: Some(rgba(0xebcb8bff).into()), terminal_ansi_bright_blue: Some(rgba(0x81a1c1ff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xb48eacff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xb48eadff).into()), terminal_ansi_bright_cyan: Some(rgba(0x8fbcbbff).into()), terminal_ansi_bright_white: Some(rgba(0xeceff4ff).into()), terminal_ansi_black: Some(rgba(0x3b4252ff).into()), @@ -53,8 +53,8 @@ pub fn nord() -> UserThemeFamily { terminal_ansi_green: Some(rgba(0xa3be8cff).into()), terminal_ansi_yellow: Some(rgba(0xebcb8bff).into()), terminal_ansi_blue: Some(rgba(0x81a1c1ff).into()), - terminal_ansi_magenta: Some(rgba(0xb48eacff).into()), - terminal_ansi_cyan: Some(rgba(0x88bfd0ff).into()), + terminal_ansi_magenta: Some(rgba(0xb48eadff).into()), + terminal_ansi_cyan: Some(rgba(0x88c0d0ff).into()), terminal_ansi_white: Some(rgba(0xe5e9f0ff).into()), ..Default::default() }, @@ -85,7 +85,7 @@ pub fn nord() -> UserThemeFamily { ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x606e87ff).into()), + color: Some(rgba(0x616e88ff).into()), ..Default::default() }, ), @@ -106,7 +106,7 @@ pub fn nord() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x88bfd0ff).into()), + color: Some(rgba(0x88c0d0ff).into()), ..Default::default() }, ), @@ -120,7 +120,7 @@ pub fn nord() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xb48eacff).into()), + color: Some(rgba(0xb48eadff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index f0f8e4f170..21e77dbacf 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -19,29 +19,29 @@ pub fn palenight() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x282b3bff).into()), - border_variant: Some(rgba(0x282b3bff).into()), - border_focused: Some(rgba(0x282b3bff).into()), - border_selected: Some(rgba(0x282b3bff).into()), - border_transparent: Some(rgba(0x282b3bff).into()), - border_disabled: Some(rgba(0x282b3bff).into()), - elevated_surface_background: Some(rgba(0x292c3eff).into()), - surface_background: Some(rgba(0x292c3eff).into()), - background: Some(rgba(0x292c3eff).into()), - element_background: Some(rgba(0x7d56c1cc).into()), + border: Some(rgba(0x282b3cff).into()), + border_variant: Some(rgba(0x282b3cff).into()), + border_focused: Some(rgba(0x282b3cff).into()), + border_selected: Some(rgba(0x282b3cff).into()), + border_transparent: Some(rgba(0x282b3cff).into()), + border_disabled: Some(rgba(0x282b3cff).into()), + elevated_surface_background: Some(rgba(0x292d3eff).into()), + surface_background: Some(rgba(0x292d3eff).into()), + background: Some(rgba(0x292d3eff).into()), + element_background: Some(rgba(0x7e57c2cc).into()), element_hover: Some(rgba(0x0000001a).into()), - element_selected: Some(rgba(0x7d56c1ff).into()), + element_selected: Some(rgba(0x7e57c2ff).into()), drop_target_background: Some(rgba(0x2e3245ff).into()), ghost_element_hover: Some(rgba(0x0000001a).into()), text: Some(rgba(0xffffffff).into()), tab_inactive_background: Some(rgba(0x31364aff).into()), - tab_active_background: Some(rgba(0x292c3eff).into()), - editor_background: Some(rgba(0x292c3eff).into()), - editor_gutter_background: Some(rgba(0x292c3eff).into()), + tab_active_background: Some(rgba(0x292d3eff).into()), + editor_background: Some(rgba(0x292d3eff).into()), + editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), editor_active_line_number: Some(rgba(0xbfc7d5ff).into()), terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()), - terminal_ansi_bright_red: Some(rgba(0xff5571ff).into()), + terminal_ansi_bright_red: Some(rgba(0xff5572ff).into()), terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffcb6bff).into()), terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()), @@ -49,7 +49,7 @@ pub fn palenight() -> UserThemeFamily { terminal_ansi_bright_cyan: Some(rgba(0x89ddffff).into()), terminal_ansi_bright_white: Some(rgba(0xffffffff).into()), terminal_ansi_black: Some(rgba(0x676e95ff).into()), - terminal_ansi_red: Some(rgba(0xff5571ff).into()), + terminal_ansi_red: Some(rgba(0xff5572ff).into()), terminal_ansi_green: Some(rgba(0xa9c77dff).into()), terminal_ansi_yellow: Some(rgba(0xffcb6bff).into()), terminal_ansi_blue: Some(rgba(0x82aaffff).into()), @@ -59,9 +59,9 @@ pub fn palenight() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xef524fff).into()), - error: Some(rgba(0xef524fff).into()), - hidden: Some(rgba(0x9199c8ff).into()), + deleted: Some(rgba(0xef5350ff).into()), + error: Some(rgba(0xef5350ff).into()), + hidden: Some(rgba(0x929ac9ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() }, @@ -84,7 +84,7 @@ pub fn palenight() -> UserThemeFamily { ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x687097ff).into()), + color: Some(rgba(0x697098ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -143,7 +143,7 @@ pub fn palenight() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xf78b6bff).into()), + color: Some(rgba(0xf78c6cff).into()), ..Default::default() }, ), @@ -157,7 +157,7 @@ pub fn palenight() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x7fcac3ff).into()), + color: Some(rgba(0x80cbc4ff).into()), ..Default::default() }, ), @@ -185,7 +185,7 @@ pub fn palenight() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xff5571ff).into()), + color: Some(rgba(0xff5572ff).into()), ..Default::default() }, ), @@ -213,7 +213,7 @@ pub fn palenight() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xff5571ff).into()), + color: Some(rgba(0xff5572ff).into()), ..Default::default() }, ), @@ -226,29 +226,29 @@ pub fn palenight() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x282b3bff).into()), - border_variant: Some(rgba(0x282b3bff).into()), - border_focused: Some(rgba(0x282b3bff).into()), - border_selected: Some(rgba(0x282b3bff).into()), - border_transparent: Some(rgba(0x282b3bff).into()), - border_disabled: Some(rgba(0x282b3bff).into()), - elevated_surface_background: Some(rgba(0x292c3eff).into()), - surface_background: Some(rgba(0x292c3eff).into()), - background: Some(rgba(0x292c3eff).into()), - element_background: Some(rgba(0x7d56c1cc).into()), + border: Some(rgba(0x282b3cff).into()), + border_variant: Some(rgba(0x282b3cff).into()), + border_focused: Some(rgba(0x282b3cff).into()), + border_selected: Some(rgba(0x282b3cff).into()), + border_transparent: Some(rgba(0x282b3cff).into()), + border_disabled: Some(rgba(0x282b3cff).into()), + elevated_surface_background: Some(rgba(0x292d3eff).into()), + surface_background: Some(rgba(0x292d3eff).into()), + background: Some(rgba(0x292d3eff).into()), + element_background: Some(rgba(0x7e57c2cc).into()), element_hover: Some(rgba(0x0000001a).into()), - element_selected: Some(rgba(0x7d56c1ff).into()), + element_selected: Some(rgba(0x7e57c2ff).into()), drop_target_background: Some(rgba(0x2e3245ff).into()), ghost_element_hover: Some(rgba(0x0000001a).into()), text: Some(rgba(0xffffffff).into()), tab_inactive_background: Some(rgba(0x31364aff).into()), - tab_active_background: Some(rgba(0x292c3eff).into()), - editor_background: Some(rgba(0x292c3eff).into()), - editor_gutter_background: Some(rgba(0x292c3eff).into()), + tab_active_background: Some(rgba(0x292d3eff).into()), + editor_background: Some(rgba(0x292d3eff).into()), + editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), editor_active_line_number: Some(rgba(0xbfc7d5ff).into()), terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()), - terminal_ansi_bright_red: Some(rgba(0xff5571ff).into()), + terminal_ansi_bright_red: Some(rgba(0xff5572ff).into()), terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffcb6bff).into()), terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()), @@ -256,7 +256,7 @@ pub fn palenight() -> UserThemeFamily { terminal_ansi_bright_cyan: Some(rgba(0x89ddffff).into()), terminal_ansi_bright_white: Some(rgba(0xffffffff).into()), terminal_ansi_black: Some(rgba(0x676e95ff).into()), - terminal_ansi_red: Some(rgba(0xff5571ff).into()), + terminal_ansi_red: Some(rgba(0xff5572ff).into()), terminal_ansi_green: Some(rgba(0xa9c77dff).into()), terminal_ansi_yellow: Some(rgba(0xffcb6bff).into()), terminal_ansi_blue: Some(rgba(0x82aaffff).into()), @@ -266,9 +266,9 @@ pub fn palenight() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xef524fff).into()), - error: Some(rgba(0xef524fff).into()), - hidden: Some(rgba(0x9199c8ff).into()), + deleted: Some(rgba(0xef5350ff).into()), + error: Some(rgba(0xef5350ff).into()), + hidden: Some(rgba(0x929ac9ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() }, @@ -291,7 +291,7 @@ pub fn palenight() -> UserThemeFamily { ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x687097ff).into()), + color: Some(rgba(0x697098ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -350,7 +350,7 @@ pub fn palenight() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xf78b6bff).into()), + color: Some(rgba(0xf78c6cff).into()), ..Default::default() }, ), @@ -364,7 +364,7 @@ pub fn palenight() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x7fcac3ff).into()), + color: Some(rgba(0x80cbc4ff).into()), ..Default::default() }, ), @@ -392,7 +392,7 @@ pub fn palenight() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xff5571ff).into()), + color: Some(rgba(0xff5572ff).into()), ..Default::default() }, ), @@ -420,7 +420,7 @@ pub fn palenight() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xff5571ff).into()), + color: Some(rgba(0xff5572ff).into()), ..Default::default() }, ), @@ -439,23 +439,23 @@ pub fn palenight() -> UserThemeFamily { border_selected: Some(rgba(0x2c2f40ff).into()), border_transparent: Some(rgba(0x2c2f40ff).into()), border_disabled: Some(rgba(0x2c2f40ff).into()), - elevated_surface_background: Some(rgba(0x25283aff).into()), - surface_background: Some(rgba(0x25283aff).into()), - background: Some(rgba(0x292c3eff).into()), - element_background: Some(rgba(0x7d56c1cc).into()), + elevated_surface_background: Some(rgba(0x25293aff).into()), + surface_background: Some(rgba(0x25293aff).into()), + background: Some(rgba(0x292d3eff).into()), + element_background: Some(rgba(0x7e57c2cc).into()), element_hover: Some(rgba(0x0000001a).into()), - element_selected: Some(rgba(0x7d56c1ff).into()), + element_selected: Some(rgba(0x7e57c2ff).into()), drop_target_background: Some(rgba(0x2e3245ff).into()), ghost_element_hover: Some(rgba(0x0000001a).into()), text: Some(rgba(0xffffffff).into()), tab_inactive_background: Some(rgba(0x31364aff).into()), - tab_active_background: Some(rgba(0x25283aff).into()), - editor_background: Some(rgba(0x292c3eff).into()), - editor_gutter_background: Some(rgba(0x292c3eff).into()), + tab_active_background: Some(rgba(0x25293aff).into()), + editor_background: Some(rgba(0x292d3eff).into()), + editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), editor_active_line_number: Some(rgba(0xbfc7d5ff).into()), terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()), - terminal_ansi_bright_red: Some(rgba(0xff5571ff).into()), + terminal_ansi_bright_red: Some(rgba(0xff5572ff).into()), terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()), terminal_ansi_bright_yellow: Some(rgba(0xffcb6bff).into()), terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()), @@ -463,7 +463,7 @@ pub fn palenight() -> UserThemeFamily { terminal_ansi_bright_cyan: Some(rgba(0x89ddffff).into()), terminal_ansi_bright_white: Some(rgba(0xffffffff).into()), terminal_ansi_black: Some(rgba(0x676e95ff).into()), - terminal_ansi_red: Some(rgba(0xff5571ff).into()), + terminal_ansi_red: Some(rgba(0xff5572ff).into()), terminal_ansi_green: Some(rgba(0xa9c77dff).into()), terminal_ansi_yellow: Some(rgba(0xffcb6bff).into()), terminal_ansi_blue: Some(rgba(0x82aaffff).into()), @@ -473,9 +473,9 @@ pub fn palenight() -> UserThemeFamily { ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xef524fff).into()), - error: Some(rgba(0xef524fff).into()), - hidden: Some(rgba(0x9199c8ff).into()), + deleted: Some(rgba(0xef5350ff).into()), + error: Some(rgba(0xef5350ff).into()), + hidden: Some(rgba(0x929ac9ff).into()), hint: Some(rgba(0x969696ff).into()), ..Default::default() }, @@ -498,7 +498,7 @@ pub fn palenight() -> UserThemeFamily { ( "comment".into(), UserHighlightStyle { - color: Some(rgba(0x687097ff).into()), + color: Some(rgba(0x697098ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -557,7 +557,7 @@ pub fn palenight() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xf78b6bff).into()), + color: Some(rgba(0xf78c6cff).into()), ..Default::default() }, ), @@ -571,7 +571,7 @@ pub fn palenight() -> UserThemeFamily { ( "property".into(), UserHighlightStyle { - color: Some(rgba(0x7fcac3ff).into()), + color: Some(rgba(0x80cbc4ff).into()), ..Default::default() }, ), @@ -599,7 +599,7 @@ pub fn palenight() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0xff5571ff).into()), + color: Some(rgba(0xff5572ff).into()), ..Default::default() }, ), @@ -627,7 +627,7 @@ pub fn palenight() -> UserThemeFamily { ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xff5571ff).into()), + color: Some(rgba(0xff5572ff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 42f0b50524..7107bb79a3 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -42,16 +42,16 @@ pub fn rose_pine() -> UserThemeFamily { editor_active_line_number: Some(rgba(0xe0def4ff).into()), terminal_ansi_bright_black: Some(rgba(0x908caaff).into()), terminal_ansi_bright_red: Some(rgba(0xeb6f92ff).into()), - terminal_ansi_bright_green: Some(rgba(0x30738fff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xf5c177ff).into()), + terminal_ansi_bright_green: Some(rgba(0x31748fff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xf6c177ff).into()), terminal_ansi_bright_blue: Some(rgba(0x9ccfd8ff).into()), terminal_ansi_bright_magenta: Some(rgba(0xc4a7e7ff).into()), terminal_ansi_bright_cyan: Some(rgba(0xebbcbaff).into()), terminal_ansi_bright_white: Some(rgba(0xe0def4ff).into()), terminal_ansi_black: Some(rgba(0x26233aff).into()), terminal_ansi_red: Some(rgba(0xeb6f92ff).into()), - terminal_ansi_green: Some(rgba(0x30738fff).into()), - terminal_ansi_yellow: Some(rgba(0xf5c177ff).into()), + terminal_ansi_green: Some(rgba(0x31748fff).into()), + terminal_ansi_yellow: Some(rgba(0xf6c177ff).into()), terminal_ansi_blue: Some(rgba(0x9ccfd8ff).into()), terminal_ansi_magenta: Some(rgba(0xc4a7e7ff).into()), terminal_ansi_cyan: Some(rgba(0xebbcbaff).into()), @@ -63,7 +63,7 @@ pub fn rose_pine() -> UserThemeFamily { error: Some(rgba(0xeb6f92ff).into()), hidden: Some(rgba(0x908caaff).into()), hint: Some(rgba(0x908caaff).into()), - warning: Some(rgba(0xf5c177ff).into()), + warning: Some(rgba(0xf6c177ff).into()), ..Default::default() }, syntax: Some(UserSyntaxTheme { @@ -102,7 +102,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0x30738fff).into()), + color: Some(rgba(0x31748fff).into()), ..Default::default() }, ), @@ -130,7 +130,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0xf5c177ff).into()), + color: Some(rgba(0xf6c177ff).into()), ..Default::default() }, ), @@ -144,7 +144,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0xf5c177ff).into()), + color: Some(rgba(0xf6c177ff).into()), ..Default::default() }, ), @@ -192,13 +192,13 @@ pub fn rose_pine() -> UserThemeFamily { border_selected: Some(rgba(0x000000ff).into()), border_transparent: Some(rgba(0x000000ff).into()), border_disabled: Some(rgba(0x000000ff).into()), - elevated_surface_background: Some(rgba(0x2a273eff).into()), - surface_background: Some(rgba(0x2a273eff).into()), + elevated_surface_background: Some(rgba(0x2a273fff).into()), + surface_background: Some(rgba(0x2a273fff).into()), background: Some(rgba(0x232136ff).into()), element_background: Some(rgba(0xea9a97ff).into()), element_hover: Some(rgba(0x817c9c14).into()), element_selected: Some(rgba(0x817c9c26).into()), - drop_target_background: Some(rgba(0x2a273eff).into()), + drop_target_background: Some(rgba(0x2a273fff).into()), ghost_element_hover: Some(rgba(0x817c9c14).into()), text: Some(rgba(0xe0def4ff).into()), tab_inactive_background: Some(rgba(0x000000ff).into()), @@ -209,16 +209,16 @@ pub fn rose_pine() -> UserThemeFamily { editor_active_line_number: Some(rgba(0xe0def4ff).into()), terminal_ansi_bright_black: Some(rgba(0x908caaff).into()), terminal_ansi_bright_red: Some(rgba(0xeb6f92ff).into()), - terminal_ansi_bright_green: Some(rgba(0x3d8fb0ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xf5c177ff).into()), + terminal_ansi_bright_green: Some(rgba(0x3e8fb0ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xf6c177ff).into()), terminal_ansi_bright_blue: Some(rgba(0x9ccfd8ff).into()), terminal_ansi_bright_magenta: Some(rgba(0xc4a7e7ff).into()), terminal_ansi_bright_cyan: Some(rgba(0xea9a97ff).into()), terminal_ansi_bright_white: Some(rgba(0xe0def4ff).into()), terminal_ansi_black: Some(rgba(0x393552ff).into()), terminal_ansi_red: Some(rgba(0xeb6f92ff).into()), - terminal_ansi_green: Some(rgba(0x3d8fb0ff).into()), - terminal_ansi_yellow: Some(rgba(0xf5c177ff).into()), + terminal_ansi_green: Some(rgba(0x3e8fb0ff).into()), + terminal_ansi_yellow: Some(rgba(0xf6c177ff).into()), terminal_ansi_blue: Some(rgba(0x9ccfd8ff).into()), terminal_ansi_magenta: Some(rgba(0xc4a7e7ff).into()), terminal_ansi_cyan: Some(rgba(0xea9a97ff).into()), @@ -230,7 +230,7 @@ pub fn rose_pine() -> UserThemeFamily { error: Some(rgba(0xeb6f92ff).into()), hidden: Some(rgba(0x908caaff).into()), hint: Some(rgba(0x908caaff).into()), - warning: Some(rgba(0xf5c177ff).into()), + warning: Some(rgba(0xf6c177ff).into()), ..Default::default() }, syntax: Some(UserSyntaxTheme { @@ -269,7 +269,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0x3d8fb0ff).into()), + color: Some(rgba(0x3e8fb0ff).into()), ..Default::default() }, ), @@ -297,7 +297,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0xf5c177ff).into()), + color: Some(rgba(0xf6c177ff).into()), ..Default::default() }, ), @@ -311,7 +311,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0xf5c177ff).into()), + color: Some(rgba(0xf6c177ff).into()), ..Default::default() }, ), @@ -362,7 +362,7 @@ pub fn rose_pine() -> UserThemeFamily { elevated_surface_background: Some(rgba(0xfffaf3ff).into()), surface_background: Some(rgba(0xfffaf3ff).into()), background: Some(rgba(0xfaf4edff).into()), - element_background: Some(rgba(0xd7827dff).into()), + element_background: Some(rgba(0xd7827eff).into()), element_hover: Some(rgba(0x6e6a860d).into()), element_selected: Some(rgba(0x6e6a8614).into()), drop_target_background: Some(rgba(0xfffaf3ff).into()), @@ -375,26 +375,26 @@ pub fn rose_pine() -> UserThemeFamily { editor_line_number: Some(rgba(0x797593ff).into()), editor_active_line_number: Some(rgba(0x575279ff).into()), terminal_ansi_bright_black: Some(rgba(0x797593ff).into()), - terminal_ansi_bright_red: Some(rgba(0xb3627aff).into()), - terminal_ansi_bright_green: Some(rgba(0x276983ff).into()), + terminal_ansi_bright_red: Some(rgba(0xb4637aff).into()), + terminal_ansi_bright_green: Some(rgba(0x286983ff).into()), terminal_ansi_bright_yellow: Some(rgba(0xea9d34ff).into()), - terminal_ansi_bright_blue: Some(rgba(0x55949fff).into()), - terminal_ansi_bright_magenta: Some(rgba(0x9079a9ff).into()), - terminal_ansi_bright_cyan: Some(rgba(0xd7827dff).into()), + terminal_ansi_bright_blue: Some(rgba(0x56949fff).into()), + terminal_ansi_bright_magenta: Some(rgba(0x907aa9ff).into()), + terminal_ansi_bright_cyan: Some(rgba(0xd7827eff).into()), terminal_ansi_bright_white: Some(rgba(0x575279ff).into()), terminal_ansi_black: Some(rgba(0xf2e9e1ff).into()), - terminal_ansi_red: Some(rgba(0xb3627aff).into()), - terminal_ansi_green: Some(rgba(0x276983ff).into()), + terminal_ansi_red: Some(rgba(0xb4637aff).into()), + terminal_ansi_green: Some(rgba(0x286983ff).into()), terminal_ansi_yellow: Some(rgba(0xea9d34ff).into()), - terminal_ansi_blue: Some(rgba(0x55949fff).into()), - terminal_ansi_magenta: Some(rgba(0x9079a9ff).into()), - terminal_ansi_cyan: Some(rgba(0xd7827dff).into()), + terminal_ansi_blue: Some(rgba(0x56949fff).into()), + terminal_ansi_magenta: Some(rgba(0x907aa9ff).into()), + terminal_ansi_cyan: Some(rgba(0xd7827eff).into()), terminal_ansi_white: Some(rgba(0x575279ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xb3627aff).into()), - error: Some(rgba(0xb3627aff).into()), + deleted: Some(rgba(0xb4637aff).into()), + error: Some(rgba(0xb4637aff).into()), hidden: Some(rgba(0x797593ff).into()), hint: Some(rgba(0x797593ff).into()), warning: Some(rgba(0xea9d34ff).into()), @@ -405,7 +405,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0x9079a9ff).into()), + color: Some(rgba(0x907aa9ff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -413,7 +413,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0xd7827dff).into()), + color: Some(rgba(0xd7827eff).into()), ..Default::default() }, ), @@ -428,7 +428,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0xb3627aff).into()), + color: Some(rgba(0xb4637aff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, @@ -436,21 +436,21 @@ pub fn rose_pine() -> UserThemeFamily { ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0x276983ff).into()), + color: Some(rgba(0x286983ff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xd7827dff).into()), + color: Some(rgba(0xd7827eff).into()), ..Default::default() }, ), ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xd7827dff).into()), + color: Some(rgba(0xd7827eff).into()), ..Default::default() }, ), @@ -471,7 +471,7 @@ pub fn rose_pine() -> UserThemeFamily { ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0x55949fff).into()), + color: Some(rgba(0x56949fff).into()), ..Default::default() }, ), @@ -485,21 +485,21 @@ pub fn rose_pine() -> UserThemeFamily { ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xd7827dff).into()), + color: Some(rgba(0xd7827eff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x55949fff).into()), + color: Some(rgba(0x56949fff).into()), ..Default::default() }, ), ( "variable".into(), UserHighlightStyle { - color: Some(rgba(0xd7827dff).into()), + color: Some(rgba(0xd7827eff).into()), font_style: Some(UserFontStyle::Italic), ..Default::default() }, diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 87221b4a85..12e3d1f399 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -21,37 +21,37 @@ pub fn solarized() -> UserThemeFamily { colors: ThemeColorsRefinement { border: Some(rgba(0x003847ff).into()), border_variant: Some(rgba(0x003847ff).into()), - border_focused: Some(rgba(0x29a19899).into()), + border_focused: Some(rgba(0x2aa19899).into()), border_selected: Some(rgba(0x003847ff).into()), border_transparent: Some(rgba(0x003847ff).into()), border_disabled: Some(rgba(0x003847ff).into()), - background: Some(rgba(0x002a35ff).into()), - element_background: Some(rgba(0x29a19899).into()), - element_hover: Some(rgba(0x004353aa).into()), + background: Some(rgba(0x002b36ff).into()), + element_background: Some(rgba(0x2aa19899).into()), + element_hover: Some(rgba(0x004454aa).into()), element_selected: Some(rgba(0x005a6fff).into()), - drop_target_background: Some(rgba(0x00435388).into()), - ghost_element_hover: Some(rgba(0x004353aa).into()), + drop_target_background: Some(rgba(0x00445488).into()), + ghost_element_hover: Some(rgba(0x004454aa).into()), text: Some(rgba(0xbbbbbbff).into()), - tab_inactive_background: Some(rgba(0x003f51ff).into()), - tab_active_background: Some(rgba(0x002a36ff).into()), - editor_background: Some(rgba(0x002a35ff).into()), - editor_gutter_background: Some(rgba(0x002a35ff).into()), + tab_inactive_background: Some(rgba(0x004052ff).into()), + tab_active_background: Some(rgba(0x002b37ff).into()), + editor_background: Some(rgba(0x002b36ff).into()), + editor_gutter_background: Some(rgba(0x002b36ff).into()), editor_line_number: Some(rgba(0x566c74ff).into()), terminal_ansi_bright_black: Some(rgba(0x586e75ff).into()), - terminal_ansi_bright_red: Some(rgba(0xcb4b15ff).into()), + terminal_ansi_bright_red: Some(rgba(0xcb4b16ff).into()), terminal_ansi_bright_green: Some(rgba(0x859900ff).into()), terminal_ansi_bright_yellow: Some(rgba(0x657b83ff).into()), terminal_ansi_bright_blue: Some(rgba(0x839496ff).into()), terminal_ansi_bright_magenta: Some(rgba(0x6c71c4ff).into()), terminal_ansi_bright_cyan: Some(rgba(0x93a1a1ff).into()), terminal_ansi_bright_white: Some(rgba(0x839496ff).into()), - terminal_ansi_black: Some(rgba(0x063642ff).into()), - terminal_ansi_red: Some(rgba(0xdc312eff).into()), + terminal_ansi_black: Some(rgba(0x073642ff).into()), + terminal_ansi_red: Some(rgba(0xdc322fff).into()), terminal_ansi_green: Some(rgba(0x859900ff).into()), - terminal_ansi_yellow: Some(rgba(0xb58800ff).into()), - terminal_ansi_blue: Some(rgba(0x258ad2ff).into()), - terminal_ansi_magenta: Some(rgba(0xd33582ff).into()), - terminal_ansi_cyan: Some(rgba(0x29a198ff).into()), + terminal_ansi_yellow: Some(rgba(0xb58900ff).into()), + terminal_ansi_blue: Some(rgba(0x268bd2ff).into()), + terminal_ansi_magenta: Some(rgba(0xd33682ff).into()), + terminal_ansi_cyan: Some(rgba(0x2aa198ff).into()), terminal_ansi_white: Some(rgba(0x839496ff).into()), ..Default::default() }, @@ -74,7 +74,7 @@ pub fn solarized() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0xb58800ff).into()), + color: Some(rgba(0xb58900ff).into()), ..Default::default() }, ), @@ -89,7 +89,7 @@ pub fn solarized() -> UserThemeFamily { ( "constant".into(), UserHighlightStyle { - color: Some(rgba(0xcb4b15ff).into()), + color: Some(rgba(0xcb4b16ff).into()), ..Default::default() }, ), @@ -103,21 +103,21 @@ pub fn solarized() -> UserThemeFamily { ( "emphasis".into(), UserHighlightStyle { - color: Some(rgba(0xd33582ff).into()), + color: Some(rgba(0xd33682ff).into()), ..Default::default() }, ), ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xd33582ff).into()), + color: Some(rgba(0xd33682ff).into()), ..Default::default() }, ), ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), @@ -131,7 +131,7 @@ pub fn solarized() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xd33582ff).into()), + color: Some(rgba(0xd33682ff).into()), ..Default::default() }, ), @@ -152,49 +152,49 @@ pub fn solarized() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0x29a198ff).into()), + color: Some(rgba(0x2aa198ff).into()), ..Default::default() }, ), ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xcb4b15ff).into()), + color: Some(rgba(0xcb4b16ff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0x29a198ff).into()), + color: Some(rgba(0x2aa198ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xcb4b15ff).into()), + color: Some(rgba(0xcb4b16ff).into()), ..Default::default() }, ), ( "variable".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), @@ -214,10 +214,10 @@ pub fn solarized() -> UserThemeFamily { border_transparent: Some(rgba(0xddd6c1ff).into()), border_disabled: Some(rgba(0xddd6c1ff).into()), background: Some(rgba(0xfdf6e3ff).into()), - element_background: Some(rgba(0xab9d56ff).into()), - element_hover: Some(rgba(0xdec98744).into()), - element_selected: Some(rgba(0xdec987ff).into()), - ghost_element_hover: Some(rgba(0xdec98744).into()), + element_background: Some(rgba(0xac9d57ff).into()), + element_hover: Some(rgba(0xdfca8844).into()), + element_selected: Some(rgba(0xdfca88ff).into()), + ghost_element_hover: Some(rgba(0xdfca8844).into()), text: Some(rgba(0x333333ff).into()), tab_inactive_background: Some(rgba(0xd3cbb7ff).into()), tab_active_background: Some(rgba(0xfdf6e3ff).into()), @@ -225,7 +225,7 @@ pub fn solarized() -> UserThemeFamily { editor_gutter_background: Some(rgba(0xfdf6e3ff).into()), editor_line_number: Some(rgba(0x9ca8a6ff).into()), terminal_ansi_bright_black: Some(rgba(0x657b83ff).into()), - terminal_ansi_bright_red: Some(rgba(0xcb4b15ff).into()), + terminal_ansi_bright_red: Some(rgba(0xcb4b16ff).into()), terminal_ansi_bright_green: Some(rgba(0x859900ff).into()), terminal_ansi_bright_yellow: Some(rgba(0x657b83ff).into()), terminal_ansi_bright_blue: Some(rgba(0x839496ff).into()), @@ -233,12 +233,12 @@ pub fn solarized() -> UserThemeFamily { terminal_ansi_bright_cyan: Some(rgba(0x93a1a1ff).into()), terminal_ansi_bright_white: Some(rgba(0xeee8d5ff).into()), terminal_ansi_black: Some(rgba(0x657b83ff).into()), - terminal_ansi_red: Some(rgba(0xdc312eff).into()), + terminal_ansi_red: Some(rgba(0xdc322fff).into()), terminal_ansi_green: Some(rgba(0x859900ff).into()), - terminal_ansi_yellow: Some(rgba(0xb58800ff).into()), - terminal_ansi_blue: Some(rgba(0x258ad2ff).into()), - terminal_ansi_magenta: Some(rgba(0xd33582ff).into()), - terminal_ansi_cyan: Some(rgba(0x29a198ff).into()), + terminal_ansi_yellow: Some(rgba(0xb58900ff).into()), + terminal_ansi_blue: Some(rgba(0x268bd2ff).into()), + terminal_ansi_magenta: Some(rgba(0xd33682ff).into()), + terminal_ansi_cyan: Some(rgba(0x2aa198ff).into()), terminal_ansi_white: Some(rgba(0xeee8d5ff).into()), ..Default::default() }, @@ -259,7 +259,7 @@ pub fn solarized() -> UserThemeFamily { ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0xb58800ff).into()), + color: Some(rgba(0xb58900ff).into()), ..Default::default() }, ), @@ -274,7 +274,7 @@ pub fn solarized() -> UserThemeFamily { ( "constant".into(), UserHighlightStyle { - color: Some(rgba(0xcb4b15ff).into()), + color: Some(rgba(0xcb4b16ff).into()), ..Default::default() }, ), @@ -288,21 +288,21 @@ pub fn solarized() -> UserThemeFamily { ( "emphasis".into(), UserHighlightStyle { - color: Some(rgba(0xd33582ff).into()), + color: Some(rgba(0xd33682ff).into()), ..Default::default() }, ), ( "emphasis.strong".into(), UserHighlightStyle { - color: Some(rgba(0xd33582ff).into()), + color: Some(rgba(0xd33682ff).into()), ..Default::default() }, ), ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), @@ -316,7 +316,7 @@ pub fn solarized() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xd33582ff).into()), + color: Some(rgba(0xd33682ff).into()), ..Default::default() }, ), @@ -330,49 +330,49 @@ pub fn solarized() -> UserThemeFamily { ( "string".into(), UserHighlightStyle { - color: Some(rgba(0x29a198ff).into()), + color: Some(rgba(0x2aa198ff).into()), ..Default::default() }, ), ( "string.escape".into(), UserHighlightStyle { - color: Some(rgba(0xcb4b15ff).into()), + color: Some(rgba(0xcb4b16ff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), ( "text.literal".into(), UserHighlightStyle { - color: Some(rgba(0x29a198ff).into()), + color: Some(rgba(0x2aa198ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), ( "variable".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0x258ad2ff).into()), + color: Some(rgba(0x268bd2ff).into()), ..Default::default() }, ), diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index fc006a7c5a..731c2527f5 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -19,36 +19,36 @@ pub fn synthwave_84() -> UserThemeFamily { styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { border_focused: Some(rgba(0x1f212bff).into()), - background: Some(rgba(0x252334ff).into()), + background: Some(rgba(0x262335ff).into()), element_background: Some(rgba(0x614d85ff).into()), element_hover: Some(rgba(0x37294d99).into()), element_selected: Some(rgba(0xffffff20).into()), drop_target_background: Some(rgba(0x34294f66).into()), ghost_element_hover: Some(rgba(0x37294d99).into()), text: Some(rgba(0xffffffff).into()), - tab_inactive_background: Some(rgba(0x252334ff).into()), - editor_background: Some(rgba(0x252334ff).into()), - editor_gutter_background: Some(rgba(0x252334ff).into()), + tab_inactive_background: Some(rgba(0x262335ff).into()), + editor_background: Some(rgba(0x262335ff).into()), + editor_gutter_background: Some(rgba(0x262335ff).into()), editor_line_number: Some(rgba(0xffffff73).into()), - terminal_ansi_bright_red: Some(rgba(0xfe444fff).into()), - terminal_ansi_bright_green: Some(rgba(0x71f1b7ff).into()), - terminal_ansi_bright_yellow: Some(rgba(0xfede5cff).into()), - terminal_ansi_bright_blue: Some(rgba(0x02edf9ff).into()), - terminal_ansi_bright_magenta: Some(rgba(0xff7ddaff).into()), - terminal_ansi_bright_cyan: Some(rgba(0x02edf9ff).into()), - terminal_ansi_red: Some(rgba(0xfe444fff).into()), - terminal_ansi_green: Some(rgba(0x71f1b7ff).into()), + terminal_ansi_bright_red: Some(rgba(0xfe4450ff).into()), + terminal_ansi_bright_green: Some(rgba(0x72f1b8ff).into()), + terminal_ansi_bright_yellow: Some(rgba(0xfede5dff).into()), + terminal_ansi_bright_blue: Some(rgba(0x03edf9ff).into()), + terminal_ansi_bright_magenta: Some(rgba(0xff7edbff).into()), + terminal_ansi_bright_cyan: Some(rgba(0x03edf9ff).into()), + terminal_ansi_red: Some(rgba(0xfe4450ff).into()), + terminal_ansi_green: Some(rgba(0x72f1b8ff).into()), terminal_ansi_yellow: Some(rgba(0xf3e70fff).into()), - terminal_ansi_blue: Some(rgba(0x02edf9ff).into()), - terminal_ansi_magenta: Some(rgba(0xff7ddaff).into()), - terminal_ansi_cyan: Some(rgba(0x02edf9ff).into()), + terminal_ansi_blue: Some(rgba(0x03edf9ff).into()), + terminal_ansi_magenta: Some(rgba(0xff7edbff).into()), + terminal_ansi_cyan: Some(rgba(0x03edf9ff).into()), ..Default::default() }, status: StatusColorsRefinement { - deleted: Some(rgba(0xfe444fff).into()), - error: Some(rgba(0xfe444fff).into()), + deleted: Some(rgba(0xfe4450ff).into()), + error: Some(rgba(0xfe4450ff).into()), hint: Some(rgba(0x969696ff).into()), - warning: Some(rgba(0x71f1b7bb).into()), + warning: Some(rgba(0x72f1b8bb).into()), ..Default::default() }, syntax: Some(UserSyntaxTheme { @@ -56,14 +56,14 @@ pub fn synthwave_84() -> UserThemeFamily { ( "attribute".into(), UserHighlightStyle { - color: Some(rgba(0xfede5cff).into()), + color: Some(rgba(0xfede5dff).into()), ..Default::default() }, ), ( "boolean".into(), UserHighlightStyle { - color: Some(rgba(0xf97d71ff).into()), + color: Some(rgba(0xf97e72ff).into()), ..Default::default() }, ), @@ -78,21 +78,21 @@ pub fn synthwave_84() -> UserThemeFamily { ( "function".into(), UserHighlightStyle { - color: Some(rgba(0x35f9f5ff).into()), + color: Some(rgba(0x36f9f6ff).into()), ..Default::default() }, ), ( "keyword".into(), UserHighlightStyle { - color: Some(rgba(0xfede5cff).into()), + color: Some(rgba(0xfede5dff).into()), ..Default::default() }, ), ( "label".into(), UserHighlightStyle { - color: Some(rgba(0xfe444fff).into()), + color: Some(rgba(0xfe4450ff).into()), ..Default::default() }, ), @@ -113,63 +113,63 @@ pub fn synthwave_84() -> UserThemeFamily { ( "number".into(), UserHighlightStyle { - color: Some(rgba(0xf97d71ff).into()), + color: Some(rgba(0xf97e72ff).into()), ..Default::default() }, ), ( "operator".into(), UserHighlightStyle { - color: Some(rgba(0xfede5cff).into()), + color: Some(rgba(0xfede5dff).into()), ..Default::default() }, ), ( "property".into(), UserHighlightStyle { - color: Some(rgba(0xff7ddaff).into()), + color: Some(rgba(0xff7edbff).into()), ..Default::default() }, ), ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x35f9f5ff).into()), + color: Some(rgba(0x36f9f6ff).into()), ..Default::default() }, ), ( "tag".into(), UserHighlightStyle { - color: Some(rgba(0x71f1b7ff).into()), + color: Some(rgba(0x72f1b8ff).into()), ..Default::default() }, ), ( "title".into(), UserHighlightStyle { - color: Some(rgba(0xfe444fff).into()), + color: Some(rgba(0xfe4450ff).into()), ..Default::default() }, ), ( "type".into(), UserHighlightStyle { - color: Some(rgba(0xfe444fff).into()), + color: Some(rgba(0xfe4450ff).into()), ..Default::default() }, ), ( "variable".into(), UserHighlightStyle { - color: Some(rgba(0xff7ddaff).into()), + color: Some(rgba(0xff7edbff).into()), ..Default::default() }, ), ( "variable.special".into(), UserHighlightStyle { - color: Some(rgba(0xfe444fff).into()), + color: Some(rgba(0xfe4450ff).into()), font_weight: Some(UserFontWeight(700.0)), ..Default::default() }, diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml index b4b72be499..bf071912a7 100644 --- a/crates/theme_importer/Cargo.toml +++ b/crates/theme_importer/Cargo.toml @@ -13,6 +13,7 @@ gpui = { package = "gpui2", path = "../gpui2" } indexmap = "1.6.2" json_comments = "0.2.2" log.workspace = true +palette = { version = "0.7.3", default-features = false, features = ["std"] } rust-embed.workspace = true serde.workspace = true simplelog = "0.9" diff --git a/crates/theme_importer/src/color.rs b/crates/theme_importer/src/color.rs new file mode 100644 index 0000000000..e595b4e381 --- /dev/null +++ b/crates/theme_importer/src/color.rs @@ -0,0 +1,54 @@ +use anyhow::Result; +use gpui::Hsla; +use palette::FromColor; + +pub(crate) fn try_parse_color(color: &str) -> Result { + let rgba = gpui::Rgba::try_from(color)?; + let rgba = palette::rgb::Srgba::from_components((rgba.r, rgba.g, rgba.b, rgba.a)); + let hsla = palette::Hsla::from_color(rgba); + + let hsla = gpui::hsla( + hsla.hue.into_positive_degrees() / 360., + hsla.saturation, + hsla.lightness, + hsla.alpha, + ); + + Ok(hsla) +} + +pub(crate) fn pack_color(color: Hsla) -> u32 { + let hsla = palette::Hsla::from_components((color.h * 360., color.s, color.l, color.a)); + let rgba = palette::rgb::Srgba::from_color(hsla); + let rgba = rgba.into_format::(); + + u32::from(rgba) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + pub fn test_serialize_color() { + let color = "#b4637aff"; + let hsla = try_parse_color(color).unwrap(); + let packed = pack_color(hsla); + + assert_eq!(format!("#{:x}", packed), color); + } + + #[test] + pub fn test_serialize_color_with_palette() { + let color = "#b4637aff"; + + let rgba = gpui::Rgba::try_from(color).unwrap(); + let rgba = palette::rgb::Srgba::from_components((rgba.r, rgba.g, rgba.b, rgba.a)); + let hsla = palette::Hsla::from_color(rgba); + + let rgba = palette::rgb::Srgba::from_color(hsla); + let rgba = rgba.into_format::(); + + assert_eq!(format!("#{:x}", rgba), color); + } +} diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs index 0c690e891c..24e95ca918 100644 --- a/crates/theme_importer/src/main.rs +++ b/crates/theme_importer/src/main.rs @@ -1,3 +1,4 @@ +mod color; mod theme_printer; mod util; mod vscode; diff --git a/crates/theme_importer/src/theme_printer.rs b/crates/theme_importer/src/theme_printer.rs index dae98d313c..8739c7bbcf 100644 --- a/crates/theme_importer/src/theme_printer.rs +++ b/crates/theme_importer/src/theme_printer.rs @@ -1,12 +1,14 @@ use std::fmt::{self, Debug}; -use gpui::{Hsla, Rgba}; +use gpui::Hsla; use theme::{ Appearance, PlayerColor, PlayerColors, StatusColorsRefinement, SystemColors, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement, }; +use crate::color::pack_color; + struct RawSyntaxPrinter<'a>(&'a str); impl<'a> Debug for RawSyntaxPrinter<'a> { @@ -19,7 +21,7 @@ struct HslaPrinter(Hsla); impl Debug for HslaPrinter { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "{:?}", IntoPrinter(&Rgba::from(self.0))) + write!(f, "rgba({:#010x}).into()", pack_color(self.0)) } } diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs index 83558b874a..bc8253e700 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use gpui::{rgba, Hsla, Rgba}; +use gpui::rgba; use indexmap::IndexMap; use strum::IntoEnumIterator; use theme::{ @@ -7,16 +7,13 @@ use theme::{ UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeStylesRefinement, }; +use crate::color::try_parse_color; use crate::util::Traverse; use crate::vscode::VsCodeTheme; use crate::ThemeMetadata; use super::ZedSyntaxToken; -pub(crate) fn try_parse_color(color: &str) -> Result { - Ok(Rgba::try_from(color)?.into()) -} - pub(crate) fn try_parse_font_weight(font_style: &str) -> Option { match font_style { style if style.contains("bold") => Some(UserFontWeight::BOLD),