Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge editor: use solid borders (#159208)

Browse Source 
Revert to solid line borders
This commit is contained in:
David Dossett
2022-08-25 11:14:04 -07:00
committed by GitHub
parent 91da7ddf60
commit 59b4df03d2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css
+4 -4
View File
@@ -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);
}