Enhance transparency to SignColumn and FoldColumn

diff --git a/colors/artesanal.vim b/colors/artesanal.vim
index faf2596b2cb5f5d34770ee4bc65bf30eb761073e..d3d9589da50fabd1c0a4fdf189d1fcab0742dcf3 100644 (file)
--- a/colors/artesanal.vim
+++ b/colors/artesanal.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " Website:      https://github.com/wimstefan/vim-artesanal
 " License:      Vim License (see `:help license`)
-" Last Updated: Mon 31 May 2021 07:16:59 PM CEST
+" Last Updated: Sat 31 Jul 2021 08:04:13 AM CEST
 
 " Generated by Colortemplate v2.1.0
 
@@ -85,15 +85,25 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
       hi WildMenu guifg=#90caf9 guibg=#455a64 gui=bold cterm=bold
     endif
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi LineNr guifg=#455a64 guibg=NONE gui=NONE cterm=NONE
       hi CursorLineNr guifg=#ffff8d guibg=NONE gui=NONE cterm=NONE
       hi FoldColumn guifg=#575c66 guibg=NONE gui=NONE cterm=NONE
-      hi SignColumn guifg=#cdd2db guibg=NONE gui=NONE cterm=NONE
+      hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
       hi VertSplit guifg=#546e7a guibg=NONE gui=NONE cterm=NONE
+      hi Pmenu guifg=#e4e6eb guibg=NONE gui=NONE cterm=NONE
+      hi PmenuSbar guifg=#cdd2db guibg=NONE gui=NONE cterm=NONE
+      hi PmenuSel guifg=#cdd2db guibg=NONE gui=reverse cterm=reverse
+      hi PmenuThumb guifg=NONE guibg=#cdd2db gui=NONE cterm=NONE
     else
+      hi LineNr guifg=#455a64 guibg=#37474f gui=NONE cterm=NONE
       hi CursorLineNr guifg=#ffff8d guibg=#37474f gui=NONE cterm=NONE
       hi FoldColumn guifg=#575c66 guibg=#37474f gui=NONE cterm=NONE
-      hi SignColumn guifg=#cdd2db guibg=#37474f gui=NONE cterm=NONE
+      hi SignColumn guifg=NONE guibg=#37474f gui=NONE cterm=NONE
       hi VertSplit guifg=#546e7a guibg=#2e3440 gui=NONE cterm=NONE
+      hi Pmenu guifg=#e4e6eb guibg=#455a64 gui=NONE cterm=NONE
+      hi PmenuSbar guifg=NONE guibg=#455a64 gui=NONE cterm=NONE
+      hi PmenuSel guifg=#37474f guibg=#cdd2db gui=bold cterm=bold
+      hi PmenuThumb guifg=NONE guibg=#90a4ae gui=NONE cterm=NONE
     endif
     hi ColorColumn guifg=NONE guibg=#37474f gui=bold cterm=bold
     hi Cursor guifg=NONE guibg=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -109,14 +119,8 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link ErrorMsg Error
     hi Folded guifg=#546e7a guibg=#37474f gui=italic cterm=NONE
     hi IncSearch guifg=#ffff8d guibg=#1c313a gui=reverse cterm=reverse
-    hi LineNr guifg=#546e7a guibg=#37474f gui=NONE cterm=NONE
-    hi SignColumn guifg=NONE guibg=#37474f gui=NONE cterm=NONE
     hi MatchParen guifg=NONE guibg=#455a64 gui=bold cterm=bold
     hi NonText guifg=#90a4ae guibg=NONE gui=NONE cterm=NONE
-    hi Pmenu guifg=#e4e6eb guibg=#455a64 gui=NONE cterm=NONE
-    hi PmenuSbar guifg=NONE guibg=#455a64 gui=NONE cterm=NONE
-    hi PmenuSel guifg=#37474f guibg=#cdd2db gui=bold cterm=bold
-    hi PmenuThumb guifg=NONE guibg=#90a4ae gui=NONE cterm=NONE
     hi Question guifg=#ffeb3b guibg=NONE gui=NONE cterm=NONE
     hi! link QuickFixLine Search
     hi Search guifg=#fff9c4 guibg=#1c313a gui=reverse cterm=reverse
