[elpa] externals/modus-operandi-theme aeaf598 103/153: Review calfw faces for consistency with the theme

[Stefan Monnier]

branch: externals/modus-operandi-theme
commit aeaf598ae8cd84100243e0fe084545ea18397b90
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Review calfw faces for consistency with the theme
---
 modus-operandi-theme.el | 31 ++++++++++++++++---------------
 modus-vivendi-theme.el  | 31 ++++++++++++++++---------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index d2ba3d2..6e13ca1 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -1691,26 +1691,27 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(diary-time ((,class :foreground ,blue-alt)))
    `(holiday ((,class :foreground ,magenta-alt)))
 ;;;;; calfw
-   `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
-   `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+   `(cfw:face-annotation ((,class :foreground ,fg-special-warm)))
+   `(cfw:face-day-title ((,class :foreground ,fg-main)))
    `(cfw:face-default-content ((,class :foreground ,green-alt)))
    `(cfw:face-default-day ((,class :inherit (cfw:face-day-title bold))))
-   `(cfw:face-disable ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
-   `(cfw:face-grid ((,class :foreground ,fg-inactive)))
-   `(cfw:face-header ((,class :inherit bold ::foreground ,fg-main)))
-   `(cfw:face-holiday ((,class :inherit bold :background ,bg-alt :foreground 
,magenta)))
+   `(cfw:face-disable ((,class :foreground ,fg-unfocused)))
+   `(cfw:face-grid ((,class :foreground ,fg-window-divider-outer)))
+   `(cfw:face-header ((,class :inherit bold :foreground ,fg-main)))
+   `(cfw:face-holiday ((,class :foreground ,magenta-alt-other)))
    `(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
-   `(cfw:face-saturday ((,class :inherit bold :background ,bg-alt :foreground 
,magenta-alt)))
+   `(cfw:face-saturday ((,class :inherit bold :foreground ,cyan-alt-other)))
    `(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
-   `(cfw:face-sunday ((,class :inherit bold :background ,bg-alt :foreground 
,magenta-alt-other)))
+   `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other)))
    `(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
-                             :foreground ,fg-special-warm
-                             ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
-   `(cfw:face-today ((,class :inherit bold :foreground ,blue)))
-   `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
-   `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
-   `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground 
,cyan)))
-   `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,bg-main 
:foreground ,blue-intense)))
+                             :foreground ,fg-special-cold
+                             ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-5))))
+   `(cfw:face-today ((,class :background ,bg-inactive)))
+   `(cfw:face-today-title ((,class :background ,bg-active)))
+   `(cfw:face-toolbar ((,class :background ,bg-alt :foreground ,bg-alt)))
+   `(cfw:face-toolbar-button-off ((,class :foreground ,fg-alt)))
+   `(cfw:face-toolbar-button-on ((,class :inherit bold :background 
,blue-nuanced-bg
+                                         :foreground ,blue-alt)))
 ;;;;; centaur-tabs
    `(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
    `(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground 
,red-active :underline t)))
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 3e5bae9..dee4587 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -1691,26 +1691,27 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(diary-time ((,class :foreground ,blue-alt)))
    `(holiday ((,class :foreground ,magenta-alt)))
 ;;;;; calfw
-   `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
-   `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+   `(cfw:face-annotation ((,class :foreground ,fg-special-warm)))
+   `(cfw:face-day-title ((,class :foreground ,fg-main)))
    `(cfw:face-default-content ((,class :foreground ,green-alt)))
    `(cfw:face-default-day ((,class :inherit (cfw:face-day-title bold))))
-   `(cfw:face-disable ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
-   `(cfw:face-grid ((,class :foreground ,fg-inactive)))
-   `(cfw:face-header ((,class :inherit bold ::foreground ,fg-main)))
-   `(cfw:face-holiday ((,class :inherit bold :background ,bg-alt :foreground 
,magenta)))
+   `(cfw:face-disable ((,class :foreground ,fg-unfocused)))
+   `(cfw:face-grid ((,class :foreground ,fg-window-divider-outer)))
+   `(cfw:face-header ((,class :inherit bold :foreground ,fg-main)))
+   `(cfw:face-holiday ((,class :foreground ,magenta-alt-other)))
    `(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
-   `(cfw:face-saturday ((,class :inherit bold :background ,bg-alt :foreground 
,magenta-alt)))
+   `(cfw:face-saturday ((,class :inherit bold :foreground ,cyan-alt-other)))
    `(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
-   `(cfw:face-sunday ((,class :inherit bold :background ,bg-alt :foreground 
,magenta-alt-other)))
+   `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other)))
    `(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
-                             :foreground ,fg-special-warm
-                             ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
-   `(cfw:face-today ((,class :inherit bold :foreground ,blue)))
-   `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
-   `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
-   `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground 
,cyan)))
-   `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,bg-main 
:foreground ,blue-intense)))
+                             :foreground ,fg-special-cold
+                             ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-5))))
+   `(cfw:face-today ((,class :background ,bg-inactive)))
+   `(cfw:face-today-title ((,class :background ,bg-active)))
+   `(cfw:face-toolbar ((,class :background ,bg-alt :foreground ,bg-alt)))
+   `(cfw:face-toolbar-button-off ((,class :foreground ,fg-alt)))
+   `(cfw:face-toolbar-button-on ((,class :inherit bold :background 
,blue-nuanced-bg
+                                         :foreground ,blue-alt)))
 ;;;;; centaur-tabs
    `(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
    `(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground 
,red-active :underline t)))