From 7a42e44c285e769dc59a266d900ae5e390d9783d Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 28 Nov 2025 12:10:51 +0800 Subject: [PATCH] theme: Fix macos-classic theme details and fix theme schema. (#1699) --- .theme-schema.json | 74 +++++++++++++++++++-------------------- themes/macos-classic.json | 32 ++++++++--------- 2 files changed, 51 insertions(+), 55 deletions(-) diff --git a/.theme-schema.json b/.theme-schema.json index 287dbb78..a630b1b5 100644 --- a/.theme-schema.json +++ b/.theme-schema.json @@ -19,43 +19,6 @@ "type": ["string", "null"], "default": null }, - "font.size": { - "description": "The base font size, default is 16.", - "type": ["number", "null"], - "format": "float", - "default": 16 - }, - "font.family": { - "description": "The base font family, default is system font: `.SystemUIFont`.", - "type": ["string", "null"], - "default": ".SystemUIFont" - }, - "mono_font.size": { - "description": "The base monospace font size, default is 13.", - "type": ["number", "null"], - "format": "float", - "default": 13 - }, - "mono_font.family": { - "description": "The monospace font family, default is platform specific:\nmacOS: `Menlo`\n- Windows: `Consolas`\n- Linux: `DejaVu Sans Mono`", - "type": ["string", "null"], - "default": null - }, - "radius": { - "description": "The border radius for general elements, default is 6.", - "type": ["number", "null"], - "default": 6 - }, - "radius.lg": { - "description": "The border radius for large elements like Dialogs and Notifications, default is 8.", - "type": ["number", "null"], - "default": 8 - }, - "shadow": { - "description": "Set shadows in the theme, for example the Input and Button, default is true.", - "type": ["boolean", "null"], - "default": true - }, "themes": { "type": "array", "items": { @@ -79,6 +42,43 @@ "$ref": "#/$defs/ThemeMode", "default": "light" }, + "font.size": { + "description": "The base font size, default is 16.", + "type": ["number", "null"], + "format": "float", + "default": 16 + }, + "font.family": { + "description": "The base font family, default is system font: `.SystemUIFont`.", + "type": ["string", "null"], + "default": ".SystemUIFont" + }, + "mono_font.size": { + "description": "The base monospace font size, default is 13.", + "type": ["number", "null"], + "format": "float", + "default": 13 + }, + "mono_font.family": { + "description": "The monospace font family, default is platform specific:\nmacOS: `Menlo`\n- Windows: `Consolas`\n- Linux: `DejaVu Sans Mono`", + "type": ["string", "null"], + "default": null + }, + "radius": { + "description": "The border radius for general elements, default is 6.", + "type": ["number", "null"], + "default": 6 + }, + "radius.lg": { + "description": "The border radius for large elements like Dialogs and Notifications, default is 8.", + "type": ["number", "null"], + "default": 8 + }, + "shadow": { + "description": "Set shadows in the theme, for example the Input and Button, default is true.", + "type": ["boolean", "null"], + "default": true + }, "colors": { "description": "The colors of the theme.", "$ref": "#/$defs/ThemeConfigColors", diff --git a/themes/macos-classic.json b/themes/macos-classic.json index 3b98aa36..fae45660 100644 --- a/themes/macos-classic.json +++ b/themes/macos-classic.json @@ -7,38 +7,35 @@ { "name": "macOS Classic Light", "mode": "light", + "shadow": false, "colors": { "accent.background": "#E0E0E0", "accent.foreground": "#000000", - "background": "#F7F7F7", + "background": "#F9F9F9", "foreground": "#000000", - "border": "#DADADA", + "border": "#D2D2D2", "ring": "#0064E1", "danger.foreground": "#FFFFFF", - "input.border": "#E0E0E0", "list.active.background": "#0064E110", "list.active.border": "#0064E1", "list.background": "#FFFFFF", "list.even.background": "#EFEFEF", "list.hover.background": "#E7E7E7", - "list.head.background": "#F7F7F7", - "muted.background": "#F7F7F7", - "muted.foreground": "#505050", - "panel.background": "#F9F9F9", - "popover.background": "#FAFAFA", + "muted.background": "#F5F5F5", + "muted.foreground": "#707070", + "popover.background": "#F5F5F5", "popover.foreground": "#000000", "primary.background": "#0064E1", "primary.foreground": "#FFFFFF", "scrollbar.background": "#FFFFFF00", - "scrollbar.thumb.background": "#C8C8C8AA", - "secondary.active.background": "#D0D0D0", - "secondary.background": "#E4E4E4", + "scrollbar.thumb.background": "#C8C8C8", + "secondary.active.background": "#D9D9D9", + "secondary.background": "#E0E0E0", "secondary.foreground": "#000000", - "secondary.hover.background": "#e9e9e9", - "tab.active.background": "#FFFFFF", + "secondary.hover.background": "#E5E5E5", "tab.active.foreground": "#000000", "tab.background": "#E9E9E9", - "tab.foreground": "#929292", + "tab.foreground": "#606060", "tab_bar.background": "#E9E9E9", "title_bar.background": "#FEFEFE", "title_bar.border": "#DADADA", @@ -149,6 +146,7 @@ { "name": "macOS Classic Dark", "mode": "dark", + "shadow": false, "colors": { "accent.background": "#363636", "accent.foreground": "#CACCCA", @@ -156,23 +154,21 @@ "border": "#454545", "ring": "#0059D1", "foreground": "#DEDEDE", - "input.border": "#494949", "list.even.background": "#232323", "list.active.background": "#0059D115", "list.active.border": "#0059D1", "muted.background": "#1E1D1E", "muted.foreground": "#9D9D9D", - "panel.background": "#1E1D1E", "popover.background": "#1E1D1E", "popover.foreground": "#CACCCA", "primary.background": "#0059D1", "primary.foreground": "#F2F9FF", "scrollbar.background": "#13131300", "scrollbar.thumb.background": "#4C4D4DAA", - "secondary.active.background": "#2F2F2F99", + "secondary.active.background": "#30303099", "secondary.background": "#303030", "secondary.foreground": "#DEDEDE", - "secondary.hover.background": "#343434", + "secondary.hover.background": "#323232", "tab.active.background": "#1E1E1E", "tab.background": "#232323", "tab.foreground": "#8F8F8F",