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

theme_importer: Map drop target colors (#3830)

Browse Source 
This PR maps the drop target background color in the `theme_importer`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-01-02 10:40:24 -05:00 committed by GitHub
parent 6b14f2fd08
commit f5b3e473fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ pub fn andromeda() -> UserThemeFamily {
panel_background: Some(rgba(0x21242bff).into()),
element_hover: Some(rgba(0x2b2f3980).into()),
element_selected: Some(rgba(0x383b4580).into()),
drop_target_background: Some(rgba(0xaca8ae80).into()),
text: Some(rgba(0xf7f7f8ff).into()),
text_muted: Some(rgba(0xaca8aeff).into()),
text_placeholder: Some(rgba(0x474a53ff).into()),

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

@ -27,6 +27,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xebeae3ff).into()),
element_hover: Some(rgba(0x96958580).into()),
element_selected: Some(rgba(0x8b8a7880).into()),
drop_target_background: Some(rgba(0x61604f80).into()),
text: Some(rgba(0x22221bff).into()),
text_muted: Some(rgba(0x61604fff).into()),
text_placeholder: Some(rgba(0x878573ff).into()),
@ -430,6 +431,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x27211eff).into()),
element_hover: Some(rgba(0x665f5c80).into()),
element_selected: Some(rgba(0x71696680).into()),
drop_target_background: Some(rgba(0xa79f9d80).into()),
text: Some(rgba(0xf1efeeff).into()),
text_muted: Some(rgba(0xa79f9dff).into()),
text_placeholder: Some(rgba(0x766e6bff).into()),
@ -833,6 +835,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xe3ebe6ff).into()),
element_hover: Some(rgba(0x8b968e80).into()),
element_selected: Some(rgba(0x7e8b8280).into()),
drop_target_background: Some(rgba(0x54625980).into()),
text: Some(rgba(0x171c19ff).into()),
text_muted: Some(rgba(0x546259ff).into()),
text_placeholder: Some(rgba(0x79877dff).into()),
@ -1236,6 +1239,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x221f26ff).into()),
element_hover: Some(rgba(0x56505e80).into()),
element_selected: Some(rgba(0x605a6880).into()),
drop_target_background: Some(rgba(0x89859180).into()),
text: Some(rgba(0xefecf4ff).into()),
text_muted: Some(rgba(0x898591ff).into()),
text_placeholder: Some(rgba(0x655f6dff).into()),
@ -1639,6 +1643,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x2c2b23ff).into()),
element_hover: Some(rgba(0x5d5c4c80).into()),
element_selected: Some(rgba(0x67665580).into()),
drop_target_background: Some(rgba(0x91907f80).into()),
text: Some(rgba(0xf4f3ecff).into()),
text_muted: Some(rgba(0x91907fff).into()),
text_placeholder: Some(rgba(0x6c6b5aff).into()),
@ -2042,6 +2047,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x262f51ff).into()),
element_hover: Some(rgba(0x5c648580).into()),
element_selected: Some(rgba(0x666e8f80).into()),
drop_target_background: Some(rgba(0x959bb280).into()),
text: Some(rgba(0xf5f7ffff).into()),
text_muted: Some(rgba(0x959bb2ff).into()),
text_placeholder: Some(rgba(0x6b7394ff).into()),
@ -2445,6 +2451,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xe5e8f5ff).into()),
element_hover: Some(rgba(0x9a9fb680).into()),
element_selected: Some(rgba(0x8e94aa80).into()),
drop_target_background: Some(rgba(0x60688980).into()),
text: Some(rgba(0x202746ff).into()),
text_muted: Some(rgba(0x606889ff).into()),
text_placeholder: Some(rgba(0x898fa5ff).into()),
@ -2848,6 +2855,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x262622ff).into()),
element_hover: Some(rgba(0x6c695c80).into()),
element_selected: Some(rgba(0x77746480).into()),
drop_target_background: Some(rgba(0xa4a08b80).into()),
text: Some(rgba(0xfefbecff).into()),
text_muted: Some(rgba(0xa4a08bff).into()),
text_placeholder: Some(rgba(0x7c7968ff).into()),
@ -3251,6 +3259,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x1f231fff).into()),
element_hover: Some(rgba(0x5c6c5c80).into()),
element_selected: Some(rgba(0x64776480).into()),
drop_target_background: Some(rgba(0x8ba48b80).into()),
text: Some(rgba(0xf4fbf4ff).into()),
text_muted: Some(rgba(0x8ba48bff).into()),
text_placeholder: Some(rgba(0x687c68ff).into()),
@ -3654,6 +3663,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xe6e3ebff).into()),
element_hover: Some(rgba(0x8f8b9680).into()),
element_selected: Some(rgba(0x837e8b80).into()),
drop_target_background: Some(rgba(0x5a546280).into()),
text: Some(rgba(0x19171cff).into()),
text_muted: Some(rgba(0x5a5462ff).into()),
text_placeholder: Some(rgba(0x7e7987ff).into()),
@ -4057,6 +4067,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x252020ff).into()),
element_hover: Some(rgba(0x564e4e80).into()),
element_selected: Some(rgba(0x60585880).into()),
drop_target_background: Some(rgba(0x89838380).into()),
text: Some(rgba(0xf4ececff).into()),
text_muted: Some(rgba(0x898383ff).into()),
text_placeholder: Some(rgba(0x655d5dff).into()),
@ -4460,6 +4471,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x252025ff).into()),
element_hover: Some(rgba(0x675b6780).into()),
element_selected: Some(rgba(0x72647280).into()),
drop_target_background: Some(rgba(0xa99aa980).into()),
text: Some(rgba(0xf7f3f7ff).into()),
text_muted: Some(rgba(0xa99aa9ff).into()),
text_placeholder: Some(rgba(0x776977ff).into()),
@ -4863,6 +4875,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x1c2529ff).into()),
element_hover: Some(rgba(0x4f6b7880).into()),
element_selected: Some(rgba(0x57768580).into()),
drop_target_background: Some(rgba(0x7ca0b380).into()),
text: Some(rgba(0xebf8ffff).into()),
text_muted: Some(rgba(0x7ca0b3ff).into()),
text_placeholder: Some(rgba(0x5a7b8bff).into()),
@ -5266,6 +5279,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xe9e6e4ff).into()),
element_hover: Some(rgba(0xaaa3a180).into()),
element_selected: Some(rgba(0xa1999680).into()),
drop_target_background: Some(rgba(0x6a636080).into()),
text: Some(rgba(0x1b1918ff).into()),
text_muted: Some(rgba(0x6a6360ff).into()),
text_placeholder: Some(rgba(0x9c9491ff).into()),
@ -5669,6 +5683,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xeeebd7ff).into()),
element_hover: Some(rgba(0xa8a48e80).into()),
element_selected: Some(rgba(0x9e9a8580).into()),
drop_target_background: Some(rgba(0x706d5f80).into()),
text: Some(rgba(0x20201dff).into()),
text_muted: Some(rgba(0x706d5fff).into()),
text_placeholder: Some(rgba(0x999580ff).into()),
@ -6072,6 +6087,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xebe3e3ff).into()),
element_hover: Some(rgba(0x8e898980).into()),
element_selected: Some(rgba(0x837c7c80).into()),
drop_target_background: Some(rgba(0x5a525280).into()),
text: Some(rgba(0x1b1818ff).into()),
text_muted: Some(rgba(0x5a5252ff).into()),
text_placeholder: Some(rgba(0x7e7777ff).into()),
@ -6475,6 +6491,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xdaeedaff).into()),
element_hover: Some(rgba(0x8ea88e80).into()),
element_selected: Some(rgba(0x859e8580).into()),
drop_target_background: Some(rgba(0x5f705f80).into()),
text: Some(rgba(0x131513ff).into()),
text_muted: Some(rgba(0x5f705fff).into()),
text_placeholder: Some(rgba(0x809980ff).into()),
@ -6878,6 +6895,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0x1f2621ff).into()),
element_hover: Some(rgba(0x505e5580).into()),
element_selected: Some(rgba(0x5a685f80).into()),
drop_target_background: Some(rgba(0x85918880).into()),
text: Some(rgba(0xecf4eeff).into()),
text_muted: Some(rgba(0x859188ff).into()),
text_placeholder: Some(rgba(0x5f6d64ff).into()),
@ -7281,6 +7299,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xe1d6e1ff).into()),
element_hover: Some(rgba(0xad9dad80).into()),
element_selected: Some(rgba(0xa394a380).into()),
drop_target_background: Some(rgba(0x6b5e6b80).into()),
text: Some(rgba(0x1b181bff).into()),
text_muted: Some(rgba(0x6b5e6bff).into()),
text_placeholder: Some(rgba(0x9e8f9eff).into()),
@ -7684,6 +7703,7 @@ pub fn atelier() -> UserThemeFamily {
panel_background: Some(rgba(0xcdeaf9ff).into()),
element_hover: Some(rgba(0x80a4b680).into()),
element_selected: Some(rgba(0x769aad80).into()),
drop_target_background: Some(rgba(0x526f7d80).into()),
text: Some(rgba(0x161b1dff).into()),
text_muted: Some(rgba(0x526f7dff).into()),
text_placeholder: Some(rgba(0x7195a8ff).into()),

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

@ -27,6 +27,7 @@ pub fn ayu() -> UserThemeFamily {
panel_background: Some(rgba(0x1f2127ff).into()),
element_hover: Some(rgba(0x3f404380).into()),
element_selected: Some(rgba(0x50515280).into()),
drop_target_background: Some(rgba(0x8a898680).into()),
text: Some(rgba(0xbfbdb6ff).into()),
text_muted: Some(rgba(0x8a8986ff).into()),
text_placeholder: Some(rgba(0x58595aff).into()),
@ -409,6 +410,7 @@ pub fn ayu() -> UserThemeFamily {
panel_background: Some(rgba(0xececedff).into()),
element_hover: Some(rgba(0xcfd1d280).into()),
element_selected: Some(rgba(0xc0c2c480).into()),
drop_target_background: Some(rgba(0x8c8f9380).into()),
text: Some(rgba(0x5c6166ff).into()),
text_muted: Some(rgba(0x8c8f93ff).into()),
text_placeholder: Some(rgba(0xb9bbbdff).into()),
@ -791,6 +793,7 @@ pub fn ayu() -> UserThemeFamily {
panel_background: Some(rgba(0x353944ff).into()),
element_hover: Some(rgba(0x53565d80).into()),
element_selected: Some(rgba(0x63656a80).into()),
drop_target_background: Some(rgba(0x9a9a9880).into()),
text: Some(rgba(0xcccac2ff).into()),
text_muted: Some(rgba(0x9a9a98ff).into()),
text_placeholder: Some(rgba(0x6b6d71ff).into()),

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

@ -27,6 +27,7 @@ pub fn gruvbox() -> UserThemeFamily {
panel_background: Some(rgba(0xecddb5ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
element_selected: Some(rgba(0xb5a68e80).into()),
drop_target_background: Some(rgba(0x5f565080).into()),
text: Some(rgba(0x282828ff).into()),
text_muted: Some(rgba(0x5f5650ff).into()),
text_placeholder: Some(rgba(0xad9e87ff).into()),
@ -416,6 +417,7 @@ pub fn gruvbox() -> UserThemeFamily {
panel_background: Some(rgba(0x3b3735ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
element_selected: Some(rgba(0x6e635a80).into()),
drop_target_background: Some(rgba(0xc5b59780).into()),
text: Some(rgba(0xfbf1c7ff).into()),
text_muted: Some(rgba(0xc5b597ff).into()),
text_placeholder: Some(rgba(0x776b61ff).into()),
@ -805,6 +807,7 @@ pub fn gruvbox() -> UserThemeFamily {
panel_background: Some(rgba(0xecddb4ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
element_selected: Some(rgba(0xb5a68e80).into()),
drop_target_background: Some(rgba(0x5f565080).into()),
text: Some(rgba(0x282828ff).into()),
text_muted: Some(rgba(0x5f5650ff).into()),
text_placeholder: Some(rgba(0xad9e87ff).into()),
@ -1194,6 +1197,7 @@ pub fn gruvbox() -> UserThemeFamily {
panel_background: Some(rgba(0x3a3735ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
element_selected: Some(rgba(0x6e635a80).into()),
drop_target_background: Some(rgba(0xc5b59780).into()),
text: Some(rgba(0xfbf1c7ff).into()),
text_muted: Some(rgba(0xc5b597ff).into()),
text_placeholder: Some(rgba(0x776b61ff).into()),
@ -1583,6 +1587,7 @@ pub fn gruvbox() -> UserThemeFamily {
panel_background: Some(rgba(0xecdcb3ff).into()),
element_hover: Some(rgba(0xc9b99a80).into()),
element_selected: Some(rgba(0xb5a68e80).into()),
drop_target_background: Some(rgba(0x5f565080).into()),
text: Some(rgba(0x282828ff).into()),
text_muted: Some(rgba(0x5f5650ff).into()),
text_placeholder: Some(rgba(0xad9e87ff).into()),
@ -1972,6 +1977,7 @@ pub fn gruvbox() -> UserThemeFamily {
panel_background: Some(rgba(0x393634ff).into()),
element_hover: Some(rgba(0x5b534d80).into()),
element_selected: Some(rgba(0x6e635a80).into()),
drop_target_background: Some(rgba(0xc5b59780).into()),
text: Some(rgba(0xfbf1c7ff).into()),
text_muted: Some(rgba(0xc5b597ff).into()),
text_placeholder: Some(rgba(0x776b61ff).into()),

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

@ -27,6 +27,7 @@ pub fn one() -> UserThemeFamily {
panel_background: Some(rgba(0xebebecff).into()),
element_hover: Some(rgba(0xc9c9ca80).into()),
element_selected: Some(rgba(0xafafaf80).into()),
drop_target_background: Some(rgba(0x7f818880).into()),
text: Some(rgba(0x383a41ff).into()),
text_muted: Some(rgba(0x7f8188ff).into()),
text_placeholder: Some(rgba(0xa7a7a8ff).into()),
@ -416,6 +417,7 @@ pub fn one() -> UserThemeFamily {
panel_background: Some(rgba(0x2f343eff).into()),
element_hover: Some(rgba(0x464b5780).into()),
element_selected: Some(rgba(0x4f545e80).into()),
drop_target_background: Some(rgba(0x83899480).into()),
text: Some(rgba(0xc8ccd4ff).into()),
text_muted: Some(rgba(0x838994ff).into()),
text_placeholder: Some(rgba(0x545862ff).into()),

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

@ -27,6 +27,7 @@ pub fn rose_pine() -> UserThemeFamily {
panel_background: Some(rgba(0xfef9f2ff).into()),
element_hover: Some(rgba(0xdcd6d580).into()),
element_selected: Some(rgba(0xc1bac180).into()),
drop_target_background: Some(rgba(0x706c8c80).into()),
text: Some(rgba(0x575279ff).into()),
text_muted: Some(rgba(0x706c8cff).into()),
text_placeholder: Some(rgba(0xb1abb5ff).into()),
@ -423,6 +424,7 @@ pub fn rose_pine() -> UserThemeFamily {
panel_background: Some(rgba(0x28253cff).into()),
element_hover: Some(rgba(0x504c6880).into()),
element_selected: Some(rgba(0x45415d80).into()),
drop_target_background: Some(rgba(0x85819e80).into()),
text: Some(rgba(0xe0def4ff).into()),
text_muted: Some(rgba(0x85819eff).into()),
text_placeholder: Some(rgba(0x3a3653ff).into()),
@ -819,6 +821,7 @@ pub fn rose_pine() -> UserThemeFamily {
panel_background: Some(rgba(0x1d1b2aff).into()),
element_hover: Some(rgba(0x423f5580).into()),
element_selected: Some(rgba(0x47445b80).into()),
drop_target_background: Some(rgba(0x75718e80).into()),
text: Some(rgba(0xe0def4ff).into()),
text_muted: Some(rgba(0x75718eff).into()),
text_placeholder: Some(rgba(0x3b384fff).into()),

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

@ -26,6 +26,7 @@ pub fn sandcastle() -> UserThemeFamily {
panel_background: Some(rgba(0x2b3039ff).into()),
element_hover: Some(rgba(0x3d435080).into()),
element_selected: Some(rgba(0x57535380).into()),
drop_target_background: Some(rgba(0xa6978280).into()),
text: Some(rgba(0xfdf4c1ff).into()),
text_muted: Some(rgba(0xa69782ff).into()),
text_placeholder: Some(rgba(0x645b54ff).into()),

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

@ -27,6 +27,7 @@ pub fn solarized() -> UserThemeFamily {
panel_background: Some(rgba(0xf3eddaff).into()),
element_hover: Some(rgba(0x9faaa880).into()),
element_selected: Some(rgba(0x7f919480).into()),
drop_target_background: Some(rgba(0x34555e80).into()),
text: Some(rgba(0x002b36ff).into()),
text_muted: Some(rgba(0x34555eff).into()),
text_placeholder: Some(rgba(0x788b8fff).into()),
@ -409,6 +410,7 @@ pub fn solarized() -> UserThemeFamily {
panel_background: Some(rgba(0x04313cff).into()),
element_hover: Some(rgba(0x2b4f5880).into()),
element_selected: Some(rgba(0x566d7480).into()),
drop_target_background: Some(rgba(0x93a1a180).into()),
text: Some(rgba(0xfdf6e3ff).into()),
text_muted: Some(rgba(0x93a1a1ff).into()),
text_placeholder: Some(rgba(0x5f757dff).into()),

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

@ -26,6 +26,7 @@ pub fn summercamp() -> UserThemeFamily {
panel_background: Some(rgba(0x231f16ff).into()),
element_hover: Some(rgba(0x312d2180).into()),
element_selected: Some(rgba(0x39342780).into()),
drop_target_background: Some(rgba(0x736e5580).into()),
text: Some(rgba(0xf8f5deff).into()),
text_muted: Some(rgba(0x736e55ff).into()),
text_placeholder: Some(rgba(0x3d382aff).into()),

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

@ -179,6 +179,7 @@ impl Zed1ThemeConverter {
.container
.background_color
.map(zed1_color_to_hsla),
drop_target_background: convert(self.theme.workspace.drop_target_overlay_color),
toolbar_background: toolbar.container.background_color.map(zed1_color_to_hsla),
editor_foreground: convert(editor.text_color),
editor_background: convert(editor.background),