diff options
| -rw-r--r-- | lib/themes/jao-light-theme.el | 2 | ||||
| -rw-r--r-- | lib/themes/jao-themes.el | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el index c6f316e..27104c6 100644 --- a/lib/themes/jao-light-theme.el +++ b/lib/themes/jao-light-theme.el @@ -43,6 +43,7 @@ (functions "#005555") (red "salmon3") (red2 "sienna4")) + (:face-family "Hack") (:palette (fg "black") (bg "white") (box "grey88") @@ -109,6 +110,7 @@ (scroll-bar (c "grey80" nil)) (show-paren-match (c nil "grey85")) (success (p f00)) + ;; (variable-pitch :family "DejaVu Sans" :height 110) (vertical-border (c "grey70" nil)) (warning (c "burlywood4" nil)))) diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el index 5efcbb9..3a772d7 100644 --- a/lib/themes/jao-themes.el +++ b/lib/themes/jao-themes.el @@ -828,7 +828,7 @@ (markdown-code-face (p keyword)) (markdown-inline-code-face (p function)) (markdown-italic-face (~ italic)) - (mct-hl-line (p hilite) ex) + (mct-highlight-candidate (p hilite) ex) (mct-line-number (p hilite)) (mct-line-number-current (~ mct-line-number) bf) (mct-stripe (p dimm) ex) @@ -1070,7 +1070,8 @@ (telega-root-heading (p hilite)) (term (~ default)) (tool-bar (~ default)) - (tooltip :family ,jao-themes--face-family (c nil "lightyellow")) + (tooltip :family ,jao-themes--face-family (c nil "lightyellow") + :height 0.9) (trailing-whitespace (p error)) (treemacs-root-face nul bf :scale 1.1) (twittering-timeline-footer-face (~ header-line)) @@ -1078,7 +1079,7 @@ (twittering-uri-face (~ link)) (twittering-username-face (p f01))) `((underline ul)) - `((variable-pitch :family ,jao-themes--face-family :height 110) + `((variable-pitch :family ,jao-themes--face-family) (vertical-border (c ,jao-themes--box nil) :inherit default) (vertico-current (p hilite)) (vertico-group-title (p dimm)) @@ -1186,13 +1187,16 @@ (assq-delete-all kind window-system-default-frame-alist))))) (defmacro jao-define-custom-theme (name &rest args) - (let* ((palette (cdr (assoc :palette args))) - (x-faces (cdr (assoc :x-faces args))) - (x-colors (cdr (assoc :x-colors args)))) + (let ((palette (cdr (assoc :palette args))) + (x-faces (cdr (assoc :x-faces args))) + (x-colors (cdr (assoc :x-colors args))) + (family (cadr (assoc :face-family args)))) `(progn (custom-make-theme-feature ',name) (deftheme ,name) - (let ((*jao-themes--color-names* ',(cdr (assoc :names args)))) + (custom-theme-set-variables ',name '(jao-themes--face-family ,family)) + (let ((*jao-themes--color-names* ',(cdr (assoc :names args))) + (jao-themes--face-family ,family)) (let* ,(jao-themes--let-palette palette) (jao-themes--set-fbg 'x) (jao-themes--set-fbg 'pgtk) |