branch: externals/modus-themes
commit 42e161138bd287e3f39f8e9bb9fef88363fa99b3
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
REMOVE bg-char mappings and use search faces for Avy and related
These are like search matches, anyway, plus we make the code more
simple on our end.
---
modus-operandi-deuteranopia-theme.el | 4 ----
modus-operandi-theme.el | 4 ----
modus-operandi-tinted-theme.el | 4 ----
modus-operandi-tritanopia-theme.el | 4 ----
modus-themes.el | 18 +++++++++---------
modus-vivendi-deuteranopia-theme.el | 4 ----
modus-vivendi-theme.el | 4 ----
modus-vivendi-tinted-theme.el | 4 ----
modus-vivendi-tritanopia-theme.el | 4 ----
9 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/modus-operandi-deuteranopia-theme.el
b/modus-operandi-deuteranopia-theme.el
index 973f2082db..b690f64841 100644
--- a/modus-operandi-deuteranopia-theme.el
+++ b/modus-operandi-deuteranopia-theme.el
@@ -172,10 +172,6 @@ standard)."
(bg-region "#bdbdbd")
(fg-region "#000000")
- (bg-char-0 "#7faaff")
- (bg-char-1 "#dfe000")
- (bg-char-2 "#7feaff")
-
(bg-mode-line-active "#d0d6ff")
(fg-mode-line-active "#0f0f0f")
(border-mode-line-active "#4f4f74")
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 1602fea552..6f92f86461 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -170,10 +170,6 @@ which corresponds to a minimum contrast in relative
luminance of
(bg-region "#bdbdbd")
(fg-region "#000000")
- (bg-char-0 "#7feaff")
- (bg-char-1 "#ffaaff")
- (bg-char-2 "#dff000")
-
(bg-mode-line-active "#c8c8c8")
(fg-mode-line-active "#000000")
(border-mode-line-active "#5a5a5a")
diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el
index 1509be035f..60762684f3 100644
--- a/modus-operandi-tinted-theme.el
+++ b/modus-operandi-tinted-theme.el
@@ -170,10 +170,6 @@ which corresponds to a minimum contrast in relative
luminance of
(bg-region "#c2bcb5")
(fg-region "#000000")
- (bg-char-0 "#7feaff")
- (bg-char-1 "#ffaaff")
- (bg-char-2 "#dff000")
-
(bg-mode-line-active "#cab9b2")
(fg-mode-line-active "#000000")
(border-mode-line-active "#545454")
diff --git a/modus-operandi-tritanopia-theme.el
b/modus-operandi-tritanopia-theme.el
index 3051ff71ce..3b6d6e2f51 100644
--- a/modus-operandi-tritanopia-theme.el
+++ b/modus-operandi-tritanopia-theme.el
@@ -172,10 +172,6 @@ standard)."
(bg-region "#bdbdbd")
(fg-region "#000000")
- (bg-char-0 "#ff908f")
- (bg-char-1 "#bfbfff")
- (bg-char-2 "#5fcfdf")
-
(bg-mode-line-active "#afe0f2")
(fg-mode-line-active "#0f0f0f")
(border-mode-line-active "#2f4f44")
diff --git a/modus-themes.el b/modus-themes.el
index 4a9f2a3f47..77aee77f2b 100644
--- a/modus-themes.el
+++ b/modus-themes.el
@@ -1875,11 +1875,11 @@ FG and BG are the main colors."
`(auto-dim-other-buffers-hide-face ((,c :foreground ,bg-inactive
: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 modus-themes-reset-soft) :background
,bg-char-0)))
- `(avy-lead-face-0 ((,c :inherit (bold modus-themes-reset-soft) :background
,bg-char-1)))
- `(avy-lead-face-1 ((,c :inherit modus-themes-reset-soft :background
,bg-inactive)))
- `(avy-lead-face-2 ((,c :inherit (bold modus-themes-reset-soft) :background
,bg-char-2)))
+ `(avy-goto-char-timer-face ((,c :inherit (bold modus-themes-search-lazy
modus-themes-reset-soft))))
+ `(avy-lead-face ((,c :inherit (bold modus-themes-search-current
modus-themes-reset-soft))))
+ `(avy-lead-face-0 ((,c :inherit (bold modus-themes-search-current
modus-themes-reset-soft))))
+ `(avy-lead-face-1 ((,c :inherit (bold modus-themes-search-current
modus-themes-reset-soft))))
+ `(avy-lead-face-2 ((,c :inherit (bold modus-themes-search-current
modus-themes-reset-soft))))
;;;;; aw (ace-window)
`(aw-background-face ((,c :foreground "gray50")))
`(aw-key-face ((,c :inherit modus-themes-key-binding)))
@@ -2052,8 +2052,8 @@ FG and BG are the main colors."
;;;;; corfu-candidate-overlay
`(corfu-candidate-overlay-face ((t :inherit shadow)))
;;;;; corfu-quick
- `(corfu-quick1 ((,c :inherit bold :background ,bg-char-0)))
- `(corfu-quick2 ((,c :inherit bold :background ,bg-char-1)))
+ `(corfu-quick1 ((,c :inherit (bold modus-themes-search-current))))
+ `(corfu-quick2 ((,c :inherit (bold modus-themes-search-current))))
;;;;; counsel
`(counsel-active-mode ((,c :foreground ,keyword)))
`(counsel-application-name ((,c :foreground ,name)))
@@ -4025,8 +4025,8 @@ FG and BG are the main colors."
;;;;; vertico
`(vertico-current ((,c :inherit modus-themes-completion-selected)))
;;;;; vertico-quick
- `(vertico-quick1 ((,c :inherit bold :background ,bg-char-0)))
- `(vertico-quick2 ((,c :inherit bold :background ,bg-char-1)))
+ `(vertico-quick1 ((,c :inherit (bold modus-themes-search-current))))
+ `(vertico-quick2 ((,c :inherit (bold modus-themes-search-current))))
;;;;; vimish-fold
`(vimish-fold-fringe ((,c :foreground ,cyan)))
`(vimish-fold-mouse-face ((,c :inherit modus-themes-intense-blue)))
diff --git a/modus-vivendi-deuteranopia-theme.el
b/modus-vivendi-deuteranopia-theme.el
index ba171e0a27..4f5cdf0847 100644
--- a/modus-vivendi-deuteranopia-theme.el
+++ b/modus-vivendi-deuteranopia-theme.el
@@ -172,10 +172,6 @@ standard)."
(bg-region "#5a5a5a")
(fg-region "#ffffff")
- (bg-char-0 "#0040ff")
- (bg-char-1 "#625000")
- (bg-char-2 "#105faf")
-
(bg-mode-line-active "#2a2a6a")
(fg-mode-line-active "#f0f0f0")
(border-mode-line-active "#8080a7")
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 9da8270a3b..b613353ade 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -170,10 +170,6 @@ which corresponds to a minimum contrast in relative
luminance of
(bg-region "#5a5a5a")
(fg-region "#ffffff")
- (bg-char-0 "#0050af")
- (bg-char-1 "#7f1f7f")
- (bg-char-2 "#625a00")
-
(bg-mode-line-active "#505050")
(fg-mode-line-active "#ffffff")
(border-mode-line-active "#959595")
diff --git a/modus-vivendi-tinted-theme.el b/modus-vivendi-tinted-theme.el
index feb90a1d92..d042201a0d 100644
--- a/modus-vivendi-tinted-theme.el
+++ b/modus-vivendi-tinted-theme.el
@@ -170,10 +170,6 @@ which corresponds to a minimum contrast in relative
luminance of
(bg-region "#555a66")
(fg-region "#ffffff")
- (bg-char-0 "#0050af")
- (bg-char-1 "#7f1f7f")
- (bg-char-2 "#625a00")
-
(bg-mode-line-active "#484d67")
(fg-mode-line-active "#ffffff")
(border-mode-line-active "#979797")
diff --git a/modus-vivendi-tritanopia-theme.el
b/modus-vivendi-tritanopia-theme.el
index 88ca650e5c..8e137a78f6 100644
--- a/modus-vivendi-tritanopia-theme.el
+++ b/modus-vivendi-tritanopia-theme.el
@@ -172,10 +172,6 @@ standard)."
(bg-region "#5a5a5a")
(fg-region "#ffffff")
- (bg-char-0 "#922a00")
- (bg-char-1 "#00709f")
- (bg-char-2 "#5f3faf")
-
(bg-mode-line-active "#003c52")
(fg-mode-line-active "#f0f0f0")
(border-mode-line-active "#5f8fb4")
