search

tokyo-night / tokyo-night-vscode-theme

A clean, dark Visual Studio Code theme that celebrates the lights of Downtown Tokyo at night.
MIT License
1.74k stars 119 forks source link

Poor contrast for merge conflict text #60

Closed karbica closed 2 years ago

karbica commented 2 years ago

When merge conflicts occur, the builtin VSCode merge conflict helper has poor contrast making the "Current Change" and "Incoming Change" hard to read.

Screen Shot 2022-08-02 at 11 13 29 AM

I'm thinking that the text match the background color so it "punches" through the green and blue bars.

Screen Shot 2022-08-02 at 11 20 55 AM

Or lighten the text based on the background color for each.

Screen Shot 2022-08-02 at 11 27 16 AM

Using the following colors:

#10a6a4 #5772b9

Or if there is a better color that follows the theme, that would be preferred.

enkia commented 2 years ago

I agree, but never found the ability to change that color. I don't see it listed in the reference either.

Is it possible for you to upgrade Vscode to the latest? This should solve the issue with their new 3 way merge UI.