@@ -173,13 +177,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi ReplaceMode guifg=#80deea guibg=#2e3440 gui=reverse cterm=reverse
     hi VisualMode guifg=#ffff8d guibg=#2e3440 gui=reverse cterm=reverse
     hi CommandMode guifg=#b39ddb guibg=#2e3440 gui=reverse cterm=reverse
-    hi Warnings guifg=#ffff8d guibg=#2e3440 gui=reverse cterm=reverse
-    hi GitSignsAdd guifg=#69f0b9 guibg=#37474f gui=NONE cterm=NONE
-    hi! link GitSignsAddNr GitSignsAdd
-    hi GitSignsChange guifg=#90caf9 guibg=#37474f gui=NONE cterm=NONE
-    hi! link GitSignsChangeNr GitSignsChange
-    hi GitSignsDelete guifg=#ff616f guibg=#37474f gui=NONE cterm=NONE
-    hi! link GitSignsDeleteNr GitSignsDelete
+    hi Warnings guifg=#ff616f guibg=#2e3440 gui=reverse cterm=reverse
     if !s:italics
       hi Folded gui=NONE cterm=NONE
       hi SpellBad gui=undercurl cterm=underline
@@ -187,6 +185,18 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
       hi SpellLocal gui=undercurl cterm=underline
       hi SpellRare gui=undercurl cterm=underline
     endif
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi GitSignsAdd guifg=#69f0b9 guibg=NONE gui=NONE cterm=NONE
+      hi GitSignsChange guifg=#90caf9 guibg=NONE gui=NONE cterm=NONE
+      hi GitSignsDelete guifg=#ff616f guibg=NONE gui=NONE cterm=NONE
+    else
+      hi GitSignsAdd guifg=#69f0b9 guibg=#37474f gui=NONE cterm=NONE
+      hi GitSignsChange guifg=#90caf9 guibg=#37474f gui=NONE cterm=NONE
+      hi GitSignsDelete guifg=#ff616f guibg=#37474f gui=NONE cterm=NONE
+    endif
+    hi! link GitSignsAddNr GitSignsAdd
+    hi! link GitSignsChangeNr GitSignsChange
+    hi! link GitSignsDeleteNr GitSignsDelete
     if has('nvim')
       hi! link TermCursor Cursor
       hi TermCursorNC guifg=#37474f guibg=#e4e6eb gui=NONE cterm=NONE
@@ -264,15 +274,25 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi WildMenu guifg=#0961a8 guibg=#cdd2db gui=bold cterm=bold
   endif
   if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+    hi LineNr guifg=#cdd2db guibg=NONE gui=NONE cterm=NONE
     hi CursorLineNr guifg=#ff870e guibg=NONE gui=NONE cterm=NONE
     hi FoldColumn guifg=#575c66 guibg=NONE gui=NONE cterm=NONE
-    hi SignColumn guifg=#455a64 guibg=NONE gui=NONE cterm=NONE
+    hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit guifg=#b6bdcb guibg=NONE gui=NONE cterm=NONE
+    hi Pmenu guifg=#37474f guibg=NONE gui=NONE cterm=NONE
+    hi PmenuSbar guifg=#455a64 guibg=NONE gui=NONE cterm=NONE
+    hi PmenuSel guifg=#455a64 guibg=NONE gui=reverse cterm=reverse
+    hi PmenuThumb guifg=NONE guibg=#455a64 gui=NONE cterm=NONE
   else
+    hi LineNr guifg=#cdd2db guibg=#e4e6eb gui=NONE cterm=NONE
     hi CursorLineNr guifg=#ff870e guibg=#e4e6eb gui=NONE cterm=NONE
     hi FoldColumn guifg=#575c66 guibg=#e4e6eb gui=NONE cterm=NONE
