branch: elpa/material-theme
commit a8add612e8bb5da6e41ee2705dd7c4170c15f03e
Author: Howdy Pierce <[email protected]>
Commit: Howdy Pierce <[email protected]>
Updated material-theme with more usable and subtle colors for ediff mode.
Previous colors were garish and not legible when in ediff mode. The
unhighlighted regions (what ediff calls the "ediff-odd" and
"ediff-even" faces) were particularly illegible.
---
material-theme.el | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/material-theme.el b/material-theme.el
index adc6ec5..0c7b1f7 100644
--- a/material-theme.el
+++ b/material-theme.el
@@ -52,6 +52,15 @@
(background (if (or window-system truecolor) "#263238" "#262626")) ;;
sidebar-container
(current-line (if (or window-system truecolor) "#37474f" "#3a3a3a"))
;; tree-row
(far-background (if (or window-system truecolor) "#1c1f26" "#121212"))
;; panel-control
+ (diff-nonactive-bg "#2F3D41")
+ (diff-current-A-bg "#40393D")
+ (diff-fine-A-bg "#784948")
+ (diff-current-B-bg "#203B4A")
+ (diff-fine-B-bg "#155378")
+ (diff-current-C-bg "#33453A")
+ (diff-fine-C-bg "#4F6C3F")
+ (diff-current-ancestor-bg "#203B4A")
+ (diff-fine-ancestor-bg "#155378")
(inactive-gray (if (or window-system truecolor) "#78909c" "#8a8a8a"))
(header-color (if (or window-system truecolor) "#455A64" "#5f5f5f"))
(subtle "#a7adba") ;; tree-row-hover-disclosure-button-control
@@ -285,10 +294,23 @@
`(diff-refine-added ((,class (:inherit diff-added :inverse-video t))))
`(diff-refine-removed ((,class (:inherit diff-removed :inverse-video t))))
- `(ediff-even-diff-A ((,class (:foreground nil :background nil
:inverse-video t))))
- `(ediff-even-diff-B ((,class (:foreground nil :background nil
:inverse-video t))))
- `(ediff-odd-diff-A ((,class (:foreground ,comment :background nil
:inverse-video t))))
- `(ediff-odd-diff-B ((,class (:foreground ,comment :background nil
:inverse-video t))))
+ ;; ediff
+ `(ediff-even-diff-A ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-even-diff-B ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-even-diff-C ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-odd-diff-A ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-odd-diff-B ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-odd-diff-C ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,diff-nonactive-bg))))
+ `(ediff-current-diff-A ((,class (:background ,diff-current-A-bg))))
+ `(ediff-current-diff-B ((,class (:background ,diff-current-B-bg))))
+ `(ediff-current-diff-C ((,class (:background ,diff-current-C-bg))))
+ `(ediff-current-diff-Ancestor ((,class (:background
,diff-current-ancestor-bg))))
+ `(ediff-fine-diff-A ((,class (:background ,diff-fine-A-bg))))
+ `(ediff-fine-diff-B ((,class (:background ,diff-fine-B-bg))))
+ `(ediff-fine-diff-C ((,class (:background ,diff-fine-C-bg))))
+ `(ediff-fine-diff-Ancestor ((,class (:background ,diff-fine-ancestor-bg))))
`(eldoc-highlight-function-argument ((,class (:foreground ,green :weight
bold))))
