diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim index 9973a4f..e3a66cd 100644 --- a/colors/solarized8_dark.vim +++ b/colors/solarized8_dark.vim @@ -12,8 +12,16 @@ set background=dark if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi! Normal cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE + hi! CursorLineNr ctermbg=NONE guibg=NONE + hi! LineNr ctermbg=NONE guibg=NONE + hi! Folded ctermbg=NONE guibg=NONE + hi! FoldColumn ctermbg=NONE guibg=NONE else hi! Normal cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 + hi! CursorLineNr ctermbg=0 guibg=#073642 + hi! LineNr ctermbg=0 guibg=#073642 + hi! Folded ctermbg=0 guibg=#073642 + hi! FoldColumn ctermbg=0 guibg=#073642 endif hi! Comment cterm=NONE gui=NONE,italic ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE @@ -29,17 +37,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 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 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 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE endif hi! NormalMode ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -67,14 +75,14 @@ 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 hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=10 guibg=#586e75 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#002b36 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 guisp=#002b36 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim index 8b3c30c..709152a 100644 --- a/colors/solarized8_dark_flat.vim +++ b/colors/solarized8_dark_flat.vim @@ -15,6 +15,10 @@ if !has('gui_running') && get(g:, 'solarized_termtrans', 0) else hi! Normal cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 endif +hi! LineNr cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE +hi! CursorLineNr ctermbg=NONE guibg=NONE +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE guisp=#002b36 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE hi! Comment cterm=NONE gui=NONE,italic ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! Identifier cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE @@ -29,17 +33,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=NONE guibg=NONE + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 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=NONE guibg=NONE + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 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=NONE guibg=NONE + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE endif if get(g:, "solarized_statusline", "") == "low" @@ -72,14 +76,11 @@ 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=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 hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#002b36 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim index 700a3f2..871fda8 100644 --- a/colors/solarized8_dark_high.vim +++ b/colors/solarized8_dark_high.vim @@ -12,8 +12,16 @@ set background=dark if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi! Normal cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE + hi! CursorLineNr ctermbg=NONE guibg=NONE + hi! LineNr ctermbg=NONE guibg=NONE + hi! Folded ctermbg=NONE guibg=NONE + hi! FoldColumn ctermbg=NONE guibg=NONE else hi! Normal cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=8 guibg=#002b36 + hi! CursorLineNr ctermbg=0 guibg=#073642 + hi! LineNr ctermbg=0 guibg=#073642 + hi! Folded ctermbg=0 guibg=#073642 + hi! FoldColumn ctermbg=0 guibg=#073642 endif hi! Comment cterm=NONE gui=NONE,italic ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE @@ -29,17 +37,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 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=11 guifg=#657b83 ctermbg=0 guibg=#073642 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 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=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE endif hi! NormalMode ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -67,14 +75,14 @@ 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=11 guifg=#657b83 ctermbg=0 guibg=#073642 +hi! LineNr cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=11 guibg=#657b83 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermbg=15 guibg=#fdf6e3 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#002b36 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 guisp=#002b36 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim index 02bea1c..9418892 100644 --- a/colors/solarized8_dark_low.vim +++ b/colors/solarized8_dark_low.vim @@ -12,8 +12,16 @@ set background=dark if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi! Normal cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE + hi! CursorLineNr ctermbg=NONE guibg=NONE + hi! LineNr ctermbg=NONE guibg=NONE + hi! Folded ctermbg=NONE guibg=NONE + hi! FoldColumn ctermbg=NONE guibg=NONE else hi! Normal cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 + hi! CursorLineNr ctermbg=0 guibg=#073642 + hi! LineNr ctermbg=0 guibg=#073642 + hi! Folded ctermbg=0 guibg=#073642 + hi! FoldColumn ctermbg=0 guibg=#073642 endif hi! Comment cterm=NONE gui=NONE,italic ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE @@ -29,17 +37,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 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 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 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE endif hi! NormalMode ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -67,14 +75,14 @@ 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 hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=10 guibg=#586e75 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#002b36 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 guisp=#002b36 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim index 435d89d..8f237d4 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -12,8 +12,16 @@ set background=light if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi! Normal cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE + hi! CursorLineNr ctermbg=NONE guibg=NONE + hi! LineNr ctermbg=NONE guibg=NONE + hi! Folded ctermbg=NONE guibg=NONE + hi! FoldColumn ctermbg=NONE guibg=NONE else hi! Normal cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 + hi! CursorLineNr ctermbg=7 guibg=#eee8d5 + hi! LineNr ctermbg=7 guibg=#eee8d5 + hi! Folded ctermbg=7 guibg=#eee8d5 + hi! FoldColumn ctermbg=7 guibg=#eee8d5 endif hi! Comment cterm=NONE gui=NONE,italic ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE @@ -29,17 +37,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 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 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 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -67,14 +75,14 @@ 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 hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=14 guibg=#93a1a1 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#fdf6e3 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 guisp=#fdf6e3 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index 9f026bd..5cb5f12 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -15,6 +15,10 @@ if !has('gui_running') && get(g:, 'solarized_termtrans', 0) else hi! Normal cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 endif +hi! LineNr cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE +hi! CursorLineNr ctermbg=NONE guibg=NONE +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE guisp=#fdf6e3 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE hi! Comment cterm=NONE gui=NONE,italic ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! Identifier cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE @@ -29,17 +33,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=NONE guibg=NONE + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f 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=NONE guibg=NONE + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 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=NONE guibg=NONE + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif if get(g:, "solarized_statusline", "") == "low" @@ -72,14 +76,11 @@ 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=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 hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#fdf6e3 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index 8f8c2a1..2bf55c5 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -12,8 +12,16 @@ set background=light if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi! Normal cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE + hi! CursorLineNr ctermbg=NONE guibg=NONE + hi! LineNr ctermbg=NONE guibg=NONE + hi! Folded ctermbg=NONE guibg=NONE + hi! FoldColumn ctermbg=NONE guibg=NONE else hi! Normal cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 + hi! CursorLineNr ctermbg=7 guibg=#eee8d5 + hi! LineNr ctermbg=7 guibg=#eee8d5 + hi! Folded ctermbg=7 guibg=#eee8d5 + hi! FoldColumn ctermbg=7 guibg=#eee8d5 endif hi! Comment cterm=NONE gui=NONE,italic ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE @@ -29,17 +37,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 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=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 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=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 + hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -67,14 +75,14 @@ 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=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 +hi! LineNr cterm=NONE gui=NONE ctermfg=12 guifg=#839496 hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=12 guibg=#839496 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermbg=8 guibg=#002b36 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#fdf6e3 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 guisp=#fdf6e3 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim index 0457062..5568791 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -12,8 +12,16 @@ set background=light if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi! Normal cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE + hi! CursorLineNr ctermbg=NONE guibg=NONE + hi! LineNr ctermbg=NONE guibg=NONE + hi! Folded ctermbg=NONE guibg=NONE + hi! FoldColumn ctermbg=NONE guibg=NONE else hi! Normal cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 + hi! CursorLineNr ctermbg=7 guibg=#eee8d5 + hi! LineNr ctermbg=7 guibg=#eee8d5 + hi! Folded ctermbg=7 guibg=#eee8d5 + hi! FoldColumn ctermbg=7 guibg=#eee8d5 endif hi! Comment cterm=NONE gui=NONE,italic ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! Constant cterm=NONE gui=NONE ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE @@ -29,17 +37,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 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 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 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE endif hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -67,14 +75,14 @@ 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 hi! Question cterm=NONE,bold gui=NONE,bold ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE hi! VertSplit cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=14 guibg=#93a1a1 hi! VisualNOS ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! WarningMsg cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! WildMenu ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse -hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#fdf6e3 -hi! FoldColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 +hi! Folded cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 guisp=#fdf6e3 +hi! FoldColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 if get(g:, "solarized_diffmode", "") == "high" hi! DiffAdd cterm=NONE,reverse gui=NONE,reverse ctermfg=2 guifg=#719e07 ctermbg=NONE guibg=NONE hi! DiffChange cterm=NONE,reverse gui=NONE,reverse ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE diff --git a/src/solarized8.vim b/src/solarized8.vim index a3a8b3a..e1c9905 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -154,12 +154,35 @@ for s:solarized_background in ["dark", "light"] exe "let s:sp_cyan = ' guisp=".s:cyan[1] ."'" "}}} - - call s:put("if !has('gui_running') && get(g:, 'solarized_termtrans', 0)") - call s:put(" hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_none) - call s:put("else") - call s:put(" hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_back) - call s:put("endif") + if s:solarized_contrast ==# "flat" + call s:put ("if !has('gui_running') && get(g:, 'solarized_termtrans', 0)") + call s:put (" hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_none) + call s:put ("else") + call s:put (" hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_back) + call s:put ("endif") + call s:put ("hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_none) + if s:solarized_background ==# "dark" + call s:put("hi! CursorLineNr" .s:bg_none) + else + call s:put("hi! CursorLineNr" .s:bg_none) + endif + call s:put ("hi! Folded" .s:fmt_undb .s:fg_base0 .s:bg_none .s:sp_base03) + call s:put ("hi! FoldColumn" .s:fmt_none .s:fg_base0 .s:bg_none) + else " Not flat + call s:put ("if !has('gui_running') && get(g:, 'solarized_termtrans', 0)") + call s:put (" hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_none) + call s:put (" hi! CursorLineNr" .s:bg_none) + call s:put (" hi! LineNr" .s:bg_none) + call s:put (" hi! Folded" .s:bg_none) + call s:put (" hi! FoldColumn" .s:bg_none) + call s:put ("else") + call s:put (" hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_back) + call s:put (" hi! CursorLineNr" .s:bg_base02) + call s:put (" hi! LineNr" .s:bg_base02) + call s:put (" hi! Folded" .s:bg_base02) + call s:put (" hi! FoldColumn" .s:bg_base02) + call s:put ("endif") + endif " Basic highlighting"{{{ " --------------------------------------------------------------------- @@ -232,19 +255,11 @@ 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) - 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 + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_orange) 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) - 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 + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_red) endif if s:solarized_background == "dark" call s:put(" hi! Title" .s:fmt_bold .s:fg_yellow .s:bg_none) @@ -254,20 +269,12 @@ 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) - 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! CursorLineNr". s:fmt_bold .s:fg_base01) 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) - 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 + call s:put(" hi! CursorLineNr" .s:fmt_bold .s:fg_base0) if s:solarized_background == "dark" call s:put(" hi! Title" .s:fmt_bold .s:fg_yellow .s:bg_none) else @@ -372,10 +379,8 @@ 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) - 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) + if s:solarized_contrast !=# "flat" + call s:put("hi! LineNr" .s:fmt_none .s:fg_base01) endif call s:put("hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none) if s:solarized_contrast == "flat" @@ -399,8 +404,10 @@ for s:solarized_background in ["dark", "light"] call s:put("hi! WildMenu" .s:fg_base2 .s:bg_base02 .s:fmt_revbb) endif endif - call s:put("hi! Folded" .s:fmt_undb .s:fg_base0 .s:bg_base02 .s:sp_base03) - call s:put("hi! FoldColumn" .s:fmt_none .s:fg_base0 .s:bg_base02) + if s:solarized_contrast !=# "flat" + call s:put("hi! Folded" .s:fmt_undb .s:fg_base0 .s:sp_base03) + call s:put("hi! FoldColumn" .s:fmt_none .s:fg_base0) + endif call s:put('if get(g:, "solarized_diffmode", "") == "high"') call s:put(" hi! DiffAdd" .s:fmt_revr .s:fg_green .s:bg_none) call s:put(" hi! DiffChange" .s:fmt_revr .s:fg_yellow .s:bg_none)