search

pawelgrzybek / gatito-theme

Minimalistic and modern looking fork of fantastic Oceanic theme for Visual Studio Code.
https://marketplace.visualstudio.com/items?itemName=pawelgrzybek.gatito-theme
79 stars 9 forks source link

[Suggestion] Change merge conflict colors #1

Open chmartinez opened 6 years ago

chmartinez commented 6 years ago

Hi! Thanks for the amazing theme. It looks great! The only thing I noticed is that when you're trying to solve merge conflicts, both incoming and current changes are being highlighted with the same color:

My suggestion will be to use a different set of colors. In my case, I've used this:

"workbench.colorCustomizations": { "merge.currentHeaderBackground": "#32766A", "merge.currentContentBackground": "#2B4641", "merge.incomingHeaderBackground": "#336493", "merge.incomingContentBackground": "#2B3F51", }

pawelgrzybek commented 6 years ago

Hi.

Fantastic suggestion! You can be assured that it will be added to a theme soon.

I am really glad that you like Gatito 🐱