matt/vim-solarized8
1
0
Fork 0
mirror of https://github.com/lifepillar/vim-solarized8.git synced 2025-12-10 15:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regressions in solarized8_dark.

Browse Source
This commit is contained in:
Lifepillar
2017-10-29 20:42:20 +01:00
parent d775a5611d
commit 3f3fc033e6
4 changed files with 156 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Readme.md
View File

@@ -64,8 +64,8 @@ The following options are inherited from Solarized:
- `g:solarized_visibility`: one of `"normal"` (default), `"low"`, `"high"`;
- `g:solarized_diffmode`: one of `"normal"` (default), `"low"`, `"high"`,
`"bold"`;
- `g:solarized_transp_bg`: make terminal background transparent if set to `1`
(default: `0`). This options was called `g:solarized_termtrans` in Solarized.
- `g:solarized_termtrans`: make terminal background transparent if set to `1`
(default: `0`).
The following options were not available in the original Solarized:

144
colors/solarized8_dark.vim
View File

@@ -4,7 +4,7 @@
" Maintainer: Lifepillar <lifepillar@lifepillar.me>
" Website: https://github.com/lifepillar/vim-solarized8
" License: OSI approved MIT license
" Last Updated: Sat Oct 28 22:11:06 2017
" Last Updated: Sun Oct 29 20:39:37 2017
if !(has('termguicolors') && &termguicolors) && !has('gui_running')
\ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -41,22 +41,34 @@ let g:colors_name = 'solarized8_dark'
" base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724]
if get(g:, 'solarized_use16', 1)
if !has('gui_running') && get(g:, 'solarized_transp_bg', 0)
if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
hi Normal ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermfg=9 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
hi LineNr ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermbg=NONE guifg=NONE
else
hi Normal ctermfg=12 ctermbg=8 guifg=#839496 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermfg=9 ctermbg=0 guifg=#cb4b16 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=10 ctermbg=0 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi FoldColumn ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi Folded ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
hi LineNr ctermfg=10 ctermbg=0 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermbg=0 guibg=#073642
endif
if get(g:, "solarized_visibility", "") == "high"
hi CursorLineNr ctermfg=9 guifg=#cb4b16 cterm=bold gui=bold
hi NonText ctermfg=9 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=9 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=3 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
elseif get(g:, "solarized_visibility", "") == "low"
hi CursorLineNr ctermfg=10 guifg=#586e75 cterm=bold gui=bold
hi NonText ctermfg=0 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=0 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
else
hi CursorLineNr ctermfg=12 guifg=#839496 cterm=bold gui=bold
hi NonText ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=11 ctermbg=0 guifg=#657b83 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi Title ctermfg=3 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
endif
hi ColorColumn ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi Conceal ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -67,19 +79,6 @@ hi Cursor ctermfg=15 ctermbg=4 guifg=#fdf6e3 guibg=#268bd2 guisp=NONE cterm=NONE
endif
hi CursorColumn ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi CursorLine ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=#93a1a1 cterm=NONE gui=NONE
if get(g:, "solarized_visibility", "") == "high"
hi NonText ctermfg=9 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=9 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=3 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
elseif get(g:, "solarized_visibility", "") == "low"
hi NonText ctermfg=0 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=0 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
else
hi NonText ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=11 ctermbg=0 guifg=#657b83 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi Title ctermfg=3 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
endif
if get(g:, "solarized_diffmode", "") == "high"
hi DiffAdd ctermfg=2 ctermbg=NONE guifg=#859900 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi DiffChange ctermfg=3 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -384,22 +383,34 @@ let g:terminal_color_2='#859900'
endif
endif
if !get(g:, 'solarized_use16', 1)
if !has('gui_running') && get(g:, 'solarized_transp_bg', 0)
if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
hi Normal ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermfg=166 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
hi LineNr ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermbg=NONE guifg=NONE
else
hi Normal ctermfg=246 ctermbg=235 guifg=#839496 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermfg=166 ctermbg=236 guifg=#cb4b16 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=242 ctermbg=236 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi CursorLineNr ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi FoldColumn ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi Folded ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
hi LineNr ctermfg=242 ctermbg=236 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi CursorLineNr ctermbg=236 guibg=#073642
endif
if get(g:, "solarized_visibility", "") == "high"
hi CursorLineNr ctermfg=166 guifg=#cb4b16 cterm=bold gui=bold
hi NonText ctermfg=166 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=166 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=136 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
elseif get(g:, "solarized_visibility", "") == "low"
hi CursorLineNr ctermfg=242 guifg=#586e75 cterm=bold gui=bold
hi NonText ctermfg=236 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=236 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
else
hi CursorLineNr ctermfg=246 guifg=#839496 cterm=bold gui=bold
hi NonText ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=66 ctermbg=236 guifg=#657b83 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi Title ctermfg=136 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
endif
hi ColorColumn ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi Conceal ctermfg=32 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -410,19 +421,6 @@ hi Cursor ctermfg=230 ctermbg=32 guifg=#fdf6e3 guibg=#268bd2 guisp=NONE cterm=NO
endif
hi CursorColumn ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
hi CursorLine ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=#93a1a1 cterm=NONE gui=NONE
if get(g:, "solarized_visibility", "") == "high"
hi NonText ctermfg=166 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=166 ctermbg=NONE guifg=#cb4b16 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=136 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
elseif get(g:, "solarized_visibility", "") == "low"
hi NonText ctermfg=236 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=236 ctermbg=NONE guifg=#073642 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi Title ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
else
hi NonText ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
hi SpecialKey ctermfg=66 ctermbg=236 guifg=#657b83 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
hi Title ctermfg=136 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
endif
if get(g:, "solarized_diffmode", "") == "high"
hi DiffAdd ctermfg=106 ctermbg=NONE guifg=#859900 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
hi DiffChange ctermfg=136 ctermbg=NONE guifg=#b58900 guibg=NONE guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -745,7 +743,46 @@ endif
" Color: green #859900 ~ 2
" Color: back #002b36 ~ 8
" Background: dark
" verbatim
" endverbatim
" Normal base0 none
" FoldColumn fg none
" Folded fg none bold s=base03
" LineNr base01 none
" verbatim
" hi CursorLineNr ctermbg=NONE guifg=NONE
" else
" endverbatim
" Normal base0 back
" FoldColumn base0 base02
" Folded base0 base02 bold s=base03
" LineNr base01 base02
" verbatim
" hi CursorLineNr ctermbg=@base02 guibg=@base02
" endif
" endverbatim
" verbatim
" hi CursorLineNr ctermfg=@orange guifg=@orange cterm=bold gui=bold
" endverbatim
" NonText orange none bold
" SpecialKey orange none reverse
" Title yellow none bold
" verbatim
" hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
" endverbatim
" NonText base02 none bold
" SpecialKey base02 none reverse
" Title base01 none bold
" verbatim
" else
" hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
" endverbatim
" NonText base00 none bold
" SpecialKey base00 base02 bold
" Title yellow none bold
" verbatim
" endif
" endverbatim
" ColorColumn none base02
" Conceal blue none
" verbatim
@@ -762,28 +799,6 @@ endif
" CursorLine none base02 s=base1
" verbatim
" endverbatim
" CursorLineNr orange base02/none bold
" NonText orange none bold
" SpecialKey orange none reverse
" Title yellow none bold
" verbatim
" endverbatim
" CursorLineNr base01 base02/none bold
" NonText base02 none bold
" SpecialKey base02 none reverse
" Title base01 none bold
" verbatim
" else
" endverbatim
" CursorLineNr base0 base02/none bold
" NonText base00 none bold
" SpecialKey base00 base02 bold
" Title yellow none bold
" verbatim
" endif
" endverbatim
" verbatim
" endverbatim
" DiffAdd green none reverse
" DiffChange yellow none reverse
" DiffDelete red none reverse
@@ -807,10 +822,7 @@ endif
" Directory blue none
" EndOfBuffer none none
" ErrorMsg red base3 reverse
" FoldColumn base0/fg base02/none
" Folded base0/fg base02/none bold s=base03
" IncSearch orange none standout
" LineNr base01/base01 base02/none
" MatchParen base3 base02 bold
" ModeMsg blue none
" MoreMsg blue none

