From 7078c5fbb9e1a59a3331ef63e8addcc62a7d5a47 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 7 Nov 2023 08:59:50 -0500 Subject: [PATCH] Regenerate all themes --- crates/theme2/src/themes/andromeda.rs | 80 +++-- crates/theme2/src/themes/ayu.rs | 119 ++++--- crates/theme2/src/themes/dracula.rs | 41 ++- crates/theme2/src/themes/gruvbox.rs | 236 ++++++++----- crates/theme2/src/themes/mod.rs | 68 ++-- crates/theme2/src/themes/night_owl.rs | 80 +++-- crates/theme2/src/themes/nord.rs | 41 ++- crates/theme2/src/themes/notctis.rs | 431 ++++++++++++++--------- crates/theme2/src/themes/palenight.rs | 119 ++++--- crates/theme2/src/themes/rose_pine.rs | 119 ++++--- crates/theme2/src/themes/solarized.rs | 80 +++-- crates/theme2/src/themes/synthwave_84.rs | 41 ++- 12 files changed, 885 insertions(+), 570 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 46e14a99ad2d0044467a434382b0ccd43881ff12..b0400a8c4b584999b07ce6965c0f1fa5b5c1b395 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -7,12 +7,12 @@ use crate::{ pub fn andromeda() -> ThemeFamily { ThemeFamily { - id: "192bb9a2-a028-4c9a-b713-4c92330b3fab".into(), + id: "ecd46547-a042-424d-99ca-5f56c060f798".into(), name: "Andromeda".into(), author: "Eliver Lara (EliverLara)".into(), themes: vec![ ThemeVariant { - id: "a3aaa73f-f225-41bd-8d52-77ca1df0b7f7".into(), + id: "3bfb3b6e-365a-4cd2-9a80-2d2c81434729".into(), name: "Andromeda".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn andromeda() -> ThemeFamily { border: rgba(0x1b1d23ff).into(), border_variant: rgba(0x1b1d23ff).into(), border_focused: rgba(0x1b1d23ff).into(), - border_disabled: rgba(0x1b1d23ff).into(), border_selected: rgba(0x1b1d23ff).into(), border_transparent: rgba(0x1b1d23ff).into(), + border_disabled: rgba(0x1b1d23ff).into(), elevated_surface_background: rgba(0x23262eff).into(), surface_background: rgba(0x23262eff).into(), background: rgba(0x23262eff).into(), @@ -61,8 +61,17 @@ pub fn andromeda() -> ThemeFamily { tab_inactive_background: rgba(0x23262eff).into(), tab_active_background: rgba(0x23262eff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x000000e6).into(), terminal_ansi_bright_red: rgba(0xee5d42ff).into(), @@ -104,24 +113,24 @@ pub fn andromeda() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn andromeda() -> ThemeFamily { }, }, ThemeVariant { - id: "91a17b19-1e74-487e-b0a0-56e2e5360ab8".into(), + id: "7bc92ac8-152c-46d5-b346-df68e4db2e7c".into(), name: "Andromeda Bordered".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn andromeda() -> ThemeFamily { border: rgba(0x1b1d23ff).into(), border_variant: rgba(0x1b1d23ff).into(), border_focused: rgba(0x1b1d23ff).into(), - border_disabled: rgba(0x1b1d23ff).into(), border_selected: rgba(0x1b1d23ff).into(), border_transparent: rgba(0x1b1d23ff).into(), + border_disabled: rgba(0x1b1d23ff).into(), elevated_surface_background: rgba(0x23262eff).into(), surface_background: rgba(0x23262eff).into(), background: rgba(0x262933ff).into(), @@ -219,8 +228,17 @@ pub fn andromeda() -> ThemeFamily { tab_inactive_background: rgba(0x23262eff).into(), tab_active_background: rgba(0x262933ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x000000e6).into(), terminal_ansi_bright_red: rgba(0xee5d42ff).into(), @@ -262,24 +280,24 @@ pub fn andromeda() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index 40fdb7ac15ba69c7efb76857dfe8298691860ecd..a2c054ac28db9f717b6ebba9df8518560d1b28fc 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -7,12 +7,12 @@ use crate::{ pub fn ayu() -> ThemeFamily { ThemeFamily { - id: "5ace5bd5-0231-4f26-a69f-40a96dd4163e".into(), + id: "4faecf44-837e-4034-9197-7da909668498".into(), name: "Ayu".into(), author: "dempfi (Ike Ku)".into(), themes: vec![ ThemeVariant { - id: "7781d65c-4575-421d-af3c-061ab0b0478a".into(), + id: "733aeb9b-98fd-4492-984e-d71540daf72e".into(), name: "Ayu Light".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn ayu() -> ThemeFamily { border: rgba(0x6b7d8f1f).into(), border_variant: rgba(0x6b7d8f1f).into(), border_focused: rgba(0x6b7d8f1f).into(), - border_disabled: rgba(0x6b7d8f1f).into(), border_selected: rgba(0x6b7d8f1f).into(), border_transparent: rgba(0x6b7d8f1f).into(), + border_disabled: rgba(0x6b7d8f1f).into(), elevated_surface_background: rgba(0xf8f9faff).into(), surface_background: rgba(0xf8f9faff).into(), background: rgba(0xf8f9faff).into(), @@ -61,8 +61,17 @@ pub fn ayu() -> ThemeFamily { tab_inactive_background: rgba(0xf8f9faff).into(), tab_active_background: rgba(0xf8f9faff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xf8f9faff).into(), terminal_ansi_bright_black: rgba(0x686868ff).into(), terminal_ansi_bright_red: rgba(0xef7070ff).into(), @@ -104,24 +113,24 @@ pub fn ayu() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn ayu() -> ThemeFamily { }, }, ThemeVariant { - id: "68066666-5e56-4937-9434-510ffd0fe05f".into(), + id: "50f68427-2e1d-4bf1-981a-d08c6b38e846".into(), name: "Ayu Mirage".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn ayu() -> ThemeFamily { border: rgba(0x171a24ff).into(), border_variant: rgba(0x171a24ff).into(), border_focused: rgba(0x171a24ff).into(), - border_disabled: rgba(0x171a24ff).into(), border_selected: rgba(0x171a24ff).into(), border_transparent: rgba(0x171a24ff).into(), + border_disabled: rgba(0x171a24ff).into(), elevated_surface_background: rgba(0x1f2430ff).into(), surface_background: rgba(0x1f2430ff).into(), background: rgba(0x1f2430ff).into(), @@ -219,8 +228,17 @@ pub fn ayu() -> ThemeFamily { tab_inactive_background: rgba(0x1f2430ff).into(), tab_active_background: rgba(0x1f2430ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x1f2430ff).into(), terminal_ansi_bright_black: rgba(0x686868ff).into(), terminal_ansi_bright_red: rgba(0xf18678ff).into(), @@ -262,24 +280,24 @@ pub fn ayu() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -328,7 +346,7 @@ pub fn ayu() -> ThemeFamily { }, }, ThemeVariant { - id: "d4f949b8-e5b9-4337-a52e-2ed1752a6c4f".into(), + id: "22d8dede-57da-46e1-946a-16876679b4d2".into(), name: "Ayu Dark".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -342,9 +360,9 @@ pub fn ayu() -> ThemeFamily { border: rgba(0x1e232bff).into(), border_variant: rgba(0x1e232bff).into(), border_focused: rgba(0x1e232bff).into(), - border_disabled: rgba(0x1e232bff).into(), border_selected: rgba(0x1e232bff).into(), border_transparent: rgba(0x1e232bff).into(), + border_disabled: rgba(0x1e232bff).into(), elevated_surface_background: rgba(0x0b0e14ff).into(), surface_background: rgba(0x0b0e14ff).into(), background: rgba(0x0b0e14ff).into(), @@ -377,8 +395,17 @@ pub fn ayu() -> ThemeFamily { tab_inactive_background: rgba(0x0b0e14ff).into(), tab_active_background: rgba(0x0b0e14ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x0b0e14ff).into(), terminal_ansi_bright_black: rgba(0x686868ff).into(), terminal_ansi_bright_red: rgba(0xef7077ff).into(), @@ -420,24 +447,24 @@ pub fn ayu() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index 2fae1b04f6ba0ceaeae2819c730da928ac051a87..7318057c53aef8d098621f7520ee0e8e2e4cf578 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -7,11 +7,11 @@ use crate::{ pub fn dracula() -> ThemeFamily { ThemeFamily { - id: "20b9a8c0-0b74-483b-bed2-be7a053e1321".into(), + id: "0abb0e55-f034-45d9-a84d-e880dfd65711".into(), name: "Dracula".into(), author: "Zeno Rocha".into(), themes: vec![ThemeVariant { - id: "02f5624f-9b0a-48e0-8897-4557adc8f104".into(), + id: "d20497ef-85be-4ea2-9070-a182d03aac73".into(), name: "Dracula".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -25,9 +25,9 @@ pub fn dracula() -> ThemeFamily { border: rgba(0xbd93f9ff).into(), border_variant: rgba(0xbd93f9ff).into(), border_focused: rgba(0xbd93f9ff).into(), - border_disabled: rgba(0xbd93f9ff).into(), border_selected: rgba(0xbd93f9ff).into(), border_transparent: rgba(0xbd93f9ff).into(), + border_disabled: rgba(0xbd93f9ff).into(), elevated_surface_background: rgba(0x282a35ff).into(), surface_background: rgba(0x282a35ff).into(), background: rgba(0x282a35ff).into(), @@ -60,8 +60,17 @@ pub fn dracula() -> ThemeFamily { tab_inactive_background: rgba(0x21222cff).into(), tab_active_background: rgba(0x282a35ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x282a35ff).into(), terminal_ansi_bright_black: rgba(0x6272a4ff).into(), terminal_ansi_bright_red: rgba(0xff6d6dff).into(), @@ -103,24 +112,24 @@ pub fn dracula() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index db5849718771d836cccd3f0230937b2e15176696..756a0b658be61dfaec2241dc3ce103f5a1d27082 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -7,12 +7,12 @@ use crate::{ pub fn gruvbox() -> ThemeFamily { ThemeFamily { - id: "c0b7f0e7-f261-4a33-a2bf-baf2e140aac4".into(), + id: "000a3e50-ccf1-430d-84e4-910583bd1064".into(), name: "Gruvbox".into(), author: "morhetz".into(), themes: vec![ ThemeVariant { - id: "fb9f8f64-372b-4fda-8dbd-d610c97a9691".into(), + id: "0db938b2-2267-453b-af84-f82c5f3400e7".into(), name: "Gruvbox Dark Hard".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn gruvbox() -> ThemeFamily { border: rgba(0x3c3836ff).into(), border_variant: rgba(0x3c3836ff).into(), border_focused: rgba(0x3c3836ff).into(), - border_disabled: rgba(0x3c3836ff).into(), border_selected: rgba(0x3c3836ff).into(), border_transparent: rgba(0x3c3836ff).into(), + border_disabled: rgba(0x3c3836ff).into(), elevated_surface_background: rgba(0x18191bff).into(), surface_background: rgba(0x18191bff).into(), background: rgba(0x1d2021ff).into(), @@ -61,8 +61,17 @@ pub fn gruvbox() -> ThemeFamily { tab_inactive_background: rgba(0x1d2021ff).into(), tab_active_background: rgba(0x32302fff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x1d2021ff).into(), terminal_ansi_bright_black: rgba(0x928374ff).into(), terminal_ansi_bright_red: rgba(0xfb4833ff).into(), @@ -104,24 +113,24 @@ pub fn gruvbox() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn gruvbox() -> ThemeFamily { }, }, ThemeVariant { - id: "72f0ea45-33bc-49d8-9f52-87540f858fb4".into(), + id: "8e1a1896-ed0f-40be-b127-6c389eacc9f1".into(), name: "Gruvbox Dark Medium".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn gruvbox() -> ThemeFamily { border: rgba(0x3c3836ff).into(), border_variant: rgba(0x3c3836ff).into(), border_focused: rgba(0x3c3836ff).into(), - border_disabled: rgba(0x3c3836ff).into(), border_selected: rgba(0x3c3836ff).into(), border_transparent: rgba(0x3c3836ff).into(), + border_disabled: rgba(0x3c3836ff).into(), elevated_surface_background: rgba(0x18191bff).into(), surface_background: rgba(0x18191bff).into(), background: rgba(0x282828ff).into(), @@ -219,8 +228,17 @@ pub fn gruvbox() -> ThemeFamily { tab_inactive_background: rgba(0x282828ff).into(), tab_active_background: rgba(0x3c3836ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x282828ff).into(), terminal_ansi_bright_black: rgba(0x928374ff).into(), terminal_ansi_bright_red: rgba(0xfb4833ff).into(), @@ -262,24 +280,24 @@ pub fn gruvbox() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -328,7 +346,7 @@ pub fn gruvbox() -> ThemeFamily { }, }, ThemeVariant { - id: "5ea1cdf8-6ed0-4e54-b44a-14c6634701cf".into(), + id: "94410e6f-f4c4-4669-bb4d-5a20b4e4b1f3".into(), name: "Gruvbox Dark Soft".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -342,9 +360,9 @@ pub fn gruvbox() -> ThemeFamily { border: rgba(0x3c3836ff).into(), border_variant: rgba(0x3c3836ff).into(), border_focused: rgba(0x3c3836ff).into(), - border_disabled: rgba(0x3c3836ff).into(), border_selected: rgba(0x3c3836ff).into(), border_transparent: rgba(0x3c3836ff).into(), + border_disabled: rgba(0x3c3836ff).into(), elevated_surface_background: rgba(0x18191bff).into(), surface_background: rgba(0x18191bff).into(), background: rgba(0x32302fff).into(), @@ -377,8 +395,17 @@ pub fn gruvbox() -> ThemeFamily { tab_inactive_background: rgba(0x32302fff).into(), tab_active_background: rgba(0x504945ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x32302fff).into(), terminal_ansi_bright_black: rgba(0x928374ff).into(), terminal_ansi_bright_red: rgba(0xfb4833ff).into(), @@ -420,24 +447,24 @@ pub fn gruvbox() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -486,7 +513,7 @@ pub fn gruvbox() -> ThemeFamily { }, }, ThemeVariant { - id: "b0c9082f-00c8-4a02-a4de-9fd7af97c7f2".into(), + id: "e4a58582-478a-4934-ad73-135e23a0d66e".into(), name: "Gruvbox Light Hard".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -500,9 +527,9 @@ pub fn gruvbox() -> ThemeFamily { border: rgba(0xebdbb2ff).into(), border_variant: rgba(0xebdbb2ff).into(), border_focused: rgba(0xebdbb2ff).into(), - border_disabled: rgba(0xebdbb2ff).into(), border_selected: rgba(0xebdbb2ff).into(), border_transparent: rgba(0xebdbb2ff).into(), + border_disabled: rgba(0xebdbb2ff).into(), elevated_surface_background: rgba(0xf9f9fbff).into(), surface_background: rgba(0xf9f9fbff).into(), background: rgba(0xf9f5d7ff).into(), @@ -535,8 +562,17 @@ pub fn gruvbox() -> ThemeFamily { tab_inactive_background: rgba(0xf9f5d7ff).into(), tab_active_background: rgba(0xf2e5bcff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xf9f5d7ff).into(), terminal_ansi_bright_black: rgba(0x928374ff).into(), terminal_ansi_bright_red: rgba(0x9d0006ff).into(), @@ -578,24 +614,24 @@ pub fn gruvbox() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -644,7 +680,7 @@ pub fn gruvbox() -> ThemeFamily { }, }, ThemeVariant { - id: "172c281c-ff0a-496e-8794-880e2fc3aa49".into(), + id: "0e875280-93fa-4c76-8874-f858c7d985c1".into(), name: "Gruvbox Light Medium".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -658,9 +694,9 @@ pub fn gruvbox() -> ThemeFamily { border: rgba(0xebdbb2ff).into(), border_variant: rgba(0xebdbb2ff).into(), border_focused: rgba(0xebdbb2ff).into(), - border_disabled: rgba(0xebdbb2ff).into(), border_selected: rgba(0xebdbb2ff).into(), border_transparent: rgba(0xebdbb2ff).into(), + border_disabled: rgba(0xebdbb2ff).into(), elevated_surface_background: rgba(0xf9f9fbff).into(), surface_background: rgba(0xf9f9fbff).into(), background: rgba(0xfbf1c7ff).into(), @@ -693,8 +729,17 @@ pub fn gruvbox() -> ThemeFamily { tab_inactive_background: rgba(0xfbf1c7ff).into(), tab_active_background: rgba(0xebdbb2ff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xfbf1c7ff).into(), terminal_ansi_bright_black: rgba(0x928374ff).into(), terminal_ansi_bright_red: rgba(0x9d0006ff).into(), @@ -736,24 +781,24 @@ pub fn gruvbox() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -802,7 +847,7 @@ pub fn gruvbox() -> ThemeFamily { }, }, ThemeVariant { - id: "b94f3305-b755-44f2-948c-cfd8c9d3158f".into(), + id: "914dbe6f-bc0f-4e6f-8d8c-5f4cabc1ca2d".into(), name: "Gruvbox Light Soft".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -816,9 +861,9 @@ pub fn gruvbox() -> ThemeFamily { border: rgba(0xebdbb2ff).into(), border_variant: rgba(0xebdbb2ff).into(), border_focused: rgba(0xebdbb2ff).into(), - border_disabled: rgba(0xebdbb2ff).into(), border_selected: rgba(0xebdbb2ff).into(), border_transparent: rgba(0xebdbb2ff).into(), + border_disabled: rgba(0xebdbb2ff).into(), elevated_surface_background: rgba(0xf9f9fbff).into(), surface_background: rgba(0xf9f9fbff).into(), background: rgba(0xf2e5bcff).into(), @@ -851,8 +896,17 @@ pub fn gruvbox() -> ThemeFamily { tab_inactive_background: rgba(0xf2e5bcff).into(), tab_active_background: rgba(0xd5c4a1ff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xf2e5bcff).into(), terminal_ansi_bright_black: rgba(0x928374ff).into(), terminal_ansi_bright_red: rgba(0x9d0006ff).into(), @@ -894,24 +948,24 @@ pub fn gruvbox() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/mod.rs b/crates/theme2/src/themes/mod.rs index 86fe9f9bb3e2a7f60bf1c3ea330a9c1cd226a067..2a00b497852e19da19d3fcadea1a1ab1dac2649e 100644 --- a/crates/theme2/src/themes/mod.rs +++ b/crates/theme2/src/themes/mod.rs @@ -1,41 +1,41 @@ -// mod andromeda; -// mod ayu; -// mod dracula; -// mod gruvbox; -// mod night_owl; -// mod nord; -// mod notctis; -// mod palenight; -// mod rose_pine; -// mod solarized; -// mod synthwave_84; +mod andromeda; +mod ayu; +mod dracula; +mod gruvbox; +mod night_owl; +mod nord; +mod notctis; +mod palenight; +mod rose_pine; +mod solarized; +mod synthwave_84; -// pub use andromeda::*; -// pub use ayu::*; -// pub use dracula::*; -// pub use gruvbox::*; -// pub use night_owl::*; -// pub use nord::*; -// pub use notctis::*; -// pub use palenight::*; -// pub use rose_pine::*; -// pub use solarized::*; -// pub use synthwave_84::*; +pub use andromeda::*; +pub use ayu::*; +pub use dracula::*; +pub use gruvbox::*; +pub use night_owl::*; +pub use nord::*; +pub use notctis::*; +pub use palenight::*; +pub use rose_pine::*; +pub use solarized::*; +pub use synthwave_84::*; use crate::ThemeFamily; -pub fn all_imported_themes() -> Vec { +pub(crate) fn all_imported_themes() -> Vec { vec![ - // rose_pine(), - // night_owl(), - // andromeda(), - // synthwave_84(), - // palenight(), - // dracula(), - // solarized(), - // nord(), - // notctis(), - // ayu(), - // gruvbox(), + rose_pine(), + night_owl(), + andromeda(), + synthwave_84(), + palenight(), + dracula(), + solarized(), + nord(), + notctis(), + ayu(), + gruvbox(), ] } diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs index d4418ac3dc7d72fc6df6c494e822b3a2071245aa..ed727127bdee22a1d3cd6162f0bbcfe58e331bb5 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -7,12 +7,12 @@ use crate::{ pub fn night_owl() -> ThemeFamily { ThemeFamily { - id: "b6469599-df68-4604-be9d-44f63d877d53".into(), + id: "19498197-1091-409d-b37a-a282998e5c31".into(), name: "Night Owl".into(), author: "Sarah Drasner (sdras)".into(), themes: vec![ ThemeVariant { - id: "2a04e5fa-e266-475b-b965-3d92efe77ad9".into(), + id: "e5de91ed-fc95-46fb-a60b-ebd0602d04c7".into(), name: "Night Owl".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn night_owl() -> ThemeFamily { border: rgba(0x5f7e97ff).into(), border_variant: rgba(0x5f7e97ff).into(), border_focused: rgba(0x5f7e97ff).into(), - border_disabled: rgba(0x5f7e97ff).into(), border_selected: rgba(0x5f7e97ff).into(), border_transparent: rgba(0x5f7e97ff).into(), + border_disabled: rgba(0x5f7e97ff).into(), elevated_surface_background: rgba(0x011526ff).into(), surface_background: rgba(0x011526ff).into(), background: rgba(0x011526ff).into(), @@ -61,8 +61,17 @@ pub fn night_owl() -> ThemeFamily { tab_inactive_background: rgba(0x01101cff).into(), tab_active_background: rgba(0x0a2842ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x575656ff).into(), terminal_ansi_bright_red: rgba(0xef524fff).into(), @@ -104,24 +113,24 @@ pub fn night_owl() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn night_owl() -> ThemeFamily { }, }, ThemeVariant { - id: "91901d29-1c1f-49ef-ac69-c25639425f7c".into(), + id: "998fc053-40c1-4a32-a31f-a17c9c07949a".into(), name: "Night Owl Light".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn night_owl() -> ThemeFamily { border: rgba(0xd9d9d9ff).into(), border_variant: rgba(0xd9d9d9ff).into(), border_focused: rgba(0xd9d9d9ff).into(), - border_disabled: rgba(0xd9d9d9ff).into(), border_selected: rgba(0xd9d9d9ff).into(), border_transparent: rgba(0xd9d9d9ff).into(), + border_disabled: rgba(0xd9d9d9ff).into(), elevated_surface_background: rgba(0xf0f0f0ff).into(), surface_background: rgba(0xf0f0f0ff).into(), background: rgba(0xfbfbfbff).into(), @@ -219,8 +228,17 @@ pub fn night_owl() -> ThemeFamily { tab_inactive_background: rgba(0xf0f0f0ff).into(), tab_active_background: rgba(0xf6f6f6ff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xf6f6f6ff).into(), terminal_ansi_bright_black: rgba(0x403f53ff).into(), terminal_ansi_bright_red: rgba(0xde3c3aff).into(), @@ -262,24 +280,24 @@ pub fn night_owl() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index 953ee1d0da5617de5948e061bb316c34d47c8e0d..25e6da2c5e8440b9cbc5a3b4ce8d5d32f1184f3c 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -7,11 +7,11 @@ use crate::{ pub fn nord() -> ThemeFamily { ThemeFamily { - id: "dcd03133-f540-47e7-9360-91bb1c94d16e".into(), + id: "3295b94b-731f-41a8-8d5e-ad02638f8e0d".into(), name: "Nord".into(), author: "Sven Greb (svengreb)".into(), themes: vec![ThemeVariant { - id: "ed7e8c08-321a-41f0-bd22-ca92c0b42e0e".into(), + id: "dfdfd9f6-bc57-46dd-b919-42b18df35bdd".into(), name: "Nord".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -25,9 +25,9 @@ pub fn nord() -> ThemeFamily { border: rgba(0x3b4252ff).into(), border_variant: rgba(0x3b4252ff).into(), border_focused: rgba(0x3b4252ff).into(), - border_disabled: rgba(0x3b4252ff).into(), border_selected: rgba(0x3b4252ff).into(), border_transparent: rgba(0x3b4252ff).into(), + border_disabled: rgba(0x3b4252ff).into(), elevated_surface_background: rgba(0x2e3440ff).into(), surface_background: rgba(0x2e3440ff).into(), background: rgba(0x2e3440ff).into(), @@ -60,8 +60,17 @@ pub fn nord() -> ThemeFamily { tab_inactive_background: rgba(0x2e3440ff).into(), tab_active_background: rgba(0x3b4252ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x2e3440ff).into(), terminal_ansi_bright_black: rgba(0x4c566aff).into(), terminal_ansi_bright_red: rgba(0xbf616aff).into(), @@ -103,24 +112,24 @@ pub fn nord() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/notctis.rs b/crates/theme2/src/themes/notctis.rs index d11463ea42ea278efd446540bf438c55203a3791..70c57bac57bd2cb9144bf33c32f07ba8a1cf2ac6 100644 --- a/crates/theme2/src/themes/notctis.rs +++ b/crates/theme2/src/themes/notctis.rs @@ -7,12 +7,12 @@ use crate::{ pub fn notctis() -> ThemeFamily { ThemeFamily { - id: "077650e4-c11f-4cb5-96ec-73bc74923e95".into(), + id: "7fbf6904-517c-42e1-8eb3-a64b1e9218b9".into(), name: "Notctis".into(), author: "Liviu Schera (liviuschera)".into(), themes: vec![ ThemeVariant { - id: "47135df9-e9b5-480c-a71b-c85052b8ff93".into(), + id: "2dc5fee8-30ff-4a50-bfae-c13bd19c9f89".into(), name: "Noctis Azureus".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x1579b6ff).into(), border_variant: rgba(0x1579b6ff).into(), border_focused: rgba(0x1579b6ff).into(), - border_disabled: rgba(0x1579b6ff).into(), border_selected: rgba(0x1579b6ff).into(), border_transparent: rgba(0x1579b6ff).into(), + border_disabled: rgba(0x1579b6ff).into(), elevated_surface_background: rgba(0x051b28ff).into(), surface_background: rgba(0x051b28ff).into(), background: rgba(0x07263aff).into(), @@ -61,8 +61,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x08324eff).into(), tab_active_background: rgba(0x07263aff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x051b28ff).into(), terminal_ansi_bright_black: rgba(0x475e6cff).into(), terminal_ansi_bright_red: rgba(0xe97749ff).into(), @@ -104,24 +113,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "5a3842b1-2273-47ce-ab82-4179842362b1".into(), + id: "ba4f5a34-987a-4e2c-939c-7f1b02d0e432".into(), name: "Noctis Bordo".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x997582ff).into(), border_variant: rgba(0x997582ff).into(), border_focused: rgba(0x997582ff).into(), - border_disabled: rgba(0x997582ff).into(), border_selected: rgba(0x997582ff).into(), border_transparent: rgba(0x997582ff).into(), + border_disabled: rgba(0x997582ff).into(), elevated_surface_background: rgba(0x272022ff).into(), surface_background: rgba(0x272022ff).into(), background: rgba(0x322a2dff).into(), @@ -219,8 +228,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x413036ff).into(), tab_active_background: rgba(0x322a2dff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x272022ff).into(), terminal_ansi_bright_black: rgba(0x69545bff).into(), terminal_ansi_bright_red: rgba(0xe97749ff).into(), @@ -262,24 +280,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -328,7 +346,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "a83c02b3-23f3-496b-8644-57df3314601e".into(), + id: "a2e4f327-82e8-41c1-a66f-bc7f27419c2e".into(), name: "Noctus Hibernus".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -342,9 +360,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x00c6e0ff).into(), border_variant: rgba(0x00c6e0ff).into(), border_focused: rgba(0x00c6e0ff).into(), - border_disabled: rgba(0x00c6e0ff).into(), border_selected: rgba(0x00c6e0ff).into(), border_transparent: rgba(0x00c6e0ff).into(), + border_disabled: rgba(0x00c6e0ff).into(), elevated_surface_background: rgba(0xe1eeefff).into(), surface_background: rgba(0xe1eeefff).into(), background: rgba(0xf4f6f6ff).into(), @@ -377,8 +395,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0xcaedf2ff).into(), tab_active_background: rgba(0xf4f6f6ff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xe1eeefff).into(), terminal_ansi_bright_black: rgba(0x004d57ff).into(), terminal_ansi_bright_red: rgba(0xff3f00ff).into(), @@ -420,24 +447,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -486,7 +513,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "bda85aea-2260-455a-959a-c03b0a62b8f4".into(), + id: "2fde44fb-e5b2-4cc2-962f-f1c77a4eb12a".into(), name: "Noctis Lilac".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -500,9 +527,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0xaea4f4ff).into(), border_variant: rgba(0xaea4f4ff).into(), border_focused: rgba(0xaea4f4ff).into(), - border_disabled: rgba(0xaea4f4ff).into(), border_selected: rgba(0xaea4f4ff).into(), border_transparent: rgba(0xaea4f4ff).into(), + border_disabled: rgba(0xaea4f4ff).into(), elevated_surface_background: rgba(0xe9e7f3ff).into(), surface_background: rgba(0xe9e7f3ff).into(), background: rgba(0xf2f1f8ff).into(), @@ -535,8 +562,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0xe2dff6ff).into(), tab_active_background: rgba(0xf2f1f8ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0xe9e7f3ff).into(), terminal_ansi_bright_black: rgba(0x0f0080ff).into(), terminal_ansi_bright_red: rgba(0xff3f00ff).into(), @@ -578,24 +614,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -644,7 +680,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "7720f487-6b09-4bb6-9add-272b030c013f".into(), + id: "2b89f218-c238-4905-9578-674d6995d2e0".into(), name: "Noctis Lux".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -658,9 +694,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x00c6e0ff).into(), border_variant: rgba(0x00c6e0ff).into(), border_focused: rgba(0x00c6e0ff).into(), - border_disabled: rgba(0x00c6e0ff).into(), border_selected: rgba(0x00c6e0ff).into(), border_transparent: rgba(0x00c6e0ff).into(), + border_disabled: rgba(0x00c6e0ff).into(), elevated_surface_background: rgba(0xf6eddaff).into(), surface_background: rgba(0xf6eddaff).into(), background: rgba(0xfef8ecff).into(), @@ -693,8 +729,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0xf0e9d6ff).into(), tab_active_background: rgba(0xfef8ecff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xf6eddaff).into(), terminal_ansi_bright_black: rgba(0x004d57ff).into(), terminal_ansi_bright_red: rgba(0xff3f00ff).into(), @@ -736,24 +781,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -802,7 +847,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "51dfe842-b4e2-4d95-a306-8e579a3bb51c".into(), + id: "f88e2cd7-2415-4118-a638-5cfd3132ecf8".into(), name: "Noctis Minimus".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -816,9 +861,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x496c83ff).into(), border_variant: rgba(0x496c83ff).into(), border_focused: rgba(0x496c83ff).into(), - border_disabled: rgba(0x496c83ff).into(), border_selected: rgba(0x496c83ff).into(), border_transparent: rgba(0x496c83ff).into(), + border_disabled: rgba(0x496c83ff).into(), elevated_surface_background: rgba(0x0e1920ff).into(), surface_background: rgba(0x0e1920ff).into(), background: rgba(0x1b2932ff).into(), @@ -851,8 +896,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x202d37ff).into(), tab_active_background: rgba(0x1b2932ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x0e1920ff).into(), terminal_ansi_bright_black: rgba(0x425866ff).into(), terminal_ansi_bright_red: rgba(0xca8468ff).into(), @@ -894,24 +948,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -960,7 +1014,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "75a67a53-afbe-4073-a7c0-85a40b56c2cc".into(), + id: "c4d43fc2-6166-47b7-8c5c-dd24afd4b735".into(), name: "Noctis".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -974,9 +1028,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x0d6571ff).into(), border_variant: rgba(0x0d6571ff).into(), border_focused: rgba(0x0d6571ff).into(), - border_disabled: rgba(0x0d6571ff).into(), border_selected: rgba(0x0d6571ff).into(), border_transparent: rgba(0x0d6571ff).into(), + border_disabled: rgba(0x0d6571ff).into(), elevated_surface_background: rgba(0x03181aff).into(), surface_background: rgba(0x03181aff).into(), background: rgba(0x052428ff).into(), @@ -1009,8 +1063,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x052e32ff).into(), tab_active_background: rgba(0x052428ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x03181aff).into(), terminal_ansi_bright_black: rgba(0x47686cff).into(), terminal_ansi_bright_red: rgba(0xe97749ff).into(), @@ -1052,24 +1115,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -1118,7 +1181,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "0202afff-5703-473b-b6b6-e86ac3a70718".into(), + id: "7253a515-c612-403c-89de-5b62dc5cbac7".into(), name: "Noctis Obscuro".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -1132,9 +1195,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x0d6571ff).into(), border_variant: rgba(0x0d6571ff).into(), border_focused: rgba(0x0d6571ff).into(), - border_disabled: rgba(0x0d6571ff).into(), border_selected: rgba(0x0d6571ff).into(), border_transparent: rgba(0x0d6571ff).into(), + border_disabled: rgba(0x0d6571ff).into(), elevated_surface_background: rgba(0x020c0eff).into(), surface_background: rgba(0x020c0eff).into(), background: rgba(0x031316ff).into(), @@ -1167,8 +1230,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x052e32ff).into(), tab_active_background: rgba(0x031316ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x020c0eff).into(), terminal_ansi_bright_black: rgba(0x47686cff).into(), terminal_ansi_bright_red: rgba(0xe97749ff).into(), @@ -1210,24 +1282,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -1276,7 +1348,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "213fd750-27ad-4762-8891-08282ed316c7".into(), + id: "b0f2d7b8-ac5f-466f-9bbf-e7cac242149c".into(), name: "Noctis Sereno".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -1290,9 +1362,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x0d6571ff).into(), border_variant: rgba(0x0d6571ff).into(), border_focused: rgba(0x0d6571ff).into(), - border_disabled: rgba(0x0d6571ff).into(), border_selected: rgba(0x0d6571ff).into(), border_transparent: rgba(0x0d6571ff).into(), + border_disabled: rgba(0x0d6571ff).into(), elevated_surface_background: rgba(0x020c0eff).into(), surface_background: rgba(0x020c0eff).into(), background: rgba(0x031316ff).into(), @@ -1325,8 +1397,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x052e32ff).into(), tab_active_background: rgba(0x031316ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x020c0eff).into(), terminal_ansi_bright_black: rgba(0x47686cff).into(), terminal_ansi_bright_red: rgba(0xe97749ff).into(), @@ -1368,24 +1449,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -1434,7 +1515,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "0cc2c841-1c01-40a7-8396-1234dd077ede".into(), + id: "331ce3fd-8faf-4a46-ad89-2c678abc4cd3".into(), name: "Noctis Uva".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -1448,9 +1529,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x6d66a7ff).into(), border_variant: rgba(0x6d66a7ff).into(), border_focused: rgba(0x6d66a7ff).into(), - border_disabled: rgba(0x6d66a7ff).into(), border_selected: rgba(0x6d66a7ff).into(), border_transparent: rgba(0x6d66a7ff).into(), + border_disabled: rgba(0x6d66a7ff).into(), elevated_surface_background: rgba(0x1f1d30ff).into(), surface_background: rgba(0x1f1d30ff).into(), background: rgba(0x292640ff).into(), @@ -1483,8 +1564,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x2f2c49ff).into(), tab_active_background: rgba(0x292640ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x1f1d30ff).into(), terminal_ansi_bright_black: rgba(0x504e65ff).into(), terminal_ansi_bright_red: rgba(0xe97749ff).into(), @@ -1526,24 +1616,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -1592,7 +1682,7 @@ pub fn notctis() -> ThemeFamily { }, }, ThemeVariant { - id: "090a97c7-ad25-4a35-96e6-2fce5e471e6b".into(), + id: "209964f1-6a61-4e40-a605-be245555c493".into(), name: "Noctis Viola".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -1606,9 +1696,9 @@ pub fn notctis() -> ThemeFamily { border: rgba(0x8666a7ff).into(), border_variant: rgba(0x8666a7ff).into(), border_focused: rgba(0x8666a7ff).into(), - border_disabled: rgba(0x8666a7ff).into(), border_selected: rgba(0x8666a7ff).into(), border_transparent: rgba(0x8666a7ff).into(), + border_disabled: rgba(0x8666a7ff).into(), elevated_surface_background: rgba(0x291d35ff).into(), surface_background: rgba(0x291d35ff).into(), background: rgba(0x30243dff).into(), @@ -1641,8 +1731,17 @@ pub fn notctis() -> ThemeFamily { tab_inactive_background: rgba(0x3d2e4dff).into(), tab_active_background: rgba(0x30243dff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x291d35ff).into(), terminal_ansi_bright_black: rgba(0x594e65ff).into(), terminal_ansi_bright_red: rgba(0xe97749ff).into(), @@ -1684,24 +1783,24 @@ pub fn notctis() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index 836ec680cdf349d563aa5745122947d6fab26b5a..8ad0a86eb86dd156d40fdeab8f114ee523d89917 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -7,12 +7,12 @@ use crate::{ pub fn palenight() -> ThemeFamily { ThemeFamily { - id: "3187cd2f-29da-4bde-9621-83016df3b393".into(), + id: "16313d66-dab6-468a-82f6-e69759fdd8cf".into(), name: "Palenight".into(), author: "Olaolu Olawuyi (whizkydee)".into(), themes: vec![ ThemeVariant { - id: "0eaa3098-3aa2-4b8e-b1df-92d9ebd9a0b8".into(), + id: "39fdf216-2c76-4b3d-b368-7c31f479d524".into(), name: "Palenight".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn palenight() -> ThemeFamily { border: rgba(0x282b3bff).into(), border_variant: rgba(0x282b3bff).into(), border_focused: rgba(0x282b3bff).into(), - border_disabled: rgba(0x282b3bff).into(), border_selected: rgba(0x282b3bff).into(), border_transparent: rgba(0x282b3bff).into(), + border_disabled: rgba(0x282b3bff).into(), elevated_surface_background: rgba(0x292c3eff).into(), surface_background: rgba(0x292c3eff).into(), background: rgba(0x292c3eff).into(), @@ -61,8 +61,17 @@ pub fn palenight() -> ThemeFamily { tab_inactive_background: rgba(0x31364aff).into(), tab_active_background: rgba(0x292c3eff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x676e95ff).into(), terminal_ansi_bright_red: rgba(0xff5571ff).into(), @@ -104,24 +113,24 @@ pub fn palenight() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn palenight() -> ThemeFamily { }, }, ThemeVariant { - id: "b6a27c72-c5b1-431b-8bfe-29e33dbcb337".into(), + id: "5ff8120f-37e9-4ad3-8bd0-c3e449ff1aa1".into(), name: "Palenight Operator".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn palenight() -> ThemeFamily { border: rgba(0x282b3bff).into(), border_variant: rgba(0x282b3bff).into(), border_focused: rgba(0x282b3bff).into(), - border_disabled: rgba(0x282b3bff).into(), border_selected: rgba(0x282b3bff).into(), border_transparent: rgba(0x282b3bff).into(), + border_disabled: rgba(0x282b3bff).into(), elevated_surface_background: rgba(0x292c3eff).into(), surface_background: rgba(0x292c3eff).into(), background: rgba(0x292c3eff).into(), @@ -219,8 +228,17 @@ pub fn palenight() -> ThemeFamily { tab_inactive_background: rgba(0x31364aff).into(), tab_active_background: rgba(0x292c3eff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x676e95ff).into(), terminal_ansi_bright_red: rgba(0xff5571ff).into(), @@ -262,24 +280,24 @@ pub fn palenight() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -328,7 +346,7 @@ pub fn palenight() -> ThemeFamily { }, }, ThemeVariant { - id: "4015bf85-061c-45ff-81ba-a31f017aac83".into(), + id: "cff26efb-72f8-4496-b33b-991080a47f1c".into(), name: "Palenight (Mild Contrast)".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -342,9 +360,9 @@ pub fn palenight() -> ThemeFamily { border: rgba(0x2c2f40ff).into(), border_variant: rgba(0x2c2f40ff).into(), border_focused: rgba(0x2c2f40ff).into(), - border_disabled: rgba(0x2c2f40ff).into(), border_selected: rgba(0x2c2f40ff).into(), border_transparent: rgba(0x2c2f40ff).into(), + border_disabled: rgba(0x2c2f40ff).into(), elevated_surface_background: rgba(0x25283aff).into(), surface_background: rgba(0x25283aff).into(), background: rgba(0x292c3eff).into(), @@ -377,8 +395,17 @@ pub fn palenight() -> ThemeFamily { tab_inactive_background: rgba(0x31364aff).into(), tab_active_background: rgba(0x25283aff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x676e95ff).into(), terminal_ansi_bright_red: rgba(0xff5571ff).into(), @@ -420,24 +447,24 @@ pub fn palenight() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index b367d6196b347c2e7dfe5a05e410262a4ae84310..d022d645cf3798259877d648021446bc3cdb9d9c 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -7,12 +7,12 @@ use crate::{ pub fn rose_pine() -> ThemeFamily { ThemeFamily { - id: "48c308b9-7dbe-4a52-b935-0b44d9dac00d".into(), + id: "9cf70eba-1185-4f3e-adb7-74f61c45c9dc".into(), name: "Rose Pine".into(), author: "Rosé Pine".into(), themes: vec![ ThemeVariant { - id: "c2832e85-20cb-4a13-924f-026e68123068".into(), + id: "80a8f5dd-2ab5-4ee7-9b25-a60c8513234e".into(), name: "Rose Pine".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn rose_pine() -> ThemeFamily { border: rgba(0x000000ff).into(), border_variant: rgba(0x000000ff).into(), border_focused: rgba(0x000000ff).into(), - border_disabled: rgba(0x000000ff).into(), border_selected: rgba(0x000000ff).into(), border_transparent: rgba(0x000000ff).into(), + border_disabled: rgba(0x000000ff).into(), elevated_surface_background: rgba(0x1f1d2eff).into(), surface_background: rgba(0x1f1d2eff).into(), background: rgba(0x191724ff).into(), @@ -61,8 +61,17 @@ pub fn rose_pine() -> ThemeFamily { tab_inactive_background: rgba(0x000000ff).into(), tab_active_background: rgba(0x6e6a861a).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x908caaff).into(), terminal_ansi_bright_red: rgba(0xeb6f92ff).into(), @@ -104,24 +113,24 @@ pub fn rose_pine() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn rose_pine() -> ThemeFamily { }, }, ThemeVariant { - id: "3f6c3263-86f4-4a0e-92a6-144984aa2d38".into(), + id: "fe9e3c9e-954e-4f8e-849e-451ba5f6ceca".into(), name: "Rose Moon".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn rose_pine() -> ThemeFamily { border: rgba(0x000000ff).into(), border_variant: rgba(0x000000ff).into(), border_focused: rgba(0x000000ff).into(), - border_disabled: rgba(0x000000ff).into(), border_selected: rgba(0x000000ff).into(), border_transparent: rgba(0x000000ff).into(), + border_disabled: rgba(0x000000ff).into(), elevated_surface_background: rgba(0x2a273eff).into(), surface_background: rgba(0x2a273eff).into(), background: rgba(0x232136ff).into(), @@ -219,8 +228,17 @@ pub fn rose_pine() -> ThemeFamily { tab_inactive_background: rgba(0x000000ff).into(), tab_active_background: rgba(0x817c9c14).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x908caaff).into(), terminal_ansi_bright_red: rgba(0xeb6f92ff).into(), @@ -262,24 +280,24 @@ pub fn rose_pine() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -328,7 +346,7 @@ pub fn rose_pine() -> ThemeFamily { }, }, ThemeVariant { - id: "d171cda6-de3b-4528-8559-cd8fb71b2e7c".into(), + id: "00cc7f69-9658-443e-b643-1c8dbffa047d".into(), name: "Rose Pine Dawn".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -342,9 +360,9 @@ pub fn rose_pine() -> ThemeFamily { border: rgba(0x000000ff).into(), border_variant: rgba(0x000000ff).into(), border_focused: rgba(0x000000ff).into(), - border_disabled: rgba(0x000000ff).into(), border_selected: rgba(0x000000ff).into(), border_transparent: rgba(0x000000ff).into(), + border_disabled: rgba(0x000000ff).into(), elevated_surface_background: rgba(0xfffaf3ff).into(), surface_background: rgba(0xfffaf3ff).into(), background: rgba(0xfaf4edff).into(), @@ -377,8 +395,17 @@ pub fn rose_pine() -> ThemeFamily { tab_inactive_background: rgba(0x000000ff).into(), tab_active_background: rgba(0x6e6a860d).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xfcfcfdff).into(), terminal_ansi_bright_black: rgba(0x797593ff).into(), terminal_ansi_bright_red: rgba(0xb3627aff).into(), @@ -420,24 +447,24 @@ pub fn rose_pine() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index d160cfa6524dda6a2deadce08f15032660f2ff0e..cca669479a406c02ceefeedd187e0416e7290fae 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -7,12 +7,12 @@ use crate::{ pub fn solarized() -> ThemeFamily { ThemeFamily { - id: "9a6f18c9-520f-46ec-9bfb-a7ee73508139".into(), + id: "96299b3e-c749-478c-bfc9-c96cdaea8630".into(), name: "Solarized".into(), author: "Ethan Schoonover (altercation)".into(), themes: vec![ ThemeVariant { - id: "74003db2-7f9a-4d26-8815-020c796bb551".into(), + id: "265f93c5-c8e7-4962-b083-8550f4b5c2ff".into(), name: "Solarized Dark".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -26,9 +26,9 @@ pub fn solarized() -> ThemeFamily { border: rgba(0x003847ff).into(), border_variant: rgba(0x003847ff).into(), border_focused: rgba(0x003847ff).into(), - border_disabled: rgba(0x003847ff).into(), border_selected: rgba(0x003847ff).into(), border_transparent: rgba(0x003847ff).into(), + border_disabled: rgba(0x003847ff).into(), elevated_surface_background: rgba(0x18191bff).into(), surface_background: rgba(0x18191bff).into(), background: rgba(0x002a35ff).into(), @@ -61,8 +61,17 @@ pub fn solarized() -> ThemeFamily { tab_inactive_background: rgba(0x003f51ff).into(), tab_active_background: rgba(0x002a36ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x586e75ff).into(), terminal_ansi_bright_red: rgba(0xcb4b15ff).into(), @@ -104,24 +113,24 @@ pub fn solarized() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { @@ -170,7 +179,7 @@ pub fn solarized() -> ThemeFamily { }, }, ThemeVariant { - id: "43be149b-2604-4eb2-a9ce-c8f902ab3bb3".into(), + id: "40e2070d-5846-4182-9dc9-bf56badf019f".into(), name: "Solarized Light".into(), appearance: Appearance::Light, styles: ThemeStyles { @@ -184,9 +193,9 @@ pub fn solarized() -> ThemeFamily { border: rgba(0xddd6c1ff).into(), border_variant: rgba(0xddd6c1ff).into(), border_focused: rgba(0xddd6c1ff).into(), - border_disabled: rgba(0xddd6c1ff).into(), border_selected: rgba(0xddd6c1ff).into(), border_transparent: rgba(0xddd6c1ff).into(), + border_disabled: rgba(0xddd6c1ff).into(), elevated_surface_background: rgba(0xf9f9fbff).into(), surface_background: rgba(0xf9f9fbff).into(), background: rgba(0xfdf6e3ff).into(), @@ -219,8 +228,17 @@ pub fn solarized() -> ThemeFamily { tab_inactive_background: rgba(0xd3cbb7ff).into(), tab_active_background: rgba(0xfdf6e3ff).into(), editor_background: rgba(0xfcfcfdff).into(), + editor_gutter_background: rgba(0xfcfcfdff).into(), editor_subheader_background: rgba(0xf9f9fbff).into(), - editor_active_line: rgba(0x0000320f).into(), + editor_active_line_background: rgba(0x0000320f).into(), + editor_highlighted_line_background: rgba(0x00002c17).into(), + editor_line_number: rgba(0x0000320f).into(), + editor_active_line_number: rgba(0x0000320f).into(), + editor_invisible: rgba(0x00002c17).into(), + editor_wrap_guide: rgba(0x00002c17).into(), + editor_active_wrap_guide: rgba(0x00002c17).into(), + editor_document_highlight_read_background: rgba(0x00002c17).into(), + editor_document_highlight_write_background: rgba(0x00002c17).into(), terminal_background: rgba(0xfcfcfdff).into(), terminal_ansi_bright_black: rgba(0x657b83ff).into(), terminal_ansi_bright_red: rgba(0xcb4b15ff).into(), @@ -262,24 +280,24 @@ pub fn solarized() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme { diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index cfe81bef424db8d1352d993c638c0002399767e0..8920037253c510a526c12b278b0f54de5b35fe6f 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -7,11 +7,11 @@ use crate::{ pub fn synthwave_84() -> ThemeFamily { ThemeFamily { - id: "5e0f0cd5-5522-45cf-a652-caeb140eb3de".into(), + id: "161a14a0-533c-4df1-b909-2bac37ac807d".into(), name: "Synthwave 84".into(), author: "Robb Owen (robb0wen)".into(), themes: vec![ThemeVariant { - id: "83110d9e-dbf0-4f36-9a4c-6b396ce9a5a4".into(), + id: "7a7102b7-8778-4c24-ba79-7407857b4f8c".into(), name: "Synthwave 84".into(), appearance: Appearance::Dark, styles: ThemeStyles { @@ -25,9 +25,9 @@ pub fn synthwave_84() -> ThemeFamily { border: rgba(0x363a3fff).into(), border_variant: rgba(0x2e3135ff).into(), border_focused: rgba(0x004073ff).into(), - border_disabled: rgba(0x212225ff).into(), border_selected: rgba(0x004073ff).into(), border_transparent: rgba(0x00000000).into(), + border_disabled: rgba(0x212225ff).into(), elevated_surface_background: rgba(0x18191bff).into(), surface_background: rgba(0x18191bff).into(), background: rgba(0x252334ff).into(), @@ -60,8 +60,17 @@ pub fn synthwave_84() -> ThemeFamily { tab_inactive_background: rgba(0x252334ff).into(), tab_active_background: rgba(0x111113ff).into(), editor_background: rgba(0x111113ff).into(), + editor_gutter_background: rgba(0x111113ff).into(), editor_subheader_background: rgba(0x18191bff).into(), - editor_active_line: rgba(0xddeaf814).into(), + editor_active_line_background: rgba(0xddeaf814).into(), + editor_highlighted_line_background: rgba(0xd3edf81d).into(), + editor_line_number: rgba(0xddeaf814).into(), + editor_active_line_number: rgba(0xddeaf814).into(), + editor_invisible: rgba(0xd3edf81d).into(), + editor_wrap_guide: rgba(0xd3edf81d).into(), + editor_active_wrap_guide: rgba(0xd3edf81d).into(), + editor_document_highlight_read_background: rgba(0xd3edf81d).into(), + editor_document_highlight_write_background: rgba(0xd3edf81d).into(), terminal_background: rgba(0x111113ff).into(), terminal_ansi_bright_black: rgba(0x000000e6).into(), terminal_ansi_bright_red: rgba(0xfe444fff).into(), @@ -103,24 +112,24 @@ pub fn synthwave_84() -> ThemeFamily { }, player: PlayerColors(vec![ PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, PlayerColor { - cursor: rgba(0x00000000).into(), - background: rgba(0x00000000).into(), - selection: rgba(0x00000000).into(), + cursor: rgba(0x000000ff).into(), + background: rgba(0x000000ff).into(), + selection: rgba(0x000000ff).into(), }, ]), syntax: SyntaxTheme {