-    hi SignColumn guifg=#455a64 guibg=#e4e6eb gui=NONE cterm=NONE
+    hi SignColumn guifg=NONE guibg=#e4e6eb gui=NONE cterm=NONE
     hi VertSplit guifg=#b6bdcb guibg=#eff1f4 gui=NONE cterm=NONE
+    hi Pmenu guifg=#37474f guibg=#cdd2db gui=NONE cterm=NONE
+    hi PmenuSbar guifg=NONE guibg=#cdd2db gui=NONE cterm=NONE
+    hi PmenuSel guifg=#e4e6eb guibg=#455a64 gui=bold cterm=bold
+    hi PmenuThumb guifg=NONE guibg=#9fa8ba gui=NONE cterm=NONE
   endif
   hi ColorColumn guifg=NONE guibg=#e4e6eb gui=bold cterm=bold
   hi Cursor guifg=NONE guibg=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -288,14 +308,8 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link ErrorMsg Error
   hi Folded guifg=#b6bdcb guibg=#e4e6eb gui=italic cterm=NONE
   hi IncSearch guifg=#ff870e guibg=#1c313a gui=reverse cterm=reverse
-  hi LineNr guifg=#b6bdcb guibg=#e4e6eb gui=NONE cterm=NONE
-  hi SignColumn guifg=NONE guibg=#e4e6eb gui=NONE cterm=NONE
   hi MatchParen guifg=NONE guibg=#cdd2db gui=bold cterm=bold
   hi NonText guifg=#9fa8ba guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#37474f guibg=#cdd2db gui=NONE cterm=NONE
-  hi PmenuSbar guifg=NONE guibg=#cdd2db gui=NONE cterm=NONE
-  hi PmenuSel guifg=#e4e6eb guibg=#455a64 gui=bold cterm=bold
-  hi PmenuThumb guifg=NONE guibg=#9fa8ba gui=NONE cterm=NONE
   hi Question guifg=#cc6c0b guibg=NONE gui=NONE cterm=NONE
   hi! link QuickFixLine Search
   hi Search guifg=#ffb76e guibg=#1c313a gui=reverse cterm=reverse
@@ -352,13 +366,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi ReplaceMode guifg=#1d9fb0 guibg=#eff1f4 gui=reverse cterm=reverse
   hi VisualMode guifg=#ff870e guibg=#eff1f4 gui=reverse cterm=reverse
   hi CommandMode guifg=#7a5ab2 guibg=#eff1f4 gui=reverse cterm=reverse
-  hi Warnings guifg=#ff870e guibg=#eff1f4 gui=reverse cterm=reverse
-  hi GitSignsAdd guifg=#0e8756 guibg=#e4e6eb gui=NONE cterm=NONE
-  hi! link GitSignsAddNr GitSignsAdd
-  hi GitSignsChange guifg=#0961a8 guibg=#e4e6eb gui=NONE cterm=NONE
-  hi! link GitSignsChangeNr GitSignsChange
-  hi GitSignsDelete guifg=#b2000f guibg=#e4e6eb gui=NONE cterm=NONE
-  hi! link GitSignsDeleteNr GitSignsDelete
+  hi Warnings guifg=#b2000f guibg=#eff1f4 gui=reverse cterm=reverse
   if !s:italics
     hi Folded gui=NONE cterm=NONE
     hi SpellBad gui=undercurl cterm=underline
@@ -366,6 +374,18 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi SpellLocal gui=undercurl cterm=underline
     hi SpellRare gui=undercurl cterm=underline
   endif
