diff --git a/package-lock.json b/package-lock.json index 708fe6c38d..92d5c3aff6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "team", - "version": "1.142.0", + "version": "1.149.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -115,6 +115,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -126,6 +127,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -3947,7 +3949,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "lowercase-keys": { "version": "1.0.1", diff --git a/src/clients/buildclient.ts b/src/clients/buildclient.ts index 052d152c5e..32b7a0dc80 100644 --- a/src/clients/buildclient.ts +++ b/src/clients/buildclient.ts @@ -53,7 +53,7 @@ export class BuildClient extends BaseClient { if (this._statusBarItem !== undefined) { const icon: string = Utils.GetBuildResultIcon(build.result); this._statusBarItem.command = CommandNames.OpenBuildSummaryPage; - this._statusBarItem.text = `$(icon octicon-package) ` + `$(icon ${icon})`; + this._statusBarItem.text = `$(package) ` + `$(${icon})`; this._statusBarItem.tooltip = "(" + BuildResult[build.result] + ") " + Strings.NavigateToBuildSummary + " " + build.buildNumber; } } else { @@ -61,7 +61,7 @@ export class BuildClient extends BaseClient { ", repo id " + this._serverContext.RepoInfo.RepositoryId.toString() + ", + branch " + (!context.CurrentBranch ? "UNKNOWN" : context.CurrentBranch.toString())); if (this._statusBarItem !== undefined) { this._statusBarItem.command = CommandNames.OpenBuildSummaryPage; - this._statusBarItem.text = `$(icon octicon-package) ` + `$(icon octicon-dash)`; + this._statusBarItem.text = `$(package) ` + `$(dash)`; this._statusBarItem.tooltip = context.Type === RepositoryType.GIT ? Strings.NoBuildsFound : Strings.NoTfvcBuildsFound; } } @@ -112,6 +112,6 @@ export class BuildClient extends BaseClient { } public static GetOfflineBuildStatusText() : string { - return `$(icon octicon-package) ` + `???`; + return `$(package) ` + `???`; } } diff --git a/src/clients/gitclient.ts b/src/clients/gitclient.ts index 6def9dca75..d3fcb92b3a 100644 --- a/src/clients/gitclient.ts +++ b/src/clients/gitclient.ts @@ -123,8 +123,8 @@ export class GitClient extends BaseClient { Logger.LogInfo("Getting pull requests that I requested..."); const svc: GitVcService = new GitVcService(this._serverContext); const myPullRequests: GitPullRequest[] = await svc.GetPullRequests(this._serverContext.RepoInfo.RepositoryId, this._serverContext.UserInfo.Id, undefined, PullRequestStatus.Active); - const icon: string = "octicon-search"; - const label: string = `$(icon ${icon}) `; + const icon: string = "search"; + const label: string = `$(${icon}) `; requestItems.push({ label: label + Strings.BrowseYourPullRequests, description: undefined, id: undefined }); myPullRequests.forEach((pr) => { @@ -156,29 +156,29 @@ export class GitClient extends BaseClient { private getPullRequestLabel(displayName: string, title: string, description: string, id: string, score: PullRequestScore): BaseQuickPickItem { let scoreIcon: string = ""; if (score === PullRequestScore.Succeeded) { - scoreIcon = "octicon-check"; + scoreIcon = "check"; } else if (score === PullRequestScore.Failed) { - scoreIcon = "octicon-stop"; + scoreIcon = "stop"; } else if (score === PullRequestScore.Waiting) { - scoreIcon = "octicon-watch"; + scoreIcon = "watch"; } else if (score === PullRequestScore.NoResponse) { - scoreIcon = "octicon-git-pull-request"; + scoreIcon = "git-pull-request"; } - const scoreLabel: string = `$(icon ${scoreIcon}) `; + const scoreLabel: string = `$(${scoreIcon}) `; return { label: scoreLabel + " (" + displayName + ") " + title, description: description, id: id }; } public static GetOfflinePullRequestStatusText() : string { - return `$(icon octicon-git-pull-request) ???`; + return `$(git-pull-request) ???`; } //Sets the text on the pull request status bar public static GetPullRequestStatusText(total?: string) : string { if (!total) { - return `$(icon octicon-git-pull-request) $(icon octicon-dash)`; + return `$(git-pull-request) $(dash)`; } - return `$(icon octicon-git-pull-request) ${total.toString()}`; + return `$(git-pull-request) ${total.toString()}`; } //Ensure that we don't accidentally send non-Git (e.g., TFVC) contexts to the Git client diff --git a/src/clients/witclient.ts b/src/clients/witclient.ts index 96e5f27f17..080e229c56 100644 --- a/src/clients/witclient.ts +++ b/src/clients/witclient.ts @@ -249,7 +249,7 @@ export class WitClient extends BaseClient { const msg: string = Strings.UnsupportedWitServerVersion; Logger.LogError(msg); if (this._statusBarItem !== undefined) { - this._statusBarItem.text = `$(icon octicon-bug) $(icon octicon-x)`; + this._statusBarItem.text = `$(bug) $(x)`; this._statusBarItem.tooltip = msg; this._statusBarItem.command = undefined; //Clear the existing command } @@ -284,13 +284,13 @@ export class WitClient extends BaseClient { } public static GetOfflinePinnedQueryStatusText() : string { - return `$(icon octicon-bug) ???`; + return `$(bug) ???`; } public static GetPinnedQueryStatusText(total?: string) : string { if (!total) { - return `$(icon octicon-bug) $(icon octicon-dash)`; + return `$(bug) $(dash)`; } - return `$(icon octicon-bug) ${total.toString()}`; + return `$(bug) ${total.toString()}`; } } diff --git a/src/extensionmanager.ts b/src/extensionmanager.ts index eed04bbd97..dd52dbe493 100644 --- a/src/extensionmanager.ts +++ b/src/extensionmanager.ts @@ -523,7 +523,7 @@ export class ExtensionManager implements Disposable { if (this._teamServicesStatusBarItem !== undefined) { //TODO: Should the default command be to display the message? this._teamServicesStatusBarItem.command = commandOnClick; // undefined clears the command - this._teamServicesStatusBarItem.text = `Team $(icon octicon-stop)`; + this._teamServicesStatusBarItem.text = `Team $(stop)`; this._teamServicesStatusBarItem.tooltip = message; this._teamServicesStatusBarItem.show(); } @@ -603,7 +603,7 @@ export class ExtensionManager implements Disposable { private showFeedbackItem(): void { this._feedbackStatusBarItem.command = CommandNames.SendFeedback; - this._feedbackStatusBarItem.text = `$(icon octicon-megaphone)`; + this._feedbackStatusBarItem.text = `$(megaphone)`; this._feedbackStatusBarItem.tooltip = Strings.SendFeedback; this._feedbackStatusBarItem.show(); } diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts index 30f30d3ceb..f8e6dd06ea 100644 --- a/src/helpers/utils.ts +++ b/src/helpers/utils.ts @@ -49,17 +49,17 @@ export class Utils { public static GetBuildResultIcon(result: BuildResult) : string { switch (result) { case BuildResult.Succeeded: - return "octicon-check"; + return "check"; case BuildResult.Canceled: - return "octicon-alert"; + return "alert"; case BuildResult.Failed: - return "octicon-stop"; + return "stop"; case BuildResult.PartiallySucceeded: - return "octicon-alert"; + return "alert"; case BuildResult.None: - return "octicon-question"; + return "question"; default: - return "octicon-question"; + return "question"; } } diff --git a/src/team-extension.ts b/src/team-extension.ts index fde63640a4..bb073c5344 100644 --- a/src/team-extension.ts +++ b/src/team-extension.ts @@ -416,7 +416,7 @@ export class TeamExtension { if (!this._buildStatusBarItem) { this._buildStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Left, 98); this._buildStatusBarItem.command = CommandNames.OpenBuildSummaryPage; - this._buildStatusBarItem.text = `$(icon octicon-package) $(icon octicon-dash)`; + this._buildStatusBarItem.text = `$(package) $(dash)`; this._buildStatusBarItem.tooltip = Strings.NoBuildsFound; this._buildStatusBarItem.show(); }