git-patch.diff (5751B)
1 e77ddc1 2 years, 2 months ago jorge.israel.p@gmail.com remove variant conditions 2 diff --git a/solarized.el b/solarized.el 3 index 9d41568..2fa0a26 100644 4 --- a/solarized.el 5 +++ b/solarized.el 6 @@ -364,9 +364,10 @@ customize the resulting theme." 7 `(dired-symlink ((,class (:foreground ,cyan :weight normal :slant italic)))) 8 `(dired-warning ((,class (:foreground ,orange :underline t)))) 9 ;;;;; dired-async 10 - `(dired-async-message ((,class (:background ,(if (eq variant 'light) yellow-l yellow) )))) 11 - `(dired-async-mode-message 12 - ((,class (:background ,(if (eq variant 'light) red-l red) )))) 13 + `(dired-async-message ((,light-class (:background ,yellow-l )) 14 + (,dark-class (:background ,yellow )))) 15 + `(dired-async-mode-message ((,light-class (:background ,red-l)) 16 + (,dark-class (:background red)))) 17 ;;;;; dired-efap 18 `(dired-efap-face ((,class (:box nil 19 :background ,base02 20 @@ -726,21 +727,29 @@ customize the resulting theme." 21 ;; )))) 22 ;;;;; edts 23 `(edts-face-error-line 24 - ((,(append '((supports :underline (:style line))) class) 25 - (:underline (:style line :color ,(if (eq variant 'light) red-l red)) :inherit unspecified)) 26 + ((,(append '((supports :underline (:style line))) light-class) 27 + (:underline (:style line :color ,red-l) :inherit unspecified)) 28 + (,(append '((supports :underline (:style line))) dark-class) 29 + (:underline (:style line :color ,red) :inherit unspecified)) 30 (,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t)))) 31 `(edts-face-warning-line 32 - ((,(append '((supports :underline (:style line))) class) 33 - (:underline (:style line :color ,(if (eq variant 'light) yellow-l yellow)) :inherit unspecified)) 34 + ((,(append '((supports :underline (:style line))) light-class) 35 + (:underline (:style line :color ,yellow-l) :inherit unspecified)) 36 + (,(append '((supports :underline (:style line))) dark-class) 37 + (:underline (:style line :color ,yellow) :inherit unspecified)) 38 (,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t)))) 39 `(edts-face-error-fringe-bitmap 40 - ((,class (:foreground ,(if (eq variant 'light) red-l red) :background unspecified :weight bold)))) 41 + ((,light-class (:foreground ,red-l :background unspecified :weight bold)) 42 + (,dark-class (:foreground ,red :background unspecified :weight bold)))) 43 `(edts-face-warning-fringe-bitmap 44 - ((,class (:foreground ,(if (eq variant 'light) yellow-l yellow) :background unspecified :weight bold)))) 45 + ((,light-class (:foreground ,yellow-l :background unspecified :weight bold)) 46 + (,dark-class (:foreground ,yellow :background unspecified :weight bold)))) 47 `(edts-face-error-mode-line 48 - ((,class (:background ,(if (eq variant 'light) red-l red) :foreground unspecified)))) 49 + ((,light-class (:background ,red-l :foreground unspecified)) 50 + (,dark-class (:background ,red :foreground unspecified)))) 51 `(edts-face-warning-mode-line 52 - ((,class (:background ,(if (eq variant 'light) yellow-l yellow) :foreground unspecified)))) 53 + ((,light-class (:background ,yellow-l :foreground unspecified)) 54 + (,dark-class (:background ,yellow :foreground unspecified)))) 55 ;;;;; elfeed 56 `(elfeed-search-date-face ((,class (:foreground ,base01)))) 57 `(elfeed-search-feed-face ((,class (:foreground ,base01)))) 58 @@ -798,7 +807,8 @@ customize the resulting theme." 59 `(eshell-ls-special ((,class (:foreground ,yellow :weight bold)))) 60 `(eshell-ls-symlink ((,class (:foreground ,cyan :weight bold)))) 61 ;;;;; evil-search-highlight-persist 62 - `(evil-search-highlight-persist-highlight-face ((,class (:background ,(if (eq variant 'light) green-lc violet-lc))))) 63 + `(evil-search-highlight-persist-highlight-face ((,light-class (:background ,green-lc)) 64 + (,dark-class (:background ,violet-lc)))) 65 ;;;;; fic 66 `(fic-author-face ((,class (:background ,base03 :foreground ,orange 67 :underline t :slant italic)))) 68 @@ -1535,18 +1545,10 @@ customize the resulting theme." 69 `(nav-face-hfile ((,class (:foreground ,red)))) 70 ;;;;; nav-flash 71 ;; `(nav-flash-face ((,class (:background ,base02)))) 72 - `(nav-flash-face ((,class (:foreground 73 - ,(apply 'solarized-color-blend 74 - (if 75 - (eq variant 'light) 76 - (list yellow base1 0.2) 77 - (list cyan base1 0.1))) 78 - :background 79 - ,(apply 'solarized-color-blend 80 - (if 81 - (eq variant 'light) 82 - (list yellow base03 0.2) 83 - (list cyan base03 0.3))))))) 84 + `(nav-flash-face ((,light-class (:foreground ,(solarized-color-blend yellow base1 0.2) 85 + :background ,(solarized-color-blend yellow base03 0.2))) 86 + (,dark-class (:foreground ,(solarized-color-blend cyan base1 0.1) 87 + :background ,(solarized-color-blend cyan base03 0.3))))) 88 ;;;;; navi2ch 89 `(navi2ch-list-category-face ((,class (:foreground ,blue )))) 90 `(navi2ch-list-add-board-name-face ((,class (:foreground ,yellow))))