+  if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+    hi GitSignsAdd guifg=#0e8756 guibg=NONE gui=NONE cterm=NONE
+    hi GitSignsChange guifg=#0961a8 guibg=NONE gui=NONE cterm=NONE
+    hi GitSignsDelete guifg=#b2000f guibg=NONE gui=NONE cterm=NONE
+  else
+    hi GitSignsAdd guifg=#0e8756 guibg=#e4e6eb gui=NONE cterm=NONE
+    hi GitSignsChange guifg=#0961a8 guibg=#e4e6eb gui=NONE cterm=NONE
+    hi GitSignsDelete guifg=#b2000f guibg=#e4e6eb gui=NONE cterm=NONE
+  endif
+  hi! link GitSignsAddNr GitSignsAdd
+  hi! link GitSignsChangeNr GitSignsChange
+  hi! link GitSignsDeleteNr GitSignsDelete
   if has('nvim')
     hi! link TermCursor Cursor
     hi TermCursorNC guifg=#e4e6eb guibg=#37474f gui=NONE cterm=NONE
@@ -435,15 +455,25 @@ if s:t_Co >= 256
       hi WildMenu ctermfg=153 ctermbg=240 cterm=bold
     endif
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
       hi CursorLineNr ctermfg=228 ctermbg=NONE cterm=NONE
       hi FoldColumn ctermfg=59 ctermbg=NONE cterm=NONE
-      hi SignColumn ctermfg=252 ctermbg=NONE cterm=NONE
+      hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
       hi VertSplit ctermfg=242 ctermbg=NONE cterm=NONE
+      hi Pmenu ctermfg=254 ctermbg=NONE cterm=NONE
+      hi PmenuSbar ctermfg=252 ctermbg=NONE cterm=NONE
+      hi PmenuSel ctermfg=252 ctermbg=NONE cterm=reverse
+      hi PmenuThumb ctermfg=NONE ctermbg=252 cterm=NONE
     else
+      hi LineNr ctermfg=240 ctermbg=238 cterm=NONE
       hi CursorLineNr ctermfg=228 ctermbg=238 cterm=NONE
       hi FoldColumn ctermfg=59 ctermbg=238 cterm=NONE
-      hi SignColumn ctermfg=252 ctermbg=238 cterm=NONE
+      hi SignColumn ctermfg=NONE ctermbg=238 cterm=NONE
       hi VertSplit ctermfg=242 ctermbg=236 cterm=NONE
+      hi Pmenu ctermfg=254 ctermbg=240 cterm=NONE
+      hi PmenuSbar ctermfg=NONE ctermbg=240 cterm=NONE
+      hi PmenuSel ctermfg=238 ctermbg=252 cterm=bold
+      hi PmenuThumb ctermfg=NONE ctermbg=247 cterm=NONE
     endif
     hi ColorColumn ctermfg=NONE ctermbg=238 cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -459,14 +489,8 @@ if s:t_Co >= 256
     hi! link ErrorMsg Error
     hi Folded ctermfg=242 ctermbg=238 cterm=NONE
     hi IncSearch ctermfg=228 ctermbg=236 cterm=reverse
-    hi LineNr ctermfg=242 ctermbg=238 cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=238 cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=240 cterm=bold
     hi NonText ctermfg=247 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=254 ctermbg=240 cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=240 cterm=NONE
-    hi PmenuSel ctermfg=238 ctermbg=252 cterm=bold
-    hi PmenuThumb ctermfg=NONE ctermbg=247 cterm=NONE
     hi Question ctermfg=226 ctermbg=NONE cterm=NONE
     hi! link QuickFixLine Search
     hi Search ctermfg=230 ctermbg=236 cterm=reverse
@@ -523,12 +547,18 @@ if s:t_Co >= 256
     hi ReplaceMode ctermfg=116 ctermbg=236 cterm=reverse
     hi VisualMode ctermfg=228 ctermbg=236 cterm=reverse
     hi CommandMode ctermfg=140 ctermbg=236 cterm=reverse
