-
-
Notifications
You must be signed in to change notification settings - Fork 201
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for magit next #127
base: master
Are you sure you want to change the base?
Conversation
This commit adds support for the forthcoming [next branch][] of magit, which should be merged in master in the near future. magit-next defined new faces for it's diff hunks that do not play well with the solarized dark, and this commit intend to fix it. [next branch]: https://github.com/magit/magit/tree/next "magit-next branch on github "
Sorry for the delay here … Could you describe a bit more what the problem is? I am not yet using magit next, but I don’t know why the existing inheritance of |
Any chance this could be merged soon? I've stayed for a long time on the old magit because the theme did not work with the new one. But I need it now and the other solarized color theme out there that supports magit >= 2.0 is rather poor. Doesn't follow color specification and doesn't work in text terminal. If you're short on time just give me a shout, I'll rebase it and prepare the commit for you. |
@Havner Thanks – I can try to get something like this in soon (or you can submit a new PR). I want this to look more like (magit-diff-added (:inherit diff-added)) though. (Which doesn’t quite line up with the definitions in this PR.) |
I had a quick look at this, and those definitions seem not to work properly anymore (there are some missing faces in the diff view). Additionally they are not nearly enough for the current magit version. There are many, many more incorrect faces. I'll try to sit down to it at some point, but can't promise this to be soon. |
Ok, I did about half the theme and with my workflow I don't see any non-solarized colors anymore. I'll try to finish this as some point. For now, can you have a look, whether I'm going in the right direction? When I'm done I'll do a PR.
|
I think that looks pretty good, at a glance. |
Is the above comment going to be merged into this PR with a rebase or should a new PR be made? |
This commit adds support for the forthcoming next branch of magit, which should be
merged in master in the near future.
magit-next defined new faces for it's diff hunks that do not play well
with the solarized dark, and this commit intend to fix it.