From 709a888e15051796a35ad77ed7ff734d05e41151 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 29 Aug 2025 11:51:32 +0800 Subject: [PATCH] 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. image --- .theme-schema.json | 4 - crates/ui/src/accordion.rs | 4 +- crates/ui/src/theme/schema.rs | 6 +- crates/ui/src/theme/theme_color.rs | 2 - themes/adventure.json | 4 - themes/alduin.json | 296 ++++++++++++++------------- themes/ayu.json | 4 - themes/catppuccin.json | 8 - themes/default.json | 6 +- themes/everforest.json | 4 - themes/fahrenheit.json | 2 - themes/flexoki.json | 6 +- themes/gruvbox.json | 4 - themes/harper.json | 2 - themes/hybrid.json | 8 +- themes/jellybeans.json | 2 - themes/kibble.json | 304 ++++++++++++++-------------- themes/macos-classic.json | 5 - themes/mandarin-square.json | 308 ++++++++++++++-------------- themes/matrix.json | 311 ++++++++++++++--------------- themes/mellifluous.json | 4 - themes/molokai.json | 2 - themes/solarized.json | 5 - themes/spaceduck.json | 2 - themes/tokyonight.json | 6 - themes/twilight.json | 2 - 26 files changed, 612 insertions(+), 699 deletions(-) diff --git a/.theme-schema.json b/.theme-schema.json index f3fc7f60..c6a7e8e1 100644 --- a/.theme-schema.json +++ b/.theme-schema.json @@ -106,10 +106,6 @@ "description": "Accordion background color.", "type": ["string", "null"] }, - "accordion.active.background": { - "description": "Accordion active background color.", - "type": ["string", "null"] - }, "accordion.hover.background": { "description": "Accordion hover background color.", "type": ["string", "null"] diff --git a/crates/ui/src/accordion.rs b/crates/ui/src/accordion.rs index 409bdfb8..cfa23382 100644 --- a/crates/ui/src/accordion.rs +++ b/crates/ui/src/accordion.rs @@ -247,9 +247,7 @@ impl RenderOnce for AccordionItem { }) }) .when(!self.bordered, |this| { - this.border_b_1() - .border_color(cx.theme().border) - .rounded_t(cx.theme().radius) + this.border_b_1().border_color(cx.theme().border) }) .child( h_flex() diff --git a/crates/ui/src/theme/schema.rs b/crates/ui/src/theme/schema.rs index c9b561c5..05446881 100644 --- a/crates/ui/src/theme/schema.rs +++ b/crates/ui/src/theme/schema.rs @@ -57,9 +57,6 @@ pub struct ThemeConfigColors { /// Accordion background color. #[serde(rename = "accordion.background")] pub accordion: Option, - /// Accordion active background color. - #[serde(rename = "accordion.active.background")] - pub accordion_active: Option, /// Accordion hover background color. #[serde(rename = "accordion.hover.background")] pub accordion_hover: Option, @@ -507,8 +504,7 @@ impl ThemeColor { apply_color!(accent, fallback = self.secondary); apply_color!(accent_foreground, fallback = self.secondary_foreground); apply_color!(accordion, fallback = self.background); - apply_color!(accordion_active, fallback = self.accordion); - apply_color!(accordion_hover, fallback = self.accordion); + apply_color!(accordion_hover, fallback = self.accent.opacity(0.8)); apply_color!( group_box, fallback = self diff --git a/crates/ui/src/theme/theme_color.rs b/crates/ui/src/theme/theme_color.rs index 50dae591..dee42421 100644 --- a/crates/ui/src/theme/theme_color.rs +++ b/crates/ui/src/theme/theme_color.rs @@ -14,8 +14,6 @@ pub struct ThemeColor { pub accent_foreground: Hsla, /// Accordion background color. pub accordion: Hsla, - /// Accordion active background color. - pub accordion_active: Hsla, /// Accordion hover background color. pub accordion_hover: Hsla, /// Default background color. diff --git a/themes/adventure.json b/themes/adventure.json index 0d5c638f..3b666165 100644 --- a/themes/adventure.json +++ b/themes/adventure.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#25292d", "accent.foreground": "#feffff", - "accordion.active.background": "#003a5b", - "accordion.hover.background": "#4b6479", "background": "#040404", "border": "#282828", "danger.background": "#d84a33", @@ -164,8 +162,6 @@ "colors": { "accent.background": "#36345f", "accent.foreground": "#f8dcc0", - "accordion.active.background": "#003a5b", - "accordion.hover.background": "#4b6479", "background": "#1f1d45", "border": "#333150", "foreground": "#f8dcc0", diff --git a/themes/alduin.json b/themes/alduin.json index a35a1081..cf4557af 100644 --- a/themes/alduin.json +++ b/themes/alduin.json @@ -1,152 +1,150 @@ { - "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", - "name": "Alduin", - "author": "AlessandroYorba", - "url": "https://github.com/AlessandroYorba/Alduin", - "themes": [ - { - "name": "Alduin", - "mode": "dark", - "colors": { - "accent.background": "#322F2D", - "accent.foreground": "#ebdbb2", - "accordion.active.background": "#504945", - "accordion.hover.background": "#665c54", - "background": "#1C1C1C", - "border": "#3a3a3a", - "danger.background": "#cc241d", - "danger.active.background": "#cc241d", - "danger.hover.background": "#fb4934", - "foreground": "#9E9E9E", - "input.border": "#504945", - "link.active.foreground": "#83a598", - "link.foreground": "#83a598", - "link.hover.foreground": "#83a598", - "list.active.background": "#26262622", - "list.active.border": "#9E9E9E", - "list.even.background": "#262626", - "list.head.background": "#1C1C1C", - "muted.background": "#3c3836", - "muted.foreground": "#878787", - "panel.background": "#282828", - "popover.background": "#141414", - "popover.foreground": "#ebdbb2", - "primary.active.background": "#45858899", - "primary.background": "#458588", - "primary.foreground": "#F0F0F0", - "primary.hover.background": "#458588AA", - "scrollbar.background": "#28282833", - "scrollbar.thumb.background": "#504945", - "secondary.background": "#282828", - "secondary.active.background": "#322F2D", - "secondary.foreground": "#9E9E9E", - "secondary.hover.background": "#26262699", - "tab.active.background": "#1C1C1C", - "tab.active.foreground": "#ebdbb2", - "tab.background": "#14141400", - "tab.foreground": "#848382", - "tab_bar.background": "#141414", - "table.row.border": "#50494570", - "title_bar.background": "#262626", - "title_bar.border": "#3a3a3a", - "base.blue": "#87afaf", - "base.cyan": "#878787", - "base.green": "#87875f", - "base.magenta": "#af8787", - "base.magenta.light": "#af878788", - "base.red": "#8b5f61", - "base.yellow": "#fed975" - }, - "highlight": { - "editor.foreground": "#DDDDDD", - "editor.background": "#000000", - "editor.active_line.background": "#131313", - "editor.line_number": "#8F8F8F", - "editor.active_line_number": "#DDDDDD", - "conflict": "#D2602D", - "created": "#3f72e2", - "error.border": "#802207", - "hidden": "#9E9E9E", - "hint": "#b283f8", - "hint.border": "#3f0891", - "info.border": "#082190", - "modified": "#B0A878", - "predictive": "#5D5945", - "syntax": { - "attribute": { - "color": "#be9a52" - }, - "boolean": { - "color": "#E1D797" - }, - "comment": { - "color": "#9E9E9E" - }, - "comment.doc": { - "color": "#9E9E9E" - }, - "constant": { - "color": "#E1D797" - }, - "constructor": { - "color": "#b5af9a" - }, - "embedded": { - "color": "#CACCCA" - }, - "function": { - "color": "#E1D797" - }, - "keyword": { - "color": "#E19773" - }, - "link_text": { - "color": "#A86D3B", - "font_style": "normal" - }, - "link_uri": { - "color": "#6F6D66", - "font_style": "italic" - }, - "number": { - "color": "#E19773" - }, - "string": { - "color": "#76BA53" - }, - "string.escape": { - "color": "#76BA53" - }, - "string.regex": { - "color": "#76BA53" - }, - "string.special": { - "color": "#E1D797" - }, - "string.special.symbol": { - "color": "#E1D797" - }, - "tag": { - "color": "#b5af9a" - }, - "text.literal": { - "color": "#E1D797" - }, - "title": { - "color": "#A76D3B", - "font_weight": 600 - }, - "type": { - "color": "#A86D3B" - }, - "property": { - "color": "#CACCCA" - }, - "variable.special": { - "color": "#E19773" - } - } - } + "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", + "name": "Alduin", + "author": "AlessandroYorba", + "url": "https://github.com/AlessandroYorba/Alduin", + "themes": [ + { + "name": "Alduin", + "mode": "dark", + "colors": { + "accent.background": "#322F2D", + "accent.foreground": "#ebdbb2", + "background": "#1C1C1C", + "border": "#3a3a3a", + "danger.background": "#cc241d", + "danger.active.background": "#cc241d", + "danger.hover.background": "#fb4934", + "foreground": "#9E9E9E", + "input.border": "#504945", + "link.active.foreground": "#83a598", + "link.foreground": "#83a598", + "link.hover.foreground": "#83a598", + "list.active.background": "#26262622", + "list.active.border": "#9E9E9E", + "list.even.background": "#262626", + "list.head.background": "#1C1C1C", + "muted.background": "#3c3836", + "muted.foreground": "#878787", + "panel.background": "#282828", + "popover.background": "#141414", + "popover.foreground": "#ebdbb2", + "primary.active.background": "#45858899", + "primary.background": "#458588", + "primary.foreground": "#F0F0F0", + "primary.hover.background": "#458588AA", + "scrollbar.background": "#28282833", + "scrollbar.thumb.background": "#504945", + "secondary.background": "#282828", + "secondary.active.background": "#322F2D", + "secondary.foreground": "#9E9E9E", + "secondary.hover.background": "#26262699", + "tab.active.background": "#1C1C1C", + "tab.active.foreground": "#ebdbb2", + "tab.background": "#14141400", + "tab.foreground": "#848382", + "tab_bar.background": "#141414", + "table.row.border": "#50494570", + "title_bar.background": "#262626", + "title_bar.border": "#3a3a3a", + "base.blue": "#87afaf", + "base.cyan": "#878787", + "base.green": "#87875f", + "base.magenta": "#af8787", + "base.magenta.light": "#af878788", + "base.red": "#8b5f61", + "base.yellow": "#fed975" + }, + "highlight": { + "editor.foreground": "#DDDDDD", + "editor.background": "#000000", + "editor.active_line.background": "#131313", + "editor.line_number": "#8F8F8F", + "editor.active_line_number": "#DDDDDD", + "conflict": "#D2602D", + "created": "#3f72e2", + "error.border": "#802207", + "hidden": "#9E9E9E", + "hint": "#b283f8", + "hint.border": "#3f0891", + "info.border": "#082190", + "modified": "#B0A878", + "predictive": "#5D5945", + "syntax": { + "attribute": { + "color": "#be9a52" + }, + "boolean": { + "color": "#E1D797" + }, + "comment": { + "color": "#9E9E9E" + }, + "comment.doc": { + "color": "#9E9E9E" + }, + "constant": { + "color": "#E1D797" + }, + "constructor": { + "color": "#b5af9a" + }, + "embedded": { + "color": "#CACCCA" + }, + "function": { + "color": "#E1D797" + }, + "keyword": { + "color": "#E19773" + }, + "link_text": { + "color": "#A86D3B", + "font_style": "normal" + }, + "link_uri": { + "color": "#6F6D66", + "font_style": "italic" + }, + "number": { + "color": "#E19773" + }, + "string": { + "color": "#76BA53" + }, + "string.escape": { + "color": "#76BA53" + }, + "string.regex": { + "color": "#76BA53" + }, + "string.special": { + "color": "#E1D797" + }, + "string.special.symbol": { + "color": "#E1D797" + }, + "tag": { + "color": "#b5af9a" + }, + "text.literal": { + "color": "#E1D797" + }, + "title": { + "color": "#A76D3B", + "font_weight": 600 + }, + "type": { + "color": "#A86D3B" + }, + "property": { + "color": "#CACCCA" + }, + "variable.special": { + "color": "#E19773" + } } - ] + } + } + ] } diff --git a/themes/ayu.json b/themes/ayu.json index bb40e85c..d2eddc12 100644 --- a/themes/ayu.json +++ b/themes/ayu.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#ECECED", "accent.foreground": "#5C6773", - "accordion.active.background": "#F3F4F5", - "accordion.hover.background": "#D9DCE3", "background": "#fafafa", "foreground": "#5C6773", "border": "#E6E8EA", @@ -161,8 +159,6 @@ "colors": { "accent.background": "#191F2A", "accent.foreground": "#B3B1AD", - "accordion.active.background": "#1F2430", - "accordion.hover.background": "#333F58", "background": "#0F1419", "border": "#444444", "ring": "#FFB454", diff --git a/themes/catppuccin.json b/themes/catppuccin.json index b3776142..ca026f49 100644 --- a/themes/catppuccin.json +++ b/themes/catppuccin.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#D6DAE2", "accent.foreground": "#4c4f69", - "accordion.active.background": "#dce0e8", - "accordion.hover.background": "#acb0be", "background": "#E5E9EF", "border": "#CCD0DA", "ring": "#c6d0f5", @@ -403,8 +401,6 @@ "colors": { "accent.background": "#3b3f4f", "accent.foreground": "#c6d0f5", - "accordion.active.background": "#414559", - "accordion.hover.background": "#51576d", "background": "#232634", "border": "#3e4255", "ring": "#f2d5cf", @@ -540,8 +536,6 @@ "colors": { "accent.background": "#24273a", "accent.foreground": "#cad3f5", - "accordion.active.background": "#363a4f", - "accordion.hover.background": "#494d64", "action_bar.background": "#1E2030", "background": "#1E2030", "border": "#494d64", @@ -689,8 +683,6 @@ "colors": { "accent.background": "#2e2e3e", "accent.foreground": "#cdd6f4", - "accordion.active.background": "#302d41", - "accordion.hover.background": "#575268", "background": "#181825", "border": "#313244", "ring": "#cba6f7", diff --git a/themes/default.json b/themes/default.json index c7999beb..89ce3f5a 100644 --- a/themes/default.json +++ b/themes/default.json @@ -12,8 +12,6 @@ "accent.background": "#f5f5f5", "accent.foreground": "#171717", "accordion.background": "#ffffff", - "accordion.active.background": "#e5e5e5", - "accordion.hover.background": "#f5f5f5", "background": "#ffffff", "border": "#e5e5e5", "group_box.background": "#f5f5f5", @@ -215,8 +213,6 @@ "accent.background": "#171717", "accent.foreground": "#fafafa", "accordion.background": "#0a0a0a", - "accordion.active.background": "#262626", - "accordion.hover.background": "#262626e6", "background": "#0a0a0a", "border": "#262626", "group_box.background": "#171717", @@ -420,4 +416,4 @@ } } ] -} \ No newline at end of file +} diff --git a/themes/everforest.json b/themes/everforest.json index a559fcc1..899ed729 100644 --- a/themes/everforest.json +++ b/themes/everforest.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#E7E5D4", "accent.foreground": "#5F6D75", - "accordion.active.background": "#d3c6aa", - "accordion.hover.background": "#E7E5D4", "background": "#FEFCEE", "border": "#E7E5D4", "danger.background": "#e67e80", @@ -155,8 +153,6 @@ "colors": { "accent.background": "#3c4448", "accent.foreground": "#d3c6aa", - "accordion.active.background": "#2E383B", - "accordion.hover.background": "#485156", "background": "#262E34", "border": "#40484c", "danger.active.background": "#e67e80", diff --git a/themes/fahrenheit.json b/themes/fahrenheit.json index 158f5819..fa83d399 100644 --- a/themes/fahrenheit.json +++ b/themes/fahrenheit.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#171717", "accent.foreground": "#FFFFCE", - "accordion.active.background": "#1e1e1e", - "accordion.hover.background": "#3e3e3e", "background": "#000000", "border": "#252525", "danger.background": "#593002", diff --git a/themes/flexoki.json b/themes/flexoki.json index 0c1fb03c..871d31bd 100644 --- a/themes/flexoki.json +++ b/themes/flexoki.json @@ -30,7 +30,7 @@ "scrollbar.thumb.hover.background": "#DAD8CE", "secondary.active.background": "#DAD8CE", "secondary.background": "#F2F0E5", - "secondary.foreground": "#5C6773", + "secondary.foreground": "#100F0F", "secondary.hover.background": "#E6E4D9", "tab.active.background": "#FFFCF0", "tab.active.foreground": "#100F0F", @@ -238,10 +238,8 @@ "name": "Flexoki Dark", "mode": "dark", "colors": { - "accent.background": "#343331", + "accent.background": "#1f1d1c", "accent.foreground": "#CECDC3", - "accordion.active.background": "#282726", - "accordion.hover.background": "#343331", "background": "#100F0F", "border": "#282726", "ring": "#AD8301", diff --git a/themes/gruvbox.json b/themes/gruvbox.json index a03547fe..2ca0615c 100644 --- a/themes/gruvbox.json +++ b/themes/gruvbox.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#ebdbb2", "accent.foreground": "#3c3836", - "accordion.active.background": "#fbf1c7", - "accordion.hover.background": "#d5c4a1", "background": "#fbf1c7", "border": "#d5c4a1", "danger.background": "#fb4934", @@ -159,8 +157,6 @@ "colors": { "accent.background": "#282828", "accent.foreground": "#ebdbb2", - "accordion.active.background": "#282828", - "accordion.hover.background": "#504945", "background": "#1d2021", "border": "#3e3936", "card.background": "#282828", diff --git a/themes/harper.json b/themes/harper.json index d39920a2..62bfe3a3 100644 --- a/themes/harper.json +++ b/themes/harper.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#18151B", "accent.foreground": "#a8a49d", - "accordion.active.background": "#003a5b", - "accordion.hover.background": "#726E69", "background": "#010101", "border": "#333333", "foreground": "#a8a49d", diff --git a/themes/hybrid.json b/themes/hybrid.json index 72f4cca7..52e6d363 100644 --- a/themes/hybrid.json +++ b/themes/hybrid.json @@ -8,10 +8,8 @@ "name": "Hybrid Light", "mode": "light", "colors": { - "accent.background": "#D4E2E2", + "accent.background": "#d3d8da", "accent.foreground": "#1c1c1c", - "accordion.active.background": "#d3d3d3", - "accordion.hover.background": "#c0c0c0", "background": "#E4E4E4", "border": "#CACACA", "danger.background": "#ff5f5f", @@ -155,10 +153,8 @@ "name": "Hybrid Dark", "mode": "dark", "colors": { - "accent.background": "#313E40", + "accent.background": "#292f30", "accent.foreground": "#e8e8e8", - "accordion.active.background": "#1c1c1c", - "accordion.hover.background": "#3a3a3a", "background": "#1D1F21", "border": "#34373c", "card.background": "#1D1F21", diff --git a/themes/jellybeans.json b/themes/jellybeans.json index f2087b2f..bc56236a 100644 --- a/themes/jellybeans.json +++ b/themes/jellybeans.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#232323", "accent.foreground": "#e8e8e8", - "accordion.active.background": "#444444", - "accordion.hover.background": "#4E4847", "background": "#151515", "border": "#2e2e2e", "danger.foreground": "#151515", diff --git a/themes/kibble.json b/themes/kibble.json index 1916dcb0..98957748 100644 --- a/themes/kibble.json +++ b/themes/kibble.json @@ -1,156 +1,154 @@ { - "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", - "name": "Kibble", - "author": "iTerm2-Color-Schemes", - "url": "https://github.com/mbadolato/iTerm2-Color-Schemes", - "themes": [ - { - "name": "Kibble", - "mode": "dark", - "colors": { - "accent.background": "#242223", - "accent.foreground": "#f7f7f7", - "accordion.active.background": "#003a5b", - "accordion.hover.background": "#726E69", - "background": "#0e100a", - "border": "#333333", - "danger.background": "#c70031", - "danger.active.background": "#c7003199", - "danger.hover.background": "#e00038", - "foreground": "#f7f7f7", - "input.border": "#333333", - "list.active.background": "#3448D122", - "list.active.border": "#3448D1", - "list.hover.background": "#2c292b54", - "list.even.background": "#24222355", - "muted.background": "#333333", - "muted.foreground": "#726E69", - "panel.background": "#003a5b", - "popover.background": "#0e100a", - "popover.foreground": "#f7f7f7", - "primary.active.background": "#3449d199", - "primary.background": "#3449d1", - "primary.foreground": "#f7f7f7", - "primary.hover.background": "#4457d5", - "scrollbar.background": "#003a5b00", - "scrollbar.thumb.background": "#726E69", - "secondary.background": "#3d3d3d", - "secondary.active.background": "#2d2d2d", - "secondary.foreground": "#f7f7f7", - "secondary.hover.background": "#404040", - "tab.active.background": "#0e100a", - "tab.active.foreground": "#f7f7f7", - "tab.foreground": "#969696", - "base.red": "#C70231", - "base.red.light": "#f01578", - "base.green": "#2BCF13", - "base.green.light": "#6ce05c", - "base.blue": "#3449d1", - "base.blue.light": "#97a4f7", - "base.cyan": "#0798ab", - "base.cyan.light": "#68f2e0", - "base.magenta": "#8400ff", - "base.magenta.light": "#C495F0", - "base.yellow": "#c7a302", - "base.yellow.light": "#f3f79e" - }, - "highlight": { - "editor.foreground": "#f7f7f7", - "editor.background": "#0e100a", - "editor.active_line.background": "#242223", - "editor.line_number": "#726E69", - "editor.active_line_number": "#f7f7f7", - "conflict": "#c70031", - "created": "#2BCF13", - "deleted": "#c70031", - "error": "#c70031", - "hidden": "#726E69", - "hint": "#0798ab", - "ignored": "#726E69", - "info": "#0798ab", - "modified": "#3449d1", - "predictive": "#726E69", - "renamed": "#3449d1", - "success": "#2BCF13", - "unreachable": "#726E69", - "warning": "#c7a302", - "syntax": { - "attribute": { - "color": "#3449d1" - }, - "boolean": { - "color": "#c7a302" - }, - "comment": { - "color": "#726E69", - "font_style": "italic" - }, - "comment.doc": { - "color": "#726E69", - "font_style": "italic" - }, - "constant": { - "color": "#c7a302" - }, - "constructor": { - "color": "#3449d1" - }, - "embedded": { - "color": "#f7f7f7" - }, - "function": { - "color": "#c7a302" - }, - "keyword": { - "color": "#c70031" - }, - "link_text": { - "color": "#0798ab", - "font_style": "normal" - }, - "link_uri": { - "color": "#68f2e0", - "font_style": "italic" - }, - "number": { - "color": "#c70031" - }, - "string": { - "color": "#2BCF13" - }, - "string.escape": { - "color": "#2BCF13" - }, - "string.regex": { - "color": "#2BCF13" - }, - "string.special": { - "color": "#c7a302" - }, - "string.special.symbol": { - "color": "#c7a302" - }, - "tag": { - "color": "#3449d1" - }, - "text.literal": { - "color": "#c7a302" - }, - "title": { - "color": "#3449d1", - "font_weight": 600 - }, - "type": { - "color": "#3449d1" - }, - "property": { - "color": "#f7f7f7" - }, - "variable.special": { - "color": "#c70031" - } - } - } + "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", + "name": "Kibble", + "author": "iTerm2-Color-Schemes", + "url": "https://github.com/mbadolato/iTerm2-Color-Schemes", + "themes": [ + { + "name": "Kibble", + "mode": "dark", + "colors": { + "accent.background": "#242223", + "accent.foreground": "#f7f7f7", + "background": "#0e100a", + "border": "#333333", + "danger.background": "#c70031", + "danger.active.background": "#c7003199", + "danger.hover.background": "#e00038", + "foreground": "#f7f7f7", + "input.border": "#333333", + "list.active.background": "#3448D122", + "list.active.border": "#3448D1", + "list.hover.background": "#2c292b54", + "list.even.background": "#24222355", + "muted.background": "#333333", + "muted.foreground": "#726E69", + "panel.background": "#003a5b", + "popover.background": "#0e100a", + "popover.foreground": "#f7f7f7", + "primary.active.background": "#3449d199", + "primary.background": "#3449d1", + "primary.foreground": "#f7f7f7", + "primary.hover.background": "#4457d5", + "scrollbar.background": "#003a5b00", + "scrollbar.thumb.background": "#726E69", + "secondary.background": "#3d3d3d", + "secondary.active.background": "#2d2d2d", + "secondary.foreground": "#f7f7f7", + "secondary.hover.background": "#404040", + "tab.active.background": "#0e100a", + "tab.active.foreground": "#f7f7f7", + "tab.foreground": "#969696", + "base.red": "#C70231", + "base.red.light": "#f01578", + "base.green": "#2BCF13", + "base.green.light": "#6ce05c", + "base.blue": "#3449d1", + "base.blue.light": "#97a4f7", + "base.cyan": "#0798ab", + "base.cyan.light": "#68f2e0", + "base.magenta": "#8400ff", + "base.magenta.light": "#C495F0", + "base.yellow": "#c7a302", + "base.yellow.light": "#f3f79e" + }, + "highlight": { + "editor.foreground": "#f7f7f7", + "editor.background": "#0e100a", + "editor.active_line.background": "#242223", + "editor.line_number": "#726E69", + "editor.active_line_number": "#f7f7f7", + "conflict": "#c70031", + "created": "#2BCF13", + "deleted": "#c70031", + "error": "#c70031", + "hidden": "#726E69", + "hint": "#0798ab", + "ignored": "#726E69", + "info": "#0798ab", + "modified": "#3449d1", + "predictive": "#726E69", + "renamed": "#3449d1", + "success": "#2BCF13", + "unreachable": "#726E69", + "warning": "#c7a302", + "syntax": { + "attribute": { + "color": "#3449d1" + }, + "boolean": { + "color": "#c7a302" + }, + "comment": { + "color": "#726E69", + "font_style": "italic" + }, + "comment.doc": { + "color": "#726E69", + "font_style": "italic" + }, + "constant": { + "color": "#c7a302" + }, + "constructor": { + "color": "#3449d1" + }, + "embedded": { + "color": "#f7f7f7" + }, + "function": { + "color": "#c7a302" + }, + "keyword": { + "color": "#c70031" + }, + "link_text": { + "color": "#0798ab", + "font_style": "normal" + }, + "link_uri": { + "color": "#68f2e0", + "font_style": "italic" + }, + "number": { + "color": "#c70031" + }, + "string": { + "color": "#2BCF13" + }, + "string.escape": { + "color": "#2BCF13" + }, + "string.regex": { + "color": "#2BCF13" + }, + "string.special": { + "color": "#c7a302" + }, + "string.special.symbol": { + "color": "#c7a302" + }, + "tag": { + "color": "#3449d1" + }, + "text.literal": { + "color": "#c7a302" + }, + "title": { + "color": "#3449d1", + "font_weight": 600 + }, + "type": { + "color": "#3449d1" + }, + "property": { + "color": "#f7f7f7" + }, + "variable.special": { + "color": "#c70031" + } } - ] + } + } + ] } diff --git a/themes/macos-classic.json b/themes/macos-classic.json index ce6f9f42..95669616 100644 --- a/themes/macos-classic.json +++ b/themes/macos-classic.json @@ -10,9 +10,6 @@ "colors": { "accent.background": "#EAEAEA", "accent.foreground": "#000000", - "accordion.active.background": "#F7F7F7", - "accordion.background": "#F9F9F9", - "accordion.hover.background": "#D0D0D0", "background": "#FFFFFF", "foreground": "#000000", "border": "#D2D2D2", @@ -160,8 +157,6 @@ "colors": { "accent.background": "#353436", "accent.foreground": "#CACCCA", - "accordion.active.background": "#1E1D1E", - "accordion.hover.background": "#353436", "background": "#131313", "border": "#404040", "ring": "#A76D3B", diff --git a/themes/mandarin-square.json b/themes/mandarin-square.json index 52c7a8fb..6e0de676 100644 --- a/themes/mandarin-square.json +++ b/themes/mandarin-square.json @@ -1,158 +1,156 @@ { - "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", - "name": "Mandarin Square", - "author": "huacnlee", - "url": "https://en.wikipedia.org/wiki/Mandarin_square", - "themes": [ - { - "name": "Mandarin Square", - "mode": "dark", - "colors": { - "accent.background": "#2B2525", - "accent.foreground": "#ebdbb2", - "accordion.active.background": "#504945", - "accordion.hover.background": "#665c54", - "background": "#110D10", - "border": "#312B32", - "danger.background": "#cc241d", - "danger.active.background": "#cc241d", - "danger.foreground": "#282828", - "danger.hover.background": "#fb4934", - "foreground": "#F0DBC6", - "input.border": "#504945", - "list.active.background": "#7F5B2128", - "list.active.border": "#D99832", - "list.even.background": "#28282899", - "muted.background": "#3c3836", - "muted.foreground": "#878787", - "panel.background": "#282828", - "popover.background": "#1B1717", - "popover.foreground": "#ebdbb2", - "primary.active.background": "#324a8f99", - "primary.background": "#324a8f", - "primary.foreground": "#c6cdf0", - "primary.hover.background": "#38519f", - "scrollbar.background": "#28282844", - "scrollbar.thumb.background": "#504945", - "secondary.background": "#312C31", - "secondary.active.background": "#201B20", - "secondary.foreground": "#D5BBA3", - "secondary.hover.background": "#3b353b", - "tab.active.background": "#110D10", - "tab.active.foreground": "#ebdbb2", - "tab.background": "#1B171700", - "tab.foreground": "#928d81", - "tab_bar.background": "#110D10", - "title_bar.background": "#110D10", - "title_bar.border": "#312B32", - "base.blue": "#33467F", - "base.cyan": "#A0C4D8", - "base.green": "#55743e", - "base.magenta": "#522431", - "base.magenta.light": "#52243188", - "base.red": "#B51E00", - "base.yellow": "#D99832", - "warning.foreground": "#282828", - "success.foreground": "#ebdbb2", - "info.foreground": "#282828" - }, - "highlight": { - "editor.foreground": "#ebdbb2", - "editor.background": "#282828", - "editor.active_line.background": "#3c3836", - "editor.line_number": "#928374", - "editor.active_line_number": "#ebdbb2", - "conflict": "#cc241d", - "created": "#7c6f64", - "deleted": "#9d0006", - "error": "#cc241d", - "hidden": "#928374", - "hint": "#83a598", - "ignored": "#928374", - "info": "#83a598", - "modified": "#b57614", - "predictive": "#928374", - "renamed": "#b57614", - "success": "#7c6f64", - "unreachable": "#928374", - "warning": "#d79921", - "syntax": { - "attribute": { - "color": "#d79921" - }, - "boolean": { - "color": "#d79921" - }, - "comment": { - "color": "#928374", - "font_style": "italic" - }, - "comment.doc": { - "color": "#928374", - "font_style": "italic" - }, - "constant": { - "color": "#d79921" - }, - "constructor": { - "color": "#b57614" - }, - "embedded": { - "color": "#ebdbb2" - }, - "function": { - "color": "#d79921" - }, - "keyword": { - "color": "#cc241d" - }, - "link_text": { - "color": "#83a598", - "font_style": "normal" - }, - "link_uri": { - "color": "#076678", - "font_style": "italic" - }, - "number": { - "color": "#cc241d" - }, - "string": { - "color": "#7c6f64" - }, - "string.escape": { - "color": "#7c6f64" - }, - "string.regex": { - "color": "#7c6f64" - }, - "string.special": { - "color": "#d79921" - }, - "string.special.symbol": { - "color": "#d79921" - }, - "tag": { - "color": "#b57614" - }, - "text.literal": { - "color": "#d79921" - }, - "title": { - "color": "#b57614", - "font_weight": 600 - }, - "type": { - "color": "#b57614" - }, - "property": { - "color": "#ebdbb2" - }, - "variable.special": { - "color": "#cc241d" - } - } - } + "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", + "name": "Mandarin Square", + "author": "huacnlee", + "url": "https://en.wikipedia.org/wiki/Mandarin_square", + "themes": [ + { + "name": "Mandarin Square", + "mode": "dark", + "colors": { + "accent.background": "#2a2c33", + "accent.foreground": "#e3dbd3", + "background": "#110D10", + "border": "#312B32", + "danger.background": "#cc241d", + "danger.active.background": "#cc241d", + "danger.foreground": "#282828", + "danger.hover.background": "#fb4934", + "foreground": "#e3dbd3", + "input.border": "#504945", + "list.active.background": "#7F5B2128", + "list.active.border": "#D99832", + "list.even.background": "#28282899", + "muted.background": "#3c3836", + "muted.foreground": "#878787", + "panel.background": "#282828", + "popover.background": "#110D10", + "popover.foreground": "#e3dbd3", + "primary.active.background": "#324a8f99", + "primary.background": "#324a8f", + "primary.foreground": "#c6cdf0", + "primary.hover.background": "#38519f", + "scrollbar.background": "#28282844", + "scrollbar.thumb.background": "#504945", + "secondary.background": "#312C31", + "secondary.active.background": "#201B20", + "secondary.foreground": "#e3dbd3", + "secondary.hover.background": "#3b353b", + "tab.active.background": "#110D10", + "tab.active.foreground": "#ebdbb2", + "tab.background": "#1B171700", + "tab.foreground": "#928d81", + "tab_bar.background": "#110D10", + "title_bar.background": "#110D10", + "title_bar.border": "#312B32", + "base.blue": "#33467F", + "base.cyan": "#A0C4D8", + "base.green": "#55743e", + "base.magenta": "#522431", + "base.magenta.light": "#52243188", + "base.red": "#B51E00", + "base.yellow": "#D99832", + "warning.foreground": "#282828", + "success.foreground": "#ebdbb2", + "info.foreground": "#282828" + }, + "highlight": { + "editor.foreground": "#ebdbb2", + "editor.background": "#282828", + "editor.active_line.background": "#3c3836", + "editor.line_number": "#928374", + "editor.active_line_number": "#ebdbb2", + "conflict": "#cc241d", + "created": "#7c6f64", + "deleted": "#9d0006", + "error": "#cc241d", + "hidden": "#928374", + "hint": "#83a598", + "ignored": "#928374", + "info": "#83a598", + "modified": "#b57614", + "predictive": "#928374", + "renamed": "#b57614", + "success": "#7c6f64", + "unreachable": "#928374", + "warning": "#d79921", + "syntax": { + "attribute": { + "color": "#d79921" + }, + "boolean": { + "color": "#d79921" + }, + "comment": { + "color": "#928374", + "font_style": "italic" + }, + "comment.doc": { + "color": "#928374", + "font_style": "italic" + }, + "constant": { + "color": "#d79921" + }, + "constructor": { + "color": "#b57614" + }, + "embedded": { + "color": "#ebdbb2" + }, + "function": { + "color": "#d79921" + }, + "keyword": { + "color": "#cc241d" + }, + "link_text": { + "color": "#83a598", + "font_style": "normal" + }, + "link_uri": { + "color": "#076678", + "font_style": "italic" + }, + "number": { + "color": "#cc241d" + }, + "string": { + "color": "#7c6f64" + }, + "string.escape": { + "color": "#7c6f64" + }, + "string.regex": { + "color": "#7c6f64" + }, + "string.special": { + "color": "#d79921" + }, + "string.special.symbol": { + "color": "#d79921" + }, + "tag": { + "color": "#b57614" + }, + "text.literal": { + "color": "#d79921" + }, + "title": { + "color": "#b57614", + "font_weight": 600 + }, + "type": { + "color": "#b57614" + }, + "property": { + "color": "#ebdbb2" + }, + "variable.special": { + "color": "#cc241d" + } } - ] + } + } + ] } diff --git a/themes/matrix.json b/themes/matrix.json index 8ae047c5..92fbdb1e 100644 --- a/themes/matrix.json +++ b/themes/matrix.json @@ -1,160 +1,157 @@ { - "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", - "name": "Matrix", - "author": "iruzo", - "url": "https://github.com/iruzo/matrix-nvim", - "themes": [ - { - "name": "Matrix", - "mode": "dark", - "colors": { - "accent.background": "#003200", - "accent.foreground": "#00FF00", - "accordion.active.background": "#001900", - "accordion.hover.background": "#003200", - "background": "#020d02", - "border": "#12410E", - "window_border": "#156B12", - "ring": "#00FF00", - "danger.background": "#FF0000", - "danger.active.background": "#FF0000", - "danger.foreground": "#0D0208", - "danger.hover.background": "#FF0000", - "foreground": "#88FF88", - "input.border": "#003200", - "link.active.foreground": "#00FF00", - "link.foreground": "#00FF00", - "link.hover.foreground": "#00FF00", - "list.active.background": "#00190066", - "list.active.border": "#00FF00", - "list.even.background": "#00190066", - "muted.background": "#001900", - "muted.foreground": "#007700", - "panel.background": "#001900", - "popover.background": "#0D0208", - "popover.foreground": "#00FF00", - "primary.active.background": "#00FF0099", - "primary.background": "#00FF00", - "primary.foreground": "#0D0208", - "primary.hover.background": "#00FF00AA", - "scrollbar.background": "#0D020800", - "scrollbar.thumb.background": "#003d00", - "secondary.active.background": "#001B00", - "secondary.background": "#002900", - "secondary.foreground": "#3fd43a", - "secondary.hover.background": "#003300", - "tab.active.background": "#0D0208", - "tab.active.foreground": "#00FF00", - "tab.background": "#0D020800", - "tab.foreground": "#88FF88", - "tab_bar.background": "#0D0208", - "title_bar.background": "#020d02", - "title_bar.border": "#12410E", - "base.red": "#23755a", - "base.green": "#82d967", - "base.yellow": "#ffd700", - "base.blue": "#3f5242", - "base.magenta": "#FF00FF", - "base.magenta.light": "#FF00FF22", - "base.cyan": "#50b45a" - }, - "highlight": { - "editor.foreground": "#88FF88", - "editor.background": "#020d02", - "editor.active_line.background": "#001900", - "editor.line_number": "#007700", - "editor.active_line_number": "#00FF00", - "conflict": "#FF0000", - "created": "#82d967", - "deleted": "#FF0000", - "error": "#FF0000", - "hidden": "#007700", - "hint": "#3fd43a", - "ignored": "#007700", - "info": "#3fd43a", - "modified": "#82d967", - "predictive": "#007700", - "renamed": "#82d967", - "success": "#82d967", - "unreachable": "#007700", - "warning": "#ffd700", - "syntax": { - "attribute": { - "color": "#82d967" - }, - "boolean": { - "color": "#ffd700" - }, - "comment": { - "color": "#007700", - "font_style": "italic" - }, - "comment.doc": { - "color": "#007700", - "font_style": "italic" - }, - "constant": { - "color": "#ffd700" - }, - "constructor": { - "color": "#82d967" - }, - "embedded": { - "color": "#88FF88" - }, - "function": { - "color": "#ffd700" - }, - "keyword": { - "color": "#FF0000" - }, - "link_text": { - "color": "#3fd43a", - "font_style": "normal" - }, - "link_uri": { - "color": "#00FF00", - "font_style": "italic" - }, - "number": { - "color": "#FF0000" - }, - "string": { - "color": "#82d967" - }, - "string.escape": { - "color": "#82d967" - }, - "string.regex": { - "color": "#82d967" - }, - "string.special": { - "color": "#ffd700" - }, - "string.special.symbol": { - "color": "#ffd700" - }, - "tag": { - "color": "#82d967" - }, - "text.literal": { - "color": "#ffd700" - }, - "title": { - "color": "#82d967", - "font_weight": 600 - }, - "type": { - "color": "#82d967" - }, - "property": { - "color": "#88FF88" - }, - "variable.special": { - "color": "#FF0000" - } - } - } + "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", + "name": "Matrix", + "author": "iruzo", + "url": "https://github.com/iruzo/matrix-nvim", + "themes": [ + { + "name": "Matrix", + "mode": "dark", + "colors": { + "accent.background": "#003200", + "accent.foreground": "#00FF00", + "background": "#020d02", + "border": "#12410E", + "window_border": "#156B12", + "ring": "#00FF00", + "danger.background": "#FF0000", + "danger.active.background": "#FF0000", + "danger.foreground": "#0D0208", + "danger.hover.background": "#FF0000", + "foreground": "#88FF88", + "input.border": "#003200", + "link.active.foreground": "#00FF00", + "link.foreground": "#00FF00", + "link.hover.foreground": "#00FF00", + "list.active.background": "#00190066", + "list.active.border": "#00FF00", + "list.even.background": "#00190066", + "muted.background": "#001900", + "muted.foreground": "#007700", + "panel.background": "#001900", + "popover.background": "#0D0208", + "popover.foreground": "#00FF00", + "primary.active.background": "#00FF0099", + "primary.background": "#00FF00", + "primary.foreground": "#0D0208", + "primary.hover.background": "#00FF00AA", + "scrollbar.background": "#0D020800", + "scrollbar.thumb.background": "#003d00", + "secondary.active.background": "#001B00", + "secondary.background": "#002900", + "secondary.foreground": "#3fd43a", + "secondary.hover.background": "#003300", + "tab.active.background": "#0D0208", + "tab.active.foreground": "#00FF00", + "tab.background": "#0D020800", + "tab.foreground": "#88FF88", + "tab_bar.background": "#0D0208", + "title_bar.background": "#020d02", + "title_bar.border": "#12410E", + "base.red": "#FF0000", + "base.green": "#00FF00", + "base.yellow": "#ffea00", + "base.blue": "#0000ff", + "base.magenta": "#FF00FF", + "base.cyan": "#00ffd5" + }, + "highlight": { + "editor.foreground": "#88FF88", + "editor.background": "#020d02", + "editor.active_line.background": "#001900", + "editor.line_number": "#007700", + "editor.active_line_number": "#00FF00", + "conflict": "#FF0000", + "created": "#82d967", + "deleted": "#FF0000", + "error": "#FF0000", + "hidden": "#007700", + "hint": "#3fd43a", + "ignored": "#007700", + "info": "#3fd43a", + "modified": "#82d967", + "predictive": "#007700", + "renamed": "#82d967", + "success": "#82d967", + "unreachable": "#007700", + "warning": "#ffd700", + "syntax": { + "attribute": { + "color": "#82d967" + }, + "boolean": { + "color": "#ffd700" + }, + "comment": { + "color": "#007700", + "font_style": "italic" + }, + "comment.doc": { + "color": "#007700", + "font_style": "italic" + }, + "constant": { + "color": "#ffd700" + }, + "constructor": { + "color": "#82d967" + }, + "embedded": { + "color": "#88FF88" + }, + "function": { + "color": "#ffd700" + }, + "keyword": { + "color": "#FF0000" + }, + "link_text": { + "color": "#3fd43a", + "font_style": "normal" + }, + "link_uri": { + "color": "#00FF00", + "font_style": "italic" + }, + "number": { + "color": "#FF0000" + }, + "string": { + "color": "#82d967" + }, + "string.escape": { + "color": "#82d967" + }, + "string.regex": { + "color": "#82d967" + }, + "string.special": { + "color": "#ffd700" + }, + "string.special.symbol": { + "color": "#ffd700" + }, + "tag": { + "color": "#82d967" + }, + "text.literal": { + "color": "#ffd700" + }, + "title": { + "color": "#82d967", + "font_weight": 600 + }, + "type": { + "color": "#82d967" + }, + "property": { + "color": "#88FF88" + }, + "variable.special": { + "color": "#FF0000" + } } - ] + } + } + ] } diff --git a/themes/mellifluous.json b/themes/mellifluous.json index c48bbec3..42c044d5 100644 --- a/themes/mellifluous.json +++ b/themes/mellifluous.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#d5d5d5", "accent.foreground": "#383a42", - "accordion.active.background": "#fafafa", - "accordion.hover.background": "#d5d5d5", "background": "#E7E7E7", "border": "#CACACA", "danger.active.background": "#e06c75", @@ -159,8 +157,6 @@ "colors": { "accent.background": "#292929", "accent.foreground": "#abb2bf", - "accordion.active.background": "#282c34", - "accordion.hover.background": "#444444", "background": "#1A1A1A", "border": "#444444", "card.background": "#282c34", diff --git a/themes/molokai.json b/themes/molokai.json index ed2699fd..1e3946ce 100644 --- a/themes/molokai.json +++ b/themes/molokai.json @@ -145,8 +145,6 @@ "colors": { "accent.background": "#2b2f30", "accent.foreground": "#f8f8f2", - "accordion.active.background": "#1b1d1e", - "accordion.hover.background": "#2b2d2e", "background": "#1b1d1e", "border": "#3b3b3b", "card.background": "#272822", diff --git a/themes/solarized.json b/themes/solarized.json index 7fc28f2b..d34a5957 100644 --- a/themes/solarized.json +++ b/themes/solarized.json @@ -10,9 +10,6 @@ "colors": { "accent.background": "#EEE8D5", "accent.foreground": "#073642", - "accordion.active.background": "#eee8d5", - "accordion.background": "#fdf6e3", - "accordion.hover.background": "#e0e0d0", "background": "#FDF6E3", "border": "#DCD4BC", "foreground": "#586E75", @@ -155,8 +152,6 @@ "colors": { "accent.background": "#15333A", "accent.foreground": "#fdf6e3", - "accordion.active.background": "#073642", - "accordion.hover.background": "#073642", "background": "#002B36", "border": "#083e4c", "card.background": "#002b36", diff --git a/themes/spaceduck.json b/themes/spaceduck.json index f6044cf1..f26f9be6 100644 --- a/themes/spaceduck.json +++ b/themes/spaceduck.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#1c1d39", "accent.foreground": "#ecf0c1", - "accordion.active.background": "#003a5b", - "accordion.hover.background": "#4b6479", "background": "#0F111B", "border": "#272C42", "foreground": "#ecf0c1", diff --git a/themes/tokyonight.json b/themes/tokyonight.json index 9d90457a..c6815fb4 100644 --- a/themes/tokyonight.json +++ b/themes/tokyonight.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#2C3045", "accent.foreground": "#c0caf5", - "accordion.active.background": "#414868", - "accordion.hover.background": "#292e42", "background": "#1a1b26", "border": "#292e42", "window_border": "#3d4462", @@ -151,8 +149,6 @@ "colors": { "accent.background": "#414868", "accent.foreground": "#c0caf5", - "accordion.active.background": "#414868", - "accordion.hover.background": "#292e42", "background": "#24283b", "border": "#3d4462", "window_border": "#3d4462", @@ -287,8 +283,6 @@ "colors": { "accent.background": "#32364E", "accent.foreground": "#c0caf5", - "accordion.active.background": "#444b6a", - "accordion.hover.background": "#2d3149", "background": "#222436", "border": "#323752", "window_border": "#404668", diff --git a/themes/twilight.json b/themes/twilight.json index caec25e2..d186fc16 100644 --- a/themes/twilight.json +++ b/themes/twilight.json @@ -10,8 +10,6 @@ "colors": { "accent.background": "#1F1F1F", "accent.foreground": "#dcdcdc", - "accordion.active.background": "#1e1e1e", - "accordion.hover.background": "#3e3e3e", "background": "#141414", "border": "#3e3e3e", "foreground": "#dcdcdc",