zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Import elevated surface color from hover popover

Browse Source
This commit is contained in:
Nathan Sobo 2023-12-27 11:58:26 -07:00
parent a2b0f14dc1
commit 02f7e681a7
10 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/theme2/src/themes/andromeda.rs
View File

@ -21,7 +21,7 @@ pub fn andromeda() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x252931ff).into()),
border_variant: Some(rgba(0x21232aff).into()),
elevated_surface_background: Some(rgba(0x262a33ff).into()),
elevated_surface_background: Some(rgba(0x21242bff).into()),
background: Some(rgba(0x262a33ff).into()),
panel_background: Some(rgba(0x21242bff).into()),
element_hover: Some(rgba(0x2b2f3980).into()),

40
crates/theme2/src/themes/atelier.rs
View File

@ -22,7 +22,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xd1d0c6ff).into()),
border_variant: Some(rgba(0xedece5ff).into()),
elevated_surface_background: Some(rgba(0xc5c4b9ff).into()),
elevated_surface_background: Some(rgba(0xebeae3ff).into()),
background: Some(rgba(0xc5c4b9ff).into()),
panel_background: Some(rgba(0xebeae3ff).into()),
element_hover: Some(rgba(0x96958580).into()),
@ -425,7 +425,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3b3431ff).into()),
border_variant: Some(rgba(0x251f1dff).into()),
elevated_surface_background: Some(rgba(0x443c39ff).into()),
elevated_surface_background: Some(rgba(0x27211eff).into()),
background: Some(rgba(0x443c39ff).into()),
panel_background: Some(rgba(0x27211eff).into()),
element_hover: Some(rgba(0x665f5c80).into()),
@ -828,7 +828,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xc8d1cbff).into()),
border_variant: Some(rgba(0xe5ede7ff).into()),
elevated_surface_background: Some(rgba(0xbcc5bfff).into()),
elevated_surface_background: Some(rgba(0xe3ebe6ff).into()),
background: Some(rgba(0xbcc5bfff).into()),
panel_background: Some(rgba(0xe3ebe6ff).into()),
element_hover: Some(rgba(0x8b968e80).into()),
@ -1231,7 +1231,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x332f38ff).into()),
border_variant: Some(rgba(0x201e24ff).into()),
elevated_surface_background: Some(rgba(0x3a353fff).into()),
elevated_surface_background: Some(rgba(0x221f26ff).into()),
background: Some(rgba(0x3a353fff).into()),
panel_background: Some(rgba(0x221f26ff).into()),
element_hover: Some(rgba(0x56505e80).into()),
@ -1634,7 +1634,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3c3b31ff).into()),
border_variant: Some(rgba(0x2a2922ff).into()),
elevated_surface_background: Some(rgba(0x424136ff).into()),
elevated_surface_background: Some(rgba(0x2c2b23ff).into()),
background: Some(rgba(0x424136ff).into()),
panel_background: Some(rgba(0x2c2b23ff).into()),
element_hover: Some(rgba(0x5d5c4c80).into()),
@ -2037,7 +2037,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x363f62ff).into()),
border_variant: Some(rgba(0x252d4fff).into()),
elevated_surface_background: Some(rgba(0x3e4769ff).into()),
elevated_surface_background: Some(rgba(0x262f51ff).into()),
background: Some(rgba(0x3e4769ff).into()),
panel_background: Some(rgba(0x262f51ff).into()),
element_hover: Some(rgba(0x5c648580).into()),
@ -2440,7 +2440,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xccd0e1ff).into()),
border_variant: Some(rgba(0xe9ebf7ff).into()),
elevated_surface_background: Some(rgba(0xc2c6d9ff).into()),
elevated_surface_background: Some(rgba(0xe5e8f5ff).into()),
background: Some(rgba(0xc2c6d9ff).into()),
panel_background: Some(rgba(0xe5e8f5ff).into()),
element_hover: Some(rgba(0x9a9fb680).into()),
@ -2843,7 +2843,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x3b3933ff).into()),
border_variant: Some(rgba(0x252521ff).into()),
elevated_surface_background: Some(rgba(0x45433bff).into()),
elevated_surface_background: Some(rgba(0x262622ff).into()),
background: Some(rgba(0x45433bff).into()),
panel_background: Some(rgba(0x262622ff).into()),
element_hover: Some(rgba(0x6c695c80).into()),
@ -3246,7 +3246,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x333b33ff).into()),
border_variant: Some(rgba(0x1d201dff).into()),
elevated_surface_background: Some(rgba(0x3b453bff).into()),
elevated_surface_background: Some(rgba(0x1f231fff).into()),
background: Some(rgba(0x3b453bff).into()),
panel_background: Some(rgba(0x1f231fff).into()),
element_hover: Some(rgba(0x5c6c5c80).into()),
@ -3649,7 +3649,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xcbc8d1ff).into()),
border_variant: Some(rgba(0xe8e5edff).into()),
elevated_surface_background: Some(rgba(0xbfbcc5ff).into()),
elevated_surface_background: Some(rgba(0xe6e3ebff).into()),
background: Some(rgba(0xbfbcc5ff).into()),
panel_background: Some(rgba(0xe6e3ebff).into()),
element_hover: Some(rgba(0x8f8b9680).into()),
@ -4052,7 +4052,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x352f2fff).into()),
border_variant: Some(rgba(0x231f1fff).into()),
elevated_surface_background: Some(rgba(0x3b3535ff).into()),
elevated_surface_background: Some(rgba(0x252020ff).into()),
background: Some(rgba(0x3b3535ff).into()),
panel_background: Some(rgba(0x252020ff).into()),
element_hover: Some(rgba(0x564e4e80).into()),
@ -4455,7 +4455,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x393239ff).into()),
border_variant: Some(rgba(0x231e23ff).into()),
elevated_surface_background: Some(rgba(0x433a43ff).into()),
elevated_surface_background: Some(rgba(0x252025ff).into()),
background: Some(rgba(0x433a43ff).into()),
panel_background: Some(rgba(0x252025ff).into()),
element_hover: Some(rgba(0x675b6780).into()),
@ -4858,7 +4858,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2c3b42ff).into()),
border_variant: Some(rgba(0x1b2327ff).into()),
elevated_surface_background: Some(rgba(0x33444dff).into()),
elevated_surface_background: Some(rgba(0x1c2529ff).into()),
background: Some(rgba(0x33444dff).into()),
panel_background: Some(rgba(0x1c2529ff).into()),
element_hover: Some(rgba(0x4f6b7880).into()),
@ -5261,7 +5261,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xd6d1cfff).into()),
border_variant: Some(rgba(0xebe8e6ff).into()),
elevated_surface_background: Some(rgba(0xcdc8c6ff).into()),
elevated_surface_background: Some(rgba(0xe9e6e4ff).into()),
background: Some(rgba(0xcdc8c6ff).into()),
panel_background: Some(rgba(0xe9e6e4ff).into()),
element_hover: Some(rgba(0xaaa3a180).into()),
@ -5664,7 +5664,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xd7d3beff).into()),
border_variant: Some(rgba(0xf2eedcff).into()),
elevated_surface_background: Some(rgba(0xcecab4ff).into()),
elevated_surface_background: Some(rgba(0xeeebd7ff).into()),
background: Some(rgba(0xcecab4ff).into()),
panel_background: Some(rgba(0xeeebd7ff).into()),
element_hover: Some(rgba(0xa8a48e80).into()),
@ -6067,7 +6067,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xcfc7c7ff).into()),
border_variant: Some(rgba(0xede5e5ff).into()),
elevated_surface_background: Some(rgba(0xc1bbbbff).into()),
elevated_surface_background: Some(rgba(0xebe3e3ff).into()),
background: Some(rgba(0xc1bbbbff).into()),
panel_background: Some(rgba(0xebe3e3ff).into()),
element_hover: Some(rgba(0x8e898980).into()),
@ -6470,7 +6470,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xbed7beff).into()),
border_variant: Some(rgba(0xdff0dfff).into()),
elevated_surface_background: Some(rgba(0xb4ceb4ff).into()),
elevated_surface_background: Some(rgba(0xdaeedaff).into()),
background: Some(rgba(0xb4ceb4ff).into()),
panel_background: Some(rgba(0xdaeedaff).into()),
element_hover: Some(rgba(0x8ea88e80).into()),
@ -6873,7 +6873,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2f3832ff).into()),
border_variant: Some(rgba(0x1e2420ff).into()),
elevated_surface_background: Some(rgba(0x353f39ff).into()),
elevated_surface_background: Some(rgba(0x1f2621ff).into()),
background: Some(rgba(0x353f39ff).into()),
panel_background: Some(rgba(0x1f2621ff).into()),
element_hover: Some(rgba(0x505e5580).into()),
@ -7276,7 +7276,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xcdbecdff).into()),
border_variant: Some(rgba(0xe5dce5ff).into()),
elevated_surface_background: Some(rgba(0xc6b8c6ff).into()),
elevated_surface_background: Some(rgba(0xe1d6e1ff).into()),
background: Some(rgba(0xc6b8c6ff).into()),
panel_background: Some(rgba(0xe1d6e1ff).into()),
element_hover: Some(rgba(0xad9dad80).into()),
@ -7679,7 +7679,7 @@ pub fn atelier() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xb0d3e5ff).into()),
border_variant: Some(rgba(0xd3edfaff).into()),
elevated_surface_background: Some(rgba(0xa6cadcff).into()),
elevated_surface_background: Some(rgba(0xcdeaf9ff).into()),
background: Some(rgba(0xa6cadcff).into()),
panel_background: Some(rgba(0xcdeaf9ff).into()),
element_hover: Some(rgba(0x80a4b680).into()),

