Numerous refinements to Org faces

An emphasis was placed on the semantic use of colour in the agenda
view (`org-agenda') and on how to best convey the meaning of the various
components of that interface.

All subtle backgrounds from keywords and other constructs were removed,
because they created inconsistencies under certain circumstances.

Other minor refinements were introduced in the interest of harmonising
everything to the new styles.
This commit is contained in:
Protesilaos Stavrou 2019-12-11 11:11:08 +02:00
parent 7940171a49
commit f5ae738386
No known key found for this signature in database
GPG Key ID: 99BD6459CD5CA3EA
2 changed files with 42 additions and 42 deletions

View File

@ -1090,14 +1090,14 @@ between foreground and background is >= 7:1)."
`(neo-vc-up-to-date-face ((,class (:foreground ,fg-alt))))
`(neo-vc-user-face ((,class (:foreground ,magenta))))
;;;; org-mode
`(org-agenda-calendar-event ((,class (:inherit default))))
`(org-agenda-calendar-sexp ((,class (:inherit default))))
`(org-agenda-calendar-clocking ((,class (:inherit modus-theme-special-cold))))
`(org-agenda-calendar-event ((,class (:foreground ,blue-alt))))
`(org-agenda-calendar-sexp ((,class (:foreground ,cyan-alt))))
`(org-agenda-clocking ((,class (:inherit modus-theme-special-cold))))
`(org-agenda-column-dateline ((,class (:inherit modus-theme-subtle-neutral))))
`(org-agenda-current-time ((,class (:inherit modus-theme-refine-cyan))))
`(org-agenda-current-time ((,class (:inherit modus-theme-intense-cyan))))
`(org-agenda-date ((,class (:foreground ,fg-main))))
`(org-agenda-date-today ((,class (:inherit modus-theme-refine-cyan))))
`(org-agenda-date-weekend ((,class (:inherit modus-theme-special-warm))))
`(org-agenda-date-today ((,class (:inherit modus-theme-subtle-cyan :weight bold :box t))))
`(org-agenda-date-weekend ((,class (:foreground ,fg-alt))))
`(org-agenda-diary ((,class (:inherit default))))
`(org-agenda-dimmed-todo-face ((,class (:inherit modus-theme-subtle-neutral))))
`(org-agenda-done ((,class (:foreground ,green))))
@ -1106,7 +1106,7 @@ between foreground and background is >= 7:1)."
`(org-agenda-filter-regexp ((,class (:background ,bg-active :foreground ,fg-main :box t))))
`(org-agenda-filter-tags ((,class (:background ,bg-active :foreground ,fg-main :box t))))
`(org-agenda-restriction-lock ((,class (:background ,bg-dim :foreground ,fg-dim))))
`(org-agenda-structure ((,class (:foreground ,fg-alt))))
`(org-agenda-structure ((,class (:foreground ,fg-special-mild))))
`(org-archived ((,class (:background ,bg-alt :foreground ,fg-alt))))
`(org-block ((,class (:inherit default))))
`(org-block-begin-line ((,class (:background ,bg-dim :foreground ,fg-alt))))
@ -1119,11 +1119,11 @@ between foreground and background is >= 7:1)."
`(org-column ((,class (:background ,bg-alt))))
`(org-column-title ((,class (:underline t :background ,bg-alt :weight bold))))
`(org-date ((,class (:foreground ,cyan))))
`(org-date-selected ((,class (:inherit modus-theme-intense-cyan))))
`(org-date-selected ((,class (:inherit modus-theme-intense-cyan :weight bold))))
`(org-default ((,class (:inherit default))))
`(org-document-info ((,class (:foreground ,fg-special-cold))))
`(org-document-title ((,class (:foreground ,fg-special-cold :weight bold))))
`(org-done ((,class (:background ,bg-alt :foreground ,green))))
`(org-done ((,class (:foreground ,green))))
`(org-drawer ((,class (:foreground ,cyan-alt))))
`(org-ellipsis ((,class (:foreground ,yellow-alt :underline t))))
`(org-footnote ((,class (:foreground ,blue-alt :underline t))))
@ -1156,36 +1156,36 @@ between foreground and background is >= 7:1)."
,@(when modus-operandi-theme-scale-headings
(list :height modus-operandi-theme-scale-1))))))
`(org-level-5 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,cyan-alt-other :weight bold))))
`(org-level-6 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,green-alt-other :weight bold))))
`(org-level-7 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,fg-dim :weight bold))))
`(org-level-8 ((,class (:inherit ,modus-theme-variable-pitch
`(org-level-6 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,fg-alt :weight bold))))
`(org-level-7 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,cyan-active :weight bold))))
`(org-level-8 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,magenta-active :weight bold))))
`(org-link ((,class (:inherit link))))
`(org-list-dt ((,class (:foreground ,fg-dim :weight bold))))
`(org-macro ((,class (:inherit org-latex-and-related))))
`(org-meta-line ((,class (:inherit font-lock-comment-face))))
`(org-mode-line-clock ((,class (:background ,bg-main :foreground ,fg-main))))
`(org-mode-line-clock-overrun ((,class (:inherit modus-theme-intense-red))))
`(org-priority ((,class (:background ,bg-alt :foreground ,magenta-alt-other))))
`(org-priority ((,class (:foreground ,magenta))))
`(org-quote ((,class (:inherit org-block :foreground ,fg-special-cold))))
`(org-scheduled ((,class (:foreground ,cyan-alt-other))))
`(org-scheduled-previously ((,class (:foreground ,red-alt-other))))
`(org-scheduled-today ((,class (:foreground ,blue-alt-other :weight bold))))
`(org-scheduled ((,class (:foreground ,fg-special-cold))))
`(org-scheduled-previously ((,class (:foreground ,fg-special-warm))))
`(org-scheduled-today ((,class (:foreground ,yellow-alt-other))))
`(org-sexp-date ((,class (:inherit org-date))))
`(org-special-keyword ((,class (:foreground ,magenta-intense))))
`(org-special-keyword ((,class (:foreground ,cyan-alt))))
`(org-table ((,class (:foreground ,fg-special-cold))))
`(org-tag ((,class (:foreground ,fg-special-warm :weight bold))))
`(org-tag-group ((,class (:inherit org-tag))))
`(org-target ((,class (:underline t))))
`(org-time-grid ((,class (:foreground ,yellow-alt-other))))
`(org-todo ((,class (:background ,bg-alt :foreground ,yellow))))
`(org-todo ((,class (:foreground ,magenta-alt-other))))
`(org-upcoming-deadline ((,class (:foreground ,red-alt-other))))
`(org-verbatim ((,class (:background ,bg-dim :foreground ,fg-special-warm))))
`(org-verse ((,class (:inherit org-quote))))
`(org-warning ((,class (:background ,bg-alt :foreground ,yellow-alt-other :weight bold))))
`(org-warning ((,class (:foreground ,blue-intense))))
;;;; outline-mode
`(outline-1 ((,class (:inherit org-level-1))))
`(outline-2 ((,class (:inherit org-level-2))))

