From 0e68a1a14acf64352d93a23007442f212864727e Mon Sep 17 00:00:00 2001 From: Jackson Kearl Date: Mon, 9 Jul 2018 10:11:02 -0700 Subject: [PATCH] Changes for feedback --- .../browser/parts/views/media/panelviewlet.css | 2 +- .../browser/parts/views/panelViewlet.ts | 6 +++--- .../debug/electron-browser/callStackView.ts | 9 ++++----- .../electron-browser/extensionsViews.ts | 6 ++---- .../electron-browser/views/openEditorsView.ts | 5 ++--- .../scm/electron-browser/media/scmViewlet.css | 2 +- .../parts/scm/electron-browser/scmViewlet.ts | 18 +++++++++--------- 7 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/media/panelviewlet.css b/src/vs/workbench/browser/parts/views/media/panelviewlet.css index 1dadcbfc4dd..7d6c4e36d60 100644 --- a/src/vs/workbench/browser/parts/views/media/panelviewlet.css +++ b/src/vs/workbench/browser/parts/views/media/panelviewlet.css @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -.monaco-panel-view .panel > .panel-header > h3.title { +.monaco-panel-view .panel > .panel-header h3.title { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts index 86886c0ea7e..a647bf39021 100644 --- a/src/vs/workbench/browser/parts/views/panelViewlet.ts +++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts @@ -100,7 +100,7 @@ export abstract class ViewletPanel extends Panel implements IView { protected renderHeader(container: HTMLElement): void { this.headerContainer = container; - this.renderHeaderTitle(container, [], [this.title]); + this.renderHeaderTitle(container, this.title); const actions = append(container, $('.actions')); this.toolbar = new ToolBar(actions, this.contextMenuService, { @@ -119,8 +119,8 @@ export abstract class ViewletPanel extends Panel implements IView { this.updateActionsVisibility(); } - protected renderHeaderTitle(container: HTMLElement, classList: string[], children: (string | Node)[]): void { - append(container, $('h3.' + ['title', ...classList].join('.'), null, ...children)); + protected renderHeaderTitle(container: HTMLElement, title: string): void { + append(container, $('h3.title', null, title)); } focus(): void { diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts index cd6b2300ab5..3868462dbe7 100644 --- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts @@ -88,13 +88,12 @@ export class CallStackView extends TreeViewsViewletPanel { } protected renderHeaderTitle(container: HTMLElement): void { - const name = $('span'); - name.textContent = this.options.title; - this.pauseMessage = $('span.pause-message'); + let titleContainer = dom.append(container, $('.debug-call-stack-title')); + super.renderHeaderTitle(titleContainer, this.options.title); + + this.pauseMessage = dom.append(titleContainer, $('span.pause-message')); this.pauseMessage.hidden = true; this.pauseMessageLabel = dom.append(this.pauseMessage, $('span.label')); - - super.renderHeaderTitle(container, ['debug-call-stack-title'], [name, this.pauseMessage]); } public renderBody(container: HTMLElement): void { diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts index 5075965732d..80e64760492 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts @@ -72,13 +72,11 @@ export class ExtensionsListView extends ViewletPanel { } renderHeaderTitle(container: HTMLElement): void { - let title = $('span'); - title.textContent = this.options.title; + super.renderHeaderTitle(container, this.options.title); - this.badgeContainer = $('.count-badge-wrapper'); + this.badgeContainer = append(container, $('.count-badge-wrapper')); this.badge = new CountBadge(this.badgeContainer); this.disposables.push(attachBadgeStyler(this.badge, this.themeService)); - super.renderHeaderTitle(container, [], [title, this.badgeContainer]); } renderBody(container: HTMLElement): void { diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index ace6268d637..e1b08ea5801 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -176,9 +176,9 @@ export class OpenEditorsView extends ViewletPanel { } protected renderHeaderTitle(container: HTMLElement): void { + super.renderHeaderTitle(container, this.title); - const title = $('span', null, this.title); - const count = $('.count'); + const count = dom.append(container, $('.count')); this.dirtyCountElement = dom.append(count, $('.monaco-count-badge')); this.disposables.push((attachStylerCallback(this.themeService, { badgeBackground, badgeForeground, contrastBorder }, colors => { @@ -195,7 +195,6 @@ export class OpenEditorsView extends ViewletPanel { }))); this.updateDirtyIndicator(); - super.renderHeaderTitle(container, [], [title, count]); } public renderBody(container: HTMLElement): void { diff --git a/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css b/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css index f6e3ec0c18a..6d43b759884 100644 --- a/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css +++ b/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css @@ -51,7 +51,7 @@ display: none; } -.scm-viewlet .scm-provider > .name > .type { +.scm-viewlet .scm-provider > .type { opacity: 0.7; margin-left: 0.5em; font-size: 0.9em; diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index 61fb04bd5ff..7d3f0bae8dc 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -765,22 +765,22 @@ export class RepositoryPanel extends ViewletPanel { } protected renderHeaderTitle(container: HTMLElement): void { - const name = $('.name'); - const title = append(name, $('span.title')); - const type = append(name, $('span.type')); + let title: string; + let type: string; if (this.repository.provider.rootUri) { - title.textContent = basename(this.repository.provider.rootUri.fsPath); - type.textContent = this.repository.provider.label; + title = basename(this.repository.provider.rootUri.fsPath); + type = this.repository.provider.label; } else { - title.textContent = this.repository.provider.label; - type.textContent = ''; + title = this.repository.provider.label; + type = ''; } + super.renderHeaderTitle(container, title); + addClass(container, 'scm-provider'); + append(container, $('span.type', null, type)); const onContextMenu = mapEvent(stop(domEvent(container, 'contextmenu')), e => new StandardMouseEvent(e)); onContextMenu(this.onContextMenu, this, this.disposables); - - super.renderHeaderTitle(container, ['scm-provider'], [name]); } private onContextMenu(event: StandardMouseEvent): void { -- GitLab