branch: externals/ef-themes
commit 56e48cd1509e10f7cda8494cc6b498f7376a8f7e
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
Add new ef-maris-dark and ef-maris-light themes
I will post an announcement on my website later in the day. The page
with the screenshots will be updated accordingly. The themes are
largely done, subject to minor tweaks.
---
contrast-ratios.org | 130 +++++++++++++++++++++
ef-maris-dark-theme.el | 293 ++++++++++++++++++++++++++++++++++++++++++++++++
ef-maris-light-theme.el | 293 ++++++++++++++++++++++++++++++++++++++++++++++++
ef-themes.el | 2 +
4 files changed, 718 insertions(+)
diff --git a/contrast-ratios.org b/contrast-ratios.org
index 0c76e38622..0e24918993 100644
--- a/contrast-ratios.org
+++ b/contrast-ratios.org
@@ -1028,6 +1028,136 @@ work with the overall design of the project.
| #dbdbdb | 11755 | 1.38 |
#+TBLFM: $2='(Δ $1 @1$1) :: $3='(Λ $1 @1$1);%.2f
+* ef-maris-dark
+:PROPERTIES:
+:CUSTOM_ID: h:b1b88202-5e59-48ed-ae04-68851d59dd9b
+:END:
+
+** Base colours
+:PROPERTIES:
+:CUSTOM_ID: h:6dece92c-4e27-40b2-8355-d9e2f6e13499
+:END:
+
+| Name | | #131c2b | #1d2c39 | #2f3943 | #1a2331 |
+|----------------+---------+---------+---------+---------+---------|
+| fg-main | #eaedef | 14.53 | 12.14 | 9.99 | 13.44 |
+| fg-dim | #969faf | 6.41 | 5.35 | 4.41 | 5.93 |
+| fg-alt | #90aacb | 7.16 | 5.98 | 4.92 | 6.62 |
+| red | #ff6f6f | 6.31 | 5.27 | 4.34 | 5.84 |
+| red-warmer | #ff7a5f | 6.67 | 5.57 | 4.59 | 6.17 |
+| red-cooler | #ff7788 | 6.71 | 5.60 | 4.61 | 6.21 |
+| red-faint | #fca4a4 | 8.94 | 7.46 | 6.15 | 8.27 |
+| green | #30ba3f | 6.69 | 5.59 | 4.60 | 6.19 |
+| green-warmer | #7fce5f | 8.87 | 7.40 | 6.10 | 8.20 |
+| green-cooler | #30c489 | 7.64 | 6.38 | 5.25 | 7.06 |
+| green-faint | #a9c99f | 9.39 | 7.84 | 6.46 | 8.69 |
+| yellow | #d0d24f | 10.59 | 8.84 | 7.28 | 9.79 |
+| yellow-warmer | #f0c060 | 10.10 | 8.44 | 6.95 | 9.34 |
+| yellow-cooler | #cab27f | 8.29 | 6.92 | 5.70 | 7.67 |
+| yellow-faint | #cac89f | 9.99 | 8.34 | 6.87 | 9.24 |
+| blue | #57b0ff | 7.37 | 6.16 | 5.07 | 6.82 |
+| blue-warmer | #70a0ff | 6.64 | 5.55 | 4.57 | 6.14 |
+| blue-cooler | #12b4ff | 7.32 | 6.11 | 5.03 | 6.77 |
+| blue-faint | #9acfff | 10.37 | 8.66 | 7.13 | 9.59 |
+| magenta | #f59acf | 8.47 | 7.07 | 5.82 | 7.83 |
+| magenta-warmer | #fa90ea | 8.34 | 6.96 | 5.73 | 7.71 |
+| magenta-cooler | #cf90ff | 7.40 | 6.17 | 5.08 | 6.84 |
+| magenta-faint | #d4aaf0 | 8.80 | 7.34 | 6.05 | 8.13 |
+| cyan | #20d7d7 | 9.57 | 7.99 | 6.58 | 8.85 |
+| cyan-warmer | #7fcfdf | 9.68 | 8.08 | 6.65 | 8.95 |
+| cyan-cooler | #60dac0 | 10.00 | 8.35 | 6.88 | 9.25 |
+| cyan-faint | #99bfcf | 8.71 | 7.28 | 5.99 | 8.06 |
+#+TBLFM: $3='(Λ $2 @1$3);%.2f :: $4='(Λ $2 @1$4);%.2f :: $5='(Λ $2 @1$5);%.2f
:: $6='(Λ $2 @1$6);%.2f
+
+** Special colours against the modeline
+:PROPERTIES:
+:CUSTOM_ID: h:a29b6418-830b-4c35-b862-a526695db6ce
+:END:
+
+| Name | | #2f527b |
+|------------------+---------+---------|
+| modeline-err | #ffbfbf | 5.15 |
+| modeline-warning | #dfd443 | 5.22 |
+| modeline-info | #7fefff | 6.00 |
+#+TBLFM: $3='(Λ $2 @1$3);%.2f
+
+** Distance and contrast between main backgrounds
+:PROPERTIES:
+:CUSTOM_ID: h:2c3cdc01-5d84-471e-8845-344935b9007e
+:END:
+
+# bg-main / bg-dim, bg-main / bg-alt
+| #131c2b | distance | contrast |
+|---------+----------+----------|
+| #1d2c39 | 1817 | 1.20 |
+| #2f3943 | 6739 | 1.45 |
+#+TBLFM: $2='(Δ $1 @1$1) :: $3='(Λ $1 @1$1);%.2f
+
+* ef-maris-light
+:PROPERTIES:
+:CUSTOM_ID: h:2658abe7-b526-4745-8121-0cfafc6f56f5
+:END:
+
+** Base colours
+:PROPERTIES:
+:CUSTOM_ID: h:3e218a03-fba5-44d7-89cf-8e14bb72d888
+:END:
+
+| Name | | #edf4f8 | #dce2ef | #cdd4de | #e6ecf2 |
+|----------------+---------+---------+---------+---------+---------|
+| fg-main | #151a27 | 15.63 | 13.37 | 11.64 | 14.60 |
+| fg-dim | #676470 | 5.20 | 4.45 | 3.87 | 4.86 |
+| fg-alt | #3f4f99 | 6.77 | 5.80 | 5.04 | 6.32 |
+| red | #c3303a | 4.97 | 4.25 | 3.70 | 4.64 |
+| red-warmer | #d00000 | 5.13 | 4.39 | 3.82 | 4.79 |
+| red-cooler | #b02440 | 5.96 | 5.10 | 4.43 | 5.56 |
+| red-faint | #9b4052 | 5.82 | 4.98 | 4.33 | 5.43 |
+| green | #007010 | 5.68 | 4.86 | 4.23 | 5.31 |
+| green-warmer | #3a6f00 | 5.47 | 4.68 | 4.07 | 5.11 |
+| green-cooler | #007047 | 5.54 | 4.74 | 4.13 | 5.18 |
+| green-faint | #4a763f | 4.78 | 4.09 | 3.56 | 4.46 |
+| yellow | #805a1f | 5.56 | 4.76 | 4.14 | 5.19 |
+| yellow-warmer | #8b4400 | 6.46 | 5.53 | 4.81 | 6.03 |
+| yellow-cooler | #78542f | 6.08 | 5.20 | 4.53 | 5.68 |
+| yellow-faint | #7f4f4a | 6.06 | 5.18 | 4.51 | 5.66 |
+| blue | #375cc6 | 5.39 | 4.61 | 4.01 | 5.03 |
+| blue-warmer | #444fcf | 5.79 | 4.95 | 4.31 | 5.40 |
+| blue-cooler | #003faf | 8.11 | 6.94 | 6.04 | 7.57 |
+| blue-faint | #3a5099 | 6.78 | 5.80 | 5.05 | 6.33 |
+| magenta | #80308f | 6.90 | 5.91 | 5.14 | 6.45 |
+| magenta-warmer | #9a3a6a | 5.93 | 5.07 | 4.41 | 5.54 |
+| magenta-cooler | #5f2fba | 7.26 | 6.21 | 5.41 | 6.78 |
+| magenta-faint | #6a4a9f | 6.11 | 5.23 | 4.55 | 5.70 |
+| cyan | #1f66af | 5.28 | 4.52 | 3.93 | 4.93 |
+| cyan-warmer | #305675 | 6.96 | 5.96 | 5.18 | 6.50 |
+| cyan-cooler | #006f70 | 5.39 | 4.61 | 4.01 | 5.03 |
+| cyan-faint | #2f6277 | 6.03 | 5.16 | 4.49 | 5.63 |
+#+TBLFM: $3='(Λ $2 @1$3);%.2f :: $4='(Λ $2 @1$4);%.2f :: $5='(Λ $2 @1$5);%.2f
:: $6='(Λ $2 @1$6);%.2f
+
+** Special colours against the modeline
+:PROPERTIES:
+:CUSTOM_ID: h:614bc6c0-7536-4950-a7d3-5b24f9bad7d1
+:END:
+
+| Name | | #a0c2ef |
+|------------------+---------+---------|
+| modeline-err | #950f0f | 4.87 |
+| modeline-warning | #7000af | 4.96 |
+| modeline-info | #0040af | 4.87 |
+#+TBLFM: $3='(Λ $2 @1$3);%.2f
+
+** Distance and contrast between main backgrounds
+:PROPERTIES:
+:CUSTOM_ID: h:1678b892-542f-40be-9dc8-40e37e487c75
+:END:
+
+# bg-main / bg-dim, bg-main / bg-alt
+| #edf4f8 | distance | contrast |
+|---------+----------+----------|
+| #dce2ef | 2321 | 1.17 |
+| #cdd4de | 8539 | 1.34 |
+#+TBLFM: $2='(Δ $1 @1$1) :: $3='(Λ $1 @1$1);%.2f
+
* ef-night
:PROPERTIES:
:CUSTOM_ID: h:cc74fbff-d0da-4fef-a83a-8e92d27738b9
diff --git a/ef-maris-dark-theme.el b/ef-maris-dark-theme.el
new file mode 100644
index 0000000000..7e57be6ba4
--- /dev/null
+++ b/ef-maris-dark-theme.el
@@ -0,0 +1,293 @@
+;;; ef-maris-dark-theme.el --- Legible dark theme with blue, cyan, and teal
colors -*- lexical-binding:t -*-
+
+;; Copyright (C) 2022-2023 Free Software Foundation, Inc.
+
+;; Author: Protesilaos Stavrou <i...@protesilaos.com>
+;; Maintainer: Ef-Themes Development <~protesilaos/ef-the...@lists.sr.ht>
+;; URL: https://git.sr.ht/~protesilaos/ef-themes
+;; Mailing-List: https://lists.sr.ht/~protesilaos/ef-themes
+;; Keywords: faces, theme, accessibility
+
+;; This file is NOT part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; The `ef-themes' are a collection of light and dark themes for GNU
+;; Emacs whose goal is to provide colorful ("pretty") yet legible
+;; options for users who want something with a bit more flair than the
+;; `modus-themes' (also designed by me).
+
+;;; Code:
+
+
+
+(eval-and-compile
+ (require 'ef-themes)
+
+ (deftheme ef-maris-dark
+ "Legible dark theme with blue, cyan, and teal colors.")
+
+ (defconst ef-maris-dark-palette
+ '(
+;;; Basic values
+
+ (bg-main "#131c2b")
+ (fg-main "#eaedef")
+ (bg-dim "#1d2c39")
+ (fg-dim "#969faf")
+ (bg-alt "#2f3943")
+ (fg-alt "#90aacb")
+
+ (bg-active "#4f5963")
+ (bg-inactive "#1a2331")
+
+;;; Basic hues for foreground values
+
+ (red "#ff6f6f")
+ (red-warmer "#ff7a5f")
+ (red-cooler "#ff7788")
+ (red-faint "#fca4a4")
+ (green "#30ba3f")
+ (green-warmer "#7fce5f")
+ (green-cooler "#30c489")
+ (green-faint "#a9c99f")
+ (yellow "#d0d24f")
+ (yellow-warmer "#f0c060")
+ (yellow-cooler "#cab27f")
+ (yellow-faint "#cac89f")
+ (blue "#57b0ff")
+ (blue-warmer "#70a0ff")
+ (blue-cooler "#12b4ff")
+ (blue-faint "#9acfff")
+ (magenta "#f59acf")
+ (magenta-warmer "#fa90ea")
+ (magenta-cooler "#cf90ff")
+ (magenta-faint "#d4aaf0")
+ (cyan "#20d7d7")
+ (cyan-warmer "#7fcfdf")
+ (cyan-cooler "#60dac0")
+ (cyan-faint "#99bfcf")
+
+;;; Basic hues for background values
+
+ (bg-red-intense "#bd1f30")
+ (bg-green-intense "#20a420")
+ (bg-yellow-intense "#847020")
+ (bg-blue-intense "#2f5f9f")
+ (bg-magenta-intense "#b05fcf")
+ (bg-cyan-intense "#028099")
+
+ (bg-red-subtle "#6a102a")
+ (bg-green-subtle "#00522a")
+ (bg-yellow-subtle "#5a4000")
+ (bg-blue-subtle "#243679")
+ (bg-magenta-subtle "#50205a")
+ (bg-cyan-subtle "#005065")
+
+;;; Diffs
+
+ (bg-added "#20493f")
+ (bg-added-faint "#163530")
+ (bg-added-refine "#136244")
+ (fg-added "#a0e0a0")
+
+ (bg-changed "#51512f")
+ (bg-changed-faint "#40332f")
+ (bg-changed-refine "#61621f")
+ (fg-changed "#dada90")
+
+ (bg-removed "#5e242f")
+ (bg-removed-faint "#4a202d")
+ (bg-removed-refine "#772a35")
+ (fg-removed "#ffbfbf")
+
+;;; Graphs
+
+ (bg-graph-red-0 "#b52c2c")
+ (bg-graph-red-1 "#702020")
+ (bg-graph-green-0 "#0fed00")
+ (bg-graph-green-1 "#007800")
+ (bg-graph-yellow-0 "#f1e00a")
+ (bg-graph-yellow-1 "#b08940")
+ (bg-graph-blue-0 "#2fafef")
+ (bg-graph-blue-1 "#1f2f8f")
+ (bg-graph-magenta-0 "#bf94fe")
+ (bg-graph-magenta-1 "#5f509f")
+ (bg-graph-cyan-0 "#47dfea")
+ (bg-graph-cyan-1 "#00808f")
+
+;;; Special hues
+
+ (bg-mode-line "#2f527b")
+ (fg-mode-line "#ecf0ff")
+ (bg-completion "#204358")
+ (bg-hover "#684d54")
+ (bg-hover-secondary "#49516a")
+ (bg-hl-line "#313044")
+ (bg-region "#243760")
+ (bg-paren "#6c5d54")
+ (bg-err "#551525") ; check with err
+ (bg-warning "#403f20") ; check with warning
+ (bg-info "#104420") ; check with info
+
+ (border "#595a63")
+ (cursor "#8fdfff")
+ (fg-intense "#ffffff")
+
+ (modeline-err "#ffbfbf")
+ (modeline-warning "#dfd443")
+ (modeline-info "#7fefff")
+
+ (underline-err "#df2f2f")
+ (underline-warning "#c0b000")
+ (underline-info "#22b022")
+
+ (bg-char-0 "#0050af")
+ (bg-char-1 "#7f1f7f")
+ (bg-char-2 "#6f6600")
+
+;;; Conditional hues
+
+ (bg-region-intense "#3f4f99")
+
+;;; Mappings
+
+;;;; General mappings
+
+ (err red-warmer)
+ (warning yellow-warmer)
+ (info green-cooler)
+
+ (link blue)
+ (link-alt magenta-cooler)
+ (name blue)
+ (keybind blue-cooler)
+ (identifier magenta-faint)
+ (prompt blue-warmer)
+
+;;;; Code mappings
+
+ (builtin magenta-faint)
+ (comment red-faint)
+ (constant blue-cooler)
+ (fnname green-warmer)
+ (keyword blue-warmer)
+ (preprocessor magenta-cooler)
+ (docstring cyan-faint)
+ (string cyan-cooler)
+ (type green)
+ (variable cyan)
+ (rx-escape yellow) ; compare with `string'
+ (rx-construct red)
+
+;;;; Accent mappings
+
+ (accent-0 blue-cooler)
+ (accent-1 green)
+ (accent-2 cyan)
+ (accent-3 magenta-cooler)
+
+;;;; Date mappings
+
+ (date-common cyan-cooler)
+ (date-deadline red)
+ (date-event fg-alt)
+ (date-holiday blue-warmer)
+ (date-now fg-main)
+ (date-range fg-alt)
+ (date-scheduled yellow-cooler)
+ (date-weekday cyan-warmer)
+ (date-weekend red-faint)
+
+;;;; Prose mappings
+
+ (prose-code cyan)
+ (prose-done green-cooler)
+ (prose-macro magenta-cooler)
+ (prose-metadata fg-dim)
+ (prose-metadata-value fg-alt)
+ (prose-table fg-alt)
+ (prose-tag cyan-faint)
+ (prose-todo red-cooler)
+ (prose-verbatim green-warmer)
+
+;;;; Mail mappings
+
+ (mail-cite-0 cyan-cooler)
+ (mail-cite-1 magenta)
+ (mail-cite-2 green)
+ (mail-cite-3 yellow-cooler)
+ (mail-part magenta-cooler)
+ (mail-recipient blue-warmer)
+ (mail-subject green-warmer)
+ (mail-other blue)
+
+;;;; 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)
+
+;;;; Rainbow mappings
+
+ (rainbow-0 green-cooler)
+ (rainbow-1 blue-warmer)
+ (rainbow-2 green-warmer)
+ (rainbow-3 cyan)
+ (rainbow-4 magenta-cooler)
+ (rainbow-5 blue-cooler)
+ (rainbow-6 magenta)
+ (rainbow-7 cyan-cooler)
+ (rainbow-8 yellow-cooler))
+ "The `ef-maris-dark' 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.")
+
+ (defcustom ef-maris-dark-palette-overrides nil
+ "Overrides for `ef-maris-dark-palette'.
+
+Mirror the elements of the aforementioned palette, overriding
+their value.
+
+For overrides that are shared across all of the Ef themes,
+refer to `ef-themes-common-palette-overrides'.
+
+To preview the palette entries, use `ef-themes-preview-colors' or
+`ef-themes-preview-colors-current' (read the documentation for
+further details)."
+ :group 'ef-themes
+ :package-version '(ef-themes . "1.0.0")
+ :type '(repeat (list symbol (choice symbol string)))
+ :link '(info-link "(ef-themes) Palette overrides"))
+
+ (ef-themes-theme ef-maris-dark ef-maris-dark-palette
ef-maris-dark-palette-overrides)
+
+ (provide-theme 'ef-maris-dark))
+
+;;;###theme-autoload
+(put 'ef-maris-dark 'theme-properties '(:background-mode dark :kind
color-scheme :family ef))
+
+;;; ef-maris-dark-theme.el ends here
diff --git a/ef-maris-light-theme.el b/ef-maris-light-theme.el
new file mode 100644
index 0000000000..335a7afffd
--- /dev/null
+++ b/ef-maris-light-theme.el
@@ -0,0 +1,293 @@
+;;; ef-maris-light-theme.el --- Legible light theme with blue, cyan, and teal
colors -*- lexical-binding:t -*-
+
+;; Copyright (C) 2023 Free Software Foundation, Inc.
+
+;; Author: Protesilaos Stavrou <i...@protesilaos.com>
+;; Maintainer: Ef-Themes Development <~protesilaos/ef-the...@lists.sr.ht>
+;; URL: https://git.sr.ht/~protesilaos/ef-themes
+;; Mailing-List: https://lists.sr.ht/~protesilaos/ef-themes
+;; Keywords: faces, theme, accessibility
+
+;; This file is NOT part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; The `ef-themes' are a collection of light and dark themes for GNU
+;; Emacs whose goal is to provide colorful ("pretty") yet legible
+;; options for users who want something with a bit more flair than the
+;; `modus-themes' (also designed by me).
+
+;;; Code:
+
+
+
+(eval-and-compile
+ (require 'ef-themes)
+
+ (deftheme ef-maris-light
+ "Legible light theme with blue, cyan, and teal colors.")
+
+ (defconst ef-maris-light-palette
+ '(
+;;; Basic values
+
+ (bg-main "#edf4f8")
+ (fg-main "#151a27")
+ (bg-dim "#dce2ef")
+ (fg-dim "#676470")
+ (bg-alt "#cdd4de")
+ (fg-alt "#3f4f99")
+
+ (bg-active "#adb4be")
+ (bg-inactive "#e6ecf2")
+
+;;; Basic hues for foreground values
+
+ (red "#c3303a")
+ (red-warmer "#d00000")
+ (red-cooler "#b02440")
+ (red-faint "#9b4052")
+ (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 "#2f6277")
+
+;;; Basic hues for background values
+
+ (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 "#f0c6bf")
+ (bg-green-subtle "#c4edaf")
+ (bg-yellow-subtle "#e4e488")
+ (bg-blue-subtle "#ccd7f7")
+ (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-changed-refine "#f0db9a")
+ (fg-changed "#553d00")
+
+ (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 "#2fe029")
+ (bg-graph-green-1 "#75ef30")
+ (bg-graph-yellow-0 "#ffcf00")
+ (bg-graph-yellow-1 "#f9ff00")
+ (bg-graph-blue-0 "#7f90ff")
+ (bg-graph-blue-1 "#9fc6ff")
+ (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 "#d4e2f0")
+ (bg-region "#c7d8f5")
+ (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")
+
+;;; Conditional hues
+
+ (bg-region-intense "#c6b2d3")
+
+;;; Mappings
+
+;;;; General mappings
+
+ (err red-warmer)
+ (warning yellow-warmer)
+ (info green-cooler)
+
+ (link blue)
+ (link-alt magenta-cooler)
+ (name blue)
+ (keybind blue-cooler)
+ (identifier magenta-faint)
+ (prompt blue-warmer)
+
+;;;; Code mappings
+
+ (builtin magenta-faint)
+ (comment red-faint)
+ (constant blue-cooler)
+ (fnname green-warmer)
+ (keyword blue-warmer)
+ (preprocessor magenta-cooler)
+ (docstring cyan-faint)
+ (string cyan-cooler)
+ (type green)
+ (variable cyan)
+ (rx-escape yellow) ; compare with `string'
+ (rx-construct red)
+
+;;;; Accent mappings
+
+ (accent-0 blue-cooler)
+ (accent-1 green)
+ (accent-2 cyan)
+ (accent-3 magenta-cooler)
+
+;;;; Date mappings
+
+ (date-common cyan-cooler)
+ (date-deadline red)
+ (date-event fg-alt)
+ (date-holiday blue-warmer)
+ (date-now fg-main)
+ (date-range fg-alt)
+ (date-scheduled yellow-cooler)
+ (date-weekday cyan-warmer)
+ (date-weekend red-faint)
+
+;;;; Prose mappings
+
+ (prose-code cyan)
+ (prose-done green-cooler)
+ (prose-macro magenta-cooler)
+ (prose-metadata fg-dim)
+ (prose-metadata-value fg-alt)
+ (prose-table fg-alt)
+ (prose-tag cyan-faint)
+ (prose-todo red-cooler)
+ (prose-verbatim green-warmer)
+
+;;;; Mail mappings
+
+ (mail-cite-0 cyan)
+ (mail-cite-1 magenta)
+ (mail-cite-2 green-cooler)
+ (mail-cite-3 yellow-cooler)
+ (mail-part magenta-cooler)
+ (mail-recipient blue-warmer)
+ (mail-subject green-warmer)
+ (mail-other blue)
+
+;;;; 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)
+
+;;;; Rainbow mappings
+
+ (rainbow-0 green-cooler)
+ (rainbow-1 blue-warmer)
+ (rainbow-2 green-warmer)
+ (rainbow-3 cyan)
+ (rainbow-4 magenta-cooler)
+ (rainbow-5 blue-cooler)
+ (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.")
+
+ (defcustom ef-maris-light-palette-overrides nil
+ "Overrides for `ef-maris-light-palette'.
+
+Mirror the elements of the aforementioned palette, overriding
+their value.
+
+For overrides that are shared across all of the Ef themes,
+refer to `ef-themes-common-palette-overrides'.
+
+To preview the palette entries, use `ef-themes-preview-colors' or
+`ef-themes-preview-colors-current' (read the documentation for
+further details)."
+ :group 'ef-themes
+ :package-version '(ef-themes . "1.0.0")
+ :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))
+
+;;;###theme-autoload
+(put 'ef-maris-light 'theme-properties '(:background-mode light :kind
color-scheme :family ef))
+
+;;; ef-maris-light-theme.el ends here
diff --git a/ef-themes.el b/ef-themes.el
index 43b3e23792..44a7eebc85 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -67,6 +67,7 @@
ef-frost
ef-kassio
ef-light
+ ef-maris-light
ef-spring
ef-summer
ef-trio-light
@@ -81,6 +82,7 @@
ef-deuteranopia-dark
ef-duo-dark
ef-elea-dark
+ ef-maris-dark
ef-night
ef-symbiosis
ef-trio-dark
