From 4dc4539c495722c48cdb6186cf3064581bb8156a Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Wed, 22 Aug 2018 14:22:13 +0300 Subject: [PATCH] Fix incorrect g:terminal_ansi_colors for light schemes. Fixes https://github.com/lifepillar/vim-solarized8/issues/45. --- colors/solarized8.vim | 46 ++----------------- colors/solarized8_flat.vim | 46 ++----------------- colors/solarized8_high.vim | 46 ++----------------- colors/solarized8_low.vim | 46 ++----------------- ... _terminal_ansi_colors_dark.colortemplate} | 0 .../_terminal_ansi_colors_light.colortemplate | 5 ++ templates/solarized8.colortemplate | 4 +- templates/solarized8_flat.colortemplate | 4 +- templates/solarized8_high.colortemplate | 4 +- templates/solarized8_low.colortemplate | 4 +- 10 files changed, 33 insertions(+), 172 deletions(-) rename templates/{_terminal_ansi_colors.colortemplate => _terminal_ansi_colors_dark.colortemplate} (100%) create mode 100644 templates/_terminal_ansi_colors_light.colortemplate diff --git a/colors/solarized8.vim b/colors/solarized8.vim index 09cf4d8..bbefb5a 100644 --- a/colors/solarized8.vim +++ b/colors/solarized8.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Thu Jun 21 12:32:13 2018 +" Last Updated: Wed Aug 22 14:17:32 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', &t_Co < 256) ? 16 : 256)) @@ -22,24 +22,6 @@ let g:colors_name = 'solarized8' " 256-color variant if !get(g:, 'solarized_use16', &t_Co < 256) if &background ==# 'dark' - " Color similarity table (dark background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base1: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " base0: GUI=#839496/rgb(131,148,150) Term=246 #949494/rgb(148,148,148) [delta=7.557606] - " base3: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " base2: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base00: GUI=#657b83/rgb(101,123,131) Term= 66 #5f8787/rgb( 95,135,135) [delta=8.468738] - " base01: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] - " back: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) @@ -400,26 +382,8 @@ if !get(g:, 'solarized_use16', &t_Co < 256) finish endif - " Color similarity table (light background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base01: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " base00: GUI=#839496/rgb(131,148,150) Term=246 #949494/rgb(148,148,148) [delta=7.557606] - " back: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " base03: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " base02: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base0: GUI=#657b83/rgb(101,123,131) Term= 66 #5f8787/rgb( 95,135,135) [delta=8.468738] - " base1: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] - " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base2: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] - let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1152,8 +1116,8 @@ if &background ==# 'dark' finish endif -let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] +let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim index 8efa993..edecb0a 100644 --- a/colors/solarized8_flat.vim +++ b/colors/solarized8_flat.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Thu Jun 21 12:32:17 2018 +" Last Updated: Wed Aug 22 14:17:35 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', &t_Co < 256) ? 16 : 256)) @@ -22,24 +22,6 @@ let g:colors_name = 'solarized8_flat' " 256-color variant if !get(g:, 'solarized_use16', &t_Co < 256) if &background ==# 'dark' - " Color similarity table (dark background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base1: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " base0: GUI=#839496/rgb(131,148,150) Term=246 #949494/rgb(148,148,148) [delta=7.557606] - " base3: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " base2: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base00: GUI=#657b83/rgb(101,123,131) Term= 66 #5f8787/rgb( 95,135,135) [delta=8.468738] - " base01: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] - " back: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) @@ -394,26 +376,8 @@ if !get(g:, 'solarized_use16', &t_Co < 256) finish endif - " Color similarity table (light background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base01: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " base00: GUI=#839496/rgb(131,148,150) Term=246 #949494/rgb(148,148,148) [delta=7.557606] - " back: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " base03: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " base02: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base0: GUI=#657b83/rgb(101,123,131) Term= 66 #5f8787/rgb( 95,135,135) [delta=8.468738] - " base1: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] - " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base2: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] - let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1134,8 +1098,8 @@ if &background ==# 'dark' finish endif -let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] +let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim index 5e148fd..e48948a 100644 --- a/colors/solarized8_high.vim +++ b/colors/solarized8_high.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Thu Jun 21 12:32:20 2018 +" Last Updated: Wed Aug 22 14:17:38 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', &t_Co < 256) ? 16 : 256)) @@ -22,24 +22,6 @@ let g:colors_name = 'solarized8_high' " 256-color variant if !get(g:, 'solarized_use16', &t_Co < 256) if &background ==# 'dark' - " Color similarity table (dark background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base0: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " base00: GUI=#839496/rgb(131,148,150) Term=246 #949494/rgb(148,148,148) [delta=7.557606] - " base2: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " base3: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " base1: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base01: GUI=#657b83/rgb(101,123,131) Term=243 #767676/rgb(118,118,118) [delta=9.154449] - " back: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#fdf6e3', \ '#002b36', '#cb4b16', '#657b83', '#839496', '#93a1a1', '#6c71c4', '#eee8d5', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) @@ -400,26 +382,8 @@ if !get(g:, 'solarized_use16', &t_Co < 256) finish endif - " Color similarity table (light background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base01: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " back: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " base03: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " base02: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base00: GUI=#657b83/rgb(101,123,131) Term= 66 #5f8787/rgb( 95,135,135) [delta=8.468738] - " base0: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] - " base2: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base1: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] - let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#002b36', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#657b83', '#586e75', '#6c71c4', '#073642', '#002b36'] + let g:terminal_ansi_colors = ['#002b36', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#073642', '#586e75', '#657b83', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1152,8 +1116,8 @@ if &background ==# 'dark' finish endif -let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#002b36', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#657b83', '#586e75', '#6c71c4', '#073642', '#002b36'] +let g:terminal_ansi_colors = ['#002b36', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#073642', '#586e75', '#657b83', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim index 8b1f8d8..4654992 100644 --- a/colors/solarized8_low.vim +++ b/colors/solarized8_low.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Thu Jun 21 12:32:24 2018 +" Last Updated: Wed Aug 22 14:17:42 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', &t_Co < 256) ? 16 : 256)) @@ -22,24 +22,6 @@ let g:colors_name = 'solarized8_low' " 256-color variant if !get(g:, 'solarized_use16', &t_Co < 256) if &background ==# 'dark' - " Color similarity table (dark background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base1: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " base0: GUI=#839496/rgb(131,148,150) Term=246 #949494/rgb(148,148,148) [delta=7.557606] - " base3: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " base2: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base00: GUI=#657b83/rgb(101,123,131) Term= 66 #5f8787/rgb( 95,135,135) [delta=8.468738] - " base01: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] - " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " back: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] - " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) @@ -400,26 +382,8 @@ if !get(g:, 'solarized_use16', &t_Co < 256) finish endif - " Color similarity table (light background) - " yellow: GUI=#b58900/rgb(181,137, 0) Term=136 #af8700/rgb(175,135, 0) [delta=1.465279] - " blue: GUI=#268bd2/rgb( 38,139,210) Term= 32 #0087d7/rgb( 0,135,215) [delta=2.677029] - " magenta: GUI=#d33682/rgb(211, 54,130) Term=162 #d70087/rgb(215, 0,135) [delta=4.342643] - " cyan: GUI=#2aa198/rgb( 42,161,152) Term= 37 #00afaf/rgb( 0,175,175) [delta=5.365780] - " base01: GUI=#93a1a1/rgb(147,161,161) Term=247 #9e9e9e/rgb(158,158,158) [delta=6.489730] - " violet: GUI=#6c71c4/rgb(108,113,196) Term= 61 #5f5faf/rgb( 95, 95,175) [delta=6.795109] - " red: GUI=#dc322f/rgb(220, 50, 47) Term=160 #d70000/rgb(215, 0, 0) [delta=6.843619] - " green: GUI=#859900/rgb(133,153, 0) Term=106 #87af00/rgb(135,175, 0) [delta=6.901386] - " base00: GUI=#839496/rgb(131,148,150) Term=246 #949494/rgb(148,148,148) [delta=7.557606] - " base03: GUI=#fdf6e3/rgb(253,246,227) Term=230 #ffffd7/rgb(255,255,215) [delta=7.816259] - " orange: GUI=#cb4b16/rgb(203, 75, 22) Term=166 #d75f00/rgb(215, 95, 0) [delta=8.065025] - " back: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base02: GUI=#eee8d5/rgb(238,232,213) Term=254 #e4e4e4/rgb(228,228,228) [delta=8.289679] - " base0: GUI=#657b83/rgb(101,123,131) Term= 66 #5f8787/rgb( 95,135,135) [delta=8.468738] - " base1: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] - " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] - " base2: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] - let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1152,8 +1116,8 @@ if &background ==# 'dark' finish endif -let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] +let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/templates/_terminal_ansi_colors.colortemplate b/templates/_terminal_ansi_colors_dark.colortemplate similarity index 100% rename from templates/_terminal_ansi_colors.colortemplate rename to templates/_terminal_ansi_colors_dark.colortemplate diff --git a/templates/_terminal_ansi_colors_light.colortemplate b/templates/_terminal_ansi_colors_light.colortemplate new file mode 100644 index 0000000..a764f8e --- /dev/null +++ b/templates/_terminal_ansi_colors_light.colortemplate @@ -0,0 +1,5 @@ +verbatim +let g:terminal_ansi_colors = ['@guibase2', '@guired', '@guigreen', '@guiyellow', '@guiblue', '@guimagenta', '@guicyan', '@guibase02', +\ '@guibase3', '@guiorange', '@guibase1', '@guibase0', '@guibase00', '@guiviolet', '@guibase01', '@guibase03'] +endverbatim + diff --git a/templates/solarized8.colortemplate b/templates/solarized8.colortemplate index 0c5fe2a..b19a9b4 100644 --- a/templates/solarized8.colortemplate +++ b/templates/solarized8.colortemplate @@ -41,7 +41,7 @@ Color: back #002b36 ~ 8 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_dark.colortemplate # }}} # Fix 256-color palette in supported terminals {{{ @@ -284,7 +284,7 @@ Color: back #fdf6e3 ~ 15 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_light.colortemplate # }}} # Default highlight groups {{{ diff --git a/templates/solarized8_flat.colortemplate b/templates/solarized8_flat.colortemplate index b235725..be4bc5b 100644 --- a/templates/solarized8_flat.colortemplate +++ b/templates/solarized8_flat.colortemplate @@ -41,7 +41,7 @@ Color: back #002b36 ~ 8 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_dark.colortemplate # }}} # Default highlight groups {{{ @@ -271,7 +271,7 @@ Color: back #fdf6e3 ~ 15 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_light.colortemplate # }}} # Default highlight groups {{{ diff --git a/templates/solarized8_high.colortemplate b/templates/solarized8_high.colortemplate index a094f7b..d0b8adf 100644 --- a/templates/solarized8_high.colortemplate +++ b/templates/solarized8_high.colortemplate @@ -41,7 +41,7 @@ Color: back #002b36 ~ 8 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_dark.colortemplate # }}} # Default highlight groups {{{ @@ -280,7 +280,7 @@ Color: back #fdf6e3 ~ 15 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_light.colortemplate # }}} # Default highlight groups {{{ diff --git a/templates/solarized8_low.colortemplate b/templates/solarized8_low.colortemplate index 9d282e4..0592495 100644 --- a/templates/solarized8_low.colortemplate +++ b/templates/solarized8_low.colortemplate @@ -41,7 +41,7 @@ Color: back #073642 ~ 0 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_dark.colortemplate # }}} # Default highlight groups {{{ @@ -280,7 +280,7 @@ Color: back #eee8d5 ~ 7 # }}} # Terminal ANSI colors {{{ -Include: _terminal_ansi_colors.colortemplate +Include: _terminal_ansi_colors_light.colortemplate # }}} # Default highlight groups {{{