mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
Workbench colors (#28507)
This commit is contained in:
parent
ab52889793
commit
996af4d965
|
@ -74,10 +74,9 @@ export default class MergeDectorator implements vscode.Disposable {
|
|||
this.generateBlockRenderOptions('merge.incomingContentBackground', 'editorOverviewRuler.incomingContentForeground', config)
|
||||
);
|
||||
|
||||
this.decorations['commonAncestors.content'] = vscode.window.createTextEditorDecorationType({
|
||||
color: new vscode.ThemeColor('editor.foreground'),
|
||||
isWholeLine: this.decorationUsesWholeLine,
|
||||
});
|
||||
this.decorations['commonAncestors.content'] = vscode.window.createTextEditorDecorationType(
|
||||
this.generateBlockRenderOptions('merge.commonContentBackground', 'editorOverviewRuler.commonContentForeground', config)
|
||||
);
|
||||
}
|
||||
|
||||
if (config.enableDecorations) {
|
||||
|
@ -95,8 +94,12 @@ export default class MergeDectorator implements vscode.Disposable {
|
|||
});
|
||||
|
||||
this.decorations['commonAncestors.header'] = vscode.window.createTextEditorDecorationType({
|
||||
color: new vscode.ThemeColor('editor.foreground'),
|
||||
isWholeLine: this.decorationUsesWholeLine,
|
||||
backgroundColor: new vscode.ThemeColor('merge.commonHeaderBackground'),
|
||||
color: new vscode.ThemeColor('editor.foreground'),
|
||||
outlineStyle: 'solid',
|
||||
outlineWidth: '1pt',
|
||||
outlineColor: new vscode.ThemeColor('merge.border')
|
||||
});
|
||||
|
||||
this.decorations['splitter'] = vscode.window.createTextEditorDecorationType({
|
||||
|
|
|
@ -261,6 +261,7 @@ export const diffRemovedOutline = registerColor('diffEditor.removedTextBorder',
|
|||
const headerTransparency = 0.5;
|
||||
const currentBaseColor = Color.fromHex('#40C8AE').transparent(headerTransparency);
|
||||
const incomingBaseColor = Color.fromHex('#40A6FF').transparent(headerTransparency);
|
||||
const commonBaseColor = Color.fromHex('#606060').transparent(0.4);
|
||||
const contentTransparency = 0.4;
|
||||
const rulerTransparency = 1;
|
||||
|
||||
|
@ -268,11 +269,14 @@ export const mergeCurrentHeaderBackground = registerColor('merge.currentHeaderBa
|
|||
export const mergeCurrentContentBackground = registerColor('merge.currentContentBackground', { dark: transparent(mergeCurrentHeaderBackground, contentTransparency), light: transparent(mergeCurrentHeaderBackground, contentTransparency), hc: transparent(mergeCurrentHeaderBackground, contentTransparency) }, nls.localize('mergeCurrentContentBackground', 'Current content background in inline merge-conflicts.'));
|
||||
export const mergeIncomingHeaderBackground = registerColor('merge.incomingHeaderBackground', { dark: incomingBaseColor, light: incomingBaseColor, hc: null }, nls.localize('mergeIncomingHeaderBackground', 'Incoming header background in inline merge-conflicts.'));
|
||||
export const mergeIncomingContentBackground = registerColor('merge.incomingContentBackground', { dark: transparent(mergeIncomingHeaderBackground, contentTransparency), light: transparent(mergeIncomingHeaderBackground, contentTransparency), hc: transparent(mergeIncomingHeaderBackground, contentTransparency) }, nls.localize('mergeIncomingContentBackground', 'Incoming content background in inline merge-conflicts.'));
|
||||
export const mergeCommonHeaderBackground = registerColor('merge.commonHeaderBackground', { dark: commonBaseColor, light: commonBaseColor, hc: null }, nls.localize('mergeCommonHeaderBackground', 'Common ancestor header background in inline merge-conflicts.'));
|
||||
export const mergeCommonContentBackground = registerColor('merge.commonContentBackground', { dark: transparent(mergeCommonHeaderBackground, contentTransparency), light: transparent(mergeCommonHeaderBackground, contentTransparency), hc: transparent(mergeCommonHeaderBackground, contentTransparency) }, nls.localize('mergeCommonContentBackground', 'Common ancester content background in inline merge-conflicts.'));
|
||||
|
||||
export const mergeBorder = registerColor('merge.border', { dark: null, light: null, hc: '#C3DF6F' }, nls.localize('mergeBorder', 'Border color on headers and the splitter in inline merge-conflicts.'));
|
||||
|
||||
export const overviewRulerCurrentContentForeground = registerColor('editorOverviewRuler.currentContentForeground', { dark: transparent(mergeCurrentHeaderBackground, rulerTransparency), light: transparent(mergeCurrentHeaderBackground, rulerTransparency), hc: mergeBorder }, nls.localize('overviewRulerCurrentContentForeground', 'Current overview ruler foreground for inline merge-conflicts.'));
|
||||
export const overviewRulerIncomingContentForeground = registerColor('editorOverviewRuler.incomingContentForeground', { dark: transparent(mergeIncomingHeaderBackground, rulerTransparency), light: transparent(mergeIncomingHeaderBackground, rulerTransparency), hc: mergeBorder }, nls.localize('overviewRulerIncomingContentForeground', 'Incoming overview ruler foreground for inline merge-conflicts.'));
|
||||
export const overviewRulerCommonContentForeground = registerColor('editorOverviewRuler.commonContentForeground', { dark: transparent(mergeCommonHeaderBackground, rulerTransparency), light: transparent(mergeCommonHeaderBackground, rulerTransparency), hc: mergeBorder }, nls.localize('overviewRulerCommonContentForeground', 'Common ancestor overview ruler foreground for inline merge-conflicts.'));
|
||||
|
||||
// ----- color functions
|
||||
|
||||
|
|
Loading…
Reference in a new issue