Added diff markup support to all textmate theme variants #91

Merged
merged 2 commits into from Jun 7, 2012

2 participants

@rktjmp

I added bits to all the themes so git diff | mate or diff x y | mate gets some colour highlighting.

Screenshot here: http://i.imgur.com/FInj2.png

I went with the background color instead of the foreground color because was what I was used to from other Textmate themes, but optionally you could change the foreground color instead (screenshot: http://i.imgur.com/cyh65.png). I couldn't decide which is better so I went with the old style. Open to comments on a preference, maybe the other way is better. I can update and make a new pull request.

Git Commit Message

Added green background for markup.inserted.diff and meta.diff.header.to-file. The green was taken from the Tomorrow color scheme.

Added red background for markup.deleted.diff and meta.diff.header.from-file. The red was taken from the Tomorrow color scheme.

Added italics text style for meta.diff.header.from-file and meta.diff.header.to-file.

Added white foreground color for meta.diff.header.from-file, meta.diff.header.to-file, markup.inserted.diff and markup.deleted.diff to improve legibility with the background.

RKTJMP added some commits May 26, 2012
RKTJMP Added diff markup support to all theme variants.
Added green background for markup.inserted.diff and meta.diff.header.to-file. The green was taken from the Tomorrow color scheme.

Added red background for markup.deleted.diff and meta.diff.header.from-file. The red was taken from the Tomorrow color scheme.

Added italics text style for meta.diff.header.from-file and meta.diff.header.to-file.

Added white foreground color for meta.diff.header.from-file, meta.diff.header.to-file, markup.inserted.diff and markup.deleted.diff to improve legibility with the background.
3084a96
RKTJMP Updated with diff range selector and foreground coloring instead of b…
…ackground coloring for dark themes.
7061be1
@rktjmp

New screenshot with range selector: http://i.imgur.com/PFG81.png

@chriskempson chriskempson merged commit 366a11d into chriskempson:master Jun 7, 2012
@chriskempson
Owner

Thanks very much for this, there are indeed a few things missing from the old version. I believe these should be fixed on the dev version however. On the dev version I went with the highlighting the background colour option but it's open to debate :)

@rktjmp

Cool man. It's your project so whatever you prefer IMO. Like I said, I couldn't decided either way, so as long as there's something there I'm happy.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment