Use underline for MatchParen in some light variants.

In order to avoid reverting dc6c1df completely, this commit introduces
underline as a further clue to distinguish matching parentheses. In the
normal and high contrast variants, underline is used for MatchParen when
g:solarized_visibility is set to "low" or "normal", while a dark
background is used when g:solarized_visibility is set to "high". For
flat and low contrast variants, underline is used when
g:solarized_visibility is set to "high" (otherwise, the appearance is
the same as before this commit).
This commit is contained in:
Lifepillar
2017-05-26 09:36:28 +02:00
parent b9e295e3b0
commit b261473732
9 changed files with 55 additions and 24 deletions

View File

@@ -33,6 +33,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
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
@@ -138,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

View File

@@ -29,6 +29,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
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
@@ -136,7 +137,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

View File

@@ -33,6 +33,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
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
@@ -138,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

View File

@@ -33,6 +33,7 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
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
@@ -138,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

View File

@@ -38,16 +38,19 @@ if get(g:, "solarized_visibility", "") == "high"
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=12 guibg=#839496
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
endif
hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
@@ -138,7 +141,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=12 guibg=#839496
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

View File

@@ -34,16 +34,19 @@ if get(g:, "solarized_visibility", "") == "high"
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
endif
if get(g:, "solarized_statusline", "") == "low"
hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse,bold gui=NONE,reverse,bold
@@ -136,7 +139,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

View File

@@ -38,16 +38,19 @@ if get(g:, "solarized_visibility", "") == "high"
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
endif
hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
@@ -138,7 +141,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function

View File

@@ -38,16 +38,19 @@ if get(g:, "solarized_visibility", "") == "high"
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=8 guifg=#002b36 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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=7 guibg=#eee8d5
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
hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=7 guibg=#eee8d5
endif
hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
@@ -138,7 +141,6 @@ if has('nvim')
let g:terminal_color_14 = '#93a1a1'
let g:terminal_color_15 = '#fdf6e3'
endif
hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=NONE guibg=NONE
hi! link vimVar Identifier
hi! link vimFunc Function
hi! link vimUserFunc Function