Merge e586974ff0 into 15b37caad7

README.markdown

@@ -50,6 +50,26 @@ darker than the normal background, or the same.
 
 Default: `0` (off, gutters are the same as the background)
 
+### g:badwolf\_folded
+
+Determines how light to render the background of folded linese.
+
+Can be set to `0`, `1`, `2`, or `3`.
+
+    " Make folded lines darker than the background.
+    let g:badwolf_folded = 0
+
+    " Make folded lines the same color as the background.
+    let g:badwolf_folded = 1
+
+    " Make folded lines lighter than the background.
+    let g:badwolf_folded = 2
+
+    " Make folded lines much lighter than the background.
+    let g:badwolf_folded = 3
+
+Default: `1` (same color as the background)
+
 ### g:badwolf\_tabline
 
 Determines how light to render the background of the tab line (the line at the

colors/badwolf.vim

@@ -35,7 +35,6 @@ if !has("gui_running") && &t_Co != 88 && &t_Co != 256
     finish
 endif
 
-highlight clear
 set background=dark
 
 if exists("syntax_on")
@@ -161,6 +160,22 @@ else
     let s:gutter = 'blackgravel'
 endif
 
+if exists('g:badwolf_folded')
+    if g:badwolf_folded == 0
+        let s:folded = 'blackestgravel'
+    elseif  g:badwolf_folded == 1
+        let s:folded = 'blackgravel'
+    elseif  g:badwolf_folded == 2
+        let s:folded = 'darkgravel'
+    elseif  g:badwolf_folded == 3
+        let s:folded = 'deepgravel'
+    else
+        let s:folded = 'blackestgravel'
+    endif
+else
+    let s:folded = 'blackgravel'
+endif
+
 if exists('g:badwolf_tabline')
     if g:badwolf_tabline == 0
         let s:tabline = 'blackestgravel'
@@ -186,7 +201,7 @@ endif
 
 call s:HL('Normal', 'plain', 'blackgravel')
 
-call s:HL('Folded', 'mediumgravel', 'bg', 'none')
+call s:HL('Folded', 'mediumgravel', s:folded, 'none')
 
 call s:HL('VertSplit', 'lightgravel', 'bg', 'none')
 

colors/goodwolf.vim

@@ -19,7 +19,6 @@ if !has("gui_running") && &t_Co != 88 && &t_Co != 256
     finish
 endif
 
-highlight clear
 set background=dark
 
 if exists("syntax_on")
@@ -140,6 +139,22 @@ else
     let s:gutter = 'blackgravel'
 endif
 
+if exists('g:badwolf_folded')
+    if g:badwolf_folded == 0
+        let s:folded = 'blackestgravel'
+    elseif  g:badwolf_folded == 1
+        let s:folded = 'blackgravel'
+    elseif  g:badwolf_folded == 2
+        let s:folded = 'darkgravel'
+    elseif  g:badwolf_folded == 3
+        let s:folded = 'deepgravel'
+    else
+        let s:folded = 'blackestgravel'
+    endif
+else
+    let s:folded = 'blackgravel'
+endif
+
 if exists('g:badwolf_tabline')
     if g:badwolf_tabline == 0
         let s:tabline = 'blackestgravel'
@@ -166,7 +181,7 @@ endif
 " call GoodWolfHL('Normal', 'plain', 'blackgravel')
 call GoodWolfHL('Normal', 'plain', 'blackestgravel')
 
-call GoodWolfHL('Folded', 'mediumgravel', 'bg', 'none')
+call GoodWolfHL('Folded', 'mediumgravel', s:folded, 'none')
 
 call GoodWolfHL('VertSplit', 'lightgravel', 'bg', 'none')
 
@@ -438,21 +453,6 @@ else
     call GoodWolfHL('htmlLink', 'lightgravel', '', 'none')
 endif
 
-" }}}
-" HTML/Django {{{
-
-call GoodWolfHL('djangoTagBlock',  'coffee', 'bg', 'bold')
-call GoodWolfHL('djangoStatement', 'orange', 'bg', 'none')
-call GoodWolfHL('djangoArgument',  'dress', 'bg', 'none')
-call GoodWolfHL('djangoVarBlock',  'lime', 'bg', 'none')
-
-" }}}
-" HTML/TEN {{{
-
-call GoodWolfHL('tenTagBlock',  'orange', 'bg', 'bold')
-call GoodWolfHL('tenArgument',  'lime', 'bg', 'none')
-call GoodWolfHL('tenVarBlock',  'dress', 'bg', 'none')
-
 " }}}
 " Java {{{
 
@@ -579,13 +579,6 @@ call GoodWolfHL('scalaParamAnnotationValue', 'gravel', '', 'bold')
 call GoodWolfHL('scalaCommentAnnotation', 'gravel', '', 'bold')
 call GoodWolfHL('scalaDocLinks', 'gravel', '', 'bold')
 
-" }}}
-" Singularity {{{
-
-call GoodWolfHL('singularitySectionLine', 'taffy', '', 'bold')
-call GoodWolfHL('singularitySection', 'taffy', '', 'bold')
-call GoodWolfHL('singularityKeyword', 'dress', '', '')
-
 " }}}
 " Vim {{{