Adjust border colors

This commit is contained in:
Marshall Bowers 2023-12-22 21:18:43 -05:00
parent e8a14b1971
commit 9cb613245e
10 changed files with 80 additions and 82 deletions

View File

@ -18,8 +18,8 @@ pub fn andromeda() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2b2f39ff).into()),
border_variant: Some(rgba(0x2b2f39ff).into()),
border: Some(rgba(0x252931ff).into()),
border_variant: Some(rgba(0x21232aff).into()),
elevated_surface_background: Some(rgba(0x262a33ff).into()),
background: Some(rgba(0x262a33ff).into()),
panel_background: Some(rgba(0x21242bff).into()),

View File

@ -19,8 +19,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x969585ff).into()),
border_variant: Some(rgba(0x969585ff).into()),
border: Some(rgba(0xd1d0c6ff).into()),
border_variant: Some(rgba(0xedece5ff).into()),
elevated_surface_background: Some(rgba(0xc5c4b9ff).into()),
background: Some(rgba(0xc5c4b9ff).into()),
panel_background: Some(rgba(0xebeae3ff).into()),
@ -379,8 +379,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x665f5cff).into()),
border_variant: Some(rgba(0x665f5cff).into()),
border: Some(rgba(0x3b3431ff).into()),
border_variant: Some(rgba(0x251f1dff).into()),
elevated_surface_background: Some(rgba(0x443c39ff).into()),
background: Some(rgba(0x443c39ff).into()),
panel_background: Some(rgba(0x27211eff).into()),
@ -739,8 +739,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8b968eff).into()),
border_variant: Some(rgba(0x8b968eff).into()),
border: Some(rgba(0xc8d1cbff).into()),
border_variant: Some(rgba(0xe5ede7ff).into()),
elevated_surface_background: Some(rgba(0xbcc5bfff).into()),
background: Some(rgba(0xbcc5bfff).into()),
panel_background: Some(rgba(0xe3ebe6ff).into()),
@ -1099,8 +1099,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x56505eff).into()),
border_variant: Some(rgba(0x56505eff).into()),
border: Some(rgba(0x332f38ff).into()),
border_variant: Some(rgba(0x201e24ff).into()),
elevated_surface_background: Some(rgba(0x3a353fff).into()),
background: Some(rgba(0x3a353fff).into()),
panel_background: Some(rgba(0x221f26ff).into()),
@ -1459,8 +1459,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5d5c4cff).into()),
border_variant: Some(rgba(0x5d5c4cff).into()),
border: Some(rgba(0x3c3b31ff).into()),
border_variant: Some(rgba(0x2a2922ff).into()),
elevated_surface_background: Some(rgba(0x424136ff).into()),
background: Some(rgba(0x424136ff).into()),
panel_background: Some(rgba(0x2c2b23ff).into()),
@ -1819,8 +1819,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5c6485ff).into()),
border_variant: Some(rgba(0x5c6485ff).into()),
border: Some(rgba(0x363f62ff).into()),
border_variant: Some(rgba(0x252d4fff).into()),
elevated_surface_background: Some(rgba(0x3e4769ff).into()),
background: Some(rgba(0x3e4769ff).into()),
panel_background: Some(rgba(0x262f51ff).into()),
@ -2179,8 +2179,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x9a9fb6ff).into()),
border_variant: Some(rgba(0x9a9fb6ff).into()),
border: Some(rgba(0xccd0e1ff).into()),
border_variant: Some(rgba(0xe9ebf7ff).into()),
elevated_surface_background: Some(rgba(0xc2c6d9ff).into()),
background: Some(rgba(0xc2c6d9ff).into()),
panel_background: Some(rgba(0xe5e8f5ff).into()),
@ -2539,8 +2539,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x6c695cff).into()),
border_variant: Some(rgba(0x6c695cff).into()),
border: Some(rgba(0x3b3933ff).into()),
border_variant: Some(rgba(0x252521ff).into()),
elevated_surface_background: Some(rgba(0x45433bff).into()),
background: Some(rgba(0x45433bff).into()),
panel_background: Some(rgba(0x262622ff).into()),
@ -2899,8 +2899,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5c6c5cff).into()),
border_variant: Some(rgba(0x5c6c5cff).into()),
border: Some(rgba(0x333b33ff).into()),
border_variant: Some(rgba(0x1d201dff).into()),
elevated_surface_background: Some(rgba(0x3b453bff).into()),
background: Some(rgba(0x3b453bff).into()),
panel_background: Some(rgba(0x1f231fff).into()),
@ -3259,8 +3259,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8f8b96ff).into()),
border_variant: Some(rgba(0x8f8b96ff).into()),
border: Some(rgba(0xcbc8d1ff).into()),
border_variant: Some(rgba(0xe8e5edff).into()),
elevated_surface_background: Some(rgba(0xbfbcc5ff).into()),
background: Some(rgba(0xbfbcc5ff).into()),
panel_background: Some(rgba(0xe6e3ebff).into()),
@ -3619,8 +3619,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x564e4eff).into()),
border_variant: Some(rgba(0x564e4eff).into()),
border: Some(rgba(0x352f2fff).into()),
border_variant: Some(rgba(0x231f1fff).into()),
elevated_surface_background: Some(rgba(0x3b3535ff).into()),
background: Some(rgba(0x3b3535ff).into()),
panel_background: Some(rgba(0x252020ff).into()),
@ -3979,8 +3979,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x675b67ff).into()),
border_variant: Some(rgba(0x675b67ff).into()),
border: Some(rgba(0x393239ff).into()),
border_variant: Some(rgba(0x231e23ff).into()),
elevated_surface_background: Some(rgba(0x433a43ff).into()),
background: Some(rgba(0x433a43ff).into()),
panel_background: Some(rgba(0x252025ff).into()),
@ -4339,8 +4339,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x4f6b78ff).into()),
border_variant: Some(rgba(0x4f6b78ff).into()),
border: Some(rgba(0x2c3b42ff).into()),
border_variant: Some(rgba(0x1b2327ff).into()),
elevated_surface_background: Some(rgba(0x33444dff).into()),
background: Some(rgba(0x33444dff).into()),
panel_background: Some(rgba(0x1c2529ff).into()),
@ -4699,8 +4699,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xaaa3a1ff).into()),
border_variant: Some(rgba(0xaaa3a1ff).into()),
border: Some(rgba(0xd6d1cfff).into()),
border_variant: Some(rgba(0xebe8e6ff).into()),
elevated_surface_background: Some(rgba(0xcdc8c6ff).into()),
background: Some(rgba(0xcdc8c6ff).into()),
panel_background: Some(rgba(0xe9e6e4ff).into()),
@ -5059,8 +5059,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xa8a48eff).into()),
border_variant: Some(rgba(0xa8a48eff).into()),
border: Some(rgba(0xd7d3beff).into()),
border_variant: Some(rgba(0xf2eedcff).into()),
elevated_surface_background: Some(rgba(0xcecab4ff).into()),
background: Some(rgba(0xcecab4ff).into()),
panel_background: Some(rgba(0xeeebd7ff).into()),
@ -5419,8 +5419,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8e8989ff).into()),
border_variant: Some(rgba(0x8e8989ff).into()),
border: Some(rgba(0xcfc7c7ff).into()),
border_variant: Some(rgba(0xede5e5ff).into()),
elevated_surface_background: Some(rgba(0xc1bbbbff).into()),
background: Some(rgba(0xc1bbbbff).into()),
panel_background: Some(rgba(0xebe3e3ff).into()),
@ -5779,8 +5779,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x8ea88eff).into()),
border_variant: Some(rgba(0x8ea88eff).into()),
border: Some(rgba(0xbed7beff).into()),
border_variant: Some(rgba(0xdff0dfff).into()),
elevated_surface_background: Some(rgba(0xb4ceb4ff).into()),
background: Some(rgba(0xb4ceb4ff).into()),
panel_background: Some(rgba(0xdaeedaff).into()),
@ -6139,8 +6139,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x505e55ff).into()),
border_variant: Some(rgba(0x505e55ff).into()),
border: Some(rgba(0x2f3832ff).into()),
border_variant: Some(rgba(0x1e2420ff).into()),
elevated_surface_background: Some(rgba(0x353f39ff).into()),
background: Some(rgba(0x353f39ff).into()),
panel_background: Some(rgba(0x1f2621ff).into()),
@ -6499,8 +6499,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xad9dadff).into()),
border_variant: Some(rgba(0xad9dadff).into()),
border: Some(rgba(0xcdbecdff).into()),
border_variant: Some(rgba(0xe5dce5ff).into()),
elevated_surface_background: Some(rgba(0xc6b8c6ff).into()),
background: Some(rgba(0xc6b8c6ff).into()),
panel_background: Some(rgba(0xe1d6e1ff).into()),
@ -6859,8 +6859,8 @@ pub fn atelier() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x80a4b6ff).into()),
border_variant: Some(rgba(0x80a4b6ff).into()),
border: Some(rgba(0xb0d3e5ff).into()),
border_variant: Some(rgba(0xd3edfaff).into()),
elevated_surface_background: Some(rgba(0xa6cadcff).into()),
background: Some(rgba(0xa6cadcff).into()),
panel_background: Some(rgba(0xcdeaf9ff).into()),

