branch: elpa/apropospriate-theme
commit 17ec6fc0f43f7c0bcb970e2b71b8674891a464c7
Author: justin talbott <jus...@waymondo.com>
Commit: justin talbott <jus...@waymondo.com>
remove color.el, set values explicitly, update corfu-current
---
apropospriate.el | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/apropospriate.el b/apropospriate.el
index cd72353d55..cc602fdd59 100644
--- a/apropospriate.el
+++ b/apropospriate.el
@@ -25,8 +25,6 @@
;;; Code:
-(require 'color)
-
(defgroup apropospriate nil
"Apropospriate theme options."
:group 'faces)
@@ -73,29 +71,17 @@ Set to `1.0' or nil to prevent font size manipulation."
(teal-1 (if (eq variant 'light) "#00897B" "#4DB6AC"))
(green (if (eq variant 'light) "#66BB6A" "#C5E1A5"))
(green-1 (if (eq variant 'light) "#558B2F" "#F4FF81"))
- (base00-1 (if (eq variant 'light)
- (color-lighten-name base00 12)
- (color-darken-name base00 12)))
- (base00-2 (if (eq variant 'light)
- (color-lighten-name base00 24)
- (color-darken-name base00 24)))
- (base00-3 (if (eq variant 'light)
- (color-lighten-name base00 36)
- (color-darken-name base00 36)))
- (base00+1 (if (eq variant 'light)
- (color-darken-name base00 2)
- (color-lighten-name base00 12)))
- (base00+2 (if (eq variant 'light)
- (color-darken-name base00 4)
- (color-lighten-name base00 24)))
- (base00+3 (if (eq variant 'light)
- (color-darken-name base00 6)
- (color-lighten-name base00 36)))
+ (base00-1 (if (eq variant 'light) "#FBFBFB" "#3A3A3A"))
+ (base00-2 (if (eq variant 'light) "#FDFDFD" "#323232"))
+ (base00-3 (if (eq variant 'light) "#FFFFFF" "#2A2A2A"))
+ (base00+1 (if (eq variant 'light) "#F0F0F0" "#494949"))
+ (base00+2 (if (eq variant 'light) "#EBEBEB" "#515151"))
+ (base00+3 (if (eq variant 'light) "#E6E6E6" "#595959"))
(light-emphasis (if (eq variant 'light) base00+3 base00-3))
(light-emphasis-1 (if (eq variant 'light) base00+2 base00-2))
(light-emphasis-2 (if (eq variant 'light) base00+1 base00-1))
- (flashing-color (if (eq variant 'light) pink (color-darken-name pink
25)))
- (highlight-line-color base00+1))
+ (flashing-color (if (eq variant 'light) "#FCE2EB" "#EE758C"))
+ (highlight-line-color (if (eq variant 'light) "#EEEEEE" "#444444")))
,@body))
(defun create-apropospriate-theme (variant theme-name)
@@ -308,7 +294,7 @@ Set to `1.0' or nil to prevent font size manipulation."
`(company-preview-common ((,class (:foreground ,base02))))
`(company-preview-search ((,class (:background ,base00))))
`(corfu-default ((,class (:background ,base00-2 :foreground ,base02))))
- `(corfu-current ((,class (:background ,base00-1 :foreground ,base03))))
+ `(corfu-current ((,class (:background ,highlight-line-color :foreground
,base03))))
`(corfu-bar ((,class (:background ,base00+1 :foreground ,base00+3))))
`(corfu-border ((,class (:background ,base00-2 :foreground ,base03))))
`(tempel-field ((,class (:background ,base00-2 :foreground ,base03))))
