solarized-emacs

commit 5ef66b8dfeba021f8f407c292dc380be6765f990
parent 4f27b4845615cf580f169a504aea99a8f2a4aa8f
Author: Thomas Frössman <thomasf@jossystem.se>
Date:   Sun,  3 Nov 2019 19:35:37 +0100

fix solarized high contrast themes increasing intensity each load

Diffstat:
M
solarized-dark-high-contrast-theme.el
 | 
17
+++++++++--------
M
solarized-light-high-contrast-theme.el
 | 
17
+++++++++--------

2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/solarized-dark-high-contrast-theme.el b/solarized-dark-high-contrast-theme.el
@@ -27,18 +27,19 @@
   (copy-alist solarized-color-palette-alist))
 
 (let ((p solarized-dark-high-contrast-palette-alist)
+      (o solarized-color-palette-alist)
       (a 0.9)
       (a2 0.85)
       (white "#ffffe8")
       (black "#051018"))
-  (setcdr (assq 's-base03 p) (solarized-color-blend (alist-get 's-base03 p) black a 2))
-  (setcdr (assq 's-base02 p) (solarized-color-blend (alist-get 's-base02 p) black a 2))
-  (setcdr (assq 's-base01 p) (solarized-color-blend (alist-get 's-base01 p) white a 2))
-  (setcdr (assq 's-base00 p) (solarized-color-blend (alist-get 's-base00 p) white a2 2))
-  (setcdr (assq 's-base0 p) (solarized-color-blend (alist-get 's-base0 p) white a2 2))
-  (setcdr (assq 's-base1 p) (solarized-color-blend (alist-get 's-base1 p) white a2 2))
-  (setcdr (assq 's-base2 p) (solarized-color-blend (alist-get 's-base2 p)  black a 2))
-  (setcdr (assq 's-base3 p) (solarized-color-blend (alist-get 's-base3 p)  black a 2)))
+  (setcdr (assq 's-base03 p) (solarized-color-blend (alist-get 's-base03 o) black a  2))
+  (setcdr (assq 's-base02 p) (solarized-color-blend (alist-get 's-base02 o) black a  2))
+  (setcdr (assq 's-base01 p) (solarized-color-blend (alist-get 's-base01 o) white a  2))
+  (setcdr (assq 's-base00 p) (solarized-color-blend (alist-get 's-base00 o) white a2 2))
+  (setcdr (assq 's-base0  p) (solarized-color-blend (alist-get 's-base0  o) white a2 2))
+  (setcdr (assq 's-base1  p) (solarized-color-blend (alist-get 's-base1  o) white a2 2))
+  (setcdr (assq 's-base2  p) (solarized-color-blend (alist-get 's-base2  o) black a  2))
+  (setcdr (assq 's-base3  p) (solarized-color-blend (alist-get 's-base3  o) black a  2)))
 
 (deftheme solarized-dark-high-contrast
   "The dark variant of the Solarized colour theme with slightly higher text contrast")
diff --git a/solarized-light-high-contrast-theme.el b/solarized-light-high-contrast-theme.el
@@ -27,20 +27,21 @@
   (copy-alist solarized-color-palette-alist))
 
 (let ((p solarized-light-high-contrast-palette-alist)
+      (o solarized-color-palette-alist)
       (a 0.9)
       (a2 0.8)
       (a3 0.7)
       (white "#ffffe8")
       (black "#051018")
       (grey "#a0a0a0"))
-  (setcdr (assq 's-base03 p) (solarized-color-blend (alist-get 's-base03 p) black a 2))
-  (setcdr (assq 's-base02 p) (solarized-color-blend (alist-get 's-base02 p) black a 2))
-  (setcdr (assq 's-base01 p) (solarized-color-blend (alist-get 's-base01 p) grey a3 2))
-  (setcdr (assq 's-base00 p) (solarized-color-blend (alist-get 's-base00 p) black a 2))
-  (setcdr (assq 's-base0 p) (solarized-color-blend (alist-get 's-base0 p) black a2 2))
-  (setcdr (assq 's-base1 p) (solarized-color-blend (alist-get 's-base1 p) black a3 2))
-  (setcdr (assq 's-base2 p) (solarized-color-blend (alist-get 's-base2 p)  white  a 2))
-  (setcdr (assq 's-base3 p) (solarized-color-blend (alist-get 's-base3 p)  white a 2)))
+  (setcdr (assq 's-base03 p) (solarized-color-blend (alist-get 's-base03 o) black a  2))
+  (setcdr (assq 's-base02 p) (solarized-color-blend (alist-get 's-base02 o) black a  2))
+  (setcdr (assq 's-base01 p) (solarized-color-blend (alist-get 's-base01 o) grey  a3 2))
+  (setcdr (assq 's-base00 p) (solarized-color-blend (alist-get 's-base00 o) black a  2))
+  (setcdr (assq 's-base0  p) (solarized-color-blend (alist-get 's-base0  o) black a2 2))
+  (setcdr (assq 's-base1  p) (solarized-color-blend (alist-get 's-base1  o) black a3 2))
+  (setcdr (assq 's-base2  p) (solarized-color-blend (alist-get 's-base2  o) white a  2))
+  (setcdr (assq 's-base3  p) (solarized-color-blend (alist-get 's-base3  o) white a  2)))
 
 (deftheme solarized-light-high-contrast
   "The light variant of the Solarized colour theme with slightly higher text contrast")