6
crates/theme2/src/themes/ayu.rs
View File

@ -22,7 +22,7 @@ pub fn ayu() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x2d2f34ff).into()),
border_variant: Some(rgba(0x1b1e24ff).into()),
elevated_surface_background: Some(rgba(0x313337ff).into()),
elevated_surface_background: Some(rgba(0x1f2127ff).into()),
background: Some(rgba(0x313337ff).into()),
panel_background: Some(rgba(0x1f2127ff).into()),
element_hover: Some(rgba(0x3f404380).into()),
@ -404,7 +404,7 @@ pub fn ayu() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xdfe0e1ff).into()),
border_variant: Some(rgba(0xefeff0ff).into()),
elevated_surface_background: Some(rgba(0xdcdddeff).into()),
elevated_surface_background: Some(rgba(0xececedff).into()),
background: Some(rgba(0xdcdddeff).into()),
panel_background: Some(rgba(0xececedff).into()),
element_hover: Some(rgba(0xcfd1d280).into()),
@ -786,7 +786,7 @@ pub fn ayu() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x43464fff).into()),
border_variant: Some(rgba(0x323641ff).into()),
elevated_surface_background: Some(rgba(0x464a52ff).into()),
elevated_surface_background: Some(rgba(0x353944ff).into()),
background: Some(rgba(0x464a52ff).into()),
panel_background: Some(rgba(0x353944ff).into()),
element_hover: Some(rgba(0x53565d80).into()),

