Merge pull request #24 from ressu/fix-22

Fix colors_name to g:colors_name instead
Merge pull request #16 from lukaszklis/fixes_for_css
2025-11-08 11:03:48 -05:00 · 2015-12-07 16:17:56 +00:00 · 2015-12-07 16:17:06 +00:00 · 2015-12-07 16:14:47 +00:00 · 2015-12-07 16:12:11 +00:00 · 2015-12-05 22:44:36 +00:00
4 changed files with 264 additions and 6 deletions
--- a/.hgtags
+++ b/.hgtags
@@ -5,3 +5,4 @@
 8c3583c971acda5cb4f034dbe643e5a9315db63b v1.2.0
 4e6ee97af8b02741af86dcb2eb3f0f4dbbcc9761 v1.3.0
 5b17fcb91dd54bff3987513ece727b45105b15fc v1.4.0
+2ef3532a6301313f323067bba6b6d445d0f332c5 v1.5.0
--- a/colors/badwolf.vim
+++ b/colors/badwolf.vim
@@ -41,7 +41,7 @@ if exists("syntax_on")
    syntax reset
 endif

-let colors_name = "badwolf"
+let g:colors_name = "badwolf"

 if !exists("g:badwolf_html_link_underline") " {{{
    let g:badwolf_html_link_underline = 1
@@ -442,15 +442,22 @@ call s:HL('clojureParen0', 'lightgravel', '', 'none')

 call s:HL('clojureAnonArg', 'snow', '', 'bold')

+" }}}
+" Common Lisp {{{
+
+call s:HL('lispFunc',           'lime', '', 'none')
+call s:HL('lispVar',            'orange', '', 'bold')
+call s:HL('lispEscapeSpecial',  'orange', '', 'none')
+
 " }}}
 " CSS {{{

 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')
+    call s:HL('cssColorProp', 'taffy', '', 'none')
+    call s:HL('cssBoxProp', 'taffy', '', 'none')
+    call s:HL('cssTextProp', 'taffy', '', 'none')
+    call s:HL('cssRenderProp', 'taffy', '', 'none')
+    call s:HL('cssGeneratedContentProp', 'taffy', '', 'none')
 else
    call s:HL('cssColorProp', 'fg', '', 'none')
    call s:HL('cssBoxProp', 'fg', '', 'none')
