From 32374f264f95ee5a79166dffb1c8ac2848183b5a Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 22 Apr 2019 17:30:16 -0700 Subject: [PATCH] Adjust default fonts (#5146) * Adjust default fonts * Adjust default ratio --- src/sql/base/browser/ui/panel/media/panel.css | 2 +- src/sql/parts/query/editor/queryEditor.ts | 2 +- src/sql/parts/query/editor/queryResultsEditor.ts | 4 ++-- src/sql/parts/query/editor/resultsGridContribution.ts | 1 + src/sql/parts/query/views/flexibleSash.ts | 7 ++++--- .../dataExplorer/browser/media/connectionViewletPanel.css | 5 ++++- .../parts/objectExplorer/browser/serverTreeRenderer.ts | 4 ++-- src/vs/editor/common/config/editorOptions.ts | 4 +++- src/vs/workbench/browser/media/part.css | 3 ++- 9 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/sql/base/browser/ui/panel/media/panel.css b/src/sql/base/browser/ui/panel/media/panel.css index 78a0e08024..9411ea8432 100644 --- a/src/sql/base/browser/ui/panel/media/panel.css +++ b/src/sql/base/browser/ui/panel/media/panel.css @@ -46,7 +46,7 @@ panel { } .tabbedPanel .tabList .tab .tabLabel { - font-size: 14px; + font-size: 13px; padding-bottom: 4px; font-weight: 600; } diff --git a/src/sql/parts/query/editor/queryEditor.ts b/src/sql/parts/query/editor/queryEditor.ts index 2bea2eef4d..26ee0d8e05 100644 --- a/src/sql/parts/query/editor/queryEditor.ts +++ b/src/sql/parts/query/editor/queryEditor.ts @@ -60,7 +60,7 @@ export class QueryEditor extends BaseEditor { private readonly _tabHeight: number = 35; // The minimum width/height of the editors hosted in the QueryEditor - private readonly _minEditorSize: number = 220; + private readonly _minEditorSize: number = 100; private _sash: IFlexibleSash; private _editorTopOffset: number; diff --git a/src/sql/parts/query/editor/queryResultsEditor.ts b/src/sql/parts/query/editor/queryResultsEditor.ts index b90fb2e9ef..c2c85ec6bc 100644 --- a/src/sql/parts/query/editor/queryResultsEditor.ts +++ b/src/sql/parts/query/editor/queryResultsEditor.ts @@ -24,8 +24,8 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; export const RESULTS_GRID_DEFAULTS = { - cellPadding: [6, 10, 5], - rowHeight: 29 + cellPadding: [5, 8, 4], + rowHeight: 24 }; export const TextCompareEditorVisible = new RawContextKey('textCompareEditorVisible', false); diff --git a/src/sql/parts/query/editor/resultsGridContribution.ts b/src/sql/parts/query/editor/resultsGridContribution.ts index 76ab34b62e..7da60f5b78 100644 --- a/src/sql/parts/query/editor/resultsGridContribution.ts +++ b/src/sql/parts/query/editor/resultsGridContribution.ts @@ -24,6 +24,7 @@ const resultsGridConfiguration: IConfigurationNode = { properties: { 'resultsGrid.fontFamily': { type: 'string', + default: EDITOR_FONT_DEFAULTS.fontFamily, description: nls.localize('fontFamily', "Controls the font family.") }, 'resultsGrid.fontWeight': { diff --git a/src/sql/parts/query/views/flexibleSash.ts b/src/sql/parts/query/views/flexibleSash.ts index 506c49bce5..0db0ec9fbd 100644 --- a/src/sql/parts/query/views/flexibleSash.ts +++ b/src/sql/parts/query/views/flexibleSash.ts @@ -162,6 +162,7 @@ export class VerticalFlexibleSash extends Disposable implements IVerticalSashLay */ export class HorizontalFlexibleSash extends Disposable implements IHorizontalSashLayoutProvider, IFlexibleSash { + private static initialRatio: number = 0.4; private sash: Sash; private ratio: number; private startPosition: number; @@ -174,7 +175,7 @@ export class HorizontalFlexibleSash extends Disposable implements IHorizontalSas constructor(container: HTMLElement, private minHeight: number) { super(); - this.ratio = 0.5; + this.ratio = HorizontalFlexibleSash.initialRatio; this.left = 0; this.sash = new Sash(container, this, { orientation: Orientation.HORIZONTAL }); @@ -240,7 +241,7 @@ export class HorizontalFlexibleSash extends Disposable implements IHorizontalSas } private onSashReset(): void { - this.ratio = 0.5; + this.ratio = HorizontalFlexibleSash.initialRatio; this._onPositionChange.fire(this.position); this.sash.layout(); } @@ -253,7 +254,7 @@ export class HorizontalFlexibleSash extends Disposable implements IHorizontalSas let sashPosition = Math.floor((sashRatio || 0.5) * contentHeight); let midPoint = Math.floor(0.5 * contentHeight); - if (contentHeight > this.minHeight * 2) { + if (contentHeight > this.minHeight * 4) { if (sashPosition < this.minHeight) { sashPosition = this.minHeight; } diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/connectionViewletPanel.css b/src/sql/workbench/parts/dataExplorer/browser/media/connectionViewletPanel.css index 49e7b4edf7..2b3df4148e 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/media/connectionViewletPanel.css +++ b/src/sql/workbench/parts/dataExplorer/browser/media/connectionViewletPanel.css @@ -75,7 +75,10 @@ margin-bottom: 2px; /* OE and connection element group */ .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile, .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group { - padding: 5px; + padding-left: 5px; + padding-right: 5px; + padding-top: 3px; + padding-bottom: 3px; overflow: hidden; } diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts index e5c18f3fc7..a4e309c329 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts @@ -41,11 +41,11 @@ export interface IObjectExplorerTemplateData { */ export class ServerTreeRenderer implements IRenderer { - public static CONNECTION_HEIGHT = 25; + public static CONNECTION_HEIGHT = 23; public static CONNECTION_GROUP_HEIGHT = 38; private static CONNECTION_TEMPLATE_ID = 'connectionProfile'; private static CONNECTION_GROUP_TEMPLATE_ID = 'connectionProfileGroup'; - public static OBJECTEXPLORER_HEIGHT = 25; + public static OBJECTEXPLORER_HEIGHT = 23; private static OBJECTEXPLORER_TEMPLATE_ID = 'objectExplorer'; /** * _isCompact is used to render connections tiles with and without the action buttons. diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index 43c76fe6cf..d8e5adfd87 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -2585,7 +2585,9 @@ export const EDITOR_FONT_DEFAULTS = { ), fontWeight: 'normal', fontSize: ( - platform.isMacintosh ? 12 : 14 + // {{SQL CARBON EDIT}} - change default font size + //platform.isMacintosh ? 12 : 14 + 12 ), lineHeight: 0, letterSpacing: 0, diff --git a/src/vs/workbench/browser/media/part.css b/src/vs/workbench/browser/media/part.css index 2ecf9c88bf..a9cee770a5 100644 --- a/src/vs/workbench/browser/media/part.css +++ b/src/vs/workbench/browser/media/part.css @@ -76,7 +76,8 @@ } .monaco-workbench .part > .content { - font-size: 13px; + /* {{SQL CARBON EDIT}} */ + font-size: 12px; } .monaco-workbench .part > .content > .monaco-progress-container,