From 2ab399fb0c8b77401f3f4f930a4629fecae3e44b Mon Sep 17 00:00:00 2001 From: jao Date: Mon, 4 May 2020 23:38:05 +0100 Subject: light theme clean-ups --- themes/jao-doomish-theme.el | 3 +- themes/jao-light-theme.el | 79 ++++++++++++++++++++++----------------------- themes/jao-themes.el | 3 +- 3 files changed, 42 insertions(+), 43 deletions(-) (limited to 'themes') diff --git a/themes/jao-doomish-theme.el b/themes/jao-doomish-theme.el index 6efc23c..c4d512a 100644 --- a/themes/jao-doomish-theme.el +++ b/themes/jao-doomish-theme.el @@ -162,8 +162,7 @@ (w3m-image (c green) bx it) (w3m-tab-background (c nil nil)) (w3m-tab-line (c 0 0) ul) - (widget-button (c nil nil) nul)) - ) + (widget-button (c nil nil) nul))) ;; (enable-theme 'jao-doomish) diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el index 37a861f..aecbcac 100644 --- a/themes/jao-light-theme.el +++ b/themes/jao-light-theme.el @@ -1,9 +1,22 @@ (jao-define-custom-theme jao-light - (:names (dimm-background "#F4F4F4") + (:names (dimm-background "#f4f4f4") + (dimm-background-2 "#f0f0f0") (string-green "#00552a") - (func-green "#005555") + (yellow "#fdf6e3") + (pale-yellow "#fff8e5") + (green "#005555") (greyish "#626262") - (blueish "#d4d4aa")) + (blueish "#1414aa") + (blue "#819cd6") + (pale-blue "azure2") + (dark-blue "#616c96") + (dark-blue-1 "#2257A0") + (blue2 "#51afef") + (keywords "lightsteelblue4") + (keywords2 "#2257A0") + (functions "#005555") + (red "sienna3") + (red2 "sienna4")) (:palette (fg unspecified "black") (bg unspecified "white") (box "grey80" "antiquewhite3") @@ -17,24 +30,26 @@ (tab-unsel ((~ mode-line-inactive))) (comment ((c greyish) it :family "Inconsolata LGC" :height 90) ((c greyish) it)) - (keyword ((c "lightsteelblue4" nil) bf)) + (keyword ((c keywords2 nil) nbf)) (type ((c 59) nbf nul nit) ((c "#223142") nbf)) - (function ((c func-green nil) nbf)) + (function ((c green nil) nbf)) (variable-name ((c 0)) ((c "black"))) (constant ((c 23))) (string ((c 58)) ((c string-green))) (warning ((c 9)) ((c "orangered4"))) - (error ((c 1) (c "sienna3"))) + (error ((c 1) (c red))) (dimm ((c 102)) ((c "lemonchiffon4"))) (gnus-mail ((c 232)) ((c "black"))) (gnus-news ((c 232)) ((c "black"))) - (outline ((c "black"))) - (f00 ((c func-green)) ((c 23))) ;; 14 + (outline ((c "black") nbf)) + (outline-1 ((c dark-blue-1) it bf)) + (outline-2 ((c functions) it nbf)) + (outline-3 ((c string-green) it nbf)) + (outline-4 ((c nil) it nbf)) + (outline-5 ((c nil))) + (f00 ((c green)) ((c 23))) ;; 14 (f01 ((c 31)) ((c 24))) - (f02 ((c 37)) ((c func-green))) ;; 8 - ;; (f00 ((c 8))) ;; 14 - ;; (f01 ((c 14))) - ;; (f02 ((c 10))) ;; 8 + (f02 ((c 37)) ((c green))) ;; 8 (f10 ((p f00))) (f11 ((p f01))) (f12 ((p f02)))) @@ -54,10 +69,6 @@ (mode-line (c 0 "grey90") nbf nul) (mode-line-inactive (c 11 "grey90") nbf nul) (org-hide (c 15 15)) - (powerline-active1 nil) - (powerline-active2 nil) - (powerline-inactive1 nil) - (powerline-inactive2 nil) (vertical-border (c 252 nil) :inherit nil) (w3m-tab-selected (c 9 nil) bf) (w3m-link-numbering (c 12)) @@ -71,43 +82,31 @@ (company-scrollbar-fg (c nil "grey90")) (cursor (c "sienna3" "sienna3")) (diary (p error) nbf) - (diff-hl-change (c "white" "lightsteelblue1")) + (diff-hl-change (c "white" pale-blue)) (diff-hl-insert (c "white" "honeydew2")) (diff-hl-delete (c "white" "wheat1")) (fill-column-indicator (c "grey80")) (fringe (c "grey70" nil)) - (gnus-summary-selected (c "#597B59") nbf) + (gnus-summary-selected (c green) nbf) (gnus-summary-cancelled (c "sienna3") st) (header-line (c nil "#efebe7")) (lui-track-bar (p dimm) :height 0.2 nul nil ex) - (magit-diff-context-highlight (c nil "cornsilk") ex) - (magit-diff-hunk-heading-highlight (c nil "cornsilk") it bf) - (mode-line (c "grey15" "grey98") - :box (:line-width 1 :color "grey90")) - (mode-line-inactive (c "grey40" "grey95") - :box (:line-width 1 :color "grey90")) - ;; (mode-line (c "grey10" "grey95") :box nil) - ;; (mode-line-inactive (c "grey55" "grey90") :box nil) - (mode-line-buffer-id (c "orange4") nbf nit) - (spaceline-read-only (c nil "white") bf) - (spaceline-modified (c "darkorange3" "white") bf nit) - (spaceline-unmodified (c "royalblue4" "white") bf) - (org-hide (c "white" "white")) + (magit-diff-context-highlight (c nil yellow) ex) + (magit-diff-hunk-heading-highlight (c nil yellow) it bf) + (mode-line (c nil dimm-background) ;; "ghost white" + :box (:line-width 1 :color "grey85")) + (mode-line-inactive (c "grey40" dimm-background-2) + :box (:line-width 1 :color "grey85")) + (mode-line-buffer-id (c nil) nbf nit) + (mode-line-emphasis it) + (mode-line-highlight (c green nil)) (scroll-bar (c "grey80")) (vertical-border (c "grey70" nil)) (w3m-image (c "midnightblue" "azure2")) (w3m-bold (c "darkslategray") bf) (w3m-tab-selected (c "orangered4" "white") bf) (w3m-tab-selected-retrieving (~ w3m-tab-selected) (c 1)) - (w3m-tab-background (c "white" "white") nul)) - (:x-colors "black" - "darkslategrey" - "lightcyan4" - "cadetblue4" - "lightgoldenrod3" - "darkseagreen4" - "sienna3" - "lemonchiffon3")) + (w3m-tab-background (c "white" "white") nul))) ;; (enable-theme 'jao-light) diff --git a/themes/jao-themes.el b/themes/jao-themes.el index 004796e..a43778a 100644 --- a/themes/jao-themes.el +++ b/themes/jao-themes.el @@ -203,7 +203,8 @@ (defun jao-themes--dfs (fs) (let ((dfs (append - `((aw-leading-char-face (~ error) :height 1.5)) + `((aw-background-face (p dimm)) + (aw-leading-char-face (~ error) :height 1.5)) `((bbdb-company) (bbdb-field-name bf) (bbdb-field-value nil) -- cgit v1.2.3