From 248f2f5071fcfe9943925b890cf41a020029d7f1 Mon Sep 17 00:00:00 2001 From: Kim Santiago <31145923+kisantia@users.noreply.github.com> Date: Thu, 13 Jun 2019 13:07:52 -0700 Subject: [PATCH] Formatting diff editor title (#6013) * add background color and more formatting to diff editor title * also handle hc-black --- .../schema-compare/src/schemaCompareResult.ts | 2 +- .../modelComponents/diffeditor.component.ts | 2 +- .../modelComponents/media/editor.css | 21 +++++++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/extensions/schema-compare/src/schemaCompareResult.ts b/extensions/schema-compare/src/schemaCompareResult.ts index 1b99ce03f4..682e8ce038 100644 --- a/extensions/schema-compare/src/schemaCompareResult.ts +++ b/extensions/schema-compare/src/schemaCompareResult.ts @@ -12,7 +12,7 @@ import { SchemaCompareOptionsDialog } from './dialogs/schemaCompareOptionsDialog import { Telemetry } from './telemetry'; import { getTelemetryErrorType } from './utils'; const localize = nls.loadMessageBundle(); -const diffEditorTitle = localize('schemaCompare.ObjectDefinitionsTitle', 'Object Definitions'); +const diffEditorTitle = localize('schemaCompare.CompareDetailsTitle', 'Compare Details'); const applyConfirmation = localize('schemaCompare.ApplyConfirmation', 'Are you sure you want to update the target?'); const reCompareToRefeshMessage = localize('schemaCompare.RecompareToRefresh', 'Press Compare to refresh the comparison.'); const generateScriptEnabledMessage = localize('schemaCompare.generateScriptEnabledButton', 'Generate script to deploy changes to target'); diff --git a/src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts b/src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts index c5b6338d26..898dcacb30 100644 --- a/src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts @@ -30,7 +30,7 @@ import { ITextModel } from 'vs/editor/common/model'; @Component({ template: `
-
+
{{_title}}
`, diff --git a/src/sql/workbench/electron-browser/modelComponents/media/editor.css b/src/sql/workbench/electron-browser/modelComponents/media/editor.css index 2e2b8ae6db..14bfafd4c8 100644 --- a/src/sql/workbench/electron-browser/modelComponents/media/editor.css +++ b/src/sql/workbench/electron-browser/modelComponents/media/editor.css @@ -15,10 +15,23 @@ modelview-diff-editor-component { display: block; } -.vs-dark modelview-diff-editor-title { - background: #444444; +.modelview-diff-editor-title { + width: 100%; + height: 100%; + font-weight: 700; + padding: 3px 3px 3px 16px; + text-transform: uppercase; + font-size: 11px } -modelview-diff-editor-title { - background: #f4f4f4; +.vs-dark .modelview-diff-editor-title-background { + background-color: #434343; +} + +.hc-black .modelview-diff-editor-title-background { + background-color: #000000; +} + +.modelview-diff-editor-title-background { + background-color: #d5d5d5; } \ No newline at end of file