branch: elpa/ample-theme
commit 837faa88f0ae211d13077f1fd7aff202754274a8
Author: Jordon Biondo <[email protected]>
Commit: Jordon Biondo <[email protected]>
some basic new magit support
---
ample-flat-theme.el | 36 +++++++++++++++++++++++++++---------
ample-theme.el | 20 +++++++++++++++++++-
2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/ample-flat-theme.el b/ample-flat-theme.el
index 39e42d3..c770450 100644
--- a/ample-flat-theme.el
+++ b/ample-flat-theme.el
@@ -388,18 +388,18 @@
;; ediff
- `(ediff-current-diff-A((t (:foreground nil :background "#482828"))))
- `(ediff-current-diff-B((t (:foreground nil :background "#284828"))))
- `(ediff-current-diff-C((t (:foreground nil :background "#484828"))))
+ `(ediff-current-diff-A((t (:foreground nil :background ,ample/red))))
+ `(ediff-current-diff-B((t (:foreground nil :background ,ample/green))))
+ `(ediff-current-diff-C((t (:foreground nil :background ,ample/yellow))))
;;`(ediff-current-diff-Ancestor((t ())))
`(ediff-even-diff-A ((t (:foreground nil :background "#191925"))))
`(ediff-even-diff-B ((t (:foreground nil :background "#191925"))))
`(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-added ((t (:background nil :foreground ,ample/green))))
+ `(diff-changed ((t (:background nil :foreground ,ample/yellow))))
+ `(diff-removed ((t (:background nil :foreground ,ample/red))))
`(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"))))
@@ -618,12 +618,30 @@
`(whitespace-tab ((t (:foreground ,ample/gray :background "grey15"))))
`(whitespace-trailing ((t (:foreground ,ample/rb3 :background ,ample/bg
:bold t))))
- ;;magit
+ ;; magit
+ ;; new
+ `(magit-section-heading ((t (:foreground ,ample/blue, :background nil))))
+ `(magit-hash ((t (:foreground ,ample/purple :background nil))))
+ `(magit-branch-local ((t (:foreground ,ample/orange :background nil))))
+ `(magit-branch-remote ((t (:foreground ,ample/yellow :background nil))))
+
+ `(magit-diff-added-highlight ((t (:background ,ample/region :foreground
,ample/green))))
+ `(magit-diff-removed-highlight ((t (:background ,ample/region :foreground
,ample/red))))
+ `(magit-diff-added ((t (:background nil :foreground ,ample/green))))
+ `(magit-diff-removed ((t (:background nil :foreground ,ample/red))))
+
+ `(magit-blame-date ((t (:foreground ,ample/purple :background "grey25"))))
+ `(magit-blame-hash ((t (:foreground ,ample/purple :background "grey25"))))
+ `(magit-blame-heading ((t (:foreground ,ample/blue :background "grey25"))))
+ `(magit-blame-name ((t (:foreground ,ample/green :background "grey25"))))
+ `(magit-blame-summary ((t (:foreground ,ample/blue :background "grey25"))))
+
+ ;; old
`(magit-branch ((t (:foreground ,ample/orange :background nil))))
;;`(magit-cherry-equivalent ((t (:foreground "cyan" :background nil))))
;;`(magit-cherry-unmatched ((t (:foreground "magenta" :background nil))))
- `(magit-diff-add ((t (:foreground nil :background ,ample/dark-green))))
- `(magit-diff-del ((t (:foreground nil :background ,ample/dark-red))))
+ `(magit-diff-add ((t (:background nil :foreground ,ample/green))))
+ `(magit-diff-del ((t (:background nil :foreground ,ample/red))))
`(magit-diff-file-header ((t (:foreground ,ample/bg :background
,ample/blue :bold t))))
`(magit-diff-hunk-header ((t (:foreground ,ample/bg :background
,ample/blue))))
`(magit-diff-merge-current ((t (:foreground ,ample/orange :background
nil))))
diff --git a/ample-theme.el b/ample-theme.el
index d92b4e2..839afae 100644
--- a/ample-theme.el
+++ b/ample-theme.el
@@ -609,7 +609,25 @@
`(whitespace-tab ((t (:foreground ,ample/gray
:background "grey15"))))
`(whitespace-trailing ((t (:foreground ,ample/rb3 :background
,ample/bg :bold t))))
- ;;magit
+ ;; magit
+ ;; new
+ `(magit-section-heading ((t (:foreground ,ample/blue, :background nil))))
+ `(magit-hash ((t (:foreground ,ample/purple :background nil))))
+ `(magit-branch-local ((t (:foreground ,ample/orange :background nil))))
+ `(magit-branch-remote ((t (:foreground ,ample/yellow :background nil))))
+
+ `(magit-diff-added-highlight ((t (:background ,ample/region :foreground
,ample/green))))
+ `(magit-diff-removed-highlight ((t (:background ,ample/region :foreground
,ample/red))))
+ `(magit-diff-added ((t (:background nil :foreground ,ample/green))))
+ `(magit-diff-removed ((t (:background nil :foreground ,ample/red))))
+
+ `(magit-blame-date ((t (:foreground ,ample/purple :background "grey25"))))
+ `(magit-blame-hash ((t (:foreground ,ample/purple :background "grey25"))))
+ `(magit-blame-heading ((t (:foreground ,ample/blue :background "grey25"))))
+ `(magit-blame-name ((t (:foreground ,ample/green :background "grey25"))))
+ `(magit-blame-summary ((t (:foreground ,ample/blue :background "grey25"))))
+
+ ;; old
`(magit-branch ((t (:foreground ,ample/orange
:background nil))))
;;`(magit-cherry-equivalent ((t (:foreground "cyan"
:background nil))))
;;`(magit-cherry-unmatched ((t (:foreground "magenta"
:background nil))))
