branch: externals/standard-themes
commit a759f5646f9ec5740c7372bf6a26727c76017150
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Expand the semantic colour mappings for dates
---
standard-dark-theme.el | 6 ++++++
standard-light-theme.el | 6 ++++++
standard-themes.el | 22 ++++++++++++++--------
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/standard-dark-theme.el b/standard-dark-theme.el
index 987dca5ef7..5f55817022 100644
--- a/standard-dark-theme.el
+++ b/standard-dark-theme.el
@@ -185,6 +185,12 @@
(info green)
(date-common cyan-warmer)
+ (date-deadline red)
+ (date-event fg-alt)
+ (date-holiday red-cooler)
+ (date-now fg-main)
+ (date-range fg-alt)
+ (date-scheduled green-cooler)
(date-weekday cyan-warmer)
(date-weekend red)
diff --git a/standard-light-theme.el b/standard-light-theme.el
index fbe06f250b..54328c7aa9 100644
--- a/standard-light-theme.el
+++ b/standard-light-theme.el
@@ -185,6 +185,12 @@
(info green)
(date-common cyan-warmer)
+ (date-deadline red)
+ (date-event fg-alt)
+ (date-holiday red-cooler)
+ (date-now fg-main)
+ (date-range fg-alt)
+ (date-scheduled green)
(date-weekday cyan-warmer)
(date-weekend red)
diff --git a/standard-themes.el b/standard-themes.el
index 5796a53cd7..1d51711d09 100644
--- a/standard-themes.el
+++ b/standard-themes.el
@@ -910,9 +910,9 @@ Optional prefix argument MAPPINGS has the same meaning as
for
`(calendar-weekday-header ((,c :foreground ,date-weekday)))
`(calendar-weekend-header ((,c :foreground ,date-weekend)))
`(diary ((,c :background ,bg-dim :foreground ,accent-0)))
- `(diary-anniversary ((,c :foreground ,accent-1)))
+ `(diary-anniversary ((,c :foreground ,date-holiday)))
`(diary-time ((,c :foreground ,date-common)))
- `(holiday ((,c :background ,bg-dim :foreground ,accent-2)))
+ `(holiday ((,c :foreground ,date-holiday)))
;;;; cider
`(cider-deprecated-face ((,c :background ,bg-warning :foreground
,warning)))
`(cider-enlightened-face ((,c :box ,warning)))
@@ -1669,24 +1669,25 @@ Optional prefix argument MAPPINGS has the same meaning
as for
`(orderless-match-face-2 ((,c :inherit bold :foreground ,accent-2)))
`(orderless-match-face-3 ((,c :inherit bold :foreground ,accent-3)))
;;;; org
- `(org-agenda-calendar-event ((,c :foreground ,fg-alt)))
+ `(org-agenda-calendar-daterange ((,c :foreground ,date-range)))
+ `(org-agenda-calendar-event ((,c :foreground ,date-event)))
`(org-agenda-calendar-sexp ((,c :inherit (italic
org-agenda-calendar-event))))
`(org-agenda-clocking ((,c :background ,bg-warning :foreground ,warning)))
`(org-agenda-column-dateline ((,c :background ,bg-alt)))
- `(org-agenda-current-time ((,c :foreground ,fg-main)))
- ;; `(org-agenda-date ((,c ,@(standard-themes--heading 'agenda-date
date-weekday))))
+ `(org-agenda-current-time ((,c :foreground ,date-now)))
+ `(org-agenda-date ((,c ,@(standard-themes--heading 'agenda-date
date-weekday))))
`(org-agenda-date-today ((,c :inherit org-agenda-date :underline t)))
`(org-agenda-date-weekend ((,c :inherit org-agenda-date)))
`(org-agenda-date-weekend-today ((,c :inherit org-agenda-date-today)))
`(org-agenda-diary ((,c :inherit org-agenda-calendar-sexp)))
`(org-agenda-dimmed-todo-face ((,c :inherit shadow)))
- `(org-agenda-done ((,c :inherit success)))
+ `(org-agenda-done ((,c :foreground ,info)))
`(org-agenda-filter-category ((,c :inherit bold :foreground
,modeline-err)))
`(org-agenda-filter-effort ((,c :inherit bold :foreground ,modeline-err)))
`(org-agenda-filter-regexp ((,c :inherit bold :foreground ,modeline-err)))
`(org-agenda-filter-tags ((,c :inherit bold :foreground ,modeline-err)))
`(org-agenda-restriction-lock ((,c :background ,bg-dim :foreground
,fg-dim)))
- ;; `(org-agenda-structure ((,c ,@(standard-themes--heading
'agenda-structure fg-alt))))
+ `(org-agenda-structure ((,c ,@(standard-themes--heading 'agenda-structure
fg-alt))))
`(org-agenda-structure-filter ((,c :inherit org-agenda-structure
:foreground ,rainbow-1)))
`(org-agenda-structure-secondary ((,c :foreground ,rainbow-1)))
`(org-archived ((,c :background ,bg-alt :foreground ,fg-main)))
@@ -1709,7 +1710,7 @@ Optional prefix argument MAPPINGS has the same meaning as
for
`(org-formula ((,c :inherit standard-themes-fixed-pitch :foreground
,comment)))
`(org-hide ((,c :foreground ,bg-main)))
`(org-indent ((,c :inherit (fixed-pitch org-hide))))
- `(org-imminent-deadline ((,c :inherit bold :foreground ,err)))
+ `(org-imminent-deadline ((,c :inherit standard-themes-bold :foreground
,date-deadline)))
`(org-latex-and-related ((,c :foreground ,type)))
`(org-level-1 ((,c :inherit standard-themes-heading-1)))
`(org-level-2 ((,c :inherit standard-themes-heading-2)))
@@ -1728,6 +1729,9 @@ Optional prefix argument MAPPINGS has the same meaning as
for
`(org-priority ((,c :foreground ,keyword)))
`(org-property-value ((,c :inherit standard-themes-fixed-pitch :foreground
,fg-alt)))
`(org-quote ((,c :inherit org-block)))
+ `(org-scheduled ((,c :foreground ,date-scheduled)))
+ ;; `(org-scheduled-previously ((,c :inherit org-scheduled)))
+ `(org-scheduled-today ((,c :inherit (standard-themes-bold org-scheduled))))
`(org-sexp-date ((,c :foreground ,date-common)))
`(org-special-keyword ((,c :inherit standard-themes-fixed-pitch
:foreground ,keyword)))
`(org-table ((,c :inherit standard-themes-fixed-pitch :foreground
,fg-alt)))
@@ -1737,6 +1741,8 @@ Optional prefix argument MAPPINGS has the same meaning as
for
`(org-target ((,c :underline t)))
`(org-time-grid ((,c :foreground ,fg-dim)))
`(org-todo ((,c :inherit bold :foreground ,err)))
+ `(org-upcoming-deadline ((,c :foreground ,date-deadline)))
+ `(org-upcoming-distant-deadline ((,c :inherit org-upcoming-deadline)))
`(org-verbatim ((,c :inherit standard-themes-fixed-pitch :foreground
,prose-verbatim)))
`(org-verse ((,c :inherit org-block)))
`(org-warning ((,c :inherit warning)))
