From c5a6fa1e3bcba6b5bc35634c2f944238151534d8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 4 Nov 2015 02:08:35 -0500 Subject: [PATCH] Polish narf-dark-theme --- private/themes/narf/narf-dark-theme.el | 106 ++++++++++++++++--------- 1 file changed, 68 insertions(+), 38 deletions(-) diff --git a/private/themes/narf/narf-dark-theme.el b/private/themes/narf/narf-dark-theme.el index 545a457e1..1c69c4d5b 100644 --- a/private/themes/narf/narf-dark-theme.el +++ b/private/themes/narf/narf-dark-theme.el @@ -6,10 +6,8 @@ (custom-theme-set-variables 'narf-dark) (let* ((class '((class color) (min-colors 89))) - (white "#ffffff") - (off-white "#eaeadb") - (background "#242836") + (background "#222226") (foreground "#cccada") (subtle "#aab6c7") (vsubtle "#556172") @@ -18,15 +16,11 @@ (error-highlight "#55ffff") (vertical-bar "#000000") - (current-line "#2c354c") + (current-line "#232D3A") (selection "#445f7f") + (search "#ccccff") (search-fg "#000000") - (search "#cccccc") (search-rest "#545060") - (linum-bg "#55616A") - (linum-fg background) - (linum-highlight foreground) - (builtin "#d08770") (comments "#55626e") (constants "#d08770") @@ -39,14 +33,28 @@ (strings "#a3be8c") (variables "#CBECFF") - (modeline-bg-main "#171c26") - (modeline-bg-light "#363c4d") - (modeline-bg-lighter "#3f475d") - (modeline-bg-inactive "#2b303f") + (linum-bg "#3B4750") + (linum-fg background) + (linum-highlight subtle) + + (modeline-bg-main "#171c26") + (modeline-bg-light "#3D454E") + (modeline-bg-inactive "#111111") + + (white "#ffffff") + (off-white "#eaeadb") + (yellow "#b58900") + (orange "#cb4b16") + (red "#dc322f") + (magenta "#d33682") + (violet "#6c71c4") + (blue "#268bd2") + (cyan "#2aa198") + (green "#859900") (vc-modified "#55616A") - (vc-added "#436b3b") - (vc-deleted "#714243") + (vc-added "#437f4b") + (vc-deleted "#864253") (dim-highlight "#3f4b56")) @@ -63,9 +71,9 @@ `(font-lock-builtin-face ((,class (:foreground ,builtin)))) `(font-lock-comment-delimiter-face ((,class (:foreground ,comments)))) `(font-lock-comment-face ((,class (:foreground ,comments)))) - `(font-lock-constant-face ((,class (:foreground ,constants)))) `(font-lock-doc-face ((,class (:foreground ,comments)))) `(font-lock-doc-string-face ((,class (:foreground ,comments)))) + `(font-lock-constant-face ((,class (:foreground ,constants)))) `(font-lock-function-name-face ((,class (:foreground ,functions)))) `(font-lock-keyword-face ((,class (:foreground ,keywords)))) ;; `(font-lock-negation-char-face ((,class ()))) @@ -83,15 +91,15 @@ `(whitespace-trailing ((t (:background "#553333")))) ;; GUI - `(vertical-border ((,class (:foreground ,vertical-bar) ))) + `(vertical-border ((,class (:foreground ,vertical-bar :background ,vertical-bar) ))) - `(linum ((,class (:background ,linum-fg :foreground ,linum-bg) ))) - `(linum-highlight-face ((,class (:foreground ,linum-highlight :background ,current-line)))) + `(linum ((,class (:background ,linum-fg :foreground ,linum-bg :bold nil) ))) + `(linum-highlight-face ((,class (:inherit linum :background ,current-line :foreground ,linum-highlight)))) `(show-paren-match ((,class (:foreground ,highlight :weight ultra-bold)))) - `(mode-line ((,class (:foreground ,subtle :background ,modeline-bg-main)))) + `(mode-line ((,class (:foreground ,subtle :background ,modeline-bg-light)))) `(powerline-active1 ((,class (:foreground ,subtle :background ,modeline-bg-light)))) - `(powerline-active2 ((,class (:foreground ,subtle :background ,modeline-bg-lighter)))) + `(powerline-active2 ((,class (:foreground ,subtle :background ,modeline-bg-light)))) `(mode-line-is-modified ((,class (:foreground ,highlight)))) `(mode-line-buffer-file ((,class (:foreground ,off-white)))) `(mode-line-buffer-dir ((,class (:foreground ,subtle)))) @@ -101,25 +109,27 @@ `(powerline-inactive2 ((,class (:foreground ,vsubtle :background ,modeline-bg-inactive)))) ;; company-mode - `(company-tooltip ((,class (:inherit default :background "#3e4555")))) - `(company-tooltip-selection ((,class (:inherit font-lock-function-name-face)))) + `(company-tooltip ((,class (:inherit default :background ,vvsubtle)))) `(company-tooltip-common ((,class (:inherit font-lock-constant-face)))) - `(company-scrollbar-bg ((,class (:background "#4b5367")))) - `(company-scrollbar-fg ((,class (:background "#353b49")))) - `(company-search ((,class (:background "#4b5367")))) + `(company-tooltip-search ((,class (:foreground ,search-fg :background ,highlight)))) + `(company-tooltip-selection ((,class (:background ,vsubtle)))) + `(company-tooltip-mouse ((,class (:background ,vsubtle)))) + `(company-scrollbar-bg ((,class (:background ,vsubtle)))) + `(company-scrollbar-fg ((,class (:background ,subtle)))) ;; VCS - `(diff-hl-change ((,class (:background ,vc-modified)))) - `(diff-hl-delete ((,class (:background ,vc-deleted)))) - `(diff-hl-insert ((,class (:background ,vc-added)))) - `(git-gutter+-modified ((,class (:foreground ,vc-modified :background nil)))) - `(git-gutter+-added ((,class (:foreground ,vc-added :background nil)))) - `(git-gutter+-deleted ((,class (:foreground ,vc-deleted :background nil)))) + `(diff-hl-change ((,class (:background ,vc-modified)))) + `(diff-hl-delete ((,class (:background ,vc-deleted)))) + `(diff-hl-insert ((,class (:background ,vc-added)))) + `(git-gutter+-modified ((,class (:foreground ,vc-modified :background nil)))) + `(git-gutter+-added ((,class (:foreground ,vc-added :background nil)))) + `(git-gutter+-deleted ((,class (:foreground ,vc-deleted :background nil)))) ;; Rainbow delimiters - `(rainbow-delimiters-depth-1-face ((,class (:foreground "#CCCCDD" :weight bold :bold t)))) - `(rainbow-delimiters-unmatched-face ((,class (:foreground "#FFFFFF" :background "#EF6C00")))) + `(rainbow-delimiters-depth-1-face ((,class (:foreground ,keywords :bold t)))) + `(rainbow-delimiters-unmatched-face ((,class (:foreground ,background :background ,orange)))) + ;; Search `(isearch ((,class (:foreground ,search-fg :background ,search)))) `(isearch-lazy-highlight-face ((,class (:foreground ,foreground :background ,search-rest)))) `(evil-snipe-first-match-face ((,class (:foreground ,search-fg :background ,highlight)))) @@ -128,8 +138,8 @@ `(flyspell-incorrect ((,class (:underline ,error-highlight :inherit unspecified)))) - `(helm-source-header ((,class (:background ,modeline-bg-light :foreground ,strings :weight bold :height 1.0)))) - `(helm-selection ((,class (:background ,modeline-bg-lighter)))) + `(helm-source-header ((,class (:background ,background :foreground ,background :height 0.1)))) + `(helm-selection ((,class (:background ,vvsubtle)))) `(yascroll:thumb-fringe ((,class (:background ,vvsubtle :foreground ,vvsubtle)))) @@ -139,9 +149,29 @@ ;; js2-mode `(js2-function-param ((t (:foreground ,variables)))) `(js2-jsdoc-tag ((t (:foreground ,comments :weight bold :bold t)))) + ;; org-mode - `(org-level-1 ((t (:inherit outline-1 :bold t :foreground ,constants)))) - `(org-level-2 ((t (:inherit outline-2 :bold t :foreground ,variables)))) + ;; `(org-table ((,class (:inherit 'fixed-pitch)))) + + ;; `(org-block ((,class (:height 0.75 :background ,vsubtle)))) + `(org-block-begin-line ((,class (:background ,current-line :foreground ,vsubtle)))) + `(org-block-end-line ((,class (:inherit org-block-begin-line)))) + + `(bold ((,class (:weight bold :foreground ,white)))) + `(italic ((,class (:slant italic :foreground ,white)))) + `(bold-italic ((,class (:weight bold :slant italic :foreground ,white)))) + + `(org-document-title ((,class (:inherit variable-pitch :foreground ,foreground :background ,current-line :height 1.25 :bold nil)))) + `(org-level-1 ((,class (:foreground ,orange :bold t)))) + `(org-level-2 ((,class (:foreground ,methods)))) + `(org-level-3 ((,class (:foreground ,yellow)))) + `(org-level-4 ((,class (:foreground ,cyan)))) + `(org-level-5 ((,class ()))) + `(org-level-6 ((,class ()))) + `(org-level-7 ((,class ()))) + `(org-level-8 ((,class ()))) + `(org-checkbox ((,class (:box (:line-width 1 :style released-button))))) + `(org-link ((t (:underline t :foreground ,blue)))) ))