commit 0d5dbbcae7620ed96aad9a6de8ddd141630e98a1
parent b90ba1b8938c2511b2e3d45015363143ec53da4e
Author: Thomas Frössman <thomasf@jossystem.se>
Date: Tue, 5 Nov 2019 12:06:30 +0100
remove the s- prefix from the name in the palette alist
Diffstat:
3 files changed, 62 insertions(+), 57 deletions(-)
diff --git a/solarized-dark-high-contrast-theme.el b/solarized-dark-high-contrast-theme.el
@@ -32,14 +32,14 @@
(a2 0.85)
(white "#ffffe8")
(black "#051018"))
- (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)))
+ (setcdr (assq 'base03 p) (solarized-color-blend (alist-get 'base03 o) black a 2))
+ (setcdr (assq 'base02 p) (solarized-color-blend (alist-get 'base02 o) black a 2))
+ (setcdr (assq 'base01 p) (solarized-color-blend (alist-get 'base01 o) white a 2))
+ (setcdr (assq 'base00 p) (solarized-color-blend (alist-get 'base00 o) white a2 2))
+ (setcdr (assq 'base0 p) (solarized-color-blend (alist-get 'base0 o) white a2 2))
+ (setcdr (assq 'base1 p) (solarized-color-blend (alist-get 'base1 o) white a2 2))
+ (setcdr (assq 'base2 p) (solarized-color-blend (alist-get 'base2 o) black a 2))
+ (setcdr (assq 'base3 p) (solarized-color-blend (alist-get '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
@@ -34,14 +34,14 @@
(white "#ffffe8")
(black "#051018")
(grey "#a0a0a0"))
- (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)))
+ (setcdr (assq 'base03 p) (solarized-color-blend (alist-get 'base03 o) black a 2))
+ (setcdr (assq 'base02 p) (solarized-color-blend (alist-get 'base02 o) black a 2))
+ (setcdr (assq 'base01 p) (solarized-color-blend (alist-get 'base01 o) grey a3 2))
+ (setcdr (assq 'base00 p) (solarized-color-blend (alist-get 'base00 o) black a 2))
+ (setcdr (assq 'base0 p) (solarized-color-blend (alist-get 'base0 o) black a2 2))
+ (setcdr (assq 'base1 p) (solarized-color-blend (alist-get 'base1 o) black a3 2))
+ (setcdr (assq 'base2 p) (solarized-color-blend (alist-get 'base2 o) white a 2))
+ (setcdr (assq 'base3 p) (solarized-color-blend (alist-get 'base3 o) white a 2)))
(deftheme solarized-light-high-contrast
"The light variant of the Solarized colour theme with slightly higher text contrast")
diff --git a/solarized.el b/solarized.el
@@ -163,14 +163,14 @@ The Returned color-palette has the same format as `solarized-color-palette'"
(blue (nth 7 core-palette))
(cyan (nth 8 core-palette))
(green (nth 9 core-palette)))
- `((s-base03 . ,(solarized-color-blend darkest-base brightest-base 1.00 2))
- (s-base02 . ,(solarized-color-blend darkest-base brightest-base 0.97 2))
- (s-base01 . ,(solarized-color-blend darkest-base brightest-base 0.65 2))
- (s-base00 . ,(solarized-color-blend darkest-base brightest-base 0.60 2))
- (s-base0 . ,(solarized-color-blend darkest-base brightest-base 0.48 2))
- (s-base1 . ,(solarized-color-blend darkest-base brightest-base 0.42 2))
- (s-base2 . ,(solarized-color-blend darkest-base brightest-base 0.06 2))
- (s-base3 . ,(solarized-color-blend darkest-base brightest-base 0.00 2))
+ `((base03 . ,(solarized-color-blend darkest-base brightest-base 1.00 2))
+ (base02 . ,(solarized-color-blend darkest-base brightest-base 0.97 2))
+ (base01 . ,(solarized-color-blend darkest-base brightest-base 0.65 2))
+ (base00 . ,(solarized-color-blend darkest-base brightest-base 0.60 2))
+ (base0 . ,(solarized-color-blend darkest-base brightest-base 0.48 2))
+ (base1 . ,(solarized-color-blend darkest-base brightest-base 0.42 2))
+ (base2 . ,(solarized-color-blend darkest-base brightest-base 0.06 2))
+ (base3 . ,(solarized-color-blend darkest-base brightest-base 0.00 2))
;; Solarized accented colors
(yellow . ,yellow)
@@ -202,19 +202,15 @@ The Returned color-palette has the same format as `solarized-color-palette'"
(green-l . ,(solarized-color-blend green brightest-base 0.80 2)))))
(defvar solarized-color-palette-alist
- '((s-base03 . "#002b36")
- (s-base02 . "#073642")
- ;; emphasized content
- (s-base01 . "#586e75")
- ;; primary content
- (s-base00 . "#657b83")
- (s-base0 . "#839496")
- ;; comments
- (s-base1 . "#93a1a1")
- ;; background highlight light
- (s-base2 . "#eee8d5")
- ;; background light
- (s-base3 . "#fdf6e3")
+ '( ;; Solarized base colors
+ (base03 . "#002b36")
+ (base02 . "#073642")
+ (base01 . "#586e75")
+ (base00 . "#657b83")
+ (base0 . "#839496")
+ (base1 . "#93a1a1")
+ (base2 . "#eee8d5")
+ (base3 . "#fdf6e3")
;; Solarized accented colors
(yellow . "#b58900")
@@ -257,15 +253,24 @@ VARIANT is 'dark or 'light."
(variant ,variant)
,@(mapcar (lambda (elm) `(,(car elm) ,(cdr elm))) color-palette)
+ (s-base03 base03)
+ (s-base02 base02)
+ (s-base01 base01)
+ (s-base00 base00)
+ (s-base3 base3)
+ (s-base2 base2)
+ (s-base1 base1)
+ (s-base0 base0)
+
;; Solarized palette names, use these instead of -fg -bg...
- (base0 (if (eq variant 'light) s-base00 s-base0))
+ (base03 (if (eq variant 'light) s-base3 s-base03))
+ (base02 (if (eq variant 'light) s-base2 s-base02))
+ (base01 (if (eq variant 'light) s-base1 s-base01))
(base00 (if (eq variant 'light) s-base0 s-base00))
+ (base0 (if (eq variant 'light) s-base00 s-base0))
(base1 (if (eq variant 'light) s-base01 s-base1))
- (base01 (if (eq variant 'light) s-base1 s-base01))
(base2 (if (eq variant 'light) s-base02 s-base2))
- (base02 (if (eq variant 'light) s-base2 s-base02))
(base3 (if (eq variant 'light) s-base03 s-base3))
- (base03 (if (eq variant 'light) s-base3 s-base03))
;; Line drawing color
;;
@@ -2548,14 +2553,14 @@ customize the resulting theme."
"The gruvbox color palette.")
(defvar solarized-gruvbox-dark-color-palette-alist
- '((s-base00 . (alist-get 'dark4 solarized-gruvbox-colors))
- (s-base01 . (alist-get 'dark3 solarized-gruvbox-colors))
- (s-base02 . (alist-get 'dark0_soft solarized-gruvbox-colors))
- (s-base03 . (alist-get 'dark0 solarized-gruvbox-colors))
- (s-base0 . (alist-get 'light4 solarized-gruvbox-colors))
- (s-base1 . (alist-get 'light3 solarized-gruvbox-colors))
- (s-base2 . (alist-get 'light4 solarized-gruvbox-colors))
- (s-base3 . (alist-get 'light0 solarized-gruvbox-colors))
+ '((base00 . (alist-get 'dark4 solarized-gruvbox-colors))
+ (base01 . (alist-get 'dark3 solarized-gruvbox-colors))
+ (base02 . (alist-get 'dark0_soft solarized-gruvbox-colors))
+ (base03 . (alist-get 'dark0 solarized-gruvbox-colors))
+ (base0 . (alist-get 'light4 solarized-gruvbox-colors))
+ (base1 . (alist-get 'light3 solarized-gruvbox-colors))
+ (base2 . (alist-get 'light4 solarized-gruvbox-colors))
+ (base3 . (alist-get 'light0 solarized-gruvbox-colors))
(yellow . (alist-get 'yellow solarized-gruvbox-colors))
(orange . (alist-get 'orange solarized-gruvbox-colors))
@@ -2585,14 +2590,14 @@ customize the resulting theme."
"The solarized gruvbox dark palette color alist.")
(defvar solarized-gruvbox-light-color-palette-alist
- '((s-base00 . (alist-get 'dark4 solarized-gruvbox-colors))
- (s-base01 . (alist-get 'dark3 solarized-gruvbox-colors))
- (s-base02 . (alist-get 'dark0_soft solarized-gruvbox-colors))
- (s-base03 . (alist-get 'dark0 solarized-gruvbox-colors))
- (s-base0 . (alist-get 'dark1 solarized-gruvbox-colors))
- (s-base1 . (alist-get 'light4 solarized-gruvbox-colors))
- (s-base2 . (alist-get 'light1 solarized-gruvbox-colors))
- (s-base3 . (alist-get 'light0 solarized-gruvbox-colors))
+ '((base00 . (alist-get 'dark4 solarized-gruvbox-colors))
+ (base01 . (alist-get 'dark3 solarized-gruvbox-colors))
+ (base02 . (alist-get 'dark0_soft solarized-gruvbox-colors))
+ (base03 . (alist-get 'dark0 solarized-gruvbox-colors))
+ (base0 . (alist-get 'dark1 solarized-gruvbox-colors))
+ (base1 . (alist-get 'light4 solarized-gruvbox-colors))
+ (base2 . (alist-get 'light1 solarized-gruvbox-colors))
+ (base3 . (alist-get 'light0 solarized-gruvbox-colors))
(yellow . (alist-get 'dark_yellow solarized-gruvbox-colors))
(orange . (alist-get 'dark_orange solarized-gruvbox-colors))
