From ddfb61b46a90eff380ecaf71229ad628b5f57374 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Tue, 27 Mar 2018 11:14:54 -0700
Subject: [PATCH] change settings to only affect grid; remove default
 fontfamily (#989)

---
 .../parts/query/editor/queryResultsEditor.ts  | 22 ++++++++++++++++++-
 .../query/editor/resultsGridContribution.ts   |  1 -
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/sql/parts/query/editor/queryResultsEditor.ts b/src/sql/parts/query/editor/queryResultsEditor.ts
index 2822520cbb..3fff652cd5 100644
--- a/src/sql/parts/query/editor/queryResultsEditor.ts
+++ b/src/sql/parts/query/editor/queryResultsEditor.ts
@@ -65,6 +65,26 @@ export class BareResultsGridInfo extends BareFontInfo {
 	}
 }
 
+function getBareResultsGridInfoStyles(info: BareResultsGridInfo): string {
+	let content = '';
+	if (info.fontFamily) {
+		content += `font-family: ${info.fontFamily};`;
+	}
+	if (info.fontWeight) {
+		content += `font-weight: ${info.fontWeight};`;
+	}
+	if (info.fontSize) {
+		content += `font-size: ${info.fontSize}px;`;
+	}
+	if (info.lineHeight) {
+		content += `line-height: ${info.lineHeight}px;`;
+	}
+	if (info.letterSpacing) {
+		content += `letter-spacing: ${info.letterSpacing}px;`;
+	}
+	return content;
+}
+
 /**
  * Editor associated with viewing and editing the data of a query results grid.
  */
@@ -98,7 +118,6 @@ export class QueryResultsEditor extends BaseEditor {
 
 	private applySettings() {
 		if (this.input && this.input.container) {
-			Configuration.applyFontInfoSlow(this.getContainer().getHTMLElement(), this._rawOptions);
 			if (!this.input.css) {
 				this.input.css = dom.createStyleSheet(this.input.container);
 			}
@@ -109,6 +128,7 @@ export class QueryResultsEditor extends BaseEditor {
 				cssRuleText = this._rawOptions.cellPadding.join('px ') + 'px;';
 			}
 			let content = `.grid .slick-cell { padding: ${cssRuleText}; }`;
+			content += `.grid { ${getBareResultsGridInfoStyles(this._rawOptions)} }`;
 			this.input.css.innerHTML = content;
 		}
 	}
diff --git a/src/sql/parts/query/editor/resultsGridContribution.ts b/src/sql/parts/query/editor/resultsGridContribution.ts
index 09a715fb30..70c1afd20a 100644
--- a/src/sql/parts/query/editor/resultsGridContribution.ts
+++ b/src/sql/parts/query/editor/resultsGridContribution.ts
@@ -25,7 +25,6 @@ const resultsGridConfiguration: IConfigurationNode = {
 	properties: {
 		'resultsGrid.fontFamily': {
 			type: 'string',
-			default: EDITOR_FONT_DEFAULTS.fontFamily,
 			description: nls.localize('fontFamily', "Controls the font family.")
 		},
 		'resultsGrid.fontWeight': {