Fix additional regressions in master (#621)

This commit is contained in:
Karl Burtram
2018-02-06 19:13:14 -05:00
committed by GitHub
parent 332dc03df0
commit 579e6bf0cb
10 changed files with 10 additions and 1114 deletions

View File

@@ -16,19 +16,19 @@
}
/* Activity Bar - explore */
.monaco-workbench > .activitybar > .content > .monaco-action-bar .action-label.explore {
.monaco-workbench > .activitybar .monaco-action-bar .action-label.explore {
-webkit-mask: url('icons/file_inverse.svg') no-repeat 50% 50%;
-webkit-mask-size: 25px 25px;
}
/* Activity Bar - source control */
.monaco-workbench > .activitybar > .content > .monaco-action-bar .action-label.scm {
.monaco-workbench > .activitybar .monaco-action-bar .action-label.scm {
-webkit-mask: url('icons/sourcecontrol_inverse.svg') no-repeat 50% 50%;
-webkit-mask-size: 25px 25px;
}
/* Activity Bar - search */
.monaco-workbench > .activitybar > .content > .monaco-action-bar .action-label.search {
.monaco-workbench > .activitybar .monaco-action-bar .action-label.search {
-webkit-mask: url('icons/search_inverse.svg') no-repeat 50% 50%;
-webkit-mask-size: 25px 25px;
}

View File

@@ -61,8 +61,10 @@ export class ServerTreeView {
this._onSelectionOrFocusChange = new Emitter();
if (this._capabilitiesService) {
this._capabilitiesService.onCapabilitiesReady().then(() => {
this.refreshTree();
this._treeSelectionHandler.onTreeActionStateChange(false);
if (this._connectionManagementService.hasRegisteredServers()) {
this.refreshTree();
this._treeSelectionHandler.onTreeActionStateChange(false);
}
});
}
}

View File

@@ -68,7 +68,7 @@ export class ProductContribution implements IWorkbenchContribution {
text => editorService.openEditor(instantiationService.createInstance(ReleaseNotesInput, pkg.version, text), { pinned: true }),
() => {
messageService.show(Severity.Info, {
message: nls.localize('read the release notes', "Welcome to {0} January Public Preview! Would you like to view the Getting Started Guide?", product.nameLong, pkg.version),
message: nls.localize('read the release notes', "Welcome to {0} February Public Preview! Would you like to view the Getting Started Guide?", product.nameLong, pkg.version),
actions: [
instantiationService.createInstance(OpenGettingStartedInBrowserAction),
CloseAction