From 77c8108f9beaa3be7a2e6b048688f65e06e1c0e9 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 8 Dec 2023 14:13:50 -0500 Subject: [PATCH] Use `dropdown.background` from VS Code for elevated surface background --- crates/theme2/src/themes/andromeda.rs | 4 ++-- crates/theme2/src/themes/ayu.rs | 6 ++--- crates/theme2/src/themes/dracula.rs | 2 +- crates/theme2/src/themes/gruvbox.rs | 6 +++++ crates/theme2/src/themes/noctis.rs | 22 +++++++++---------- crates/theme2/src/themes/nord.rs | 2 +- crates/theme2/src/themes/palenight.rs | 2 +- crates/theme2/src/themes/solarized.rs | 2 ++ crates/theme2/src/themes/synthwave_84.rs | 1 + crates/theme_importer/src/vscode/converter.rs | 2 +- 10 files changed, 29 insertions(+), 20 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 9e61fbe2e05023c95e5d38e7f41e53a7cd831893..8ff4b6887fd553aaa264a599679abbb7adacb0fa 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -25,7 +25,7 @@ pub fn andromeda() -> UserThemeFamily { border_selected: Some(rgba(0x1b1d23ff).into()), border_transparent: Some(rgba(0x1b1d23ff).into()), border_disabled: Some(rgba(0x1b1d23ff).into()), - elevated_surface_background: Some(rgba(0x23262eff).into()), + elevated_surface_background: Some(rgba(0x2b303bff).into()), surface_background: Some(rgba(0x23262eff).into()), background: Some(rgba(0x23262eff).into()), element_background: Some(rgba(0x00e8c5cc).into()), @@ -230,7 +230,7 @@ pub fn andromeda() -> UserThemeFamily { border_selected: Some(rgba(0x1b1d23ff).into()), border_transparent: Some(rgba(0x1b1d23ff).into()), border_disabled: Some(rgba(0x1b1d23ff).into()), - elevated_surface_background: Some(rgba(0x23262eff).into()), + elevated_surface_background: Some(rgba(0x2b303bff).into()), surface_background: Some(rgba(0x23262eff).into()), background: Some(rgba(0x262a33ff).into()), element_background: Some(rgba(0x00e8c5cc).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index c9bb3dd51461c42ce6ae3513781bf79dbdf1fbda..92bdb32f6f1eb066da2498dfdcc91675b9186c46 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -25,7 +25,7 @@ pub fn ayu() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0xfcfcfcff).into()), surface_background: Some(rgba(0xf8f9faff).into()), background: Some(rgba(0xf8f9faff).into()), element_background: Some(rgba(0xffaa33ff).into()), @@ -324,7 +324,7 @@ pub fn ayu() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x242936ff).into()), surface_background: Some(rgba(0x1f2430ff).into()), background: Some(rgba(0x1f2430ff).into()), element_background: Some(rgba(0xffcc66ff).into()), @@ -623,7 +623,7 @@ pub fn ayu() -> UserThemeFamily { border_selected: Some(rgba(0x1e232bff).into()), border_transparent: Some(rgba(0x1e232bff).into()), border_disabled: Some(rgba(0x1e232bff).into()), - elevated_surface_background: Some(rgba(0x0b0e14ff).into()), + elevated_surface_background: Some(rgba(0x0d1017ff).into()), surface_background: Some(rgba(0x0b0e14ff).into()), background: Some(rgba(0x0b0e14ff).into()), element_background: Some(rgba(0xe6b450ff).into()), diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index 391ef11803d7d2e1db3b9a37f7070d4cbf87b4e9..d4c395831c9cf0f9ecdba6c76af1445ac08da9c2 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -24,7 +24,7 @@ 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(0x282a36ff).into()), + elevated_surface_background: Some(rgba(0x343746ff).into()), surface_background: Some(rgba(0x282a36ff).into()), background: Some(rgba(0x282a36ff).into()), element_background: Some(rgba(0x44475aff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 161450dbc060e87d1a8bc1c8a575e8620e36c68a..106c18868bb94613a11d00c1f87dd80429ea6d22 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -25,6 +25,7 @@ pub fn gruvbox() -> UserThemeFamily { border_selected: Some(rgba(0x3c3836ff).into()), border_transparent: Some(rgba(0x3c3836ff).into()), border_disabled: Some(rgba(0x3c3836ff).into()), + elevated_surface_background: Some(rgba(0x1d2021ff).into()), background: Some(rgba(0x1d2021ff).into()), element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0x3c383680).into()), @@ -309,6 +310,7 @@ pub fn gruvbox() -> UserThemeFamily { border_selected: Some(rgba(0x3c3836ff).into()), border_transparent: Some(rgba(0x3c3836ff).into()), border_disabled: Some(rgba(0x3c3836ff).into()), + elevated_surface_background: Some(rgba(0x282828ff).into()), background: Some(rgba(0x282828ff).into()), element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0x3c383680).into()), @@ -593,6 +595,7 @@ pub fn gruvbox() -> UserThemeFamily { border_selected: Some(rgba(0x3c3836ff).into()), border_transparent: Some(rgba(0x3c3836ff).into()), border_disabled: Some(rgba(0x3c3836ff).into()), + elevated_surface_background: Some(rgba(0x32302fff).into()), background: Some(rgba(0x32302fff).into()), element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0x3c383680).into()), @@ -877,6 +880,7 @@ pub fn gruvbox() -> UserThemeFamily { border_selected: Some(rgba(0xebdbb2ff).into()), border_transparent: Some(rgba(0xebdbb2ff).into()), border_disabled: Some(rgba(0xebdbb2ff).into()), + elevated_surface_background: Some(rgba(0xf9f5d7ff).into()), background: Some(rgba(0xf9f5d7ff).into()), element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0xebdbb280).into()), @@ -1161,6 +1165,7 @@ pub fn gruvbox() -> UserThemeFamily { border_selected: Some(rgba(0xebdbb2ff).into()), border_transparent: Some(rgba(0xebdbb2ff).into()), border_disabled: Some(rgba(0xebdbb2ff).into()), + elevated_surface_background: Some(rgba(0xfbf1c7ff).into()), background: Some(rgba(0xfbf1c7ff).into()), element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0xebdbb280).into()), @@ -1445,6 +1450,7 @@ pub fn gruvbox() -> UserThemeFamily { border_selected: Some(rgba(0xebdbb2ff).into()), border_transparent: Some(rgba(0xebdbb2ff).into()), border_disabled: Some(rgba(0xebdbb2ff).into()), + elevated_surface_background: Some(rgba(0xf2e5bcff).into()), background: Some(rgba(0xf2e5bcff).into()), element_background: Some(rgba(0x45858880).into()), element_hover: Some(rgba(0xebdbb280).into()), diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs index 3a0e96755e335eb6a17c7660c9c87aab1e11579e..3a9203c8045401ad114ed7ff3baf9f03cf7840b0 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -25,7 +25,7 @@ pub fn noctis() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x09334eff).into()), surface_background: Some(rgba(0x051b29ff).into()), background: Some(rgba(0x07273bff).into()), element_background: Some(rgba(0x007f99ff).into()), @@ -295,7 +295,7 @@ pub fn noctis() -> UserThemeFamily { border_selected: Some(rgba(0x997582ff).into()), border_transparent: Some(rgba(0x997582ff).into()), border_disabled: Some(rgba(0x997582ff).into()), - elevated_surface_background: Some(rgba(0x272022ff).into()), + elevated_surface_background: Some(rgba(0x413036ff).into()), surface_background: Some(rgba(0x272022ff).into()), background: Some(rgba(0x322a2dff).into()), element_background: Some(rgba(0x007f99ff).into()), @@ -565,7 +565,7 @@ pub fn noctis() -> UserThemeFamily { border_selected: Some(rgba(0x00c6e0ff).into()), border_transparent: Some(rgba(0x00c6e0ff).into()), border_disabled: Some(rgba(0x00c6e0ff).into()), - elevated_surface_background: Some(rgba(0xe1eeefff).into()), + elevated_surface_background: Some(rgba(0xf4f6f6ff).into()), surface_background: Some(rgba(0xe1eeefff).into()), background: Some(rgba(0xf4f6f6ff).into()), element_background: Some(rgba(0x099099ff).into()), @@ -835,7 +835,7 @@ pub fn noctis() -> UserThemeFamily { border_selected: Some(rgba(0xaea4f4ff).into()), border_transparent: Some(rgba(0xaea4f4ff).into()), border_disabled: Some(rgba(0xaea4f4ff).into()), - elevated_surface_background: Some(rgba(0xe9e7f3ff).into()), + elevated_surface_background: Some(rgba(0xf2f1f8ff).into()), surface_background: Some(rgba(0xe9e7f3ff).into()), background: Some(rgba(0xf2f1f8ff).into()), element_background: Some(rgba(0x8e80ffff).into()), @@ -1105,7 +1105,7 @@ pub fn noctis() -> UserThemeFamily { border_selected: Some(rgba(0x00c6e0ff).into()), border_transparent: Some(rgba(0x00c6e0ff).into()), border_disabled: Some(rgba(0x00c6e0ff).into()), - elevated_surface_background: Some(rgba(0xf6eddaff).into()), + elevated_surface_background: Some(rgba(0xfef8ecff).into()), surface_background: Some(rgba(0xf6eddaff).into()), background: Some(rgba(0xfef8ecff).into()), element_background: Some(rgba(0x099099ff).into()), @@ -1375,7 +1375,7 @@ pub fn noctis() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x202e37ff).into()), surface_background: Some(rgba(0x0e1920ff).into()), background: Some(rgba(0x1b2932ff).into()), element_background: Some(rgba(0x2e616bff).into()), @@ -1645,7 +1645,7 @@ pub fn noctis() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x073940ff).into()), surface_background: Some(rgba(0x03191bff).into()), background: Some(rgba(0x052529ff).into()), element_background: Some(rgba(0x099099ff).into()), @@ -1915,7 +1915,7 @@ pub fn noctis() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x031417ff).into()), surface_background: Some(rgba(0x020c0eff).into()), background: Some(rgba(0x031417ff).into()), element_background: Some(rgba(0x099099ff).into()), @@ -2185,7 +2185,7 @@ pub fn noctis() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x031417ff).into()), surface_background: Some(rgba(0x020c0eff).into()), background: Some(rgba(0x031417ff).into()), element_background: Some(rgba(0x099099ff).into()), @@ -2455,7 +2455,7 @@ pub fn noctis() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x2f2c49ff).into()), surface_background: Some(rgba(0x1f1d30ff).into()), background: Some(rgba(0x292640ff).into()), element_background: Some(rgba(0x007f99ff).into()), @@ -2725,7 +2725,7 @@ pub fn noctis() -> UserThemeFamily { 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()), + elevated_surface_background: Some(rgba(0x3d2e4dff).into()), surface_background: Some(rgba(0x291d35ff).into()), background: Some(rgba(0x30243dff).into()), element_background: Some(rgba(0x007f99ff).into()), diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index b4a723d35c082c4808dbd44c85dcf3f8570b289c..e8d2bdc8b75264a1684fb28320e5d7536f06c0ea 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -24,7 +24,7 @@ pub fn nord() -> UserThemeFamily { border_selected: Some(rgba(0x3b4252ff).into()), border_transparent: Some(rgba(0x3b4252ff).into()), border_disabled: Some(rgba(0x3b4252ff).into()), - elevated_surface_background: Some(rgba(0x2e3440ff).into()), + elevated_surface_background: Some(rgba(0x3b4252ff).into()), surface_background: Some(rgba(0x2e3440ff).into()), background: Some(rgba(0x2e3440ff).into()), element_background: Some(rgba(0x88c0d0ee).into()), diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index 3036a0ffdb90109298c8abf2514767976c048822..82f8418e0d3b780b1b2d856c7d2922096d3acb0f 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -583,7 +583,7 @@ 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(0x25293aff).into()), + elevated_surface_background: Some(rgba(0x292d3eff).into()), surface_background: Some(rgba(0x25293aff).into()), background: Some(rgba(0x292d3eff).into()), element_background: Some(rgba(0x7e57c2cc).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 9a7e6c145f6b2c72ef6ab4ba7c9a59f8749649b8..bc4752f7a68830f40b41b20c27c27ae76ad2cbdc 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -25,6 +25,7 @@ pub fn solarized() -> UserThemeFamily { border_selected: Some(rgba(0x003847ff).into()), border_transparent: Some(rgba(0x003847ff).into()), border_disabled: Some(rgba(0x003847ff).into()), + elevated_surface_background: Some(rgba(0x00212bff).into()), background: Some(rgba(0x002b36ff).into()), element_background: Some(rgba(0x2aa19899).into()), element_hover: Some(rgba(0x004454aa).into()), @@ -288,6 +289,7 @@ pub fn solarized() -> UserThemeFamily { border_selected: Some(rgba(0xddd6c1ff).into()), border_transparent: Some(rgba(0xddd6c1ff).into()), border_disabled: Some(rgba(0xddd6c1ff).into()), + elevated_surface_background: Some(rgba(0xeee8d5ff).into()), background: Some(rgba(0xfdf6e3ff).into()), element_background: Some(rgba(0xac9d57ff).into()), element_hover: Some(rgba(0xdfca8844).into()), diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index 5d6214e2318bcbbd77ac7fced5358e456354aeb0..51855bdbefafcc21fbdad32f5a060dad3fde8a09 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -19,6 +19,7 @@ pub fn synthwave_84() -> UserThemeFamily { styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { border_focused: Some(rgba(0x1f212bff).into()), + elevated_surface_background: Some(rgba(0x232530ff).into()), background: Some(rgba(0x262335ff).into()), element_background: Some(rgba(0x614d85ff).into()), element_hover: Some(rgba(0x37294d99).into()), diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs index 6c5ef51fe6720869a84584dcdecbe8e65f0e52e9..1980327e0150d1f42b334e384357a0c944b62367 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -153,7 +153,7 @@ impl VsCodeThemeConverter { .as_ref() .traverse(|color| try_parse_color(&color))?, elevated_surface_background: vscode_colors - .panel_background + .dropdown_background .as_ref() .traverse(|color| try_parse_color(&color))?, surface_background: vscode_colors