From e271bbe8966a5e7ee455c2506c2dcb33729db3a9 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 11 Dec 2023 16:54:53 -0500 Subject: [PATCH] Use `editorOverviewRuler.border` for the scrollbar track border --- crates/theme2/src/themes/andromeda.rs | 4 ++-- crates/theme2/src/themes/ayu.rs | 6 ++--- crates/theme2/src/themes/dracula.rs | 1 + crates/theme2/src/themes/gruvbox.rs | 12 +++++----- crates/theme2/src/themes/night_owl.rs | 2 -- crates/theme2/src/themes/noctis.rs | 22 +++++++++---------- crates/theme2/src/themes/nord.rs | 2 +- crates/theme2/src/themes/palenight.rs | 3 --- crates/theme2/src/themes/rose_pine.rs | 6 ++--- crates/theme2/src/themes/synthwave_84.rs | 2 +- crates/theme_importer/src/vscode/converter.rs | 2 +- 11 files changed, 29 insertions(+), 33 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index a2de85aa82..33284cdbee 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -46,7 +46,7 @@ pub fn andromeda() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()), scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()), scrollbar_track_background: Some(rgba(0x23262eff).into()), - scrollbar_track_border: Some(rgba(0x23262eff).into()), + scrollbar_track_border: Some(rgba(0x1b1d23ff).into()), editor_background: Some(rgba(0x23262eff).into()), editor_gutter_background: Some(rgba(0x23262eff).into()), editor_line_number: Some(rgba(0x746f77ff).into()), @@ -260,7 +260,7 @@ pub fn andromeda() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()), scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()), scrollbar_track_background: Some(rgba(0x262a33ff).into()), - scrollbar_track_border: Some(rgba(0x23262eff).into()), + scrollbar_track_border: Some(rgba(0x1b1d23ff).into()), editor_background: Some(rgba(0x262a33ff).into()), editor_gutter_background: Some(rgba(0x262a33ff).into()), editor_line_number: Some(rgba(0x746f77ff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index 65932e7cda..0164e4786f 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -45,7 +45,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x8a919999).into()), scrollbar_thumb_border: Some(rgba(0x8a919966).into()), scrollbar_track_background: Some(rgba(0xf8f9faff).into()), - scrollbar_track_border: Some(rgba(0x6b7d8f00).into()), + scrollbar_track_border: Some(rgba(0x6b7d8f1f).into()), editor_background: Some(rgba(0xf8f9faff).into()), editor_gutter_background: Some(rgba(0xf8f9faff).into()), editor_line_number: Some(rgba(0x8a919966).into()), @@ -351,7 +351,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x707a8c99).into()), scrollbar_thumb_border: Some(rgba(0x707a8c66).into()), scrollbar_track_background: Some(rgba(0x1f2430ff).into()), - scrollbar_track_border: Some(rgba(0x171b2400).into()), + scrollbar_track_border: Some(rgba(0x171b24ff).into()), editor_background: Some(rgba(0x1f2430ff).into()), editor_gutter_background: Some(rgba(0x1f2430ff).into()), editor_line_number: Some(rgba(0x8a919966).into()), @@ -657,7 +657,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x565b6699).into()), scrollbar_thumb_border: Some(rgba(0x565b6666).into()), scrollbar_track_background: Some(rgba(0x0b0e14ff).into()), - scrollbar_track_border: Some(rgba(0x1e232b00).into()), + scrollbar_track_border: Some(rgba(0x1e232bff).into()), editor_background: Some(rgba(0x0b0e14ff).into()), editor_gutter_background: Some(rgba(0x0b0e14ff).into()), editor_line_number: Some(rgba(0x6c738099).into()), diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index 54f2946169..5933ec46ff 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -42,6 +42,7 @@ pub fn dracula() -> UserThemeFamily { tab_inactive_background: Some(rgba(0x21222cff).into()), tab_active_background: Some(rgba(0x282a36ff).into()), scrollbar_track_background: Some(rgba(0x282a36ff).into()), + scrollbar_track_border: Some(rgba(0x191a21ff).into()), editor_background: Some(rgba(0x282a36ff).into()), editor_gutter_background: Some(rgba(0x282a36ff).into()), editor_line_number: Some(rgba(0x6272a4ff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 6ea8ee0c98..4573f55ca1 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -45,7 +45,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()), scrollbar_thumb_border: Some(rgba(0x50494599).into()), scrollbar_track_background: Some(rgba(0x1d2021ff).into()), - scrollbar_track_border: Some(rgba(0x1d2021ff).into()), + scrollbar_track_border: Some(rgba(0x1d202100).into()), editor_background: Some(rgba(0x1d2021ff).into()), editor_gutter_background: Some(rgba(0x1d2021ff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -337,7 +337,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()), scrollbar_thumb_border: Some(rgba(0x50494599).into()), scrollbar_track_background: Some(rgba(0x282828ff).into()), - scrollbar_track_border: Some(rgba(0x282828ff).into()), + scrollbar_track_border: Some(rgba(0x28282800).into()), editor_background: Some(rgba(0x282828ff).into()), editor_gutter_background: Some(rgba(0x282828ff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -629,7 +629,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()), scrollbar_thumb_border: Some(rgba(0x50494599).into()), scrollbar_track_background: Some(rgba(0x32302fff).into()), - scrollbar_track_border: Some(rgba(0x32302fff).into()), + scrollbar_track_border: Some(rgba(0x32302f00).into()), editor_background: Some(rgba(0x32302fff).into()), editor_gutter_background: Some(rgba(0x32302fff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -921,7 +921,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xbdae93ff).into()), scrollbar_thumb_border: Some(rgba(0xd5c4a199).into()), scrollbar_track_background: Some(rgba(0xf9f5d7ff).into()), - scrollbar_track_border: Some(rgba(0xf9f5d7ff).into()), + scrollbar_track_border: Some(rgba(0xf9f5d700).into()), editor_background: Some(rgba(0xf9f5d7ff).into()), editor_gutter_background: Some(rgba(0xf9f5d7ff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), @@ -1213,7 +1213,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xbdae93ff).into()), scrollbar_thumb_border: Some(rgba(0xd5c4a199).into()), scrollbar_track_background: Some(rgba(0xfbf1c7ff).into()), - scrollbar_track_border: Some(rgba(0xfbf1c7ff).into()), + scrollbar_track_border: Some(rgba(0xfbf1c700).into()), editor_background: Some(rgba(0xfbf1c7ff).into()), editor_gutter_background: Some(rgba(0xfbf1c7ff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), @@ -1505,7 +1505,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xbdae93ff).into()), scrollbar_thumb_border: Some(rgba(0xd5c4a199).into()), scrollbar_track_background: Some(rgba(0xf2e5bcff).into()), - scrollbar_track_border: Some(rgba(0xf2e5bcff).into()), + scrollbar_track_border: Some(rgba(0xf2e5bc00).into()), editor_background: Some(rgba(0xf2e5bcff).into()), editor_gutter_background: Some(rgba(0xf2e5bcff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs index e680b39554..71c980e631 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -46,7 +46,6 @@ pub fn night_owl() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x084d8180).into()), scrollbar_thumb_border: Some(rgba(0x084d8180).into()), scrollbar_track_background: Some(rgba(0x011627ff).into()), - scrollbar_track_border: Some(rgba(0x010b14ff).into()), editor_background: Some(rgba(0x011627ff).into()), editor_gutter_background: Some(rgba(0x011627ff).into()), editor_line_number: Some(rgba(0x4b6479ff).into()), @@ -306,7 +305,6 @@ pub fn night_owl() -> UserThemeFamily { tab_inactive_background: Some(rgba(0xf0f0f0ff).into()), tab_active_background: Some(rgba(0xf6f6f6ff).into()), scrollbar_track_background: Some(rgba(0xfbfbfbff).into()), - scrollbar_track_border: Some(rgba(0xccccccff).into()), editor_background: Some(rgba(0xfbfbfbff).into()), editor_gutter_background: Some(rgba(0xfbfbfbff).into()), editor_line_number: Some(rgba(0x90a7b2ff).into()), diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs index 9748090544..51b442a57e 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -46,7 +46,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x008ee655).into()), scrollbar_thumb_border: Some(rgba(0x008ee633).into()), scrollbar_track_background: Some(rgba(0x07273bff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x07273bff).into()), editor_background: Some(rgba(0x07273bff).into()), editor_gutter_background: Some(rgba(0x07273bff).into()), editor_line_number: Some(rgba(0x4d6c80ff).into()), @@ -323,7 +323,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xeb609144).into()), scrollbar_thumb_border: Some(rgba(0xeb609133).into()), scrollbar_track_background: Some(rgba(0x322a2dff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x322a2dff).into()), editor_background: Some(rgba(0x322a2dff).into()), editor_gutter_background: Some(rgba(0x322a2dff).into()), editor_line_number: Some(rgba(0x715b63ff).into()), @@ -600,7 +600,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0xf4f6f6ff).into()), - scrollbar_track_border: Some(rgba(0x00000055).into()), + scrollbar_track_border: Some(rgba(0xf4f6f6ff).into()), editor_background: Some(rgba(0xf4f6f6ff).into()), editor_gutter_background: Some(rgba(0xf4f6f6ff).into()), editor_line_number: Some(rgba(0xa0abacff).into()), @@ -877,7 +877,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x7060eb62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0xf2f1f8ff).into()), - scrollbar_track_border: Some(rgba(0x00000055).into()), + scrollbar_track_border: Some(rgba(0xf2f1f8ff).into()), editor_background: Some(rgba(0xf2f1f8ff).into()), editor_gutter_background: Some(rgba(0xf2f1f8ff).into()), editor_line_number: Some(rgba(0x9d9ab1ff).into()), @@ -1154,7 +1154,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0xfef8ecff).into()), - scrollbar_track_border: Some(rgba(0x00000055).into()), + scrollbar_track_border: Some(rgba(0xfef8ecff).into()), editor_background: Some(rgba(0xfef8ecff).into()), editor_gutter_background: Some(rgba(0xfef8ecff).into()), editor_line_number: Some(rgba(0xa0abacff).into()), @@ -1431,7 +1431,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x3f7fa655).into()), scrollbar_thumb_border: Some(rgba(0x3f7fa633).into()), scrollbar_track_background: Some(rgba(0x1b2932ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x1b2932ff).into()), editor_background: Some(rgba(0x1b2932ff).into()), editor_gutter_background: Some(rgba(0x1b2932ff).into()), editor_line_number: Some(rgba(0x5d6e79ff).into()), @@ -1708,7 +1708,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0x052529ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x052529ff).into()), editor_background: Some(rgba(0x052529ff).into()), editor_gutter_background: Some(rgba(0x052529ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -1985,7 +1985,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0x031417ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x031417ff).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -2262,7 +2262,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0x031417ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x031417ff).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -2539,7 +2539,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x7060eb55).into()), scrollbar_thumb_border: Some(rgba(0x7060eb33).into()), scrollbar_track_background: Some(rgba(0x292640ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x292640ff).into()), editor_background: Some(rgba(0x292640ff).into()), editor_gutter_background: Some(rgba(0x292640ff).into()), editor_line_number: Some(rgba(0x5c5973ff).into()), @@ -2816,7 +2816,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xa660eb55).into()), scrollbar_thumb_border: Some(rgba(0xa660eb33).into()), scrollbar_track_background: Some(rgba(0x30243dff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x30243dff).into()), editor_background: Some(rgba(0x30243dff).into()), editor_gutter_background: Some(rgba(0x30243dff).into()), editor_line_number: Some(rgba(0x665973ff).into()), diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index ceb57ff4df..949926c685 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -45,7 +45,7 @@ pub fn nord() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x434c5eaa).into()), scrollbar_thumb_border: Some(rgba(0x434c5e99).into()), scrollbar_track_background: Some(rgba(0x2e3440ff).into()), - scrollbar_track_border: Some(rgba(0x00000066).into()), + scrollbar_track_border: Some(rgba(0x3b4252ff).into()), editor_background: Some(rgba(0x2e3440ff).into()), editor_gutter_background: Some(rgba(0x2e3440ff).into()), editor_line_number: Some(rgba(0x4c566aff).into()), diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index fbf1f50def..ab47cc1046 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -46,7 +46,6 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), scrollbar_track_background: Some(rgba(0x292d3eff).into()), - scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), @@ -332,7 +331,6 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), scrollbar_track_background: Some(rgba(0x292d3eff).into()), - scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), @@ -618,7 +616,6 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), scrollbar_track_background: Some(rgba(0x292d3eff).into()), - scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 29cb2030ad..d9091df347 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -46,7 +46,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x6e6a8666).into()), scrollbar_thumb_border: Some(rgba(0x6e6a8633).into()), scrollbar_track_background: Some(rgba(0x191724ff).into()), - scrollbar_track_border: Some(rgba(0x1f1d2e4d).into()), + scrollbar_track_border: Some(rgba(0x6e6a8666).into()), editor_background: Some(rgba(0x191724ff).into()), editor_gutter_background: Some(rgba(0x191724ff).into()), editor_line_number: Some(rgba(0x908caaff).into()), @@ -305,7 +305,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x817c9c4d).into()), scrollbar_thumb_border: Some(rgba(0x817c9c26).into()), scrollbar_track_background: Some(rgba(0x232136ff).into()), - scrollbar_track_border: Some(rgba(0x2a273f4d).into()), + scrollbar_track_border: Some(rgba(0x817c9c4d).into()), editor_background: Some(rgba(0x232136ff).into()), editor_gutter_background: Some(rgba(0x232136ff).into()), editor_line_number: Some(rgba(0x908caaff).into()), @@ -564,7 +564,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x6e6a8626).into()), scrollbar_thumb_border: Some(rgba(0x6e6a8614).into()), scrollbar_track_background: Some(rgba(0xfaf4edff).into()), - scrollbar_track_border: Some(rgba(0xfffaf34d).into()), + scrollbar_track_border: Some(rgba(0x6e6a8626).into()), editor_background: Some(rgba(0xfaf4edff).into()), editor_gutter_background: Some(rgba(0xfaf4edff).into()), editor_line_number: Some(rgba(0x797593ff).into()), diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index f460d75816..6b7a73109a 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -37,7 +37,7 @@ pub fn synthwave_84() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x9d8bca50).into()), scrollbar_thumb_border: Some(rgba(0x9d8bca30).into()), scrollbar_track_background: Some(rgba(0x262335ff).into()), - scrollbar_track_border: Some(rgba(0x2a2139ff).into()), + scrollbar_track_border: Some(rgba(0x34294fb3).into()), editor_background: Some(rgba(0x262335ff).into()), editor_gutter_background: Some(rgba(0x262335ff).into()), editor_line_number: Some(rgba(0xffffff73).into()), diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs index 5328a6b58d..9e4dc56eb8 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -235,7 +235,7 @@ impl VsCodeThemeConverter { .traverse(|color| try_parse_color(&color))?, scrollbar_track_background: vscode_editor_background, scrollbar_track_border: vscode_colors - .scrollbar_shadow + .editor_overview_ruler_border .as_ref() .traverse(|color| try_parse_color(&color))?, scrollbar_thumb_background: vscode_scrollbar_slider_background,