From 4bf4fae5ff6c64b55bf03c40861b1a866cdc979f Mon Sep 17 00:00:00 2001
From: Yukon <126093594+baseGame@users.noreply.github.com>
Date: Sat, 26 Sep 2026 03:55:16 +0800
Subject: [PATCH] Match Text Merge conflict panel fill to capture #f0f0f0

---
 src/styles/main.css                       | 2 +-
 src/styles/textMergeChromeDensity.test.ts | 4 ++--
 src/views/TextMergeView.vue               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/styles/main.css b/src/styles/main.css
index 705a1d91..77a9eb28 100644
--- a/src/styles/main.css
+++ b/src/styles/main.css
@@ -3795,7 +3795,7 @@ html[data-show-path-bars='0'] .path-pair-bar {
   padding: 2px 4px !important;
   border: 1px solid #a0a0a0 !important;
   border-radius: 0 !important;
-  background: #f5f5f5 !important;
+  background: #f0f0f0 !important;
 }
 
 .text-merge-view .merge-path-chrome {
diff --git a/src/styles/textMergeChromeDensity.test.ts b/src/styles/textMergeChromeDensity.test.ts
index 64d888cf..423bec34 100644
--- a/src/styles/textMergeChromeDensity.test.ts
+++ b/src/styles/textMergeChromeDensity.test.ts
@@ -77,7 +77,7 @@ describe('text merge editor pane residual', () => {
     expect(mergeView).toMatch(/data-editor-density="capture-1to1"/)
     expect(mergeView).toMatch(/\.merge-grid\s*\{[\s\S]*?gap:\s*1px/)
     expect(mergeView).toMatch(/\.output-editor\s*\{[\s\S]*?line-height:\s*16px/)
-    expect(mergeView).toMatch(/\.conflict-panel\s*\{[\s\S]*?background:\s*#f5f5f5/)
+    expect(mergeView).toMatch(/\.conflict-panel\s*\{[\s\S]*?background:\s*#f0f0f0/)
     expect(css).toMatch(/\.text-merge-view \.merge-grid\s*\{[\s\S]*?gap:\s*1px/)
     expect(css).toMatch(/\.text-merge-view \.pane-header\s*\{[\s\S]*?min-height:\s*18px/)
     expect(css).toMatch(/\.text-merge-view \.output-editor\s*\{[\s\S]*?line-height:\s*16px/)
@@ -90,7 +90,7 @@ describe('text merge conflict chrome residual', () => {
     expect(mergeView).toMatch(/data-conflict-chrome="capture-1to1-residual"/)
     expect(mergeView).toMatch(/data-pane-sync="capture-1to1-residual"/)
     expect(css).toMatch(
-      /data-conflict-chrome='capture-1to1-residual'\][\s\S]*?background:\s*#f5f5f5/,
+      /data-conflict-chrome='capture-1to1-residual'\][\s\S]*?background:\s*#f0f0f0/,
     )
     expect(css).toMatch(
       /data-pane-sync='capture-1to1-residual'\] \.pane-header[\s\S]*?min-height:\s*18px/,
diff --git a/src/views/TextMergeView.vue b/src/views/TextMergeView.vue
index b34a22ea..2cd77c0b 100644
--- a/src/views/TextMergeView.vue
+++ b/src/views/TextMergeView.vue
@@ -1672,7 +1672,7 @@ watch(
   border: 1px solid var(--app-border);
   border-radius: 0;
   background: var(--app-surface);
-  background: #f5f5f5;
+  background: #f0f0f0;
 }
 
 .conflict-panel header {