diff options
Diffstat (limited to 'lib/themes')
| -rw-r--r-- | lib/themes/jao-light-theme.el | 25 | ||||
| -rw-r--r-- | lib/themes/jao-themes.el | 41 |
2 files changed, 48 insertions, 18 deletions
diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el index 659b6bb..7f75c68 100644 --- a/lib/themes/jao-light-theme.el +++ b/lib/themes/jao-light-theme.el @@ -18,7 +18,7 @@ (jao-define-custom-theme jao-light (:names (bg-lightest "gray98") - (bg-light "gray95") + (bg-light "#efefef") (light-gray "gray80") @@ -36,9 +36,6 @@ (green "#005555") (lightgreen "darkgreen") (yellow "lightyellow")) - (:face-size 9) - ;; (:face-family "DejaVu Sans Mono") - (:face-family "Hack") (:bold-weight 'semibold) (:palette (fg "black") (bg "white") @@ -93,6 +90,7 @@ (gnus-cite-2 (c "slate gray" nil)) (gnus-cite-3 (c "slate gray" nil)) (gnus-cite-4 (c "slate gray" nil)) + (gnus-face-4 (p f11) :family "Triplicate C4c") (gnus-header-name (c fg-light)) (gnus-summary-selected (c green) nbf) (gnus-summary-cancelled (c "sienna3" nil) st) @@ -101,13 +99,24 @@ (magit-diff-context-highlight (c nil yellow) ex) (magit-diff-hunk-heading-highlight (c nil hl) it bf) (message-header-subject (p warning) nbf) - (mode-line (c "grey20") :box (:line-width 1 :color "grey80")) + (mode-line + (c "seashell3" nil) + :box (:line-width 1 :color "#dfdfdf" :style flat-button)) + (mode-line-active + (c "#3f3f3f" "gray96") + :box (:line-width 1 :color "#dfdfdf" :style flat-button)) (mode-line-inactive - (c "grey40" bg-light) :box (:line-width 1 :color "grey80")) + (c "#afafaf" nil) + :box (:line-width 1 :color "#efefdf" :style flat-button)) (mode-line-buffer-id (~ default) (c nil nil) nit) (mode-line-emphasis (c green nil)) (mode-line-highlight (c green nil)) + (org-agenda-calendar-event (p f02)) + (org-agenda-structure (c nil "#efefef") ex) + (org-agenda-date (~ default)) + (org-agenda-date-today (~ org-agenda-structure) ex) (org-link (p link) (ul "grey80")) + (org-time-grid (c "grey60" nil)) (tab-bar (~ header-line) :family "Source Code Pro") (scroll-bar (c "grey80" nil)) (show-paren-match (c nil "grey85")) @@ -115,9 +124,9 @@ (shr-link (~ link) (ul light-gray)) (shr-code (c blue nil)) (success (c green)) - (variable-pitch :family "Iosevka Etoile" :height 90) - (vertical-border (c "grey70" nil)) + (vertical-border (c "#dfdfdf" nil)) (vterm-color-yellow (c "darkgoldenrod4" yellow)) + (window-divider (c "grey99" nil)) (widget-button (~ default) nit (ul "grey80")))) ;; (enable-theme 'jao-light) diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el index 706427b..65d9c32 100644 --- a/lib/themes/jao-themes.el +++ b/lib/themes/jao-themes.el @@ -21,8 +21,14 @@ (require 'ansi-color) ;;; palette -(defvar jao-themes-default-face "DejaVu Sans Mono-9") -(defvar jao-themes--face-family "DejaVu Sans Mono") +(defvar jao-themes-default-face nil) +(defvar jao-themes-default-family "Hack") +(defvar jao-themes-default-variable-pitch-size 9) +(defvar jao-themes-default-variable-pitch-family "Hack") +(defvar jao-themes-default-size 9) +(defvar jao-themes--face-family jao-themes-default-face) +(defvar jao-themes--variable-pitch-family nil) +(defvar jao-themes--variable-pitch-height nil) (defvar jao-themes--fg "black") (defvar jao-themes--bg "white") (defvar jao-themes--box "grey75") @@ -318,9 +324,9 @@ (avy-lead-face-0 (~ avy-lead-face) bf) (avy-lead-face-1 (~ avy-lead-face))) `((bbdb-company) - (bbdb-field-name bf) + (bbdb-field-name (p f00)) (bbdb-field-value (~ default)) - (bbdb-name ul) + (bbdb-name (p f01)) (bmk-mgr-bookmark-face (~ default)) (bmk-mgr-folder-face bf) (bmk-mgr-sel-bookmark-face link) @@ -597,7 +603,11 @@ (font-lock-type-face (p type)) (font-lock-variable-name-face (p variable-name)) (font-lock-warning-face (p warning)) + (forge-pullreq-merged (p dimm)) (forge-pullreq-open (c nil nil)) + (forge-pullreq-rejected (~ forge-pullreq-merged) st) + (forge-topic-pending (c nil nil)) + (forge-topic-unread (p f00)) (forge-topic-label bx) (fringe (p dimm)) (fuel-font-lock-debug-error (p error) nul) @@ -958,7 +968,7 @@ (org-table (p f01)) (org-tag (p dimm) nbf) (org-target ul) - (org-time-grid (c nil nil)) + (org-time-grid (p dimm)) (org-todo nbf niv (p error)) (org-upcoming-deadline (p f02)) (org-verbatim (p hilite)) @@ -1106,7 +1116,7 @@ (twittering-uri-face (~ link)) (twittering-username-face (p f01))) `((underline ul)) - `((variable-pitch :family ,jao-themes--face-family) + `((variable-pitch :family ,jao-themes--variable-pitch-family) (variable-pitch-text (~ variable-pitch)) (vertical-border (c ,jao-themes--box nil) :inherit default) (vertico-current (p hilite)) @@ -1189,7 +1199,7 @@ (push df fs))))) (defun jao-themes--adjust-palette (p s) - (if-let* ((v (alist-get s p))) (cons (cons s (car v)) (assoc-delete-all s p)) p)) + (if-let (v (alist-get s p)) (cons (cons s (car v)) (assoc-delete-all s p)) p)) (defun jao-themes--let-palette (palette) (let ((palette (seq-reduce #'jao-themes--adjust-palette '(fg bg box) palette))) @@ -1225,21 +1235,32 @@ (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))) - (size (or (cadr (assoc :face-size args)) 9)) + (family (or (cadr (assoc :face-family args)) + jao-themes-default-family)) + (size (or (cadr (assoc :face-size args)) + jao-themes-default-size)) + (vpitch (or (cadr (assoc :variable-pitch-family args)) + jao-themes-default-variable-pitch-family)) + (vsize (or (cadr (assoc :variable-pitch-size args)) + jao-themes-default-variable-pitch-size)) (bw (or (cadr (assoc :bold-weight args)) jao-themes--bold-weight))) `(progn (custom-make-theme-feature ',name) (deftheme ,name) (custom-theme-set-variables ',name '(jao-themes-default-face - (format "%s-%s" ,family ,size)) + ,(format "%s-%s" family size)) '(jao-themes--face-family ,family) + '(jao-themes--variable-pitch-family + ,vpitch) + '(jao-themes--variable-pitch-height + ,(* 10 vsize)) '(jao-themes--bold-weight ,bw)) (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 'ns) (jao-themes--set-fbg 'pgtk) (let* ((xfaces (jao-themes--make-faces ',x-faces ',x-colors)) (tx-faces (jao-themes--extract-faces xfaces xfaces))) |