From 59b4df03d29f246be6b6bb02ed512140cefd8910 Mon Sep 17 00:00:00 2001 From: David Dossett Date: Thu, 25 Aug 2022 11:14:04 -0700 Subject: [PATCH] Merge editor: use solid borders (#159208) Revert to solid line borders --- .../mergeEditor/browser/view/media/mergeEditor.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css b/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css index a6e3725fb55..52ff87d452c 100644 --- 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); }