-    hi Warnings ctermfg=228 ctermbg=236 cterm=reverse
-    hi GitSignsAdd ctermfg=85 ctermbg=238 cterm=NONE
+    hi Warnings ctermfg=203 ctermbg=236 cterm=reverse
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi GitSignsAdd ctermfg=85 ctermbg=NONE cterm=NONE
+      hi GitSignsChange ctermfg=153 ctermbg=NONE cterm=NONE
+      hi GitSignsDelete ctermfg=203 ctermbg=NONE cterm=NONE
+    else
+      hi GitSignsAdd ctermfg=85 ctermbg=238 cterm=NONE
+      hi GitSignsChange ctermfg=153 ctermbg=238 cterm=NONE
+      hi GitSignsDelete ctermfg=203 ctermbg=238 cterm=NONE
+    endif
     hi! link GitSignsAddNr GitSignsAdd
-    hi GitSignsChange ctermfg=153 ctermbg=238 cterm=NONE
     hi! link GitSignsChangeNr GitSignsChange
-    hi GitSignsDelete ctermfg=203 ctermbg=238 cterm=NONE
     hi! link GitSignsDeleteNr GitSignsDelete
     if has('nvim')
       hi! link TermCursor Cursor
@@ -588,15 +618,25 @@ if s:t_Co >= 256
     hi WildMenu ctermfg=25 ctermbg=252 cterm=bold
   endif
   if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+    hi LineNr ctermfg=252 ctermbg=NONE cterm=NONE
     hi CursorLineNr ctermfg=208 ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=59 ctermbg=NONE cterm=NONE
-    hi SignColumn ctermfg=240 ctermbg=NONE cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=250 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=238 ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=240 ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=240 ctermbg=NONE cterm=reverse
+    hi PmenuThumb ctermfg=NONE ctermbg=240 cterm=NONE
   else
+    hi LineNr ctermfg=252 ctermbg=254 cterm=NONE
     hi CursorLineNr ctermfg=208 ctermbg=254 cterm=NONE
     hi FoldColumn ctermfg=59 ctermbg=254 cterm=NONE
-    hi SignColumn ctermfg=240 ctermbg=254 cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=254 cterm=NONE
     hi VertSplit ctermfg=250 ctermbg=255 cterm=NONE
+    hi Pmenu ctermfg=238 ctermbg=252 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=252 cterm=NONE
+    hi PmenuSel ctermfg=254 ctermbg=240 cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=248 cterm=NONE
   endif
   hi ColorColumn ctermfg=NONE ctermbg=254 cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -612,14 +652,8 @@ if s:t_Co >= 256
   hi! link ErrorMsg Error
   hi Folded ctermfg=250 ctermbg=254 cterm=NONE
   hi IncSearch ctermfg=208 ctermbg=236 cterm=reverse
-  hi LineNr ctermfg=250 ctermbg=254 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=254 cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=252 cterm=bold
   hi NonText ctermfg=248 ctermbg=NONE cterm=NONE
-  hi Pmenu ctermfg=238 ctermbg=252 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=252 cterm=NONE
-  hi PmenuSel ctermfg=254 ctermbg=240 cterm=bold
-  hi PmenuThumb ctermfg=NONE ctermbg=248 cterm=NONE
   hi Question ctermfg=166 ctermbg=NONE cterm=NONE
   hi! link QuickFixLine Search
   hi Search ctermfg=215 ctermbg=236 cterm=reverse
@@ -676,12 +710,18 @@ if s:t_Co >= 256
   hi ReplaceMode ctermfg=37 ctermbg=255 cterm=reverse
   hi VisualMode ctermfg=208 ctermbg=255 cterm=reverse
   hi CommandMode ctermfg=97 ctermbg=255 cterm=reverse
-  hi Warnings ctermfg=208 ctermbg=255 cterm=reverse
-  hi GitSignsAdd ctermfg=29 ctermbg=254 cterm=NONE
+  hi Warnings ctermfg=124 ctermbg=255 cterm=reverse
+  if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+    hi GitSignsAdd ctermfg=29 ctermbg=NONE cterm=NONE
+    hi GitSignsChange ctermfg=25 ctermbg=NONE cterm=NONE
+    hi GitSignsDelete ctermfg=124 ctermbg=NONE cterm=NONE
+  else
+    hi GitSignsAdd ctermfg=29 ctermbg=254 cterm=NONE
+    hi GitSignsChange ctermfg=25 ctermbg=254 cterm=NONE
+    hi GitSignsDelete ctermfg=124 ctermbg=254 cterm=NONE
+  endif
   hi! link GitSignsAddNr GitSignsAdd
