branch: elpa/moe-theme
commit da3380bf1ca7cb5ff15a2e7e98866f7fc8e178c8
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
Diff & EDiff.
---
moe-dark-theme.el | 44 +++++++++++++++++++++++++++++++++++---------
moe-light-theme.el | 44 +++++++++++++++++++++++++++++++++++---------
2 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index d6c7d6428c..a699d522ef 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -372,15 +372,41 @@ Moe, moe, kyun!")
`(grep-hit-face ((,class (:foreground ,green-2))))
`(grep-match-face ((,class (:foreground nil :background nil :inherit
match))))
- ;; Ediff faces
- `(ediff-current-diff-A ((,class (:background ,black-2))))
- `(ediff-fine-diff-A ((,class (:background ,blue-3))))
- `(ediff-even-diff-A ((,class (:background ,black-4))))
- `(ediff-odd-diff-A ((,class (:background ,black-4))))
- `(ediff-current-diff-B ((,class (:background ,black-2))))
- `(ediff-fine-diff-B ((,class (:background ,magenta-3))))
- `(ediff-even-diff-B ((,class (:background ,black-4))))
- `(ediff-odd-diff-B ((,class (:background ,black-4))))
+ ;; Diff
+ `(diff-added ((,class (:foreground ,green-0 :bold t))))
+ `(diff-changed ((,class (:foreground ,yellow-2 :bold t))))
+ `(diff-context ((,class (:foreground ,black-2-5))))
+ `(diff-file-header ((,class (:foreground ,white-0 :background ,black-3
:bold t))))
+ `(diff-function ((,class (:foreground ,black-4 :background ,white-2))))
+ `(diff-header ((,class (:foreground ,black-4 :background ,white-2))))
+ `(diff-hunk-header ((,class (:foreground ,black-4 :background ,white-2))))
+ `(diff-index ((,class (:foreground ,black-4 :background ,white-3 :bold t))))
+ `(diff-indicator-added ((,class (:foreground ,green-1 :bold t))))
+ `(diff-indicator-changed ((,class (:foreground ,yellow-2 :bold t))))
+ `(diff-indicator-removed ((,class (:foreground ,red-1 :bold t))))
+ `(diff-nonexistent ((,class (:foreground ,white-0 :background ,red-3 :bold
t ))))
+ `(diff-refine-added ((,class (:foreground ,green-2))))
+ `(diff-refine-change ((,class (:foreground ,yellow-3 :bold t))))
+ `(diff-refine-removed ((,class (:foreground ,red-2 :bold t))))
+ `(diff-removed ((,class (:foreground ,red-0 :bold t))))
+
+ ;; Ediff
+ `(ediff-current-diff-A ((,class (:background ,yellow-4))))
+ `(ediff-current-diff-Ancestor ((,class (:background ,blue-3))))
+ `(ediff-current-diff-B ((,class (:background ,green-5))))
+ `(ediff-current-diff-C ((,class (:background ,orange-3))))
+ `(ediff-even-diff-A ((,class (:background ,black-3))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,black-3))))
+ `(ediff-even-diff-B ((,class (:background ,black-3))))
+ `(ediff-even-diff-C ((,class (:background ,black-3))))
+ `(ediff-fine-diff-A ((,class (:foreground ,white-0 :background ,magenta-3
:bold t))))
+ `(ediff-fine-diff-Ancestor ((,class (:foreground ,white-0 :background
,magenta-3 :bold t))))
+ `(ediff-fine-diff-B ((,class (:foreground ,white-0 :background ,magenta-3
:bold t))))
+ `(ediff-fine-diff-C ((,class (:foreground ,white-0 :background ,magenta-3
:bold t))))
+ `(ediff-odd-diff-A ((,class (:background ,black-3))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,black-3))))
+ `(ediff-odd-diff-B ((,class (:background ,black-3))))
+ `(ediff-odd-diff-C ((,class (:background ,black-3))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 69b2d9b88f..c8deca0c36 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -372,15 +372,41 @@ Moe, moe, kyun!")
`(grep-hit-face ((,class (:foreground ,green-2))))
`(grep-match-face ((,class (:foreground nil :background nil :inherit
match))))
- ;; Ediff faces
- `(ediff-current-diff-A ((,class (:background ,magenta-1))))
- `(ediff-fine-diff-A ((,class (:background ,green-1))))
- `(ediff-even-diff-A ((,class (:background ,yellow-0))))
- `(ediff-odd-diff-A ((,class (:background ,orange-0))))
- `(ediff-current-diff-B ((,class (:background ,magenta-1))))
- `(ediff-fine-diff-B ((,class (:background ,green-1))))
- `(ediff-even-diff-B ((,class (:background ,yellow-0))))
- `(ediff-odd-diff-B ((,class (:background ,orange-0))))
+ ;; Diff
+ `(diff-added ((,class (:foreground ,green-3 :bold t))))
+ `(diff-changed ((,class (:foreground ,yellow-4 :background ,yellow-0 :bold
t))))
+ `(diff-context ((,class (:foreground ,white-4))))
+ `(diff-file-header ((,class (:foreground ,black-4 :background ,white-3
:bold t))))
+ `(diff-function ((,class (:foreground ,black-2 :background ,white-2))))
+ `(diff-header ((,class (:foreground ,black-2 :background ,white-2))))
+ `(diff-hunk-header ((,class (:foreground ,black-2 :background ,white-2))))
+ `(diff-index ((,class (:foreground ,black-4 :background ,white-3 :bold t))))
+ `(diff-indicator-added ((,class (:foreground ,green-3 :bold t))))
+ `(diff-indicator-changed ((,class (:foreground ,yellow-4 :bold t))))
+ `(diff-indicator-removed ((,class (:foreground ,red-3 :bold t))))
+ `(diff-nonexistent ((,class (:foreground ,white-0 :background ,red-3 :bold
t ))))
+ `(diff-refine-added ((,class (:foreground ,green-3))))
+ `(diff-refine-change ((,class (:foreground ,yellow-4 :background ,yellow-0
:bold t))))
+ `(diff-refine-removed ((,class (:foreground ,red-3 :bold t))))
+ `(diff-removed ((,class (:foreground ,red-3 :bold t))))
+
+ ;; Ediff
+ `(ediff-current-diff-A ((,class (:background ,yellow-0))))
+ `(ediff-current-diff-Ancestor ((,class (:background ,blue-0))))
+ `(ediff-current-diff-B ((,class (:background ,green-00))))
+ `(ediff-current-diff-C ((,class (:background ,orange-00))))
+ `(ediff-even-diff-A ((,class (:background ,white-3))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,white-3))))
+ `(ediff-even-diff-B ((,class (:background ,white-3))))
+ `(ediff-even-diff-C ((,class (:background ,white-3))))
+ `(ediff-fine-diff-A ((,class (:foreground ,white-0 :background ,magenta-2
:bold t))))
+ `(ediff-fine-diff-Ancestor ((,class (:foreground ,white-0 :background
,magenta-2 :bold t))))
+ `(ediff-fine-diff-B ((,class (:foreground ,white-0 :background ,magenta-2
:bold t))))
+ `(ediff-fine-diff-C ((,class (:foreground ,white-0 :background ,magenta-2
:bold t))))
+ `(ediff-odd-diff-A ((,class (:background ,white-3))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,white-3))))
+ `(ediff-odd-diff-B ((,class (:background ,white-3))))
+ `(ediff-odd-diff-C ((,class (:background ,white-3))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
