From 670bbaf869d90a9ae250a804b71c00a76ff8595a Mon Sep 17 00:00:00 2001 From: Protesilaos Stavrou Date: Tue, 27 Dec 2022 06:45:27 +0200 Subject: [PATCH] Add intense diff foregrounds; use them for diffstat --- modus-operandi-deuteranopia-theme.el | 3 +++ modus-operandi-theme.el | 3 +++ modus-operandi-tinted-theme.el | 3 +++ modus-themes.el | 10 +++++----- modus-vivendi-deuteranopia-theme.el | 3 +++ modus-vivendi-theme.el | 3 +++ modus-vivendi-tinted-theme.el | 3 +++ 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/modus-operandi-deuteranopia-theme.el b/modus-operandi-deuteranopia-theme.el index a3a5f44..b4d7800 100644 --- a/modus-operandi-deuteranopia-theme.el +++ b/modus-operandi-deuteranopia-theme.el @@ -191,18 +191,21 @@ standard).") (bg-added-refine "#b5b5ef") (bg-added-intense "#579acc") (fg-added "#333399") + (fg-added-intense "#3333cc") (bg-changed "#eecfdf") (bg-changed-faint "#f0dde5") (bg-changed-refine "#e0b0d0") (bg-changed-intense "#9f7abf") (fg-changed "#6f1343") + (fg-changed-intense "#7f1f5f") (bg-removed "#fff585") (bg-removed-faint "#f2f2bb") (bg-removed-refine "#f0e068") (bg-removed-intense "#d7c20a") (fg-removed "#553d00") + (fg-removed-intense "#655000") ;;;; Mappings diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 8c0774d..aa3cf55 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -189,18 +189,21 @@ which corresponds to a minimum contrast in relative luminance of (bg-added-refine "#aee5be") (bg-added-intense "#8cca8c") (fg-added "#005000") + (fg-added-intense "#006700") (bg-changed "#ffdfa9") (bg-changed-faint "#ffefbf") (bg-changed-refine "#fac090") (bg-changed-intense "#d7c20a") (fg-changed "#553d00") + (fg-changed-intense "#655000") (bg-removed "#ffd8d5") (bg-removed-faint "#ffe9e9") (bg-removed-refine "#f3b5af") (bg-removed-intense "#d84a4f") (fg-removed "#8f1313") + (fg-removed-intense "#aa2222") ;;;; Mappings diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el index f4a0bfb..d8a5434 100644 --- a/modus-operandi-tinted-theme.el +++ b/modus-operandi-tinted-theme.el @@ -188,18 +188,21 @@ which corresponds to a minimum contrast in relative luminance of (bg-added-refine "#acd6a5") (bg-added-intense "#8cca8c") (fg-added "#005000") + (fg-added-intense "#006700") (bg-changed "#ffdfa9") (bg-changed-faint "#ffefbf") (bg-changed-refine "#fac090") (bg-changed-intense "#d7c20a") (fg-changed "#553d00") + (fg-changed-intense "#655000") (bg-removed "#f4d0cf") (bg-removed-faint "#ffe9e5") (bg-removed-refine "#f3b5a7") (bg-removed-intense "#d84a4f") (fg-removed "#8f1313") + (fg-removed-intense "#aa2222") ;;;; Mappings diff --git a/modus-themes.el b/modus-themes.el index c8476ac..2587e6b 100644 --- a/modus-themes.el +++ b/modus-themes.el @@ -1918,9 +1918,9 @@ is a less intense variant of BG." `(diff-refine-added ((,c :background ,bg-added-refine))) `(diff-refine-changed ((,c :background ,bg-changed-refine))) `(diff-refine-removed ((,c :background ,bg-removed-refine))) - `(diff-indicator-added ((,c :inherit (success diff-added)))) - `(diff-indicator-changed ((,c :inherit (warning diff-changed)))) - `(diff-indicator-removed ((,c :inherit (error diff-removed)))) + `(diff-indicator-added ((,c :inherit diff-added :foreground ,fg-added-intense))) + `(diff-indicator-changed ((,c :inherit diff-changed :foreground ,fg-changed-intense))) + `(diff-indicator-removed ((,c :inherit diff-removed :foreground ,fg-removed-intense))) `(diff-context (( ))) `(diff-error ((,c :inherit error))) `(diff-file-header ((,c :inherit bold))) @@ -2634,8 +2634,8 @@ is a less intense variant of BG." `(magit-diff-lines-heading ((,c :background ,fg-dim :foreground ,bg-main))) `(magit-diff-removed ((,c :background ,bg-removed-faint :foreground ,fg-removed))) `(magit-diff-removed-highlight ((,c :background ,bg-removed :foreground ,fg-removed))) - `(magit-diffstat-added ((,c :inherit success))) - `(magit-diffstat-removed ((,c :inherit error))) + `(magit-diffstat-added ((,c :foreground ,fg-added-intense))) + `(magit-diffstat-removed ((,c :foreground ,fg-removed-intense))) `(magit-dimmed ((,c :inherit shadow))) `(magit-filename ((,c :foreground ,fg-accent-2))) `(magit-hash ((,c :foreground ,identifier))) diff --git a/modus-vivendi-deuteranopia-theme.el b/modus-vivendi-deuteranopia-theme.el index a588ba5..b482bd5 100644 --- a/modus-vivendi-deuteranopia-theme.el +++ b/modus-vivendi-deuteranopia-theme.el @@ -190,18 +190,21 @@ standard).") (bg-added-refine "#0f4a77") (bg-added-intense "#0f4fbf") (fg-added "#c4d5ff") + (fg-added-intense "#a0afff") (bg-changed "#2f123f") (bg-changed-faint "#1f022f") (bg-changed-refine "#3f325f") (bg-changed-intense "#7f42af") (fg-changed "#e3cfff") + (fg-changed-intense "#c0a4ff") (bg-removed "#3d3d00") (bg-removed-faint "#281f00") (bg-removed-refine "#515100") (bg-removed-intense "#dfd23a") (fg-removed "#d4d48f") + (fg-removed-intense "#c0b05f") ;;;; Mappings diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index e03479f..c263867 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -188,18 +188,21 @@ which corresponds to a minimum contrast in relative luminance of (bg-added-refine "#034f2f") (bg-added-intense "#237f3f") (fg-added "#a0e0a0") + (fg-added-intense "#80e080") (bg-changed "#363300") (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") (bg-changed-intense "#8a7a00") (fg-changed "#efef80") + (fg-changed-intense "#c0b05f") (bg-removed "#4f1119") (bg-removed-faint "#380a0f") (bg-removed-refine "#781a1f") (bg-removed-intense "#b81a1f") (fg-removed "#ffbfbf") + (fg-removed-intense "#ff9095") ;;;; Mappings diff --git a/modus-vivendi-tinted-theme.el b/modus-vivendi-tinted-theme.el index 2ca8001..0b20213 100644 --- a/modus-vivendi-tinted-theme.el +++ b/modus-vivendi-tinted-theme.el @@ -188,18 +188,21 @@ which corresponds to a minimum contrast in relative luminance of (bg-added-refine "#035542") (bg-added-intense "#237f4f") (fg-added "#a0e0a0") + (fg-added-intense "#80e080") (bg-changed "#363300") (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") (bg-changed-intense "#8a7a00") (fg-changed "#efef80") + (fg-changed-intense "#c0b05f") (bg-removed "#4f1127") (bg-removed-faint "#380a19") (bg-removed-refine "#781a3a") (bg-removed-intense "#b81a26") (fg-removed "#ffbfbf") + (fg-removed-intense "#ff9095") ;;;; Mappings