[elpa] externals/modus-vivendi-theme ead95c9 106/110: Use bespoke colour for contextually unfocused text

[Stefan Monnier]

branch: externals/modus-vivendi-theme
commit ead95c9f20ae41a9a57b646c774e279fdf4b3f2a
Author: Protesilaos Stavrou <address@hidden>
Commit: Protesilaos Stavrou <address@hidden>

    Use bespoke colour for contextually unfocused text
---
 modus-operandi-theme.el | 14 +++++++++-----
 modus-vivendi-theme.el  | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 473fa83..26d4861 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -621,6 +621,8 @@ AMOUNT is a customisation option."
       ;; `fg-mark', `fg-mark-del', `fg-mark-other' can be combined with
       ;; `bg-main', `bg-dim', `bg-alt', `bg-hl-line'
       ;;
+      ;; `fg-unfocused' must be combined with `fg-main'
+      ;;
       ;; the window divider colours apply to faces with just an fg value
       ;;
       ;; all pairs are combinable with themselves
@@ -642,6 +644,8 @@ AMOUNT is a customisation option."
       (fg-window-divider-inner "#888888")
       (fg-window-divider-outer "#585858")
 
+      (fg-unfocused "#56576d")
+
       (fg-header "#2a2a2a") (bg-header "#e5e5e5")
       (fg-whitespace "#645060") (bg-whitespace "#fff8fc")
 
@@ -1195,7 +1199,7 @@ AMOUNT is a customisation option."
    `(diff-changed ((,class ,(modus-operandi-theme-diffs
                              bg-main yellow
                              bg-diff-focus-changed fg-diff-focus-changed))))
-   `(diff-context ((,class (:foreground ,fg-alt))))
+   `(diff-context ((,class (:foreground ,fg-unfocused))))
    `(diff-file-header ((,class (:foreground ,blue :weight bold))))
    `(diff-function ((,class (:foreground ,fg-special-cold))))
    `(diff-header ((,class (:foreground ,blue-nuanced))))
@@ -1581,7 +1585,7 @@ AMOUNT is a customisation option."
    `(frog-menu-posframe-background-face ((,class (:background ,bg-dim))))
    `(frog-menu-prompt-face ((,class (:foreground ,cyan))))
    ;;;; focus
-   `(focus-unfocused ((,class (:foreground ,fg-alt))))
+   `(focus-unfocused ((,class (:foreground ,fg-unfocused))))
    ;;;; fold-this
    `(fold-this-overlay ((,class (:inherit modus-theme-special-mild))))
    ;;;; font-lock
@@ -2124,7 +2128,7 @@ AMOUNT is a customisation option."
    `(magit-diff-base-highlight ((,class ,(modus-operandi-theme-diffs
                                           bg-dim yellow
                                           bg-diff-focus-changed 
fg-diff-focus-changed))))
-   `(magit-diff-context ((,class (:foreground ,fg-alt))))
+   `(magit-diff-context ((,class (:foreground ,fg-unfocused))))
    `(magit-diff-context-highlight ((,class ,(modus-operandi-theme-diffs
                                              bg-dim fg-dim
                                              bg-inactive fg-inactive))))
@@ -2722,7 +2726,7 @@ AMOUNT is a customisation option."
    `(reb-regexp-grouping-construct ((,class (:foreground 
,fg-escape-char-construct :weight bold))))
    ;;;; rg (rg.el)
    `(rg-column-number-face ((,class (:foreground ,magenta-alt-other))))
-   `(rg-context-face ((,class (:foreground ,fg-alt))))
+   `(rg-context-face ((,class (:foreground ,fg-unfocused))))
    `(rg-error-face ((,class (:foreground ,red :weight bold))))
    `(rg-file-tag-face ((,class (:foreground ,fg-special-cold))))
    `(rg-filename-face ((,class (:foreground ,fg-special-cold :weight bold))))
@@ -2734,7 +2738,7 @@ AMOUNT is a customisation option."
    `(rg-toggle-on-face ((,class (:foreground ,cyan-active :weight bold))))
    `(rg-warning-face ((,class (:foreground ,yellow :weight bold))))
    ;;;; ripgrep