-  hi GitSignsChange ctermfg=25 ctermbg=254 cterm=NONE
   hi! link GitSignsChangeNr GitSignsChange
-  hi GitSignsDelete ctermfg=124 ctermbg=254 cterm=NONE
   hi! link GitSignsDeleteNr GitSignsDelete
   if has('nvim')
     hi! link TermCursor Cursor
@@ -743,15 +783,25 @@ if s:t_Co >= 16
       hi WildMenu ctermfg=Blue ctermbg=DarkGrey cterm=bold
     endif
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi LineNr ctermfg=DarkGrey ctermbg=NONE cterm=NONE
       hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
       hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
-      hi SignColumn ctermfg=LightGrey ctermbg=NONE cterm=NONE
+      hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
       hi VertSplit ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+      hi Pmenu ctermfg=White ctermbg=NONE cterm=NONE
+      hi PmenuSbar ctermfg=LightGrey ctermbg=NONE cterm=NONE
+      hi PmenuSel ctermfg=LightGrey ctermbg=NONE cterm=reverse
+      hi PmenuThumb ctermfg=NONE ctermbg=LightGrey cterm=NONE
     else
+      hi LineNr ctermfg=DarkGrey ctermbg=Black cterm=NONE
       hi CursorLineNr ctermfg=Yellow ctermbg=Black cterm=NONE
       hi FoldColumn ctermfg=DarkGray ctermbg=Black cterm=NONE
-      hi SignColumn ctermfg=LightGrey ctermbg=Black cterm=NONE
+      hi SignColumn ctermfg=NONE ctermbg=Black cterm=NONE
       hi VertSplit ctermfg=DarkGrey ctermbg=Black cterm=NONE
+      hi Pmenu ctermfg=White ctermbg=DarkGrey cterm=NONE
+      hi PmenuSbar ctermfg=NONE ctermbg=DarkGrey cterm=NONE
+      hi PmenuSel ctermfg=Black ctermbg=LightGrey cterm=bold
+      hi PmenuThumb ctermfg=NONE ctermbg=LightGrey cterm=NONE
     endif
     hi ColorColumn ctermfg=NONE ctermbg=Black cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -767,14 +817,8 @@ if s:t_Co >= 16
     hi! link ErrorMsg Error
     hi Folded ctermfg=DarkGrey ctermbg=Black cterm=NONE
     hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse
-    hi LineNr ctermfg=DarkGrey ctermbg=Black cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=Black cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=DarkGrey cterm=bold
     hi NonText ctermfg=LightGrey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=White ctermbg=DarkGrey cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=DarkGrey cterm=NONE
-    hi PmenuSel ctermfg=Black ctermbg=LightGrey cterm=bold
-    hi PmenuThumb ctermfg=NONE ctermbg=LightGrey cterm=NONE
     hi Question ctermfg=DarkYellow ctermbg=NONE cterm=NONE
     hi! link QuickFixLine Search
     hi Search ctermfg=LightYellow ctermbg=Black cterm=reverse
@@ -831,12 +875,18 @@ if s:t_Co >= 16
     hi ReplaceMode ctermfg=Cyan ctermbg=Black cterm=reverse
     hi VisualMode ctermfg=Yellow ctermbg=Black cterm=reverse
     hi CommandMode ctermfg=Magenta ctermbg=Black cterm=reverse
-    hi Warnings ctermfg=Yellow ctermbg=Black cterm=reverse
-    hi GitSignsAdd ctermfg=Green ctermbg=Black cterm=NONE
+    hi Warnings ctermfg=Red ctermbg=Black cterm=reverse
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi GitSignsAdd ctermfg=Green ctermbg=NONE cterm=NONE
+      hi GitSignsChange ctermfg=Blue ctermbg=NONE cterm=NONE
+      hi GitSignsDelete ctermfg=Red ctermbg=NONE cterm=NONE
+    else
+      hi GitSignsAdd ctermfg=Green ctermbg=Black cterm=NONE
+      hi GitSignsChange ctermfg=Blue ctermbg=Black cterm=NONE
+      hi GitSignsDelete ctermfg=Red ctermbg=Black cterm=NONE
+    endif
     hi! link GitSignsAddNr GitSignsAdd
