From 5860e3dcad744cde8156f55ad8726d862f9c5498 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 25 May 2017 14:40:05 -0700 Subject: [PATCH] Tune merge-conflict colors (#27299) --- src/vs/platform/theme/common/colorRegistry.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts index b908d663df374..5f3a474f0347f 100644 --- a/src/vs/platform/theme/common/colorRegistry.ts +++ b/src/vs/platform/theme/common/colorRegistry.ts @@ -258,11 +258,11 @@ export const diffRemovedOutline = registerColor('diffEditor.removedTextBorder', * Merge-conflict colors */ -const headerTransparency = 1; -const currentBaseColor = Color.fromHex('#20C85E').transparent(headerTransparency); -const incomingBaseColor = Color.fromHex('#1886FF').transparent(headerTransparency); -const contentTransparency = 0.2; -const rulerTransparency = 0.5; +const headerTransparency = 0.5; +const currentBaseColor = Color.fromHex('#40C8AE').transparent(headerTransparency); +const incomingBaseColor = Color.fromHex('#40A6FF').transparent(headerTransparency); +const contentTransparency = 0.4; +const rulerTransparency = 1; export const mergeCurrentHeaderBackground = registerColor('merge.currentHeaderBackground', { dark: currentBaseColor, light: currentBaseColor, hc: currentBaseColor }, nls.localize('mergeCurrentHeaderBackground', 'Current header background in inline merge-conflict.')); 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-conflict.'));