ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust default fonts (#5146)

Browse Source 
* Adjust default fonts

* Adjust default ratio
This commit is contained in:
Karl Burtram
2019-04-22 17:30:16 -07:00
committed by GitHub
parent 5e62229f25
commit 32374f264f
9 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/base/browser/ui/panel/media/panel.css
View File

@@ -46,7 +46,7 @@ panel {
} }
.tabbedPanel .tabList .tab .tabLabel { .tabbedPanel .tabList .tab .tabLabel {
font-size: 14px; font-size: 13px;
padding-bottom: 4px; padding-bottom: 4px;
font-weight: 600; font-weight: 600;
} }

2
src/sql/parts/query/editor/queryEditor.ts
View File

@@ -60,7 +60,7 @@ export class QueryEditor extends BaseEditor {
private readonly _tabHeight: number = 35; private readonly _tabHeight: number = 35;
// The minimum width/height of the editors hosted in the QueryEditor // 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 _sash: IFlexibleSash;
private _editorTopOffset: number; private _editorTopOffset: number;

4
src/sql/parts/query/editor/queryResultsEditor.ts
View File

@@ -24,8 +24,8 @@ import { CancellationToken } from 'vs/base/common/cancellation';
import { IStorageService } from 'vs/platform/storage/common/storage'; import { IStorageService } from 'vs/platform/storage/common/storage';
export const RESULTS_GRID_DEFAULTS = { export const RESULTS_GRID_DEFAULTS = {
cellPadding: [6, 10, 5], cellPadding: [5, 8, 4],
rowHeight: 29 rowHeight: 24
}; };
export const TextCompareEditorVisible = new RawContextKey<boolean>('textCompareEditorVisible', false); export const TextCompareEditorVisible = new RawContextKey<boolean>('textCompareEditorVisible', false);

1
src/sql/parts/query/editor/resultsGridContribution.ts
View File

@@ -24,6 +24,7 @@ const resultsGridConfiguration: IConfigurationNode = {
properties: { properties: {
'resultsGrid.fontFamily': { 'resultsGrid.fontFamily': {
type: 'string', type: 'string',
default: EDITOR_FONT_DEFAULTS.fontFamily,
description: nls.localize('fontFamily', "Controls the font family.") description: nls.localize('fontFamily', "Controls the font family.")
}, },
'resultsGrid.fontWeight': { 'resultsGrid.fontWeight': {

7
src/sql/parts/query/views/flexibleSash.ts
View File

@@ -162,6 +162,7 @@ export class VerticalFlexibleSash extends Disposable implements IVerticalSashLay
*/ */
export class HorizontalFlexibleSash extends Disposable implements IHorizontalSashLayoutProvider, IFlexibleSash { export class HorizontalFlexibleSash extends Disposable implements IHorizontalSashLayoutProvider, IFlexibleSash {
private static initialRatio: number = 0.4;
private sash: Sash; private sash: Sash;
private ratio: number; private ratio: number;
private startPosition: number; private startPosition: number;
@@ -174,7 +175,7 @@ export class HorizontalFlexibleSash extends Disposable implements IHorizontalSas
constructor(container: HTMLElement, private minHeight: number) { constructor(container: HTMLElement, private minHeight: number) {
super(); super();
this.ratio = 0.5; this.ratio = HorizontalFlexibleSash.initialRatio;
this.left = 0; this.left = 0;
this.sash = new Sash(container, this, { orientation: Orientation.HORIZONTAL }); this.sash = new Sash(container, this, { orientation: Orientation.HORIZONTAL });
@@ -240,7 +241,7 @@ export class HorizontalFlexibleSash extends Disposable implements IHorizontalSas
} }
private onSashReset(): void { private onSashReset(): void {
this.ratio = 0.5; this.ratio = HorizontalFlexibleSash.initialRatio;
this._onPositionChange.fire(this.position); this._onPositionChange.fire(this.position);
this.sash.layout(); this.sash.layout();
} }
@@ -253,7 +254,7 @@ export class HorizontalFlexibleSash extends Disposable implements IHorizontalSas
let sashPosition = Math.floor((sashRatio || 0.5) * contentHeight); let sashPosition = Math.floor((sashRatio || 0.5) * contentHeight);
let midPoint = Math.floor(0.5 * contentHeight); let midPoint = Math.floor(0.5 * contentHeight);
if (contentHeight > this.minHeight * 2) { if (contentHeight > this.minHeight * 4) {
if (sashPosition < this.minHeight) { if (sashPosition < this.minHeight) {
sashPosition = this.minHeight; sashPosition = this.minHeight;
} }

5
src/sql/workbench/parts/dataExplorer/browser/media/connectionViewletPanel.css
View File

@@ -75,7 +75,10 @@ margin-bottom: 2px;
/* OE and connection element group */ /* 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 > .connection-tile,
.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group { .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; overflow: hidden;
} }

4
src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts
View File

@@ -41,11 +41,11 @@ export interface IObjectExplorerTemplateData {
*/ */
export class ServerTreeRenderer implements IRenderer { export class ServerTreeRenderer implements IRenderer {
public static CONNECTION_HEIGHT = 25; public static CONNECTION_HEIGHT = 23;
public static CONNECTION_GROUP_HEIGHT = 38; public static CONNECTION_GROUP_HEIGHT = 38;
private static CONNECTION_TEMPLATE_ID = 'connectionProfile'; private static CONNECTION_TEMPLATE_ID = 'connectionProfile';
private static CONNECTION_GROUP_TEMPLATE_ID = 'connectionProfileGroup'; private static CONNECTION_GROUP_TEMPLATE_ID = 'connectionProfileGroup';
public static OBJECTEXPLORER_HEIGHT = 25; public static OBJECTEXPLORER_HEIGHT = 23;
private static OBJECTEXPLORER_TEMPLATE_ID = 'objectExplorer'; private static OBJECTEXPLORER_TEMPLATE_ID = 'objectExplorer';
/** /**
* _isCompact is used to render connections tiles with and without the action buttons. * _isCompact is used to render connections tiles with and without the action buttons.

4
src/vs/editor/common/config/editorOptions.ts
View File

@@ -2585,7 +2585,9 @@ export const EDITOR_FONT_DEFAULTS = {
), ),
fontWeight: 'normal', fontWeight: 'normal',
fontSize: ( fontSize: (
platform.isMacintosh ? 12 : 14 // {{SQL CARBON EDIT}} - change default font size
//platform.isMacintosh ? 12 : 14
12
), ),
lineHeight: 0, lineHeight: 0,
letterSpacing: 0, letterSpacing: 0,

3
src/vs/workbench/browser/media/part.css
View File

@@ -76,7 +76,8 @@
} }
.monaco-workbench .part > .content { .monaco-workbench .part > .content {
font-size: 13px; /* {{SQL CARBON EDIT}} */
font-size: 12px;
} }
.monaco-workbench .part > .content > .monaco-progress-container, .monaco-workbench .part > .content > .monaco-progress-container,