development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 23:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

deco - align git color names

Browse source
This commit is contained in:
Johannes Rieken 2017-10-30 12:52:16 +01:00
parent 5a0d5fe77e
commit f502f70345
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extensions/git/package.json
View file

@ -834,7 +834,7 @@
},
"colors": [
{
"id": "git.color.modified",
"id": "git.modifiedForeground",
"description": "Color for modified resources",
"defaults": {
"light": "#a76e12",
@ -843,7 +843,7 @@
}
},
{
"id": "git.color.deleted",
"id": "git.deletedForeground",
"description": "Color for deleted resources",
"defaults": {
"light": "#ad0707",
@ -852,7 +852,7 @@
}
},
{
"id": "git.color.untracked",
"id": "git.untrackedForeground",
"description": "Color for untracked resources",
"defaults": {
"light": "#019001",
@ -861,7 +861,7 @@
}
},
{
"id": "git.color.ignored",
"id": "git.ignoredForeground",
"description": "Color for ignored resources",
"defaults": {
"light": "#8E8E90",
@ -870,7 +870,7 @@
}
},
{
"id": "git.color.conflict",
"id": "git.conflictForeground",
"description": "Color for resources with conflicts",
"defaults": {
"light": "#6c6cc4",

2
extensions/git/src/decorationProvider.ts
View file

@ -40,7 +40,7 @@ class GitIgnoreDecorationProvider implements DecorationProvider {
if (ignored) {
return <DecorationData>{
priority: 3,
color: new ThemeColor('git.color.ignored')
color: new ThemeColor('git.ignoredForeground')
};
}
});

10
extensions/git/src/repository.ts
View file

@ -217,16 +217,16 @@ export class Resource implements SourceControlResourceState {
switch (this.type) {
case Status.INDEX_MODIFIED:
case Status.MODIFIED:
return new ThemeColor('git.color.modified');
return new ThemeColor('git.modifiedForeground');
case Status.INDEX_DELETED:
case Status.DELETED:
return new ThemeColor('git.color.deleted');
return new ThemeColor('git.deletedForeground');
case Status.INDEX_ADDED: // todo@joh - special color?
case Status.INDEX_RENAMED: // todo@joh - special color?
case Status.UNTRACKED:
return new ThemeColor('git.color.untracked');
return new ThemeColor('git.untrackedForeground');
case Status.IGNORED:
return new ThemeColor('git.color.ignored');
return new ThemeColor('git.ignoredForeground');
case Status.INDEX_COPIED:
case Status.BOTH_DELETED:
case Status.ADDED_BY_US:
@ -235,7 +235,7 @@ export class Resource implements SourceControlResourceState {
case Status.DELETED_BY_US:
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return new ThemeColor('git.color.conflict');
return new ThemeColor('git.conflictForeground');
default:
return undefined;
}