Merge from vscode cfc1ab4c5f816765b91fb7ead3c3427a7c8581a3

This commit is contained in:
ADS Merger
2020-03-11 04:19:23 +00:00
parent 16fab722d5
commit 4c3e48773d
880 changed files with 20441 additions and 11232 deletions

View File

@@ -26,8 +26,6 @@ import * as dom from 'vs/base/browser/dom';
import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { IDimension } from 'vs/platform/layout/browser/layoutService';
// import { TERMINAL_COMMAND_ID } from 'vs/workbench/contrib/terminal/common/terminal';
import { assertIsDefined } from 'vs/base/common/types';
import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
@@ -165,7 +163,7 @@ export class WatermarkContribution extends Disposable implements IWorkbenchContr
this.handleEditorPartSize(container, this.editorGroupsService.contentDimension);
}
private handleEditorPartSize(container: HTMLElement, dimension: IDimension): void {
private handleEditorPartSize(container: HTMLElement, dimension: dom.IDimension): void {
if (dimension.height <= 478) {
dom.addClass(container, 'max-height-478px');
} else {