--- a/contrib/badwolf-theme.el
+++ b/contrib/badwolf-theme.el
@@ -0,0 +1,108 @@
+(deftheme badwolf "Badwolf color Theme")
+
+(let ((class '((class color) (min-colors 89)))
+     ;;Badwolf pallete
+    (bwc-plain "#f8f6f2")
+    (bwc-snow "#ffffff")
+    (bwc-coal "#000000")
+
+    (bwc-brightgravel "#d9cec3")
+    (bwc-lightgravel "#998f84")
+    (bwc-gravel "#857f78")
+    (bwc-mediumgravel "#666462")
+    (bwc-deepgravel "#45413b")
+    (bwc-deepergravel "#35322d")
+    (bwc-darkgravel "#242321")
+    (bwc-blackgravel "#1c1b1a")
+    (bwc-blackestgravel "#141413")
+
+    (bwc-dalespale "#fade3e")
+    (bwc-dirtyblonde "#f4cf86")
+    ; (bwc-taffy "#ff2c4b")
+    (bwc-taffy "#ff0208")
+    (bwc-saltwatertaffy "#8cffba")
+    (bwc-tardis "#0a9dff")
+    (bwc-orange "#ffa724")
+    (bwc-lime "#aeee00")
+    (bwc-dress "#ff9eb8")
+    (bwc-toffee "#b88853")
+    (bwc-coffee "#c7915b")
+    (bwc-darkroast "#88633f")
+    )
+
+  ;; theme faces
+  (custom-theme-set-faces
+   'badwolf
+   `(default ((t (:inherit nil :foreground ,bwc-plain :background ,bwc-blackestgravel))))
+   `(cursor ((t (:background ,bwc-tardis))))
+   `(region ((t (:foreground nil :background ,bwc-mediumgravel ))))
+   `(fringe ((t (:background ,bwc-blackestgravel))))
+
+   `(minibuffer-prompt ((t (:foreground ,bwc-lime))))
+   `(link ((t (:foreground ,bwc-lightgravel :underline t))))
+   `(link-visited ((t (:inherit link :foreground ,bwc-orange))))
+
+   `(highlight ((t (:foreground ,bwc-coal :background ,bwc-dalespale))))
+   `(hl-line ((t (:inherit nil :background ,bwc-darkgravel))))
+
+   `(linum ((t (:foreground ,bwc-mediumgravel))))
+
+   `(isearch ((t (:foreground ,bwc-coal :background ,bwc-dalespale :weight bold))))
+   `(lazy-highlight ((t (:foreground ,bwc-coal :background, bwc-dalespale :weight bold))))
+
+   `(mode-line ((t (:box (:line-width -1 :style released-button) :foreground ,bwc-brightgravel :background ,bwc-darkgravel))))
+   `(mode-line-inactive ((t (:box (:line-width -1 :style released-button) :foreground ,bwc-snow :background ,bwc-deepgravel))))
+
+
+   `(font-lock-comment-face ((t (:foreground ,bwc-lightgravel))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,bwc-lightgravel))))
+   `(font-lock-doc-face ((t (:foreground ,bwc-snow))))
+   `(font-lock-string-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(font-lock-function-name-face ((t (:foreground ,bwc-orange))))
+   `(font-lock-variable-name-face ((t (:foreground ,bwc-dress))))
+   `(font-lock-builtin-face ((t (:foreground ,bwc-taffy :weight bold))))
+   `(font-lock-keyword-face ((t (:foreground ,bwc-taffy :weight bold))))
+   `(font-lock-type-face ((t (:foreground ,bwc-dress))))
+   `(font-lock-constant-face ((t (:foreground ,bwc-orange))))
+   `(font-lock-warning-face ((t (:foreground ,bwc-dress :weight bold))))
+
+  `(show-paren-match ((t (:background ,bwc-tardis :weight bold))))
+  `(show-paren-mismatch ((t (:background ,bwc-taffy :weight bold))))
+
+    ;; rainbow-delimiters
+   `(rainbow-delimiters-depth-1-face ((t (:foreground ,bwc-lightgravel))))
+   `(rainbow-delimiters-depth-2-face ((t (:foreground ,bwc-orange))))
+   `(rainbow-delimiters-depth-3-face ((t (:foreground ,bwc-saltwatertaffy))))
+   `(rainbow-delimiters-depth-4-face ((t (:foreground ,bwc-dress))))
+   `(rainbow-delimiters-depth-5-face ((t (:foreground ,bwc-coffee))))
+   `(rainbow-delimiters-depth-6-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(rainbow-delimiters-depth-7-face ((t (:foreground ,bwc-orange))))
+   `(rainbow-delimiters-depth-8-face ((t (:foreground ,bwc-saltwatertaffy)))
+   `(rainbow-delimiters-depth-9-face ((t (:foreground ,bwc-dress))))
+   `(rainbow-delimiters-depth-10-face ((t (:foreground ,bwc-coffee))))
+   `(rainbow-delimiters-depth-11-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(rainbow-delimiters-unmatched-face ((t (:foreground "red"))))
+
+
+
+
+   ))
+
+    (custom-set-faces
+     `(ein:cell-input-area ((t (:background ,bwc-blackestgravel :inherit nil))))
+     `(ein:cell-input-prompt ((t (:foreground ,bwc-orange :background nil :inherit nil))))
+     `(ein:cell-output-prompt ((t (:foreground ,bwc-taffy :background nil :inherit nil))))
+     '(mumamo-background-chunk-major ((((class color) (min-colors 88) (background dark)) nil)))
+
+     `(ac-candidate-face ((t (:background ,bwc-lightgravel))))
+     `(ac-selection-face ((t (:foreground ,bwc-coal :background ,bwc-orange))))
+
+      `(flymake-errline ((t (:background nil :underline ,bwc-taffy ))))
+      `(flymake-warnline ((t (:background nil :underline ,bwc-dress ))))
+     )
+
+
+    (font-lock-add-keywords 'python-mode `(("\\<\\(import\\||from\\|except\\|finally\\|try\\|from\\|\\)\\>" 1 '(:foreground ,bwc-lime ) t)))
+  )
+
+(provide-theme 'badwolf)
--- a/contrib/badwolf.dvtcolortheme
+++ b/contrib/badwolf.dvtcolortheme
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>DVTConsoleDebuggerInputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleDebuggerInputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleDebuggerOutputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleDebuggerOutputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleDebuggerPromptTextColor</key>
+	<string>0.0392157 0.615686 1 1</string>
+	<key>DVTConsoleDebuggerPromptTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleExectuableInputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleExectuableInputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleExectuableOutputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleExectuableOutputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleTextBackgroundColor</key>
+	<string>0.138326 0.138352 0.13832 1</string>
+	<key>DVTConsoleTextInsertionPointColor</key>
+	<string>0 0 0 1</string>
+	<key>DVTConsoleTextSelectionColor</key>
+	<string>0.2 0.2 0.2 1</string>
+	<key>DVTDebuggerInstructionPointerColor</key>
+	<string>0.705792 0.8 0.544 1</string>
+	<key>DVTSourceTextBackground</key>
+	<string>0.0784314 0.0784314 0.0745098 1</string>
+	<key>DVTSourceTextBlockDimBackgroundColor</key>
+	<string>0.5 0.5 0.5 1</string>
+	<key>DVTSourceTextInsertionPointColor</key>
+	<string>0.0392157 0.615686 1 1</string>
+	<key>DVTSourceTextInvisiblesColor</key>
+	<string>0.85098 0.807843 0.764706 1</string>
+	<key>DVTSourceTextSelectionColor</key>
+	<string>0.207843 0.196078 0.176471 1</string>
+	<key>DVTSourceTextSyntaxColors</key>
+	<dict>
+		<key>xcode.syntax.attribute</key>
+		<string>1 0.619608 0.721569 1</string>
+		<key>xcode.syntax.character</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.comment</key>
+		<string>0.521569 0.498039 0.470588 1</string>
+		<key>xcode.syntax.comment.doc</key>
+		<string>0.521569 0.498039 0.470588 1</string>
+		<key>xcode.syntax.comment.doc.keyword</key>
+		<string>0.521569 0.498039 0.470588 1</string>
+		<key>xcode.syntax.identifier.class</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.identifier.class.system</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.identifier.constant</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.identifier.constant.system</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.identifier.function</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.function.system</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.macro</key>
+		<string>0.682353 0.933333 0 1</string>
+		<key>xcode.syntax.identifier.macro.system</key>
+		<string>0.682353 0.933333 0 1</string>
+		<key>xcode.syntax.identifier.type</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.type.system</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.variable</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.identifier.variable.system</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.keyword</key>
+		<string>1 0.172549 0.294118 1</string>
+		<key>xcode.syntax.number</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.plain</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.preprocessor</key>
+		<string>0.682353 0.933333 0 1</string>
+		<key>xcode.syntax.string</key>
+		<string>0.956863 0.811765 0.52549 1</string>
+		<key>xcode.syntax.url</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+	</dict>
+	<key>DVTSourceTextSyntaxFonts</key>
+	<dict>
+		<key>xcode.syntax.attribute</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.character</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.comment</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.comment.doc</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.comment.doc.keyword</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.class</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.class.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.constant</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.constant.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.function</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.function.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.macro</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.macro.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.type</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.type.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.variable</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.variable.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.keyword</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.number</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.plain</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.preprocessor</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.string</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.url</key>
+		<string>Monaco - 11.0</string>
+	</dict>
+</dict>
+</plist>
Author	SHA1	Message	Date
Steve Losh	8bb978cdce	Merge pull request #24 from ressu/fix-22 Fix colors_name to g:colors_name instead	2015-12-07 16:17:56 +00:00
Steve Losh	ae7ec52358	Merge pull request #16 from lukaszklis/fixes_for_css Changed the color of highlighted props in CSS	2015-12-07 16:17:06 +00:00
Steve Losh	2ccc47fe94	Merge.	2015-12-07 16:14:47 +00:00
Steve Losh	d6f5f55525	Merge.	2015-12-07 16:12:11 +00:00
Steve Losh	c54212897d	Update Lisp highlighting	2015-12-05 22:44:36 +00:00
Sami Haahtinen	29558a0eff	Fix color_name to g:color_name instead This causes vim to properly reload the correct theme when needed. Fixes issue #22	2015-11-15 09:51:00 +02:00
Łukasz Kliś	398cc9a63f	Changed the color of highlighted props in CSS	2014-05-27 09:56:24 +02:00
Denis Ciccale	8653875764	Initial Xcode port.	2013-09-04 16:03:47 +02:00
Steve Losh	e6fdf1844a	Added tag v1.5.0 for changeset 2ef3532a6301	2013-07-19 20:55:06 -04:00
locojay	8959ff56fb	more orange for cmd mode	2013-07-15 09:11:21 -04:00
locojaydev	d7671e52d8	flymake, autocomplete colors	2012-10-29 22:40:05 -04:00
locojaydev	b13530ddcb	adding python lime colors for import try catch ... ipython notebook colors	2012-10-28 14:51:26 -04:00
locojaydev	44b9e784f8	adding emacs theme	2012-10-16 18:17:19 -04:00