Skip to content

Added additional colour options for differing git staging statuses#107318

Merged
joaomoreno merged 2 commits intomicrosoft:masterfrom
mwood77:99129-theme-colour-git-staged
Sep 28, 2020
Merged

Added additional colour options for differing git staging statuses#107318
joaomoreno merged 2 commits intomicrosoft:masterfrom
mwood77:99129-theme-colour-git-staged

Conversation

@mwood77
Copy link
Copy Markdown
Contributor

@mwood77 mwood77 commented Sep 23, 2020

This PR fixes #99129 - added the ability to colourize different git staging statuses.

The staged statuses include:

  • Add (index added)
  • Modified (index modified)
  • Deleted (index deleted)

The default colours have been set to be similar, albeit slightly different tha what the conventional U, A, M, D git indicator colours. This way users can, at a glance, see the different statuses.

Screenshot 2020-09-23 at 20 14 57

@ghost
Copy link
Copy Markdown

ghost commented Sep 23, 2020

CLA assistant check
All CLA requirements met.

@mwood77 mwood77 changed the title added additional colour options for differing git staging statuses Added additional colour options for differing git staging statuses Sep 24, 2020
@kieferrm kieferrm requested a review from joaomoreno September 24, 2020 13:42
Copy link
Copy Markdown
Member

@joaomoreno joaomoreno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've addressed my comments with a commit on top and will merge it.

}
},
{
"id": "gitDecoration.stageAddedResourceForeground",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stageAdded doesn't exist. There's untracked and there's added, both states already have individual colors.

Comment on lines +172 to +173
"colors.stageModified": "Color for resources which have been staged, but modified.",
"colors.stageDeleted": "Color for resources which have been staged, but deleted.",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's got to be a better description here.

Comment on lines +1938 to +1949
"light": "#FF661F",
"dark": "#FFAB85",
"highContrast": "#ca541d"
}
},
{
"id": "gitDecoration.stageDeletedResourceForeground",
"description": "%colors.stageDeleted%",
"defaults": {
"light": "#ad0707",
"dark": "#c74e39",
"highContrast": "#c74e39"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should change the default colors, so let's just use today's colors. This is about enabling themes to overwrite this, not to change the default themes.

@joaomoreno
Copy link
Copy Markdown
Member

Thanks! 🍻

@joaomoreno joaomoreno added the git GIT issues label Sep 28, 2020
@joaomoreno joaomoreno added this to the September 2020 milestone Sep 28, 2020
@joaomoreno joaomoreno merged commit c2311f2 into microsoft:master Sep 28, 2020
@mwood77
Copy link
Copy Markdown
Contributor Author

mwood77 commented Sep 28, 2020

Thanks for the feedback!

@bpasero
Copy link
Copy Markdown
Member

bpasero commented Oct 7, 2020

@mwood77
Copy link
Copy Markdown
Contributor Author

mwood77 commented Oct 7, 2020

raised @ microsoft/vscode-docs#4047

@joaomoreno
Copy link
Copy Markdown
Member

@bpasero I already did this 3 days ago on vnext: microsoft/vscode-docs@6b9a0ac

@bpasero
Copy link
Copy Markdown
Member

bpasero commented Oct 8, 2020

Thanks!

@github-actions github-actions Bot locked and limited conversation to collaborators Dec 4, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Theme Color : Git : Staged

3 participants