diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 8dfc32d8b5..e09f0b222f 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -34,6 +34,8 @@ pub fn andromeda() -> UserThemeFamily { drop_target_background: Some(rgba(0x3a404eff).into()), ghost_element_hover: Some(rgba(0x23262eff).into()), text: Some(rgba(0xd5ced9ff).into()), + status_bar_background: Some(rgba(0x23262eff).into()), + title_bar_background: Some(rgba(0x23262eff).into()), tab_inactive_background: Some(rgba(0x23262eff).into()), tab_active_background: Some(rgba(0x23262eff).into()), editor_background: Some(rgba(0x23262eff).into()), @@ -192,6 +194,8 @@ pub fn andromeda() -> UserThemeFamily { drop_target_background: Some(rgba(0x3a404eff).into()), ghost_element_hover: Some(rgba(0x23262eff).into()), text: Some(rgba(0xd5ced9ff).into()), + status_bar_background: Some(rgba(0x23262eff).into()), + title_bar_background: Some(rgba(0x23262eff).into()), tab_inactive_background: Some(rgba(0x23262eff).into()), tab_active_background: Some(rgba(0x262a33ff).into()), editor_background: Some(rgba(0x262a33ff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index fe9d750461..762c1a5279 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -33,6 +33,8 @@ pub fn ayu() -> UserThemeFamily { element_selected: Some(rgba(0x56728f1f).into()), ghost_element_hover: Some(rgba(0x56728f1f).into()), text: Some(rgba(0x8a9199ff).into()), + status_bar_background: Some(rgba(0xf8f9faff).into()), + title_bar_background: Some(rgba(0xf8f9faff).into()), tab_inactive_background: Some(rgba(0xf8f9faff).into()), tab_active_background: Some(rgba(0xf8f9faff).into()), editor_background: Some(rgba(0xf8f9faff).into()), @@ -304,6 +306,8 @@ pub fn ayu() -> UserThemeFamily { element_selected: Some(rgba(0x63759926).into()), ghost_element_hover: Some(rgba(0x63759926).into()), text: Some(rgba(0x707a8cff).into()), + status_bar_background: Some(rgba(0x1f2430ff).into()), + title_bar_background: Some(rgba(0x1f2430ff).into()), tab_inactive_background: Some(rgba(0x1f2430ff).into()), tab_active_background: Some(rgba(0x1f2430ff).into()), editor_background: Some(rgba(0x1f2430ff).into()), @@ -575,6 +579,8 @@ pub fn ayu() -> UserThemeFamily { element_selected: Some(rgba(0x47526640).into()), ghost_element_hover: Some(rgba(0x47526640).into()), text: Some(rgba(0x565b66ff).into()), + status_bar_background: Some(rgba(0x0b0e14ff).into()), + title_bar_background: Some(rgba(0x0b0e14ff).into()), tab_inactive_background: Some(rgba(0x0b0e14ff).into()), tab_active_background: Some(rgba(0x0b0e14ff).into()), editor_background: Some(rgba(0x0b0e14ff).into()), diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index bf8fc12b8a..c52bdb49b1 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -33,6 +33,8 @@ pub fn dracula() -> UserThemeFamily { drop_target_background: Some(rgba(0x44475aff).into()), ghost_element_hover: Some(rgba(0x44475a75).into()), text: Some(rgba(0xf8f8f2ff).into()), + status_bar_background: Some(rgba(0x191a21ff).into()), + title_bar_background: Some(rgba(0x21222cff).into()), tab_inactive_background: Some(rgba(0x21222cff).into()), tab_active_background: Some(rgba(0x282a36ff).into()), editor_background: Some(rgba(0x282a36ff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 44d779071a..f801d44032 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -32,6 +32,8 @@ pub fn gruvbox() -> UserThemeFamily { drop_target_background: Some(rgba(0x3c3836ff).into()), ghost_element_hover: Some(rgba(0x3c383680).into()), text: Some(rgba(0xebdbb2ff).into()), + status_bar_background: Some(rgba(0x1d2021ff).into()), + title_bar_background: Some(rgba(0x1d2021ff).into()), tab_inactive_background: Some(rgba(0x1d2021ff).into()), tab_active_background: Some(rgba(0x32302fff).into()), editor_background: Some(rgba(0x1d2021ff).into()), @@ -231,6 +233,8 @@ pub fn gruvbox() -> UserThemeFamily { drop_target_background: Some(rgba(0x3c3836ff).into()), ghost_element_hover: Some(rgba(0x3c383680).into()), text: Some(rgba(0xebdbb2ff).into()), + status_bar_background: Some(rgba(0x282828ff).into()), + title_bar_background: Some(rgba(0x282828ff).into()), tab_inactive_background: Some(rgba(0x282828ff).into()), tab_active_background: Some(rgba(0x3c3836ff).into()), editor_background: Some(rgba(0x282828ff).into()), @@ -430,6 +434,8 @@ pub fn gruvbox() -> UserThemeFamily { drop_target_background: Some(rgba(0x3c3836ff).into()), ghost_element_hover: Some(rgba(0x3c383680).into()), text: Some(rgba(0xebdbb2ff).into()), + status_bar_background: Some(rgba(0x32302fff).into()), + title_bar_background: Some(rgba(0x32302fff).into()), tab_inactive_background: Some(rgba(0x32302fff).into()), tab_active_background: Some(rgba(0x504945ff).into()), editor_background: Some(rgba(0x32302fff).into()), @@ -629,6 +635,8 @@ pub fn gruvbox() -> UserThemeFamily { drop_target_background: Some(rgba(0xebdbb2ff).into()), ghost_element_hover: Some(rgba(0xebdbb280).into()), text: Some(rgba(0x3c3836ff).into()), + status_bar_background: Some(rgba(0xf9f5d7ff).into()), + title_bar_background: Some(rgba(0xf9f5d7ff).into()), tab_inactive_background: Some(rgba(0xf9f5d7ff).into()), tab_active_background: Some(rgba(0xf2e5bcff).into()), editor_background: Some(rgba(0xf9f5d7ff).into()), @@ -828,6 +836,8 @@ pub fn gruvbox() -> UserThemeFamily { drop_target_background: Some(rgba(0xebdbb2ff).into()), ghost_element_hover: Some(rgba(0xebdbb280).into()), text: Some(rgba(0x3c3836ff).into()), + status_bar_background: Some(rgba(0xfbf1c7ff).into()), + title_bar_background: Some(rgba(0xfbf1c7ff).into()), tab_inactive_background: Some(rgba(0xfbf1c7ff).into()), tab_active_background: Some(rgba(0xebdbb2ff).into()), editor_background: Some(rgba(0xfbf1c7ff).into()), @@ -1027,6 +1037,8 @@ pub fn gruvbox() -> UserThemeFamily { drop_target_background: Some(rgba(0xebdbb2ff).into()), ghost_element_hover: Some(rgba(0xebdbb280).into()), text: Some(rgba(0x3c3836ff).into()), + status_bar_background: Some(rgba(0xf2e5bcff).into()), + title_bar_background: Some(rgba(0xf2e5bcff).into()), tab_inactive_background: Some(rgba(0xf2e5bcff).into()), tab_active_background: Some(rgba(0xd5c4a1ff).into()), editor_background: Some(rgba(0xf2e5bcff).into()), diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs index 13a931453b..94689f2e14 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -34,6 +34,8 @@ pub fn night_owl() -> UserThemeFamily { drop_target_background: Some(rgba(0x011627ff).into()), ghost_element_hover: Some(rgba(0x011627ff).into()), text: Some(rgba(0xd6deebff).into()), + status_bar_background: Some(rgba(0x011627ff).into()), + title_bar_background: Some(rgba(0x011627ff).into()), tab_inactive_background: Some(rgba(0x01111dff).into()), tab_active_background: Some(rgba(0x0b2942ff).into()), editor_background: Some(rgba(0x011627ff).into()), @@ -220,6 +222,8 @@ pub fn night_owl() -> UserThemeFamily { element_selected: Some(rgba(0xd3e8f8ff).into()), ghost_element_hover: Some(rgba(0xd3e8f8ff).into()), text: Some(rgba(0x403f53ff).into()), + status_bar_background: Some(rgba(0xf0f0f0ff).into()), + title_bar_background: Some(rgba(0xf0f0f0ff).into()), tab_inactive_background: Some(rgba(0xf0f0f0ff).into()), tab_active_background: Some(rgba(0xf6f6f6ff).into()), editor_background: Some(rgba(0xfbfbfbff).into()), diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs index d19aeb61d3..23202260c6 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -34,6 +34,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x002a4dff).into()), ghost_element_hover: Some(rgba(0x00558a65).into()), text: Some(rgba(0xbecfdaff).into()), + status_bar_background: Some(rgba(0x07273bff).into()), + title_bar_background: Some(rgba(0x07273bff).into()), tab_inactive_background: Some(rgba(0x09334eff).into()), tab_active_background: Some(rgba(0x07273bff).into()), editor_background: Some(rgba(0x07273bff).into()), @@ -240,6 +242,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x38292eff).into()), ghost_element_hover: Some(rgba(0x533641ff).into()), text: Some(rgba(0xcbbec2ff).into()), + status_bar_background: Some(rgba(0x322a2dff).into()), + title_bar_background: Some(rgba(0x322a2dff).into()), tab_inactive_background: Some(rgba(0x413036ff).into()), tab_active_background: Some(rgba(0x322a2dff).into()), editor_background: Some(rgba(0x322a2dff).into()), @@ -446,6 +450,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0xb2cacdff).into()), ghost_element_hover: Some(rgba(0xd1eafaff).into()), text: Some(rgba(0x005661ff).into()), + status_bar_background: Some(rgba(0xcaedf2ff).into()), + title_bar_background: Some(rgba(0xe7f2f3ff).into()), tab_inactive_background: Some(rgba(0xcaedf2ff).into()), tab_active_background: Some(rgba(0xf4f6f6ff).into()), editor_background: Some(rgba(0xf4f6f6ff).into()), @@ -652,6 +658,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0xafaad4aa).into()), ghost_element_hover: Some(rgba(0xd2ccffff).into()), text: Some(rgba(0x0c006bff).into()), + status_bar_background: Some(rgba(0xe2dff6ff).into()), + title_bar_background: Some(rgba(0xedecf8ff).into()), tab_inactive_background: Some(rgba(0xe2dff6ff).into()), tab_active_background: Some(rgba(0xf2f1f8ff).into()), editor_background: Some(rgba(0xf2f1f8ff).into()), @@ -858,6 +866,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0xcdcbb2ff).into()), ghost_element_hover: Some(rgba(0xd2f3f9ff).into()), text: Some(rgba(0x005661ff).into()), + status_bar_background: Some(rgba(0xf0e9d6ff).into()), + title_bar_background: Some(rgba(0xf9f1e1ff).into()), tab_inactive_background: Some(rgba(0xf0e9d6ff).into()), tab_active_background: Some(rgba(0xfef8ecff).into()), editor_background: Some(rgba(0xfef8ecff).into()), @@ -1064,6 +1074,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x152837ff).into()), ghost_element_hover: Some(rgba(0x00558aff).into()), text: Some(rgba(0xc5cdd3ff).into()), + status_bar_background: Some(rgba(0x1b2932ff).into()), + title_bar_background: Some(rgba(0x1b2932ff).into()), tab_inactive_background: Some(rgba(0x202e37ff).into()), tab_active_background: Some(rgba(0x1b2932ff).into()), editor_background: Some(rgba(0x1b2932ff).into()), @@ -1270,6 +1282,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x00404dff).into()), ghost_element_hover: Some(rgba(0x0b515bff).into()), text: Some(rgba(0xb2cacdff).into()), + status_bar_background: Some(rgba(0x041d20ff).into()), + title_bar_background: Some(rgba(0x041d20ff).into()), tab_inactive_background: Some(rgba(0x062e32ff).into()), tab_active_background: Some(rgba(0x052529ff).into()), editor_background: Some(rgba(0x052529ff).into()), @@ -1476,6 +1490,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x00404dff).into()), ghost_element_hover: Some(rgba(0x0b515bff).into()), text: Some(rgba(0xb2cacdff).into()), + status_bar_background: Some(rgba(0x031417ff).into()), + title_bar_background: Some(rgba(0x031417ff).into()), tab_inactive_background: Some(rgba(0x062e32ff).into()), tab_active_background: Some(rgba(0x031417ff).into()), editor_background: Some(rgba(0x031417ff).into()), @@ -1682,6 +1698,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x00404dff).into()), ghost_element_hover: Some(rgba(0x0b515bff).into()), text: Some(rgba(0xb2cacdff).into()), + status_bar_background: Some(rgba(0x031417ff).into()), + title_bar_background: Some(rgba(0x031417ff).into()), tab_inactive_background: Some(rgba(0x062e32ff).into()), tab_active_background: Some(rgba(0x031417ff).into()), editor_background: Some(rgba(0x031417ff).into()), @@ -1888,6 +1906,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x202040ff).into()), ghost_element_hover: Some(rgba(0x383866ff).into()), text: Some(rgba(0xc5c2d6ff).into()), + status_bar_background: Some(rgba(0x292640ff).into()), + title_bar_background: Some(rgba(0x292640ff).into()), tab_inactive_background: Some(rgba(0x2f2c49ff).into()), tab_active_background: Some(rgba(0x292640ff).into()), editor_background: Some(rgba(0x292640ff).into()), @@ -2094,6 +2114,8 @@ pub fn noctis() -> UserThemeFamily { drop_target_background: Some(rgba(0x302040ff).into()), ghost_element_hover: Some(rgba(0x6a448dff).into()), text: Some(rgba(0xccbfd9ff).into()), + status_bar_background: Some(rgba(0x30243dff).into()), + title_bar_background: Some(rgba(0x30243dff).into()), tab_inactive_background: Some(rgba(0x3d2e4dff).into()), tab_active_background: Some(rgba(0x30243dff).into()), editor_background: Some(rgba(0x30243dff).into()), diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index cc863f3716..f1111d8695 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -33,6 +33,8 @@ pub fn nord() -> UserThemeFamily { drop_target_background: Some(rgba(0x88c0d099).into()), ghost_element_hover: Some(rgba(0x3b4252ff).into()), text: Some(rgba(0xd8dee9ff).into()), + status_bar_background: Some(rgba(0x3b4252ff).into()), + title_bar_background: Some(rgba(0x2e3440ff).into()), tab_inactive_background: Some(rgba(0x2e3440ff).into()), tab_active_background: Some(rgba(0x3b4252ff).into()), editor_background: Some(rgba(0x2e3440ff).into()), diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index daee43f572..0595f2fb44 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -34,6 +34,8 @@ pub fn palenight() -> UserThemeFamily { drop_target_background: Some(rgba(0x2e3245ff).into()), ghost_element_hover: Some(rgba(0x0000001a).into()), text: Some(rgba(0xffffffff).into()), + status_bar_background: Some(rgba(0x282c3dff).into()), + title_bar_background: Some(rgba(0x292d3eff).into()), tab_inactive_background: Some(rgba(0x31364aff).into()), tab_active_background: Some(rgba(0x292d3eff).into()), editor_background: Some(rgba(0x292d3eff).into()), @@ -249,6 +251,8 @@ pub fn palenight() -> UserThemeFamily { drop_target_background: Some(rgba(0x2e3245ff).into()), ghost_element_hover: Some(rgba(0x0000001a).into()), text: Some(rgba(0xffffffff).into()), + status_bar_background: Some(rgba(0x282c3dff).into()), + title_bar_background: Some(rgba(0x292d3eff).into()), tab_inactive_background: Some(rgba(0x31364aff).into()), tab_active_background: Some(rgba(0x292d3eff).into()), editor_background: Some(rgba(0x292d3eff).into()), @@ -464,6 +468,8 @@ pub fn palenight() -> UserThemeFamily { drop_target_background: Some(rgba(0x2e3245ff).into()), ghost_element_hover: Some(rgba(0x0000001a).into()), text: Some(rgba(0xffffffff).into()), + status_bar_background: Some(rgba(0x25293aff).into()), + title_bar_background: Some(rgba(0x25293aff).into()), tab_inactive_background: Some(rgba(0x31364aff).into()), tab_active_background: Some(rgba(0x25293aff).into()), editor_background: Some(rgba(0x292d3eff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index f4de7fb0d3..b7bff4d559 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -34,6 +34,8 @@ pub fn rose_pine() -> UserThemeFamily { drop_target_background: Some(rgba(0x1f1d2eff).into()), ghost_element_hover: Some(rgba(0x6e6a861a).into()), text: Some(rgba(0xe0def4ff).into()), + status_bar_background: Some(rgba(0x191724ff).into()), + title_bar_background: Some(rgba(0x191724ff).into()), tab_inactive_background: Some(rgba(0x000000ff).into()), tab_active_background: Some(rgba(0x6e6a861a).into()), editor_background: Some(rgba(0x191724ff).into()), @@ -207,6 +209,8 @@ pub fn rose_pine() -> UserThemeFamily { drop_target_background: Some(rgba(0x2a273fff).into()), ghost_element_hover: Some(rgba(0x817c9c14).into()), text: Some(rgba(0xe0def4ff).into()), + status_bar_background: Some(rgba(0x232136ff).into()), + title_bar_background: Some(rgba(0x232136ff).into()), tab_inactive_background: Some(rgba(0x000000ff).into()), tab_active_background: Some(rgba(0x817c9c14).into()), editor_background: Some(rgba(0x232136ff).into()), @@ -380,6 +384,8 @@ pub fn rose_pine() -> UserThemeFamily { drop_target_background: Some(rgba(0xfffaf3ff).into()), ghost_element_hover: Some(rgba(0x6e6a860d).into()), text: Some(rgba(0x575279ff).into()), + status_bar_background: Some(rgba(0xfaf4edff).into()), + title_bar_background: Some(rgba(0xfaf4edff).into()), tab_inactive_background: Some(rgba(0x000000ff).into()), tab_active_background: Some(rgba(0x6e6a860d).into()), editor_background: Some(rgba(0xfaf4edff).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index e77d2e79f9..65aaa1e27e 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -32,6 +32,8 @@ pub fn solarized() -> UserThemeFamily { drop_target_background: Some(rgba(0x00445488).into()), ghost_element_hover: Some(rgba(0x004454aa).into()), text: Some(rgba(0xbbbbbbff).into()), + status_bar_background: Some(rgba(0x00212bff).into()), + title_bar_background: Some(rgba(0x002c39ff).into()), tab_inactive_background: Some(rgba(0x004052ff).into()), tab_active_background: Some(rgba(0x002b37ff).into()), editor_background: Some(rgba(0x002b36ff).into()), @@ -227,6 +229,8 @@ pub fn solarized() -> UserThemeFamily { element_selected: Some(rgba(0xdfca88ff).into()), ghost_element_hover: Some(rgba(0xdfca8844).into()), text: Some(rgba(0x333333ff).into()), + status_bar_background: Some(rgba(0xeee8d5ff).into()), + title_bar_background: Some(rgba(0xeee8d5ff).into()), tab_inactive_background: Some(rgba(0xd3cbb7ff).into()), tab_active_background: Some(rgba(0xfdf6e3ff).into()), editor_background: Some(rgba(0xfdf6e3ff).into()), diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index 585d584c68..c0ffca1828 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -26,6 +26,8 @@ pub fn synthwave_84() -> UserThemeFamily { drop_target_background: Some(rgba(0x34294f66).into()), ghost_element_hover: Some(rgba(0x37294d99).into()), text: Some(rgba(0xffffffff).into()), + status_bar_background: Some(rgba(0x241b2fff).into()), + title_bar_background: Some(rgba(0x241b2fff).into()), tab_inactive_background: Some(rgba(0x262335ff).into()), editor_background: Some(rgba(0x262335ff).into()), editor_gutter_background: Some(rgba(0x262335ff).into()), diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs index 4e4b82a2c5..45b54327cd 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -141,6 +141,14 @@ impl VsCodeThemeConverter { .editor_background .as_ref() .traverse(|color| try_parse_color(&color))?, + title_bar_background: vscode_colors + .title_bar_active_background + .as_ref() + .traverse(|color| try_parse_color(&color))?, + status_bar_background: vscode_colors + .status_bar_background + .as_ref() + .traverse(|color| try_parse_color(&color))?, element_background: vscode_colors .button_background .as_ref()