branch: elpa/ample-theme
commit e4fd825670d27a3a0ee886c7e05c8fa3be20017d
Merge: 34ceb60 d399fa3
Author: jordonbiondo <[email protected]>
Commit: jordonbiondo <[email protected]>
Merge branch 'master' into add_auctex
---
ample-flat-theme.el | 12 +++++++++---
ample-light-theme.el | 5 +++++
ample-theme.el | 6 ++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ample-flat-theme.el b/ample-flat-theme.el
index a9f3fbd..9635acc 100644
--- a/ample-flat-theme.el
+++ b/ample-flat-theme.el
@@ -122,6 +122,12 @@
`(ace-jump-face-background ((t (:inherit font-lock-comment-face))))
`(ace-jump-face-foreground ((t (:foreground ,ample/orange))))
+
+ `(avy-background-face ((t (:foreground ,ample/dark-gray :background nil))))
+ `(avy-lead-face ((t (:foreground "white" :background ,ample/red))))
+ `(avy-lead-face-0 ((t (:foreground "white" :background ,ample/blue))))
+ `(avy-lead-face-1 ((t (:foreground "white" :background ,ample/fg))))
+
`(vertical-border ((t (:background ,ample/darker-gray :foreground
,ample/darkest-gray))))
`(hl-line ((t (:background "#1f1f1f"))))
@@ -265,10 +271,10 @@
`(helm-ff-prefix ((t (:foreground ,ample/red))))
;;`(helm-ff-symlink ((t ())))
;;`(helm-grep-cmd-line ((t ())))
- ;;`(helm-grep-file ((t ())))
+ `(helm-grep-file ((t (:foreground ,ample/blue))))
;;`(helm-grep-finish ((t ())))
- ;;`(helm-grep-lineno ((t ())))
- ;;`(helm-grep-match ((t ())))
+ `(helm-grep-lineno ((t (:foreground ,ample/purple))))
+ `(helm-grep-match ((t (:foreground ,ample/fg :background ,ample/region))))
;;`(helm-grep-running ((t ())))
`(helm-header ((t (:foreground ,ample/bg :background ,ample/fg))))
;;`(helm-helper ((t ())))
diff --git a/ample-light-theme.el b/ample-light-theme.el
index 34d7d34..e9d2ab4 100644
--- a/ample-light-theme.el
+++ b/ample-light-theme.el
@@ -128,6 +128,11 @@
`(ace-jump-face-background ((t (:inherit font-lock-comment-face :background
nil))))
`(ace-jump-face-foreground ((t (:foreground ,ample/purple :bold t
:background nil))))
+ `(avy-background-face ((t (:foreground ,ample/dark-gray :background nil))))
+ `(avy-lead-face ((t (:foreground "white" :background ,ample/purple))))
+ `(avy-lead-face-0 ((t (:foreground "white" :background ,ample/blue))))
+ `(avy-lead-face-1 ((t (:foreground "white" :background ,ample/fg))))
+
`(vertical-border ((t (:background ,ample/darker-gray :foreground
,ample/darkest-gray))))
`(hl-line ((t (:background ,ample/region-light))))
diff --git a/ample-theme.el b/ample-theme.el
index fc540e9..19039d1 100644
--- a/ample-theme.el
+++ b/ample-theme.el
@@ -119,11 +119,17 @@
;; search
`(isearch ((t (:background ,ample/blue :foreground ,ample/bg))))
`(lazy-highlight ((t (:background ,ample/bg :foreground ,ample/purple
:underline t))))
+ `(evil-search-highlight-persist-highlight-face ((t (:background ,ample/blue
:foreground ,ample/bg))))
;; ace-jump
`(ace-jump-face-background ((t (:inherit font-lock-comment-face))))
`(ace-jump-face-foreground ((t (:foreground ,ample/orange))))
+ `(avy-background-face ((t (:foreground ,ample/dark-gray :background nil))))
+ `(avy-lead-face ((t (:foreground ,ample/fg :background ,ample/dark-red))))
+ `(avy-lead-face-0 ((t (:foreground ,ample/fg :background ,ample/blue))))
+ `(avy-lead-face-1 ((t (:foreground ,ample/bg :background ,ample/fg))))
+
`(vertical-border ((t (:background ,ample/darker-gray :foreground
,ample/darkest-gray))))
`(hl-line ((t (:background "#1f1f1f"))))
