solarized-emacs

commit 86dfe1b4f6c1ba8b5e178a5c8bbaae657fcd7728
parent 19b30b0c30c4eebdc33b9c9f1a01548be966ab02
Author: Thomas Frössman <thomasf@jossystem.se>
Date:   Wed, 16 Oct 2013 12:12:12 +0200

add all current web-mode faces

+ small adjustments

Diffstat:
M
solarized.el
 | 
35
++++++++++++++++++++++++++---------

1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/solarized.el b/solarized.el
@@ -1309,12 +1309,10 @@ customize the resulting theme."
      `(web-mode-comment-face ((,class (:foreground ,solarized-comments))))
      `(web-mode-constant-face ((,class (:foreground ,blue :weight bold))))
      `(web-mode-current-element-highlight-face ((,class
-                                                 (:underline nil :weight normal
+                                                 (:underline unspecified :weight unspecified
                                                              :background ,solarized-hl))))
      `(web-mode-css-at-rule-face ((,class (:foreground ,violet :slant italic))))
-     `(web-mode-css-prop-face ((,class (:foreground ,violet))))
      `(web-mode-css-pseudo-class-face ((,class (:foreground ,green :slant italic))))
-     `(web-mode-css-rule-face ((,class (:foreground ,blue))))
      `(web-mode-doctype-face ((,class (:foreground ,solarized-comments
                                                    :slant italic :weight bold))))
      `(web-mode-folded-face ((,class (:underline t))))
@@ -1322,16 +1320,35 @@ customize the resulting theme."
      `(web-mode-html-attr-name-face ((,class (:foreground ,blue :slant normal))))
      `(web-mode-html-attr-value-face ((,class (:foreground ,cyan :slant italic))))
      `(web-mode-html-tag-face ((,class (:foreground ,green))))
-     `(web-mode-keyword-face ((,class (:foreground ,yellow :weight bold))))
-     `(web-mode-preprocessor-face ((,class (:foreground ,yellow  :slant italic :weight bold))))
+     `(web-mode-keyword-face ((,class (:foreground ,yellow :weight normal))))
+     `(web-mode-preprocessor-face ((,class (:foreground ,yellow :slant normal :weight unspecified))))
      `(web-mode-string-face ((,class (:foreground ,cyan))))
      `(web-mode-type-face ((,class (:foreground ,yellow))))
      `(web-mode-variable-name-face ((,class (:foreground ,blue))))
-     `(web-mode-server-background-face ((,class (:background ,solarized-bg))))
-     `(web-mode-server-comment-face ((,class (:inherit web-mode-comment-face))))
-     `(web-mode-server-string-face ((,class (:inherit web-mode-string-face))))
      `(web-mode-warning-face ((,class (:inherit font-lock-warning-face))))
-     `(web-mode-whitespaces-face ((,class (:background ,red))))
+     `(web-mode-block-attr-name-face ((,class (:inherit web-mode-html-attr-name-face))))
+     `(web-mode-block-attr-value-face ((,class (:inherit web-mode-html-attr-value-face))))
+     `(web-mode-block-comment-face ((,class (:inherit web-mode-comment-face))))
+     `(web-mode-block-control-face ((,class (:inherit font-lock-preprocessor-face))))
+     `(web-mode-block-face ((,class (:background unspecified))))
+     `(web-mode-block-string-face ((,class (:inherit web-mode-string-face))))
+     `(web-mode-comment-keyword-face ((,class (:box 1 :weight bold))))
+     `(web-mode-css-color-face ((,class (:inherit font-lock-builtin-face))))
+     `(web-mode-css-function-face ((,class (:inherit font-lock-builtin-face))))
+     `(web-mode-css-priority-face ((,class (:inherit font-lock-builtin-face))))
+     `(web-mode-css-property-name-face ((,class (:inherit font-lock-variable-name-face))))
+     `(web-mode-css-selector-face ((,class (:inherit font-lock-keyword-face))))
+     `(web-mode-css-string-face ((,class (:inherit web-mode-string-face))))
+     `(web-mode-javascript-string-face ((,class (:inherit web-mode-string-face))))
+     `(web-mode-json-context-face ((,class (:foreground ,violet))))
+     `(web-mode-json-key-face ((,class (:foreground ,violet))))
+     `(web-mode-json-string-face ((,class (:inherit web-mode-string-face))))
+     `(web-mode-param-name-face ((,class (:foreground ,solarized-fg))))
+     `(web-mode-part-comment-face ((,class (:inherit web-mode-comment-face))))
+     `(web-mode-part-face ((,class (:inherit web-mode-block-face))))
+     `(web-mode-part-string-face ((,class (:inherit web-mode-string-face))))
+     `(web-mode-symbol-face ((,class (:foreground ,yellow))))
+     `(web-mode-whitespace-face ((,class (:background ,red))))
 
      ;; whitespace-mode
      `(whitespace-space ((,class (:background unspecified :foreground ,solarized-comments