From 55da14edb2beef111ce24b12035bae433bfafa48 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Wed, 26 Nov 2025 11:54:28 +0800 Subject: [PATCH] theme: Use difference color like the window background for TitleBar. (#1686) --- crates/ui/src/theme/default-theme.json | 4 +-- themes/adventure.json | 22 +++++++------- themes/ayu.json | 3 +- themes/everforest.json | 5 ++-- themes/fahrenheit.json | 1 + themes/flexoki.json | 11 ++++--- themes/gruvbox.json | 4 +-- themes/kibble.json | 40 ++++++++++++++------------ themes/macos-classic.json | 6 ++-- themes/mellifluous.json | 16 +++++------ themes/molokai.json | 5 ++-- themes/solarized.json | 10 +++---- themes/spaceduck.json | 19 ++++++------ themes/tokyonight.json | 6 ++-- themes/twilight.json | 14 ++++----- 15 files changed, 84 insertions(+), 82 deletions(-) diff --git a/crates/ui/src/theme/default-theme.json b/crates/ui/src/theme/default-theme.json index e570a0b7..670cf3b4 100644 --- a/crates/ui/src/theme/default-theme.json +++ b/crates/ui/src/theme/default-theme.json @@ -93,7 +93,7 @@ "table.hover.background": "#f5f5f5", "table.row.border": "#e5e5e5b3", "tiles.background": "#fafafa", - "title_bar.background": "#ffffff", + "title_bar.background": "#F8F8F8", "title_bar.border": "#e5e5e5", "warning.background": "#eab308", "warning.active.background": "#ca8a04", @@ -294,7 +294,7 @@ "table.hover.background": "#262626", "table.row.border": "#262626b3", "tiles.background": "#171717", - "title_bar.background": "#0a0a0a", + "title_bar.background": "#171717", "title_bar.border": "#262626", "warning.background": "#713f12", "warning.active.background": "#5b320f", diff --git a/themes/adventure.json b/themes/adventure.json index 0a726257..cfdd6ae4 100644 --- a/themes/adventure.json +++ b/themes/adventure.json @@ -32,10 +32,10 @@ "primary.hover.background": "#417AB3", "scrollbar.background": "#003a5b00", "scrollbar.thumb.background": "#606060", - "secondary.background": "#1b1b1b", - "secondary.active.background": "#232323", + "secondary.background": "#171a1c", + "secondary.active.background": "#121516", "secondary.foreground": "#e4d5c7", - "secondary.hover.background": "#23232399", + "secondary.hover.background": "#1e2224", "tab.active.background": "#040404", "tab.active.foreground": "#feffff", "tab.background": "#04040400", @@ -44,7 +44,7 @@ "table.background": "#040404", "table.head.foreground": "#feffffb3", "table.row.border": "#4b647970", - "title_bar.background": "#040404", + "title_bar.background": "#0f1112", "ring": "#5da602", "base.red": "#d84a33", "base.red.light": "#d76b42", @@ -162,10 +162,10 @@ "mode": "dark", "colors": { "accent.background": "#36345f", - "accent.foreground": "#f8dcc0", + "accent.foreground": "#C7C7D4", "background": "#1f1d45", "border": "#333150", - "foreground": "#f8dcc0", + "foreground": "#C7C7D4", "input.border": "#555465", "link.active.foreground": "#4b61bf", "link.foreground": "#5f72c6", @@ -174,10 +174,10 @@ "list.active.border": "#549235", "list.even.background": "#1c1a37", "muted.background": "#333333", - "muted.foreground": "#687f94", + "muted.foreground": "#717192", "panel.background": "#003a5b", "popover.background": "#1f1d45", - "popover.foreground": "#f8dcc0", + "popover.foreground": "#C7C7D4", "primary.active.background": "#5f72c699", "primary.background": "#5f72c6", "primary.foreground": "#ffffff", @@ -186,10 +186,10 @@ "scrollbar.thumb.background": "#555465", "secondary.background": "#2e2c51", "secondary.active.background": "#36345f", - "secondary.foreground": "#e4d5c7", + "secondary.foreground": "#C7C7D4", "secondary.hover.background": "#34325b", "tab.active.background": "#1f1d45", - "tab.active.foreground": "#f8dcc0", + "tab.active.foreground": "#C7C7D4", "tab.background": "#1f1d4500", "tab.foreground": "#aeab9e", "tab_bar.background": "#1f1d45", @@ -197,7 +197,7 @@ "table.active.border": "#549235", "table.head.foreground": "#f8dcc0b3", "table.row.border": "#333333", - "title_bar.background": "#1f1d45", + "title_bar.background": "#1c1a3e", "title_bar.border": "#333150", "base.red": "#a02733", "base.red.light": "#fc5f5a", diff --git a/themes/ayu.json b/themes/ayu.json index 5f11d29d..4dad4d2e 100644 --- a/themes/ayu.json +++ b/themes/ayu.json @@ -237,7 +237,7 @@ "accent.background": "#2D2F34", "accent.foreground": "#B3B1AD", "background": "#0D1016", - "border": "#333436", + "border": "#292a2c", "ring": "#FFB454", "foreground": "#B3B1AD", "input.border": "#2D2F34", @@ -263,6 +263,7 @@ "tab.active.background": "#0D1016", "tab_bar.background": "#1F2127", "title_bar.background": "#1F2127", + "title_bar.border": "#38393b", "base.yellow": "#feb454", "base.red": "#ef7177", "base.blue": "#5ac1fe", diff --git a/themes/everforest.json b/themes/everforest.json index c1d52449..9b068eff 100644 --- a/themes/everforest.json +++ b/themes/everforest.json @@ -155,8 +155,6 @@ "accent.foreground": "#d3c6aa", "background": "#262E34", "border": "#40484c", - "danger.active.background": "#e67e80", - "danger.hover.background": "#e67e80", "foreground": "#d3c6aa", "input.border": "#485156", "link.active.foreground": "#7fbbb3", @@ -177,13 +175,14 @@ "scrollbar.thumb.background": "#485156", "secondary.background": "#2E383B", "secondary.foreground": "#849087", + "secondary.active.background": "#2c3538", "secondary.hover.background": "#3E474B99", "tab.active.background": "#262E34", "tab.active.foreground": "#d3c6aa", "tab.background": "#262E3400", "tab.foreground": "#849087", "tab_bar.background": "#2E383B", - "title_bar.background": "#262E34", + "title_bar.background": "#1f262b", "title_bar.border": "#40484c", "base.red": "#e67e80", "base.green": "#a7c080", diff --git a/themes/fahrenheit.json b/themes/fahrenheit.json index 656b01e0..bb071fa6 100644 --- a/themes/fahrenheit.json +++ b/themes/fahrenheit.json @@ -33,6 +33,7 @@ "secondary.foreground": "#979797", "secondary.hover.background": "#202020DD", "tab.foreground": "#808080", + "title_bar.background": "#0e0e0e", "table.background": "#1e1e1e00", "table.hover.background": "#1E1E1E", "ring": "#570101", diff --git a/themes/flexoki.json b/themes/flexoki.json index 2f928830..88e1e5f3 100644 --- a/themes/flexoki.json +++ b/themes/flexoki.json @@ -187,22 +187,21 @@ "popover.background": "#100F0F", "popover.foreground": "#CECDC3", "primary.background": "#24837B", - "primary.active.background": "#1d6862", "primary.foreground": "#FFFCF0", "info.background": "#205EA6", "scrollbar.background": "#100F0F00", - "scrollbar.thumb.background": "##282726", + "scrollbar.thumb.background": "#282726", "scrollbar.thumb.hover.background": "#343331", - "secondary.active.background": "#282726", - "secondary.background": "#1C1B1A", + "secondary.background": "#232221", + "secondary.active.background": "#232221", "secondary.foreground": "#CECDC3", - "secondary.hover.background": "#282726", + "secondary.hover.background": "#262524", "tab.active.background": "#100F0F", "tab.active.foreground": "#CECDC3", "tab.background": "#1C1B1A", "tab.foreground": "#878580", "tab_bar.background": "#1C1B1A", - "title_bar.background": "#1C1B1A", + "title_bar.background": "#191818", "base.yellow": "#AD8301", "base.yellow.light": "#D0A215", "base.red": "#AF3029", diff --git a/themes/gruvbox.json b/themes/gruvbox.json index 6126a3c3..1a8966f9 100644 --- a/themes/gruvbox.json +++ b/themes/gruvbox.json @@ -181,8 +181,8 @@ "ring": "#b17f1b", "scrollbar.background": "#1d202100", "scrollbar.thumb.background": "#504945", - "secondary.background": "#282828", "secondary.active.background": "#2E2E2D", + "secondary.background": "#282828", "secondary.foreground": "#ebdbb2", "secondary.hover.background": "#2E2E2D99", "tab.active.background": "#1d2021", @@ -190,7 +190,7 @@ "tab.background": "#28282800", "tab.foreground": "#928374", "tab_bar.background": "#282828", - "title_bar.background": "#282828", + "title_bar.background": "#252525", "title_bar.border": "#3e3936", "base.magenta.light": "#D3869B66", "base.red": "#f06555", diff --git a/themes/kibble.json b/themes/kibble.json index 98957748..6d0d6f0d 100644 --- a/themes/kibble.json +++ b/themes/kibble.json @@ -8,49 +8,51 @@ "name": "Kibble", "mode": "dark", "colors": { - "accent.background": "#242223", + "accent.background": "#22231f", "accent.foreground": "#f7f7f7", "background": "#0e100a", - "border": "#333333", - "danger.background": "#c70031", - "danger.active.background": "#c7003199", - "danger.hover.background": "#e00038", + "border": "#292a24", + "danger.background": "#e07b5c", "foreground": "#f7f7f7", "input.border": "#333333", - "list.active.background": "#3448D122", - "list.active.border": "#3448D1", + "list.active.background": "#2BCF1315", + "list.active.border": "#2BCF13", "list.hover.background": "#2c292b54", "list.even.background": "#24222355", "muted.background": "#333333", - "muted.foreground": "#726E69", + "muted.foreground": "#777", "panel.background": "#003a5b", "popover.background": "#0e100a", "popover.foreground": "#f7f7f7", - "primary.active.background": "#3449d199", - "primary.background": "#3449d1", - "primary.foreground": "#f7f7f7", - "primary.hover.background": "#4457d5", + "primary.active.background": "#6ce05c99", + "primary.background": "#6ce05c", + "primary.foreground": "#101010", "scrollbar.background": "#003a5b00", "scrollbar.thumb.background": "#726E69", - "secondary.background": "#3d3d3d", - "secondary.active.background": "#2d2d2d", + "secondary.background": "#22231f", + "secondary.active.background": "#22231f", "secondary.foreground": "#f7f7f7", - "secondary.hover.background": "#404040", + "secondary.hover.background": "#272824", + "success.background": "#5c6ee0", + "warning.background": "#e0c85c", + "info.background": "#5cd1e0", + "selection.background": "#9ba787", "tab.active.background": "#0e100a", "tab.active.foreground": "#f7f7f7", "tab.foreground": "#969696", + "title_bar.background": "#161712", "base.red": "#C70231", - "base.red.light": "#f01578", + "base.red.light": "#e07b5c", "base.green": "#2BCF13", "base.green.light": "#6ce05c", "base.blue": "#3449d1", - "base.blue.light": "#97a4f7", + "base.blue.light": "#5c6ee0", "base.cyan": "#0798ab", - "base.cyan.light": "#68f2e0", + "base.cyan.light": "#5cd1e0", "base.magenta": "#8400ff", "base.magenta.light": "#C495F0", "base.yellow": "#c7a302", - "base.yellow.light": "#f3f79e" + "base.yellow.light": "#e0c85c" }, "highlight": { "editor.foreground": "#f7f7f7", diff --git a/themes/macos-classic.json b/themes/macos-classic.json index c1c5c6a4..3b98aa36 100644 --- a/themes/macos-classic.json +++ b/themes/macos-classic.json @@ -10,9 +10,9 @@ "colors": { "accent.background": "#E0E0E0", "accent.foreground": "#000000", - "background": "#FCFCFC", + "background": "#F7F7F7", "foreground": "#000000", - "border": "#D2D2D2", + "border": "#DADADA", "ring": "#0064E1", "danger.foreground": "#FFFFFF", "input.border": "#E0E0E0", @@ -25,7 +25,7 @@ "muted.background": "#F7F7F7", "muted.foreground": "#505050", "panel.background": "#F9F9F9", - "popover.background": "#F7F7F7", + "popover.background": "#FAFAFA", "popover.foreground": "#000000", "primary.background": "#0064E1", "primary.foreground": "#FFFFFF", diff --git a/themes/mellifluous.json b/themes/mellifluous.json index 3d276a62..a9c8c310 100644 --- a/themes/mellifluous.json +++ b/themes/mellifluous.json @@ -33,17 +33,17 @@ "primary.foreground": "#F0F0F0", "primary.hover.background": "#626ca2", "scrollbar.background": "#fafafa00", - "scrollbar.thumb.background": "#929292", - "secondary.background": "#F0F0F0", - "secondary.active.background": "#d5d5d5", + "scrollbar.thumb.background": "#c0c0c0", + "secondary.background": "#d0d0d0", + "secondary.active.background": "#d0d0d0", "secondary.foreground": "#383a42", - "secondary.hover.background": "#FAFAFA", + "secondary.hover.background": "#dcdcdc", "tab.active.background": "#E7E7E7", "tab.active.foreground": "#383a42", "tab.background": "#F0F0F000", "tab.foreground": "#727272", "tab_bar.background": "#E7E7E7", - "title_bar.background": "#E7E7E7", + "title_bar.background": "#dfdfdf", "title_bar.border": "#CACACA", "base.red": "#C95954", "base.green": "#828040", @@ -179,15 +179,15 @@ "scrollbar.background": "#282c3400", "scrollbar.thumb.background": "#444444", "secondary.background": "#292929", - "secondary.active.background": "#3A3A3A", + "secondary.active.background": "#292929", "secondary.foreground": "#abb2bf", - "secondary.hover.background": "#2E2E2E", + "secondary.hover.background": "#2D2D2D", "tab.active.background": "#1A1A1A", "tab.active.foreground": "#abb2bf", "tab.background": "#1A1A1A00", "tab.foreground": "#abb2bf", "tab_bar.background": "#292929", - "title_bar.background": "#1A1A1A", + "title_bar.background": "#171717", "title_bar.border": "#444444", "base.red": "#C95954", "base.green": "#828040", diff --git a/themes/molokai.json b/themes/molokai.json index 6dc84880..aab7f2b9 100644 --- a/themes/molokai.json +++ b/themes/molokai.json @@ -28,10 +28,11 @@ "primary.foreground": "#fafafa", "scrollbar.background": "#FEFAF900", "scrollbar.thumb.background": "#ADADB0", - "secondary.background": "#E4DEDAEE", - "secondary.active.background": "#E4DEDA", + "secondary.background": "#E4DEDA", "secondary.foreground": "#060606", "secondary.hover.background": "#E4DEDA99", + "title_bar.background": "#e8e3e0", + "title_bar.border": "#d5ccc6", "base.red": "#e17047", "base.green": "#82cc0a", "base.yellow": "#ccac0a", diff --git a/themes/solarized.json b/themes/solarized.json index 15b94eba..f1251da9 100644 --- a/themes/solarized.json +++ b/themes/solarized.json @@ -36,7 +36,7 @@ "tab.background": "#fdf6e300", "tab.foreground": "#657b83", "tab_bar.background": "#eee8d5", - "title_bar.background": "#fdf6e3", + "title_bar.background": "#f4ecd7", "title_bar.border": "#dcd4bc", "chart.grid": "#ebe5d4", "base.red": "#755858", @@ -153,7 +153,7 @@ "accent.background": "#15333A", "accent.foreground": "#fdf6e3", "background": "#002B36", - "border": "#083e4c", + "border": "#103a44", "foreground": "#fdf6e3", "input.border": "#083e4c", "list.active.background": "#0d667d25", @@ -169,13 +169,13 @@ "scrollbar.background": "#002b3600", "scrollbar.thumb.background": "#586e75", "secondary.background": "#073642", - "secondary.active.background": "#07364299", + "secondary.active.background": "#073945", "secondary.foreground": "#fdf6e3", - "secondary.hover.background": "#094453", + "secondary.hover.background": "#083e4b", "tab.active.background": "#002b36", "tab.active.foreground": "#fdf6e3", "tab.foreground": "#93a1a1", - "title_bar.background": "#002b36", + "title_bar.background": "#09323d", "title_bar.border": "#16404b", "base.red": "#7d2f0d", "base.green": "#0d7d3f", diff --git a/themes/spaceduck.json b/themes/spaceduck.json index f26f9be6..9d61045f 100644 --- a/themes/spaceduck.json +++ b/themes/spaceduck.json @@ -9,10 +9,10 @@ "mode": "dark", "colors": { "accent.background": "#1c1d39", - "accent.foreground": "#ecf0c1", + "accent.foreground": "#a3a49d", "background": "#0F111B", "border": "#272C42", - "foreground": "#ecf0c1", + "foreground": "#a3a49d", "input.border": "#272C42", "link.active.foreground": "#089CC5", "link.foreground": "#089CC5", @@ -24,19 +24,18 @@ "muted.foreground": "#4b6479", "panel.background": "#003a5b", "popover.background": "#0F111B", - "popover.foreground": "#ecf0c1", + "popover.foreground": "#a3a49d", "primary.background": "#089CC5", "primary.foreground": "#ecf0c1", "scrollbar.background": "#003a5b00", - "scrollbar.thumb.background": "#4b6479", - "secondary.background": "#1a1b33", - "secondary.active.background": "#151529", + "scrollbar.thumb.background": "#24303a", + "secondary.background": "#242547", + "secondary.active.background": "#242547", "secondary.foreground": "#a3a49d", - "secondary.hover.background": "#242547", + "secondary.hover.background": "#292b51", "tab.active.background": "#0F111B", - "tab.active.foreground": "#ecf0c1", "tab.foreground": "#838182", - "title_bar.background": "#0F111B", + "title_bar.background": "#141724", "title_bar.border": "#272C42", "base.red": "#e33400", "base.green": "#5ccc96", @@ -44,7 +43,7 @@ "base.cyan": "#089CC5", "base.magenta": "#C86D8C", "base.magenta.light": "#C86D8C33", - "base.yellow": "#f2ce00" + "base.yellow": "#b89c00" }, "highlight": { "editor.foreground": "#ecf0c1", diff --git a/themes/tokyonight.json b/themes/tokyonight.json index c8a8e2b1..87869776 100644 --- a/themes/tokyonight.json +++ b/themes/tokyonight.json @@ -35,7 +35,7 @@ "secondary.background": "#292e42", "secondary.foreground": "#C0CAF5", "secondary.hover.background": "#31374f", - "title_bar.background": "#1a1b26", + "title_bar.background": "#161720", "title_bar.border": "#292e42", "chart.grid": "#222332", "base.red": "#f7768e", @@ -174,7 +174,7 @@ "secondary.background": "#292e42", "secondary.foreground": "#c0caf5", "secondary.hover.background": "#323750", - "title_bar.background": "#24283b", + "title_bar.background": "#202435", "title_bar.border": "#3d4462", "base.red": "#f7768e", "base.green": "#9ece6a", @@ -308,7 +308,7 @@ "secondary.foreground": "#8c94b5", "secondary.hover.background": "#333752", "table.row.border": "#2d3149", - "title_bar.background": "#222436", + "title_bar.background": "#1e2030", "title_bar.border": "#323752", "base.red": "#ff757f", "base.green": "#c3e88d", diff --git a/themes/twilight.json b/themes/twilight.json index d186fc16..bfb77fde 100644 --- a/themes/twilight.json +++ b/themes/twilight.json @@ -8,10 +8,10 @@ "name": "Twilight", "mode": "dark", "colors": { - "accent.background": "#1F1F1F", + "accent.background": "#232323", "accent.foreground": "#dcdcdc", "background": "#141414", - "border": "#3e3e3e", + "border": "#343434", "foreground": "#dcdcdc", "input.border": "#3e3e3e", "list.active.background": "#CDA86911", @@ -20,16 +20,16 @@ "muted.background": "#2e2e2e", "muted.foreground": "#828282", "panel.background": "#1e1e1e", - "popover.background": "#141414", + "popover.background": "#171717", "popover.foreground": "#dcdcdc", "primary.background": "#CDA869", "primary.foreground": "#1e1e1e", "scrollbar.background": "#1e1e1e00", "scrollbar.thumb.background": "#3e3e3e", - "secondary.background": "#202020", - "secondary.active.background": "#1A1A1A", + "secondary.background": "#262626", + "secondary.active.background": "#272727", "secondary.foreground": "#dcdcdc", - "secondary.hover.background": "#222222", + "secondary.hover.background": "#2a2a2a", "tab.active.background": "#141414", "tab.active.foreground": "#dcdcdc", "tab.background": "#1E1E1E00", @@ -37,7 +37,7 @@ "tab_bar.background": "#1E1E1E", "table.background": "#1e1e1e00", "title_bar.background": "#1e1e1e", - "title_bar.border": "#3e3e3e", + "title_bar.border": "#343434", "base.red": "#c06d44", "base.red.light": "#de7c4c", "base.green": "#afb97a",