[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/ample-theme 837faa8 112/137: some basic new magit support
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/ample-theme 837faa8 112/137: some basic new magit support |
|
Date: |
Thu, 21 Oct 2021 18:00:28 -0400 (EDT) |
branch: elpa/ample-theme
commit 837faa88f0ae211d13077f1fd7aff202754274a8
Author: Jordon Biondo <jordon@Jordons-MacBook-Pro.local>
Commit: Jordon Biondo <jordon@Jordons-MacBook-Pro.local>
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))))
- [nongnu] elpa/ample-theme 5358b2f 047/137: getting ready for org-mode specs, (continued)
- [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
- [nongnu] elpa/ample-theme 4aa9057 065/137: better ediff colors, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 47db163 076/137: some org, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme daa9b14 068/137: twittering specs, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 1523650 088/137: core color changes, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 458b500 089/137: rainbow and region changes for light, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 1d79add 103/137: added auctex to every thing, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 837faa8 112/137: some basic new magit support,
ELPA Syncer <=
- [nongnu] elpa/ample-theme 3d7b095 125/137: Add ample/light-gray and shadow face, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 3eae3fa 122/137: Add AUCTeX error faces, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 8fbae3a 127/137: Add faces for ansi-term for all themes, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme a364f21 134/137: Make the install command easier to find and read, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme d00e827 069/137: inclusion of light theme, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme ae2f229 071/137: hl-line for light, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme fd49e27 074/137: headers, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme bac477c 063/137: cleanup, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme 020ab20 070/137: updated readme for light theme, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ample-theme ed1c9f1 060/137: some initial gnus faces, ELPA Syncer, 2021/10/21