From b4866520679e7a74c688223b30356d1c29f18e4f Mon Sep 17 00:00:00 2001 From: Omkar Chandorkar Date: Thu, 24 Sep 2026 09:21:18 +0530 Subject: [PATCH] fix(ui): fix desktop theme background seeds, light contrast, and token typos (#50517) Signed-off-by: Omkar Chandorkar --- packages/ui/src/theme/color.ts | 2 +- .../src/theme/themes/catppuccin-frappe.json | 60 +++++++------------ .../theme/themes/catppuccin-macchiato.json | 48 +++++---------- packages/ui/src/theme/themes/catppuccin.json | 14 ++--- packages/ui/src/theme/themes/kanagawa.json | 36 +++++------ packages/ui/src/theme/themes/oc-2.json | 2 +- 6 files changed, 61 insertions(+), 101 deletions(-) diff --git a/packages/ui/src/theme/color.ts b/packages/ui/src/theme/color.ts index 730642b1bb0..82a8ed7cec7 100644 --- a/packages/ui/src/theme/color.ts +++ b/packages/ui/src/theme/color.ts @@ -258,7 +258,7 @@ export function contrastRatio(foreground: HexColor, background: HexColor) { const linear = (c: number) => (c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4) const luminance = (hex: HexColor) => { const { r, g, b } = hexToRgb(hex) - return 0.2126 * linear(r) + 0.587 * linear(g) + 0.0722 * linear(b) + return 0.2126 * linear(r) + 0.7152 * linear(g) + 0.0722 * linear(b) } const fg = luminance(foreground) const bg = luminance(background) diff --git a/packages/ui/src/theme/themes/catppuccin-frappe.json b/packages/ui/src/theme/themes/catppuccin-frappe.json index ea02b981de1..8b734fa7e45 100644 --- a/packages/ui/src/theme/themes/catppuccin-frappe.json +++ b/packages/ui/src/theme/themes/catppuccin-frappe.json @@ -4,49 +4,29 @@ "id": "catppuccin-frappe", "light": { "palette": { - "neutral": "#303446", - "ink": "#c6d0f5", - "primary": "#8da4e2", - "accent": "#f4b8e4", - "success": "#a6d189", - "warning": "#e5c890", - "error": "#e78284", - "info": "#81c8be" + "neutral": "#eff1f5", + "ink": "#4c4f69", + "primary": "#7287fd", + "accent": "#d20f39", + "success": "#40a02b", + "warning": "#df8e1d", + "error": "#d20f39", + "info": "#04a5e5", + "diffAdd": "#40a02b", + "diffDelete": "#d20f39" }, "overrides": { - "text-weak": "#b5bfe2", - "syntax-comment": "#949cb8", - "syntax-keyword": "#ca9ee6", - "syntax-string": "#a6d189", - "syntax-primitive": "#8da4e2", - "syntax-variable": "#e78284", - "syntax-property": "#99d1db", - "syntax-type": "#e5c890", - "syntax-constant": "#ef9f76", - "syntax-operator": "#99d1db", - "syntax-punctuation": "#c6d0f5", - "syntax-object": "#e78284", - "markdown-heading": "#ca9ee6", - "markdown-text": "#c6d0f5", - "markdown-link": "#8da4e2", - "markdown-link-text": "#99d1db", - "markdown-code": "#a6d189", - "markdown-block-quote": "#e5c890", - "markdown-emph": "#e5c890", - "markdown-strong": "#ef9f76", - "markdown-horizontal-rule": "#a5adce", - "markdown-list-item": "#8da4e2", - "markdown-list-enumeration": "#99d1db", - "markdown-image": "#8da4e2", - "markdown-image-text": "#99d1db", - "markdown-code-block": "#c6d0f5" + "syntax-comment": "#6c6f85", + "syntax-keyword": "#8839ef", + "syntax-primitive": "#1e66f5", + "syntax-constant": "#fe640b" } }, "dark": { "palette": { "neutral": "#303446", "ink": "#c6d0f5", - "primary": "#8da4e2", + "primary": "#8caaee", "accent": "#f4b8e4", "success": "#a6d189", "warning": "#e5c890", @@ -55,10 +35,10 @@ }, "overrides": { "text-weak": "#b5bfe2", - "syntax-comment": "#949cb8", + "syntax-comment": "#949cbb", "syntax-keyword": "#ca9ee6", "syntax-string": "#a6d189", - "syntax-primitive": "#8da4e2", + "syntax-primitive": "#8caaee", "syntax-variable": "#e78284", "syntax-property": "#99d1db", "syntax-type": "#e5c890", @@ -68,16 +48,16 @@ "syntax-object": "#e78284", "markdown-heading": "#ca9ee6", "markdown-text": "#c6d0f5", - "markdown-link": "#8da4e2", + "markdown-link": "#8caaee", "markdown-link-text": "#99d1db", "markdown-code": "#a6d189", "markdown-block-quote": "#e5c890", "markdown-emph": "#e5c890", "markdown-strong": "#ef9f76", "markdown-horizontal-rule": "#a5adce", - "markdown-list-item": "#8da4e2", + "markdown-list-item": "#8caaee", "markdown-list-enumeration": "#99d1db", - "markdown-image": "#8da4e2", + "markdown-image": "#8caaee", "markdown-image-text": "#99d1db", "markdown-code-block": "#c6d0f5" } diff --git a/packages/ui/src/theme/themes/catppuccin-macchiato.json b/packages/ui/src/theme/themes/catppuccin-macchiato.json index 9315e154208..ddfc9073ac7 100644 --- a/packages/ui/src/theme/themes/catppuccin-macchiato.json +++ b/packages/ui/src/theme/themes/catppuccin-macchiato.json @@ -4,42 +4,22 @@ "id": "catppuccin-macchiato", "light": { "palette": { - "neutral": "#24273a", - "ink": "#cad3f5", - "primary": "#8aadf4", - "accent": "#f5bde6", - "success": "#a6da95", - "warning": "#eed49f", - "error": "#ed8796", - "info": "#8bd5ca" + "neutral": "#eff1f5", + "ink": "#4c4f69", + "primary": "#7287fd", + "accent": "#d20f39", + "success": "#40a02b", + "warning": "#df8e1d", + "error": "#d20f39", + "info": "#04a5e5", + "diffAdd": "#40a02b", + "diffDelete": "#d20f39" }, "overrides": { - "text-weak": "#b8c0e0", - "syntax-comment": "#939ab7", - "syntax-keyword": "#c6a0f6", - "syntax-string": "#a6da95", - "syntax-primitive": "#8aadf4", - "syntax-variable": "#ed8796", - "syntax-property": "#91d7e3", - "syntax-type": "#eed49f", - "syntax-constant": "#f5a97f", - "syntax-operator": "#91d7e3", - "syntax-punctuation": "#cad3f5", - "syntax-object": "#ed8796", - "markdown-heading": "#c6a0f6", - "markdown-text": "#cad3f5", - "markdown-link": "#8aadf4", - "markdown-link-text": "#91d7e3", - "markdown-code": "#a6da95", - "markdown-block-quote": "#eed49f", - "markdown-emph": "#eed49f", - "markdown-strong": "#f5a97f", - "markdown-horizontal-rule": "#a5adcb", - "markdown-list-item": "#8aadf4", - "markdown-list-enumeration": "#91d7e3", - "markdown-image": "#8aadf4", - "markdown-image-text": "#91d7e3", - "markdown-code-block": "#cad3f5" + "syntax-comment": "#6c6f85", + "syntax-keyword": "#8839ef", + "syntax-primitive": "#1e66f5", + "syntax-constant": "#fe640b" } }, "dark": { diff --git a/packages/ui/src/theme/themes/catppuccin.json b/packages/ui/src/theme/themes/catppuccin.json index b67dfaf3e67..7044fad65d6 100644 --- a/packages/ui/src/theme/themes/catppuccin.json +++ b/packages/ui/src/theme/themes/catppuccin.json @@ -4,7 +4,7 @@ "id": "catppuccin", "light": { "palette": { - "neutral": "#f5e0dc", + "neutral": "#eff1f5", "ink": "#4c4f69", "primary": "#7287fd", "accent": "#d20f39", @@ -12,14 +12,14 @@ "warning": "#df8e1d", "error": "#d20f39", "info": "#04a5e5", - "diffAdd": "#a6d189", - "diffDelete": "#e78284" + "diffAdd": "#40a02b", + "diffDelete": "#d20f39" }, "overrides": { - "syntax-comment": "#6c7086", + "syntax-comment": "#6c6f85", "syntax-keyword": "#8839ef", "syntax-primitive": "#1e66f5", - "syntax-constant": "#ca6702" + "syntax-constant": "#fe640b" } }, "dark": { @@ -28,8 +28,8 @@ "ink": "#cdd6f4", "primary": "#b4befe", "accent": "#f38ba8", - "success": "#a6d189", - "warning": "#f4b8e4", + "success": "#a6e3a1", + "warning": "#f9e2af", "error": "#f38ba8", "info": "#89dceb", "diffAdd": "#94e2d5", diff --git a/packages/ui/src/theme/themes/kanagawa.json b/packages/ui/src/theme/themes/kanagawa.json index e1b308c15e3..5bfab05bcf0 100644 --- a/packages/ui/src/theme/themes/kanagawa.json +++ b/packages/ui/src/theme/themes/kanagawa.json @@ -8,35 +8,35 @@ "ink": "#54433A", "primary": "#2D4F67", "accent": "#D27E99", - "success": "#98BB6C", - "warning": "#D7A657", + "success": "#6f894e", + "warning": "#cc6d00", "error": "#E82424", - "info": "#76946A", + "info": "#4d699b", "diffAdd": "#89AF5B", "diffDelete": "#D61F1F" }, "overrides": { - "text-weak": "#9E9389", - "syntax-comment": "#9E9389", - "syntax-keyword": "#957FB8", - "syntax-string": "#98BB6C", + "text-weak": "#8a8980", + "syntax-comment": "#8a8980", + "syntax-keyword": "#624c83", + "syntax-string": "#6f894e", "syntax-primitive": "#2D4F67", "syntax-variable": "#54433A", - "syntax-property": "#76946A", - "syntax-type": "#C38D9D", - "syntax-constant": "#D7A657", - "syntax-operator": "#D27E99", + "syntax-property": "#4d699b", + "syntax-type": "#b35b79", + "syntax-constant": "#cc6d00", + "syntax-operator": "#735896", "syntax-punctuation": "#54433A", "syntax-object": "#54433A", - "markdown-heading": "#957FB8", + "markdown-heading": "#624c83", "markdown-text": "#54433A", "markdown-link": "#2D4F67", - "markdown-link-text": "#76946A", - "markdown-code": "#98BB6C", - "markdown-block-quote": "#9E9389", - "markdown-emph": "#C38D9D", - "markdown-strong": "#D7A657", - "markdown-horizontal-rule": "#9E9389", + "markdown-link-text": "#4d699b", + "markdown-code": "#6f894e", + "markdown-block-quote": "#8a8980", + "markdown-emph": "#b35b79", + "markdown-strong": "#cc6d00", + "markdown-horizontal-rule": "#8a8980", "markdown-list-item": "#2D4F67", "markdown-list-enumeration": "#76946A", "markdown-image": "#2D4F67", diff --git a/packages/ui/src/theme/themes/oc-2.json b/packages/ui/src/theme/themes/oc-2.json index b0ea8158f75..bd3d4fff202 100644 --- a/packages/ui/src/theme/themes/oc-2.json +++ b/packages/ui/src/theme/themes/oc-2.json @@ -25,7 +25,7 @@ "border-weak-base": "#DBDBDB", "border-weaker-base": "#E8E8E8", "icon-base": "#8F8F8F", - "icon-weak-base": "C7C7C7", + "icon-weak-base": "#C7C7C7", "surface-raised-base": "#F3F3F3", "surface-raised-base-hover": "#EDEDED", "surface-base": "#F8F8F8",