13
doc/solarized8_dark.txt
View File

@@ -23,6 +23,12 @@ Set to `"low"` to reduce the contrast in the status line.
Set to 0 if you want to disable italics in the terminal.
>
let g:solarized_term_italics = 1
<
*g:solarized_termtrans*
Set to 1 if you want a transparent background. Takes effect only in the
terminal.
>
let g:solarized_termtrans = 0
<
*g:solarized_visibility*
Tweak the visibility of a few elements. Allowed values are `"normal"`
@@ -30,16 +36,9 @@ Tweak the visibility of a few elements. Allowed values are `"normal"`
>
let g:solarized_visibility = "normal"
<
==============================================================================
Solarized8 Dark other options *solarized8_dark-other-options*
*g:solarized_transp_bg*
Set to 1 if you want a transparent background. Takes effect only in the
terminal.
>
let g:solarized_transp_bg = 0
<
*g:solarized_use16*
Set to 0 if you want to use 256 colors.
>

91
templates/solarized8_dark.colortemplate
View File

@@ -57,6 +57,12 @@ Set to `"low"` to reduce the contrast in the status line.
Set to 0 if you want to disable italics in the terminal.
>
let g:@optionprefix_term_italics = 1
<
*g:@optionprefix_termtrans*
Set to 1 if you want a transparent background. Takes effect only in the
terminal.
>
let g:@optionprefix_termtrans = 0
<
*g:@optionprefix_visibility*
Tweak the visibility of a few elements. Allowed values are `"normal"`
@@ -64,7 +70,6 @@ Tweak the visibility of a few elements. Allowed values are `"normal"`
>
let g:@optionprefix_visibility = "normal"
<
enddocumentation
# }}}
@@ -93,9 +98,59 @@ Color: back #002b36 ~ 8
Background: dark
# Default highlight groups {{{
# Comment out (do not delete) the definitions that you want to keep at their default.
# Group Foreground Background Attributes
verbatim
if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
endverbatim
# Transparent background
Normal base0 none
FoldColumn fg none
Folded fg none bold s=base03
LineNr base01 none
verbatim
hi CursorLineNr ctermbg=NONE guifg=NONE
else
endverbatim
# Opaque background
Normal base0 back
FoldColumn base0 base02
Folded base0 base02 bold s=base03
LineNr base01 base02
verbatim
hi CursorLineNr ctermbg=@base02 guibg=@base02
endif
endverbatim
# Visibility ================================================================
verbatim
if get(g:, "@optionprefix_visibility", "") == "high"
hi CursorLineNr ctermfg=@orange guifg=@orange cterm=bold gui=bold
endverbatim
NonText orange none bold
SpecialKey orange none reverse
Title yellow none bold
verbatim
elseif get(g:, "@optionprefix_visibility", "") == "low"
hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
endverbatim
NonText base02 none bold
SpecialKey base02 none reverse
Title base01 none bold
verbatim
else
hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
endverbatim
NonText base00 none bold
SpecialKey base00 base02 bold
Title yellow none bold
verbatim
endif
endverbatim
# ---------------------------------------------------------------------------
ColorColumn none base02
Conceal blue none
@@ -116,33 +171,6 @@ endverbatim
CursorColumn none base02
CursorLine none base02 s=base1
# Visibility ================================================================
verbatim
if get(g:, "@optionprefix_visibility", "") == "high"
endverbatim
CursorLineNr orange base02/none bold
NonText orange none bold
SpecialKey orange none reverse
Title yellow none bold
verbatim
elseif get(g:, "@optionprefix_visibility", "") == "low"
endverbatim
CursorLineNr base01 base02/none bold
NonText base02 none bold
SpecialKey base02 none reverse
Title base01 none bold
verbatim
else
endverbatim
CursorLineNr base0 base02/none bold
NonText base00 none bold
SpecialKey base00 base02 bold
Title yellow none bold
verbatim
endif
endverbatim
# ---------------------------------------------------------------------------
# Diff mode =================================================================
verbatim
if get(g:, "@optionprefix_diffmode", "") == "high"
@@ -171,10 +199,7 @@ endverbatim
Directory blue none
EndOfBuffer none none
ErrorMsg red base3 reverse
FoldColumn base0/fg base02/none
Folded base0/fg base02/none bold s=base03
IncSearch orange none standout
LineNr base01/base01 base02/none
MatchParen base3 base02 bold
ModeMsg blue none
MoreMsg blue none