View File

@ -19,8 +19,8 @@ pub fn ayu() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3f4043ff).into()),
border_variant: Some(rgba(0x3f4043ff).into()),
border: Some(rgba(0x2d2f34ff).into()),
border_variant: Some(rgba(0x1b1e24ff).into()),
elevated_surface_background: Some(rgba(0x313337ff).into()),
background: Some(rgba(0x313337ff).into()),
panel_background: Some(rgba(0x1f2127ff).into()),
@ -358,8 +358,8 @@ pub fn ayu() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xcfd1d2ff).into()),
border_variant: Some(rgba(0xcfd1d2ff).into()),
border: Some(rgba(0xdfe0e1ff).into()),
border_variant: Some(rgba(0xefeff0ff).into()),
elevated_surface_background: Some(rgba(0xdcdddeff).into()),
background: Some(rgba(0xdcdddeff).into()),
panel_background: Some(rgba(0xececedff).into()),
@ -697,8 +697,8 @@ pub fn ayu() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x53565dff).into()),
border_variant: Some(rgba(0x53565dff).into()),
border: Some(rgba(0x43464fff).into()),
border_variant: Some(rgba(0x323641ff).into()),
elevated_surface_background: Some(rgba(0x464a52ff).into()),
background: Some(rgba(0x464a52ff).into()),
panel_background: Some(rgba(0x353944ff).into()),