-   `(ripgrep-context-face ((,class (:foreground ,fg-alt))))
+   `(ripgrep-context-face ((,class (:foreground ,fg-unfocused))))
    `(ripgrep-error-face ((,class (:foreground ,red :weight bold))))
    `(ripgrep-hit-face ((,class (:foreground ,cyan))))
    `(ripgrep-match-face ((,class (:inherit modus-theme-special-calm))))
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 2071e32..2f92346 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -621,6 +621,8 @@ AMOUNT is a customisation option."
       ;; `fg-mark', `fg-mark-del', `fg-mark-other' can be combined with
       ;; `bg-main', `bg-dim', `bg-alt', `bg-hl-line'
       ;;
+      ;; `fg-unfocused' must be combined with `fg-main'
+      ;;
       ;; the window divider colours apply to faces with just an fg value
       ;;
       ;; all pairs are combinable with themselves
@@ -642,6 +644,8 @@ AMOUNT is a customisation option."
       (fg-window-divider-inner "#646464")
       (fg-window-divider-outer "#969696")
 
+      (fg-unfocused "#93959b")
+
       (fg-header "#dddddd") (bg-header "#2a2a2a")
       (fg-whitespace "#a4959f") (bg-whitespace "#170016")
 
@@ -1195,7 +1199,7 @@ AMOUNT is a customisation option."
    `(diff-changed ((,class ,(modus-vivendi-theme-diffs
                              bg-main yellow
                              bg-diff-focus-changed fg-diff-focus-changed))))
-   `(diff-context ((,class (:foreground ,fg-alt))))
+   `(diff-context ((,class (:foreground ,fg-unfocused))))
    `(diff-file-header ((,class (:foreground ,blue :weight bold))))
    `(diff-function ((,class (:foreground ,fg-special-cold))))
    `(diff-header ((,class (:foreground ,blue-nuanced))))
@@ -1581,7 +1585,7 @@ AMOUNT is a customisation option."
    `(frog-menu-posframe-background-face ((,class (:background ,bg-dim))))
    `(frog-menu-prompt-face ((,class (:foreground ,cyan))))
    ;;;; focus
-   `(focus-unfocused ((,class (:foreground ,fg-alt))))
+   `(focus-unfocused ((,class (:foreground ,fg-unfocused))))
    ;;;; fold-this
    `(fold-this-overlay ((,class (:inherit modus-theme-special-mild))))
    ;;;; font-lock
@@ -2124,7 +2128,7 @@ AMOUNT is a customisation option."
    `(magit-diff-base-highlight ((,class ,(modus-vivendi-theme-diffs
                                           bg-dim yellow
                                           bg-diff-focus-changed 
fg-diff-focus-changed))))
-   `(magit-diff-context ((,class (:foreground ,fg-alt))))
+   `(magit-diff-context ((,class (:foreground ,fg-unfocused))))
    `(magit-diff-context-highlight ((,class ,(modus-vivendi-theme-diffs
                                              bg-dim fg-dim
                                              bg-inactive fg-inactive))))
@@ -2722,7 +2726,7 @@ AMOUNT is a customisation option."
    `(reb-regexp-grouping-construct ((,class (:foreground 
,fg-escape-char-construct :weight bold))))
    ;;;; rg (rg.el)
    `(rg-column-number-face ((,class (:foreground ,magenta-alt-other))))
-   `(rg-context-face ((,class (:foreground ,fg-alt))))
+   `(rg-context-face ((,class (:foreground ,fg-unfocused))))
    `(rg-error-face ((,class (:foreground ,red :weight bold))))
    `(rg-file-tag-face ((,class (:foreground ,fg-special-cold))))
    `(rg-filename-face ((,class (:foreground ,fg-special-cold :weight bold))))
@@ -2734,7 +2738,7 @@ AMOUNT is a customisation option."
    `(rg-toggle-on-face ((,class (:foreground ,cyan-active :weight bold))))
    `(rg-warning-face ((,class (:foreground ,yellow :weight bold))))
    ;;;; ripgrep
-   `(ripgrep-context-face ((,class (:foreground ,fg-alt))))
+   `(ripgrep-context-face ((,class (:foreground ,fg-unfocused))))
    `(ripgrep-error-face ((,class (:foreground ,red :weight bold))))
    `(ripgrep-hit-face ((,class (:foreground ,cyan))))
    `(ripgrep-match-face ((,class (:inherit modus-theme-special-calm))))