From 72c6acc08b0a2e53af9a84ac98f4bd5f42a2fe59 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Tue, 6 Sep 2016 10:59:22 +0200 Subject: [PATCH] Remove background from line numbers in flat variant. --- colors/solarized8_dark_flat.vim | 8 ++++---- colors/solarized8_light_flat.vim | 8 ++++---- src/solarized8.vim | 30 +++++++++++++++++++++++++----- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim index dcd0c5b..d22a610 100644 --- a/colors/solarized8_dark_flat.vim +++ b/colors/solarized8_dark_flat.vim @@ -25,17 +25,17 @@ hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guib if get(g:, "solarized_visibility", "") == "high" hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE - hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=0 guibg=#073642 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE elseif get(g:, "solarized_visibility", "") == "low" hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=0 guifg=#073642 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=0 guifg=#073642 ctermbg=NONE guibg=NONE - hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=0 guibg=#073642 hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE - hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE endif if get(g:, "solarized_statusline", "") == "low" @@ -68,7 +68,7 @@ hi! IncSearch cterm=NONE,standout gui=NONE,standout ctermfg=9 guifg=#cb4b16 cter hi! Search cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE hi! MoreMsg cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE hi! ModeMsg cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE -hi! LineNr cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 +hi! LineNr cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=0 guifg=#073642 ctermbg=0 guibg=#073642 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index 4eb1f23..d5a9b17 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -25,17 +25,17 @@ hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guib if get(g:, "solarized_visibility", "") == "high" hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE - hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE elseif get(g:, "solarized_visibility", "") == "low" hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE - hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE - hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif if get(g:, "solarized_statusline", "") == "low" @@ -68,7 +68,7 @@ hi! IncSearch cterm=NONE,standout gui=NONE,standout ctermfg=9 guifg=#cb4b16 cter hi! Search cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE hi! MoreMsg cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE hi! ModeMsg cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE -hi! LineNr cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 +hi! LineNr cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=7 guifg=#eee8d5 ctermbg=7 guibg=#eee8d5 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse diff --git a/src/solarized8.vim b/src/solarized8.vim index 60c4e08..70bab2e 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -228,11 +228,19 @@ for s:solarized_background in ["dark", "light"] if s:solarized_background ==# "dark" call s:put(" hi! SpecialKey" .s:fmt_revr .s:fg_orange .s:bg_none) call s:put(" hi! NonText" .s:fmt_bold .s:fg_orange .s:bg_none) - call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_orange .s:bg_base02) + if s:solarized_contrast ==# "flat" + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_orange .s:bg_none) + else + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_orange .s:bg_base02) + endif else call s:put(" hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none) call s:put(" hi! NonText" .s:fmt_bold .s:fg_red .s:bg_none) - call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_red .s:bg_base02) + if s:solarized_contrast ==# "flat" + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_red .s:bg_none) + else + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_red .s:bg_base02) + endif endif if s:solarized_background == "dark" call s:put(" hi! Title" .s:fmt_bold .s:fg_yellow .s:bg_none) @@ -242,12 +250,20 @@ for s:solarized_background in ["dark", "light"] call s:put('elseif get(g:, "solarized_visibility", "") == "low"') call s:put(" hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none) call s:put(" hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none) - call s:put(" hi! CursorLineNr". s:fmt_bold .s:fg_base01 .s:bg_base02) + if s:solarized_contrast ==# "flat" + call s:put(" hi! CursorLineNr". s:fmt_bold .s:fg_base01 .s:bg_none) + else + call s:put(" hi! CursorLineNr". s:fmt_bold .s:fg_base01 .s:bg_base02) + endif call s:put(" hi! Title" .s:fmt_bold .s:fg_base01 .s:bg_none) call s:put('else') call s:put(" hi! SpecialKey" .s:fmt_bold .s:fg_base00 .s:bg_base02) call s:put(" hi! NonText" .s:fmt_bold .s:fg_base00 .s:bg_none) - call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_base0 .s:bg_base02) + if s:solarized_contrast ==# "flat" + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_base0 .s:bg_none) + else + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_base0 .s:bg_base02) + endif if s:solarized_background == "dark" call s:put(" hi! Title" .s:fmt_bold .s:fg_yellow .s:bg_none) else @@ -341,7 +357,11 @@ for s:solarized_background in ["dark", "light"] call s:put("hi! Search" .s:fmt_revr .s:fg_yellow .s:bg_none) call s:put("hi! MoreMsg" .s:fmt_none .s:fg_blue .s:bg_none) call s:put("hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none) - call s:put("hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02) + if s:solarized_contrast ==# "flat" + call s:put("hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_none) + else + call s:put("hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02) + endif call s:put("hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none) if s:solarized_contrast == "flat" call s:put("hi! VertSplit" .s:fmt_none .s:fg_base02 .s:bg_base02)