From a18c263128f3bbd5f3ad6ce12f7d111ba42b3996 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Sun, 22 May 2016 16:09:47 +0200 Subject: [PATCH] Update status line colors for low status line. Make it easier to distinguish between the active and inactive status lines. --- colors/solarized8_dark.vim | 2 +- colors/solarized8_dark_high.vim | 2 +- colors/solarized8_dark_low.vim | 2 +- colors/solarized8_light.vim | 2 +- colors/solarized8_light_high.vim | 2 +- colors/solarized8_light_low.vim | 2 +- src/solarized8.vim | 30 +++++++++++++++++++----------- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim index 95bd6e3..a53a4fb 100644 --- a/colors/solarized8_dark.vim +++ b/colors/solarized8_dark.vim @@ -45,7 +45,7 @@ else endif if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse - hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim index 2b1edfd..e17feec 100644 --- a/colors/solarized8_dark_high.vim +++ b/colors/solarized8_dark_high.vim @@ -45,7 +45,7 @@ else endif if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse - hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim index fe19a6f..e2fbdc8 100644 --- a/colors/solarized8_dark_low.vim +++ b/colors/solarized8_dark_low.vim @@ -45,7 +45,7 @@ else endif if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse - hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim index 9604f0e..fb51b24 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -44,7 +44,7 @@ else hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif if get(g:, "solarized_statusline", "") == "low" - hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index 6c802a5..cb82d8b 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -44,7 +44,7 @@ else hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif if get(g:, "solarized_statusline", "") == "low" - hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim index a87cba6..5146094 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -44,7 +44,7 @@ else hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif if get(g:, "solarized_statusline", "") == "low" - hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse diff --git a/src/solarized8.vim b/src/solarized8.vim index 4e88190..6a1f984 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -283,17 +283,25 @@ for s:solarized_background in ["dark", "light"] call s:put(" hi! StatusLine" .s:fg_base02 .s:bg_base1 .s:fmt_revbb) call s:put(" hi! TabLineSel" .s:fg_base1 .s:bg_base02 .s:fmt_none) else " no flat - if s:solarized_background == "dark" - if s:solarized_contrast == "high" - call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb) - else - call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=7 guibg=#eee8d5" .s:fmt_revbb) - endif - call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base1 .s:fmt_revbb) - else " light - call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb) - call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base02 .s:fmt_revbb) - endif + call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base2 .s:fmt_revbb) + call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base02 .s:fmt_revbb) + " if s:solarized_background == "dark" + " if s:solarized_contrast == "high" + " call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb) + " call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base02 .s:fmt_revbb) + " else + " call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=7 guibg=#eee8d5" .s:fmt_revbb) + " call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base1 .s:fmt_revbb) + " endif + " else " light + " if s:solarized_contrast == "high" + " call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb) + " call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base2 .s:fmt_revbb) + " else + " call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb) + " call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base02 .s:fmt_revbb) + " endif + " endif endif call s:put('else') " solarized_statusline !=# 'low' if s:solarized_contrast == "flat"