From 2ef375ecf47d471eed9a0ea76d88588ca10dae90 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 27 Apr 2016 15:19:19 +0200 Subject: [PATCH] fix bad serif font in extensions quick open fixes #5793 --- .../electron-browser/extensionsQuickOpen.ts | 21 ++++++++++--------- .../electron-browser/media/extensions.css | 7 ++++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts index 66f2545ae66..315024543fb 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts @@ -58,6 +58,7 @@ interface ITemplateData { displayName: HighlightedLabel; version: HTMLElement; installCount: HTMLElement; + installCountLabel: HTMLElement; author: HTMLElement; actionbar: ActionBar; description: HighlightedLabel; @@ -203,7 +204,9 @@ class Renderer implements IPagedRenderer { const secondRow = dom.append(root, $('.row')); const published = dom.append(firstRow, $('.published')); const displayName = new HighlightedLabel(dom.append(firstRow, $('span.name'))); - const installCount = dom.append(firstRow, $('span.installCount')); + const installCount = dom.append(firstRow, $('span.install')); + dom.append(installCount, $('span.octicon.octicon-cloud-download')); + const installCountLabel = dom.append(installCount, $('span.installCount')); const version = dom.append(published, $('span.version')); const author = dom.append(published, $('span.author')); @@ -213,6 +216,7 @@ class Renderer implements IPagedRenderer { displayName, version, installCount, + installCountLabel, actionbar: new ActionBar(dom.append(secondRow, $('.actions'))), description: new HighlightedLabel(dom.append(secondRow, $('span.description'))), disposables: [] @@ -225,9 +229,8 @@ class Renderer implements IPagedRenderer { data.author.textContent = nls.localize('author', 'Author'); data.displayName.set(nls.localize('name', 'Name')); data.version.textContent = '0.0.1'; - data.installCount.textContent = ''; - dom.removeClass(data.installCount, 'octicon'); - dom.removeClass(data.installCount, 'octicon-cloud-download'); + data.installCount.style.display = 'none'; + data.installCountLabel.textContent = ''; data.actionbar.clear(); data.description.set(nls.localize('description', 'Description')); data.disposables = dispose(data.disposables); @@ -284,9 +287,8 @@ class Renderer implements IPagedRenderer { data.version.textContent = extension.version; if (isNumber(installCount)) { - data.installCount.textContent = String(installCount); - dom.addClass(data.installCount, 'octicon'); - dom.addClass(data.installCount, 'octicon-cloud-download'); + data.installCount.style.display = 'inline'; + data.installCountLabel.textContent = String(installCount); if (!installCount) { data.installCount.title = nls.localize('installCountZero', "{0} wasn't downloaded yet.", extension.displayName); @@ -296,9 +298,8 @@ class Renderer implements IPagedRenderer { data.installCount.title = nls.localize('installCountMultiple', "{0} was downloaded {1} times.", extension.displayName, installCount); } } else { - data.installCount.textContent = ''; - dom.removeClass(data.installCount, 'octicon'); - dom.removeClass(data.installCount, 'octicon-cloud-download'); + data.installCount.style.display = 'none'; + data.installCountLabel.textContent = ''; } data.author.textContent = publisher; diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css index c302e4a68f7..2514121d7c8 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css +++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css @@ -36,7 +36,7 @@ opacity: 0.6; } -.quick-open-widget .extension .installCount:not(:empty) { +.quick-open-widget .extension .install { margin-left: 6px; padding: 1px 3px; border-radius: 3px; @@ -45,8 +45,9 @@ opacity: 0.7; } -.quick-open-widget .extension .installCount:not(:empty):before { - margin-right: 2px; +.quick-open-widget .extension .install > .octicon { + font-size: small; + margin-right: 3px; } .quick-open-widget .extension .icon.octicon-x:before {