ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-29 16:20:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 6fded8a497cd0142de3a1c607649a5423a091a25

Browse Source
This commit is contained in:
ADS Merger
2020-04-04 04:30:52 +00:00
parent 00cc0074f7
commit 35f1a014d5
184 changed files with 3043 additions and 2285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
View File

@@ -862,7 +862,15 @@ export class ExtensionEditor extends BaseEditor {
extensionPackReadme.style.maxWidth = '882px';
const extensionPack = append(extensionPackReadme, $('div', { class: 'extension-pack' }));
toggleClass(extensionPackReadme, 'narrow', manifest.extensionPack!.length <= 2);
if (manifest.extensionPack!.length <= 3) {
addClass(extensionPackReadme, 'one-row');
} else if (manifest.extensionPack!.length <= 6) {
addClass(extensionPackReadme, 'two-rows');
} else if (manifest.extensionPack!.length <= 9) {
addClass(extensionPackReadme, 'three-rows');
} else {
addClass(extensionPackReadme, 'more-rows');
}
const extensionPackHeader = append(extensionPack, $('div.header'));
extensionPackHeader.textContent = localize('extension pack', "Extension Pack ({0})", manifest.extensionPack!.length);

2
src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
View File

@@ -2605,7 +2605,7 @@ export class MaliciousStatusLabelAction extends ExtensionAction {
export class SyncIgnoredIconAction extends ExtensionAction {
private static readonly ENABLE_CLASS = `${ExtensionAction.ICON_ACTION_CLASS} codicon-eye-closed`;
private static readonly ENABLE_CLASS = `${ExtensionAction.ICON_ACTION_CLASS} codicon-sync-ignored`;
private static readonly DISABLE_CLASS = `${SyncIgnoredIconAction.ENABLE_CLASS} hide`;
constructor(

2
src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
View File

@@ -54,7 +54,7 @@ export class ExtensionsGridView extends Disposable {
private renderExtension(extension: IExtension, index: number): void {
const extensionContainer = dom.append(this.element, dom.$('.extension-container'));
extensionContainer.style.height = `${this.delegate.getHeight()}px`;
extensionContainer.style.width = `350px`;
extensionContainer.style.width = `275px`;
extensionContainer.setAttribute('tabindex', '0');
const template = this.renderer.renderTemplate(extensionContainer);

1
src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
View File

@@ -55,6 +55,7 @@
.monaco-action-bar .action-item.disabled .action-label.extension-action {
opacity: 1;
pointer-events: none;
}
.monaco-action-bar .action-item.disabled .action-label.extension-action.text {

34
src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
View File

@@ -277,16 +277,36 @@
padding-left: 20px;
}
.extension-editor > .body > .content > .extension-pack-readme.narrow > .extension-pack {
.extension-editor > .body > .content > .extension-pack-readme.one-row > .extension-pack {
height: 142px;
}
.extension-editor > .body > .content > .extension-pack-readme > .readme-content {
.extension-editor > .body > .content > .extension-pack-readme.two-rows > .extension-pack {
height: 224px;
}
.extension-editor > .body > .content > .extension-pack-readme.three-rows > .extension-pack {
height: 306px;
}
.extension-editor > .body > .content > .extension-pack-readme.more-rows > .extension-pack {
height: 326px;
}
.extension-editor > .body > .content > .extension-pack-readme.one-row > .readme-content {
height: calc(100% - 142px);
}
.extension-editor > .body > .content > .extension-pack-readme.two-rows > .readme-content {
height: calc(100% - 224px);
}
.extension-editor > .body > .content > .extension-pack-readme.narrow > .readme-content {
height: calc(100% - 142px);
.extension-editor > .body > .content > .extension-pack-readme.three-rows > .readme-content {
height: calc(100% - 306px);
}
.extension-editor > .body > .content > .extension-pack-readme.more-rows > .readme-content {
height: calc(100% - 326px);
}
.extension-editor > .body > .content > .extension-pack-readme > .extension-pack > .header,
@@ -483,6 +503,12 @@
cursor: pointer;
}
.extension-editor .extensions-grid-view .extension-list-item > .details > .header-container > .header > .version,
.extension-editor .extensions-grid-view .extension-list-item > .details > .header-container > .header > .ratings,
.extension-editor .extensions-grid-view .extension-list-item > .details > .header-container > .header > .install-count {
display: none;
}
.extension-editor .extensions-grid-view > .extension-container:focus > .extension-list-item > .details .header > .name,
.extension-editor .extensions-grid-view > .extension-container:focus > .extension-list-item > .details .header > .name:hover {
text-decoration: underline;