Skip to content

Commit 36a510e

Browse files
committed
1 parent f0c9dd6 commit 36a510e

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

src/vs/workbench/contrib/extensions/browser/extensionEditor.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ import { Delegate } from 'vs/workbench/contrib/extensions/browser/extensionsList
6666
import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
6767
import { attachKeybindingLabelStyler } from 'vs/platform/theme/common/styler';
6868
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
69-
import { errorIcon, infoIcon, starEmptyIcon, verifiedPublisherIcon as verifiedPublisherThemeIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
69+
import { errorIcon, infoIcon, preReleaseIcon, starEmptyIcon, verifiedPublisherIcon as verifiedPublisherThemeIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
7070
import { MarkdownString } from 'vs/base/common/htmlContent';
7171
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
7272
import { ViewContainerLocation } from 'vs/workbench/common/views';
@@ -195,7 +195,9 @@ class PreReleaseTextWidget extends ExtensionWithDifferentGalleryVersionWidget {
195195
constructor(container: HTMLElement) {
196196
super();
197197
this.element = append(container, $('span.pre-release'));
198-
this.element.textContent = localize('preRelease', "Pre-Release");
198+
append(this.element, $('span' + ThemeIcon.asCSSSelector(preReleaseIcon)));
199+
const textElement = append(this.element, $('span.pre-release-text'));
200+
textElement.textContent = localize('preRelease', "Pre-Release");
199201
this.render();
200202
}
201203
render(): void {
@@ -286,10 +288,11 @@ export class ExtensionEditor extends EditorPane {
286288
const name = append(title, $('span.name.clickable', { title: localize('name', "Extension name"), role: 'heading', tabIndex: 0 }));
287289
const versionWidget = new VersionWidget(title);
288290

291+
const preReleaseWidget = new PreReleaseTextWidget(title);
292+
289293
const preview = append(title, $('span.preview', { title: localize('preview', "Preview") }));
290294
preview.textContent = localize('preview', "Preview");
291295

292-
const preReleaseWidget = new PreReleaseTextWidget(title);
293296
const builtin = append(title, $('span.builtin'));
294297
builtin.textContent = localize('builtin', "Built-in");
295298

src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,10 @@ export class ExtensionHoverWidget extends ExtensionWidget {
486486
}
487487
const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
488488

489-
markdown.appendMarkdown(`**${this.extension.displayName}** _v${this.extension.version}_`);
489+
markdown.appendMarkdown(`**${this.extension.displayName}**&nbsp;<span style="background-color:#8080802B;">**&nbsp;_v${this.extension.version}_**&nbsp;</span>`);
490490
if (this.extension.local?.isPreReleaseVersion || this.extension.gallery?.properties.isPreReleaseVersion) {
491491
const extensionPreReleaseIcon = this.themeService.getColorTheme().getColor(extensionPreReleaseIconColor);
492-
markdown.appendMarkdown(`&nbsp;<span style="color:#ffffff;background-color:${extensionPreReleaseIcon ? Color.Format.CSS.formatHex(extensionPreReleaseIcon) : '#ffffff'};">&nbsp;${localize('pre-release-label', "Pre-Release")}&nbsp;</span>`);
492+
markdown.appendMarkdown(`**&nbsp;**&nbsp;<span style="background-color:${extensionPreReleaseIcon ? Color.Format.CSS.formatHex(extensionPreReleaseIcon) : '#ffffff'};">&nbsp;$(${preReleaseIcon.id})&nbsp;${localize('pre-release-label', "Pre-Release")}&nbsp;</span>`);
493493
}
494494
markdown.appendText(`\n`);
495495

src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,23 @@
8989
}
9090

9191
.extension-editor > .header > .details > .title > .pre-release {
92-
font-size: 10px;
9392
margin-left: 10px;
9493
padding: 0px 4px;
9594
border-radius: 4px;
96-
user-select: none;
97-
-webkit-user-select: none;
9895
background-color: var(--vscode-extensionIcon-preReleaseForeground);
9996
color: #ffffff;
100-
white-space: nowrap;
97+
display: flex;
98+
align-items: center;
99+
}
100+
101+
.extension-editor > .header > .details > .title > .pre-release > .codicon.codicon-extensions-pre-release {
102+
color: #ffffff;
103+
font-size: 14px;
104+
}
105+
106+
.extension-editor > .header > .details > .title > .pre-release > .pre-release-text {
107+
font-size: 10px;
108+
padding-left: 3px;
101109
}
102110

103111
.monaco-workbench.vs .extension-editor > .header > .details > .title > .preview {

0 commit comments

Comments
 (0)