From c3bb16f93eb9de4bb5579b20981786a51a5f9f0b Mon Sep 17 00:00:00 2001 From: t8y2 Date: Fri, 7 Aug 2026 03:29:52 +0800 Subject: [PATCH] fix(grid): revert dirty cell base color to yellow --- apps/desktop/src/components/grid/DataGrid.vue | 6 +++--- .../src/lib/__tests__/dataGrid/dataGridPaintTheme.spec.ts | 4 ++-- apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 6338e6e7b..5bcb38ef6 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -10322,7 +10322,7 @@ const gridContextMenuItems = computed(() => { --data-grid-row-new-bg: rgb(243, 243, 243); --data-grid-row-deleted-bg: rgb(255, 244, 244); --data-grid-cell-active-bg: rgb(244, 248, 255); - --data-grid-cell-dirty-bg: rgb(166, 210, 255); + --data-grid-cell-dirty-bg: rgb(255, 248, 230); --data-grid-cell-selected-bg: rgb(239, 246, 255); --data-grid-cell-selected-single-bg: rgb(191, 219, 254); --data-grid-cell-selected-dirty-bg: rgb(235, 224, 184); @@ -10354,7 +10354,7 @@ const gridContextMenuItems = computed(() => { --data-grid-row-new-bg: rgb(51, 51, 55); --data-grid-row-deleted-bg: rgb(55, 31, 32); --data-grid-cell-active-bg: rgb(25, 34, 46); - --data-grid-cell-dirty-bg: rgb(33, 66, 131); + --data-grid-cell-dirty-bg: rgb(94, 75, 26); --data-grid-cell-selected-bg: rgb(20, 40, 60); --data-grid-cell-selected-single-bg: rgb(30, 64, 96); --data-grid-cell-selected-dirty-bg: rgb(76, 66, 38); @@ -10386,7 +10386,7 @@ const gridContextMenuItems = computed(() => { --data-grid-row-muted-bg: color-mix(in oklab, var(--muted) 99%, var(--foreground)); --data-grid-row-new-bg: color-mix(in oklab, var(--primary) 5%, transparent); --data-grid-row-deleted-bg: color-mix(in oklab, var(--destructive) 5%, transparent); - --data-grid-cell-dirty-bg: color-mix(in oklab, rgb(166 210 255) 85%, var(--background)); + --data-grid-cell-dirty-bg: color-mix(in oklab, rgb(240 177 0) 10%, transparent); --data-grid-cell-selected-bg: color-mix(in oklab, rgb(59 130 246) 12%, var(--background)); --data-grid-cell-selected-single-bg: color-mix(in oklab, rgb(59 130 246) 30%, var(--background)); --data-grid-cell-selected-dirty-bg: color-mix(in oklab, rgb(234 181 50) 30%, color-mix(in oklab, rgb(59 130 246) 18%, var(--background))); diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridPaintTheme.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridPaintTheme.spec.ts index 59bb0d7bf..1f8f530db 100644 --- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridPaintTheme.spec.ts +++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridPaintTheme.spec.ts @@ -67,7 +67,7 @@ describe("data grid paint theme", () => { expect(light.cellSelectedBorder).toBe("rgb(59, 130, 246)"); expect(light.cellSelectedSingle).toBe("rgb(191, 219, 254)"); expect(light.cellSelectedDirty).toBe("rgb(235, 224, 184)"); - expect(light.cellDirty).toBe("rgb(166, 210, 255)"); + expect(light.cellDirty).toBe("rgb(255, 248, 230)"); expect(light.rowNumberTextNew).toBe("rgb(0, 122, 85)"); expect(light.rowNumberTextEdited).toBe("rgb(187, 77, 0)"); expect(contrastRatio(light.cellSelectedBorder, light.cellSelected)).toBeGreaterThanOrEqual(3); @@ -76,7 +76,7 @@ describe("data grid paint theme", () => { expect(dark.cellSelectedBorder).toBe("rgb(96, 165, 250)"); expect(dark.cellSelectedSingle).toBe("rgb(30, 64, 96)"); expect(dark.cellSelectedDirty).toBe("rgb(76, 66, 38)"); - expect(dark.cellDirty).toBe("rgb(33, 66, 131)"); + expect(dark.cellDirty).toBe("rgb(94, 75, 26)"); }); it("honors an explicit --data-grid-cell-selected-border token when provided in light mode", () => { diff --git a/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts b/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts index 1d1bdc61c..1c22db5bc 100644 --- a/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts +++ b/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts @@ -251,7 +251,7 @@ export function resolveDataGridPaintTheme(options: { getVar: (name: string) => s const rowNew = isDark ? "rgb(51, 51, 55)" : "rgb(243, 243, 243)"; const rowDeleted = isDark ? "rgb(55, 31, 32)" : "rgb(255, 244, 244)"; const cellActive = activeSurface; - const cellDirty = isDark ? "rgb(33, 66, 131)" : "rgb(166, 210, 255)"; + const cellDirty = isDark ? "rgb(94, 75, 26)" : "rgb(255, 248, 230)"; const cellSelected = isDark ? "rgb(20, 40, 60)" : "rgb(239, 246, 255)"; const cellSelectedDirty = isDark ? "rgb(76, 66, 38)" : "rgb(235, 224, 184)"; const cellSelectedBorder = isDark ? "rgb(96, 165, 250)" : "rgb(59, 130, 246)";