diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts index 6b8d4842712..5312c1636a7 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts @@ -255,7 +255,6 @@ export class ExtensionEditor extends EditorPane { rating.setAttribute('role', 'link'); // #132645 const description = append(details, $('.description')); - const preReleaseText = append(details, $('.pre-release-text')); const actionsAndStatusContainer = append(details, $('.actions-status-container')); const extensionActionBar = this._register(new ActionBar(actionsAndStatusContainer, { @@ -273,6 +272,7 @@ export class ExtensionEditor extends EditorPane { })); const status = append(actionsAndStatusContainer, $('.status')); + const preReleaseText = append(details, $('.pre-release-text')); const recommendation = append(details, $('.recommendation')); this._register(Event.chain(extensionActionBar.onDidRun) diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts index a7251b84880..f18ce4af267 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts @@ -501,18 +501,12 @@ export class ExtensionHoverWidget extends ExtensionWidget { } const preReleaseMessage = ExtensionHoverWidget.getPreReleaseMessage(this.extension); - if (preReleaseMessage) { - const extensionPreReleaseIcon = this.themeService.getColorTheme().getColor(extensionPreReleaseIconColor); - markdown.appendMarkdown(`$(${preReleaseIcon.id}) ${preReleaseMessage}`); - markdown.appendText(`\n`); - } - const extensionRuntimeStatus = this.extensionsWorkbenchService.getExtensionStatus(this.extension); const extensionStatus = this.extensionStatusAction.status; const reloadRequiredMessage = this.reloadAction.enabled ? this.reloadAction.tooltip : ''; const recommendationMessage = this.getRecommendationMessage(this.extension); - if (extensionRuntimeStatus || extensionStatus || reloadRequiredMessage || recommendationMessage) { + if (extensionRuntimeStatus || extensionStatus || reloadRequiredMessage || recommendationMessage || preReleaseMessage) { markdown.appendMarkdown(`---`); markdown.appendText(`\n`); @@ -555,6 +549,12 @@ export class ExtensionHoverWidget extends ExtensionWidget { markdown.appendText(`\n`); } + if (preReleaseMessage) { + const extensionPreReleaseIcon = this.themeService.getColorTheme().getColor(extensionPreReleaseIconColor); + markdown.appendMarkdown(`$(${preReleaseIcon.id}) ${preReleaseMessage}`); + markdown.appendText(`\n`); + } + if (recommendationMessage) { markdown.appendMarkdown(recommendationMessage); markdown.appendText(`\n`); diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css index 572237f365a..b16594bab09 100644 --- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css +++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css @@ -284,8 +284,9 @@ } .extension-editor > .header > .details > .pre-release-text:not(:empty){ - margin-top: 10px; + margin-top: 5px; display: flex; + font-size: 90%; } .extension-editor > .header > .details > .recommendation {