View File

@ -19,8 +19,8 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
border_variant: Some(rgba(0xc9b99aff).into()),
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xefe2bcff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecddb5ff).into()),
@ -365,8 +365,8 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
border_variant: Some(rgba(0x5b534dff).into()),
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x393634ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x3b3735ff).into()),
@ -711,8 +711,8 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
border_variant: Some(rgba(0xc9b99aff).into()),
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xefe1b8ff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecddb4ff).into()),
@ -1057,8 +1057,8 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
border_variant: Some(rgba(0x5b534dff).into()),
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x373432ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x3a3735ff).into()),
@ -1403,8 +1403,8 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9b99aff).into()),
border_variant: Some(rgba(0xc9b99aff).into()),
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xeddeb5ff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecdcb3ff).into()),
@ -1749,8 +1749,8 @@ pub fn gruvbox() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x5b534dff).into()),
border_variant: Some(rgba(0x5b534dff).into()),
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x343130ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x393634ff).into()),

View File

@ -19,8 +19,8 @@ pub fn one() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc9c9caff).into()),
border_variant: Some(rgba(0xc9c9caff).into()),
border: Some(rgba(0xdfdfe0ff).into()),
border_variant: Some(rgba(0xeeeeeeff).into()),
elevated_surface_background: Some(rgba(0xdcdcddff).into()),
background: Some(rgba(0xdcdcddff).into()),
panel_background: Some(rgba(0xebebecff).into()),
@ -365,8 +365,8 @@ pub fn one() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x464b57ff).into()),
border_variant: Some(rgba(0x464b57ff).into()),
border: Some(rgba(0x363c46ff).into()),
border_variant: Some(rgba(0x2e333cff).into()),
elevated_surface_background: Some(rgba(0x3b414dff).into()),
background: Some(rgba(0x3b414dff).into()),
panel_background: Some(rgba(0x2f343eff).into()),

