diff --git a/src/vs/base/browser/ui/splitview/splitview.css b/src/vs/base/browser/ui/splitview/splitview.css index 26429830a854cf7bd5591001b183ceb3f33bd5f2..2ed3c4a7615cfdcab19b5bd81eaf57ef6ea9f7b0 100644 --- a/src/vs/base/browser/ui/splitview/splitview.css +++ b/src/vs/base/browser/ui/splitview/splitview.css @@ -21,7 +21,7 @@ .monaco-split-view > .split-view-view > .header { position: relative; - line-height: 24px; + line-height: 22px; font-size: 11px; font-weight: bold; text-transform: uppercase; diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts index a102998015056cd0b99213c9ae90f192a8323e62..bd962175f9c841ecca11dd224a18aa46c72dab48 100644 --- a/src/vs/base/browser/ui/splitview/splitview.ts +++ b/src/vs/base/browser/ui/splitview/splitview.ts @@ -64,8 +64,8 @@ export class View extends ee.EventEmitter { this.size = 0; this._sizing = types.isUndefined(opts.sizing) ? ViewSizing.Flexible : opts.sizing; - this._fixedSize = types.isUndefined(opts.fixedSize) ? 24 : opts.fixedSize; - this._minimumSize = types.isUndefined(opts.minimumSize) ? 24 : opts.minimumSize; + this._fixedSize = types.isUndefined(opts.fixedSize) ? 22 : opts.fixedSize; + this._minimumSize = types.isUndefined(opts.minimumSize) ? 22 : opts.minimumSize; } public get sizing(): ViewSizing { return this._sizing; } @@ -108,7 +108,7 @@ export class HeaderView extends View { constructor(opts: IHeaderViewOptions) { super(opts); - this.headerSize = types.isUndefined(opts.headerSize) ? 24 : opts.headerSize; + this.headerSize = types.isUndefined(opts.headerSize) ? 22 : opts.headerSize; } public render(container: HTMLElement, orientation: Orientation): void { @@ -292,7 +292,7 @@ export class FixedCollapsibleView extends AbstractCollapsibleView { constructor(opts: IFixedCollapsibleViewOptions) { super(objects.mixin({ sizing: ViewSizing.Fixed }, opts)); - this._expandedBodySize = types.isUndefined(opts.expandedBodySize) ? 24 : opts.expandedBodySize; + this._expandedBodySize = types.isUndefined(opts.expandedBodySize) ? 22 : opts.expandedBodySize; } public get fixedSize(): number { return this.state === CollapsibleState.EXPANDED ? this.expandedSize : this.headerSize; } diff --git a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts index 8cbef483f28dda468866dd771d94fc900dca5391..10619f447ab7b56105b2b6756d24e1c4fcfcb3c1 100644 --- a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts +++ b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts @@ -421,7 +421,7 @@ class Renderer implements IRenderer { return (entry).getHeight(); } - return 24; + return 22; } public getTemplateId(entry: QuickOpenEntry): string { diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts index f746b15b462548dd45b992c13a8c374bee635792..726dc4b188807007ac17eaa4e18dadd12d225b71 100644 --- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts +++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts @@ -61,7 +61,7 @@ export class QuickOpenController extends DefaultController { export class QuickOpenWidget implements IModelProvider { public static MAX_WIDTH = 600; // Max total width of quick open widget - public static MAX_ITEMS_HEIGHT = 20 * 24; // Max height of item list below input field + public static MAX_ITEMS_HEIGHT = 20 * 22; // Max height of item list below input field private options: IQuickOpenOptions; private builder: Builder; @@ -693,7 +693,7 @@ export class QuickOpenWidget implements IModelProvider { this.tree.setInput(null); // Reset Tree Height - this.treeContainer.style({ height: (this.options.minItemsToShow ? this.options.minItemsToShow * 24 : 0) + 'px' }); + this.treeContainer.style({ height: (this.options.minItemsToShow ? this.options.minItemsToShow * 22 : 0) + 'px' }); // Clear any running Progress this.progressBar.stop().getContainer().hide(); diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css index fba75e213a80b80ab4f1f0e769e21e7df9622d12..be287288ce2fed598c846b26e9eb0a2d5c6804d6 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css @@ -57,7 +57,7 @@ width: 20%; color: #646465; font-family: "Segoe WPC", "Segoe UI", "SFUIText-Light", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback"; - line-height: 24px; + line-height: 22px; font-size: 13px; } @@ -90,7 +90,7 @@ .monaco-editor .reference-zone-widget .tree .reference-file { position: relative; - line-height: 24px; + line-height: 22px; color: #1E1E1E; } diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index 027c4daa15ee3b7eb551c73b73a5141c363ee134..c5880de7dcd654595d120c0574e9f2850e025d74 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -537,7 +537,7 @@ export class AdaptiveCollapsibleViewletView extends FixedCollapsibleView impleme ) { super({ expandedBodySize: initialBodySize, - headerSize: 24, + headerSize: 22, initialState: collapsed ? CollapsibleState.COLLAPSED : CollapsibleState.EXPANDED }); @@ -656,7 +656,7 @@ export class CollapsibleViewletView extends CollapsibleView implements IViewletV @IContextMenuService protected contextMenuService: IContextMenuService ) { super({ - minimumSize: 2 * 24, + minimumSize: 2 * 22, initialState: collapsed ? CollapsibleState.COLLAPSED : CollapsibleState.EXPANDED }); diff --git a/src/vs/workbench/parts/debug/browser/debugViewer.ts b/src/vs/workbench/parts/debug/browser/debugViewer.ts index 161496c10d87552c7051fd7bd17c7a32cecc45b8..7453ab451b5b75a005f612179a1596707f0968fd 100644 --- a/src/vs/workbench/parts/debug/browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/browser/debugViewer.ts @@ -228,7 +228,7 @@ export class CallStackRenderer implements tree.IRenderer { } public getHeight(tree:tree.ITree, element:any): number { - return 24; + return 22; } public getTemplateId(tree: tree.ITree, element: any): string { @@ -381,7 +381,7 @@ export class VariablesRenderer implements tree.IRenderer { } public getHeight(tree: tree.ITree, element: any): number { - return 24; + return 22; } public getTemplateId(tree: tree.ITree, element: any): string { @@ -541,7 +541,7 @@ export class WatchExpressionsRenderer implements tree.IRenderer { } public getHeight(tree:tree.ITree, element:any): number { - return 24; + return 22; } public getTemplateId(tree: tree.ITree, element: any): string { @@ -764,7 +764,7 @@ export class BreakpointsRenderer implements tree.IRenderer { } public getHeight(tree:tree.ITree, element:any): number { - return 24; + return 22; } public getTemplateId(tree: tree.ITree, element: any): string { diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts index 473783c331c3a2afc896383098d7cc3b27241514..9facb4fbff756488c3af68dfbe4c5e63145a593d 100644 --- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts +++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts @@ -399,7 +399,7 @@ class BreakpointsView extends viewlet.AdaptiveCollapsibleViewletView { } private static getExpandedBodySize(length: number): number { - return Math.min(BreakpointsView.MAX_VISIBLE_FILES, length) * 24; + return Math.min(BreakpointsView.MAX_VISIBLE_FILES, length) * 22; } public shutdown(): void { diff --git a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css index b56aa541ffc11679048b236720c01216df7a726f..3cb6c60fa14812031f5fd2f5d0b741845c95a76f 100644 --- a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css +++ b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css @@ -10,7 +10,7 @@ } .debug-viewlet .monaco-tree .monaco-tree-row > .content { - line-height: 24px; + line-height: 22px; } .monaco-workbench .debug-select { diff --git a/src/vs/workbench/parts/debug/browser/media/repl.css b/src/vs/workbench/parts/debug/browser/media/repl.css index 155d6987ec8251ee2aa52a12faec0cbf59f28fbe..3849d53fba3a2c44bbf80263f072a6a06a5e38a5 100644 --- a/src/vs/workbench/parts/debug/browser/media/repl.css +++ b/src/vs/workbench/parts/debug/browser/media/repl.css @@ -12,7 +12,7 @@ } .monaco-workbench .repl .repl-tree { - height: calc(100% - 24px); + height: calc(100% - 22px); } .monaco-workbench .repl .surveyor { @@ -26,7 +26,7 @@ } .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content { - line-height: 24px; + line-height: 22px; word-wrap: break-word; -webkit-user-select: initial; } @@ -109,7 +109,7 @@ padding: 0; outline: none; font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback"; - line-height: 24px; + line-height: 22px; } .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-rows > .monaco-tree-row { @@ -137,7 +137,7 @@ .monaco-workbench .repl .repl-input-wrapper { border-top: 1px solid rgba(128, 128, 128, 0.35); box-sizing: border-box; - height: 24px; + height: 22px; } .monaco-workbench .repl .repl-input-wrapper:before { @@ -164,12 +164,12 @@ .monaco-workbench .repl .repl-input-wrapper.linux:before { content: '\276f'; - line-height: 24px; + line-height: 22px; } .monaco-workbench .repl .repl-input-wrapper.mac:before { content: '\276f'; - line-height: 24px; + line-height: 22px; } .monaco-workbench .repl .repl-input { diff --git a/src/vs/workbench/parts/debug/browser/replViewer.ts b/src/vs/workbench/parts/debug/browser/replViewer.ts index 18f9328cb96e735ad1919e0822c5550930e5e2b6..a892c634b38260f51bb505c671cdb8e2805933f5 100644 --- a/src/vs/workbench/parts/debug/browser/replViewer.ts +++ b/src/vs/workbench/parts/debug/browser/replViewer.ts @@ -120,14 +120,14 @@ export class ReplExpressionsRenderer implements tree.IRenderer { private getHeightForString(s: string): number { if (!s || !s.length || this.width <= 0 || this.characterWidth <= 0) { - return 24; + return 22; } let realLength = 0; for (let i = 0; i < s.length; i++) { realLength += strings.isFullWidthCharacter(s.charCodeAt(i)) ? 2 : 1; } - return 24 * Math.ceil(realLength * this.characterWidth / this.width); + return 22 * Math.ceil(realLength * this.characterWidth / this.width); } public setWidth(fullWidth: number, characterWidth: number): void { diff --git a/src/vs/workbench/parts/files/browser/media/explorerviewlet.css b/src/vs/workbench/parts/files/browser/media/explorerviewlet.css index 63254d978d8ec1fefb7c2628347c866545c6988e..3ae54e985f401c68813fdd48d22e5707b8471e45 100644 --- a/src/vs/workbench/parts/files/browser/media/explorerviewlet.css +++ b/src/vs/workbench/parts/files/browser/media/explorerviewlet.css @@ -9,7 +9,7 @@ } .explorer-viewlet .explorer-item, .explorer-viewlet .working-files-item { - line-height: 24px; + line-height: 22px; } .explorer-viewlet .explorer-item-label, .explorer-viewlet .working-files-item-label { diff --git a/src/vs/workbench/parts/files/browser/views/emptyView.ts b/src/vs/workbench/parts/files/browser/views/emptyView.ts index 50ca73f36fa71326c4d868cae3f2da36f4e63cbe..83a158961d50b8817494af2a37be68fdcc11ae85 100644 --- a/src/vs/workbench/parts/files/browser/views/emptyView.ts +++ b/src/vs/workbench/parts/files/browser/views/emptyView.ts @@ -22,7 +22,7 @@ export class EmptyView extends CollapsibleView { constructor(@IInstantiationService private instantiationService: IInstantiationService) { super({ - minimumSize: 2 * 24 + minimumSize: 2 * 22 }); } diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts index 8b393b5dbce1a08a6939d070efa44f4a55647528..b2e78a5d56ebf9ebd51d6ce529ec784289af3e7c 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts @@ -269,7 +269,7 @@ export class FileRenderer extends ActionsRenderer implements Tree.IRenderer { } public getContentHeight(tree: Tree.ITree, element: any): number { - return 24; + return 22; } public renderContents(tree: Tree.ITree, stat: FileStat, domElement: HTMLElement, previousCleanupFn: Tree.IElementCallback): Tree.IElementCallback { diff --git a/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts b/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts index bc3cc12672185b628dd311e4083b874e6dd343ca..d9b886820c020e14f8d010073dbd3fdd278e0825 100644 --- a/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts @@ -78,7 +78,7 @@ export class WorkingFilesSorter implements tree.ISorter { export class WorkingFilesRenderer extends ActionsRenderer { - public static FILE_ITEM_HEIGHT = 24; + public static FILE_ITEM_HEIGHT = 22; constructor( model: WorkingFilesModel, diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesView.css b/src/vs/workbench/parts/git/browser/views/changes/changesView.css index ce38ce654880ac34c4703d78501504072c525809..2a4ca96059703e51d8916cadc7ac2127d2c39c03 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesView.css +++ b/src/vs/workbench/parts/git/browser/views/changes/changesView.css @@ -31,7 +31,7 @@ /* Status view */ .git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row .content { - line-height: 24px; + line-height: 22px; } .git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row .content .monaco-action-bar { diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts index 9743679801227bb498abe986d616e61b70a0e7e1..d5e83f774749fee0ed64d54c55f3f643f981e3bf 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts @@ -232,7 +232,7 @@ export class Renderer implements tree.IRenderer { } public getHeight(tree:tree.ITree, element:any): number { - return 24; + return 22; } public getTemplateId(tree: tree.ITree, element: any): string { diff --git a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts index 70bf78bdd3e743069d8eae0807e3e3921602201d..7607d5384e94f1c74f299f6f1bd0dc247009dcb3 100644 --- a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts @@ -43,7 +43,7 @@ class HelpEntry extends QuickOpenEntryItem { } public getHeight(): number { - return 24; + return 22; } public getGroupLabel(): string { diff --git a/src/vs/workbench/parts/quickopen/browser/media/markerHandler.css b/src/vs/workbench/parts/quickopen/browser/media/markerHandler.css index 3625872976c1f7d577d9a416df768c7814425c5a..3ec474d2f6a69086eb1017d97409ed121f5d9298 100644 --- a/src/vs/workbench/parts/quickopen/browser/media/markerHandler.css +++ b/src/vs/workbench/parts/quickopen/browser/media/markerHandler.css @@ -9,13 +9,13 @@ } .quick-open-widget.marker-handler .row { - height: 24px; + height: 22px; } .quick-open-widget.marker-handler .severity { display: inline-block; width: 16px; - height: 24px; + height: 22px; margin-right: 4px; } diff --git a/src/vs/workbench/parts/search/browser/media/searchviewlet.css b/src/vs/workbench/parts/search/browser/media/searchviewlet.css index b462768fc879baeeec089450933b61e08a79f4c7..e8f7cbfcd4c53409ad60c8a8802cd11e896f11d2 100644 --- a/src/vs/workbench/parts/search/browser/media/searchviewlet.css +++ b/src/vs/workbench/parts/search/browser/media/searchviewlet.css @@ -99,7 +99,7 @@ .search-viewlet .filematch { position: relative; - line-height: 24px; + line-height: 22px; padding: 0; } @@ -113,7 +113,7 @@ overflow: hidden; text-overflow: ellipsis; position: relative; - line-height: 24px; + line-height: 22px; } .search-viewlet .linematch.changedOrRemoved { diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index a463f9c8bc1ae55d5964de8028938368a724513e..9d01f5296b43ae72d73b4fe7a4b78ec526437c70 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -210,7 +210,7 @@ class SearchRenderer extends ActionsRenderer { } public getContentHeight(tree: ITree, element: any): number { - return 24; + return 22; } public renderContents(tree: ITree, element: FileMatchOrMatch, domElement: HTMLElement, previousCleanupFn: IElementCallback): IElementCallback {