-    hi GitSignsChange ctermfg=Blue ctermbg=Black cterm=NONE
     hi! link GitSignsChangeNr GitSignsChange
-    hi GitSignsDelete ctermfg=Red ctermbg=Black cterm=NONE
     hi! link GitSignsDeleteNr GitSignsDelete
     if has('nvim')
       hi! link TermCursor Cursor
@@ -896,15 +946,25 @@ if s:t_Co >= 16
     hi WildMenu ctermfg=Blue ctermbg=LightGrey cterm=bold
   endif
   if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+    hi LineNr ctermfg=LightGrey ctermbg=NONE cterm=NONE
     hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi SignColumn ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=Black ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=DarkGrey ctermbg=NONE cterm=reverse
+    hi PmenuThumb ctermfg=NONE ctermbg=DarkGrey cterm=NONE
   else
+    hi LineNr ctermfg=LightGrey ctermbg=White cterm=NONE
     hi CursorLineNr ctermfg=Yellow ctermbg=White cterm=NONE
     hi FoldColumn ctermfg=DarkGray ctermbg=White cterm=NONE
-    hi SignColumn ctermfg=DarkGrey ctermbg=White cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=White cterm=NONE
     hi VertSplit ctermfg=DarkGrey ctermbg=White cterm=NONE
+    hi Pmenu ctermfg=Black ctermbg=LightGrey cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=LightGrey cterm=NONE
+    hi PmenuSel ctermfg=White ctermbg=DarkGrey cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=DarkGrey cterm=NONE
   endif
   hi ColorColumn ctermfg=NONE ctermbg=White cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -920,14 +980,8 @@ if s:t_Co >= 16
   hi! link ErrorMsg Error
   hi Folded ctermfg=DarkGrey ctermbg=White cterm=NONE
   hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse
-  hi LineNr ctermfg=DarkGrey ctermbg=White cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=White cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=LightGrey cterm=bold
   hi NonText ctermfg=DarkGrey ctermbg=NONE cterm=NONE
-  hi Pmenu ctermfg=Black ctermbg=LightGrey cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=LightGrey cterm=NONE
-  hi PmenuSel ctermfg=White ctermbg=DarkGrey cterm=bold
-  hi PmenuThumb ctermfg=NONE ctermbg=DarkGrey cterm=NONE
   hi Question ctermfg=DarkYellow ctermbg=NONE cterm=NONE
   hi! link QuickFixLine Search
   hi Search ctermfg=LightYellow ctermbg=Black cterm=reverse
@@ -984,12 +1038,18 @@ if s:t_Co >= 16
   hi ReplaceMode ctermfg=Cyan ctermbg=White cterm=reverse
   hi VisualMode ctermfg=Yellow ctermbg=White cterm=reverse
   hi CommandMode ctermfg=Magenta ctermbg=White cterm=reverse
-  hi Warnings ctermfg=Yellow ctermbg=White cterm=reverse
-  hi GitSignsAdd ctermfg=Green ctermbg=White cterm=NONE
+  hi Warnings ctermfg=Red ctermbg=White cterm=reverse
+  if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+    hi GitSignsAdd ctermfg=Green ctermbg=NONE cterm=NONE
+    hi GitSignsChange ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi GitSignsDelete ctermfg=Red ctermbg=NONE cterm=NONE
+  else
+    hi GitSignsAdd ctermfg=Green ctermbg=White cterm=NONE
+    hi GitSignsChange ctermfg=Blue ctermbg=White cterm=NONE
+    hi GitSignsDelete ctermfg=Red ctermbg=White cterm=NONE
+  endif
   hi! link GitSignsAddNr GitSignsAdd
