branch: externals/standard-themes
commit 91c20b6ade1346a4cd401c89927c78d77b0a76d4
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Use modus-themes-generate-palette and fix some palette entry names
---
standard-dark-theme.el | 173 ++++++++++++----------------------------
standard-dark-tinted-theme.el | 172 ++++++++++++----------------------------
standard-light-theme.el | 174 ++++++++++++-----------------------------
standard-light-tinted-theme.el | 171 ++++++++++++----------------------------
4 files changed, 205 insertions(+), 485 deletions(-)
diff --git a/standard-dark-theme.el b/standard-dark-theme.el
index 774451d5b1..6026352782 100644
--- a/standard-dark-theme.el
+++ b/standard-dark-theme.el
@@ -41,11 +41,8 @@
(require 'standard-themes)
(defconst standard-dark-palette
- (append
- '(
-;;; Basic values
-
- (bg-main "#000000")
+ (modus-themes-generate-palette
+ '((bg-main "#000000")
(fg-main "#ffffff")
(bg-dim "#272727")
(fg-dim "#a6a6a6")
@@ -54,9 +51,6 @@
(bg-active "#606060")
(bg-inactive "#202020")
(border "#606070")
-
- ;; Basic accent foregrounds
-
(red "#ff6f60")
(red-warmer "#ff7f24")
(red-cooler "#ff778f")
@@ -81,166 +75,103 @@
(cyan-warmer "#87cefa")
(cyan-cooler "#7fffd4")
(cyan-faint "#6acbcb")
-
-;;; Common accent backgrounds
-
(bg-red-intense "#9d1f1f")
(bg-green-intense "#2f822f")
(bg-yellow-intense "#7a6100")
(bg-blue-intense "#1640b0")
(bg-magenta-intense "#7030af")
(bg-cyan-intense "#2266ae")
-
(bg-red-subtle "#620f2a")
(bg-green-subtle "#00422a")
(bg-yellow-subtle "#4a4000")
(bg-blue-subtle "#242679")
(bg-magenta-subtle "#552f5f")
(bg-cyan-subtle "#004065")
-
(bg-red-nuanced "#2c0614")
(bg-green-nuanced "#001904")
(bg-yellow-nuanced "#221000")
(bg-blue-nuanced "#0f0e39")
(bg-magenta-nuanced "#230631")
(bg-cyan-nuanced "#041529")
-
-;;; Diffs
-
(bg-added "#00331f")
(bg-added-faint "#002410")
(bg-added-refine "#03492f")
(fg-added "#4fb04f")
-
(bg-changed "#323200")
(bg-changed-faint "#281a00")
(bg-changed-refine "#484800")
(fg-changed "#e0cf03")
-
(bg-removed "#4a1119")
(bg-removed-faint "#320a0f")
(bg-removed-refine "#751a1f")
(fg-removed "#ff5f5f")
-
-;;; Marks
-
- (bg-mark-alt "#002f4a")
- (fg-mark-alt "#57cefa")
-
- (bg-mark-del "#440d09")
- (fg-mark-del "#ff5f60")
-
- (bg-mark-sel "#333000")
- (fg-mark-sel "#d0d082")
-
-;;; Graphs
-
- (red-graph-0-bg "#b52c2c")
- (red-graph-1-bg "#702020")
- (green-graph-0-bg "#4fd100")
- (green-graph-1-bg "#007800")
- (yellow-graph-0-bg "#f1e00a")
- (yellow-graph-1-bg "#b08600")
- (blue-graph-0-bg "#2fafef")
- (blue-graph-1-bg "#1f2f8f")
- (magenta-graph-0-bg "#bf94fe")
- (magenta-graph-1-bg "#5f509f")
- (cyan-graph-0-bg "#47dfea")
- (cyan-graph-1-bg "#00808f")
-
-;;; Special hues
-
+ (bg-mark-other "#002f4a")
+ (fg-mark-other "#57cefa")
+ (bg-mark-delete "#440d09")
+ (fg-mark-delete "#ff5f60")
+ (bg-mark-select "#333000")
+ (fg-mark-select "#d0d082")
(bg-completion "#254b5f")
(bg-hover "#457b2f")
- (bg-hover-alt "#00688b")
+ (bg-hover-secondary "#00688b")
(bg-hl-line "#334815")
(bg-region "#20009d")
(bg-paren-match "#4f94cd")
- (bg-err "#3f0d09") ; check with err
- (bg-warning "#362f00") ; check with warning
- (bg-info "#002f12") ; check with info
-
(bg-mode-line-active "#505050")
(fg-mode-line-active "#ffffff")
(border-mode-line-active "#959595")
(bg-mode-line-inactive "#323232")
(fg-mode-line-inactive "#a6a6a6")
(border-mode-line-inactive "#606070")
-
(modeline-err "#ff80af")
(modeline-warning "#dfcf33")
(modeline-info "#2fc82f")
-
(underline-err "#df2f2f")
(underline-warning "#c0b000")
- (underline-info "#22b022")
-
-;;; Mappings
-
-;;;; General mappings
-
- (cursor fg-main)
-
- (name cyan-cooler)
- (keybind blue-cooler)
-
- (err red)
- (warning yellow-warmer)
- (info green)
-
-;;;; Prompt mappings
-
- (fg-prompt blue)
-
-;;;; Code mappings
-
- (builtin blue-faint)
- (comment red-warmer)
- (constant cyan-cooler)
- (fnname cyan-warmer)
- (fnname-call cyan-faint)
- (keyword cyan)
- (preprocessor blue-faint)
- (docstring yellow-cooler)
- (string yellow-cooler)
- (type green-cooler)
- (variable yellow)
- (variable-use yellow-faint)
- (rx-escape green) ; compare with `string'
- (rx-construct fg-main)
-
-;;;; Accent mappings
-
- (accent-0 blue-warmer)
- (accent-1 red-cooler)
- (accent-2 green)
- (accent-3 magenta-cooler)
-
-;;;; Link mappings
-
- (fg-link cyan)
- (bg-link unspecified)
- (underline-link blue-warmer)
-
- (fg-link-visited magenta-cooler)
- (bg-link-visited unspecified)
- (underline-link-visited magenta)
-
-;;;; Mail mappings
-
- (mail-0 magenta-warmer)
- (mail-1 cyan-cooler)
- (mail-2 yellow)
- (mail-3 red)
- (mail-4 blue-warmer)
- (mail-recipient blue)
- (mail-subject magenta-cooler)
- (mail-other cyan)
-
-;;;; Rainbow mappings
-
+ (underline-note "#22b022")
(rainbow-0 "#afeeee"))
- standard-themes-common-palette-mappings)
+ 'cool
+ nil
+ (append
+ '((cursor fg-main)
+ (name cyan-cooler)
+ (keybind blue-cooler)
+ (err red)
+ (warning yellow-warmer)
+ (info green)
+ (fg-prompt blue)
+ (builtin blue-faint)
+ (comment red-warmer)
+ (constant cyan-cooler)
+ (fnname cyan-warmer)
+ (fnname-call cyan-faint)
+ (keyword cyan)
+ (preprocessor blue-faint)
+ (docstring yellow-cooler)
+ (string yellow-cooler)
+ (type green-cooler)
+ (variable yellow)
+ (variable-use yellow-faint)
+ (rx-backslash green) ; compare with `string'
+ (rx-construct fg-main)
+ (accent-0 blue-warmer)
+ (accent-1 red-cooler)
+ (accent-2 green)
+ (accent-3 magenta-cooler)
+ (fg-link cyan)
+ (bg-link unspecified)
+ (underline-link blue-warmer)
+ (fg-link-visited magenta-cooler)
+ (bg-link-visited unspecified)
+ (underline-link-visited magenta)
+ (mail-cite-0 magenta-warmer)
+ (mail-cite-1 cyan-cooler)
+ (mail-cite-2 yellow)
+ (mail-cite-3 red)
+ (mail-recipient blue)
+ (mail-subject magenta-cooler)
+ (mail-other cyan))
+ standard-themes-common-palette-mappings))
"The `standard-dark' palette.
Color values have the form (COLOR-NAME HEX-VALUE) with the former
as a symbol and the latter as a string.
diff --git a/standard-dark-tinted-theme.el b/standard-dark-tinted-theme.el
index e9a3bc3693..29bb468681 100644
--- a/standard-dark-tinted-theme.el
+++ b/standard-dark-tinted-theme.el
@@ -41,11 +41,8 @@
(require 'standard-themes)
(defconst standard-dark-tinted-palette
- (append
- '(
-;;; Basic values
-
- (bg-main "#182440")
+ (modus-themes-generate-palette
+ '((bg-main "#182440")
(fg-main "#ffffff")
(bg-dim "#2e3355")
(fg-dim "#a6a6a6")
@@ -54,9 +51,6 @@
(bg-active "#5f6580")
(bg-inactive "#203348")
(border "#707090")
-
- ;; Basic accent foregrounds
-
(red "#ff6f60")
(red-warmer "#ff7f24")
(red-cooler "#ff778f")
@@ -81,170 +75,106 @@
(cyan-warmer "#87cefa")
(cyan-cooler "#7fffd4")
(cyan-faint "#6acbcb")
-
-;;; Common accent backgrounds
-
(bg-red-intense "#9d1f1f")
(bg-green-intense "#2f822f")
(bg-yellow-intense "#7a6100")
(bg-blue-intense "#1640b0")
(bg-magenta-intense "#7030af")
(bg-cyan-intense "#2266ae")
-
(bg-red-subtle "#620f2a")
(bg-green-subtle "#00422a")
(bg-yellow-subtle "#4a4000")
(bg-blue-subtle "#242679")
(bg-magenta-subtle "#552f5f")
(bg-cyan-subtle "#004065")
-
(bg-red-nuanced "#2c0614")
(bg-green-nuanced "#001904")
(bg-yellow-nuanced "#221000")
(bg-blue-nuanced "#0f0e39")
(bg-magenta-nuanced "#230631")
(bg-cyan-nuanced "#041529")
-
-;;; Diffs
-
(bg-added "#12522f")
(bg-added-faint "#0f3a30")
(bg-added-refine "#17623f")
(fg-added "#4fb04f")
-
(bg-changed "#424200")
(bg-changed-faint "#383a00")
(bg-changed-refine "#684f20")
(fg-changed "#e0cf03")
-
(bg-removed "#602119")
(bg-removed-faint "#4e0f1f")
(bg-removed-refine "#792f2f")
(fg-removed "#ff5f5f")
-
-;;; Marks
-
- (bg-mark-alt "#223f6a")
- (fg-mark-alt "#57defa")
-
- (bg-mark-del "#5a201f")
- (fg-mark-del "#ff7f60")
-
- (bg-mark-sel "#494000")
- (fg-mark-sel "#d0d082")
-
-;;; Graphs
-
- (red-graph-0-bg "#b52c2c")
- (red-graph-1-bg "#702020")
- (green-graph-0-bg "#4fd100")
- (green-graph-1-bg "#007800")
- (yellow-graph-0-bg "#f1e00a")
- (yellow-graph-1-bg "#b08600")
- (blue-graph-0-bg "#2fafef")
- (blue-graph-1-bg "#1f2f8f")
- (magenta-graph-0-bg "#bf94fe")
- (magenta-graph-1-bg "#5f509f")
- (cyan-graph-0-bg "#47dfea")
- (cyan-graph-1-bg "#00808f")
-
-;;; Special hues
-
+ (bg-mark-other "#223f6a")
+ (fg-mark-other "#57defa")
+ (bg-mark-delete "#5a201f")
+ (fg-mark-delete "#ff7f60")
+ (bg-mark-select "#494000")
+ (fg-mark-select "#d0d082")
(bg-completion "#406a70")
(bg-hover "#35705f")
- (bg-hover-alt "#00688b")
+ (bg-hover-secondary "#00688b")
(bg-hl-line "#304845")
(bg-region "#4f2f99")
(bg-paren-match "#4f94cd")
- (bg-err "#5f1f1f") ; check with err
- (bg-warning "#434100") ; check with warning
- (bg-info "#20481f") ; check with info
-
(bg-mode-line-active "#5b59b2")
(fg-mode-line-active "#ffffff")
(border-mode-line-active "#9595b5")
(bg-mode-line-inactive "#353a52")
(fg-mode-line-inactive "#a6a6a6")
(border-mode-line-inactive "#606070")
-
(modeline-err "#ff80af")
(modeline-warning "#dfcf33")
(modeline-info "#2fc82f")
-
(underline-err "#df2f2f")
(underline-warning "#c0b000")
- (underline-info "#22b022")
-
-;;; Mappings
-
-;;;; General mappings
-
+ (underline-note "#22b022")
(cursor "#d072f0")
-
- (name cyan-cooler)
- (keybind blue-cooler)
-
- (err red)
- (warning yellow-warmer)
- (info green)
-
-;;;; Prompt mappings
-
- (fg-prompt cyan)
-
-;;;; Code mappings
-
- (builtin blue-faint)
- (comment red-warmer)
- (constant cyan-cooler)
- (fnname cyan-warmer)
- (fnname-call cyan-faint)
- (keyword cyan)
- (preprocessor blue-faint)
- (docstring yellow-cooler)
- (string yellow-cooler)
- (type green-cooler)
- (variable yellow)
- (variable-use yellow-faint)
- (rx-escape green) ; compare with `string'
- (rx-construct fg-main)
-
-;;;; Accent mappings
-
- (accent-0 blue-warmer)
- (accent-1 red-cooler)
- (accent-2 green)
- (accent-3 magenta-cooler)
-
-;;;; Link mappings
-
- (fg-link cyan)
- (bg-link unspecified)
- (underline-link blue-warmer)
-
- (fg-link-visited magenta-cooler)
- (bg-link-visited unspecified)
- (underline-link-visited magenta)
-
-;;;; Mail mappings
-
- (mail-0 magenta-warmer)
- (mail-1 cyan-cooler)
- (mail-2 yellow)
- (mail-3 red)
- (mail-4 blue-warmer)
- (mail-recipient blue)
- (mail-subject magenta-cooler)
- (mail-other cyan)
-
-;;;; Rainbow mappings
-
(rainbow-0 "#afeeee"))
- standard-themes-common-palette-mappings)
+ 'warm
+ nil
+ (append
+ '((name cyan-cooler)
+ (keybind blue-cooler)
+ (err red)
+ (warning yellow-warmer)
+ (info green)
+ (fg-prompt cyan)
+ (builtin blue-faint)
+ (comment red-warmer)
+ (constant cyan-cooler)
+ (fnname cyan-warmer)
+ (fnname-call cyan-faint)
+ (keyword cyan)
+ (preprocessor blue-faint)
+ (docstring yellow-cooler)
+ (string yellow-cooler)
+ (type green-cooler)
+ (variable yellow)
+ (variable-use yellow-faint)
+ (rx-backslash green) ; compare with `string'
+ (rx-construct fg-main)
+ (accent-0 blue-warmer)
+ (accent-1 red-cooler)
+ (accent-2 green)
+ (accent-3 magenta-cooler)
+ (fg-link cyan)
+ (bg-link unspecified)
+ (underline-link blue-warmer)
+ (fg-link-visited magenta-cooler)
+ (bg-link-visited unspecified)
+ (underline-link-visited magenta)
+ (mail-cite-0 magenta-warmer)
+ (mail-cite-1 cyan-cooler)
+ (mail-cite-2 yellow)
+ (mail-cite-3 red)
+ (mail-recipient blue)
+ (mail-subject magenta-cooler)
+ (mail-other cyan))
+ standard-themes-common-palette-mappings))
"The `standard-dark-tinted' 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.")
diff --git a/standard-light-theme.el b/standard-light-theme.el
index 3215ade228..74d2094d7f 100644
--- a/standard-light-theme.el
+++ b/standard-light-theme.el
@@ -41,11 +41,8 @@
(require 'standard-themes)
(defconst standard-light-palette
- (append
- '(
-;;; Basic values
-
- (bg-main "#ffffff")
+ (modus-themes-generate-palette
+ '((bg-main "#ffffff")
(fg-main "#000000")
(bg-dim "#ebebeb")
(fg-dim "#7f7f7f")
@@ -54,9 +51,6 @@
(bg-active "#bfbfbf")
(bg-inactive "#f0f0f0")
(border "#bababa")
-
-;;; Basic accent foregrounds
-
(red "#b3303a")
(red-warmer "#e00033")
(red-cooler "#ce2b50")
@@ -81,170 +75,106 @@
(cyan-warmer "#2f8fab")
(cyan-cooler "#008b8b")
(cyan-faint "#3f7a80")
-
-;;; Common accent backgrounds
-
(bg-red-intense "#ff8f88")
(bg-green-intense "#8adf80")
(bg-yellow-intense "#f3d000")
(bg-blue-intense "#bfc9ff")
(bg-magenta-intense "#dfa0f0")
(bg-cyan-intense "#a4d5f9")
-
(bg-red-subtle "#ffcfbf")
(bg-green-subtle "#b3fabf")
(bg-yellow-subtle "#fff576")
(bg-blue-subtle "#ccdfff")
(bg-magenta-subtle "#ffddff")
(bg-cyan-subtle "#bfefff")
-
(bg-red-nuanced "#fff1f0")
(bg-green-nuanced "#ecf7ed")
(bg-yellow-nuanced "#fff3da")
(bg-blue-nuanced "#f3f3ff")
(bg-magenta-nuanced "#fdf0ff")
(bg-cyan-nuanced "#ebf6fa")
-
-;;; Diffs
-
(bg-added "#c0f8d0")
(bg-added-faint "#d0ffe0")
(bg-added-refine "#b4e8c4")
(fg-added "#007200")
-
(bg-changed "#ffdfa9")
(bg-changed-faint "#ffefbf")
(bg-changed-refine "#fac090")
(fg-changed "#8d6a12")
-
(bg-removed "#ffd8d5")
(bg-removed-faint "#ffe9e9")
(bg-removed-refine "#f3b5af")
(fg-removed "#a02a2a")
-
-;;; Marks
-
- (bg-mark-alt "#c0effa")
- (fg-mark-alt "#1f6fb0")
-
- (bg-mark-del "#ffd5ea")
- (fg-mark-del "#b32230")
-
- (bg-mark-sel "#fafa7b")
- (fg-mark-sel "#805f00")
-
-;;; Graphs
-
- (red-graph-0-bg "#ef7969")
- (red-graph-1-bg "#ffaab4")
- (green-graph-0-bg "#4faa09")
- (green-graph-1-bg "#8fef00")
- (yellow-graph-0-bg "#ffcf00")
- (yellow-graph-1-bg "#f9ff00")
- (blue-graph-0-bg "#7090ff")
- (blue-graph-1-bg "#9fc6ff")
- (magenta-graph-0-bg "#e07fff")
- (magenta-graph-1-bg "#fad0ff")
- (cyan-graph-0-bg "#70d3f0")
- (cyan-graph-1-bg "#afefff")
-
-;;; Special hues
-
+ (bg-mark-other "#c0effa")
+ (fg-mark-other "#1f6fb0")
+ (bg-mark-delete "#ffd5ea")
+ (fg-mark-delete "#b32230")
+ (bg-mark-select "#fafa7b")
+ (fg-mark-select "#805f00")
(bg-completion "#bfe8ff")
(bg-hover "#aaeccf")
- (bg-hover-alt "#ffff00")
+ (bg-hover-secondary "#ffff00")
(bg-hl-line "#b4eeb4")
(bg-region "#eedc82")
(bg-paren-match "#40e0d0")
- (bg-err "#ffd5ea") ; check with err
- (bg-warning "#ffeabb") ; check with warning
- (bg-info "#d0efda") ; check with info
-
(bg-mode-line-active "#b3b3b3")
(fg-mode-line-active "#000000")
(border-mode-line-active "#5a5a5a")
(bg-mode-line-inactive "#e5e5e5")
(fg-mode-line-inactive "#7f7f7f")
(border-mode-line-inactive "#bababa")
-
(modeline-err "#b02020")
(modeline-warning "#5f1080")
(modeline-info "#002fb0")
-
(underline-err "#ef0f1f")
(underline-warning "#bf5f00")
- (underline-info "#02af52")
-
-;;; Mappings
-
-;;;; General mappings
-
- (cursor fg-main)
-
- (name green-cooler)
- (keybind blue)
-
- (err red-warmer)
- (warning yellow-warmer)
- (info green)
-
-;;;; Prompt mappings
-
- (fg-prompt blue-cooler)
-
-;;;; Code mappings
-
- (builtin blue-faint)
- (comment red-faint)
- (constant cyan-cooler)
- (fnname blue-cooler)
- (fnname-call blue-faint)
- (keyword magenta-cooler)
- (preprocessor blue-faint)
- (docstring magenta-warmer)
- (string magenta-warmer)
- (type green)
- (variable yellow-cooler)
- (variable-use yellow-faint)
- (rx-escape green) ; compare with `string'
- (rx-construct fg-main)
-
-;;;; Accent mappings
-
- (accent-0 blue)
- (accent-1 red-cooler)
- (accent-2 green)
- (accent-3 magenta-cooler)
-
-;;;; Link mappings
-
- (fg-link blue-warmer)
- (bg-link unspecified)
- (underline-link blue-warmer)
-
- (fg-link-visited magenta)
- (bg-link-visited unspecified)
- (underline-link-visited magenta)
-
-;;;; Mail mappings
-
- (mail-0 magenta)
- (mail-1 cyan-cooler)
- (mail-2 yellow-cooler)
- (mail-3 red-warmer)
- (mail-4 blue-warmer)
- (mail-recipient blue)
- (mail-subject magenta-cooler)
- (mail-other cyan)
-
-;;;; Rainbow mappings
-
+ (underline-note "#02af52")
(rainbow-0 "#191970"))
- standard-themes-common-palette-mappings)
+ 'cool
+ nil
+ (append
+ '((cursor fg-main)
+ (name green-cooler)
+ (keybind blue)
+ (err red-warmer)
+ (warning yellow-warmer)
+ (info green)
+ (fg-prompt blue-cooler)
+ (builtin blue-faint)
+ (comment red-faint)
+ (constant cyan-cooler)
+ (fnname blue-cooler)
+ (fnname-call blue-faint)
+ (keyword magenta-cooler)
+ (preprocessor blue-faint)
+ (docstring magenta-warmer)
+ (string magenta-warmer)
+ (type green)
+ (variable yellow-cooler)
+ (variable-use yellow-faint)
+ (rx-backslash green) ; compare with `string'
+ (rx-construct fg-main)
+ (accent-0 blue)
+ (accent-1 red-cooler)
+ (accent-2 green)
+ (accent-3 magenta-cooler)
+ (fg-link blue-warmer)
+ (bg-link unspecified)
+ (underline-link blue-warmer)
+ (fg-link-visited magenta)
+ (bg-link-visited unspecified)
+ (underline-link-visited magenta)
+ (mail-cite-0 magenta)
+ (mail-cite-1 cyan-cooler)
+ (mail-cite-2 yellow-cooler)
+ (mail-cite-3 red-warmer)
+ (mail-recipient blue)
+ (mail-subject magenta-cooler)
+ (mail-other cyan))
+ standard-themes-common-palette-mappings))
"The `standard-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.")
diff --git a/standard-light-tinted-theme.el b/standard-light-tinted-theme.el
index cb4d50e12f..792c7b1de0 100644
--- a/standard-light-tinted-theme.el
+++ b/standard-light-tinted-theme.el
@@ -41,11 +41,8 @@
(require 'standard-themes)
(defconst standard-light-tinted-palette
- (append
- '(
-;;; Basic values
-
- (bg-main "#eeecd9")
+ (modus-themes-generate-palette
+ '((bg-main "#eeecd9")
(fg-main "#000000")
(bg-dim "#e2d3ca")
(fg-dim "#606060")
@@ -54,9 +51,6 @@
(bg-active "#b09a90")
(bg-inactive "#dedecd")
(border "#9a7a7a")
-
-;;; Basic accent foregrounds
-
(red "#b3303a")
(red-warmer "#e00033")
(red-cooler "#ce2b50")
@@ -81,170 +75,105 @@
(cyan-warmer "#2f8fab")
(cyan-cooler "#008b8b")
(cyan-faint "#3f7a80")
-
-;;; Common accent backgrounds
-
(bg-red-intense "#ff8f88")
(bg-green-intense "#8adf80")
(bg-yellow-intense "#f3d000")
(bg-blue-intense "#bfc9ff")
(bg-magenta-intense "#dfa0f0")
(bg-cyan-intense "#a4d5f9")
-
(bg-red-subtle "#ffcfbf")
(bg-green-subtle "#b3fabf")
(bg-yellow-subtle "#fff576")
(bg-blue-subtle "#ccdfff")
(bg-magenta-subtle "#ffddff")
(bg-cyan-subtle "#bfefff")
-
(bg-red-nuanced "#fff1f0")
(bg-green-nuanced "#ecf7ed")
(bg-yellow-nuanced "#fff3da")
(bg-blue-nuanced "#f3f3ff")
(bg-magenta-nuanced "#fdf0ff")
(bg-cyan-nuanced "#ebf6fa")
-
-;;; Diffs
-
(bg-added "#c3ebc1")
(bg-added-faint "#d0eac0")
(bg-added-refine "#acd6a5")
(fg-added "#005000")
-
(bg-changed "#ffdfa9")
(bg-changed-faint "#ffe2bf")
(bg-changed-refine "#fac090")
(fg-changed "#553d00")
-
(bg-removed "#f4c2c7")
(bg-removed-faint "#f2d3d0")
(bg-removed-refine "#f3b5a7")
(fg-removed "#8f1313")
-
-;;; Marks
-
- (bg-mark-alt "#c0effa")
- (fg-mark-alt "#1f6fb0")
-
- (bg-mark-del "#ffd5ea")
- (fg-mark-del "#b32230")
-
- (bg-mark-sel "#fafa7b")
- (fg-mark-sel "#805f00")
-
-;;; Graphs
-
- (red-graph-0-bg "#ef7969")
- (red-graph-1-bg "#ffaab4")
- (green-graph-0-bg "#4faa09")
- (green-graph-1-bg "#8fef00")
- (yellow-graph-0-bg "#ffcf00")
- (yellow-graph-1-bg "#f9ff00")
- (blue-graph-0-bg "#7090ff")
- (blue-graph-1-bg "#9fc6ff")
- (magenta-graph-0-bg "#e07fff")
- (magenta-graph-1-bg "#fad0ff")
- (cyan-graph-0-bg "#70d3f0")
- (cyan-graph-1-bg "#afefff")
-
-;;; Special hues
-
+ (bg-mark-other "#c0effa")
+ (fg-mark-other "#1f6fb0")
+ (bg-mark-delete "#ffd5ea")
+ (fg-mark-delete "#b32230")
+ (bg-mark-select "#fafa7b")
+ (fg-mark-select "#805f00")
(bg-completion "#afc8df")
(bg-hover "#8acf9f")
- (bg-hover-alt "#ffff00")
+ (bg-hover-secondary "#ffff00")
(bg-hl-line "#b6ded0")
(bg-region "#d0acb2")
(bg-paren-match "#40aff0")
- (bg-err "#f0c8cf") ; check with err
- (bg-warning "#f0ea8b") ; check with warning
- (bg-info "#b0d3ef") ; check with info
-
(bg-mode-line-active "#cf93a0")
(fg-mode-line-active "#000000")
(border-mode-line-active "#7a5a50")
(bg-mode-line-inactive "#d0baaf")
(fg-mode-line-inactive "#503f3f")
(border-mode-line-inactive "#b39590")
-
(modeline-err "#b02020")
(modeline-warning "#5f1080")
(modeline-info "#002fb0")
-
(underline-err "#ef0f1f")
(underline-warning "#bf5f00")
- (underline-info "#02af52")
-
-;;; Mappings
-
-;;;; General mappings
-
+ (underline-note "#02af52")
(cursor "#aa0090")
-
- (name green-cooler)
- (keybind blue)
-
- (err red-warmer)
- (warning yellow-warmer)
- (info green)
-
-;;;; Prompt mappings
-
- (fg-prompt magenta)
-
-;;;; Code mappings
-
- (builtin blue-faint)
- (comment red-faint)
- (constant cyan-cooler)
- (fnname blue-cooler)
- (fnname-call blue-faint)
- (keyword magenta-cooler)
- (preprocessor blue-faint)
- (docstring magenta-warmer)
- (string magenta-warmer)
- (type green)
- (variable yellow-cooler)
- (variable-use yellow-faint)
- (rx-escape green) ; compare with `string'
- (rx-construct fg-main)
-
-;;;; Accent mappings
-
- (accent-0 blue)
- (accent-1 red-cooler)
- (accent-2 green)
- (accent-3 magenta-cooler)
-
-;;;; Link mappings
-
- (fg-link blue-warmer)
- (bg-link unspecified)
- (underline-link blue-warmer)
-
- (fg-link-visited magenta)
- (bg-link-visited unspecified)
- (underline-link-visited magenta)
-
-;;;; Mail mappings
-
- (mail-0 magenta)
- (mail-1 cyan-cooler)
- (mail-2 yellow-cooler)
- (mail-3 red-warmer)
- (mail-4 blue-warmer)
- (mail-recipient blue)
- (mail-subject magenta-cooler)
- (mail-other cyan)
-
-;;;; Rainbow mappings
-
(rainbow-0 "#191970"))
- standard-themes-common-palette-mappings)
+ 'warm
+ nil
+ (append
+ '((name green-cooler)
+ (keybind blue)
+ (err red-warmer)
+ (warning yellow-warmer)
+ (info green)
+ (fg-prompt magenta)
+ (builtin blue-faint)
+ (comment red-faint)
+ (constant cyan-cooler)
+ (fnname blue-cooler)
+ (fnname-call blue-faint)
+ (keyword magenta-cooler)
+ (preprocessor blue-faint)
+ (docstring magenta-warmer)
+ (type green)
+ (variable yellow-cooler)
+ (variable-use yellow-faint)
+ (rx-backslash green) ; compare with `string'
+ (rx-construct fg-main)
+ (accent-0 blue)
+ (accent-1 red-cooler)
+ (accent-2 green)
+ (accent-3 magenta-cooler)
+ (fg-link blue-warmer)
+ (bg-link unspecified)
+ (underline-link blue-warmer)
+ (fg-link-visited magenta)
+ (bg-link-visited unspecified)
+ (underline-link-visited magenta)
+ (mail-cite-0 magenta)
+ (mail-cite-1 cyan-cooler)
+ (mail-cite-2 yellow-cooler)
+ (mail-cite-3 red-warmer)
+ (mail-recipient blue)
+ (mail-subject magenta-cooler)
+ (mail-other cyan))
+ standard-themes-common-palette-mappings))
"The `standard-light-tinted' 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.")
