From 8cd492b350d488eb51dfb482eab4cfcbe6555e06 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Sun, 22 May 2016 17:26:53 +0200 Subject: [PATCH] Update status line colors for low variant. --- colors/solarized8_dark_flat.vim | 2 +- colors/solarized8_dark_high.vim | 2 +- colors/solarized8_light.vim | 2 +- colors/solarized8_light_flat.vim | 2 +- colors/solarized8_light_high.vim | 2 +- colors/solarized8_light_low.vim | 4 ++-- src/solarized8.vim | 15 +++++++++------ 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim index df12c67..12942fd 100644 --- a/colors/solarized8_dark_flat.vim +++ b/colors/solarized8_dark_flat.vim @@ -45,13 +45,13 @@ endif if get(g:, "solarized_statusline", "") == "low" hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse +hi! StatusLineNC ctermfg=0 guifg=#073642 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE else hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! TabLineSel ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE endif -hi! StatusLineNC ctermfg=0 guifg=#073642 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse hi! Visual ctermfg=10 guifg=#586e75 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3 diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim index e4ab235..ba620ae 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_light.vim b/colors/solarized8_light.vim index 9604f0e..7cad2d7 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -45,7 +45,7 @@ else endif if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse - hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index c3bff6c..d8c9f17 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -45,13 +45,13 @@ endif if get(g:, "solarized_statusline", "") == "low" hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse +hi! StatusLineNC ctermfg=7 guifg=#eee8d5 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE else hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! TabLineSel ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE endif -hi! StatusLineNC ctermfg=7 guifg=#eee8d5 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse hi! Visual ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3 diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index 84c5e35..67e3df6 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -45,7 +45,7 @@ else endif if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse - hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=11 guifg=#657b83 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..789a95a 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -44,8 +44,8 @@ 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! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse else hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse diff --git a/src/solarized8.vim b/src/solarized8.vim index ccb6fec..3bdd3bb 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -281,18 +281,24 @@ for s:solarized_background in ["dark", "light"] if s:solarized_contrast == "flat" call s:put(" hi! NormalMode" .s:fg_base02 .s:bg_base1 .s:fmt_revbb) call s:put(" hi! StatusLine" .s:fg_base02 .s:bg_base1 .s:fmt_revbb) + call s:put("hi! StatusLineNC" .s:fg_base02 .s:bg_base01 .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) + 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 - 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) + if s:solarized_contrast == "low" + call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base02 .s:fmt_revbb) + else + call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base03 .s:fmt_revbb) + endif + call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base1 .s:fmt_revbb) endif endif call s:put('else') " solarized_statusline !=# 'low' @@ -310,9 +316,6 @@ for s:solarized_background in ["dark", "light"] endif endif call s:put('endif') - if s:solarized_contrast == "flat" - call s:put("hi! StatusLineNC" .s:fg_base02 .s:bg_base01 .s:fmt_revbb) - endif call s:put("hi! Visual" .s:fg_base01 .s:bg_base03 .s:fmt_revbb) call s:put("hi! Directory" .s:fmt_none .s:fg_blue .s:bg_none) " Changed by Lifepillar: ErrorMsg is always white on red, never black on red (pesky)