zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-16 17:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix hint colors (#3855)

Browse Source 
This PR fixes the hint colors, which were no longer correct after #3842.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-01-02 20:34:18 -05:00 committed by GitHub
parent d637657a99
commit e8df1a7284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 47 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

@ -110,7 +110,7 @@ pub fn andromeda() -> UserThemeFamily {
hidden: Some(rgba(0x6b6b73ff).into()),
hidden_background: Some(rgba(0x262a33ff).into()),
hidden_border: Some(rgba(0x292d37ff).into()),
hint: Some(rgba(0x11a793ff).into()),
hint: Some(rgba(0x618399ff).into()),
hint_background: Some(rgba(0x122420ff).into()),
hint_border: Some(rgba(0x183a34ff).into()),
ignored: Some(rgba(0xaca8aeff).into()),

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

@ -111,7 +111,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x767463ff).into()),
hidden_background: Some(rgba(0xc5c4b9ff).into()),
hidden_border: Some(rgba(0xadac9fff).into()),
hint: Some(rgba(0x38a166ff).into()),
hint: Some(rgba(0x768962ff).into()),
hint_background: Some(rgba(0xd9ecdfff).into()),
hint_border: Some(rgba(0xbbddc6ff).into()),
ignored: Some(rgba(0x61604fff).into()),
@ -576,7 +576,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x8e8683ff).into()),
hidden_background: Some(rgba(0x443c39ff).into()),
hidden_border: Some(rgba(0x554e4bff).into()),
hint: Some(rgba(0x417ee6ff).into()),
hint: Some(rgba(0xa87187ff).into()),
hint_background: Some(rgba(0x0f1d3dff).into()),
hint_border: Some(rgba(0x192e5bff).into()),
ignored: Some(rgba(0xa79f9dff).into()),
@ -1041,7 +1041,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x68766dff).into()),
hidden_background: Some(rgba(0xbcc5bfff).into()),
hidden_border: Some(rgba(0xa3ada6ff).into()),
hint: Some(rgba(0x488c90ff).into()),
hint: Some(rgba(0x66847cff).into()),
hint_background: Some(rgba(0xdae7e8ff).into()),
hint_border: Some(rgba(0xbed4d6ff).into()),
ignored: Some(rgba(0x546259ff).into()),
@ -1506,7 +1506,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x756f7eff).into()),
hidden_background: Some(rgba(0x3a353fff).into()),
hidden_border: Some(rgba(0x48434fff).into()),
hint: Some(rgba(0x576ddaff).into()),
hint: Some(rgba(0x716998ff).into()),
hint_background: Some(rgba(0x161a36ff).into()),
hint_border: Some(rgba(0x222953ff).into()),
ignored: Some(rgba(0x898591ff).into()),
@ -1971,7 +1971,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x7d7c6aff).into()),
hidden_background: Some(rgba(0x424136ff).into()),
hidden_border: Some(rgba(0x504f41ff).into()),
hint: Some(rgba(0x37a166ff).into()),
hint: Some(rgba(0x70825bff).into()),
hint_background: Some(rgba(0x142319ff).into()),
hint_border: Some(rgba(0x1c3927ff).into()),
ignored: Some(rgba(0x91907fff).into()),
@ -2436,7 +2436,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x7e849eff).into()),
hidden_background: Some(rgba(0x3e4769ff).into()),
hidden_border: Some(rgba(0x4d5577ff).into()),
hint: Some(rgba(0x3e8fd0ff).into()),
hint: Some(rgba(0x6d82a6ff).into()),
hint_background: Some(rgba(0x161f2bff).into()),
hint_border: Some(rgba(0x203348ff).into()),
ignored: Some(rgba(0x959bb2ff).into()),
@ -2901,7 +2901,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x767d9aff).into()),
hidden_background: Some(rgba(0xc2c6d9ff).into()),
hidden_border: Some(rgba(0xaeb3c7ff).into()),
hint: Some(rgba(0x3f8fd0ff).into()),
hint: Some(rgba(0x7087b2ff).into()),
hint_background: Some(rgba(0xdde7f6ff).into()),
hint_border: Some(rgba(0xc2d5efff).into()),
ignored: Some(rgba(0x606889ff).into()),
@ -3366,7 +3366,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x8f8b77ff).into()),
hidden_background: Some(rgba(0x45433bff).into()),
hidden_border: Some(rgba(0x58564bff).into()),
hint: Some(rgba(0x6684e0ff).into()),
hint: Some(rgba(0xb17272ff).into()),
hint_background: Some(rgba(0x171e39ff).into()),
hint_border: Some(rgba(0x263056ff).into()),
ignored: Some(rgba(0xa4a08bff).into()),
@ -3831,7 +3831,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x778f77ff).into()),
hidden_background: Some(rgba(0x3b453bff).into()),
hidden_border: Some(rgba(0x4b584bff).into()),
hint: Some(rgba(0x3e62f4ff).into()),
hint: Some(rgba(0x008b9fff).into()),
hint_background: Some(rgba(0x061949ff).into()),
hint_border: Some(rgba(0x102668ff).into()),
ignored: Some(rgba(0x8ba48bff).into()),
@ -4296,7 +4296,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x6e6876ff).into()),
hidden_background: Some(rgba(0xbfbcc5ff).into()),
hidden_border: Some(rgba(0xa7a3adff).into()),
hint: Some(rgba(0x586ddaff).into()),
hint: Some(rgba(0x786e9dff).into()),
hint_background: Some(rgba(0xe1e0f9ff).into()),
hint_border: Some(rgba(0xc9c8f3ff).into()),
ignored: Some(rgba(0x5a5462ff).into()),
@ -4761,7 +4761,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x756e6eff).into()),
hidden_background: Some(rgba(0x3b3535ff).into()),
hidden_border: Some(rgba(0x494242ff).into()),
hint: Some(rgba(0x7272caff).into()),
hint: Some(rgba(0x8a647aff).into()),
hint_background: Some(rgba(0x1c1b29ff).into()),
hint_border: Some(rgba(0x2c2b45ff).into()),
ignored: Some(rgba(0x898383ff).into()),
@ -5226,7 +5226,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x908190ff).into()),
hidden_background: Some(rgba(0x433a43ff).into()),
hidden_border: Some(rgba(0x554a55ff).into()),
hint: Some(rgba(0x526aebff).into()),
hint: Some(rgba(0x8d70a8ff).into()),
hint_background: Some(rgba(0x0e1a43ff).into()),
hint_border: Some(rgba(0x1a2961ff).into()),
ignored: Some(rgba(0xa99aa9ff).into()),
@ -5691,7 +5691,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x698c9eff).into()),
hidden_background: Some(rgba(0x33444dff).into()),
hidden_border: Some(rgba(0x415763ff).into()),
hint: Some(rgba(0x277fadff).into()),
hint: Some(rgba(0x52809aff).into()),
hint_background: Some(rgba(0x131d24ff).into()),
hint_border: Some(rgba(0x1a2f3cff).into()),
ignored: Some(rgba(0x7ca0b3ff).into()),
@ -6156,7 +6156,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x847c79ff).into()),
hidden_background: Some(rgba(0xcdc8c6ff).into()),
hidden_border: Some(rgba(0xbcb6b4ff).into()),
hint: Some(rgba(0x417ee6ff).into()),
hint: Some(rgba(0xa67287ff).into()),
hint_background: Some(rgba(0xdfe3fbff).into()),
hint_border: Some(rgba(0xc6cef7ff).into()),
ignored: Some(rgba(0x6a6360ff).into()),
@ -6621,7 +6621,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x878471ff).into()),
hidden_background: Some(rgba(0xcecab4ff).into()),
hidden_border: Some(rgba(0xbbb7a1ff).into()),
hint: Some(rgba(0x6784e0ff).into()),
hint: Some(rgba(0xb37979ff).into()),
hint_background: Some(rgba(0xe3e5faff).into()),
hint_border: Some(rgba(0xcdd1f5ff).into()),
ignored: Some(rgba(0x706d5fff).into()),
@ -7086,7 +7086,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x6e6666ff).into()),
hidden_background: Some(rgba(0xc1bbbbff).into()),
hidden_border: Some(rgba(0xa8a2a2ff).into()),
hint: Some(rgba(0x7372caff).into()),
hint: Some(rgba(0x916a80ff).into()),
hint_background: Some(rgba(0xe4e1f5ff).into()),
hint_border: Some(rgba(0xcecaecff).into()),
ignored: Some(rgba(0x5a5252ff).into()),
@ -7551,7 +7551,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x718771ff).into()),
hidden_background: Some(rgba(0xb4ceb4ff).into()),
hidden_border: Some(rgba(0xa1bba1ff).into()),
hint: Some(rgba(0x3f62f4ff).into()),
hint: Some(rgba(0x008fa1ff).into()),
hint_background: Some(rgba(0xe1ddfeff).into()),
hint_border: Some(rgba(0xc9c4fdff).into()),
ignored: Some(rgba(0x5f705fff).into()),
@ -8016,7 +8016,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x6f7e74ff).into()),
hidden_background: Some(rgba(0x353f39ff).into()),
hidden_border: Some(rgba(0x434f47ff).into()),
hint: Some(rgba(0x478c90ff).into()),
hint: Some(rgba(0x607e76ff).into()),
hint_background: Some(rgba(0x151f20ff).into()),
hint_border: Some(rgba(0x1f3233ff).into()),
ignored: Some(rgba(0x859188ff).into()),
@ -8481,7 +8481,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x857785ff).into()),
hidden_background: Some(rgba(0xc6b8c6ff).into()),
hidden_border: Some(rgba(0xbaaabaff).into()),
hint: Some(rgba(0x526aebff).into()),
hint: Some(rgba(0x8c70a6ff).into()),
hint_background: Some(rgba(0xe2dffcff).into()),
hint_border: Some(rgba(0xcac7faff).into()),
ignored: Some(rgba(0x6b5e6bff).into()),
@ -8946,7 +8946,7 @@ pub fn atelier() -> UserThemeFamily {
hidden: Some(rgba(0x628496ff).into()),
hidden_background: Some(rgba(0xa6cadcff).into()),
hidden_border: Some(rgba(0x93b7c9ff).into()),
hint: Some(rgba(0x277fadff).into()),
hint: Some(rgba(0x5a87a0ff).into()),
hint_background: Some(rgba(0xd8e4eeff).into()),
hint_border: Some(rgba(0xbacfe1ff).into()),
ignored: Some(rgba(0x526f7dff).into()),

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

@ -111,7 +111,7 @@ pub fn ayu() -> UserThemeFamily {
hidden: Some(rgba(0x696a6aff).into()),
hidden_background: Some(rgba(0x313337ff).into()),
hidden_border: Some(rgba(0x383a3eff).into()),
hint: Some(rgba(0x5ac2feff).into()),
hint: Some(rgba(0x638c81ff).into()),
hint_background: Some(rgba(0x0d304fff).into()),
hint_border: Some(rgba(0x1b4a6eff).into()),
ignored: Some(rgba(0x8a8986ff).into()),
@ -555,7 +555,7 @@ pub fn ayu() -> UserThemeFamily {
hidden: Some(rgba(0xa9acaeff).into()),
hidden_background: Some(rgba(0xdcdddeff).into()),
hidden_border: Some(rgba(0xd5d6d8ff).into()),
hint: Some(rgba(0x3b9ee5ff).into()),
hint: Some(rgba(0x8ca7c2ff).into()),
hint_background: Some(rgba(0xdeebfaff).into()),
hint_border: Some(rgba(0xc4daf6ff).into()),
ignored: Some(rgba(0x8c8f93ff).into()),
@ -999,7 +999,7 @@ pub fn ayu() -> UserThemeFamily {
hidden: Some(rgba(0x7b7d7fff).into()),
hidden_background: Some(rgba(0x464a52ff).into()),
hidden_border: Some(rgba(0x4d5058ff).into()),
hint: Some(rgba(0x73cffeff).into()),
hint: Some(rgba(0x7399a3ff).into()),
hint_background: Some(rgba(0x123a50ff).into()),
hint_border: Some(rgba(0x24556fff).into()),
ignored: Some(rgba(0x9a9a98ff).into()),

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

@ -111,7 +111,7 @@ pub fn gruvbox() -> UserThemeFamily {
hidden: Some(rgba(0x8a7c6fff).into()),
hidden_background: Some(rgba(0xd9c8a4ff).into()),
hidden_border: Some(rgba(0xd1c09eff).into()),
hint: Some(rgba(0x0b6678ff).into()),
hint: Some(rgba(0x677562ff).into()),
hint_background: Some(rgba(0xd2dee2ff).into()),
hint_border: Some(rgba(0xaec6cdff).into()),
ignored: Some(rgba(0x5f5650ff).into()),
@ -562,7 +562,7 @@ pub fn gruvbox() -> UserThemeFamily {
hidden: Some(rgba(0x9a8c79ff).into()),
hidden_background: Some(rgba(0x4c4642ff).into()),
hidden_border: Some(rgba(0x544c48ff).into()),
hint: Some(rgba(0x83a598ff).into()),
hint: Some(rgba(0x8d957eff).into()),
hint_background: Some(rgba(0x1e2321ff).into()),
hint_border: Some(rgba(0x303a36ff).into()),
ignored: Some(rgba(0xc5b597ff).into()),
@ -1013,7 +1013,7 @@ pub fn gruvbox() -> UserThemeFamily {
hidden: Some(rgba(0x8a7c6fff).into()),
hidden_background: Some(rgba(0xd9c8a4ff).into()),
hidden_border: Some(rgba(0xd1c09eff).into()),
hint: Some(rgba(0x0b6678ff).into()),
hint: Some(rgba(0x677562ff).into()),
hint_background: Some(rgba(0xd2dee2ff).into()),
hint_border: Some(rgba(0xaec6cdff).into()),
ignored: Some(rgba(0x5f5650ff).into()),
@ -1464,7 +1464,7 @@ pub fn gruvbox() -> UserThemeFamily {
hidden: Some(rgba(0x9a8c79ff).into()),
hidden_background: Some(rgba(0x4c4642ff).into()),
hidden_border: Some(rgba(0x544c48ff).into()),
hint: Some(rgba(0x83a598ff).into()),
hint: Some(rgba(0x8d957eff).into()),
hint_background: Some(rgba(0x1e2321ff).into()),
hint_border: Some(rgba(0x303a36ff).into()),
ignored: Some(rgba(0xc5b597ff).into()),
@ -1915,7 +1915,7 @@ pub fn gruvbox() -> UserThemeFamily {
hidden: Some(rgba(0x8a7c6fff).into()),
hidden_background: Some(rgba(0xd9c8a4ff).into()),
hidden_border: Some(rgba(0xd1c09eff).into()),
hint: Some(rgba(0x0b6678ff).into()),
hint: Some(rgba(0x677562ff).into()),
hint_background: Some(rgba(0xd2dee2ff).into()),
hint_border: Some(rgba(0xaec6cdff).into()),
ignored: Some(rgba(0x5f5650ff).into()),
@ -2366,7 +2366,7 @@ pub fn gruvbox() -> UserThemeFamily {
hidden: Some(rgba(0x9a8c79ff).into()),
hidden_background: Some(rgba(0x4c4642ff).into()),
hidden_border: Some(rgba(0x544c48ff).into()),
hint: Some(rgba(0x83a598ff).into()),
hint: Some(rgba(0x8d957eff).into()),
hint_background: Some(rgba(0x1e2321ff).into()),
hint_border: Some(rgba(0x303a36ff).into()),
ignored: Some(rgba(0xc5b597ff).into()),

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

@ -111,7 +111,7 @@ pub fn one() -> UserThemeFamily {
hidden: Some(rgba(0xa1a1a3ff).into()),
hidden_background: Some(rgba(0xdcdcddff).into()),
hidden_border: Some(rgba(0xd3d3d4ff).into()),
hint: Some(rgba(0x5c79e2ff).into()),
hint: Some(rgba(0x9295beff).into()),
hint_background: Some(rgba(0xe2e2faff).into()),
hint_border: Some(rgba(0xcbcdf6ff).into()),
ignored: Some(rgba(0x7f8188ff).into()),
@ -562,7 +562,7 @@ pub fn one() -> UserThemeFamily {
hidden: Some(rgba(0x555a63ff).into()),
hidden_background: Some(rgba(0x3b414dff).into()),
hidden_border: Some(rgba(0x414754ff).into()),
hint: Some(rgba(0x74ade8ff).into()),
hint: Some(rgba(0x5b708aff).into()),
hint_background: Some(rgba(0x18243dff).into()),
hint_border: Some(rgba(0x293c5bff).into()),
ignored: Some(rgba(0x838994ff).into()),

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

@ -111,7 +111,7 @@ pub fn rose_pine() -> UserThemeFamily {
hidden: Some(rgba(0x938fa3ff).into()),
hidden_background: Some(rgba(0xdcd8d8ff).into()),
hidden_border: Some(rgba(0xd0cccfff).into()),
hint: Some(rgba(0x57949fff).into()),
hint: Some(rgba(0x7a92aaff).into()),
hint_background: Some(rgba(0xdde9ebff).into()),
hint_border: Some(rgba(0xc3d7dbff).into()),
ignored: Some(rgba(0x706c8cff).into()),
@ -569,7 +569,7 @@ pub fn rose_pine() -> UserThemeFamily {
hidden: Some(rgba(0x615d7aff).into()),
hidden_background: Some(rgba(0x38354eff).into()),
hidden_border: Some(rgba(0x44415bff).into()),
hint: Some(rgba(0x9cced7ff).into()),
hint: Some(rgba(0x728aa2ff).into()),
hint_background: Some(rgba(0x2f3739ff).into()),
hint_border: Some(rgba(0x435255ff).into()),
ignored: Some(rgba(0x85819eff).into()),
@ -1027,7 +1027,7 @@ pub fn rose_pine() -> UserThemeFamily {
hidden: Some(rgba(0x2f2b43ff).into()),
hidden_background: Some(rgba(0x292739ff).into()),
hidden_border: Some(rgba(0x353347ff).into()),
hint: Some(rgba(0x9cced7ff).into()),
hint: Some(rgba(0x5e768cff).into()),
hint_background: Some(rgba(0x2f3739ff).into()),
hint_border: Some(rgba(0x435255ff).into()),
ignored: Some(rgba(0x75718eff).into()),

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

@ -110,7 +110,7 @@ pub fn sandcastle() -> UserThemeFamily {
hidden: Some(rgba(0x827568ff).into()),
hidden_background: Some(rgba(0x333944ff).into()),
hidden_border: Some(rgba(0x393f4aff).into()),
hint: Some(rgba(0x528b8bff).into()),
hint: Some(rgba(0x727d68ff).into()),
hint_background: Some(rgba(0x171f1fff).into()),
hint_border: Some(rgba(0x223232ff).into()),
ignored: Some(rgba(0xa69782ff).into()),

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

@ -111,7 +111,7 @@ pub fn solarized() -> UserThemeFamily {
hidden: Some(rgba(0x6a7f86ff).into()),
hidden_background: Some(rgba(0xcfd0c4ff).into()),
hidden_border: Some(rgba(0xb7bdb6ff).into()),
hint: Some(rgba(0x298bd1ff).into()),
hint: Some(rgba(0x5889a3ff).into()),
hint_background: Some(rgba(0xdbe6f6ff).into()),
hint_border: Some(rgba(0xbfd3efff).into()),
ignored: Some(rgba(0x34555eff).into()),
@ -555,7 +555,7 @@ pub fn solarized() -> UserThemeFamily {
hidden: Some(rgba(0x6f8389ff).into()),
hidden_background: Some(rgba(0x083743ff).into()),
hidden_border: Some(rgba(0x19424dff).into()),
hint: Some(rgba(0x288bd1ff).into()),
hint: Some(rgba(0x4f8297ff).into()),
hint_background: Some(rgba(0x141f2cff).into()),
hint_border: Some(rgba(0x1c3249ff).into()),
ignored: Some(rgba(0x93a1a1ff).into()),

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

@ -110,7 +110,7 @@ pub fn summercamp() -> UserThemeFamily {
hidden: Some(rgba(0x4c4735ff).into()),
hidden_background: Some(rgba(0x2a261cff).into()),
hidden_border: Some(rgba(0x2e2a1fff).into()),
hint: Some(rgba(0x499befff).into()),
hint: Some(rgba(0x246e61ff).into()),
hint_background: Some(rgba(0x0e2242ff).into()),
hint_border: Some(rgba(0x193761ff).into()),
ignored: Some(rgba(0x736e55ff).into()),

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

@ -76,6 +76,8 @@ impl Zed1ThemeConverter {
let lowest = &base_theme.lowest;
let editor = &self.theme.editor;
Ok(StatusColorsRefinement {
created: convert(lowest.positive.default.foreground),
created_background: convert(lowest.positive.default.background),
@ -95,7 +97,12 @@ impl Zed1ThemeConverter {
error: convert(lowest.negative.default.foreground),
error_background: convert(lowest.negative.default.background),
error_border: convert(lowest.negative.default.border),
hint: convert(lowest.accent.default.foreground),
// The `hint` color used in Zed1 is inlined from the syntax colors.
hint: editor
.hint
.color
.map(zed1_color_to_hsla)
.or(convert(lowest.accent.default.foreground)),
hint_background: convert(lowest.accent.default.background),
hint_border: convert(lowest.accent.default.border),
predictive: convert(lowest.positive.default.foreground),