Skip to content
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

Merged some aspects into a unified color scheme (rebased) #30

Merged
merged 3 commits into from
Sep 27, 2015

Conversation

lithammer
Copy link
Contributor

This is a rebased version of #9, it was quite messy, but I think it's all there.

+ The color file now always sets values for both cterm and gui, instead of
  trying to detect which is being used. This allows, for instance, for
  starting in terminal vim, and using :gui to start the gui without
  having to re-run the color command.
+ The file now inspects the value of &background. If it is 'dark', the
  hybrid palette is used. If it is 'light', the hybrid-light palette is
  used. Choice of palette can therefore be toggled via 'set bg=light/dark'.
+ hybrid-light.vim has been deleted in light of the previous change.
@lithammer lithammer changed the title Merged some aspects into a unified color scheme. Merged some aspects into a unified color scheme (rebased) Aug 19, 2015
@lithammer
Copy link
Contributor Author

@w0ng what do you think?

@ghost
Copy link

ghost commented Sep 24, 2015

👍 How's the progress on this?

@lithammer
Copy link
Contributor Author

It's done from my end, just need @w0ng to take a look at it.

@w0ng
Copy link
Owner

w0ng commented Sep 26, 2015

@Renstrom Thanks a lot for tidying this up.

Before merging, could you please remove the bling and BlingHilight references as I think it's better to keep third-party styling out of this.

Also, I think the Spell hilights need merging i.e. the darkblue, darkcyan, darkred, darkpurple colours in the dark scheme should be combined with with the addbg, addfg, changefg, changebg of the light scheme.

In #30, errors are thrown in the light version because it's attempting to set ctermbg="" for the Spell hilights.

line  299:
E254: Cannot allocate color ctermbg=
line  300:
E254: Cannot allocate color ctermbg=
line  301:
E254: Cannot allocate color ctermbg=
line  302:
E254: Cannot allocate color ctermbg=
line  367:
E254: Cannot allocate color ctermbg=

@lithammer
Copy link
Contributor Author

This is what the spelling stuff look like.

term

screen shot 2015-09-26 at 17 19 26

gui

screen shot 2015-09-26 at 17 20 37

@ghost
Copy link

ghost commented Sep 27, 2015

👍 it's good to see some progress on this!! Thank you.

w0ng added a commit that referenced this pull request Sep 27, 2015
Merged some aspects into a unified color scheme (rebased)
@w0ng w0ng merged commit 57315b1 into w0ng:master Sep 27, 2015
@w0ng
Copy link
Owner

w0ng commented Sep 27, 2015

Awesome thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants