Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Emit accurate hex colors in generated themes (#3547)

Browse source 
This PR fixes an issues where the hex colors in the generated themes
were not correct.

We're using the [`palette`](https://crates.io/crates/palette) crate to
perform the conversions, as this gives us accurate hex codes that match
the VS Code source themes.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-12-07 18:34:03 -05:00 • committed by GitHub
parent 0b78a401de
commit c7e19c0bcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 974 additions and 871 deletions
Download patch file Download diff file Expand all files Collapse all files

96
crates/theme2/src/themes/andromeda.rs
View file

@ -33,30 +33,30 @@ pub fn andromeda() -> UserThemeFamily {
element_selected: Some(rgba(0x23262eff).into()),
drop_target_background: Some(rgba(0x3a404eff).into()),
ghost_element_hover: Some(rgba(0x23262eff).into()),
text: Some(rgba(0xd4cdd8ff).into()),
text: Some(rgba(0xd5ced9ff).into()),
tab_inactive_background: Some(rgba(0x23262eff).into()),
tab_active_background: Some(rgba(0x23262eff).into()),
editor_background: Some(rgba(0x23262eff).into()),
editor_gutter_background: Some(rgba(0x23262eff).into()),
editor_line_number: Some(rgba(0x746f77ff).into()),
editor_active_line_number: Some(rgba(0xd4cdd8ff).into()),
terminal_ansi_bright_red: Some(rgba(0xee5d42ff).into()),
terminal_ansi_bright_green: Some(rgba(0x95e072ff).into()),
editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_bright_blue: Some(rgba(0x7bb7ffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff00a9ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()),
terminal_ansi_red: Some(rgba(0xee5d42ff).into()),
terminal_ansi_green: Some(rgba(0x95e072ff).into()),
terminal_ansi_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_blue: Some(rgba(0x7bb7ffff).into()),
terminal_ansi_magenta: Some(rgba(0xff00a9ff).into()),
terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_cyan: Some(rgba(0x00e8c6ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
deleted: Some(rgba(0xfc634cff).into()),
error: Some(rgba(0xfc634cff).into()),
deleted: Some(rgba(0xfc644dff).into()),
error: Some(rgba(0xfc644dff).into()),
hidden: Some(rgba(0x746f77ff).into()),
hint: Some(rgba(0x969696ff).into()),
..Default::default()
@ -66,28 +66,28 @@ pub fn andromeda() -> UserThemeFamily {
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x9fa0a6cc).into()),
color: Some(rgba(0xa0a1a7cc).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xc64dedff).into()),
color: Some(rgba(0xc74dedff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
@ -101,42 +101,42 @@ pub fn andromeda() -> UserThemeFamily {
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc64dedff).into()),
color: Some(rgba(0xc74dedff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xee5d42ff).into()),
color: Some(rgba(0xee5d43ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0xf92571ff).into()),
color: Some(rgba(0xf92672ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
@ -171,36 +171,36 @@ pub fn andromeda() -> UserThemeFamily {
border_disabled: Some(rgba(0x1b1d23ff).into()),
elevated_surface_background: Some(rgba(0x23262eff).into()),
surface_background: Some(rgba(0x23262eff).into()),
background: Some(rgba(0x262933ff).into()),
background: Some(rgba(0x262a33ff).into()),
element_background: Some(rgba(0x00e8c5cc).into()),
element_hover: Some(rgba(0x23262eff).into()),
element_selected: Some(rgba(0x23262eff).into()),
drop_target_background: Some(rgba(0x3a404eff).into()),
ghost_element_hover: Some(rgba(0x23262eff).into()),
text: Some(rgba(0xd4cdd8ff).into()),
text: Some(rgba(0xd5ced9ff).into()),
tab_inactive_background: Some(rgba(0x23262eff).into()),
tab_active_background: Some(rgba(0x262933ff).into()),
editor_background: Some(rgba(0x262933ff).into()),
editor_gutter_background: Some(rgba(0x262933ff).into()),
tab_active_background: Some(rgba(0x262a33ff).into()),
editor_background: Some(rgba(0x262a33ff).into()),
editor_gutter_background: Some(rgba(0x262a33ff).into()),
editor_line_number: Some(rgba(0x746f77ff).into()),
editor_active_line_number: Some(rgba(0xd4cdd8ff).into()),
terminal_ansi_bright_red: Some(rgba(0xee5d42ff).into()),
terminal_ansi_bright_green: Some(rgba(0x95e072ff).into()),
editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_bright_blue: Some(rgba(0x7bb7ffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff00a9ff).into()),
terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()),
terminal_ansi_red: Some(rgba(0xee5d42ff).into()),
terminal_ansi_green: Some(rgba(0x95e072ff).into()),
terminal_ansi_red: Some(rgba(0xee5d43ff).into()),
terminal_ansi_green: Some(rgba(0x96e072ff).into()),
terminal_ansi_yellow: Some(rgba(0xffe66dff).into()),
terminal_ansi_blue: Some(rgba(0x7bb7ffff).into()),
terminal_ansi_magenta: Some(rgba(0xff00a9ff).into()),
terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()),
terminal_ansi_magenta: Some(rgba(0xff00aaff).into()),
terminal_ansi_cyan: Some(rgba(0x00e8c6ff).into()),
..Default::default()
},
status: StatusColorsRefinement {
deleted: Some(rgba(0xfc634cff).into()),
error: Some(rgba(0xfc634cff).into()),
deleted: Some(rgba(0xfc644dff).into()),
error: Some(rgba(0xfc644dff).into()),
hidden: Some(rgba(0x746f77ff).into()),
hint: Some(rgba(0x969696ff).into()),
..Default::default()
@ -210,28 +210,28 @@ pub fn andromeda() -> UserThemeFamily {
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
color: Some(rgba(0x9fa0a6cc).into()),
color: Some(rgba(0xa0a1a7cc).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xc64dedff).into()),
color: Some(rgba(0xc74dedff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
@ -245,42 +245,42 @@ pub fn andromeda() -> UserThemeFamily {
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc64dedff).into()),
color: Some(rgba(0xc74dedff).into()),
..Default::default()
},
),
(
"number".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
color: Some(rgba(0xf39c12ff).into()),
..Default::default()
},
),
(
"operator".into(),
UserHighlightStyle {
color: Some(rgba(0xee5d42ff).into()),
color: Some(rgba(0xee5d43ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),
(
"tag".into(),
UserHighlightStyle {
color: Some(rgba(0xf92571ff).into()),
color: Some(rgba(0xf92672ff).into()),
..Default::default()
},
),
(
"text.literal".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
color: Some(rgba(0x96e072ff).into()),
..Default::default()
},
),