Add zenburn red/green for magit diff remove/add blocks

[impaktor]

Not 100% sure on the colour selection, suggestions welcome!

(I've only changed the background, but magit also changes fg colour).

Before

After

[impaktor]

Maybe @basil-conto is interested in reviewing, seeing that's the author of the other open magit-related PR.

[basil-conto]

@impaktor #291 is indeed related to Magit but is otherwise unrelated to this PR. As for the proposed changes, I am in favour of using Zenburn colours, but I would personally prefer a bit more contrast between the foreground and background of magit-diff-added-highlight. It's up to @bbatsov to decide, though.

[bbatsov]

I agree the contrast should be better - light green + some text is not exactly a readable combination.

[impaktor]

I agree. I'll try out some other zen-colours and see what I find.

[bbatsov]

@impaktor ping :-)

[bbatsov]

@impaktor Ping 2 :-)

[impaktor]

Sorry, got other stuff come up. Feel free to close if you want, or anyone else can take it over. I've pointed out the variables, and approximate direction.

Vanilla magit changes both fg and bg color in the red/green fields, I think.

I might look into this after January again.

[impaktor]

For reference; this is vanilla magit:

Need to find two different green bg+fg and two different red bg+fg

[bbatsov]

I'll just merge it as is and tune it down the road. At least we use Zenburn colours now.

[jcf]

If you're using Spacemacs and want to rollback this change while it's still being "tuned", you can do so by enabling the theming layer and then adding this to your spacemacs/user-init function:

(setq theming-modifications
      '((zenburn
         (magit-diff-added :background "#335533"
                           :foreground "#ddffdd")
         (magit-diff-added-highlight :background "#336633"
                                     :foreground "#cceecc")
         (magit-diff-removed :background "#553333"
                             :foreground "#ffdddd")
         (magit-diff-removed-highlight :background "#663333"
                                       :foreground "#eecccc"))))

These are the colours Magit uses with a dark background. The light colours can be found alongside the dark ones in the Magit source code.

• https://github.com/magit/magit/blob/3aee233f491553cc0c87307f0f3d940977d06881/lisp/magit-diff.el#L480-L498
• https://github.com/magit/magit/blob/3aee233f491553cc0c87307f0f3d940977d06881/lisp/magit-diff.el#L526-L544

[impaktor]

@jcf please feel free to push an improved version, if you like.

[bbatsov]

@jcf Yeah, I think that would be best. I just don't have time to play with the colors, but I think we just need some darker shade of green for bigger contrast and this is going to be ok.

[xiongtx]

(Repost from here)

@bbatsov This creates an inconsistency b/t Magit and diff. E.g. magit-diff-added is no longer the same color as diff-added.

diff colors:

Magit colors:

We should make Magit inherit from diff colors . In this case, I prefer current diff colors, which are a deeper shade and easier on the eyes, but either way they should be consistent.