From ca63e9aab18d7e0df1666744cf9d49fb639ec13f Mon Sep 17 00:00:00 2001 From: Protesilaos Stavrou Date: Wed, 11 Jun 2025 08:09:05 +0300 Subject: [PATCH] Update modus-themes to their version 4.8.0 * doc/misc/modus-themes.org (Preview theme colors):(Get a single color from the palette with ~modus-themes-get-color-value~): (DIY Do not extend the region background, Note on SHR fonts): Fix some typos. (Full support for packages or face groups): Include tmr in the list of supported packages. (Acknowledgements): Mention more people who have contributed to the project in some capacity. * etc/themes/modus-operandi-deuteranopia-theme.el: * etc/themes/modus-operandi-theme.el: * etc/themes/modus-operandi-tinted-theme.el: * etc/themes/modus-operandi-tritanopia-theme.el: * etc/themes/modus-vivendi-deuteranopia-theme.el: * etc/themes/modus-vivendi-theme.el: * etc/themes/modus-vivendi-tinted-theme.el: * etc/themes/modus-vivendi-tritanopia-theme.el: Make small changes to the palette of each theme. * etc/themes/modus-themes.el (modus-themes-after-load-theme-hook): Reword the doc string (modus-themes--rotate, modus-themes--rotate-p) (modus-themes--next-in-rotation, modus-themes-rotate): Make rotation optionally move in the opposite direction. (modus-themes-faces): Tweak some faces. Release notes: . (cherry picked from commit 7416595e2fc0ff676ef98a139328722ac9220ca0) --- doc/misc/modus-themes.org | 101 +++++++++--------- .../modus-operandi-deuteranopia-theme.el | 15 +-- etc/themes/modus-operandi-theme.el | 15 +-- etc/themes/modus-operandi-tinted-theme.el | 19 ++-- etc/themes/modus-operandi-tritanopia-theme.el | 15 +-- etc/themes/modus-themes.el | 58 +++++----- .../modus-vivendi-deuteranopia-theme.el | 15 +-- etc/themes/modus-vivendi-theme.el | 15 +-- etc/themes/modus-vivendi-tinted-theme.el | 19 ++-- etc/themes/modus-vivendi-tritanopia-theme.el | 15 +-- 10 files changed, 154 insertions(+), 133 deletions(-) diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 8b5940f83a4..286f580ebc6 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -4,9 +4,9 @@ #+language: en #+options: ':t toc:nil author:t email:t num:t #+startup: content -#+macro: stable-version 4.7.0 -#+macro: release-date 2025-04-17 -#+macro: development-version 4.8.0-dev +#+macro: stable-version 4.8.0 +#+macro: release-date 2025-06-11 +#+macro: development-version 4.9.0-dev #+macro: file @@texinfo:@file{@@$1@@texinfo:}@@ #+macro: space @@texinfo:@: @@ #+macro: kbd @@texinfo:@kbd{@@$1@@texinfo:}@@ @@ -1321,7 +1321,7 @@ semantic color mappings instead of the full palette ([[#h:34c7a691-19bb-4037-8d2 #+findex: modus-themes-preview-colors #+findex: modus-themes-preview-colors-current -Aliases for these commands are ~modus-themes-preview-colors~ and +Aliases for those commands are ~modus-themes-preview-colors~ and ~modus-themes-preview-colors-current~. Each row includes a foreground and background rendition of the given @@ -1356,7 +1356,7 @@ value in some other application. :END: #+findex: modus-themes-get-color-value -The fuction ~modus-themes-get-color-value~ can be called from Lisp to +The function ~modus-themes-get-color-value~ can be called from Lisp to return the value of a color from the active Modus theme palette. It takea a =COLOR= argument and an optional =OVERRIDES=. It also accepts a third =THEME= argument, to get the color from the given theme. @@ -2936,7 +2936,7 @@ Reload the theme for changes to take effect. :CUSTOM_ID: h:a5140c9c-18b2-45db-8021-38d0b5074116 :END: -By the default, the background of the ~region~ face extends from the +By default, the background of the ~region~ face extends from the end of the line to the edge of the window. To limit it to the end of the line, we need to override the face's =:extend= attribute. Adding this to the Emacs configuration file will suffice: @@ -4395,6 +4395,7 @@ have lots of extensions, so the "full support" may not be 100% true… + term + textsec + tldr ++ tmr + transient (pop-up windows such as Magit's) + trashed + treemacs @@ -5075,7 +5076,7 @@ Consult the doc string of ~shr-use-colors~. :end: #+cindex: Fonts in EWW, Elfeed, Ement, and SHR -By default, packages that build on top of the Simple HTML Remember +By default, packages that build on top of the Simple HTML Renderer (~shr~) use proportionately spaced fonts. This is controlled by the user option ~shr-use-fonts~, which is set to non-~nil~ by default. To use the standard font instead, set that variable to ~nil~. @@ -5696,51 +5697,53 @@ The Modus themes are a collective effort. Every bit of work matters. Griffin, Anders Johansson, Antonio Ruiz, Basil L.{{{space()}}} Contovounesios, Björn Lindström, Carlo Zancanaro, Christian Tietze, Daniel Mendler, David Edmondson, Eli Zaretskii, Fritz Grabo, Gautier - Ponsinet, Illia Ostapyshyn, Jared Finder, Kévin Le Gouguec, Koen van - Greevenbroek, Kostadin Ninev, Leilei332, Madhavan Krishnan, Manuel - Giraud, Markus Beppler, Matthew Stevenson, Mauro Aranda, Nacho - Barrientos, Niall Dooley, Nicolas De Jaeghere, Paul David, Pavel - Novichkov, Philip Kaludercic, Pierre Téchoueyres, Rahul M. - {{{space()}}} Juliato, Rudolf Adamkovič, Sergey Nichiporchik, - Shreyas Ragavan, Stefan Kangas, Stephen Berman, Stephen Gildea, - Steve Downey, Thanos Apollo, Tomasz Hołubowicz, Utkarsh Singh, - Vincent Murphy, Xinglu Chen, Yuanchen Xie, fluentpwn, okamsn. + Ponsinet, Illia Ostapyshyn, Jacob S.{{{space()}}} Gordon, Jared + Finder, Kévin Le Gouguec, Koen van Greevenbroek, Kostadin Ninev, + Leilei332, Madhavan Krishnan, Manuel Giraud, Markus Beppler, Matthew + Stevenson, Mauro Aranda, Nacho Barrientos, Niall Dooley, Nicolas De + Jaeghere, Paul David, Pavel Novichkov, Philip Kaludercic, Pierre + Téchoueyres, Rahul M.{{{space()}}} Juliato, Rudolf Adamkovič, + Sergey Nichiporchik, Shreyas Ragavan, Stefan Kangas, Stephen Berman, + Stephen Gildea, Steve Downey, Thanos Apollo, Tomasz Hołubowicz, + Utkarsh Singh, Vincent Murphy, Xinglu Chen, Yuanchen Xie, fluentpwn, + okamsn. + Ideas and user feedback :: Aaron Jensen, Adam Porter, Adam Spiers, Adrian Manea, Aleksei Pirogov, Alex Griffin, Alex Koen, Alex - Peitsinis, Alexey Shmalko, Alok Singh, Anders Johansson, André - Alexandre Gomes, Andrew Tropin, Antonio Hernández Blas, Arif Rezai, - Augusto Stoffel, Basil L.{{{space()}}} Contovounesios, Bernd - Rellermeyer, Burgess Chang, Charlotte Van Petegem, Christian Tietze, - Christopher Dimech, Christopher League, Damien Cassou, Daniel - Mendler, Dario Gjorgjevski, David Edmondson, Davor Rotim, Divan - Santana, Eliraz Kedmi, Emanuele Michele Alberto Monterosso, Farasha - Euker, Feng Shu, Filippo Argiolas, Gautier Ponsinet, Gerry Agbobada, - Gianluca Recchia, Gonçalo Marrafa, Guilherme Semente, Gustavo - Barros, Hörmetjan Yiltiz, Ilja Kocken, Imran Khan, Iris Garcia, Ivan - Popovych, Jabir Ali Ouassou, James Ferguson, Jeremy Friesen, Jerry - Zhang, Johannes Grødem, John Haman, John Wick, Jonas Collberg, Jorge - Morais, Joshua O'Connor, Julio C. Villasante, Kenta Usami, Kevin - Fleming, Kévin Le Gouguec, Kevin Kainan Li, Kostadin Ninev, Laith - Bahodi, Lasse Lindner, Len Trigg, Lennart C.{{{space()}}} Karssen, - Luis Miguel Castañeda, Magne Hov, Manuel Giraud, Manuel Uberti, Mark - Bestley, Mark Burton, Mark Simpson, Marko Kocic, Markus Beppler, - Matt Armstrong, Matthias Fuchs, Mattias Engdegård, Mauro Aranda, - Maxime Tréca, Michael Goldenberg, Morgan Smith, Morgan Willcock, - Murilo Pereira, Nicky van Foreest, Nicolas De Jaeghere, Nicolas - Semrau, Olaf Meeuwissen, Oliver Epper, Pablo Stafforini, Paul - Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu, Philip Kaludercic, - Pierre Téchoueyres, Przemysław Kryger, Robert Hepple, Roman Rudakov, - Russell Sim, Ryan Phillips, Rytis Paškauskas, Rudolf Adamkovič, Sam - Kleinman, Samuel Culpepper, Saša Janiška, Shreyas Ragavan, Simon - Pugnet, Steve Downey, Tassilo Horn, Thanos Apollo, Thibaut Verron, - Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey Merkley, Tomasz - Hołubowicz, Toon Claes, Uri Sharf, Utkarsh Singh, Vincent Foley, - Zoltan Kiraly. As well as users: Ben, CsBigDataHub1, Emacs Contrib, - Eugene, Fourchaux, Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, - TitusMu, Trey, ZharMeny, bepolymathe, bit9tream, bangedorrunt, - derek-upham, doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, - okamsn, pedro-nonfree, pRot0ta1p, shipmints, soaringbird, tumashu, + Peitsinis, Alexandr Semenov, Alexey Shmalko, Alok Singh, Anders + Johansson, André Alexandre Gomes, Andrew Tropin, Antonio Hernández + Blas, Arif Rezai, Augusto Stoffel, Basil L.{{{space()}}} + Contovounesios, Bernd Rellermeyer, Burgess Chang, Charlotte Van + Petegem, Christian Tietze, Christopher Dimech, Christopher League, + Damien Cassou, Daniel Mendler, Dario Gjorgjevski, David Edmondson, + Davor Rotim, Divan Santana, Eliraz Kedmi, Emanuele Michele Alberto + Monterosso, Farasha Euker, Feng Shu, Filippo Argiolas, Gautier + Ponsinet, Gerry Agbobada, Gianluca Recchia, Gonçalo Marrafa, + Guilherme Semente, Gustavo Barros, Hörmetjan Yiltiz, Ilja Kocken, + Imran Khan, Iris Garcia, Ivan Popovych, Jabir Ali Ouassou, James + Ferguson, Jeremy Friesen, Jerry Zhang, Johannes Grødem, John Haman, + John Wick, Jonas Collberg, Jorge Morais, Joshua O'Connor, Julio C. + Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec, Kevin + Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse Lindner, Len Trigg, + Lennart C.{{{space()}}} Karssen, Luis Miguel Castañeda, Magne Hov, + Manuel Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark + Simpson, Marko Kocic, Markus Beppler, Matt Armstrong, Matthias + Fuchs, Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael + Goldenberg, Morgan Smith, Morgan Willcock, Murilo Pereira, Nicky van + Foreest, Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen, + Oliver Epper, Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete + Kazmier, Peter Wu, Philip Kaludercic, Pierre Téchoueyres, Przemysław + Kryger, Robert Hepple, Roman Rudakov, Russell Sim, Ryan Phillips, + Rytis Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel Culpepper, + Saša Janiška, Shreyas Ragavan, Simon Pugnet, Steve Downey, Tassilo + Horn, Thanos Apollo, Thibaut Verron, Thomas Heartman, Togan + Muftuoglu, Tony Zorman, Trey Merkley, Tomasz Hołubowicz, Toon Claes, + Uri Sharf, Utkarsh Singh, Vincent Foley, Zoltan Kiraly. As well as + users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, + Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, TitusMu, Trey, + ZharMeny, bepolymathe, bit9tream, bangedorrunt, derek-upham, doolio, + fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn, + pedro-nonfree, pRot0ta1p, shipmints, soaringbird, tumashu, wakamenod. + Packaging :: Basil L.{{{space()}}} Contovounesios, Eli Zaretskii, diff --git a/etc/themes/modus-operandi-deuteranopia-theme.el b/etc/themes/modus-operandi-deuteranopia-theme.el index 45167dbd7d4..2d6d4120f70 100644 --- a/etc/themes/modus-operandi-deuteranopia-theme.el +++ b/etc/themes/modus-operandi-deuteranopia-theme.el @@ -212,6 +212,13 @@ standard)." (bg-diff-context "#f3f3f3") +;;; Paren match + + (bg-paren-match "#5fcfff") + (fg-paren-match fg-main) + (bg-paren-expression "#efd3f5") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -257,6 +264,7 @@ standard)." (number fg-main) (operator fg-main) (preprocessor magenta-cooler) + (property cyan) (punctuation fg-main) (rx-backslash blue-cooler) (rx-construct yellow-cooler) @@ -264,13 +272,6 @@ standard)." (type cyan-cooler) (variable cyan) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-yellow-nuanced) - ;;;; Accent mappings (accent-0 blue-warmer) diff --git a/etc/themes/modus-operandi-theme.el b/etc/themes/modus-operandi-theme.el index 6f92f864616..2de59012e44 100644 --- a/etc/themes/modus-operandi-theme.el +++ b/etc/themes/modus-operandi-theme.el @@ -210,6 +210,13 @@ which corresponds to a minimum contrast in relative luminance of (bg-diff-context "#f3f3f3") +;;; Paren match + + (bg-paren-match "#5fcfff") + (fg-paren-match fg-main) + (bg-paren-expression "#efd3f5") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -255,6 +262,7 @@ which corresponds to a minimum contrast in relative luminance of (number fg-main) (operator fg-main) (preprocessor red-cooler) + (property cyan) (punctuation fg-main) (rx-backslash magenta) (rx-construct green-cooler) @@ -262,13 +270,6 @@ which corresponds to a minimum contrast in relative luminance of (type cyan-cooler) (variable cyan) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-yellow-nuanced) - ;;;; Accent mappings (accent-0 blue) diff --git a/etc/themes/modus-operandi-tinted-theme.el b/etc/themes/modus-operandi-tinted-theme.el index 11b7f38ba0f..297b9784ca2 100644 --- a/etc/themes/modus-operandi-tinted-theme.el +++ b/etc/themes/modus-operandi-tinted-theme.el @@ -210,6 +210,13 @@ which corresponds to a minimum contrast in relative luminance of (bg-diff-context "#efe9df") +;;; Paren match + + (bg-paren-match "#7fdfcf") + (fg-paren-match fg-main) + (bg-paren-expression "#efd3f5") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -255,6 +262,7 @@ which corresponds to a minimum contrast in relative luminance of (number fg-main) (operator fg-main) (preprocessor yellow-warmer) + (property green-cooler) (punctuation fg-main) (rx-backslash magenta-warmer) (rx-construct magenta-cooler) @@ -262,13 +270,6 @@ which corresponds to a minimum contrast in relative luminance of (type green-warmer) (variable green-cooler) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-yellow-nuanced) - ;;;; Accent mappings (accent-0 red-cooler) @@ -332,11 +333,11 @@ which corresponds to a minimum contrast in relative luminance of ;;;; Mail mappings - (mail-cite-0 cyan-cooler) + (mail-cite-0 cyan) (mail-cite-1 yellow) (mail-cite-2 green-warmer) (mail-cite-3 red-cooler) - (mail-part magenta-cooler) + (mail-part green-cooler) (mail-recipient blue-warmer) (mail-subject magenta-warmer) (mail-other magenta) diff --git a/etc/themes/modus-operandi-tritanopia-theme.el b/etc/themes/modus-operandi-tritanopia-theme.el index 8638d201d7f..fd256ea3514 100644 --- a/etc/themes/modus-operandi-tritanopia-theme.el +++ b/etc/themes/modus-operandi-tritanopia-theme.el @@ -212,6 +212,13 @@ standard)." (bg-diff-context "#f3f3f3") +;;; Paren match + + (bg-paren-match "#5fcfff") + (fg-paren-match fg-main) + (bg-paren-expression "#efd3f5") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -257,6 +264,7 @@ standard)." (number fg-main) (operator fg-main) (preprocessor red-warmer) + (property cyan-cooler) (punctuation fg-main) (rx-backslash magenta) (rx-construct red) @@ -264,13 +272,6 @@ standard)." (type blue-warmer) (variable cyan-cooler) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-red-nuanced) - ;;;; Accent mappings (accent-0 cyan) diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el index df39cf2d192..ea6b578b24a 100644 --- a/etc/themes/modus-themes.el +++ b/etc/themes/modus-themes.el @@ -5,7 +5,7 @@ ;; Author: Protesilaos Stavrou ;; Maintainer: Protesilaos Stavrou ;; URL: https://github.com/protesilaos/modus-themes -;; Version: 4.7.0 +;; Version: 4.8.0 ;; Package-Requires: ((emacs "28.1")) ;; Keywords: faces, theme, accessibility @@ -333,7 +333,9 @@ the same as using the command `modus-themes-select'." (defcustom modus-themes-after-load-theme-hook nil "Hook that runs after loading a Modus theme. -This is used by the command `modus-themes-toggle'." +This is used by the commands `modus-themes-toggle', +`modus-themes-rotate', `modus-themes-select', as well as the function +`modus-themes-load-theme'." :type 'hook :package-version '(modus-themes . "4.0.0") :version "30.1" @@ -1260,34 +1262,31 @@ Disable other themes per `modus-themes-disable-other-themes'." ;;;;; Rotate through a list of themes -(defun modus-themes--rotate (themes) - "Rotate THEMES rightward such that the car is moved to the end." - (if (proper-list-p themes) - (let* ((index (seq-position themes (modus-themes--current-theme))) - (offset (1+ index))) - (append (nthcdr offset themes) (take offset themes))) - (error "The `%s' is not a list" themes))) - -(defun modus-themes--rotate-p (themes) - "Return a new theme among THEMES if it is possible to rotate to it." - (if-let* ((new-theme (car (modus-themes--rotate themes)))) - (if (eq new-theme (modus-themes--current-theme)) - (car (modus-themes--rotate-p (modus-themes--rotate themes))) - new-theme) +(defun modus-themes--next-in-rotation (themes &optional reverse) + "Return a new theme among THEMES if it is possible to rotate to it. +The argument REVERSE controls the direction of rotation." + (if-let* ((index (seq-position themes (modus-themes--current-theme))) + (offset (mod (if reverse (1- index) (1+ index)) + (length themes))) + (new-theme (nth offset themes))) + new-theme (error "Cannot determine a theme among `%s'" themes))) ;;;###autoload -(defun modus-themes-rotate (themes) +(defun modus-themes-rotate (themes &optional reverse) "Rotate to the next theme among THEMES. -When called interactively THEMES is the value of `modus-themes-to-rotate'. +When called interactively THEMES is the value of `modus-themes-to-rotate' +and REVERSE is the prefix argument. If the current theme is already the next in line, then move to the one -after. Perform the rotation rightwards, such that the first element in -the list becomes the last. Do not modify THEMES in the process." - (interactive (list modus-themes-to-rotate)) +after. The rotation is performed rightwards if REVERSE is nil (the +default), and leftwards if REVERSE is non-nil. Perform the rotation +such that the current element in the list becomes the last. Do not +modify THEMES in the process." + (interactive (list modus-themes-to-rotate current-prefix-arg)) (unless (proper-list-p themes) "This is not a list of themes: `%s'" themes) - (let ((candidate (modus-themes--rotate-p themes))) + (let ((candidate (modus-themes--next-in-rotation themes reverse))) (if (modus-themes--modus-p candidate) (progn (message "Rotating to `%s'" (propertize (symbol-name candidate) 'face 'success)) @@ -1690,6 +1689,7 @@ FG and BG are the main colors." `(escape-glyph ((,c :foreground ,err))) `(file-name-shadow ((,c :inherit shadow))) `(header-line ((,c :inherit modus-themes-ui-variable-pitch :background ,bg-dim))) + `(header-line-inactive ((,c :inherit (modus-themes-ui-variable-pitch shadow)))) `(header-line-highlight ((,c :background ,bg-hover :foreground ,fg-main :box ,fg-main))) `(help-argument-name ((,c :inherit modus-themes-slant :foreground ,variable))) `(help-key-binding ((,c :inherit modus-themes-key-binding))) @@ -2504,6 +2504,7 @@ FG and BG are the main colors." `(font-lock-number-face ((,c :foreground ,number))) `(font-lock-operator-face ((,c :foreground ,operator))) `(font-lock-preprocessor-face ((,c :foreground ,preprocessor))) + `(font-lock-property-name-face ((,c :foreground ,property))) `(font-lock-punctuation-face ((,c :foreground ,punctuation))) `(font-lock-regexp-grouping-backslash ((,c :inherit modus-themes-bold :foreground ,rx-backslash))) `(font-lock-regexp-grouping-construct ((,c :inherit modus-themes-bold :foreground ,rx-construct))) @@ -2635,7 +2636,7 @@ FG and BG are the main colors." `(gnus-summary-low-ticked ((,c :inherit italic :foreground ,err))) `(gnus-summary-low-undownloaded ((,c :inherit italic :foreground ,warning))) `(gnus-summary-low-unread ((,c :inherit italic))) - `(gnus-summary-normal-ancient (( ))) + `(gnus-summary-normal-ancient ((,c :inherit shadow))) `(gnus-summary-normal-read ((,c :inherit shadow))) `(gnus-summary-normal-ticked ((,c :foreground ,err))) `(gnus-summary-normal-undownloaded ((,c :foreground ,warning))) @@ -2926,7 +2927,8 @@ FG and BG are the main colors." `(keycast-command ((,c :inherit bold))) `(keycast-key ((,c :inherit modus-themes-bold :background ,keybind :foreground ,bg-main))) ;;;;; kmacro-menu - `(kmacro-menu-mark ((,c :inherit bold))) + ;; Use `list' here to avoid a spurious warning about `kmacro-menu-mark'. + (list 'kmacro-menu-mark `((,c :inherit bold))) `(kmacro-menu-marked ((,c :inherit modus-themes-mark-sel))) `(kmacro-menu-flagged ((,c :inherit modus-themes-mark-del))) ;;;;; ledger-mode @@ -3872,6 +3874,14 @@ FG and BG are the main colors." `(tldr-description ((,c :inherit font-lock-doc-face))) `(tldr-introduction ((,c :inherit font-lock-comment-face))) `(tldr-title ((,c :inherit bold))) +;;;;; tmr + `(tmr-mode-line-active ((,c :inherit bold :foreground ,modeline-info))) + `(tmr-mode-line-soon ((,c :inherit bold :foreground ,modeline-warning))) + `(tmr-mode-line-urgent ((,c :inherit bold :foreground ,modeline-err))) + `(tmr-tabulated-description ((,c :foreground ,docstring))) + `(tmr-tabulated-end-time ((,c :foreground ,date-deadline))) + `(tmr-tabulated-remaining-time ((,c :foreground ,date-scheduled))) + `(tmr-tabulated-start-time ((,c :foreground ,date-common))) ;;;;; transient `(transient-active-infix ((,c :inherit highlight))) `(transient-amaranth ((,c :inherit bold :foreground ,yellow-warmer))) diff --git a/etc/themes/modus-vivendi-deuteranopia-theme.el b/etc/themes/modus-vivendi-deuteranopia-theme.el index 676432f8531..e9e617ccab5 100644 --- a/etc/themes/modus-vivendi-deuteranopia-theme.el +++ b/etc/themes/modus-vivendi-deuteranopia-theme.el @@ -212,6 +212,13 @@ standard)." (bg-diff-context "#1a1a1a") +;;; Paren match + + (bg-paren-match "#2f7f9f") + (fg-paren-match fg-main) + (bg-paren-expression "#453040") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -257,6 +264,7 @@ standard)." (number fg-main) (operator fg-main) (preprocessor magenta-cooler) + (property cyan) (punctuation fg-main) (rx-backslash blue-cooler) (rx-construct yellow-cooler) @@ -264,13 +272,6 @@ standard)." (type cyan-cooler) (variable cyan) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-yellow-nuanced) - ;;;; Accent mappings (accent-0 blue-warmer) diff --git a/etc/themes/modus-vivendi-theme.el b/etc/themes/modus-vivendi-theme.el index b613353ade7..10b95ec9c43 100644 --- a/etc/themes/modus-vivendi-theme.el +++ b/etc/themes/modus-vivendi-theme.el @@ -210,6 +210,13 @@ which corresponds to a minimum contrast in relative luminance of (bg-diff-context "#1a1a1a") +;;; Paren match + + (bg-paren-match "#2f7f9f") + (fg-paren-match fg-main) + (bg-paren-expression "#453040") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -255,6 +262,7 @@ which corresponds to a minimum contrast in relative luminance of (number fg-main) (operator fg-main) (preprocessor red-cooler) + (property cyan) (punctuation fg-main) (rx-backslash magenta) (rx-construct green-cooler) @@ -262,13 +270,6 @@ which corresponds to a minimum contrast in relative luminance of (type cyan-cooler) (variable cyan) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-yellow-nuanced) - ;;;; Accent mappings (accent-0 blue-cooler) diff --git a/etc/themes/modus-vivendi-tinted-theme.el b/etc/themes/modus-vivendi-tinted-theme.el index ba186fc9f8f..f5e6d1d9584 100644 --- a/etc/themes/modus-vivendi-tinted-theme.el +++ b/etc/themes/modus-vivendi-tinted-theme.el @@ -210,6 +210,13 @@ which corresponds to a minimum contrast in relative luminance of (bg-diff-context "#1a1f30") +;;; Paren match + + (bg-paren-match "#4f7f9f") + (fg-paren-match fg-main) + (bg-paren-expression "#453040") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -255,6 +262,7 @@ which corresponds to a minimum contrast in relative luminance of (number fg-main) (operator fg-main) (preprocessor red-cooler) + (property cyan-warmer) (punctuation fg-main) (rx-backslash magenta-warmer) (rx-construct magenta-cooler) @@ -262,13 +270,6 @@ which corresponds to a minimum contrast in relative luminance of (type green-cooler) (variable cyan-warmer) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-yellow-nuanced) - ;;;; Accent mappings (accent-0 magenta-cooler) @@ -332,11 +333,11 @@ which corresponds to a minimum contrast in relative luminance of ;;;; Mail mappings - (mail-cite-0 blue) + (mail-cite-0 blue-faint) (mail-cite-1 yellow-cooler) (mail-cite-2 cyan-cooler) (mail-cite-3 red-cooler) - (mail-part magenta-cooler) + (mail-part blue) (mail-recipient blue-warmer) (mail-subject magenta-warmer) (mail-other magenta) diff --git a/etc/themes/modus-vivendi-tritanopia-theme.el b/etc/themes/modus-vivendi-tritanopia-theme.el index 7929c69e31b..d8027368848 100644 --- a/etc/themes/modus-vivendi-tritanopia-theme.el +++ b/etc/themes/modus-vivendi-tritanopia-theme.el @@ -212,6 +212,13 @@ standard)." (bg-diff-context "#1a1a1a") +;;; Paren match + + (bg-paren-match "#2f7f9f") + (fg-paren-match fg-main) + (bg-paren-expression "#453040") + (underline-paren-match unspecified) + ;;; Mappings ;;;; General mappings @@ -257,6 +264,7 @@ standard)." (number fg-main) (operator fg-main) (preprocessor red-warmer) + (property cyan-cooler) (punctuation fg-main) (rx-backslash magenta) (rx-construct red) @@ -264,13 +272,6 @@ standard)." (type blue-warmer) (variable cyan-cooler) -;;;; Paren match - - (bg-paren-match bg-cyan-subtle) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-paren-expression bg-red-nuanced) - ;;;; Accent mappings (accent-0 cyan) -- 2.39.5