Update Merge Editor Colors (microsoft#159199)

Revert merge editor color changes

Author: daviddossett

src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts

@@ -8,55 +8,37 @@ import { registerColor } from 'vs/platform/theme/common/colorRegistry';
 
 export const diff = registerColor(
 	'mergeEditor.change.background',
-	{ dark: '#40A6FF33', light: '#40A6FF33', hcDark: '#40A6FF33', hcLight: '#40A6FF33', },
+	{ dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533', },
 	localize('mergeEditor.change.background', 'The background color for changes.')
 );
 
 export const diffWord = registerColor(
 	'mergeEditor.change.word.background',
-	{ dark: '#9bb9551e', light: '#9bb9551e', hcDark: null, hcLight: null, },
+	{ dark: '#9bb9551e', light: '#9bb9551e', hcDark: '#9bb9551e', hcLight: '#9bb9551e', },
 	localize('mergeEditor.change.word.background', 'The background color for word changes.')
 );
 
 export const conflictBorderUnhandledUnfocused = registerColor(
 	'mergeEditor.conflict.unhandledUnfocused.border',
-	{ dark: '#ffa6007a', light: '#ffa6007a', hcDark: '#ffa60080', hcLight: '#ffa60080', },
+	{ dark: '#ffa6007a', light: '#ffa6007a', hcDark: '#ffa6007a', hcLight: '#ffa6007a', },
 	localize('mergeEditor.conflict.unhandledUnfocused.border', 'The border color of unhandled unfocused conflicts.')
 );
 
-export const conflictBackgroundUnhandledUnfocused = registerColor(
-	'mergeEditor.conflict.unhandledUnfocused.background',
-	{ dark: '#ffa60026', light: '#ffa60080', hcDark: '#ffa60026', hcLight: '#ffa6007a', },
-	localize('mergeEditor.conflict.unhandledUnfocused.background', 'The background color of unhandled unfocused conflicts.')
-);
-
 export const conflictBorderUnhandledFocused = registerColor(
 	'mergeEditor.conflict.unhandledFocused.border',
-	{ dark: '#ffa600BF', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', },
+	{ dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', },
 	localize('mergeEditor.conflict.unhandledFocused.border', 'The border color of unhandled focused conflicts.')
 );
 
 export const conflictBorderHandledUnfocused = registerColor(
 	'mergeEditor.conflict.handledUnfocused.border',
-	{ dark: '#40C8AE49', light: '#40C8AE49', hcDark: '#40C8AE', hcLight: '#40C8AE', },
+	{ dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649', },
 	localize('mergeEditor.conflict.handledUnfocused.border', 'The border color of handled unfocused conflicts.')
 );
 
-export const conflictBackgroundHandledUnfocused = registerColor(
-	'mergeEditor.conflict.handledUnfocused.background',
-	{ dark: '#40C8AE33', light: '#40C8AE33', hcDark: '#40C8AE33', hcLight: '#40C8AE33', },
-	localize('mergeEditor.conflict.handledUnfocused.background', 'The background color of handled unfocused conflicts.')
-);
-
-export const conflictBackgroundHandledFocused = registerColor(
-	'mergeEditor.conflict.handledFocused.background',
-	{ dark: '#40C8AE33', light: '#40C8AE33', hcDark: '#40C8AE33', hcLight: '#40C8AE33', },
-	localize('mergeEditor.conflict.handledFocused.background', 'The background color of handled focused conflicts.')
-);
-
 export const conflictBorderHandledFocused = registerColor(
 	'mergeEditor.conflict.handledFocused.border',
-	{ dark: '#40C8AEBF', light: '#40C8AEBF', hcDark: '#40C8AE', hcLight: '#40C8AE', },
+	{ dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc', },
 	localize('mergeEditor.conflict.handledFocused.border', 'The border color of handled focused conflicts.')
 );
 

src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css

@@ -58,6 +58,10 @@
 	flex-grow: 0;
 }
 
+.merge-editor-diff {
+	background-color: var(--vscode-mergeEditor-change-background);
+}
+
 .merge-editor-diff-word {
 	background-color: var(--vscode-mergeEditor-change-word-background);
 }
@@ -176,9 +180,8 @@
 }
 
 .conflict-zone-root {
+	background-color: var(--vscode-mergeEditor-change-background);
 	border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
-	background-color: var(--vscode-mergeEditor-conflict-unhandledUnfocused-background);
-
 	height: 90%;
 	display: flex;
 	align-items: center;
@@ -195,11 +198,11 @@
 }
 
 .conflict-zone-root .text {
+	background: var(--vscode-mergeEditor-conflictingLines-background);
 	margin-left: auto;
 	padding: 0 8px;
 	display: flex;
 	align-items: center;
-	/* background: var(--vscode-mergeEditor-conflict-unhandledUnfocused-background); */
 	height: 100%;
 	white-space: nowrap;
 	overflow: hidden;