-  hi GitSignsChange ctermfg=Blue ctermbg=White cterm=NONE
   hi! link GitSignsChangeNr GitSignsChange
-  hi GitSignsDelete ctermfg=Red ctermbg=White cterm=NONE
   hi! link GitSignsDeleteNr GitSignsDelete
   if has('nvim')
     hi! link TermCursor Cursor

diff --git a/doc/artesanal.txt b/doc/artesanal.txt
index 9d1b33c864077f8138b9b0ceb19a2f7c680f3679..7cfe157fd4bd7fb4e54c22c40e1aa9722aebd2f3 100644 (file)
--- a/doc/artesanal.txt
+++ b/doc/artesanal.txt
@@ -1,4 +1,4 @@
-*artesanal.txt*       For Vim version 8.2       Last change: 2021 May 31
+*artesanal.txt*       For Vim version 8.0       Last change: 2021 Jul 31
 
 
                 Artesanal color scheme    by Stefan Wimmer <wimstefan@gmail.com>

diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index 2fe7cf0fed5ed36c9f33dd4e1618822609b85959..7823b86ac20f6db48a4b0874bc113203e6a9ac2d 100644 (file)
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -54,16 +54,26 @@
 #endif
 #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
   ; transparent background
+  LineNr                           bg2          none
   CursorLineNr                     yellow       none
   FoldColumn                       darkgray     none
-  SignColumn                       fg2          none
+  SignColumn                       none         none
   VertSplit                        bg3          none
+  Pmenu                            fg1          none
+  PmenuSbar                        fg2          none
+  PmenuSel                         fg2          none        reverse
+  PmenuThumb                       none         fg2
 #else
   ; opaque background
+  LineNr                           bg2          bg1
   CursorLineNr                     yellow       bg1
   FoldColumn                       darkgray     bg1
-  SignColumn                       fg2          bg1
+  SignColumn                       none          bg1
   VertSplit                        bg3          bg0
+  Pmenu                            fg1          bg2
+  PmenuSbar                        none         bg2
+  PmenuSel                         bg1          fg2        bold
+  PmenuThumb                       none         bg4
 #endif
 
 ; Group                          Fg           Bg         Attributes
@@ -81,14 +91,8 @@ EndOfBuffer                      bg0          none
 ErrorMsg                      -> Error
 Folded                           bg3          bg1        g=italic
 IncSearch                        yellow       black      reverse
-LineNr                           bg3          bg1
-SignColumn                       none         bg1
 MatchParen                       none         bg2        bold
 NonText                          bg4          none
-Pmenu                            fg1          bg2
-PmenuSbar                        none         bg2
-PmenuSel                         bg1          fg2        bold
-PmenuThumb                       none         bg4
 Question                         darkyellow   none
 QuickFixLine                  -> Search
 Search                           brightyellow black      reverse
@@ -156,16 +160,24 @@ InsertMode                       blue         bg0        reverse
 ReplaceMode                      cyan         bg0        reverse
 VisualMode                       yellow       bg0        reverse
 CommandMode                      magenta      bg0        reverse
-Warnings                         yellow       bg0        reverse
+Warnings                         red          bg0        reverse
 ; }}}
 
 ; Plugin support {{{
 ; GitSigns
-GitSignsAdd                      green    bg1
+#if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
+  ; transparent background
+  GitSignsAdd                      green    none
+  GitSignsChange                   blue     none
+  GitSignsDelete                   red      none
+#else
+  ; opaque background
+  GitSignsAdd                      green    bg1
+  GitSignsChange                   blue     bg1
+  GitSignsDelete                   red      bg1
+#endif
 GitSignsAddNr                 -> GitSignsAdd
-GitSignsChange                   blue     bg1
 GitSignsChangeNr              -> GitSignsChange
-GitSignsDelete                   red      bg1
 GitSignsDeleteNr              -> GitSignsDelete
 ; }}}