Skip to content

Commit

Permalink
Revise colours for deadlines and scheduled tasks
Browse files Browse the repository at this point in the history
The goal is two-fold:

1. Improve the semantics of relevant faces. This now covers the Org
   agenda. We want pending/urgent tasks to be rendered in a bold font
   and use a vivid colour. Whereas tasks that are not urgent should
   have a subtle colour and a normal weight. Thanks to Adam
   Porter (GitHub @alphapapa) for discussing this with me in issue
   102: <#102>.

2. Make the applicable colours be more consistent with the rest of the
   theme. In practice, this means that the colour values are cooler
   overall and the intensity is lower.
  • Loading branch information
protesilaos committed Oct 18, 2024
1 parent 817ff75 commit 77a0310
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 26 deletions.
4 changes: 3 additions & 1 deletion modus-operandi-deuteranopia-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -304,14 +304,16 @@ standard)."

(date-common cyan)
(date-deadline yellow-warmer)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday yellow-warmer)
(date-holiday-other blue)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled yellow-cooler)
(date-scheduled-subtle yellow-faint)
(date-weekday cyan)
(date-weekend yellow-faint)
(date-weekend magenta)

;;;; Line number mappings

Expand Down
10 changes: 6 additions & 4 deletions modus-operandi-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,17 @@ which corresponds to a minimum contrast in relative luminance of
;;;; Date mappings

(date-common cyan)
(date-deadline red)
(date-deadline red-cooler)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday red-cooler)
(date-holiday red)
(date-holiday-other blue)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled yellow-warmer)
(date-scheduled yellow)
(date-scheduled-subtle yellow-faint)
(date-weekday cyan)
(date-weekend red-faint)
(date-weekend magenta)

;;;; Line number mappings

Expand Down
10 changes: 6 additions & 4 deletions modus-operandi-tinted-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,17 @@ which corresponds to a minimum contrast in relative luminance of
;;;; Date mappings

(date-common cyan)
(date-deadline red)
(date-deadline red-cooler)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday red-cooler)
(date-holiday red)
(date-holiday-other blue)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled yellow-warmer)
(date-scheduled yellow)
(date-scheduled-subtle yellow-faint)
(date-weekday cyan)
(date-weekend red-faint)
(date-weekend magenta)

;;;; Line number mappings

Expand Down
4 changes: 3 additions & 1 deletion modus-operandi-tritanopia-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -304,14 +304,16 @@ standard)."

(date-common cyan-cooler)
(date-deadline red)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday red)
(date-holiday-other cyan)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled magenta)
(date-scheduled-subtle magenta-faint)
(date-weekday cyan)
(date-weekend red-faint)
(date-weekend magenta-warmer)

;;;; Line number mappings

Expand Down
12 changes: 6 additions & 6 deletions modus-themes.el
Original file line number Diff line number Diff line change
Expand Up @@ -3300,7 +3300,7 @@ FG and BG are the main colors."
`(org-headline-todo ((,c :inherit org-todo)))
`(org-hide ((,c :foreground ,bg-main)))
`(org-indent ((,c :inherit (fixed-pitch org-hide))))
`(org-imminent-deadline ((,c :inherit modus-themes-bold :foreground ,date-deadline)))
`(org-imminent-deadline ((,c :inherit bold :foreground ,date-deadline)))
`(org-latex-and-related ((,c :foreground ,type)))
`(org-level-1 ((,c :inherit modus-themes-heading-1)))
`(org-level-2 ((,c :inherit modus-themes-heading-2)))
Expand All @@ -3319,9 +3319,9 @@ FG and BG are the main colors."
`(org-priority ((,c :foreground ,prose-tag)))
`(org-property-value ((,c :inherit modus-themes-fixed-pitch :foreground ,prose-metadata-value)))
`(org-quote ((,c :inherit org-block)))
`(org-scheduled ((,c :foreground ,date-scheduled)))
`(org-scheduled-previously ((,c :inherit org-scheduled)))
`(org-scheduled-today ((,c :inherit (modus-themes-bold org-scheduled))))
`(org-scheduled ((,c :foreground ,date-scheduled-subtle)))
`(org-scheduled-previously ((,c :inherit (bold org-scheduled-today))))
`(org-scheduled-today ((,c :foreground ,date-scheduled)))
`(org-sexp-date ((,c :foreground ,date-common)))
`(org-special-keyword ((,c :inherit org-drawer)))
`(org-table ((,c :inherit modus-themes-fixed-pitch :foreground ,prose-table)))
Expand All @@ -3331,8 +3331,8 @@ FG and BG are the main colors."
`(org-target ((,c :underline t)))
`(org-time-grid ((,c :foreground ,fg-dim)))
`(org-todo ((,c :foreground ,prose-todo)))
`(org-upcoming-deadline ((,c :foreground ,date-deadline)))
`(org-upcoming-distant-deadline ((,c :inherit org-upcoming-deadline)))
`(org-upcoming-deadline ((,c :foreground ,date-deadline-subtle)))
`(org-upcoming-distant-deadline ((,c :foreground ,fg-main)))
`(org-verbatim ((,c :inherit modus-themes-prose-verbatim)))
`(org-verse ((,c :inherit org-block)))
`(org-warning ((,c :inherit warning)))
Expand Down
4 changes: 3 additions & 1 deletion modus-vivendi-deuteranopia-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -304,14 +304,16 @@ standard)."

(date-common cyan)
(date-deadline yellow-warmer)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday yellow-warmer)
(date-holiday-other blue)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled yellow-cooler)
(date-scheduled-subtle yellow-faint)
(date-weekday cyan)
(date-weekend yellow-faint)
(date-weekend magenta)

;;;; Line number mappings

Expand Down
10 changes: 6 additions & 4 deletions modus-vivendi-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,17 @@ which corresponds to a minimum contrast in relative luminance of
;;;; Date mappings

(date-common cyan)
(date-deadline red)
(date-deadline red-cooler)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday red-cooler)
(date-holiday magenta-warmer)
(date-holiday-other blue)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled yellow-warmer)
(date-scheduled yellow-cooler)
(date-scheduled-subtle yellow-faint)
(date-weekday cyan)
(date-weekend red-faint)
(date-weekend magenta)

;;;; Line number mappings

Expand Down
10 changes: 6 additions & 4 deletions modus-vivendi-tinted-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,17 @@ which corresponds to a minimum contrast in relative luminance of
;;;; Date mappings

(date-common cyan)
(date-deadline red)
(date-deadline red-cooler)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday red-cooler)
(date-holiday magenta-warmer)
(date-holiday-other blue)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled yellow-warmer)
(date-scheduled yellow-cooler)
(date-scheduled-subtle yellow-faint)
(date-weekday cyan)
(date-weekend red-faint)
(date-weekend magenta)

;;;; Line number mappings

Expand Down
4 changes: 3 additions & 1 deletion modus-vivendi-tritanopia-theme.el
Original file line number Diff line number Diff line change
Expand Up @@ -304,14 +304,16 @@ standard)."

(date-common cyan-cooler)
(date-deadline red)
(date-deadline-subtle red-faint)
(date-event fg-alt)
(date-holiday red-intense)
(date-holiday-other cyan-warmer)
(date-now fg-main)
(date-range fg-alt)
(date-scheduled magenta)
(date-scheduled-subtle magenta-faint)
(date-weekday cyan)
(date-weekend red-faint)
(date-weekend magenta-warmer)

;;;; Line number mappings

Expand Down

0 comments on commit 77a0310

Please sign in to comment.