Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Editor: Tweak Colors #153316

Closed
hediet opened this issue Jun 27, 2022 · 1 comment · Fixed by #158825
Closed

Merge Editor: Tweak Colors #153316

hediet opened this issue Jun 27, 2022 · 1 comment · Fixed by #158825
Assignees
@hediet @daviddossett
Labels
insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue
Milestone
August 2022

Comments

@hediet
Copy link
Member

hediet commented Jun 27, 2022 •
edited

This is how it looks with a light theme:

image

Dark theme:

image

These are the current customizable colors (subject to change):

  • mergeEditor.diff
  • mergeEditor.diff.word
  • mergeEditor.conflict-handled.minimapOverViewRuler
  • mergeEditor.conflict-unhandled.minimapOverViewRuler
  • mergeEditor.conflictBorder.handledFocused
  • mergeEditor.conflictBorder.handledUnfocused
  • mergeEditor.conflictBorder.unhandledFocused
  • mergeEditor.conflictBorder.unhandledUnfocused

edit: the names changed
@hediet hediet added polish Cleanup and polish issue merge-editor labels Jun 27, 2022
@hediet hediet added this to the June 2022 milestone Jun 27, 2022
@hediet hediet modified the milestones: June 2022, July 2022 Jul 1, 2022
@daviddossett daviddossett modified the milestones: July 2022, August 2022 Jul 26, 2022
@daviddossett daviddossett mentioned this issue Aug 22, 2022
Merged
@VSCodeTriageBot VSCodeTriageBot added unreleased Patch has not yet been released in VS Code Insiders insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Aug 22, 2022
@isidorn
Copy link
Contributor

isidorn commented Aug 24, 2022

Created follow up #159019

@github-actions github-actions bot locked and limited conversation to collaborators Oct 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@hediet hediet

@daviddossett daviddossett

Labels
insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue
Projects
None yet
Milestone
August 2022
Development

Successfully merging a pull request may close this issue.

Merge Editor: update background and border colors microsoft/vscode
5 participants
@isidorn @hediet @daviddossett @miguelsolorio @VSCodeTriageBot