aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.org1
-rw-r--r--ef-autumn-theme.el4
-rw-r--r--ef-bio-theme.el4
-rw-r--r--ef-cherie-theme.el4
-rw-r--r--ef-cyprus-theme.el4
-rw-r--r--ef-dark-theme.el4
-rw-r--r--ef-day-theme.el4
-rw-r--r--ef-deuteranopia-dark-theme.el4
-rw-r--r--ef-deuteranopia-light-theme.el4
-rw-r--r--ef-duo-dark-theme.el4
-rw-r--r--ef-duo-light-theme.el4
-rw-r--r--ef-elea-dark-theme.el4
-rw-r--r--ef-elea-light-theme.el4
-rw-r--r--ef-frost-theme.el4
-rw-r--r--ef-kassio-theme.el4
-rw-r--r--ef-light-theme.el4
-rw-r--r--ef-night-theme.el4
-rw-r--r--ef-spring-theme.el4
-rw-r--r--ef-summer-theme.el4
-rw-r--r--ef-symbiosis-theme.el4
-rw-r--r--ef-themes.el19
-rw-r--r--ef-trio-dark-theme.el4
-rw-r--r--ef-trio-light-theme.el4
-rw-r--r--ef-tritanopia-dark-theme.el4
-rw-r--r--ef-tritanopia-light-theme.el4
-rw-r--r--ef-winter-theme.el4
26 files changed, 116 insertions, 0 deletions
diff --git a/README.org b/README.org
index 791feeb..1a2d8f5 100644
--- a/README.org
+++ b/README.org
@@ -1282,6 +1282,7 @@ everything most users need.
- ansi-color
- auctex
- auto-dim-other-buffers
+- avy [Part of {{{development-version}}}]
- bongo
- bookmark
- calendar and diary
diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index 65508aa..e8a0f76 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#4f4400")
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index 286f215..49843ca 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#0f5450")
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index 3e1570f..18f69e0 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#3f3460")
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index be5c16d..6cde58e 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af5f")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#dcd09f")
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index 366f47d..226b52a 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#3a3465")
diff --git a/ef-day-theme.el b/ef-day-theme.el
index 7820cb0..894f2b8 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#f0a0f0")
+ (bg-char-2 "#d0e000")
+
;;; Conditional hues
(bg-region-intense "#dfc39a")
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index 4d84a5d..c09ceb2 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -158,6 +158,10 @@
(underline-warning "#bfaf50")
(underline-info "#22cff2")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#1f2f70")
diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el
index defb573..3c86ac4 100644
--- a/ef-deuteranopia-light-theme.el
+++ b/ef-deuteranopia-light-theme.el
@@ -158,6 +158,10 @@
(underline-warning "#6f3f00")
(underline-info "#025f92")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#cfcf9a")
diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el
index c84f0ab..5448d02 100644
--- a/ef-duo-dark-theme.el
+++ b/ef-duo-dark-theme.el
@@ -158,6 +158,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#1f2f70")
diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el
index a7bbb0a..d07256b 100644
--- a/ef-duo-light-theme.el
+++ b/ef-duo-light-theme.el
@@ -158,6 +158,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#dfc2b0")
diff --git a/ef-elea-dark-theme.el b/ef-elea-dark-theme.el
index 7823272..2b4244d 100644
--- a/ef-elea-dark-theme.el
+++ b/ef-elea-dark-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#6f6600")
+
;;; Conditional hues
(bg-region-intense "#6f4489")
diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el
index 1f932ba..bc22800 100644
--- a/ef-elea-light-theme.el
+++ b/ef-elea-light-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af5f")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#f0a0f0")
+ (bg-char-2 "#d0e000")
+
;;; Conditional hues
(bg-region-intense "#c6b2d3")
diff --git a/ef-frost-theme.el b/ef-frost-theme.el
index 1fb9357..64b5461 100644
--- a/ef-frost-theme.el
+++ b/ef-frost-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#aadfcc")
diff --git a/ef-kassio-theme.el b/ef-kassio-theme.el
index 7928449..e58606a 100644
--- a/ef-kassio-theme.el
+++ b/ef-kassio-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#f0c0f0")
diff --git a/ef-light-theme.el b/ef-light-theme.el
index c1b8e55..0fff90a 100644
--- a/ef-light-theme.el
+++ b/ef-light-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#afdfc0")
diff --git a/ef-night-theme.el b/ef-night-theme.el
index 68ca22d..250141a 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#3f2f60")
diff --git a/ef-spring-theme.el b/ef-spring-theme.el
index ed3b75d..8290db2 100644
--- a/ef-spring-theme.el
+++ b/ef-spring-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#cfb5f0")
diff --git a/ef-summer-theme.el b/ef-summer-theme.el
index 2760ae2..3be0211 100644
--- a/ef-summer-theme.el
+++ b/ef-summer-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#caaadf")
diff --git a/ef-symbiosis-theme.el b/ef-symbiosis-theme.el
index 521fa4d..311d97d 100644
--- a/ef-symbiosis-theme.el
+++ b/ef-symbiosis-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#425425")
diff --git a/ef-themes.el b/ef-themes.el
index 5d9dd8b..a71a5a5 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -844,6 +844,15 @@ Optional prefix argument MAPPINGS has the same meaning as for
:package-version '(ef-themes . "0.4.0")
:group 'ef-themes-faces)
+(defface ef-themes-reset-soft nil
+ "Generic face to set most face properties to nil.
+
+This is intended to be inherited by faces that should not retain
+properties from their context (e.g. an overlay over an underlined
+text should not be underlined as well) yet still blend in."
+ :package-version '(ef-themes . "1.2.0")
+ :group 'ef-themes-faces)
+
;; This produces `ef-themes-mark-delete' and the like.
(dolist (scope '(delete select other))
(custom-declare-face
@@ -881,6 +890,9 @@ Optional prefix argument MAPPINGS has the same meaning as for
`(ef-themes-underline-error ((,c :underline (:style wave :color ,underline-err))))
`(ef-themes-underline-info ((,c :underline (:style wave :color ,underline-info))))
`(ef-themes-underline-warning ((,c :underline (:style wave :color ,underline-warning))))
+ `(ef-themes-reset-soft ((,c :background ,bg-main :foreground ,fg-main
+ :weight normal :slant normal :strike-through nil
+ :box nil :underline nil :overline nil :extend nil)))
;;;; all basic faces
;;;;; absolute essentials
`(bold ((,c :weight bold)))
@@ -1006,6 +1018,13 @@ Optional prefix argument MAPPINGS has the same meaning as for
`(TeX-error-description-warning ((,c :inherit warning)))
;;;; auto-dim-other-buffers
`(auto-dim-other-buffers-face ((,c :background ,bg-inactive)))
+;;;; avy
+ `(avy-background-face ((,c :background ,bg-dim :foreground ,fg-dim :extend t)))
+ `(avy-goto-char-timer-face ((,c :inherit bold :background ,bg-active)))
+ `(avy-lead-face ((,c :inherit (bold ef-themes-reset-soft) :background ,bg-char-0)))
+ `(avy-lead-face-0 ((,c :inherit (bold ef-themes-reset-soft) :background ,bg-char-1)))
+ `(avy-lead-face-1 ((,c :inherit ef-themes-reset-soft :background ,bg-inactive)))
+ `(avy-lead-face-2 ((,c :inherit (bold ef-themes-reset-soft) :background ,bg-char-2)))
;;;; bongo
`(bongo-album-title (( )))
`(bongo-artist ((,c :foreground ,rainbow-0)))
diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el
index 4acdbc6..0837eaf 100644
--- a/ef-trio-dark-theme.el
+++ b/ef-trio-dark-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#5d336c")
diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el
index afe9a19..43b6f24 100644
--- a/ef-trio-light-theme.el
+++ b/ef-trio-light-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#bf5f00")
(underline-info "#02af52")
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#ffaaff")
+ (bg-char-2 "#dff000")
+
;;; Conditional hues
(bg-region-intense "#aacacf")
diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el
index 9c7918d..7115a32 100644
--- a/ef-tritanopia-dark-theme.el
+++ b/ef-tritanopia-dark-theme.el
@@ -158,6 +158,10 @@
(underline-warning "#ffafa0")
(underline-info "#22ffd2")
+ (bg-char-0 "#922a00")
+ (bg-char-1 "#00709f")
+ (bg-char-2 "#5f3faf")
+
;;; Conditional hues
(bg-region-intense "#5f303f")
diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el
index cd6543e..5c0e19c 100644
--- a/ef-tritanopia-light-theme.el
+++ b/ef-tritanopia-light-theme.el
@@ -158,6 +158,10 @@
(underline-warning "#af7f90")
(underline-info "#22afc2")
+ (bg-char-0 "#ff908f")
+ (bg-char-1 "#bfbfff")
+ (bg-char-2 "#5fcfdf")
+
;;; Conditional hues
(bg-region-intense "#dfa5a5")
diff --git a/ef-winter-theme.el b/ef-winter-theme.el
index d8b0f99..d0fedac 100644
--- a/ef-winter-theme.el
+++ b/ef-winter-theme.el
@@ -155,6 +155,10 @@
(underline-warning "#c0b000")
(underline-info "#22b022")
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#625a00")
+
;;; Conditional hues
(bg-region-intense "#4f2f5d")