solarized-emacs

commit 7c91f489cf00db39ea1977a0572e2293569b769b
parent 1a46af3ff988e656a12b93c503fff87324b7420b
Author: Jonas Bernoulli <jonas@bernoul.li>
Date:   Sun,  6 May 2018 13:04:53 +0200

Adjust magit-blame faces to recent upstream changes

The hash/name/date/summary faces no longer inherit from
`magit-blame-heading'.  Instead they are combined with that or another
face like `:face (list BG-FACE %-FACE)' or in some cases they are not
combined with another face.

The heading face should only set the background and the
heading and the new `magit-blame-margin' should inherit from that.

It isn't necessary to theme that or the also new `magit-blame-dimmed'
here because these faces (and `magit-blame-heading') now `:weight
normal :normal' by default.

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

1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/solarized.el b/solarized.el
@@ -1418,20 +1418,17 @@ customize the resulting theme."
      `(magit-bisect-skip ((t (:foreground ,yellow))))
      `(magit-bisect-bad  ((t (:foreground ,red))))
 ;;;;;; blame
-     `(magit-blame-heading ((t (:background ,base02 :foreground ,violet
-                                            :weight bold :slant normal :box (:color ,base02 :line-width 2)))))
-     `(magit-blame-hash    ((t (:background ,base02 :foreground ,violet
-                                            :weight normal :slant normal :box (:color ,base02 :line-width 2)))))
-     `(magit-blame-name    ((t (:background ,base02 :foreground ,violet
-                                            :weight normal :slant normal :box (:color ,base02 :line-width 2)))))
-     `(magit-blame-date    ((t (:background ,base02 :foreground ,violet
-                                            :weight bold :slant normal :box (:color ,base02 :line-width 2)))))
-     `(magit-blame-summary ((t (:background ,base02 :foreground ,base0
-                                            :weight bold :slant normal :box (:color ,base02 :line-width 2)))))
+     `(magit-blame-highlight ((t (:background ,base02))))
+     `(magit-blame-heading   ((t (:inherit magit-blame-highlight
+                                           :box (:color ,base02 :line-width 2)))))
+     `(magit-blame-summary   ((t (:foreground ,base0))))
+     `(magit-blame-hash      ((t (:foreground ,violet))))
+     `(magit-blame-name      ((t (:foreground ,violet))))
+     `(magit-blame-date      ((t (:foreground ,violet))))
 ;;;;;; references etc.
      `(magit-dimmed         ((t (:foreground ,base01))))
      `(magit-hash           ((t (:foreground ,base01))))
-     `(magit-tag            ((t (:foreground ,cyan :weight bold))))
+     `(magit-tag            ((t (:foreground ,cyan   :weight bold))))
      `(magit-branch-remote  ((t (:foreground ,green  :weight bold))))
      `(magit-branch-local   ((t (:foreground ,blue   :weight bold))))
      `(magit-branch-current ((t (:foreground ,blue   :weight bold :box t))))