# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1338671545 14400
# Node ID 383c5a5e05232def8540aab9342527adc01fcfb8
# Parent  41b595a4a40f79440971c7bb3ec24e5a41b58ad7# Parent  2090ae1db328e8213eb567f3defc56682f1998bf
Merge.

diff -r 41b595a4a40f -r 383c5a5e0523 README.markdown
--- a/README.markdown	Fri Jun 01 10:37:52 2012 -0400
+++ b/README.markdown	Sat Jun 02 17:12:25 2012 -0400
@@ -49,6 +49,15 @@
 
 Default: `1` (on)
 
+### g:badwolf\_css\_props\_highlight
+
+Determines whether CSS properties should be highlighted.
+
+    " Turn on CSS properties highlighting
+    let g:badwolf_css_props_highlight = 1
+
+Default: `0` (off)
+
 Contributing
 ------------
 
diff -r 41b595a4a40f -r 383c5a5e0523 colors/badwolf.vim
--- a/colors/badwolf.vim	Fri Jun 01 10:37:52 2012 -0400
+++ b/colors/badwolf.vim	Sat Jun 02 17:12:25 2012 -0400
@@ -47,6 +47,10 @@
     let g:badwolf_html_link_underline = 1
 endif " }}}
 
+if !exists("g:badwolf_css_props_highlight") " {{{
+    let g:badwolf_css_props_highlight = 0
+endif " }}}
+
 " }}}
 " Palette {{{
 
@@ -397,11 +401,19 @@
 " }}}
 " CSS {{{
 
-call s:HL('cssColorProp', 'fg', '', 'none')
-call s:HL('cssBoxProp', 'fg', '', 'none')
-call s:HL('cssTextProp', 'fg', '', 'none')
-call s:HL('cssRenderProp', 'fg', '', 'none')
-call s:HL('cssGeneratedContentProp', 'fg', '', 'none')
+if g:badwolf_css_props_highlight
+    call s:HL('cssColorProp', 'dirtyblonde', '', 'none')
+    call s:HL('cssBoxProp', 'dirtyblonde', '', 'none')
+    call s:HL('cssTextProp', 'dirtyblonde', '', 'none')
+    call s:HL('cssRenderProp', 'dirtyblonde', '', 'none')
+    call s:HL('cssGeneratedContentProp', 'dirtyblonde', '', 'none')
+else
+    call s:HL('cssColorProp', 'fg', '', 'none')
+    call s:HL('cssBoxProp', 'fg', '', 'none')
+    call s:HL('cssTextProp', 'fg', '', 'none')
+    call s:HL('cssRenderProp', 'fg', '', 'none')
+    call s:HL('cssGeneratedContentProp', 'fg', '', 'none')
+end
 
 call s:HL('cssValueLength', 'toffee', '', 'bold')
 call s:HL('cssColor', 'toffee', '', 'bold')