branch: elpa/cyberpunk-theme
commit d2b0d65aef2fe5bac94875f001da9dcfe24235f1
Merge: 5fee81b 54e1f9c
Author: Nicholas M. Van Horn <[email protected]>
Commit: Nicholas M. Van Horn <[email protected]>
Merge pull request #23 from tee3/devel-magit-diff
Match magit-diff faces with other diff faces in cyberpunk.
---
cyberpunk-theme.el | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/cyberpunk-theme.el b/cyberpunk-theme.el
index f730b3f..878007c 100644
--- a/cyberpunk-theme.el
+++ b/cyberpunk-theme.el
@@ -419,7 +419,7 @@
`(js2-jsdoc-tag-face ((,class (:foreground ,cyberpunk-green-1))))
`(js2-jsdoc-type-face ((,class (:foreground ,cyberpunk-green+2))))
`(js2-jsdoc-value-face ((,class (:foreground ,cyberpunk-green+3))))
- `(js2-function-param-face ((,class (:foreground, cyberpunk-green+3))))
+ `(js2-function-param-face ((,class (:foreground ,cyberpunk-green+3))))
`(js2-external-variable-face ((,class (:foreground ,cyberpunk-orange))))
;; jabber-mode
@@ -456,10 +456,14 @@
:foreground ,cyberpunk-blue-6))))
`(magit-diff-lines-heading ((t (:background ,cyberpunk-blue-6
:foreground ,cyberpunk-bg+1))))
- `(magit-diff-context-highlight ((t (:background ,cyberpunk-bg+2
- :foreground ,cyberpunk-gray))))
- `(magit-diffstat-added ((t (:foreground ,cyberpunk-blue-5))))
- `(magit-diffstat-removed ((t (:foreground ,cyberpunk-magenta))))
+ `(magit-diff-added ((t (:foreground ,cyberpunk-blue-5))))
+ `(magit-diff-added-highlight ((t (:inherit magit-diff-added :weight
bold))))
+ `(magit-diff-removed ((t (:foreground ,cyberpunk-magenta))))
+ `(magit-diff-removed-highlight ((t (:inherit magit-diff-removed
:weight bold))))
+ `(magit-diff-context ((t (:foreground ,cyberpunk-gray))))
+ `(magit-diff-context-highlight ((t (:inherit magit-diff-context
:weight bold))))
+ `(magit-diffstat-added ((t (:inherit magit-diff-added))))
+ `(magit-diffstat-removed ((t (:inherit magit-diff-removed))))
;; magit popup
`(magit-popup-heading ((t (:foreground ,cyberpunk-pink-1
:weight bold))))
`(magit-popup-key ((t (:foreground ,cyberpunk-blue+1
:weight bold))))