BREAKING: Make proof-of-concept for the redesign on top of the modus-themes

I still need to re-implement the relevant commands to switch themes,
but this is already an important step forward.

1 files changed, 84 insertions, 205 deletions

diff --git a/ef-maris-light-theme.el b/ef-maris-light-theme.el
index 70df614..0a6aeef 100644
--- a/ef-maris-light-theme.el
+++ b/ef-maris-light-theme.el
@@ -36,137 +36,83 @@
 (eval-and-compile
   (require 'ef-themes)
 
-;;;###theme-autoload
-  (deftheme ef-maris-light
-    "Legible light theme with blue, cyan, and green colors."
-    :background-mode 'light
-    :kind 'color-scheme
-    :family 'ef)
-
-  (defconst ef-maris-light-palette
-    '(
-;;; Basic values
-
-      (bg-main     "#edf4f8")
-      (fg-main     "#151a27")
-      (bg-dim      "#e0e7ef")
-      (fg-dim      "#676470")
-      (bg-alt      "#cfd8e3")
-      (fg-alt      "#3f4f99")
-
-      (bg-active   "#afb8c3")
+  (defconst ef-maris-light-partial
+    '((cursor "#036f99")
+      (bg-main "#edf4f8")
+      (bg-dim "#e0e7ef")
+      (bg-alt "#cfd8e3")
+      (fg-main "#151a27")
+      (fg-dim "#676470")
+      (fg-alt "#3f4f99")
+      (bg-active "#afb8c3")
       (bg-inactive "#e6ecf2")
-
-;;; Basic hues for foreground values
-
-      (red             "#c3303a")
-      (red-warmer      "#d00000")
-      (red-cooler      "#b02440")
-      (red-faint       "#8b4052")
-      (green           "#007010")
-      (green-warmer    "#3a6f00")
-      (green-cooler    "#007047")
-      (green-faint     "#4a763f")
-      (yellow          "#805a1f")
-      (yellow-warmer   "#8b4400")
-      (yellow-cooler   "#78542f")
-      (yellow-faint    "#7f4f4a")
-      (blue            "#375cc6")
-      (blue-warmer     "#444fcf")
-      (blue-cooler     "#003faf")
-      (blue-faint      "#3a5099")
-      (magenta         "#80308f")
-      (magenta-warmer  "#9a3a6a")
-      (magenta-cooler  "#5f2fba")
-      (magenta-faint   "#6a4a9f")
-      (cyan            "#1f66af")
-      (cyan-warmer     "#305675")
-      (cyan-cooler     "#006f70")
-      (cyan-faint      "#3f627f")
-
-;;; Basic hues for background values
-
-      (bg-red-intense     "#ff8f88")
-      (bg-green-intense   "#96df80")
-      (bg-yellow-intense  "#efbf00")
-      (bg-blue-intense    "#cfceff")
+      (border "#a2a6af")
+
+      (red "#c3303a")
+      (red-warmer "#d00000")
+      (red-cooler "#b02440")
+      (red-faint "#8b4052")
+      (green "#007010")
+      (green-warmer "#3a6f00")
+      (green-cooler "#007047")
+      (green-faint "#4a763f")
+      (yellow "#805a1f")
+      (yellow-warmer "#8b4400")
+      (yellow-cooler "#78542f")
+      (yellow-faint "#7f4f4a")
+      (blue "#375cc6")
+      (blue-warmer "#444fcf")
+      (blue-cooler "#003faf")
+      (blue-faint "#3a5099")
+      (magenta "#80308f")
+      (magenta-warmer "#9a3a6a")
+      (magenta-cooler "#5f2fba")
+      (magenta-faint "#6a4a9f")
+      (cyan "#1f66af")
+      (cyan-warmer "#305675")
+      (cyan-cooler "#006f70")
+      (cyan-faint "#3f627f")
+
+      (bg-red-intense "#ff8f88")
+      (bg-green-intense "#96df80")
+      (bg-yellow-intense "#efbf00")
+      (bg-blue-intense "#cfceff")
       (bg-magenta-intense "#df9fff")
-      (bg-cyan-intense    "#88cfd0")
-
-      (bg-red-subtle      "#f0c6cf")
-      (bg-green-subtle    "#b0ebca")
-      (bg-yellow-subtle   "#e4e498")
-      (bg-blue-subtle     "#ccd5f7")
-      (bg-magenta-subtle  "#edd3f2")
-      (bg-cyan-subtle     "#b2e6f0")
-
-;;; Diffs
-
-      (bg-added          "#b0e8ca")
-      (bg-added-faint    "#c5f0e0")
-      (bg-added-refine   "#a0d4b9")
-      (fg-added          "#005000")
-
-      (bg-changed        "#f5e8b0")
-      (bg-changed-faint  "#f5f2bf")
+      (bg-cyan-intense "#88cfd0")
+
+      (bg-red-subtle "#f0c6cf")
+      (bg-green-subtle "#b0ebca")
+      (bg-yellow-subtle "#e4e498")
+      (bg-blue-subtle "#ccd5f7")
+      (bg-magenta-subtle "#edd3f2")
+      (bg-cyan-subtle "#b2e6f0")
+
+      (bg-added "#b0e8ca")
+      (bg-added-faint "#c5f0e0")
+      (bg-added-refine "#a0d4b9")
+      (fg-added "#005000")
+
+      (bg-changed "#f5e8b0")
+      (bg-changed-faint "#f5f2bf")
       (bg-changed-refine "#f0db9a")
-      (fg-changed        "#553d00")
+      (fg-changed "#553d00")
 
-      (bg-removed        "#f5c7d6")
-      (bg-removed-faint  "#f0d6d6")
+      (bg-removed "#f5c7d6")
+      (bg-removed-faint "#f0d6d6")
       (bg-removed-refine "#efb1cd")
-      (fg-removed        "#8f1313")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#ef7969")
-      (bg-graph-red-1     "#ffaab4")
-      (bg-graph-green-0   "#45c050")
-      (bg-graph-green-1   "#75ef30")
-      (bg-graph-yellow-0  "#ffcf00")
-      (bg-graph-yellow-1  "#f9ff00")
-      (bg-graph-blue-0    "#7f90ff")
-      (bg-graph-blue-1    "#a6c0ff")
-      (bg-graph-magenta-0 "#e07fff")
-      (bg-graph-magenta-1 "#fad0ff")
-      (bg-graph-cyan-0    "#70d3f0")
-      (bg-graph-cyan-1    "#afefff")
-
-;;; Special hues
-
-      (bg-mode-line       "#a0c2ef")
-      (fg-mode-line       "#142810")
-      (bg-completion      "#cddbfa")
-      (bg-hover           "#d2b4cf")
-      (bg-hover-secondary "#b7bbea")
-      (bg-hl-line         "#dae5f0")
-      (bg-paren           "#cab3b2")
-      (bg-err             "#f2c2b5") ; check with err
-      (bg-warning         "#e8df9a") ; check with warning
-      (bg-info            "#a4e2cf") ; check with info
-
-      (border        "#a2a6af")
-      (cursor        "#036f99")
-      (fg-intense    "#000000")
-
-      (modeline-err     "#950f0f")
-      (modeline-warning "#7000af")
-      (modeline-info    "#0040af")
-
-      (underline-err     "#ef0f1f")
-      (underline-warning "#bf5f00")
-      (underline-info    "#02af5f")
-
-      (bg-char-0 "#7feaff")
-      (bg-char-1 "#f0a0f0")
-      (bg-char-2 "#d0e000")
+      (fg-removed "#8f1313")
 
-;;; Mappings
-
-;;;; General mappings
-
-      (bg-fringe unspecified)
-      (fg-fringe unspecified)
+      (bg-mode-line-active "#a0c2ef")
+      (fg-mode-line-active "#142810")
+      (bg-completion "#cddbfa")
+      (bg-hover "#d2b4cf")
+      (bg-hover-secondary "#b7bbea")
+      (bg-hl-line "#dae5f0")
+      (bg-paren-match-match "#cab3b2")
+      (bg-region "#c8dcff")
+      (bg-err "#f2c2b5") ; check with err
+      (bg-warning "#e8df9a") ; check with warning
+      (bg-info "#a4e2cf") ; check with info
 
       (err red-warmer)
       (warning yellow-warmer)
@@ -178,12 +124,7 @@
       (keybind blue-cooler)
       (identifier magenta-faint)
       (prompt blue-warmer)
-
-      (bg-region "#c8dcff")
-      (fg-region unspecified)
-
-;;;; Code mappings
-
+      
       (builtin magenta-faint)
       (comment red-faint)
       (constant blue-cooler)
@@ -197,15 +138,11 @@
       (rx-escape yellow) ; compare with `string'
       (rx-construct red)
 
-;;;; Accent mappings
-
       (accent-0 blue-cooler)
       (accent-1 green)
       (accent-2 cyan)
       (accent-3 red-cooler)
 
-;;;; Date mappings
-
       (date-common cyan-cooler)
       (date-deadline red)
       (date-deadline-subtle red-cooler)
@@ -218,8 +155,6 @@
       (date-weekday cyan-warmer)
       (date-weekend red-faint)
 
-;;;; Prose mappings
-
       (prose-code cyan)
       (prose-done green-cooler)
       (prose-macro magenta-cooler)
@@ -231,8 +166,6 @@
       (prose-todo red-cooler)
       (prose-verbatim green-warmer)
 
-;;;; Mail mappings
-
       (mail-cite-0 cyan)
       (mail-cite-1 magenta)
       (mail-cite-2 blue-faint)
@@ -242,8 +175,6 @@
       (mail-subject green-warmer)
       (mail-other blue)
 
-;;;; Search mappings
-
       (bg-search-match bg-warning)
       (bg-search-current bg-yellow-intense)
       (bg-search-lazy bg-blue-intense)
@@ -254,62 +185,8 @@
       (bg-search-rx-group-2 bg-red-subtle)
       (bg-search-rx-group-3 bg-cyan-subtle)
 
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
       (bg-space-err bg-yellow-intense)
 
-;;;; Tab mappings
-
-      (bg-tab-bar      bg-alt)
-      (bg-tab-current  bg-main)
-      (bg-tab-other    bg-active)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "black")
-      (fg-term-black           "black")
-      (bg-term-black-bright    "gray35")
-      (fg-term-black-bright    "gray35")
-
-      (bg-term-red             red-cooler)
-      (fg-term-red             red-cooler)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue-warmer)
-      (fg-term-blue            blue-warmer)
-      (bg-term-blue-bright     blue-cooler)
-      (fg-term-blue-bright     blue-cooler)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "gray65")
-      (fg-term-white           "gray65")
-      (bg-term-white-bright    "white")
-      (fg-term-white-bright    "white")
-
-;;;; Rainbow mappings
-
       (rainbow-0 green-cooler)
       (rainbow-1 blue-warmer)
       (rainbow-2 green-warmer)
@@ -319,13 +196,7 @@
       (rainbow-6 magenta)
       (rainbow-7 cyan-cooler)
       (rainbow-8 yellow-cooler))
-    "The `ef-maris-light' palette.
-Color values have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a color that already exists
-in the palette and is associated with a HEX-VALUE.")
+    "Legible light marine theme with blue, cyan, and green colors.")
 
   (defcustom ef-maris-light-palette-overrides nil
     "Overrides for `ef-maris-light-palette'.
@@ -344,8 +215,16 @@ further details)."
   :type '(repeat (list symbol (choice symbol string)))
   :link '(info-link "(ef-themes) Palette overrides"))
 
-  (ef-themes-theme ef-maris-light ef-maris-light-palette ef-maris-light-palette-overrides)
-
-  (provide-theme 'ef-maris-light))
+  (defconst ef-themes-maris-light-palette
+    (append ef-themes-common-palette-overrides ef-maris-light-partial ef-themes-palette-common))
+
+  (modus-themes-theme
+    ef-maris-light
+    ef-themes
+    "Legible light marine theme with blue, cyan, and green colors."
+    light
+    modus-operandi-palette
+    ef-themes-maris-light-palette
+    ef-themes-maris-light-palette-overrides))
 
 ;;; ef-maris-light-theme.el ends here