diff options
| -rw-r--r-- | themes/jao-mono-dark-theme.el | 63 | ||||
| -rw-r--r-- | themes/jao-themes.el | 60 | ||||
| -rwxr-xr-x | themes/light-ec | 2 |
3 files changed, 88 insertions, 37 deletions
diff --git a/themes/jao-mono-dark-theme.el b/themes/jao-mono-dark-theme.el index 043562b..5db2138 100644 --- a/themes/jao-mono-dark-theme.el +++ b/themes/jao-mono-dark-theme.el @@ -1,43 +1,44 @@ (jao-define-custom-theme jao-mono-dark - (:palette (fg unspecified "grey60") + (:palette (fg unspecified "grey75") (bg unspecified "grey2") - (box "color-237" "grey30") - (button ((c 240) nul)) + (box "color-237" "grey25") + (button ((c 240) nul) ((c "aquamarine4"))) (hilite ((c nil 8))) - (strike-through ((c 237))) - (italic ((c 250) nul)) - (link ((c 108) nul)) - (visited-link ((c 107) nul)) + (strike-through ((c 237)) (st)) + (italic ((c 250) nul) (nit (c "lightyellow"))) + (link ((c 108) nul) ((c "aquamarine3") nit nul)) + (visited-link ((c 107) nul) ((c "aquamarine3") nul)) (tab-sel ((c 252 232) nbf)) (tab-unsel ((c 245 232) bx)) - (comment ((c 244))) - (keyword ((c 151) nbf nul)) - (function ((c 108) nul nbf)) - (type ((c 72) nbf)) + (comment ((c 29))) + (keyword ((c 151) nbf nul) ((c "darkseagreen2"))) + (function ((c 108) nul nbf) ((c "aquamarine3"))) + (type ((c 72) nbf) ((c "lightyellow3"))) (variable-name ((c nil))) - (constant ((c 66))) - (string ((c 66))) - (warning ((c 144))) - (error ((c 95))) + (constant ((c 66)) ((p function))) + (string ((c 36)) ((c "aquamarine4"))) + (warning ((c 144)) ((c "lightgoldenrod3"))) + (error ((c 95)) ((c "goldenrod3"))) (dimm ((c 240))) (gnus-mail ((c 248 nil))) (gnus-news ((c 248 nil))) (outline ((c 247))) - (f00 ((c 108))) - (f01 ((c 29))) ;; 30 - (f02 ((c 102))) - (f10 ((p f00))) - (f11 ((p f01))) + (f00 ((c 29)) ((c "darkseagreen3"))) + (f01 ((c 108)) ((c "aquamarine4"))) + (f02 ((c 102)) ((c "lightyellow4"))) + (f10 ((p f01))) + (f11 ((p f00))) (f12 ((p f02)))) (:faces (bold (c nil nil) nul) (button (c 66)) - (header-line (c 243 236)) - (font-lock-doc-face (c 244)) + (font-lock-doc-face (c 30)) (gnus-button (c nil) nul) + (gnus-header-subject (p f01)) (gnus-summary-selected (c 66 nil) nul nbf) + (match ul) (mm-uu-extract (c nil 234)) - (mode-line (c 253 240) nbf nul) - (mode-line-inactive (c 245 235) nbf nul) + (mode-line (c 248 235) nbf nul) + (mode-line-inactive (c 243 235) nbf nul) (org-hide (c 0 nil)) (rcirc-other-nick (c 108)) (vertical-border (c 8 nil) :inherit nil) @@ -45,16 +46,20 @@ (w3m-tab-background (c 0 0)) (w3m-tab-line (c 0 0)) (widget-button (c 196))) - (:x-faces (gnus-button (c nil nil) nul) + (:x-faces (gnus-button (c "lightyellow4") nul) (gnus-summary-selected (c "grey40" nil) ul) - (mode-line (c 14 8) nbf nul bx) - (mode-line-inactive (c 3 8) nbf nul bx) + (header-line (c 243 235)) + (jabber-roster-user-dnd (p warning)) + (jabber-roster-user-error (p warning)) + (jabber-title-small-face (~ jabber-tittle-medium-face)) + (mode-line (c "grey75" "grey20") nbf nul bx) + (mode-line-inactive (c "grey40" "grey11") nbf nul bx) (org-hide (c 0 nil)) - (font-lock-doc-face (c 10)) + (font-lock-doc-face (c "darkseagreen")) (fringe (p dimm)) (rcirc-other-nick (c 5)) (vertical-border (c 8 nil) :inherit nil) - (w3m-image (c 100)) + (w3m-image (c "lightyellow4")) (w3m-tab-background (c 0 0)) (widget-button (c nil nil) nul)) (:x-colors "#050505" diff --git a/themes/jao-themes.el b/themes/jao-themes.el index 6599cad..6e6b22d 100644 --- a/themes/jao-themes.el +++ b/themes/jao-themes.el @@ -47,16 +47,47 @@ (jao-themes--normalize-body (apply 'append (mapcar 'jao-themes--parse-face-sym f)))))) -(defvar jao-themes--cidxs - '("black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" - "brightblack" "brightred" "brightgreen" "brightyellow" "brightblue" - "brightmagenta" "brightcyan" "brightwhite")) +(defvar jao-themes--default-cidxs + '("#000000" "#cd0000" "#00cd00" "#cdcd00" "#0000cd" "#cd00cd" "#00cdcd" "#e5e5e5" + "#4d4d4d" "#ff0000" "#00ff00" "#ffff00" "#0000ff" "#ff00ff" "#00ffff" "#ffffff" + "#000000" "#00002a" "#000055" "#000080" "#0000aa" "#0000d4" "#002a00" "#002a2a" + "#002a55" "#002a80" "#002aaa" "#002ad4" "#005500" "#00552a" "#005555" "#005580" + "#0055aa" "#0055d4" "#008000" "#00802a" "#008055" "#008080" "#0080aa" "#0080d4" + "#00aa00" "#00aa2a" "#00aa55" "#00aa80" "#00aaaa" "#00aad4" "#00d400" "#00d42a" + "#00d455" "#00d480" "#00d4aa" "#00d4d4" "#2a0000" "#2a002a" "#2a0055" "#2a0080" + "#2a00aa" "#2a00d4" "#2a2a00" "#2a2a2a" "#2a2a55" "#2a2a80" "#2a2aaa" "#2a2ad4" + "#2a5500" "#2a552a" "#2a5555" "#2a5580" "#2a55aa" "#2a55d4" "#2a8000" "#2a802a" + "#2a8055" "#2a8080" "#2a80aa" "#2a80d4" "#2aaa00" "#2aaa2a" "#2aaa55" "#2aaa80" + "#2aaaaa" "#2aaad4" "#2ad400" "#2ad42a" "#2ad455" "#2ad480" "#2ad4aa" "#2ad4d4" + "#550000" "#55002a" "#550055" "#550080" "#5500aa" "#5500d4" "#552a00" "#552a2a" + "#552a55" "#552a80" "#552aaa" "#552ad4" "#555500" "#55552a" "#555555" "#555580" + "#5555aa" "#5555d4" "#558000" "#55802a" "#558055" "#558080" "#5580aa" "#5580d4" + "#55aa00" "#55aa2a" "#55aa55" "#55aa80" "#55aaaa" "#55aad4" "#55d400" "#55d42a" + "#55d455" "#55d480" "#55d4aa" "#55d4d4" "#800000" "#80002a" "#800055" "#800080" + "#8000aa" "#8000d4" "#802a00" "#802a2a" "#802a55" "#802a80" "#802aaa" "#802ad4" + "#805500" "#80552a" "#805555" "#805580" "#8055aa" "#8055d4" "#808000" "#80802a" + "#808055" "#808080" "#8080aa" "#8080d4" "#80aa00" "#80aa2a" "#80aa55" "#80aa80" + "#80aaaa" "#80aad4" "#80d400" "#80d42a" "#80d455" "#80d480" "#80d4aa" "#80d4d4" + "#aa0000" "#aa002a" "#aa0055" "#aa0080" "#aa00aa" "#aa00d4" "#aa2a00" "#aa2a2a" + "#aa2a55" "#aa2a80" "#aa2aaa" "#aa2ad4" "#aa5500" "#aa552a" "#aa5555" "#aa5580" + "#aa55aa" "#aa55d4" "#aa8000" "#aa802a" "#aa8055" "#aa8080" "#aa80aa" "#aa80d4" + "#aaaa00" "#aaaa2a" "#aaaa55" "#aaaa80" "#aaaaaa" "#aaaad4" "#aad400" "#aad42a" + "#aad455" "#aad480" "#aad4aa" "#aad4d4" "#d40000" "#d4002a" "#d40055" "#d40080" + "#d400aa" "#d400d4" "#d42a00" "#d42a2a" "#d42a55" "#d42a80" "#d42aaa" "#d42ad4" + "#d45500" "#d4552a" "#d45555" "#d45580" "#d455aa" "#d455d4" "#d48000" "#d4802a" + "#d48055" "#d48080" "#d480aa" "#d480d4" "#d4aa00" "#d4aa2a" "#d4aa55" "#d4aa80" + "#d4aaaa" "#d4aad4" "#d4d400" "#d4d42a" "#d4d455" "#d4d480" "#d4d4aa" "#d4d4d4" + "#080808" "#121212" "#1c1c1c" "#262626" "#303030" "#3a3a3a" "#444444" "#4e4e4e" + "#585858" "#626262" "#6c6c6c" "#767676" "#808080" "#8a8a8a" "#949494" "#9e9e9e" + "#a8a8a8" "#b2b2b2" "#bcbcbc" "#c6c6c6" "#d0d0d0" "#dadada" "#e4e4e4" "#eeeeee")) +(defvar jao-themes--cidxs nil) (defvar jao-themes--x-colors nil) (defun jao-themes--color (clr) (cond ((stringp clr) clr) ((numberp clr) (or (nth clr jao-themes--cidxs) + (nth clr jao-themes--default-cidxs) (format "color-%s" clr))) (t 'unspecified))) @@ -93,7 +124,7 @@ (defun jao-themes--make-faces (fs &optional cidxs) (let ((*jao--parsed-faces* nil) - (jao-themes--cidxs (or cidxs jao-themes--cidxs)) + (jao-themes--cidxs (or cidxs jao-themes--default-cidxs)) (result nil)) (dolist (f (sort (jao-themes--dfs fs) 'jao--cmp-faces) (reverse result)) (let ((body (jao-themes--parse-face-body (cdr f)))) @@ -207,6 +238,9 @@ (darcsum-need-action-face (p warning)) (darcsum-need-action-marked-face bf (p warning)) (diary (p f02)) + (dictionary-button-face (p link)) + (dictionary-reference-face (p f11)) + (dictionary-word-entry-face (p f10)) (diff-added (p warning)) (diff-changed (p f02)) (diff-context (p dimm)) @@ -266,6 +300,18 @@ (epa-validity-high bf) (epa-validity-low) (epa-validity-medium) + (erc-action-face (p f02)) + (erc-button (p link)) + (erc-current-nick-face (p error)) + (erc-error-face (p error)) + (erc-header-line (~ header)) + (erc-input-face (p warning)) + (erc-nick-default-face (p f11)) + (erc-nick-msg-face (p warning)) + (erc-notice-face (p dimm)) + (erc-pal-face (p warning)) + (erc-prompt-face (f 01)) + (erc-timestamp-face (p dimm)) (escape-glyph (p dimm)) (eshell-ls-archive (p f12)) (eshell-ls-backup (p dimm)) @@ -415,7 +461,7 @@ (gnus-x-face) (gui-button-face (~ button)) (gui-element (~ gui-button-face))) - `((header-line (~ mode-line)) + `((header-line (~ mode-line-inactive)) (help-argument-name) (highlight (p hilite))) `((ido-first-match (p warning)) @@ -487,7 +533,7 @@ (magit-log-head-label-local (p keyword) bf) (magit-log-head-label-remote (p function) bf) (magit-log-head-label-tags (p warning) nbf) - (magit-log-graph bf) + (magit-log-graph (p f11)) (magit-log-tag-label (p keyword)) (magit-section-title (~ outline-2)) (match (p hilite)) diff --git a/themes/light-ec b/themes/light-ec index 7dc7bdc..361a058 100755 --- a/themes/light-ec +++ b/themes/light-ec @@ -8,7 +8,7 @@ frg="black" bkg="#EFEBE7" bw=${EC_TERM_BORDER:-1} -tr=${EC_TRANS_SPEC} +tr=${EC_TRANS_SPEC:-+tr} usr=${EC_USR_OPTS} exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \ |