[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/ample-theme 30afb7e 040/137: ediff
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/ample-theme 30afb7e 040/137: ediff |
Date: |
Thu, 21 Oct 2021 18:00:14 -0400 (EDT) |
branch: elpa/ample-theme
commit 30afb7e6255b8ceb044d8b4a609dd5c89cfc45e8
Author: jordonbiondo <biondoj@mail.gvsu.edu>
Commit: jordonbiondo <biondoj@mail.gvsu.edu>
ediff
new colors
---
ample-theme.el | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/ample-theme.el b/ample-theme.el
index 893592e..9390c7d 100644
--- a/ample-theme.el
+++ b/ample-theme.el
@@ -42,6 +42,7 @@
;; Not a bad idea to define a palette...
(let ((ample/green "#6aaf50")
+ (ample/dark-green "#057f10")
(ample/blue "#5180b3")
(ample/light-blue "#528fd1")
(ample/orange "#FF8512")
@@ -55,7 +56,8 @@
(ample/darker-gray "#454545")
(ample/darkest-gray "#252525")
(ample/red "#cd5542")
-
+ (ample/dark-red "#9d2512")
+
(ample/cursor "#f57e00")
(ample/fringe "#1f1f1f")
(ample/region "#303030")
@@ -223,6 +225,28 @@
`(ac-slime-selection-face((t (:inherit ac-selection-face))))
`(ac-yasnippet-candidate-face((t (:inherit ac-candidate-face))))
`(ac-yasnippet-selection-face((t (:inherit ac-selection-face))))
+
+ ;; ediff
+ `(ediff-current-diff-A((t (:foreground "white" :background
,ample/dark-red))))
+ `(ediff-current-diff-B((t (:foreground "white" :background
,ample/dark-green))))
+ `(ediff-current-diff-C((t (:foreground "black" :background ,ample/yellow))))
+ ;;`(ediff-current-diff-Ancestor((t ())))
+
+ `(ediff-even-diff-A((t (:foreground ,ample/bg :background ,ample/fg))))
+ `(ediff-even-diff-B((t (:foreground ,ample/bg :background ,ample/fg))))
+ `(ediff-even-diff-C((t (:foreground ,ample/bg :background ,ample/fg))))
+ ;;`(ediff-even-diff-Ancestor((t ())))
+
+ `(ediff-fine-diff-A((t (:foreground "white" :background ,ample/red))))
+ `(ediff-fine-diff-B((t (:foreground "white" :background ,ample/green))))
+ `(ediff-fine-diff-C((t (:foreground "black" :background
,ample/bright-yellow))))
+ ;;`(ediff-fine-diff-Ancestor((t ())))
+
+ `(ediff-odd-diff-A((t (:foreground ,ample/bg :background ,ample/gray))))
+ `(ediff-odd-diff-B((t (:foreground ,ample/bg :background ,ample/gray))))
+ `(ediff-odd-diff-C((t (:foreground ,ample/bg :background ,ample/gray))))
+ ;;`(ediff-odd-diff-Ancestor((t ())))
+
;; man pages
`(Man-overstrike ((t (:foreground ,ample/blue))))
`(Man-underline ((t (:foreground ,ample/yellow))))
- [nongnu] elpa/ample-theme d70f892 029/137: start of helm support, (continued)
- [nongnu] elpa/ample-theme d70f892 029/137: start of helm support, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 62fea2d 014/137: new screenshot, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 38a3449 021/137: search, comment delim, and header colors, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 6f5334a 023/137: darker gray and darkest gray, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 4460825 030/137: removed old powerline crap, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme e8ecb0d 032/137: changed isearch, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme f962232 045/137: show-paren, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme f900346 042/137: pop-up colors, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 559ec83 038/137: removed rouge comma, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 0a2bac5 044/137: undo-tree, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 30afb7e 040/137: ediff,
ELPA Syncer <=
- [nongnu] elpa/ample-theme 15fb94f 041/137: cleanup, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme d7b4407 046/137: rainbow delim mismatch, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 5c9dd57 049/137: more magit support, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 5c83062 054/137: cursor foreground is buffer background, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 004a4aa 035/137: updated version info, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 640f340 043/137: specify no background for minibuff, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 5358b2f 047/137: getting ready for org-mode specs, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 84d0eaa 058/137: message-mode colors, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme d102814 055/137: some js2 faces, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 9044c93 075/137: more header changes, ELPA Syncer, 2021/10/21