Fixes microsoft#161998 (microsoft#164444)

hediet · web-flow · commit f4d9b1d53db3 · 2022-10-24T05:26:55.000-07:00
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts
@@ -32,7 +32,7 @@ export const diffWordBase = registerColor(
 
 export const conflictBorderUnhandledUnfocused = registerColor(
 	'mergeEditor.conflict.unhandledUnfocused.border',
-	{ dark: '#ffa6007a', light: '#ffa6007a', hcDark: '#ffa6007a', hcLight: '#ffa6007a', },
+	{ dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', },
 	localize('mergeEditor.conflict.unhandledUnfocused.border', 'The border color of unhandled unfocused conflicts.')
 );
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css b/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css
@@ -90,7 +90,7 @@
 }
 
 .merge-editor-block:not(.handled).focused {
-	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
+	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }
 
 .merge-editor-block.handled:not(.focused) {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`.merge-editor-block:not(.handled).focused {`
`93`		`- border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);`
	`93`	`+ border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`.merge-editor-block.handled:not(.focused) {`