diff --git a/src/styles/main.css b/src/styles/main.css index 77a9eb28..49b7f9b0 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -4843,7 +4843,7 @@ html[data-show-path-bars='0'] .path-pair-bar { .text-merge-view .conflict-panel[data-conflict-chrome='capture-1to1-residual'] li { min-height: 18px !important; padding: 2px 4px !important; - border: 1px solid #d0d0d0 !important; + border: 1px solid #c0c0c0 !important; border-radius: 0 !important; font-size: 11px !important; line-height: 16px !important; diff --git a/src/styles/textMergeChromeDensity.test.ts b/src/styles/textMergeChromeDensity.test.ts index 423bec34..48059020 100644 --- a/src/styles/textMergeChromeDensity.test.ts +++ b/src/styles/textMergeChromeDensity.test.ts @@ -105,3 +105,11 @@ describe('text merge path meta residual', () => { ) }) }) + +describe('merge conflict li border', () => { + it('matches capture conflict list item border #c0c0c0', () => { + expect(css).toMatch( + /data-conflict-chrome='capture-1to1-residual'\] li[\s\S]*?border:\s*1px solid #c0c0c0/, + ) + }) +})