From 8719839f6af2bf7bd1cede397424c71ed1857c5a Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Sat, 21 May 2016 19:27:41 +0200 Subject: [PATCH] Do not use reverse in TabLineSel. Do not use reverse in TabLineSel, because it reverses Title, too (used to highlight the number of windows in the current tab), which looks ugly. --- colors/solarized8_dark.vim | 2 +- colors/solarized8_dark_flat.vim | 4 ++-- colors/solarized8_dark_high.vim | 2 +- colors/solarized8_dark_low.vim | 2 +- colors/solarized8_light.vim | 2 +- colors/solarized8_light_flat.vim | 4 ++-- colors/solarized8_light_high.vim | 2 +- colors/solarized8_light_low.vim | 2 +- src/solarized8.vim | 14 +++++++------- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim index 189790a..eab7a6b 100644 --- a/colors/solarized8_dark.vim +++ b/colors/solarized8_dark.vim @@ -90,7 +90,7 @@ hi! PmenuSbar ctermfg=7 guifg=#eee8d5 ctermbg=12 guibg=#839496 cterm=NONE,revers hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE -hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse +hi! TabLineSel ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE gui=NONE hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#93a1a1 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim index a5a3b1d..a1392ff 100644 --- a/colors/solarized8_dark_flat.vim +++ b/colors/solarized8_dark_flat.vim @@ -42,11 +42,11 @@ 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! TabLineSel ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 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=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 diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim index 8e75625..231711c 100644 --- a/colors/solarized8_dark_high.vim +++ b/colors/solarized8_dark_high.vim @@ -90,7 +90,7 @@ hi! PmenuSbar ctermfg=15 guifg=#fdf6e3 ctermbg=14 guibg=#93a1a1 cterm=NONE,rever hi! PmenuThumb ctermfg=14 guifg=#93a1a1 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE hi! TabLineFill ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE -hi! TabLineSel ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! TabLineSel ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 cterm=NONE gui=NONE hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#eee8d5 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim index f5e307c..b746027 100644 --- a/colors/solarized8_dark_low.vim +++ b/colors/solarized8_dark_low.vim @@ -90,7 +90,7 @@ hi! PmenuSbar ctermfg=7 guifg=#eee8d5 ctermbg=12 guibg=#839496 cterm=NONE,revers hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE -hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse +hi! TabLineSel ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE gui=NONE hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#93a1a1 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim index b449347..a775a92 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -90,7 +90,7 @@ hi! PmenuSbar ctermfg=0 guifg=#073642 ctermbg=11 guibg=#657b83 cterm=NONE,revers hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE -hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse +hi! TabLineSel ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE gui=NONE hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#586e75 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index c574c9f..7d07fd5 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -42,11 +42,11 @@ 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! TabLineSel ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 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=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 diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index 293de78..cfc3415 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -90,7 +90,7 @@ hi! PmenuSbar ctermfg=8 guifg=#002b36 ctermbg=10 guibg=#586e75 cterm=NONE,revers hi! PmenuThumb ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE hi! TabLineFill ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE -hi! TabLineSel ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse +hi! TabLineSel ctermfg=8 guifg=#002b36 ctermbg=12 guibg=#839496 cterm=NONE gui=NONE hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#073642 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim index 576d4d6..42db87f 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -90,7 +90,7 @@ hi! PmenuSbar ctermfg=0 guifg=#073642 ctermbg=11 guibg=#657b83 cterm=NONE,revers hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE -hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse +hi! TabLineSel ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE gui=NONE hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#586e75 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 diff --git a/src/solarized8.vim b/src/solarized8.vim index c6a0e7e..79bfde4 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -262,9 +262,9 @@ for s:solarized_background in ["dark", "light"] call s:put('endif') call s:put('if get(g:, "solarized_statusline", "") == "low"') 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! TabLineSel" .s:fg_base02 .s:bg_base1 .s:fmt_revbb) + 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! TabLineSel" .s:fg_base1 .s:bg_base02 .s:fmt_none) else " no flat if s:solarized_background == "dark" if s:solarized_contrast == "high" @@ -278,9 +278,9 @@ for s:solarized_background in ["dark", "light"] 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! TabLineSel" .s:fg_base02 .s:bg_base2 .s:fmt_revbb) + 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_base2 .s:bg_base02 .s:fmt_none) else if s:solarized_background == "dark" " Changed by Lifepillar: slightly darker status line, light foreground @@ -378,7 +378,7 @@ for s:solarized_background in ["dark", "light"] 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) + 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"