12
crates/theme2/src/themes/gruvbox.rs
View File

@ -22,7 +22,7 @@ pub fn gruvbox() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xefe2bcff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
elevated_surface_background: Some(rgba(0xecddb5ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecddb5ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
@ -411,7 +411,7 @@ pub fn gruvbox() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x393634ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
elevated_surface_background: Some(rgba(0x3b3735ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x3b3735ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
@ -800,7 +800,7 @@ pub fn gruvbox() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xefe1b8ff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
elevated_surface_background: Some(rgba(0xecddb4ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecddb4ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
@ -1189,7 +1189,7 @@ pub fn gruvbox() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x373432ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
elevated_surface_background: Some(rgba(0x3a3735ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x3a3735ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
@ -1578,7 +1578,7 @@ pub fn gruvbox() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xddcca7ff).into()),
border_variant: Some(rgba(0xeddeb5ff).into()),
elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
elevated_surface_background: Some(rgba(0xecdcb3ff).into()),
background: Some(rgba(0xd9c8a4ff).into()),
panel_background: Some(rgba(0xecdcb3ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
@ -1967,7 +1967,7 @@ pub fn gruvbox() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x494340ff).into()),
border_variant: Some(rgba(0x343130ff).into()),
elevated_surface_background: Some(rgba(0x4c4642ff).into()),
elevated_surface_background: Some(rgba(0x393634ff).into()),
background: Some(rgba(0x4c4642ff).into()),
panel_background: Some(rgba(0x393634ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),

4
crates/theme2/src/themes/one.rs
View File

@ -22,7 +22,7 @@ pub fn one() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xdfdfe0ff).into()),
border_variant: Some(rgba(0xeeeeeeff).into()),
elevated_surface_background: Some(rgba(0xdcdcddff).into()),
elevated_surface_background: Some(rgba(0xebebecff).into()),
background: Some(rgba(0xdcdcddff).into()),
panel_background: Some(rgba(0xebebecff).into()),
element_hover: Some(rgba(0xc9c9ca80).into()),
@ -411,7 +411,7 @@ pub fn one() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x363c46ff).into()),
border_variant: Some(rgba(0x2e333cff).into()),
elevated_surface_background: Some(rgba(0x3b414dff).into()),
elevated_surface_background: Some(rgba(0x2f343eff).into()),
background: Some(rgba(0x3b414dff).into()),
panel_background: Some(rgba(0x2f343eff).into()),
element_hover: Some(rgba(0x464b5780).into()),

6
crates/theme2/src/themes/rose_pine.rs
View File

@ -22,7 +22,7 @@ pub fn rose_pine() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xe5e0dfff).into()),
border_variant: Some(rgba(0xfdf8f1ff).into()),
elevated_surface_background: Some(rgba(0xdcd8d8ff).into()),
elevated_surface_background: Some(rgba(0xfef9f2ff).into()),
background: Some(rgba(0xdcd8d8ff).into()),
panel_background: Some(rgba(0xfef9f2ff).into()),
element_hover: Some(rgba(0xdcd6d580).into()),
@ -418,7 +418,7 @@ pub fn rose_pine() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x322f48ff).into()),
border_variant: Some(rgba(0x27243bff).into()),
elevated_surface_background: Some(rgba(0x38354eff).into()),
elevated_surface_background: Some(rgba(0x28253cff).into()),
background: Some(rgba(0x38354eff).into()),
panel_background: Some(rgba(0x28253cff).into()),
element_hover: Some(rgba(0x504c6880).into()),
@ -814,7 +814,7 @@ pub fn rose_pine() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x232132ff).into()),
border_variant: Some(rgba(0x1c1a29ff).into()),
elevated_surface_background: Some(rgba(0x292739ff).into()),
elevated_surface_background: Some(rgba(0x1d1b2aff).into()),
background: Some(rgba(0x292739ff).into()),
panel_background: Some(rgba(0x1d1b2aff).into()),
element_hover: Some(rgba(0x423f5580).into()),

