accordion: Fix Accordion hover background. (#1184)

- Improved `accordion.hover` theme color default fallback to `accent`.
- Fix incorrect Accordion border top radius on hover.
- Removed unused `accordion.active.background` theme variable.

<img width="1106" height="799" alt="image"
src="https://github.com/user-attachments/assets/3b1d3e56-7e77-4118-ac3c-231c6571940a"
/>
This commit is contained in:
Jason Lee 2025-08-29 11:51:32 +08:00 committed by GitHub
parent f98ad5232b
commit 709a888e15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 612 additions and 699 deletions

View file

@ -106,10 +106,6 @@
"description": "Accordion background color.", "description": "Accordion background color.",
"type": ["string", "null"] "type": ["string", "null"]
}, },
"accordion.active.background": {
"description": "Accordion active background color.",
"type": ["string", "null"]
},
"accordion.hover.background": { "accordion.hover.background": {
"description": "Accordion hover background color.", "description": "Accordion hover background color.",
"type": ["string", "null"] "type": ["string", "null"]

View file

@ -247,9 +247,7 @@ impl RenderOnce for AccordionItem {
}) })
}) })
.when(!self.bordered, |this| { .when(!self.bordered, |this| {
this.border_b_1() this.border_b_1().border_color(cx.theme().border)
.border_color(cx.theme().border)
.rounded_t(cx.theme().radius)
}) })
.child( .child(
h_flex() h_flex()

View file

@ -57,9 +57,6 @@ pub struct ThemeConfigColors {
/// Accordion background color. /// Accordion background color.
#[serde(rename = "accordion.background")] #[serde(rename = "accordion.background")]
pub accordion: Option<SharedString>, pub accordion: Option<SharedString>,
/// Accordion active background color.
#[serde(rename = "accordion.active.background")]
pub accordion_active: Option<SharedString>,
/// Accordion hover background color. /// Accordion hover background color.
#[serde(rename = "accordion.hover.background")] #[serde(rename = "accordion.hover.background")]
pub accordion_hover: Option<SharedString>, pub accordion_hover: Option<SharedString>,
@ -507,8 +504,7 @@ impl ThemeColor {
apply_color!(accent, fallback = self.secondary); apply_color!(accent, fallback = self.secondary);
apply_color!(accent_foreground, fallback = self.secondary_foreground); apply_color!(accent_foreground, fallback = self.secondary_foreground);
apply_color!(accordion, fallback = self.background); apply_color!(accordion, fallback = self.background);
apply_color!(accordion_active, fallback = self.accordion); apply_color!(accordion_hover, fallback = self.accent.opacity(0.8));
apply_color!(accordion_hover, fallback = self.accordion);
apply_color!( apply_color!(
group_box, group_box,
fallback = self fallback = self

View file

@ -14,8 +14,6 @@ pub struct ThemeColor {
pub accent_foreground: Hsla, pub accent_foreground: Hsla,
/// Accordion background color. /// Accordion background color.
pub accordion: Hsla, pub accordion: Hsla,
/// Accordion active background color.
pub accordion_active: Hsla,
/// Accordion hover background color. /// Accordion hover background color.
pub accordion_hover: Hsla, pub accordion_hover: Hsla,
/// Default background color. /// Default background color.

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#25292d", "accent.background": "#25292d",
"accent.foreground": "#feffff", "accent.foreground": "#feffff",
"accordion.active.background": "#003a5b",
"accordion.hover.background": "#4b6479",
"background": "#040404", "background": "#040404",
"border": "#282828", "border": "#282828",
"danger.background": "#d84a33", "danger.background": "#d84a33",
@ -164,8 +162,6 @@
"colors": { "colors": {
"accent.background": "#36345f", "accent.background": "#36345f",
"accent.foreground": "#f8dcc0", "accent.foreground": "#f8dcc0",
"accordion.active.background": "#003a5b",
"accordion.hover.background": "#4b6479",
"background": "#1f1d45", "background": "#1f1d45",
"border": "#333150", "border": "#333150",
"foreground": "#f8dcc0", "foreground": "#f8dcc0",

View file

@ -1,152 +1,150 @@
{ {
"$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json",
"name": "Alduin", "name": "Alduin",
"author": "AlessandroYorba", "author": "AlessandroYorba",
"url": "https://github.com/AlessandroYorba/Alduin", "url": "https://github.com/AlessandroYorba/Alduin",
"themes": [ "themes": [
{ {
"name": "Alduin", "name": "Alduin",
"mode": "dark", "mode": "dark",
"colors": { "colors": {
"accent.background": "#322F2D", "accent.background": "#322F2D",
"accent.foreground": "#ebdbb2", "accent.foreground": "#ebdbb2",
"accordion.active.background": "#504945", "background": "#1C1C1C",
"accordion.hover.background": "#665c54", "border": "#3a3a3a",
"background": "#1C1C1C", "danger.background": "#cc241d",
"border": "#3a3a3a", "danger.active.background": "#cc241d",
"danger.background": "#cc241d", "danger.hover.background": "#fb4934",
"danger.active.background": "#cc241d", "foreground": "#9E9E9E",
"danger.hover.background": "#fb4934", "input.border": "#504945",
"foreground": "#9E9E9E", "link.active.foreground": "#83a598",
"input.border": "#504945", "link.foreground": "#83a598",
"link.active.foreground": "#83a598", "link.hover.foreground": "#83a598",
"link.foreground": "#83a598", "list.active.background": "#26262622",
"link.hover.foreground": "#83a598", "list.active.border": "#9E9E9E",
"list.active.background": "#26262622", "list.even.background": "#262626",
"list.active.border": "#9E9E9E", "list.head.background": "#1C1C1C",
"list.even.background": "#262626", "muted.background": "#3c3836",
"list.head.background": "#1C1C1C", "muted.foreground": "#878787",
"muted.background": "#3c3836", "panel.background": "#282828",
"muted.foreground": "#878787", "popover.background": "#141414",
"panel.background": "#282828", "popover.foreground": "#ebdbb2",
"popover.background": "#141414", "primary.active.background": "#45858899",
"popover.foreground": "#ebdbb2", "primary.background": "#458588",
"primary.active.background": "#45858899", "primary.foreground": "#F0F0F0",
"primary.background": "#458588", "primary.hover.background": "#458588AA",
"primary.foreground": "#F0F0F0", "scrollbar.background": "#28282833",
"primary.hover.background": "#458588AA", "scrollbar.thumb.background": "#504945",
"scrollbar.background": "#28282833", "secondary.background": "#282828",
"scrollbar.thumb.background": "#504945", "secondary.active.background": "#322F2D",
"secondary.background": "#282828", "secondary.foreground": "#9E9E9E",
"secondary.active.background": "#322F2D", "secondary.hover.background": "#26262699",
"secondary.foreground": "#9E9E9E", "tab.active.background": "#1C1C1C",
"secondary.hover.background": "#26262699", "tab.active.foreground": "#ebdbb2",
"tab.active.background": "#1C1C1C", "tab.background": "#14141400",
"tab.active.foreground": "#ebdbb2", "tab.foreground": "#848382",
"tab.background": "#14141400", "tab_bar.background": "#141414",
"tab.foreground": "#848382", "table.row.border": "#50494570",
"tab_bar.background": "#141414", "title_bar.background": "#262626",
"table.row.border": "#50494570", "title_bar.border": "#3a3a3a",
"title_bar.background": "#262626", "base.blue": "#87afaf",
"title_bar.border": "#3a3a3a", "base.cyan": "#878787",
"base.blue": "#87afaf", "base.green": "#87875f",
"base.cyan": "#878787", "base.magenta": "#af8787",
"base.green": "#87875f", "base.magenta.light": "#af878788",
"base.magenta": "#af8787", "base.red": "#8b5f61",
"base.magenta.light": "#af878788", "base.yellow": "#fed975"
"base.red": "#8b5f61", },
"base.yellow": "#fed975" "highlight": {
}, "editor.foreground": "#DDDDDD",
"highlight": { "editor.background": "#000000",
"editor.foreground": "#DDDDDD", "editor.active_line.background": "#131313",
"editor.background": "#000000", "editor.line_number": "#8F8F8F",
"editor.active_line.background": "#131313", "editor.active_line_number": "#DDDDDD",
"editor.line_number": "#8F8F8F", "conflict": "#D2602D",
"editor.active_line_number": "#DDDDDD", "created": "#3f72e2",
"conflict": "#D2602D", "error.border": "#802207",
"created": "#3f72e2", "hidden": "#9E9E9E",
"error.border": "#802207", "hint": "#b283f8",
"hidden": "#9E9E9E", "hint.border": "#3f0891",
"hint": "#b283f8", "info.border": "#082190",
"hint.border": "#3f0891", "modified": "#B0A878",
"info.border": "#082190", "predictive": "#5D5945",
"modified": "#B0A878", "syntax": {
"predictive": "#5D5945", "attribute": {
"syntax": { "color": "#be9a52"
"attribute": { },
"color": "#be9a52" "boolean": {
}, "color": "#E1D797"
"boolean": { },
"color": "#E1D797" "comment": {
}, "color": "#9E9E9E"
"comment": { },
"color": "#9E9E9E" "comment.doc": {
}, "color": "#9E9E9E"
"comment.doc": { },
"color": "#9E9E9E" "constant": {
}, "color": "#E1D797"
"constant": { },
"color": "#E1D797" "constructor": {
}, "color": "#b5af9a"
"constructor": { },
"color": "#b5af9a" "embedded": {
}, "color": "#CACCCA"
"embedded": { },
"color": "#CACCCA" "function": {
}, "color": "#E1D797"
"function": { },
"color": "#E1D797" "keyword": {
}, "color": "#E19773"
"keyword": { },
"color": "#E19773" "link_text": {
}, "color": "#A86D3B",
"link_text": { "font_style": "normal"
"color": "#A86D3B", },
"font_style": "normal" "link_uri": {
}, "color": "#6F6D66",
"link_uri": { "font_style": "italic"
"color": "#6F6D66", },
"font_style": "italic" "number": {
}, "color": "#E19773"
"number": { },
"color": "#E19773" "string": {
}, "color": "#76BA53"
"string": { },
"color": "#76BA53" "string.escape": {
}, "color": "#76BA53"
"string.escape": { },
"color": "#76BA53" "string.regex": {
}, "color": "#76BA53"
"string.regex": { },
"color": "#76BA53" "string.special": {
}, "color": "#E1D797"
"string.special": { },
"color": "#E1D797" "string.special.symbol": {
}, "color": "#E1D797"
"string.special.symbol": { },
"color": "#E1D797" "tag": {
}, "color": "#b5af9a"
"tag": { },
"color": "#b5af9a" "text.literal": {
}, "color": "#E1D797"
"text.literal": { },
"color": "#E1D797" "title": {
}, "color": "#A76D3B",
"title": { "font_weight": 600
"color": "#A76D3B", },
"font_weight": 600 "type": {
}, "color": "#A86D3B"
"type": { },
"color": "#A86D3B" "property": {
}, "color": "#CACCCA"
"property": { },
"color": "#CACCCA" "variable.special": {
}, "color": "#E19773"
"variable.special": { }
"color": "#E19773"
}
}
}
} }
] }
}
]
} }

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#ECECED", "accent.background": "#ECECED",
"accent.foreground": "#5C6773", "accent.foreground": "#5C6773",
"accordion.active.background": "#F3F4F5",
"accordion.hover.background": "#D9DCE3",
"background": "#fafafa", "background": "#fafafa",
"foreground": "#5C6773", "foreground": "#5C6773",
"border": "#E6E8EA", "border": "#E6E8EA",
@ -161,8 +159,6 @@
"colors": { "colors": {
"accent.background": "#191F2A", "accent.background": "#191F2A",
"accent.foreground": "#B3B1AD", "accent.foreground": "#B3B1AD",
"accordion.active.background": "#1F2430",
"accordion.hover.background": "#333F58",
"background": "#0F1419", "background": "#0F1419",
"border": "#444444", "border": "#444444",
"ring": "#FFB454", "ring": "#FFB454",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#D6DAE2", "accent.background": "#D6DAE2",
"accent.foreground": "#4c4f69", "accent.foreground": "#4c4f69",
"accordion.active.background": "#dce0e8",
"accordion.hover.background": "#acb0be",
"background": "#E5E9EF", "background": "#E5E9EF",
"border": "#CCD0DA", "border": "#CCD0DA",
"ring": "#c6d0f5", "ring": "#c6d0f5",
@ -403,8 +401,6 @@
"colors": { "colors": {
"accent.background": "#3b3f4f", "accent.background": "#3b3f4f",
"accent.foreground": "#c6d0f5", "accent.foreground": "#c6d0f5",
"accordion.active.background": "#414559",
"accordion.hover.background": "#51576d",
"background": "#232634", "background": "#232634",
"border": "#3e4255", "border": "#3e4255",
"ring": "#f2d5cf", "ring": "#f2d5cf",
@ -540,8 +536,6 @@
"colors": { "colors": {
"accent.background": "#24273a", "accent.background": "#24273a",
"accent.foreground": "#cad3f5", "accent.foreground": "#cad3f5",
"accordion.active.background": "#363a4f",
"accordion.hover.background": "#494d64",
"action_bar.background": "#1E2030", "action_bar.background": "#1E2030",
"background": "#1E2030", "background": "#1E2030",
"border": "#494d64", "border": "#494d64",
@ -689,8 +683,6 @@
"colors": { "colors": {
"accent.background": "#2e2e3e", "accent.background": "#2e2e3e",
"accent.foreground": "#cdd6f4", "accent.foreground": "#cdd6f4",
"accordion.active.background": "#302d41",
"accordion.hover.background": "#575268",
"background": "#181825", "background": "#181825",
"border": "#313244", "border": "#313244",
"ring": "#cba6f7", "ring": "#cba6f7",

View file

@ -12,8 +12,6 @@
"accent.background": "#f5f5f5", "accent.background": "#f5f5f5",
"accent.foreground": "#171717", "accent.foreground": "#171717",
"accordion.background": "#ffffff", "accordion.background": "#ffffff",
"accordion.active.background": "#e5e5e5",
"accordion.hover.background": "#f5f5f5",
"background": "#ffffff", "background": "#ffffff",
"border": "#e5e5e5", "border": "#e5e5e5",
"group_box.background": "#f5f5f5", "group_box.background": "#f5f5f5",
@ -215,8 +213,6 @@
"accent.background": "#171717", "accent.background": "#171717",
"accent.foreground": "#fafafa", "accent.foreground": "#fafafa",
"accordion.background": "#0a0a0a", "accordion.background": "#0a0a0a",
"accordion.active.background": "#262626",
"accordion.hover.background": "#262626e6",
"background": "#0a0a0a", "background": "#0a0a0a",
"border": "#262626", "border": "#262626",
"group_box.background": "#171717", "group_box.background": "#171717",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#E7E5D4", "accent.background": "#E7E5D4",
"accent.foreground": "#5F6D75", "accent.foreground": "#5F6D75",
"accordion.active.background": "#d3c6aa",
"accordion.hover.background": "#E7E5D4",
"background": "#FEFCEE", "background": "#FEFCEE",
"border": "#E7E5D4", "border": "#E7E5D4",
"danger.background": "#e67e80", "danger.background": "#e67e80",
@ -155,8 +153,6 @@
"colors": { "colors": {
"accent.background": "#3c4448", "accent.background": "#3c4448",
"accent.foreground": "#d3c6aa", "accent.foreground": "#d3c6aa",
"accordion.active.background": "#2E383B",
"accordion.hover.background": "#485156",
"background": "#262E34", "background": "#262E34",
"border": "#40484c", "border": "#40484c",
"danger.active.background": "#e67e80", "danger.active.background": "#e67e80",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#171717", "accent.background": "#171717",
"accent.foreground": "#FFFFCE", "accent.foreground": "#FFFFCE",
"accordion.active.background": "#1e1e1e",
"accordion.hover.background": "#3e3e3e",
"background": "#000000", "background": "#000000",
"border": "#252525", "border": "#252525",
"danger.background": "#593002", "danger.background": "#593002",

View file

@ -30,7 +30,7 @@
"scrollbar.thumb.hover.background": "#DAD8CE", "scrollbar.thumb.hover.background": "#DAD8CE",
"secondary.active.background": "#DAD8CE", "secondary.active.background": "#DAD8CE",
"secondary.background": "#F2F0E5", "secondary.background": "#F2F0E5",
"secondary.foreground": "#5C6773", "secondary.foreground": "#100F0F",
"secondary.hover.background": "#E6E4D9", "secondary.hover.background": "#E6E4D9",
"tab.active.background": "#FFFCF0", "tab.active.background": "#FFFCF0",
"tab.active.foreground": "#100F0F", "tab.active.foreground": "#100F0F",
@ -238,10 +238,8 @@
"name": "Flexoki Dark", "name": "Flexoki Dark",
"mode": "dark", "mode": "dark",
"colors": { "colors": {
"accent.background": "#343331", "accent.background": "#1f1d1c",
"accent.foreground": "#CECDC3", "accent.foreground": "#CECDC3",
"accordion.active.background": "#282726",
"accordion.hover.background": "#343331",
"background": "#100F0F", "background": "#100F0F",
"border": "#282726", "border": "#282726",
"ring": "#AD8301", "ring": "#AD8301",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#ebdbb2", "accent.background": "#ebdbb2",
"accent.foreground": "#3c3836", "accent.foreground": "#3c3836",
"accordion.active.background": "#fbf1c7",
"accordion.hover.background": "#d5c4a1",
"background": "#fbf1c7", "background": "#fbf1c7",
"border": "#d5c4a1", "border": "#d5c4a1",
"danger.background": "#fb4934", "danger.background": "#fb4934",
@ -159,8 +157,6 @@
"colors": { "colors": {
"accent.background": "#282828", "accent.background": "#282828",
"accent.foreground": "#ebdbb2", "accent.foreground": "#ebdbb2",
"accordion.active.background": "#282828",
"accordion.hover.background": "#504945",
"background": "#1d2021", "background": "#1d2021",
"border": "#3e3936", "border": "#3e3936",
"card.background": "#282828", "card.background": "#282828",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#18151B", "accent.background": "#18151B",
"accent.foreground": "#a8a49d", "accent.foreground": "#a8a49d",
"accordion.active.background": "#003a5b",
"accordion.hover.background": "#726E69",
"background": "#010101", "background": "#010101",
"border": "#333333", "border": "#333333",
"foreground": "#a8a49d", "foreground": "#a8a49d",

View file

@ -8,10 +8,8 @@
"name": "Hybrid Light", "name": "Hybrid Light",
"mode": "light", "mode": "light",
"colors": { "colors": {
"accent.background": "#D4E2E2", "accent.background": "#d3d8da",
"accent.foreground": "#1c1c1c", "accent.foreground": "#1c1c1c",
"accordion.active.background": "#d3d3d3",
"accordion.hover.background": "#c0c0c0",
"background": "#E4E4E4", "background": "#E4E4E4",
"border": "#CACACA", "border": "#CACACA",
"danger.background": "#ff5f5f", "danger.background": "#ff5f5f",
@ -155,10 +153,8 @@
"name": "Hybrid Dark", "name": "Hybrid Dark",
"mode": "dark", "mode": "dark",
"colors": { "colors": {
"accent.background": "#313E40", "accent.background": "#292f30",
"accent.foreground": "#e8e8e8", "accent.foreground": "#e8e8e8",
"accordion.active.background": "#1c1c1c",
"accordion.hover.background": "#3a3a3a",
"background": "#1D1F21", "background": "#1D1F21",
"border": "#34373c", "border": "#34373c",
"card.background": "#1D1F21", "card.background": "#1D1F21",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#232323", "accent.background": "#232323",
"accent.foreground": "#e8e8e8", "accent.foreground": "#e8e8e8",
"accordion.active.background": "#444444",
"accordion.hover.background": "#4E4847",
"background": "#151515", "background": "#151515",
"border": "#2e2e2e", "border": "#2e2e2e",
"danger.foreground": "#151515", "danger.foreground": "#151515",

View file

@ -1,156 +1,154 @@
{ {
"$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json",
"name": "Kibble", "name": "Kibble",
"author": "iTerm2-Color-Schemes", "author": "iTerm2-Color-Schemes",
"url": "https://github.com/mbadolato/iTerm2-Color-Schemes", "url": "https://github.com/mbadolato/iTerm2-Color-Schemes",
"themes": [ "themes": [
{ {
"name": "Kibble", "name": "Kibble",
"mode": "dark", "mode": "dark",
"colors": { "colors": {
"accent.background": "#242223", "accent.background": "#242223",
"accent.foreground": "#f7f7f7", "accent.foreground": "#f7f7f7",
"accordion.active.background": "#003a5b", "background": "#0e100a",
"accordion.hover.background": "#726E69", "border": "#333333",
"background": "#0e100a", "danger.background": "#c70031",
"border": "#333333", "danger.active.background": "#c7003199",
"danger.background": "#c70031", "danger.hover.background": "#e00038",
"danger.active.background": "#c7003199", "foreground": "#f7f7f7",
"danger.hover.background": "#e00038", "input.border": "#333333",
"foreground": "#f7f7f7", "list.active.background": "#3448D122",
"input.border": "#333333", "list.active.border": "#3448D1",
"list.active.background": "#3448D122", "list.hover.background": "#2c292b54",
"list.active.border": "#3448D1", "list.even.background": "#24222355",
"list.hover.background": "#2c292b54", "muted.background": "#333333",
"list.even.background": "#24222355", "muted.foreground": "#726E69",
"muted.background": "#333333", "panel.background": "#003a5b",
"muted.foreground": "#726E69", "popover.background": "#0e100a",
"panel.background": "#003a5b", "popover.foreground": "#f7f7f7",
"popover.background": "#0e100a", "primary.active.background": "#3449d199",
"popover.foreground": "#f7f7f7", "primary.background": "#3449d1",
"primary.active.background": "#3449d199", "primary.foreground": "#f7f7f7",
"primary.background": "#3449d1", "primary.hover.background": "#4457d5",
"primary.foreground": "#f7f7f7", "scrollbar.background": "#003a5b00",
"primary.hover.background": "#4457d5", "scrollbar.thumb.background": "#726E69",
"scrollbar.background": "#003a5b00", "secondary.background": "#3d3d3d",
"scrollbar.thumb.background": "#726E69", "secondary.active.background": "#2d2d2d",
"secondary.background": "#3d3d3d", "secondary.foreground": "#f7f7f7",
"secondary.active.background": "#2d2d2d", "secondary.hover.background": "#404040",
"secondary.foreground": "#f7f7f7", "tab.active.background": "#0e100a",
"secondary.hover.background": "#404040", "tab.active.foreground": "#f7f7f7",
"tab.active.background": "#0e100a", "tab.foreground": "#969696",
"tab.active.foreground": "#f7f7f7", "base.red": "#C70231",
"tab.foreground": "#969696", "base.red.light": "#f01578",
"base.red": "#C70231", "base.green": "#2BCF13",
"base.red.light": "#f01578", "base.green.light": "#6ce05c",
"base.green": "#2BCF13", "base.blue": "#3449d1",
"base.green.light": "#6ce05c", "base.blue.light": "#97a4f7",
"base.blue": "#3449d1", "base.cyan": "#0798ab",
"base.blue.light": "#97a4f7", "base.cyan.light": "#68f2e0",
"base.cyan": "#0798ab", "base.magenta": "#8400ff",
"base.cyan.light": "#68f2e0", "base.magenta.light": "#C495F0",
"base.magenta": "#8400ff", "base.yellow": "#c7a302",
"base.magenta.light": "#C495F0", "base.yellow.light": "#f3f79e"
"base.yellow": "#c7a302", },
"base.yellow.light": "#f3f79e" "highlight": {
}, "editor.foreground": "#f7f7f7",
"highlight": { "editor.background": "#0e100a",
"editor.foreground": "#f7f7f7", "editor.active_line.background": "#242223",
"editor.background": "#0e100a", "editor.line_number": "#726E69",
"editor.active_line.background": "#242223", "editor.active_line_number": "#f7f7f7",
"editor.line_number": "#726E69", "conflict": "#c70031",
"editor.active_line_number": "#f7f7f7", "created": "#2BCF13",
"conflict": "#c70031", "deleted": "#c70031",
"created": "#2BCF13", "error": "#c70031",
"deleted": "#c70031", "hidden": "#726E69",
"error": "#c70031", "hint": "#0798ab",
"hidden": "#726E69", "ignored": "#726E69",
"hint": "#0798ab", "info": "#0798ab",
"ignored": "#726E69", "modified": "#3449d1",
"info": "#0798ab", "predictive": "#726E69",
"modified": "#3449d1", "renamed": "#3449d1",
"predictive": "#726E69", "success": "#2BCF13",
"renamed": "#3449d1", "unreachable": "#726E69",
"success": "#2BCF13", "warning": "#c7a302",
"unreachable": "#726E69", "syntax": {
"warning": "#c7a302", "attribute": {
"syntax": { "color": "#3449d1"
"attribute": { },
"color": "#3449d1" "boolean": {
}, "color": "#c7a302"
"boolean": { },
"color": "#c7a302" "comment": {
}, "color": "#726E69",
"comment": { "font_style": "italic"
"color": "#726E69", },
"font_style": "italic" "comment.doc": {
}, "color": "#726E69",
"comment.doc": { "font_style": "italic"
"color": "#726E69", },
"font_style": "italic" "constant": {
}, "color": "#c7a302"
"constant": { },
"color": "#c7a302" "constructor": {
}, "color": "#3449d1"
"constructor": { },
"color": "#3449d1" "embedded": {
}, "color": "#f7f7f7"
"embedded": { },
"color": "#f7f7f7" "function": {
}, "color": "#c7a302"
"function": { },
"color": "#c7a302" "keyword": {
}, "color": "#c70031"
"keyword": { },
"color": "#c70031" "link_text": {
}, "color": "#0798ab",
"link_text": { "font_style": "normal"
"color": "#0798ab", },
"font_style": "normal" "link_uri": {
}, "color": "#68f2e0",
"link_uri": { "font_style": "italic"
"color": "#68f2e0", },
"font_style": "italic" "number": {
}, "color": "#c70031"
"number": { },
"color": "#c70031" "string": {
}, "color": "#2BCF13"
"string": { },
"color": "#2BCF13" "string.escape": {
}, "color": "#2BCF13"
"string.escape": { },
"color": "#2BCF13" "string.regex": {
}, "color": "#2BCF13"
"string.regex": { },
"color": "#2BCF13" "string.special": {
}, "color": "#c7a302"
"string.special": { },
"color": "#c7a302" "string.special.symbol": {
}, "color": "#c7a302"
"string.special.symbol": { },
"color": "#c7a302" "tag": {
}, "color": "#3449d1"
"tag": { },
"color": "#3449d1" "text.literal": {
}, "color": "#c7a302"
"text.literal": { },
"color": "#c7a302" "title": {
}, "color": "#3449d1",
"title": { "font_weight": 600
"color": "#3449d1", },
"font_weight": 600 "type": {
}, "color": "#3449d1"
"type": { },
"color": "#3449d1" "property": {
}, "color": "#f7f7f7"
"property": { },
"color": "#f7f7f7" "variable.special": {
}, "color": "#c70031"
"variable.special": { }
"color": "#c70031"
}
}
}
} }
] }
}
]
} }

View file

@ -10,9 +10,6 @@
"colors": { "colors": {
"accent.background": "#EAEAEA", "accent.background": "#EAEAEA",
"accent.foreground": "#000000", "accent.foreground": "#000000",
"accordion.active.background": "#F7F7F7",
"accordion.background": "#F9F9F9",
"accordion.hover.background": "#D0D0D0",
"background": "#FFFFFF", "background": "#FFFFFF",
"foreground": "#000000", "foreground": "#000000",
"border": "#D2D2D2", "border": "#D2D2D2",
@ -160,8 +157,6 @@
"colors": { "colors": {
"accent.background": "#353436", "accent.background": "#353436",
"accent.foreground": "#CACCCA", "accent.foreground": "#CACCCA",
"accordion.active.background": "#1E1D1E",
"accordion.hover.background": "#353436",
"background": "#131313", "background": "#131313",
"border": "#404040", "border": "#404040",
"ring": "#A76D3B", "ring": "#A76D3B",

View file

@ -1,158 +1,156 @@
{ {
"$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json",
"name": "Mandarin Square", "name": "Mandarin Square",
"author": "huacnlee", "author": "huacnlee",
"url": "https://en.wikipedia.org/wiki/Mandarin_square", "url": "https://en.wikipedia.org/wiki/Mandarin_square",
"themes": [ "themes": [
{ {
"name": "Mandarin Square", "name": "Mandarin Square",
"mode": "dark", "mode": "dark",
"colors": { "colors": {
"accent.background": "#2B2525", "accent.background": "#2a2c33",
"accent.foreground": "#ebdbb2", "accent.foreground": "#e3dbd3",
"accordion.active.background": "#504945", "background": "#110D10",
"accordion.hover.background": "#665c54", "border": "#312B32",
"background": "#110D10", "danger.background": "#cc241d",
"border": "#312B32", "danger.active.background": "#cc241d",
"danger.background": "#cc241d", "danger.foreground": "#282828",
"danger.active.background": "#cc241d", "danger.hover.background": "#fb4934",
"danger.foreground": "#282828", "foreground": "#e3dbd3",
"danger.hover.background": "#fb4934", "input.border": "#504945",
"foreground": "#F0DBC6", "list.active.background": "#7F5B2128",
"input.border": "#504945", "list.active.border": "#D99832",
"list.active.background": "#7F5B2128", "list.even.background": "#28282899",
"list.active.border": "#D99832", "muted.background": "#3c3836",
"list.even.background": "#28282899", "muted.foreground": "#878787",
"muted.background": "#3c3836", "panel.background": "#282828",
"muted.foreground": "#878787", "popover.background": "#110D10",
"panel.background": "#282828", "popover.foreground": "#e3dbd3",
"popover.background": "#1B1717", "primary.active.background": "#324a8f99",
"popover.foreground": "#ebdbb2", "primary.background": "#324a8f",
"primary.active.background": "#324a8f99", "primary.foreground": "#c6cdf0",
"primary.background": "#324a8f", "primary.hover.background": "#38519f",
"primary.foreground": "#c6cdf0", "scrollbar.background": "#28282844",
"primary.hover.background": "#38519f", "scrollbar.thumb.background": "#504945",
"scrollbar.background": "#28282844", "secondary.background": "#312C31",
"scrollbar.thumb.background": "#504945", "secondary.active.background": "#201B20",
"secondary.background": "#312C31", "secondary.foreground": "#e3dbd3",
"secondary.active.background": "#201B20", "secondary.hover.background": "#3b353b",
"secondary.foreground": "#D5BBA3", "tab.active.background": "#110D10",
"secondary.hover.background": "#3b353b", "tab.active.foreground": "#ebdbb2",
"tab.active.background": "#110D10", "tab.background": "#1B171700",
"tab.active.foreground": "#ebdbb2", "tab.foreground": "#928d81",
"tab.background": "#1B171700", "tab_bar.background": "#110D10",
"tab.foreground": "#928d81", "title_bar.background": "#110D10",
"tab_bar.background": "#110D10", "title_bar.border": "#312B32",
"title_bar.background": "#110D10", "base.blue": "#33467F",
"title_bar.border": "#312B32", "base.cyan": "#A0C4D8",
"base.blue": "#33467F", "base.green": "#55743e",
"base.cyan": "#A0C4D8", "base.magenta": "#522431",
"base.green": "#55743e", "base.magenta.light": "#52243188",
"base.magenta": "#522431", "base.red": "#B51E00",
"base.magenta.light": "#52243188", "base.yellow": "#D99832",
"base.red": "#B51E00", "warning.foreground": "#282828",
"base.yellow": "#D99832", "success.foreground": "#ebdbb2",
"warning.foreground": "#282828", "info.foreground": "#282828"
"success.foreground": "#ebdbb2", },
"info.foreground": "#282828" "highlight": {
}, "editor.foreground": "#ebdbb2",
"highlight": { "editor.background": "#282828",
"editor.foreground": "#ebdbb2", "editor.active_line.background": "#3c3836",
"editor.background": "#282828", "editor.line_number": "#928374",
"editor.active_line.background": "#3c3836", "editor.active_line_number": "#ebdbb2",
"editor.line_number": "#928374", "conflict": "#cc241d",
"editor.active_line_number": "#ebdbb2", "created": "#7c6f64",
"conflict": "#cc241d", "deleted": "#9d0006",
"created": "#7c6f64", "error": "#cc241d",
"deleted": "#9d0006", "hidden": "#928374",
"error": "#cc241d", "hint": "#83a598",
"hidden": "#928374", "ignored": "#928374",
"hint": "#83a598", "info": "#83a598",
"ignored": "#928374", "modified": "#b57614",
"info": "#83a598", "predictive": "#928374",
"modified": "#b57614", "renamed": "#b57614",
"predictive": "#928374", "success": "#7c6f64",
"renamed": "#b57614", "unreachable": "#928374",
"success": "#7c6f64", "warning": "#d79921",
"unreachable": "#928374", "syntax": {
"warning": "#d79921", "attribute": {
"syntax": { "color": "#d79921"
"attribute": { },
"color": "#d79921" "boolean": {
}, "color": "#d79921"
"boolean": { },
"color": "#d79921" "comment": {
}, "color": "#928374",
"comment": { "font_style": "italic"
"color": "#928374", },
"font_style": "italic" "comment.doc": {
}, "color": "#928374",
"comment.doc": { "font_style": "italic"
"color": "#928374", },
"font_style": "italic" "constant": {
}, "color": "#d79921"
"constant": { },
"color": "#d79921" "constructor": {
}, "color": "#b57614"
"constructor": { },
"color": "#b57614" "embedded": {
}, "color": "#ebdbb2"
"embedded": { },
"color": "#ebdbb2" "function": {
}, "color": "#d79921"
"function": { },
"color": "#d79921" "keyword": {
}, "color": "#cc241d"
"keyword": { },
"color": "#cc241d" "link_text": {
}, "color": "#83a598",
"link_text": { "font_style": "normal"
"color": "#83a598", },
"font_style": "normal" "link_uri": {
}, "color": "#076678",
"link_uri": { "font_style": "italic"
"color": "#076678", },
"font_style": "italic" "number": {
}, "color": "#cc241d"
"number": { },
"color": "#cc241d" "string": {
}, "color": "#7c6f64"
"string": { },
"color": "#7c6f64" "string.escape": {
}, "color": "#7c6f64"
"string.escape": { },
"color": "#7c6f64" "string.regex": {
}, "color": "#7c6f64"
"string.regex": { },
"color": "#7c6f64" "string.special": {
}, "color": "#d79921"
"string.special": { },
"color": "#d79921" "string.special.symbol": {
}, "color": "#d79921"
"string.special.symbol": { },
"color": "#d79921" "tag": {
}, "color": "#b57614"
"tag": { },
"color": "#b57614" "text.literal": {
}, "color": "#d79921"
"text.literal": { },
"color": "#d79921" "title": {
}, "color": "#b57614",
"title": { "font_weight": 600
"color": "#b57614", },
"font_weight": 600 "type": {
}, "color": "#b57614"
"type": { },
"color": "#b57614" "property": {
}, "color": "#ebdbb2"
"property": { },
"color": "#ebdbb2" "variable.special": {
}, "color": "#cc241d"
"variable.special": { }
"color": "#cc241d"
}
}
}
} }
] }
}
]
} }

View file

@ -1,160 +1,157 @@
{ {
"$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json",
"name": "Matrix", "name": "Matrix",
"author": "iruzo", "author": "iruzo",
"url": "https://github.com/iruzo/matrix-nvim", "url": "https://github.com/iruzo/matrix-nvim",
"themes": [ "themes": [
{ {
"name": "Matrix", "name": "Matrix",
"mode": "dark", "mode": "dark",
"colors": { "colors": {
"accent.background": "#003200", "accent.background": "#003200",
"accent.foreground": "#00FF00", "accent.foreground": "#00FF00",
"accordion.active.background": "#001900", "background": "#020d02",
"accordion.hover.background": "#003200", "border": "#12410E",
"background": "#020d02", "window_border": "#156B12",
"border": "#12410E", "ring": "#00FF00",
"window_border": "#156B12", "danger.background": "#FF0000",
"ring": "#00FF00", "danger.active.background": "#FF0000",
"danger.background": "#FF0000", "danger.foreground": "#0D0208",
"danger.active.background": "#FF0000", "danger.hover.background": "#FF0000",
"danger.foreground": "#0D0208", "foreground": "#88FF88",
"danger.hover.background": "#FF0000", "input.border": "#003200",
"foreground": "#88FF88", "link.active.foreground": "#00FF00",
"input.border": "#003200", "link.foreground": "#00FF00",
"link.active.foreground": "#00FF00", "link.hover.foreground": "#00FF00",
"link.foreground": "#00FF00", "list.active.background": "#00190066",
"link.hover.foreground": "#00FF00", "list.active.border": "#00FF00",
"list.active.background": "#00190066", "list.even.background": "#00190066",
"list.active.border": "#00FF00", "muted.background": "#001900",
"list.even.background": "#00190066", "muted.foreground": "#007700",
"muted.background": "#001900", "panel.background": "#001900",
"muted.foreground": "#007700", "popover.background": "#0D0208",
"panel.background": "#001900", "popover.foreground": "#00FF00",
"popover.background": "#0D0208", "primary.active.background": "#00FF0099",
"popover.foreground": "#00FF00", "primary.background": "#00FF00",
"primary.active.background": "#00FF0099", "primary.foreground": "#0D0208",
"primary.background": "#00FF00", "primary.hover.background": "#00FF00AA",
"primary.foreground": "#0D0208", "scrollbar.background": "#0D020800",
"primary.hover.background": "#00FF00AA", "scrollbar.thumb.background": "#003d00",
"scrollbar.background": "#0D020800", "secondary.active.background": "#001B00",
"scrollbar.thumb.background": "#003d00", "secondary.background": "#002900",
"secondary.active.background": "#001B00", "secondary.foreground": "#3fd43a",
"secondary.background": "#002900", "secondary.hover.background": "#003300",
"secondary.foreground": "#3fd43a", "tab.active.background": "#0D0208",
"secondary.hover.background": "#003300", "tab.active.foreground": "#00FF00",
"tab.active.background": "#0D0208", "tab.background": "#0D020800",
"tab.active.foreground": "#00FF00", "tab.foreground": "#88FF88",
"tab.background": "#0D020800", "tab_bar.background": "#0D0208",
"tab.foreground": "#88FF88", "title_bar.background": "#020d02",
"tab_bar.background": "#0D0208", "title_bar.border": "#12410E",
"title_bar.background": "#020d02", "base.red": "#FF0000",
"title_bar.border": "#12410E", "base.green": "#00FF00",
"base.red": "#23755a", "base.yellow": "#ffea00",
"base.green": "#82d967", "base.blue": "#0000ff",
"base.yellow": "#ffd700", "base.magenta": "#FF00FF",
"base.blue": "#3f5242", "base.cyan": "#00ffd5"
"base.magenta": "#FF00FF", },
"base.magenta.light": "#FF00FF22", "highlight": {
"base.cyan": "#50b45a" "editor.foreground": "#88FF88",
}, "editor.background": "#020d02",
"highlight": { "editor.active_line.background": "#001900",
"editor.foreground": "#88FF88", "editor.line_number": "#007700",
"editor.background": "#020d02", "editor.active_line_number": "#00FF00",
"editor.active_line.background": "#001900", "conflict": "#FF0000",
"editor.line_number": "#007700", "created": "#82d967",
"editor.active_line_number": "#00FF00", "deleted": "#FF0000",
"conflict": "#FF0000", "error": "#FF0000",
"created": "#82d967", "hidden": "#007700",
"deleted": "#FF0000", "hint": "#3fd43a",
"error": "#FF0000", "ignored": "#007700",
"hidden": "#007700", "info": "#3fd43a",
"hint": "#3fd43a", "modified": "#82d967",
"ignored": "#007700", "predictive": "#007700",
"info": "#3fd43a", "renamed": "#82d967",
"modified": "#82d967", "success": "#82d967",
"predictive": "#007700", "unreachable": "#007700",
"renamed": "#82d967", "warning": "#ffd700",
"success": "#82d967", "syntax": {
"unreachable": "#007700", "attribute": {
"warning": "#ffd700", "color": "#82d967"
"syntax": { },
"attribute": { "boolean": {
"color": "#82d967" "color": "#ffd700"
}, },
"boolean": { "comment": {
"color": "#ffd700" "color": "#007700",
}, "font_style": "italic"
"comment": { },
"color": "#007700", "comment.doc": {
"font_style": "italic" "color": "#007700",
}, "font_style": "italic"
"comment.doc": { },
"color": "#007700", "constant": {
"font_style": "italic" "color": "#ffd700"
}, },
"constant": { "constructor": {
"color": "#ffd700" "color": "#82d967"
}, },
"constructor": { "embedded": {
"color": "#82d967" "color": "#88FF88"
}, },
"embedded": { "function": {
"color": "#88FF88" "color": "#ffd700"
}, },
"function": { "keyword": {
"color": "#ffd700" "color": "#FF0000"
}, },
"keyword": { "link_text": {
"color": "#FF0000" "color": "#3fd43a",
}, "font_style": "normal"
"link_text": { },
"color": "#3fd43a", "link_uri": {
"font_style": "normal" "color": "#00FF00",
}, "font_style": "italic"
"link_uri": { },
"color": "#00FF00", "number": {
"font_style": "italic" "color": "#FF0000"
}, },
"number": { "string": {
"color": "#FF0000" "color": "#82d967"
}, },
"string": { "string.escape": {
"color": "#82d967" "color": "#82d967"
}, },
"string.escape": { "string.regex": {
"color": "#82d967" "color": "#82d967"
}, },
"string.regex": { "string.special": {
"color": "#82d967" "color": "#ffd700"
}, },
"string.special": { "string.special.symbol": {
"color": "#ffd700" "color": "#ffd700"
}, },
"string.special.symbol": { "tag": {
"color": "#ffd700" "color": "#82d967"
}, },
"tag": { "text.literal": {
"color": "#82d967" "color": "#ffd700"
}, },
"text.literal": { "title": {
"color": "#ffd700" "color": "#82d967",
}, "font_weight": 600
"title": { },
"color": "#82d967", "type": {
"font_weight": 600 "color": "#82d967"
}, },
"type": { "property": {
"color": "#82d967" "color": "#88FF88"
}, },
"property": { "variable.special": {
"color": "#88FF88" "color": "#FF0000"
}, }
"variable.special": {
"color": "#FF0000"
}
}
}
} }
] }
}
]
} }

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#d5d5d5", "accent.background": "#d5d5d5",
"accent.foreground": "#383a42", "accent.foreground": "#383a42",
"accordion.active.background": "#fafafa",
"accordion.hover.background": "#d5d5d5",
"background": "#E7E7E7", "background": "#E7E7E7",
"border": "#CACACA", "border": "#CACACA",
"danger.active.background": "#e06c75", "danger.active.background": "#e06c75",
@ -159,8 +157,6 @@
"colors": { "colors": {
"accent.background": "#292929", "accent.background": "#292929",
"accent.foreground": "#abb2bf", "accent.foreground": "#abb2bf",
"accordion.active.background": "#282c34",
"accordion.hover.background": "#444444",
"background": "#1A1A1A", "background": "#1A1A1A",
"border": "#444444", "border": "#444444",
"card.background": "#282c34", "card.background": "#282c34",

View file

@ -145,8 +145,6 @@
"colors": { "colors": {
"accent.background": "#2b2f30", "accent.background": "#2b2f30",
"accent.foreground": "#f8f8f2", "accent.foreground": "#f8f8f2",
"accordion.active.background": "#1b1d1e",
"accordion.hover.background": "#2b2d2e",
"background": "#1b1d1e", "background": "#1b1d1e",
"border": "#3b3b3b", "border": "#3b3b3b",
"card.background": "#272822", "card.background": "#272822",

View file

@ -10,9 +10,6 @@
"colors": { "colors": {
"accent.background": "#EEE8D5", "accent.background": "#EEE8D5",
"accent.foreground": "#073642", "accent.foreground": "#073642",
"accordion.active.background": "#eee8d5",
"accordion.background": "#fdf6e3",
"accordion.hover.background": "#e0e0d0",
"background": "#FDF6E3", "background": "#FDF6E3",
"border": "#DCD4BC", "border": "#DCD4BC",
"foreground": "#586E75", "foreground": "#586E75",
@ -155,8 +152,6 @@
"colors": { "colors": {
"accent.background": "#15333A", "accent.background": "#15333A",
"accent.foreground": "#fdf6e3", "accent.foreground": "#fdf6e3",
"accordion.active.background": "#073642",
"accordion.hover.background": "#073642",
"background": "#002B36", "background": "#002B36",
"border": "#083e4c", "border": "#083e4c",
"card.background": "#002b36", "card.background": "#002b36",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#1c1d39", "accent.background": "#1c1d39",
"accent.foreground": "#ecf0c1", "accent.foreground": "#ecf0c1",
"accordion.active.background": "#003a5b",
"accordion.hover.background": "#4b6479",
"background": "#0F111B", "background": "#0F111B",
"border": "#272C42", "border": "#272C42",
"foreground": "#ecf0c1", "foreground": "#ecf0c1",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#2C3045", "accent.background": "#2C3045",
"accent.foreground": "#c0caf5", "accent.foreground": "#c0caf5",
"accordion.active.background": "#414868",
"accordion.hover.background": "#292e42",
"background": "#1a1b26", "background": "#1a1b26",
"border": "#292e42", "border": "#292e42",
"window_border": "#3d4462", "window_border": "#3d4462",
@ -151,8 +149,6 @@
"colors": { "colors": {
"accent.background": "#414868", "accent.background": "#414868",
"accent.foreground": "#c0caf5", "accent.foreground": "#c0caf5",
"accordion.active.background": "#414868",
"accordion.hover.background": "#292e42",
"background": "#24283b", "background": "#24283b",
"border": "#3d4462", "border": "#3d4462",
"window_border": "#3d4462", "window_border": "#3d4462",
@ -287,8 +283,6 @@
"colors": { "colors": {
"accent.background": "#32364E", "accent.background": "#32364E",
"accent.foreground": "#c0caf5", "accent.foreground": "#c0caf5",
"accordion.active.background": "#444b6a",
"accordion.hover.background": "#2d3149",
"background": "#222436", "background": "#222436",
"border": "#323752", "border": "#323752",
"window_border": "#404668", "window_border": "#404668",

View file

@ -10,8 +10,6 @@
"colors": { "colors": {
"accent.background": "#1F1F1F", "accent.background": "#1F1F1F",
"accent.foreground": "#dcdcdc", "accent.foreground": "#dcdcdc",
"accordion.active.background": "#1e1e1e",
"accordion.hover.background": "#3e3e3e",
"background": "#141414", "background": "#141414",
"border": "#3e3e3e", "border": "#3e3e3e",
"foreground": "#dcdcdc", "foreground": "#dcdcdc",