From ec9adfba23a9dbfe1e617d7a002ea5c73f1ca82f Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Wed, 14 Jun 2017 02:20:22 +0200 Subject: themes --- themes/jao-mono-dark-theme.el | 68 +++++++++++++++++++++++-------------------- themes/jao-themes.el | 21 ++++++++++++- themes/jao-zenburn-theme.el | 18 +++++++++++- 3 files changed, 73 insertions(+), 34 deletions(-) (limited to 'themes') diff --git a/themes/jao-mono-dark-theme.el b/themes/jao-mono-dark-theme.el index b780e3a..69e0a00 100644 --- a/themes/jao-mono-dark-theme.el +++ b/themes/jao-mono-dark-theme.el @@ -1,37 +1,37 @@ (jao-define-custom-theme jao-mono-dark - (:palette (fg unspecified "grey60") - (bg unspecified "grey10") + (:palette (fg unspecified "grey80") + (bg unspecified "#3f3f3f") (box "color-237" "grey25") - (button ((c 240) nul) ((c "aquamarine4"))) - (hilite ((c nil 238))) + (button ((c 240) nul) ((c "lightskyblue1" "#4f4f4f"))) + (hilite ((c nil "#666666"))) (strike-through ((c 237)) (st)) (italic ((c 137) it) (it (c "lightyellow3"))) - (link ((c 108) nul) ((c "aquamarine3") nit nul)) - (visited-link ((c 36) nul) ((c "dodgerblue4") nul)) + (link ((c 108) nul) ((c "#F0DFAF") nit nul)) + (visited-link ((c 36) nul) ((c "#E0CF9F") nul)) (tab-sel ((c 252 232) nbf)) (tab-unsel ((c 245 232) bx)) ;; (comment ((c 102) it) ((c nil) :height 100 ;; :family "Inconsolata LGC" it)) - (comment ((c 102) it) ((c nil) it)) + (comment ((c 102) it) ((c "grey70") it)) (keyword ((c 151) nbf nul nit) ((c "darkseagreen3"))) - (function ((c 115) nul nbf) ((c "aquamarine3"))) ;; 108 - (type ((c 72) nbf) ((c "lightyellow4"))) + (function ((c 115) nul nbf) ((c "palegreen3"))) ;; 108 + (type ((c 72) nbf) ((c "honeydew3"))) (variable-name ((c nil))) - (constant ((c 72)) ((p function))) - (string ((c 36)) ((c "aquamarine4"))) - (warning ((c 144)) ((c "lightgoldenrod3"))) + (constant ((c 72)) ((c "darkseagreen2"))) + (string ((c 36)) ((c "lemonchiffon3"))) + (warning ((c 144)) ((c "#F0DFAF"))) (error ((c 95)) ((c "goldenrod3"))) ;; (dimm ((c 240))) - (dimm ((c 59)) ((c "darkslategray4"))) - (gnus-mail ((c 248 nil))) - (gnus-news ((c 248 nil))) + (dimm ((c 59)) ((c "#7f7f7f"))) + (gnus-mail ((c "gray70" nil))) + (gnus-news ((c "gray70" nil))) (outline ((c 247))) - (f00 ((c 29)) ((c "aquamarine3"))) - (f01 ((c 108)) ((c "darkseagreen3"))) + (f00 ((c 29)) ((c "darkseagreen"))) + (f01 ((c 108)) ((c "darkseagreen2"))) (f02 ((c 102)) ((c "lightcyan4"))) ;; ((c "paleturquoise4")) - (f10 ((p f01))) - (f11 ((p f00))) - (f12 ((p f02)))) + (f10 ((c "cornsilk3"))) + (f11 ((c "lemonchiffon3"))) + (f12 ((c "azure3")))) (:faces (bold (c nil nil) nul) (button (c 66)) (font-lock-doc-face (c 30)) @@ -52,22 +52,26 @@ (w3m-tab-line (c 0 0) ul) (widget-button (c 196)) (widget-field (c 143 236))) - (:x-faces (diff-hl-change (c "red")) - (diff-hl-insert (c "green")) - (diff-hl-delete (c "yellow")) + (:x-faces (diff-hl-change (c "#3f3f3f" "darkseagreen4")) + (diff-hl-delete (c "#3f3f3f" "goldenrod4")) + (diff-hl-insert (c "#3f3f3f" "aquamarine4")) + (font-lock-doc-face (p visited-link)) + (fringe (p dimm)) (gnus-button (c "lightyellow3") nul) - (gnus-summary-selected nul bf) (gnus-summary-cancelled (c "dark slate gray" nil) st) - (header-line (c 243 235)) - (mode-line (c "grey75" "grey20") nbf nul bx) - (mode-line-inactive (c "grey40" "grey11") nbf nul bx) + (gnus-summary-selected (p warning) nul nbf) + (header-line (p hilite)) + (mode-line (c "grey75" "grey21")) + (mode-line-inactive (c "grey60" "grey31")) (org-hide (c 0 nil)) - (font-lock-doc-face (c "darkseagreen4")) - (fringe (p dimm)) (rcirc-other-nick (c 5)) - (vertical-border (c 8 nil) :inherit nil) - (w3m-image (c "lightyellow4")) - (w3m-tab-background (c 0 0)) + (spaceline-modified (c "black" "lemonchiffon3") niv) + (spaceline-read-only (c "black" "lemonchiffon4") niv) + (spaceline-unmodified (c nil "darkseagreen4") niv) + (vertical-border (c "gray35") :inherit nil) + (w3m-image (c "lightcyan2")) + (w3m-tab-background (c nil nil)) + (w3m-tab-line (c 0 0) ul) (widget-button (c nil nil) nul)) (:x-colors "#050505" "lightgoldenrod3" diff --git a/themes/jao-themes.el b/themes/jao-themes.el index 0de1c0f..a814354 100644 --- a/themes/jao-themes.el +++ b/themes/jao-themes.el @@ -147,6 +147,7 @@ (nbf '(:bold t :weight normal)) (it '(:italic t :slant italic)) (nit '(:italic nil :slant normal)) + (iv '(:inverse-video t)) (niv '(:inverse-video nil)) (ul '(:underline t)) (nul '(:underline nil)) @@ -567,7 +568,13 @@ (info-xref-visited vlink) (isearch bf (p hilite)) (isearch-fail (p error)) - (italic (p italic))) + (italic (p italic)) + (ivy-confirm (p f01)) + (ivy-current-match (p warning) bf) + (ivy-highlight-face (p hilite)) + (ivy-match-required-face (p warning)) + (ivy-modified-buffer bf) + (ivy-subdir (p f11) it)) `((jabber-activity-face dbg dfg nbf) (jabber-activity-personal-face (p warning) nbf) (jabber-chat-error (p error)) @@ -616,6 +623,7 @@ (magit-diff-file-header (~ diff-file-header)) (magit-diff-hunk-header (~ diff-hunk-header)) (magit-diff-none (p dimm)) + (magit-hash (p f12)) (magit-item-highlight (~ mm-uu-extract)) (magit-item-mark (p warning)) (magit-log-head-label (p keyword) bf) @@ -631,6 +639,7 @@ (magit-section-title (~ outline-2)) (match (p hilite)) (markdown-italic-face (~ italic)) + (markdown-inline-code-face (p f12)) (menu nil) (message-cited-text (p f01) nbf) (message-header-cc (p f00) nbf) @@ -713,6 +722,10 @@ (outline-6 nbf (p outline)) (outline-7 nbf (p outline)) (outline-8 nbf (p outline))) + `((powerline-active1 (~ mode-line)) + (powerline-active2 (~ mode-line-inactive)) + (powerline-inactive1 (~ mode-line-inactive)) + (powerline-inactive2 (~ mode-line))) `((query-replace bf (p hilite))) `((rcirc-bright-nick (p hilite)) (rcirc-my-nick (p warning)) @@ -749,6 +762,12 @@ (slime-repl-input-face (p f00) bf) (slime-repl-inputed-output-face (p f02)) (slime-repl-output-face (p string)) + (spaceline-highlight-face-default (p f00)) + (spaceline-highlight-face-modified (p f01)) + (spaceline-highlight-face (p f02)) + (spaceline-modified (p f10) iv) + (spaceline-unmodified (p f11) iv) + (spaceline-read-only (p f12) iv) (speedbar-directory-face (~ diredp-dir-heading)) (speedbar-file-face (~ diredp-file-name)) (speedbar-highlight-face (p hilite)) diff --git a/themes/jao-zenburn-theme.el b/themes/jao-zenburn-theme.el index 30c2d83..f14db14 100644 --- a/themes/jao-zenburn-theme.el +++ b/themes/jao-zenburn-theme.el @@ -11,7 +11,7 @@ ("zenburn-blue-4" . "cadet blue") ("zenburn-blue-5" . "dark cyan"))) -(require 'zenburn-theme) +(use-package zenburn-theme :ensure t) ;; (setq zenburn-colors-alist ;; (append zenburn-default-colors-alist @@ -35,6 +35,18 @@ (diredp-write-priv (c ,zenburn-yellow-2)) (font-lock-function-name-face (c ,zenburn-yellow) nbf) (fringe (c nil nil)) + (gnus-group-mail-1 (c ,zenburn-fg)) + (gnus-group-mail-2 (c ,zenburn-fg)) + (gnus-group-mail-3 (c ,zenburn-fg)) + (gnus-group-mail-4 (c ,zenburn-fg)) + (gnus-group-mail-5 (c ,zenburn-fg)) + (gnus-group-mail-6 (c ,zenburn-fg)) + (gnus-group-news-1-empty (c "grey50")) + (gnus-group-news-2-empty (c "grey50")) + (gnus-group-news-3-empty (c "grey50")) + (gnus-group-news-4-empty (c "grey50")) + (gnus-group-news-5-empty (c "grey50")) + (gnus-group-news-6-empty (c "grey50")) (gnus-summary-cancelled (c ,zenburn-red) st) (header-line (c ,zenburn-fg ,zenburn-bg+1)) (isearch (c nil ,zenburn-bg+1)) @@ -47,11 +59,15 @@ (match (c ,zenburn-orange) nbf) (mm-uu-extract (c nil ,zenburn-bg+1)) (mode-line (c ,zenburn-fg ,zenburn-bg+1) ,@box) + (mode-line-buffer-id (c ,zenburn-yellow nil) bf) + (mode-line-buffer-id-inactive (c ,zenburn-fg-1 nil) nbf) (mode-line-inactive (~ header-line) ,@box) + (org-ellipsis (c ,zenburn-yellow) nul bf) (powerline-active1 (c nil ,zenburn-bg+1)) (powerline-active2 (c nil ,zenburn-bg+3)) (powerline-inactive1 (c nil ,zenburn-bg+1)) (powerline-inactive2 (c nil ,zenburn-bg+2)) + (rcirc-track-nick (c ,zenburn-orange)) (spaceline-read-only (c "black" ,zenburn-blue-3)) (spaceline-modified (c "black" ,zenburn-blue-2)) (spaceline-unmodified (c nil ,zenburn-green-1)) -- cgit v1.2.3