# HG changeset patch # User Steve Losh # Date 1329076989 18000 # Node ID 621c2b1cd1820ede93da83090ef4240ced361000 # Parent 92bdf13d9fbab30e98ddc71dac82c92027e41c7c Prepare for release. diff -r 92bdf13d9fba -r 621c2b1cd182 README.markdown --- a/README.markdown Sat Feb 04 15:28:12 2012 -0500 +++ b/README.markdown Sun Feb 12 15:03:09 2012 -0500 @@ -1,1 +1,44 @@ -A colorscheme for Vim. +Bad Wolf +======== + +A color scheme for Vim, pieced together by [Steve Losh](http://stevelosh.com/). + +There's still quite a lot of room for improvement (particularly in HTML) so feel +free to send me ideas through the [issue tracker][] or pull requests. + +**If you're going to send a pull request that you want me to merge, please post +a comment in it with before/after screenshots!** + +[issue tracker]: http://github.com/sjl/badwolf/issues + +Screenshots +----------- + +These screenshots may be out of date, but they'll at least give you a taste of +what you're in for. + +### Python + +![Screenshot](http://i.imgur.com/fQGGC.png) + +### HTML (Django Templates) + +![Screenshot](http://i.imgur.com/LgLar.png) + +### Clojure + +![Screenshot](http://i.imgur.com/THHz7.png) + +### Markdown + +![Screenshot](http://i.imgur.com/J56VS.png) + + +Contributing +------------ + +I'd love pull requests, but won't necessarily merge all of them. Color schemes +are a very subjective topic -- we don't all have the same taste. + +**If you're going to send a pull request that you want me to merge, please post +a comment in it with before/after screenshots!** diff -r 92bdf13d9fba -r 621c2b1cd182 colors/badwolf.vim --- a/colors/badwolf.vim Sat Feb 04 15:28:12 2012 -0500 +++ b/colors/badwolf.vim Sun Feb 12 15:03:09 2012 -0500 @@ -29,13 +29,10 @@ " }}} " Supporting code ------------------------------------------------------------- - " Preamble {{{ set background=dark -" hi clear - if exists("syntax_on") syntax reset endif @@ -56,14 +53,15 @@ let s:bwc.coal = ['000000', 0] " All of the Gravel colors are based on a brown from Clouds Midnight. -let s:bwc.brightgravel = ['d9cec3', 252] -let s:bwc.lightgravel = ['998f84', 245] -let s:bwc.gravel = ['857f78', 243] -let s:bwc.mediumgravel = ['666462', 241] -let s:bwc.deepgravel = ['45413b', 238] -let s:bwc.deepergravel = ['35322d', 236] -let s:bwc.darkgravel = ['242321', 235] -let s:bwc.blackgravel = ['1c1b1a', 233] +let s:bwc.brightgravel = ['d9cec3', 252] +let s:bwc.lightgravel = ['998f84', 245] +let s:bwc.gravel = ['857f78', 243] +let s:bwc.mediumgravel = ['666462', 241] +let s:bwc.deepgravel = ['45413b', 238] +let s:bwc.deepergravel = ['35322d', 236] +let s:bwc.darkgravel = ['242321', 235] +let s:bwc.blackgravel = ['1c1b1a', 233] +let s:bwc.blackestgravel = ['141413', 232] " A color sampled from a highlight in a photo of a glass of Dale's Pale Ale on " my desk. @@ -81,16 +79,18 @@ " This one's from Mustang, not Florida! let s:bwc.orange = ['ffa724', 214] -" A limier version of Mustang's horsefood, to ward off scurvy. -" It actually turned out pretty close to Molokai's green. Huh. -let s:bwc.lime = ['a1e022', 148] +" A limier green from Getafe. +let s:bwc.lime = ['aeee00', 148] " Rose's dress in The Idiot's Lantern. -let s:bwc.dress = ['ff99b3', 211] +let s:bwc.dress = ['ff9eb8', 211] -" Saturated gravel (originally from Clouds Midnight). -let s:bwc.mud = ['ff6b40', 203] -let s:bwc.mud = ['b88853', 137] +" Another play on the brown from Clouds Midnight. I love that color. +let s:bwc.toffee = ['b88853', 137] + +" Also based on that Clouds Midnight brown. +let s:bwc.coffee = ['c7915b', 173] +let s:bwc.darkroast = ['88633f', 95] " }}} " Highlighting Function {{{ @@ -131,16 +131,23 @@ execute histring endfunction " }}} +" Configuration Options {{{ + +if exists('g:badwolf_darkgutter') && g:badwolf_darkgutter + let s:gutter = 'blackestgravel' +else + let s:gutter = 'blackgravel' +endif + +" }}} " Actual colorscheme ---------------------------------------------------------- - " Vanilla Vim {{{ " General/UI {{{ call HL('Normal', 'plain', 'blackgravel') -call HL('LineNr', 'mediumgravel', 'bg') call HL('Folded', 'mediumgravel', 'bg', 'none') call HL('VertSplit', 'lightgravel', 'bg', 'none') @@ -149,7 +156,7 @@ call HL('CursorColumn', '', 'darkgravel') call HL('ColorColumn', '', 'darkgravel') -call HL('MatchParen', 'dalespale', 'bg', 'bold') +call HL('MatchParen', 'dalespale', 'darkgravel', 'bold') call HL('NonText', 'deepgravel', 'bg') call HL('SpecialKey', 'deepgravel', 'bg') @@ -160,9 +167,6 @@ call HL('Search', 'coal', 'dalespale', 'bold') call HL('IncSearch', 'coal', 'tardis', 'bold') -call HL('SignColumn', '', 'blackgravel') -call HL('FoldColumn', 'mediumgravel', 'blackgravel') - call HL('Underlined', 'fg', '', 'underline') call HL('StatusLine', 'coal', 'tardis', 'bold') @@ -185,6 +189,13 @@ " hi WildMenu guifg=#66D9EF guibg=#000000 " }}} +" Gutter {{{ + +call HL('LineNr', 'mediumgravel', s:gutter) +call HL('SignColumn', '', s:gutter) +call HL('FoldColumn', 'mediumgravel', s:gutter) + +" }}} " Cursor {{{ call HL('Cursor', 'coal', 'tardis', 'bold') @@ -230,12 +241,12 @@ " Constants of all kinds are colored together. " I'm not really happy with the color yet... -call HL('Constant', 'mud', '', 'bold') -call HL('Character', 'mud', '', 'bold') -call HL('Boolean', 'mud', '', 'bold') +call HL('Constant', 'toffee', '', 'bold') +call HL('Character', 'toffee', '', 'bold') +call HL('Boolean', 'toffee', '', 'bold') -call HL('Number', 'mud', '', 'bold') -call HL('Float', 'mud', '', 'bold') +call HL('Number', 'toffee', '', 'bold') +call HL('Float', 'toffee', '', 'bold') " Not sure what 'special character in a constant' means, but let's make it pop. call HL('SpecialChar', 'dress', '', 'bold') @@ -264,8 +275,8 @@ " }}} " Diffs {{{ -call HL('DiffDelete', 'coal', 'dress') -call HL('DiffAdd', 'coal', 'lime') +call HL('DiffDelete', 'coal', 'coal') +call HL('DiffAdd', '', 'deepergravel') call HL('DiffChange', '', 'darkgravel') call HL('DiffText', 'snow', 'deepergravel', 'bold') @@ -319,11 +330,12 @@ " Clojure {{{ -call HL('clojureSpecial', 'taffy', '', '') -call HL('clojureDefn', 'taffy', '', '') -call HL('clojureDefine', 'taffy', '', '') -call HL('clojureMacro', 'taffy', '', '') -call HL('clojureCond', 'taffy', '', '') +call HL('clojureSpecial', 'taffy', '', '') +call HL('clojureDefn', 'taffy', '', '') +call HL('clojureDefMacro', 'taffy', '', '') +call HL('clojureDefine', 'taffy', '', '') +call HL('clojureMacro', 'taffy', '', '') +call HL('clojureCond', 'taffy', '', '') call HL('clojureKeyword', 'orange', '', 'none') @@ -343,8 +355,8 @@ call HL('cssRenderProp', 'fg', '', 'none') call HL('cssGeneratedContentProp', 'fg', '', 'none') -call HL('cssValueLength', 'mud', '', 'bold') -call HL('cssColor', 'mud', '', 'bold') +call HL('cssValueLength', 'toffee', '', 'bold') +call HL('cssColor', 'toffee', '', 'bold') call HL('cssBraces', 'lightgravel', '', 'none') call HL('cssIdentifier', 'orange', '', 'bold') call HL('cssClassName', 'orange', '', 'none') @@ -353,19 +365,27 @@ " Django Templates {{{ call HL('djangoArgument', 'dirtyblonde', '',) -call HL('djangoTagBlock', 'lime', '') +call HL('djangoTagBlock', 'orange', '') +call HL('djangoVarBlock', 'orange', '') " hi djangoStatement guifg=#ff3853 gui=bold " hi djangoVarBlock guifg=#f4cf86 " }}} " HTML {{{ -call HL('htmlTagName', 'taffy', '', 'bold') +" Punctuation +call HL('htmlTag', 'darkroast', 'bg', 'none') +call HL('htmlEndTag', 'darkroast', 'bg', 'none') + +" Tag names +call HL('htmlTagName', 'coffee', '', 'bold') +call HL('htmlSpecialTagName', 'coffee', '', 'bold') + +" Attributes +call HL('htmlArg', 'coffee', '', 'none') + +" Stuff inside an tag call HL('htmlLink', 'lightgravel', '', 'underline') -" hi htmlTag guifg=#947b5b -" hi htmlTagName guifg=#ff3853 gui=bold -" hi htmlArg guifg=#c0a7c7 -" hi htmlString guifg=#e6db74 " }}} " Java {{{ @@ -388,7 +408,7 @@ call HL('mailHeader', 'lightgravel', '', '') call HL('mailHeaderKey', 'lightgravel', '', '') call HL('mailHeaderEmail', 'snow', '', '') -call HL('mailURL', 'mud', '', 'underline') +call HL('mailURL', 'toffee', '', 'underline') call HL('mailSignature', 'gravel', '', 'none') call HL('mailQuoted1', 'gravel', '', 'none') @@ -410,10 +430,10 @@ call HL('markdownH4', 'lime', '', 'none') call HL('markdownH5', 'lime', '', 'none') call HL('markdownH6', 'lime', '', 'none') -call HL('markdownLinkText', 'mud', '', 'underline') -call HL('markdownIdDeclaration', 'mud') -call HL('markdownAutomaticLink', 'mud', '', 'bold') -call HL('markdownUrl', 'mud', '', 'bold') +call HL('markdownLinkText', 'toffee', '', 'underline') +call HL('markdownIdDeclaration', 'toffee') +call HL('markdownAutomaticLink', 'toffee', '', 'bold') +call HL('markdownUrl', 'toffee', '', 'bold') call HL('markdownUrldelimiter', 'lightgravel', '', 'bold') call HL('markdownLinkDelimiter', 'lightgravel', '', 'bold') call HL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold') @@ -429,6 +449,7 @@ call HL('pythonEscape', 'dress') call HL('pythonException', 'lime', '', 'bold') call HL('pythonExceptions', 'lime', '', 'none') +call HL('pythonDecorator', 'taffy', '', 'none') " }}} " Vim {{{