From 7516e0eff3865ec3e3548fe5bc852d232cde31c5 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 27 Apr 2017 21:54:48 +0200 Subject: [PATCH] Theming: diff colors should be more specific. Fixes #25544 --- extensions/theme-abyss/themes/abyss-color-theme.json | 8 ++++---- .../themes/solarized-dark-color-theme.json | 8 ++++---- src/vs/editor/browser/widget/diffEditorWidget.ts | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index 7132051cbef..85f14031407 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -336,10 +336,10 @@ // "peekViewTitleInfoForeground": "", // Editor: Diff - "diffInserted": "#31958A55", - // "diffInsertedOutline": "", - "diffRemoved": "#892F4688", - // "diffRemovedOutline": "", + "diffEditorInserted": "#31958A55", + // "diffEditorInsertedOutline": "", + "diffEditorRemoved": "#892F4688", + // "diffEditorRemovedOutline": "", // Workbench: Title "titleBarActiveBackground": "#10192c", diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json index 5010c81f1cb..63a31ddf13c 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -376,10 +376,10 @@ // "peekViewTitleInfoForeground": "", // Editor: Diff - // "diffInserted": "", - // "diffInsertedOutline": "", - // "diffRemoved": "", - // "diffRemovedOutline": "", + // "diffEditorInserted": "", + // "diffEditorInsertedOutline": "", + // "diffEditorRemoved": "", + // "diffEditorRemovedOutline": "", // Workbench: Title "titleBarActiveBackground": "#002C39", diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index db839926953..df8c421914b 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -1954,10 +1954,10 @@ function createFakeLinesDiv(): HTMLElement { const defaultInsertColor = Color.fromRGBA(new RGBA(155, 185, 85, 255 * 0.2)); const defaultRemoveColor = Color.fromRGBA(new RGBA(255, 0, 0, 255 * 0.2)); -export const diffInserted = registerColor('diffInserted', { dark: defaultInsertColor, light: defaultInsertColor, hc: null }, nls.localize('diffInserted', 'Background color for text that got inserted.')); -export const diffRemoved = registerColor('diffRemoved', { dark: defaultRemoveColor, light: defaultRemoveColor, hc: null }, nls.localize('diffRemoved', 'Background color for text that got removed.')); -export const diffInsertedOutline = registerColor('diffInsertedOutline', { dark: null, light: null, hc: '#33ff2eff' }, nls.localize('diffInsertedOutline', 'Outline color for the text that got inserted.')); -export const diffRemovedOutline = registerColor('diffRemovedOutline', { dark: null, light: null, hc: '#FF008F' }, nls.localize('diffRemovedOutline', 'Outline color for text that got removed.')); +export const diffInserted = registerColor('diffEditorInserted', { dark: defaultInsertColor, light: defaultInsertColor, hc: null }, nls.localize('diffEditorInserted', 'Background color for text that got inserted.')); +export const diffRemoved = registerColor('diffEditorRemoved', { dark: defaultRemoveColor, light: defaultRemoveColor, hc: null }, nls.localize('diffEditorRemoved', 'Background color for text that got removed.')); +export const diffInsertedOutline = registerColor('diffEditorInsertedOutline', { dark: null, light: null, hc: '#33ff2eff' }, nls.localize('diffEditorInsertedOutline', 'Outline color for the text that got inserted.')); +export const diffRemovedOutline = registerColor('diffEditorRemovedOutline', { dark: null, light: null, hc: '#FF008F' }, nls.localize('diffEditorRemovedOutline', 'Outline color for text that got removed.')); registerThemingParticipant((theme, collector) => { -- GitLab