Merge editor: use solid borders (microsoft#159208)

daviddossett · web-flow · commit 59b4df03d29f · 2022-08-25T20:14:04.000+02:00
Revert to solid line borders
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css b/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css
@@ -73,11 +73,11 @@
 }
 
 .merge-editor-block:not(.handled):not(.focused) {
-	border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
 }
 
 .merge-editor-block:not(.handled).focused {
-	border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledFocused-border);
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }
 
 .merge-editor-block.handled:not(.focused) {
@@ -181,7 +181,7 @@
 
 .conflict-zone-root {
 	background-color: var(--vscode-mergeEditor-change-background);
-	border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
 	height: 90%;
 	display: flex;
 	align-items: center;
@@ -210,5 +210,5 @@
 
 
 .focused.conflict-zone .conflict-zone-root {
-	border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledFocused-border);
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`.merge-editor-block:not(.handled):not(.focused) {`
`76`		`- border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);`
	`76`	`+ border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`.merge-editor-block:not(.handled).focused {`
`80`		`- border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledFocused-border);`
	`80`	`+ border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`.merge-editor-block.handled:not(.focused) {`
`@@ -181,7 +181,7 @@`
`181`	`181`
`182`	`182`	`.conflict-zone-root {`
`183`	`183`	`background-color: var(--vscode-mergeEditor-change-background);`
`184`		`- border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);`
	`184`	`+ border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);`
`185`	`185`	`height: 90%;`
`186`	`186`	`display: flex;`
`187`	`187`	`align-items: center;`
`@@ -210,5 +210,5 @@`
`210`	`210`
`211`	`211`
`212`	`212`	`.focused.conflict-zone .conflict-zone-root {`
`213`		`- border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledFocused-border);`
	`213`	`+ border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);`
`214`	`214`	`}`