From e73da33e4fa009a648c241cd3ac1b9b452d30ca5 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 9 Oct 2017 18:42:13 +0200 Subject: [PATCH] add back untracked color, remove suffix for now --- extensions/git/package.json | 9 +++++++++ extensions/git/src/repository.ts | 3 ++- .../parts/scm/electron-browser/scmFileDecorations.ts | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/extensions/git/package.json b/extensions/git/package.json index 8eeaeb7cace..b10cfa73f31 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -813,6 +813,15 @@ "dark": "#cf9425", "highContrast": "#cf9425" } + }, + { + "id": "git.color.untracked", + "description": "Color for modified resources", + "defaults": { + "light": "#49805b", + "dark": "#73c990", + "highContrast": "#73c990" + } } ] }, diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index efc10d9a6fc..f4dab0e46e5 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -174,8 +174,9 @@ export class Resource implements SourceControlResourceState { switch (this.type) { case Status.INDEX_MODIFIED: case Status.MODIFIED: - case Status.UNTRACKED: return new ThemeColor('git.color.modified'); + case Status.UNTRACKED: + return new ThemeColor('git.color.untracked'); default: return undefined; } diff --git a/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts b/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts index 0aa8a1d962d..d963f462e7e 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts @@ -67,7 +67,6 @@ class SCMDecorationsProvider implements IDecorationsProvider { return { severity: Severity.Info, color: resource.decorations.color, - suffix: '\'', tooltip: localize('tooltip', "{0} - {1}", resource.decorations.tooltip, this._provider.label) }; }