View File

@ -1090,14 +1090,14 @@ between foreground and background is >= 7:1)."
`(neo-vc-up-to-date-face ((,class (:foreground ,fg-alt))))
`(neo-vc-user-face ((,class (:foreground ,magenta))))
;;;; org-mode
`(org-agenda-calendar-event ((,class (:inherit default))))
`(org-agenda-calendar-sexp ((,class (:inherit default))))
`(org-agenda-calendar-clocking ((,class (:inherit modus-theme-special-cold))))
`(org-agenda-calendar-event ((,class (:foreground ,blue-alt))))
`(org-agenda-calendar-sexp ((,class (:foreground ,cyan-alt))))
`(org-agenda-clocking ((,class (:inherit modus-theme-special-cold))))
`(org-agenda-column-dateline ((,class (:inherit modus-theme-subtle-neutral))))
`(org-agenda-current-time ((,class (:inherit modus-theme-refine-cyan))))
`(org-agenda-current-time ((,class (:inherit modus-theme-intense-cyan))))
`(org-agenda-date ((,class (:foreground ,fg-main))))
`(org-agenda-date-today ((,class (:inherit modus-theme-refine-cyan))))
`(org-agenda-date-weekend ((,class (:inherit modus-theme-special-warm))))
`(org-agenda-date-today ((,class (:inherit modus-theme-subtle-cyan :weight bold :box t))))
`(org-agenda-date-weekend ((,class (:foreground ,fg-alt))))
`(org-agenda-diary ((,class (:inherit default))))
`(org-agenda-dimmed-todo-face ((,class (:inherit modus-theme-subtle-neutral))))
`(org-agenda-done ((,class (:foreground ,green))))
@ -1106,7 +1106,7 @@ between foreground and background is >= 7:1)."
`(org-agenda-filter-regexp ((,class (:background ,bg-active :foreground ,fg-main :box t))))
`(org-agenda-filter-tags ((,class (:background ,bg-active :foreground ,fg-main :box t))))
`(org-agenda-restriction-lock ((,class (:background ,bg-dim :foreground ,fg-dim))))
`(org-agenda-structure ((,class (:foreground ,fg-alt))))
`(org-agenda-structure ((,class (:foreground ,fg-special-mild))))
`(org-archived ((,class (:background ,bg-alt :foreground ,fg-alt))))
`(org-block ((,class (:inherit default))))
`(org-block-begin-line ((,class (:background ,bg-dim :foreground ,fg-alt))))
@ -1119,11 +1119,11 @@ between foreground and background is >= 7:1)."
`(org-column ((,class (:background ,bg-alt))))
`(org-column-title ((,class (:underline t :background ,bg-alt :weight bold))))
`(org-date ((,class (:foreground ,cyan))))
`(org-date-selected ((,class (:inherit modus-theme-intense-cyan))))
`(org-date-selected ((,class (:inherit modus-theme-intense-cyan :weight bold))))
`(org-default ((,class (:inherit default))))
`(org-document-info ((,class (:foreground ,fg-special-cold))))
`(org-document-title ((,class (:foreground ,fg-special-cold :weight bold))))
`(org-done ((,class (:background ,bg-alt :foreground ,green))))
`(org-done ((,class (:foreground ,green))))
`(org-drawer ((,class (:foreground ,cyan-alt))))
`(org-ellipsis ((,class (:foreground ,yellow-alt :underline t))))
`(org-footnote ((,class (:foreground ,blue-alt :underline t))))
@ -1156,36 +1156,36 @@ between foreground and background is >= 7:1)."
,@(when modus-vivendi-theme-scale-headings
(list :height modus-vivendi-theme-scale-1))))))
`(org-level-5 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,cyan-alt-other :weight bold))))
`(org-level-6 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,green-alt-other :weight bold))))
`(org-level-7 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,fg-dim :weight bold))))
`(org-level-8 ((,class (:inherit ,modus-theme-variable-pitch
`(org-level-6 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,fg-alt :weight bold))))
`(org-level-7 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,cyan-active :weight bold))))
`(org-level-8 ((,class (:inherit ,modus-theme-variable-pitch
:foreground ,magenta-active :weight bold))))
`(org-link ((,class (:inherit link))))
`(org-list-dt ((,class (:foreground ,fg-dim :weight bold))))
`(org-macro ((,class (:inherit org-latex-and-related))))
`(org-meta-line ((,class (:inherit font-lock-comment-face))))
`(org-mode-line-clock ((,class (:background ,bg-main :foreground ,fg-main))))
`(org-mode-line-clock-overrun ((,class (:inherit modus-theme-intense-red))))
`(org-priority ((,class (:background ,bg-alt :foreground ,magenta-alt-other))))
`(org-priority ((,class (:foreground ,magenta))))
`(org-quote ((,class (:inherit org-block :foreground ,fg-special-cold))))
`(org-scheduled ((,class (:foreground ,cyan-alt-other))))
`(org-scheduled-previously ((,class (:foreground ,red-alt-other))))
`(org-scheduled-today ((,class (:foreground ,blue-alt-other :weight bold))))
`(org-scheduled ((,class (:foreground ,fg-special-cold))))
`(org-scheduled-previously ((,class (:foreground ,fg-special-warm))))
`(org-scheduled-today ((,class (:foreground ,yellow-alt-other))))
`(org-sexp-date ((,class (:inherit org-date))))
`(org-special-keyword ((,class (:foreground ,magenta-intense))))
`(org-special-keyword ((,class (:foreground ,cyan-alt))))
`(org-table ((,class (:foreground ,fg-special-cold))))
`(org-tag ((,class (:foreground ,fg-special-warm :weight bold))))
`(org-tag-group ((,class (:inherit org-tag))))
`(org-target ((,class (:underline t))))
`(org-time-grid ((,class (:foreground ,yellow-alt-other))))
`(org-todo ((,class (:background ,bg-alt :foreground ,yellow))))
`(org-todo ((,class (:foreground ,magenta-alt-other))))
`(org-upcoming-deadline ((,class (:foreground ,red-alt-other))))
`(org-verbatim ((,class (:background ,bg-dim :foreground ,fg-special-warm))))
`(org-verse ((,class (:inherit org-quote))))
`(org-warning ((,class (:background ,bg-alt :foreground ,yellow-alt-other :weight bold))))
`(org-warning ((,class (:foreground ,blue-intense))))
;;;; outline-mode
`(outline-1 ((,class (:inherit org-level-1))))
`(outline-2 ((,class (:inherit org-level-2))))