vim / colorschemes

colorschemes for Vim
279 stars 23 forks source link

feat: unified diff colors for legacy colors #122

Closed habamax closed 2 years ago

habamax commented 2 years ago

Closes #121

habamax commented 2 years ago

Every colorscheme has

;;; "Standard" diff colors
Include: _diff

At the end of template.

Feel free to suggest adjustments to bg colors.

habamax commented 2 years ago

Ah!

@romainl I didn't touch 2 colorschemes: blue and darkblue.

They both have quite nice colors (at least in 256c :) )

I can convert them too if you don't mind or we can leave them as is.

habamax commented 2 years ago

And darkblue is actually also converted :) sorry.

romainl commented 2 years ago

We may have a problem with bold Statement:

Capture d’écran 2022-01-18 à 18 28 48
habamax commented 2 years ago

I don't have it... image

romainl commented 2 years ago

OK, it's a terminal emulator setting.

bold

habamax commented 2 years ago

soften colors a bit:

image

image

image

image

image

habamax commented 2 years ago

darkblue image

And I am still not sure about blue as of now:

image

Might be

image

PS, although it also looks good...

habamax commented 2 years ago

Anyway, I don't mind any other color selection ...

romainl commented 2 years ago

My comments…

I'm still not sure about how much attention we should give to color blindness since there are relatively inexpensive glasses that supposedly correct that issue. But the lack of contrast between DiffDelete and DiffAdd is bothering.

habamax commented 2 years ago

How about this?

image

image

image

image

romainl commented 2 years ago

That works very well for normal vision. Great!

habamax commented 2 years ago

Blue difftext clashes with visual of my own colorscheme :(, but that is ok.

habamax commented 2 years ago

@romainl I wanted to propose this kind of change too

romainl commented 2 years ago

Yeah, :qa! was tiring.

romainl commented 2 years ago

FWIW, I just spent some time in master in 16c and the diffs in this branch are a hell of a lot better.

The only slight issue I have is the lack of contrast of black on blue for DiffChange.

Capture d’écran 2022-02-06 à 17 03 48

I tried with white on blue and sure enough the contrast is stronger, but now it sort of doesn't fit :-(:

Capture d’écran 2022-02-06 à 17 06 05

@habamax what do you think?

habamax commented 2 years ago

we can have white fg on 16c and black for the rest

romainl commented 2 years ago

The problem is indeed worse on white bg. That's a good idea.

habamax commented 2 years ago

ctermbg=14

image

image

habamax commented 2 years ago

On the other hand black on blue is still readable for me on default xterm16

habamax commented 2 years ago

nice, what about white for diffadd?

image

image

habamax commented 2 years ago

btw, we could have a single _diff with 2 definitions depending on background

romainl commented 2 years ago

Maybe. I tried it but colortemplate reported a bunch of errors so I opted for a different file.

habamax commented 2 years ago

I will fix it later, once we agree on colors

habamax commented 2 years ago

White fg is actually quite readable on dark bg too:

image

image

image

image

habamax commented 2 years ago

nice!