development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 1px borders for merge editor conflicts (#158796)

Browse source
This commit is contained in:
David Dossett 2022-08-22 11:43:02 -07:00 committed by GitHub
parent 2fe3b4574a
commit ce32c59fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css
View file

@ -59,20 +59,20 @@
}
.merge-editor-block {
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
}
.merge-editor-block.focused {
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
}
.merge-editor-block.handled {
border: 2px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border);
border: 1px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border);
}
.merge-editor-block.handled.focused {
border: 2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
}
.gutter.monaco-editor > div {
@ -159,7 +159,7 @@
}
.conflict-zone-root {
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
background-color: var(--vscode-mergeEditor-change-background);
height: 90%;
@ -190,7 +190,7 @@
.focused.conflict-zone .conflict-zone-root {
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
}