From 71c9724ccb29326dca071f4368ce463341679fb1 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Fri, 20 Jan 2017 14:41:29 -0800 Subject: [PATCH] Use class instead of media query --- .../electron-browser/walkThroughPart.ts | 17 ++++++++++++----- .../electron-browser/welcomePage.css | 8 +++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts index b53d9f02892..4e820af0842 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts +++ b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts @@ -111,6 +111,11 @@ export class WalkThroughPart extends BaseEditor { layout({ width, height }: Dimension): void { $(this.content).style({ height: `${height}px`, width: `${width}px` }); + const innerContent = this.content.firstElementChild; + if (innerContent) { + const classList = innerContent.classList; + classList[height <= 690 ? 'add' : 'remove']('max-height-690px'); + } this.contentDisposables.forEach(disposable => { if (disposable instanceof CodeEditor) { disposable.layout(); @@ -137,7 +142,7 @@ export class WalkThroughPart extends BaseEditor { this.content.innerHTML = content; this.decorateContent(); if (input.onReady) { - input.onReady(this.content); + input.onReady(this.content.firstElementChild as HTMLElement); } this.scrollbar.scanDomNode(); return; @@ -149,14 +154,16 @@ export class WalkThroughPart extends BaseEditor { const id = `snippet-${model.snippets[i++].textEditorModel.uri.fragment}`; return `
`; }; - this.content.classList.add('walkThroughContent'); // only for markdown files + const innerContent = document.createElement('div'); + innerContent.classList.add('walkThroughContent'); // only for markdown files const markdown = this.expandMacros(content); - this.content.innerHTML = marked(markdown, { renderer }); + innerContent.innerHTML = marked(markdown, { renderer }); + this.content.appendChild(innerContent); model.snippets.forEach((snippet, i) => { const model = snippet.textEditorModel; const id = `snippet-${model.uri.fragment}`; - const div = this.content.querySelector(`#${id.replace(/\./g, '\\.')}`) as HTMLElement; + const div = innerContent.querySelector(`#${id.replace(/\./g, '\\.')}`) as HTMLElement; var options: IEditorOptions = { scrollBeyondLastLine: false, @@ -184,7 +191,7 @@ export class WalkThroughPart extends BaseEditor { } }); if (input.onReady) { - input.onReady(this.content); + input.onReady(innerContent); } this.scrollbar.scanDomNode(); }); diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css index be959c8cd4f..f37c7a30837 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css +++ b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css @@ -222,8 +222,6 @@ outline-offset: -5px; } -@media screen and (max-height: 750px) { - .monaco-workbench > .part.editor > .content .welcomePage .title { - display: none; - } -} \ No newline at end of file +.monaco-workbench > .part.editor > .content .welcomePage.max-height-690px .title { + display: none; +}