branch: elpa/moe-theme
commit ec8f6e3f19c3c824998b55665272f09a997520ee
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
Fix #43 ediff colors are hard to read
---
moe-dark-theme.el | 20 ++++++++++----------
moe-light-theme.el | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 3ff0469c50..4aa0756a2e 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -471,20 +471,20 @@ Moe, moe, kyun!")
;; 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-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 ,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))))
+ `(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))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index af056a4122..a59a8ddb75 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -474,14 +474,14 @@ Moe, moe, kyun!")
`(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))))
+ `(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))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
