do not use a special badge for update notification

isidorn · isidorn · commit 862088c2b1b0 · 2017-05-29T16:13:43.000+02:00
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -13,7 +13,7 @@ import { Builder, $ } from 'vs/base/browser/builder';
 import { DelayedDragHandler } from 'vs/base/browser/dnd';
 import { Action } from 'vs/base/common/actions';
 import { BaseActionItem, Separator, IBaseActionItemOptions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IActivityBarService, DotBadge, ProgressBadge, TextBadge, NumberBadge, IconBadge, IBadge } from 'vs/workbench/services/activity/common/activityBarService';
+import { IActivityBarService, ProgressBadge, TextBadge, NumberBadge, IconBadge, IBadge } from 'vs/workbench/services/activity/common/activityBarService';
 import Event, { Emitter } from 'vs/base/common/event';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -206,13 +206,6 @@ export class ActivityActionItem extends BaseActionItem {
 				this.$badge.show();
 			}
 
-			// Dot
-			else if (badge instanceof DotBadge) {
-				this.$badge.addClass('dot-badge');
-				this.$badge.title(badge.getDescription());
-				this.$badge.show();
-			}
-
 			// Progress
 			else if (badge instanceof ProgressBadge) {
 				this.$badge.show();
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -67,16 +67,6 @@
 	text-align: center;
 }
 
-.monaco-workbench > .activitybar > .content .monaco-action-bar .badge.dot-badge .badge-content {
-	box-sizing: border-box;
-	content: '';
-	top: 9px;
-	width: 11px;
-	height: 11px;
-	min-width: inherit;
-	padding: 0;
-}
-
 /* Right aligned */
 
 .monaco-workbench > .activitybar.right > .content .monaco-action-bar .action-label {
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -15,7 +15,7 @@ import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import URI from 'vs/base/common/uri';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IActivityBarService, DotBadge } from 'vs/workbench/services/activity/common/activityBarService';
+import { IActivityBarService, TextBadge } from 'vs/workbench/services/activity/common/activityBarService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ReleaseNotesInput } from 'vs/workbench/parts/update/electron-browser/releaseNotesInput';
 import { IGlobalActivity } from 'vs/workbench/browser/activity';
@@ -280,7 +280,7 @@ export class UpdateContribution implements IWorkbenchContribution {
 export class LightUpdateContribution implements IGlobalActivity {
 
 	get id() { return 'vs.update'; }
-	get name() { return 'VS Code'; }
+	get name() { return ''; }
 	get cssClass() { return 'update-activity'; }
 
 	constructor(
@@ -293,7 +293,7 @@ export class LightUpdateContribution implements IGlobalActivity {
 		@IActivityBarService activityBarService: IActivityBarService
 	) {
 		this.updateService.onUpdateReady(() => {
-			const badge = new DotBadge(() => nls.localize('updateIsReady', "New update available."));
+			const badge = new TextBadge('\u21e9', () => nls.localize('updateIsReady', "New update available."));
 			activityBarService.showGlobalActivity(this.id, badge);
 		});
 
diff --git a/src/vs/workbench/services/activity/common/activityBarService.ts b/src/vs/workbench/services/activity/common/activityBarService.ts
@@ -24,8 +24,6 @@ export class BaseBadge implements IBadge {
 	}
 }
 
-export class DotBadge extends BaseBadge { }
-
 export class NumberBadge extends BaseBadge {
 	public number: number;
 

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ export class BaseBadge implements IBadge {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-export class DotBadge extends BaseBadge { }`
`28`		`-`
`29`	`27`	`export class NumberBadge extends BaseBadge {`
`30`	`28`	`public number: number;`
`31`	`29`