Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Editor: minor updates to font and title bar styles #158945

Merged
merged 3 commits into from Aug 23, 2022
Merged

Merge Editor: minor updates to font and title bar styles #158945

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4833e9
Fix multi-line border styles
daviddossett Aug 23, 2022
3ca4609
Merge Editor: update font styles and titlebar alignment
daviddossett Aug 23, 2022
811102e
Fix icon styles
daviddossett Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css
View file
Open in desktop
Expand Up @@ -23,13 +23,22 @@
}

.monaco-workbench .merge-editor .code-view>.title>SPAN.description {
opacity: 0.7;
font-size: 90%;
display: flex;
font-size: 12px;
align-items: center;
color: var(--vscode-descriptionForeground);
}

.monaco-workbench .merge-editor .code-view>.title>SPAN.description .codicon {
font-size: 14px;
color: var(--vscode-descriptionForeground);
}

.monaco-workbench .merge-editor .code-view>.title>SPAN.detail {
margin-left: auto;
flex-shrink: 0;
font-size: 12px;
color: var(--vscode-descriptionForeground);
}

.monaco-workbench .merge-editor .code-view>.title>SPAN.detail .codicon {
Expand Down Expand Up @@ -88,22 +97,24 @@
}

.merge-accept-gutter-marker.multi-line.focused .background {
border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledFocused-border);
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
border-right: 0;
}

.merge-accept-gutter-marker.multi-line .background {
border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
border-right: 0;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}

.merge-accept-gutter-marker.multi-line.handled.focused .background {
border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
border: 2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
border-right: 0;
}

.merge-accept-gutter-marker.multi-line.handled .background {
border: 1px solid var(--vscode-checkbox-border);
border: 2px solid var(--vscode-checkbox-border);
border-right: 0;
}

Expand Down