branch: elpa/ample-theme
commit 3c89a28d0806c4db75711f291360f318c93d4fdb
Author: jordonbiondo <[email protected]>
Commit: jordonbiondo <[email protected]>
diff colors
---
ample-light-theme.el | 25 +++++++++++++++++++++----
ample-theme.el | 17 +++++++++++++++++
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/ample-light-theme.el b/ample-light-theme.el
index 9c0abc0..4eaaac0 100644
--- a/ample-light-theme.el
+++ b/ample-light-theme.el
@@ -400,6 +400,23 @@
`(ediff-odd-diff-C ((t (:foreground nil :background
,ample/region-dark))))
;;`(ediff-odd-diff-Ancestor ((t ())))
+ `(diff-added ((t (:foreground nil :background
,ample/light-green-bg))))
+ `(diff-changed ((t (:foreground nil :background
,ample/light-blue-bg))))
+ `(diff-removed ((t (:foreground nil :background
,ample/light-red-bg))))
+ `(diff-context ((t (:foreground ,ample/fg :background nil))))
+ `(diff-file-header ((t (:foreground ,ample/bg :background
,ample/region-dark :bold t))))
+ `(diff-function ((t (:foreground ,ample/bg :background
,ample/region-dark))))
+ `(diff-header ((t (:foreground ,ample/bg :background
,ample/region-dark))))
+ `(diff-hunk-header ((t (:foreground ,ample/bg :background
,ample/region-dark))))
+ `(diff-index ((t (:foreground ,ample/bg :background
,ample/region-dark))))
+ `(diff-indicator-added ((t (:inherit diff-added))))
+ `(diff-indicator-changed ((t (:inherit diff-changed))))
+ `(diff-indicator-removed ((t (:inherit diff-removed))))
+ `(diff-nonexistent ((t (:foreground ,ample/fg :background "grey70"))))
+ `(diff-refine-added ((t (:foreground ,ample/fg :background
,ample/green))))
+ `(diff-refine-changed ((t (:foreground ,ample/fg :background
,ample/blue))))
+ `(diff-refine-removed ((t (:foreground ,ample/fg :background
,ample/red))))
+
;; man pages
`(Man-overstrike ((t (:foreground ,ample/blue))))
`(Man-underline ((t (:foreground ,ample/yellow))))
@@ -587,13 +604,13 @@
;;`(magit-cherry-unmatched ((t (:foreground "magenta"
:background nil))))
`(magit-diff-add ((t (:foreground nil
:background ,ample/light-green-bg))))
`(magit-diff-del ((t (:foreground nil
:background ,ample/light-red-bg))))
- `(magit-diff-file-header ((t (:foreground ,ample/bg
:background ,ample/region :bold t))))
- `(magit-diff-hunk-header ((t (:foreground ,ample/bg
:background ,ample/light-blue-bg))))
+ `(magit-diff-file-header ((t (:foreground ,ample/fg
:background ,ample/region :bold t))))
+ `(magit-diff-hunk-header ((t (:foreground ,ample/fg
:background ,ample/light-blue-bg))))
`(magit-diff-merge-current ((t (:foreground ,ample/orange
:background nil))))
`(magit-diff-merge-diff3-separator ((t (:foreground ,ample/orange
:background nil))))
`(magit-diff-merge-proposed ((t (:foreground ,ample/orange
:background nil))))
`(magit-diff-merge-separator ((t (:foreground
,ample/orange :background nil))))
- `(magit-diff-none ((t (:foreground ,ample/fg
:background ,ample/region-dark))))
+ `(magit-diff-none ((t (:foreground ,ample/fg
:background nil))))
`(magit-header ((t (:foreground ,ample/blue
:background nil))))
`(magit-item-highlight ((t (:foreground nil
:background ,ample/region-dark))))
;;`(magit-item-mark ((t (:foreground nil
:background "darkolivegreen"))))
@@ -627,7 +644,7 @@
`(magit-section-title ((t (:foreground ,ample/blue
:background nil))))
`(magit-tag ((t (:foreground ,ample/blue
:background nil))))
;;`(magit-valid-signature ((t (:foreground
"PaleTurquoise" :background nil :bold t))))
- `(magit-whitespace-warning-face ((t (:foreground ,ample/bg
:background "white" :bold t))))
+ `(magit-whitespace-warning-face ((t (:foreground ,ample/bg
:background ,ample/purple :bold t))))
`(git-gutter:deleted ((t (:foreground ,ample/red :background nil :bold
t))))
`(git-gutter:modified ((t (:foreground ,ample/purple :background nil :bold
t))))
diff --git a/ample-theme.el b/ample-theme.el
index 0123b3e..6062dd1 100644
--- a/ample-theme.el
+++ b/ample-theme.el
@@ -387,6 +387,23 @@
`(ediff-even-diff-C ((t (:foreground nil :background
"#191925"))))
;;`(ediff-even-diff-Ancestor ((t ())))
+ `(diff-added ((t (:foreground nil :background "#284828"))))
+ `(diff-changed ((t (:foreground nil :background "#484828"))))
+ `(diff-removed ((t (:foreground nil :background "#482828"))))
+ `(diff-context ((t (:foreground ,ample/gray :background nil))))
+ `(diff-file-header ((t (:foreground ,ample/bg :background "grey60"
:bold t))))
+ `(diff-function ((t (:foreground ,ample/bg :background "grey50"))))
+ `(diff-header ((t (:foreground ,ample/bg :background "grey50"))))
+ `(diff-hunk-header ((t (:foreground ,ample/bg :background "grey50"))))
+ `(diff-index ((t (:foreground ,ample/bg :background "grey50"))))
+ `(diff-indicator-added ((t (:inherit diff-added))))
+ `(diff-indicator-changed ((t (:inherit diff-changed))))
+ `(diff-indicator-removed ((t (:inherit diff-removed))))
+ `(diff-nonexistent ((t (:foreground nil :background "grey70"))))
+ `(diff-refine-added ((t (:foreground nil :background "#649694"))))
+ `(diff-refine-changed ((t (:foreground nil :background "#8f8f40"))))
+ `(diff-refine-removed ((t (:foreground nil :background "#694949"))))
+
`(ediff-fine-diff-A ((t (:foreground ,ample/fg :background
"#694949"))))
`(ediff-fine-diff-B ((t (:foreground ,ample/fg :background
"#496949"))))
`(ediff-fine-diff-C ((t (:foreground ,ample/fg :background
"#696949"))))
