From 450ffa64b7c3b6d3101c5c7b220d0ab426905545 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Sun, 22 May 2016 22:25:12 +0200 Subject: [PATCH] Make StatusLine bold when set to low and flat. --- colors/solarized8_dark.vim | 10 +++---- colors/solarized8_dark_flat.vim | 16 ++++++---- colors/solarized8_dark_high.vim | 10 +++---- colors/solarized8_dark_low.vim | 10 +++---- colors/solarized8_light.vim | 10 +++---- colors/solarized8_light_flat.vim | 16 ++++++---- colors/solarized8_light_high.vim | 10 +++---- colors/solarized8_light_low.vim | 10 +++---- src/solarized8.vim | 50 ++++++++++++++++---------------- 9 files changed, 75 insertions(+), 67 deletions(-) diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim index 5aa53e1..e35ed31 100644 --- a/colors/solarized8_dark.vim +++ b/colors/solarized8_dark.vim @@ -22,11 +22,6 @@ 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! NormalMode ctermfg=12 guifg=#839496 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 -hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,6 +38,11 @@ else hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 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 +hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim index 94f7c8b..7a6ecb1 100644 --- a/colors/solarized8_dark_flat.vim +++ b/colors/solarized8_dark_flat.vim @@ -22,10 +22,6 @@ 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! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse -hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,14 +39,22 @@ else hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE 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! NormalMode ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=0 guifg=#073642 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=0 guifg=#073642 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse,bold gui=NONE,reverse,bold hi! StatusLineNC ctermfg=0 guifg=#073642 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermbg=0 guibg=#073642 ctermfg=10 guifg=#586e75 cterm=NONE gui=NONE hi! TabLineFill ctermbg=0 guibg=#073642 ctermfg=10 guifg=#586e75 cterm=NONE gui=NONE 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! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse + hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse + hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse + hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermbg=0 guibg=#073642 ctermfg=10 guifg=#586e75 cterm=NONE gui=NONE diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim index e5d08e4..8a4c61e 100644 --- a/colors/solarized8_dark_high.vim +++ b/colors/solarized8_dark_high.vim @@ -22,11 +22,6 @@ 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! NormalMode ctermfg=14 guifg=#93a1a1 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 -hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,6 +38,11 @@ else hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 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 +hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim index 81770f5..56d901e 100644 --- a/colors/solarized8_dark_low.vim +++ b/colors/solarized8_dark_low.vim @@ -22,11 +22,6 @@ 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! NormalMode ctermfg=12 guifg=#839496 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 -hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,6 +38,11 @@ else hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 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 +hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim index 8479c77..cd72b74 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -22,11 +22,6 @@ 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! 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 -hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,6 +38,11 @@ else hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 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 +hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index 4865370..4eb1f23 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -22,10 +22,6 @@ 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! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse -hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,14 +39,22 @@ else hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE 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! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse,bold gui=NONE,reverse,bold + hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse,bold gui=NONE,reverse,bold hi! StatusLineNC ctermfg=7 guifg=#eee8d5 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermbg=7 guibg=#eee8d5 ctermfg=14 guifg=#93a1a1 cterm=NONE gui=NONE hi! TabLineFill ctermbg=7 guibg=#eee8d5 ctermfg=14 guifg=#93a1a1 cterm=NONE gui=NONE 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! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse + hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse hi! TabLine ctermbg=7 guibg=#eee8d5 ctermfg=14 guifg=#93a1a1 cterm=NONE gui=NONE diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index f63dddd..7d8719c 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -22,11 +22,6 @@ 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! 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 -hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,6 +38,11 @@ else hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 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 +hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim index 4fd3697..02eb55a 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -22,11 +22,6 @@ 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! 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 -hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse -hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse 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 @@ -43,6 +38,11 @@ else hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 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 +hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse +hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse if get(g:, "solarized_statusline", "") == "low" hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse diff --git a/src/solarized8.vim b/src/solarized8.vim index 3feac7e..1d1b306 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -222,29 +222,6 @@ for s:solarized_background in ["dark", "light"] " keywords TODO FIXME and XXX " "}}} - " Lifepillar's mode highlighting {{{ - if s:solarized_contrast == "flat" - " NormalMode set together with StatusLine (see below) - call s:put("hi! InsertMode" . s:bg_cyan .s:fg_base02. s:fmt_revbb) - call s:put("hi! ReplaceMode". s:bg_orange .s:fg_base02. s:fmt_revbb) - call s:put("hi! VisualMode" . s:bg_magenta.s:fg_base02. s:fmt_revbb) - call s:put("hi! CommandMode". s:bg_magenta.s:fg_base02. s:fmt_revbb) - else - if s:solarized_background == "dark" - call s:put("hi! NormalMode" . s:fg_base0 .s:bg_base3. s:fmt_revbb) - call s:put("hi! InsertMode" . s:fg_cyan .s:bg_base3. s:fmt_revbb) - call s:put("hi! ReplaceMode". s:fg_orange .s:bg_base3. s:fmt_revbb) - call s:put("hi! VisualMode" . s:fg_magenta.s:bg_base3. s:fmt_revbb) - call s:put("hi! CommandMode". s:fg_magenta.s:bg_base3. s:fmt_revbb) - else - call s:put("hi! NormalMode" .s:fg_base1 .s:bg_base03. s:fmt_revbb) - call s:put("hi! InsertMode" .s:fg_cyan .s:bg_base03. s:fmt_revbb) - call s:put("hi! ReplaceMode" .s:fg_orange .s:bg_base03. s:fmt_revbb) - call s:put("hi! VisualMode" .s:fg_magenta.s:bg_base03. s:fmt_revbb) - call s:put("hi! CommandMode" .s:fg_magenta.s:bg_base03. s:fmt_revbb) - endif - endif - " }}} " Extended highlighting "{{{ " --------------------------------------------------------------------- call s:put('if get(g:, "solarized_visibility", "") == "high"') @@ -277,10 +254,29 @@ for s:solarized_background in ["dark", "light"] call s:put(" hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none) endif call s:put('endif') + if s:solarized_contrast != "flat" + if s:solarized_background == "dark" + call s:put("hi! NormalMode" . s:fg_base0 .s:bg_base3. s:fmt_revbb) + call s:put("hi! InsertMode" . s:fg_cyan .s:bg_base3. s:fmt_revbb) + call s:put("hi! ReplaceMode". s:fg_orange .s:bg_base3. s:fmt_revbb) + call s:put("hi! VisualMode" . s:fg_magenta.s:bg_base3. s:fmt_revbb) + call s:put("hi! CommandMode". s:fg_magenta.s:bg_base3. s:fmt_revbb) + else + call s:put("hi! NormalMode" .s:fg_base1 .s:bg_base03. s:fmt_revbb) + call s:put("hi! InsertMode" .s:fg_cyan .s:bg_base03. s:fmt_revbb) + call s:put("hi! ReplaceMode" .s:fg_orange .s:bg_base03. s:fmt_revbb) + call s:put("hi! VisualMode" .s:fg_magenta.s:bg_base03. s:fmt_revbb) + call s:put("hi! CommandMode" .s:fg_magenta.s:bg_base03. s:fmt_revbb) + endif + 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! NormalMode" .s:fg_base02 .s:bg_base1 .s:fmt_revb) + call s:put(" hi! InsertMode" .s:bg_cyan .s:fg_base02 .s:fmt_revb) + call s:put(" hi! ReplaceMode" .s:bg_orange .s:fg_base02 .s:fmt_revb) + call s:put(" hi! VisualMode" .s:bg_magenta .s:fg_base02 .s:fmt_revb) + call s:put(" hi! CommandMode" .s:bg_magenta .s:fg_base02 .s:fmt_revb) + call s:put(" hi! StatusLine" .s:fg_base02 .s:bg_base1 .s:fmt_revb) 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) @@ -315,6 +311,10 @@ for s:solarized_background in ["dark", "light"] 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! InsertMode" .s:bg_cyan .s:fg_base02 .s:fmt_revbb) + call s:put(" hi! ReplaceMode" .s:bg_orange .s:fg_base02 .s:fmt_revbb) + call s:put(" hi! VisualMode" .s:bg_magenta.s:fg_base02 .s:fmt_revbb) + call s:put(" hi! CommandMode" .s:bg_magenta.s:fg_base02 .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)