View File

@ -19,8 +19,8 @@ pub fn rose_pine() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0xdcd6d5ff).into()),
border_variant: Some(rgba(0xdcd6d5ff).into()),
border: Some(rgba(0xe5e0dfff).into()),
border_variant: Some(rgba(0xfdf8f1ff).into()),
elevated_surface_background: Some(rgba(0xdcd8d8ff).into()),
background: Some(rgba(0xdcd8d8ff).into()),
panel_background: Some(rgba(0xfef9f2ff).into()),
@ -372,8 +372,8 @@ pub fn rose_pine() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x504c68ff).into()),
border_variant: Some(rgba(0x504c68ff).into()),
border: Some(rgba(0x322f48ff).into()),
border_variant: Some(rgba(0x27243bff).into()),
elevated_surface_background: Some(rgba(0x38354eff).into()),
background: Some(rgba(0x38354eff).into()),
panel_background: Some(rgba(0x28253cff).into()),
@ -725,8 +725,8 @@ pub fn rose_pine() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x423f55ff).into()),
border_variant: Some(rgba(0x423f55ff).into()),
border: Some(rgba(0x232132ff).into()),
border_variant: Some(rgba(0x1c1a29ff).into()),
elevated_surface_background: Some(rgba(0x292739ff).into()),
background: Some(rgba(0x292739ff).into()),
panel_background: Some(rgba(0x1d1b2aff).into()),

View File

@ -18,8 +18,8 @@ pub fn sandcastle() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3d4350ff).into()),
border_variant: Some(rgba(0x3d4350ff).into()),
border: Some(rgba(0x313741ff).into()),
border_variant: Some(rgba(0x2a2f38ff).into()),
elevated_surface_background: Some(rgba(0x333944ff).into()),
background: Some(rgba(0x333944ff).into()),
panel_background: Some(rgba(0x2b3039ff).into()),

View File

@ -19,8 +19,8 @@ pub fn solarized() -> UserThemeFamily {
appearance: Appearance::Light,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x9faaa8ff).into()),
border_variant: Some(rgba(0x9faaa8ff).into()),
border: Some(rgba(0xdcdacbff).into()),
border_variant: Some(rgba(0xf5eedbff).into()),
elevated_surface_background: Some(rgba(0xcfd0c4ff).into()),
background: Some(rgba(0xcfd0c4ff).into()),
panel_background: Some(rgba(0xf3eddaff).into()),
@ -358,8 +358,8 @@ pub fn solarized() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2b4f58ff).into()),
border_variant: Some(rgba(0x2b4f58ff).into()),
border: Some(rgba(0x063541ff).into()),
border_variant: Some(rgba(0x032f3bff).into()),
elevated_surface_background: Some(rgba(0x083743ff).into()),
background: Some(rgba(0x083743ff).into()),
panel_background: Some(rgba(0x04313cff).into()),

View File

@ -18,8 +18,8 @@ pub fn summercamp() -> UserThemeFamily {
appearance: Appearance::Dark,
styles: UserThemeStylesRefinement {
colors: ThemeColorsRefinement {
border: Some(rgba(0x312d21ff).into()),
border_variant: Some(rgba(0x312d21ff).into()),
border: Some(rgba(0x29251bff).into()),
border_variant: Some(rgba(0x221e15ff).into()),
elevated_surface_background: Some(rgba(0x2a261cff).into()),
background: Some(rgba(0x2a261cff).into()),
panel_background: Some(rgba(0x231f16ff).into()),

View File

@ -99,11 +99,9 @@ impl Zed1ThemeConverter {
let scrollbar = &self.theme.editor.scrollbar;
let terminal = &self.theme.terminal;
let title_bar_border = convert(title_bar.container.border.color);
Ok(ThemeColorsRefinement {
border: title_bar_border,
border_variant: title_bar_border,
border: convert(active_tab.container.border.color),
border_variant: convert(toolbar.container.border.color),
background: convert(self.theme.workspace.background),
elevated_surface_background: picker.container.background_color.map(zed1_color_to_hsla),
title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla),