diff options
Diffstat (limited to 'themes')
| -rwxr-xr-x | themes/dark-ec | 8 | ||||
| -rw-r--r-- | themes/jao-dark-theme.el | 46 | ||||
| -rw-r--r-- | themes/jao-light-theme.el | 6 | ||||
| -rw-r--r-- | themes/jao-themes.el | 28 | ||||
| -rwxr-xr-x | themes/light-ec | 3 |
5 files changed, 63 insertions, 28 deletions
diff --git a/themes/dark-ec b/themes/dark-ec index 0574ef8..f93f727 100755 --- a/themes/dark-ec +++ b/themes/dark-ec @@ -2,10 +2,13 @@ font=${EC_TERM_FACE:-xft:Terminus:size=12,[codeset=iso8859-7]xft:Andale Mono:size=12} -frg="grey50" -bkg="#050505" +frg="grey60" +bkg="#101010" +bkg="black" +bkg="grey5" bw=${EC_TERM_BORDER:-2} tr=${EC_TRANS_SPEC} +usr=${EC_USR_OPTS} exec urxvtcd -cr tomato -sl 0 +ptab +rv +ssr -b $bw -bd "$bkg" \ -bg "$bkg" -fg "$frg" \ @@ -28,4 +31,5 @@ exec urxvtcd -cr tomato -sl 0 +ptab +rv +ssr -b $bw -bd "$bkg" \ -xrm "*color14: grey40" \ -xrm "*color7: ${frg}" \ -xrm "*color15: grey50" \ + ${usr} \ -e emacsclient -t $* diff --git a/themes/jao-dark-theme.el b/themes/jao-dark-theme.el index 03f8e5d..e95f663 100644 --- a/themes/jao-dark-theme.el +++ b/themes/jao-dark-theme.el @@ -1,23 +1,25 @@ (jao-define-custom-theme jao-dark - (:palette (fg unspecified "grey55") + (:palette (fg unspecified "grey60") (bg unspecified "grey2") (box "yellow" "grey30") (button ((c 11) nul)) (hilite ((c nil 8))) (strike-through ((c 8))) - (italic ((c 101) nul) ((c "lemmonchiffon4"))) + (italic ((c 101) nul) (it :family "DejaVu Sans" :height 90)) (link ((c 2) nul)) (visited-link ((c 2) nul)) (tab-sel ((c 9 8) nbf)) (tab-unsel ((c 15 6) bx)) - (comment ((c 3))) - (keyword ((c 36) nbf nul) (bf)) + (comment ((c 3)) ((c 3))) + (keyword ((c 12) nbf nul)) +;; (keyword ((c 151) nbf nul) (bf)) (type ((c 11) nbf)) - (function ((c 10) nul nbf)) + (function ((c 108) nul nbf)) +;; (function ((c 13) nul bf)) (variable-name ((c nil))) - (constant ((c 3))) + (constant ((c 4))) (string ((c 2))) - (warning ((c 144))) + (warning ((c 144)) ((c 1))) (error ((c 9))) (dimm ((c 3))) (gnus-mail ((c 15 nil))) @@ -25,18 +27,19 @@ (outline ((c 7))) (f00 ((c 11))) (f01 ((c 10))) - (f02 ((c 29))) + (f02 ((c 23)) ((c "cadetblue4"))) (f10 ((p f00))) (f11 ((p f01))) (f12 ((p f02)))) (:faces (bold (c nil nil) nul) + (font-lock-doc-face (c 10)) (gnus-button (c nil nil) nul) (gnus-summary-selected (c nil nil) ul nbf) (mm-uu-extract (c nil 6)) (mode-line (c 7 8) nbf nul) - (mode-line-inactive (c 8 6) nbf nul) + (mode-line-inactive (c 8 16) nbf nul) (org-hide (c 0 nil)) - (rcirc-other-nick (c 14) bf) +;; (rcirc-other-nick (c 4) nbf) (vertical-border (c 8 nil) :inherit nil) (w3m-image (c 1)) (w3m-tab-background (c 0 0)) @@ -44,18 +47,31 @@ (widget-button (c nil nil) nul)) (:x-faces (gnus-button (c nil nil) nul) (gnus-summary-selected (c "grey40" nil) ul) - (mode-line (c 14 8) bf nul bx) + (mode-line (c 14 8) nbf nul bx) (mode-line-inactive (c 3 8) nbf nul bx) (org-hide (c 0 nil)) + (font-lock-doc-face (c 10)) (fringe (p dimm)) (rcirc-other-nick (c 5)) (vertical-border (c 8 nil) :inherit nil) (w3m-image (c 9)) (w3m-tab-background (c 0 0)) (widget-button (c nil nil) nul)) - (:x-colors "#050505" "lightgoldenrod3" "darkseagreen4" "grey40" "lightcyan4" - "paleturquoise4" "grey7" "grey60" - "grey20" "sienna4" "#44836e" "#648f81" "darkseagreen4" - "aquamarine4" "azure4" "grey60")) + (:x-colors "#050505" + "lightgoldenrod3" + "darkseagreen4" + "grey40" + "lightcyan4" + "paleturquoise4" + "grey7" + "grey60" + "grey20" + "sienna4" + "#44836e" + "#648f81" + "darkseagreen4" + "aquamarine4" + "azure4" + "grey60")) (provide 'jao-dark-theme) diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el index 4201532..a387767 100644 --- a/themes/jao-light-theme.el +++ b/themes/jao-light-theme.el @@ -5,7 +5,7 @@ (button ((c 13 nil) nbf nul) (bx)) (hilite ((c nil 5))) (strike-through ((c 1)) (st)) - (italic ((c 4) nbf it) (dfg dbg it)) + (italic ((c 10) nbf it) (dfg dbg it)) (link ((c 8) ul nbf)) (visited-link (link)) (tab-sel ((~ mode-line))) @@ -39,11 +39,12 @@ (gnus-summary-selected (c 13 nil) nul) (gnus-summary-normal-unread (c 0 nil)) (header-line (c nil 5) nul) - (italic it) +;; (italic it) (mode-line (c 11 5) nbf nul) (mode-line-inactive (c 11 6) nbf nul) (org-hide (c 7 7)) (vertical-border (c 11 nil) :inherit nil) + (w3m-tab-selected (c 9 15) bf) (w3m-link-numbering (c 12)) (w3m-bold (c nil nil) bf) (w3m-image (c 3)) @@ -74,4 +75,3 @@ "lemonchiffon4" "#386858" "#223142" "#EFEBE7")) (provide 'jao-light-theme) - diff --git a/themes/jao-themes.el b/themes/jao-themes.el index 0b4b44c..6599cad 100644 --- a/themes/jao-themes.el +++ b/themes/jao-themes.el @@ -127,6 +127,8 @@ (buffer-menu-buffer bf) (button (p button))) `((calendar-holiday-marker (p f00)) + (clojure-test-failure-face (p warning) ul) + (clojure-test-error-face (p error) ul) (cursor (p error))) `((diredp-compressed-file-suffix (~ diredp-file-suffix)) (diredp-date-time (p f01)) @@ -227,7 +229,8 @@ (dired-marked bf (p f00)) (dired-symlink (p f11)) (dired-warn-writable (p warning)) - (dired-warning (p warning))) + (dired-warning (p warning)) + (diredp-number (p f11))) `((ediff-current-diff-A (~ diff-added)) (ediff-current-diff-Ancestor (c nil ,jao-themes--box)) (ediff-current-diff-B (~ ediff-current-diff-A)) @@ -416,9 +419,10 @@ (help-argument-name) (highlight (p hilite))) `((ido-first-match (p warning)) + (ido-first-match-face (p warning)) (ido-incomplete-regexp (p error)) (ido-indicator (p error) nbf) - (ido-only-match (p f00)) + (ido-only-match (p error)) (ido-subdir (p f01)) (info-header-node bf dfg) (info-header-xref dfg) @@ -476,9 +480,13 @@ (magit-diff-file-header (~ diff-file-header)) (magit-diff-hunk-header (~ diff-hunk-header)) (magit-diff-none (p dimm)) - (magit-item-highlight (p hilite)) + (magit-item-highlight (~ mm-uu-extract)) (magit-item-mark (p warning)) (magit-log-head-label (p keyword) bf) + (magit-log-head-label-default (p keyword) nbf) + (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-tag-label (p keyword)) (magit-section-title (~ outline-2)) @@ -501,6 +509,7 @@ (mode-line-highlight (~ mode-line)) (modeline-mousable (~ mode-line-active)) (modeline-mousable-minor-mode (~ modeline-mousable)) + (moinmoin-table-pi (p f02)) (mouse dfg dbg ul) (muse-link link) (muse-verbatim (p f02))) @@ -554,9 +563,9 @@ (outline-8 nbf (p outline))) `((query-replace bf (p hilite))) `((rcirc-bright-nick (p hilite)) - (rcirc-my-nick (p error)) - (rcirc-nick-in-message (p error)) - (rcirc-nick-in-message-full-line nbf) + (rcirc-my-nick (p warning)) + (rcirc-nick-in-message (p warning)) + (rcirc-nick-in-message-full-line (~ rcirc-nick-in-message)) (rcirc-other-nick (p keyword)) (rcirc-prompt bf) (rcirc-server (p dimm)) @@ -572,6 +581,9 @@ (sh-quoted-exec (p f00)) (show-paren-match (p hilite)) (show-paren-mismatch (p error)) + (sldb-frame-line-face (p f00)) + (sldb-frame-label-face (p f01)) + (sldb-condition-face (p f02)) (slime-repl-prompt-face (p f00)) (slime-repl-input-face (p f00) bf) (slime-repl-inputed-output-face (p f02)) @@ -585,7 +597,9 @@ (shadow nil)) `((tool-bar nil) (tooltip :family ,jao-themes--face-family (c nil "lightyellow")) - (trailing-whitespace (p error))) + (trailing-whitespace (p error)) + (twittering-uri-face (~ link)) + (twittering-username-face (p f01))) `((underline nul)) `((variable-pitch :family ,jao-themes--face-family :height 11) (vertical-border (c ,jao-themes--box nil) :inherit default)) diff --git a/themes/light-ec b/themes/light-ec index 20e5fd3..7dc7bdc 100755 --- a/themes/light-ec +++ b/themes/light-ec @@ -9,6 +9,7 @@ bkg="#EFEBE7" bw=${EC_TERM_BORDER:-1} tr=${EC_TRANS_SPEC} +usr=${EC_USR_OPTS} exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \ -sl 0 +rv +ssr -b $bw +sbg -fn "${font}" \ @@ -30,7 +31,7 @@ exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \ -xrm "*color14: #1F3D4F" \ -xrm "*color7: ${bkg}" \ -xrm "*color15: #EFEBE7" \ - -name "emacsclient" \ + -name "emacsclient" ${usr} \ -e emacsclient -t $* # fname=${EC_XTERM_FN:-Inconsolata} |