Flatten tabline in flat variant.

Use same highlighting as in StatusLine/StatusLineNC.
This commit is contained in:
Lifepillar
2016-05-21 19:11:22 +02:00
parent da34766220
commit 67bbe9ac29
3 changed files with 19 additions and 17 deletions

View File

@@ -264,21 +264,23 @@ 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)
else
call s:put(" hi! TabLineSel" .s:fg_base02 .s:bg_base1 .s:fmt_revbb)
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
else
else " light
call s:put(" hi! StatusLine" .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb)
endif
endif
call s:put('else')
call s:put('else') " solarized_statusline !=# 'low'
if s:solarized_contrast == "flat"
call s:put(" hi! NormalMode" .s:fg_base02 .s:bg_base2 . s:fmt_revbb)
call s:put(" hi! StatusLine" .s:fg_base02 .s:bg_base2 .s:fmt_revbb)
call s:put(" hi! TabLineSel" .s:fg_base02 .s:bg_base2 .s:fmt_revbb)
else
if s:solarized_background == "dark"
" Changed by Lifepillar: slightly darker status line, light foreground
@@ -369,15 +371,13 @@ for s:solarized_background in ["dark", "light"]
call s:put("hi! PmenuSbar" .s:fg_base2 .s:bg_base0 .s:fmt_revbb)
call s:put("hi! PmenuThumb" .s:fg_base0 .s:bg_base03 .s:fmt_revbb)
endif
call s:put("hi! TabLine" .s:fg_base0 .s:bg_base02 .s:fmt_none)
call s:put("hi! TabLineFill" .s:fg_base0 .s:bg_base02 .s:fmt_none)
if s:solarized_contrast == "flat"
if s:solarized_background == "dark"
call s:put("hi! TabLineSel" .s:fg_base02 .s:bg_base2 .s:fmt_revbb)
else
call s:put("hi! TabLineSel" .s:fg_base01 .s:bg_base03 .s:fmt_revbb)
endif
if s:solarized_contrast ==# "flat"
call s:put(" hi! TabLine" . s:bg_base02 . s:fg_base01 . s:fmt_none)
call s:put(" hi! TabLineFill" . s:bg_base02 . s:fg_base01 . s:fmt_none)
" TabLineSel is set together with StatusLine (see below)
else
call s:put("hi! TabLine" .s:fg_base0 .s:bg_base02 .s:fmt_none)
call s:put("hi! TabLineFill" .s:fg_base0 .s:bg_base02 .s:fmt_none)
call s:put("hi! TabLineSel" .s:fg_base01 .s:bg_base2 .s:fmt_revbb)
endif
call s:put("hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02)