smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
431 stars 42 forks source link

Insufficient contrast of the text on the blue and green conflict headers #184

Open BrianHawley opened 9 years ago

BrianHawley commented 9 years ago

The "our changes" and "their changes" grey text is too hard to see against the blue or especially green backgrounds, making it tricky to read. This makes it hard to determine which is ours and which is theirs, if you don't remember from the last time you used this tool. Perhaps a better color than that grey, one with more contrast?

It's notable that the gif screenshot animation on the package page has more contrast and is easily readable. Maybe you could go back to that color? The regular nonanimated screenshot later on the package page shows the current color, and is harder to read.

adamreisnz commented 8 years ago

+1