2
crates/theme2/src/themes/sandcastle.rs
View File

@ -21,7 +21,7 @@ pub fn sandcastle() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x313741ff).into()),
border_variant: Some(rgba(0x2a2f38ff).into()),
elevated_surface_background: Some(rgba(0x333944ff).into()),
elevated_surface_background: Some(rgba(0x2b3039ff).into()),
background: Some(rgba(0x333944ff).into()),
panel_background: Some(rgba(0x2b3039ff).into()),
element_hover: Some(rgba(0x3d435080).into()),

4
crates/theme2/src/themes/solarized.rs
View File

@ -22,7 +22,7 @@ pub fn solarized() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0xdcdacbff).into()),
border_variant: Some(rgba(0xf5eedbff).into()),
elevated_surface_background: Some(rgba(0xcfd0c4ff).into()),
elevated_surface_background: Some(rgba(0xf3eddaff).into()),
background: Some(rgba(0xcfd0c4ff).into()),
panel_background: Some(rgba(0xf3eddaff).into()),
element_hover: Some(rgba(0x9faaa880).into()),
@ -404,7 +404,7 @@ pub fn solarized() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x063541ff).into()),
border_variant: Some(rgba(0x032f3bff).into()),
elevated_surface_background: Some(rgba(0x083743ff).into()),
elevated_surface_background: Some(rgba(0x04313cff).into()),
background: Some(rgba(0x083743ff).into()),
panel_background: Some(rgba(0x04313cff).into()),
element_hover: Some(rgba(0x2b4f5880).into()),

2
crates/theme2/src/themes/summercamp.rs
View File

@ -21,7 +21,7 @@ pub fn summercamp() -> UserThemeFamily {
colors: ThemeColorsRefinement {
border: Some(rgba(0x29251bff).into()),
border_variant: Some(rgba(0x221e15ff).into()),
elevated_surface_background: Some(rgba(0x2a261cff).into()),
elevated_surface_background: Some(rgba(0x231f16ff).into()),
background: Some(rgba(0x2a261cff).into()),
panel_background: Some(rgba(0x231f16ff).into()),
element_hover: Some(rgba(0x312d2180).into()),

6
crates/theme_importer/src/zed1/converter.rs
View File

@ -133,7 +133,11 @@ impl Zed1ThemeConverter {
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),
elevated_surface_background: editor
.hover_popover
.container
.background_color
.map(zed1_color_to_hsla),
title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla),
status_bar_background: status_bar
.container