branch: elpa/moe-theme
commit 2a8c15b9eef84d51c1e5f8be21e1ef0ee75cae72
Author: ono hiroko <[email protected]>
Commit: ono hiroko <[email protected]>
I'm so sorry for my disastrous Ediff faces...
This is my first time to use ediff, any finally know how to make
resonable faces for it.
---
moe-dark-theme.el | 36 ++++++++++++++++++++----------------
moe-light-theme.el | 36 ++++++++++++++++++++----------------
2 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 2feee41561..097f217911 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -579,22 +579,26 @@ Moe, moe, kyun!")
`(diff-removed ((,class (:foreground ,red-0 :background ,black-4 :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 ,purple-4))))
- `(ediff-current-diff-C ((,class (:background ,orange-5))))
- `(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 nil :background ,green-5 :bold
t))))
- `(ediff-fine-diff-Ancestor ((,class (:foreground nil :background ,green-5
:bold t))))
- `(ediff-fine-diff-B ((,class (:foreground nil :background ,green-5 :bold
t))))
- `(ediff-fine-diff-C ((,class (:foreground nil :background ,green-5 :bold
t))))
- `(ediff-odd-diff-A ((,class (:background ,red-3))))
- `(ediff-odd-diff-Ancestor ((,class (:background ,red-3))))
- `(ediff-odd-diff-B ((,class (:background ,red-3))))
- `(ediff-odd-diff-C ((,class (:background ,red-3))))
+ ;; `current': Face for highlighting the selected difference in buffer A/B/C
+ ;; `fine': Face for highlighting the refinement of the selected diff in
buffer A/B/C.
+ ;; `even': Face for highlighting even-numbered non-current differences
in buffer A/B/C
+ ;; `odd': Face for highlighting odd-numbered non-current differences in
buffer A/B/C.
+ `(ediff-current-diff-A ((,class (:background ,green-5 :foreground
,white-1))))
+ `(ediff-current-diff-Ancestor ((,class (:background ,green-5 :foreground
,white-1))))
+ `(ediff-current-diff-B ((,class (:background ,green-5 :foreground
,white-1))))
+ `(ediff-current-diff-C ((,class (:background ,green-5 :foreground
,white-1))))
+ `(ediff-fine-diff-A ((,class (:background ,green-4 :foreground
,white-0 :bold t ))))
+ `(ediff-fine-diff-Ancestor ((,class (:background ,green-4 :foreground
,white-0 :bold t ))))
+ `(ediff-fine-diff-B ((,class (:background ,green-4 :foreground
,white-0 :bold t ))))
+ `(ediff-fine-diff-C ((,class (:background ,green-4 :foreground
,white-0 :bold t ))))
+ `(ediff-even-diff-A ((,class (:background ,black-3 :foreground
,black-1))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,black-3 :foreground
,black-1))))
+ `(ediff-even-diff-B ((,class (:background ,black-3 :foreground
,black-1))))
+ `(ediff-even-diff-C ((,class (:background ,black-3 :foreground
,black-1))))
+ `(ediff-odd-diff-A ((,class (:background ,black-3 :foreground
,black-1))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,black-3 :foreground
,black-1))))
+ `(ediff-odd-diff-B ((,class (:background ,black-3 :foreground
,black-1))))
+ `(ediff-odd-diff-C ((,class (:background ,black-3 :foreground
,black-1))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index ed1af61ea2..be5c01c389 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -578,22 +578,26 @@ Moe, moe, kyun!")
`(diff-removed ((,class (:foreground ,red-3 :background ,red-00 :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 nil :background ,green-00 :bold
t))))
- `(ediff-fine-diff-Ancestor ((,class (:foreground nil :background ,green-00
:bold t))))
- `(ediff-fine-diff-B ((,class (:foreground nil :background ,green-00 :bold
t))))
- `(ediff-fine-diff-C ((,class (:foreground nil :background ,green-00 :bold
t))))
- `(ediff-odd-diff-A ((,class (:background ,red-00 :bold t))))
- `(ediff-odd-diff-Ancestor ((,class (:background ,red-00 :bold t))))
- `(ediff-odd-diff-B ((,class (:background ,red-00 :bold t))))
- `(ediff-odd-diff-C ((,class (:background ,red-00 :bold t))))
+ ;; `current': Face for highlighting the selected difference in buffer A/B/C
+ ;; `fine': Face for highlighting the refinement of the selected diff in
buffer A/B/C.
+ ;; `even': Face for highlighting even-numbered non-current differences
in buffer A/B/C
+ ;; `odd': Face for highlighting odd-numbered non-current differences in
buffer A/B/C.
+ `(ediff-current-diff-A ((,class (:background ,green-00 :foreground
,black-5))))
+ `(ediff-current-diff-Ancestor ((,class (:background ,green-00 :foreground
,black-5))))
+ `(ediff-current-diff-B ((,class (:background ,green-00 :foreground
,black-5))))
+ `(ediff-current-diff-C ((,class (:background ,green-00 :foreground
,black-5))))
+ `(ediff-fine-diff-A ((,class (:background ,green-0 :foreground
,green-5 :bold t))))
+ `(ediff-fine-diff-Ancestor ((,class (:background ,green-0 :foreground
,green-5 :bold t))))
+ `(ediff-fine-diff-B ((,class (:background ,green-0 :foreground
,green-5 :bold t))))
+ `(ediff-fine-diff-C ((,class (:background ,green-0 :foreground
,green-5 :bold t))))
+ `(ediff-even-diff-A ((,class (:background ,white-2 :foreground
,black-2))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,white-2 :foreground
,black-2))))
+ `(ediff-even-diff-B ((,class (:background ,white-2 :foreground
,black-2))))
+ `(ediff-even-diff-C ((,class (:background ,white-2 :foreground
,black-2))))
+ `(ediff-odd-diff-A ((,class (:background ,white-2 :foreground
,black-2))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,white-2 :foreground
,black-2))))
+ `(ediff-odd-diff-B ((,class (:background ,white-2 :foreground
,black-2))))
+ `(ediff-odd-diff-C ((,class (:background ,white-2 :foreground
,black-2))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
