matt/vim-solarized8
1
0
Fork 0
mirror of https://github.com/lifepillar/vim-solarized8.git synced 2025-12-12 08:47:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistencies between statusline and tabline.

Browse Source 
Now, when g:solarized_statusline is low, TabLineSel looks like
StatusLine.
This commit is contained in:
Lifepillar
2016-05-22 21:52:27 +02:00
parent 8cd492b350
commit cbf34d99b0
9 changed files with 72 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/solarized8.vim
View File

@@ -281,30 +281,44 @@ 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! StatusLineNC" .s:fg_base02 .s:bg_base01 .s:fmt_revbb)
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)
call s:put(" hi! TabLineSel" .s:fg_base1 .s:bg_base02 .s:fmt_none)
else " no flat
if s:solarized_background == "dark"
call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base2 .s:fmt_revbb)
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)
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! 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_base2 .s:bg_base01 .s:fmt_none)
else " light
if s:solarized_contrast == "low"
call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base02 .s:fmt_revbb)
call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base02 .s:fmt_revbb)
call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base1 .s:fmt_revbb)
call s:put(" hi! TabLine" .s:fg_base01 .s:bg_base02 .s:fmt_none)
call s:put(" hi! TabLineFill" .s:fg_base01 .s:bg_base02 .s:fmt_none)
call s:put(" hi! TabLineSel" .s:fg_base02 .s:bg_base01 .s:fmt_none)
else
call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base03 .s:fmt_revbb)
call s:put(" hi! StatusLine" .s:fg_base01 .s:bg_base03 .s:fmt_revbb)
call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base1 .s:fmt_revbb)
call s:put(" hi! TabLine" .s:fg_base01 .s:bg_base02 .s:fmt_none)
call s:put(" hi! TabLineFill" .s:fg_base01 .s:bg_base02 .s:fmt_none)
call s:put(" hi! TabLineSel" .s:fg_base03 .s:bg_base01 .s:fmt_none)
endif
call s:put(" hi! StatusLineNC" .s:fg_base01 .s:bg_base1 .s:fmt_revbb)
endif
endif
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! StatusLineNC" .s:fg_base02 .s:bg_base1 .s:fmt_revbb)
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)
call s:put(" hi! TabLineSel" .s:fg_base2 .s:bg_base02 .s:fmt_none)
else " no low, no flat
if s:solarized_background == "dark"
@@ -314,6 +328,9 @@ for s:solarized_background in ["dark", "light"]
call s:put(" hi! StatusLine" .s:fg_base1 .s:bg_base02 .s:fmt_revbb)
call s:put(" hi! StatusLineNC" .s:fg_base00 .s:bg_base02 .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)
call s:put(" hi! TabLineSel" .s:fg_base2 .s:bg_base01 .s:fmt_none)
endif
call s:put('endif')
call s:put("hi! Visual" .s:fg_base01 .s:bg_base03 .s:fmt_revbb)
@@ -390,15 +407,6 @@ 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
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_base2 .s:bg_base01 .s:fmt_none)
endif
call s:put("hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02)
if s:solarized_contrast == "flat"
call s:put("hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base03 .s:sp_base1)