From 463f01bb1634ee50d3f6cfbb2709c59161beca2b Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Thu, 2 Oct 2025 14:46:27 +0800 Subject: [PATCH] theme: Update macos-clasic dark theme color. (#1320) image image --- crates/ui/src/text/node.rs | 2 +- themes/default.json | 26 +++++------ themes/hybrid.json | 6 +-- themes/macos-classic.json | 91 +++++++++++++++++--------------------- 4 files changed, 57 insertions(+), 68 deletions(-) diff --git a/crates/ui/src/text/node.rs b/crates/ui/src/text/node.rs index 4f41030f..5b41b677 100644 --- a/crates/ui/src/text/node.rs +++ b/crates/ui/src/text/node.rs @@ -362,7 +362,7 @@ impl CodeBlock { .mb(style.paragraph_gap) .p_3() .rounded(cx.theme().radius) - .bg(cx.theme().accent) + .bg(cx.theme().secondary.opacity(0.85)) .font_family("Menlo, Monaco, Consolas, monospace") .text_size(rems(0.875)) .relative() diff --git a/themes/default.json b/themes/default.json index 8f0ca0ea..38ed4d0e 100644 --- a/themes/default.json +++ b/themes/default.json @@ -331,8 +331,8 @@ "hint": "#b283f8", "hint.background": "#250c4b", "hint.border": "#3f0891", - "info.background": "#0C194D", - "info.border": "#082190", + "info.background": "#0059D1", + "info.border": "#0059D1", "modified": "#B0A878", "modified.background": "#3A310E", "predictive": "#5D5945", @@ -341,7 +341,7 @@ "warning.border": "#7B6508", "syntax": { "attribute": { - "color": "#be9a52" + "color": "#e7cb8f" }, "boolean": { "color": "#E1D797" @@ -362,30 +362,30 @@ "color": "#CACCCA" }, "function": { - "color": "#E1D797" + "color": "#fdd888" }, "keyword": { - "color": "#E19773" + "color": "#c28b12" }, "link_text": { - "color": "#A86D3B", + "color": "#307BF6", "font_style": "normal" }, "link_uri": { - "color": "#6F6D66", + "color": "#7faef9", "font_style": "italic" }, "number": { - "color": "#E19773" + "color": "#E1D797" }, "string": { - "color": "#76BA53" + "color": "#62BA46" }, "string.escape": { - "color": "#76BA53" + "color": "#62BA46" }, "string.regex": { - "color": "#76BA53" + "color": "#62BA46" }, "string.special": { "color": "#E1D797" @@ -400,11 +400,11 @@ "color": "#E1D797" }, "title": { - "color": "#A76D3B", + "color": "#fdd888", "font_weight": 600 }, "type": { - "color": "#A86D3B" + "color": "#ec642a" }, "property": { "color": "#CACCCA" diff --git a/themes/hybrid.json b/themes/hybrid.json index 52e6d363..93bd3cc8 100644 --- a/themes/hybrid.json +++ b/themes/hybrid.json @@ -157,8 +157,6 @@ "accent.foreground": "#e8e8e8", "background": "#1D1F21", "border": "#34373c", - "card.background": "#1D1F21", - "card.foreground": "#e8e8e8", "foreground": "#e8e8e8", "input.border": "#282A2E", "link.active.foreground": "#87d7ff", @@ -176,10 +174,10 @@ "primary.foreground": "#e8e8e8", "scrollbar.background": "#1D1F2144", "scrollbar.thumb.background": "#5f5f5f", - "secondary.background": "#333333", + "secondary.background": "#303336", "secondary.active.background": "#33363b", "secondary.foreground": "#e8e8e8", - "secondary.hover.background": "#393939", + "secondary.hover.background": "#373b3e", "tab.active.background": "#1D1F21", "tab.active.foreground": "#d4d4d4", "tab.background": "#24262700", diff --git a/themes/macos-classic.json b/themes/macos-classic.json index 0405e31b..68f3f7d2 100644 --- a/themes/macos-classic.json +++ b/themes/macos-classic.json @@ -28,13 +28,13 @@ "muted.background": "#F7F7F7", "muted.foreground": "#505050", "panel.background": "#F9F9F9", - "popover.background": "#FFFFFF", + "popover.background": "#F7F7F7", "popover.foreground": "#000000", "primary.active.background": "#1958a4", "primary.background": "#0064E1", "primary.foreground": "#FFFFFF", "primary.hover.background": "#2585fa", - "scrollbar.background": "#FFFFFF33", + "scrollbar.background": "#FFFFFF00", "scrollbar.thumb.background": "#C8C8C8AA", "secondary.active.background": "#E0E0E0", "secondary.background": "#E9E9E9", @@ -155,54 +155,45 @@ "name": "macOS Classic Dark", "mode": "dark", "colors": { - "accent.background": "#353436", + "accent.background": "#363636", "accent.foreground": "#CACCCA", - "background": "#131313", - "border": "#404040", - "ring": "#A76D3B", - "card.background": "#1E1D1E", - "card.foreground": "#CACCCA", - "danger.background": "#802207", - "danger.foreground": "#E8E4CF", - "foreground": "#CACCCA", - "input.border": "#3A3A3A", + "background": "#1f1f1f", + "border": "#494949", + "ring": "#0059D1", + "foreground": "#DEDEDE", + "input.border": "#494949", "list.active.background": "#353436", - "list.active.border": "#A76D3B", + "list.active.border": "#0059D1", "list.even.background": "#1E1D1E", "muted.background": "#1E1D1E", - "muted.foreground": "#9E9E9E", + "muted.foreground": "#9D9D9D", "panel.background": "#1E1D1E", "popover.background": "#1E1D1E", "popover.foreground": "#CACCCA", - "primary.background": "#A76D3B", - "primary.foreground": "#E8E4CF", - "scrollbar.background": "#13131333", + "primary.background": "#0059D1", + "primary.foreground": "#F2F9FF", + "scrollbar.background": "#13131300", "scrollbar.thumb.background": "#4C4D4DAA", - "secondary.active.background": "#1E1D1E99", - "secondary.background": "#1E1D1E", - "secondary.foreground": "#CACCCA", - "secondary.hover.background": "#212122", - "tab.active.background": "#131313", - "tab.active.foreground": "#CACCCA", + "secondary.active.background": "#2F2F2F99", + "secondary.background": "#303030", + "secondary.foreground": "#DEDEDE", + "secondary.hover.background": "#343434", + "tab.active.background": "#1E1E1E", "tab.background": "#232323", "tab.foreground": "#8F8F8F", - "tab_bar.background": "#232323", - "base.blue": "#073180", - "base.blue.light": "#3f72e2", - "base.cyan": "#07807c", - "base.cyan.light": "#5BDFD8", - "base.green": "#078015", - "base.green.light": "#76BA53", - "base.magenta": "#AE30C2", - "base.magenta.light": "#D86DE9", - "base.red": "#802207", - "base.red.light": "#DD6F61", - "base.yellow": "#807007", - "base.yellow.light": "#7B6508" + "title_bar.background": "#222222", + "selection.background": "#3F638B", + "link": "#307BF6", + "base.blue": "#0059D1", + "base.cyan": "#3CD3FE", + "base.green": "#62BA46", + "base.magenta": "#F74F9E", + "base.red": "#FF4245", + "base.yellow": "#FCB827" }, "highlight": { "editor.foreground": "#CACCCA", - "editor.background": "#131313", + "editor.background": "#181818", "editor.active_line.background": "#35343666", "editor.line_number": "#8F8F8F", "editor.active_line_number": "#DDDDDD", @@ -216,8 +207,8 @@ "hint": "#b283f8", "hint.background": "#250c4b", "hint.border": "#3f0891", - "info.background": "#0C194D", - "info.border": "#082190", + "info.background": "#0059D1", + "info.border": "#0059D1", "modified": "#B0A878", "modified.background": "#3A310E", "predictive": "#5D5945", @@ -226,7 +217,7 @@ "warning.border": "#7B6508", "syntax": { "attribute": { - "color": "#be9a52" + "color": "#e7cb8f" }, "boolean": { "color": "#E1D797" @@ -247,30 +238,30 @@ "color": "#CACCCA" }, "function": { - "color": "#E1D797" + "color": "#fdd888" }, "keyword": { - "color": "#E19773" + "color": "#c28b12" }, "link_text": { - "color": "#A86D3B", + "color": "#307BF6", "font_style": "normal" }, "link_uri": { - "color": "#6F6D66", + "color": "#7faef9", "font_style": "italic" }, "number": { - "color": "#E19773" + "color": "#E1D797" }, "string": { - "color": "#76BA53" + "color": "#62BA46" }, "string.escape": { - "color": "#76BA53" + "color": "#62BA46" }, "string.regex": { - "color": "#76BA53" + "color": "#62BA46" }, "string.special": { "color": "#E1D797" @@ -285,11 +276,11 @@ "color": "#E1D797" }, "title": { - "color": "#A76D3B", + "color": "#fdd888", "font_weight": 600 }, "type": { - "color": "#A86D3B" + "color": "#ec642a" }, "property": { "color": "#CACCCA"