From 07c64b9875a6f8f39392b32e5b65aedc9d7f9c89 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:33:33 -0400 Subject: theme: Sort list --- lisp/km-theme.el | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index e81015e..3d8ccff 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -24,17 +24,15 @@ (custom-theme-set-faces 'stekene-light - '(default ((t (:background "white")))) - '(match ((t (:inherit default :background "PaleGreen1")))) '(compilation-info ((t (:inherit font-lock-function-name-face)))) + '(default ((t (:background "white")))) '(diff-added ((t (:foreground "DarkGreen" :background "grey98")))) '(diff-context ((t (:foreground "grey10" :background "grey98")))) '(diff-removed ((t (:foreground "#aa2222" :background "grey98")))) '(dired-symlink ((t (:inherit font-lock-constant-face)))) - ;; Darken a bit (was gray40). - '(font-lock-keyword-face ((t (:foreground "gray33")))) '(font-latex-math-face ((t (:inherit font-lock-builtin-face)))) '(font-latex-string-face ((t (:inherit default)))) + '(font-lock-keyword-face ((t (:foreground "gray33")))) ; Darken a bit (was gray40) '(git-annex-dired-annexed-available ((t (:inherit font-lock-type-face)))) '(git-annex-dired-annexed-unavailable ((t (:inherit font-lock-string-face)))) '(gnus-button ((t (:inherit default)))) @@ -51,25 +49,25 @@ '(gnus-header-subject ((t (:inherit font-lock-doc-face)))) '(gnus-subject ((t (:inherit font-lock-doc-face)))) '(gnus-summary-normal-read ((t (:inherit font-lock-comment-face)))) - '(helm-grep-finish ((t (:inherit compilation-mode-line-exit)))) '(helm-grep-file ((t (:inherit compilation-info)))) + '(helm-grep-finish ((t (:inherit compilation-mode-line-exit)))) '(helm-grep-lineno ((t (:inherit compilation-line-number)))) + '(helm-match-item ((t (:inherit lazy-highlight)))) '(helm-selection ((t (:inherit region)))) - '(helm-swoop-target-word-face ((t (:inherit lazy-highlight)))) '(helm-swoop-target-line-block-face ((t (:inherit match)))) '(helm-swoop-target-line-face ((t (:inherit match)))) - '(helm-match-item ((t (:inherit lazy-highlight)))) + '(helm-swoop-target-word-face ((t (:inherit lazy-highlight)))) '(isearch ((t (:inherit match)))) - '(magit-cherry-unmatched ((t (:inherit font-lock-string-face)))) '(magit-cherry-equivalent ((t (:inherit font-lock-constant-face)))) + '(magit-cherry-unmatched ((t (:inherit font-lock-string-face)))) '(magit-diff-added ((t (:foreground "DarkGreen" :background "grey98")))) '(magit-diff-added-highlight ((t (:foreground "DarkGreen" :background "grey98")))) '(magit-diff-context ((t (:foreground "grey50" :background "grey98")))) '(magit-diff-context-highlight ((t (:foreground "grey50" :background "grey98")))) - '(magit-diff-hunk-heading ((t (:foreground "gray30" :background "grey90")))) - '(magit-diff-hunk-heading-highlight ((t (:foreground "gray30" :background "grey80")))) '(magit-diff-file-heading ((t (:inherit default :weight bold)))) '(magit-diff-file-heading-selection ((t (:inherit default :weight bold)))) + '(magit-diff-hunk-heading ((t (:foreground "gray30" :background "grey90")))) + '(magit-diff-hunk-heading-highlight ((t (:foreground "gray30" :background "grey80")))) '(magit-diff-removed ((t (:foreground "#aa2222" :background "grey98")))) '(magit-diff-removed-highlight ((t (:foreground "#aa2222" :background "grey98")))) '(magit-popup-argument ((t (:inherit font-lock-string-face)))) @@ -81,10 +79,11 @@ '(magit-reflog-rebase ((t (:inherit font-lock-string-face)))) '(magit-reflog-remote ((t (:inherit font-lock-variable-name-face)))) '(magit-reflog-reset ((t (:inherit font-lock-warning-face)))) - '(magit-section-highlight ((t (:background "white")))) '(magit-section-heading ((t (:inherit font-lock-constant-face :weight bold)))) + '(magit-section-highlight ((t (:background "white")))) '(magit-section-secondary-heading ((t (:inherit default)))) - '(mm-uu-extract ((t (:background "gray95" )))) + '(match ((t (:inherit default :background "PaleGreen1")))) + '(mm-uu-extract ((t (:background "gray95")))) '(org-agenda-calendar-event ((t (:inherit font-lock-function-name-face)))) '(org-agenda-calendar-sexp ((t (:inherit font-lock-variable-name-face)))) '(org-agenda-clocking ((t (:inherit lazy-highlight)))) -- cgit v1.2.3 From 6ffe7b068ee37de30db0131aad00077a9e9384ba Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:33:41 -0400 Subject: theme: Avoid setting faces outside theme --- lisp/km-theme.el | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index 3d8ccff..962ffd5 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -24,11 +24,16 @@ (custom-theme-set-faces 'stekene-light + '(Info-quoted ((t (:inherit default)))) '(compilation-info ((t (:inherit font-lock-function-name-face)))) + '(cursor ((t (:background "#f08080")))) '(default ((t (:background "white")))) '(diff-added ((t (:foreground "DarkGreen" :background "grey98")))) '(diff-context ((t (:foreground "grey10" :background "grey98")))) '(diff-removed ((t (:foreground "#aa2222" :background "grey98")))) + '(dired-subtree-depth-1-face ((t (:background "gray80")))) + '(dired-subtree-depth-2-face ((t (:background "gray90")))) + '(dired-subtree-depth-3-face ((t (:background "gray95")))) '(dired-symlink ((t (:inherit font-lock-constant-face)))) '(font-latex-math-face ((t (:inherit font-lock-builtin-face)))) '(font-latex-string-face ((t (:inherit default)))) @@ -108,14 +113,7 @@ '(term-color-green ((t (:foreground "#3cb371")))) '(term-color-magenta ((t (:foreground "#8b008b")))) '(term-color-red ((t (:inherit font-lock-string-face)))) - '(term-color-yellow ((t (:inherit font-lock-doc-face))))) - -(custom-set-faces - '(cursor ((t (:background "#f08080")))) - '(dired-subtree-depth-1-face ((t (:background "gray80")))) - '(dired-subtree-depth-2-face ((t (:background "gray90")))) - '(dired-subtree-depth-3-face ((t (:background "gray95")))) - '(Info-quoted ((t (:inherit default)))) + '(term-color-yellow ((t (:inherit font-lock-doc-face)))) '(whitespace-indentation ((t (:background "gray90")))) '(whitespace-trailing ((t (:background "gray90"))))) -- cgit v1.2.3 From 9af4b1165df5a2cfcbc6765a38d53b065b47edff Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:40:55 -0400 Subject: theme: Pull out and name some shared values --- lisp/km-theme.el | 194 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 100 insertions(+), 94 deletions(-) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index 962ffd5..2fc1fe7 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -22,100 +22,106 @@ (load-theme 'stekene-light t) -(custom-theme-set-faces - 'stekene-light - '(Info-quoted ((t (:inherit default)))) - '(compilation-info ((t (:inherit font-lock-function-name-face)))) - '(cursor ((t (:background "#f08080")))) - '(default ((t (:background "white")))) - '(diff-added ((t (:foreground "DarkGreen" :background "grey98")))) - '(diff-context ((t (:foreground "grey10" :background "grey98")))) - '(diff-removed ((t (:foreground "#aa2222" :background "grey98")))) - '(dired-subtree-depth-1-face ((t (:background "gray80")))) - '(dired-subtree-depth-2-face ((t (:background "gray90")))) - '(dired-subtree-depth-3-face ((t (:background "gray95")))) - '(dired-symlink ((t (:inherit font-lock-constant-face)))) - '(font-latex-math-face ((t (:inherit font-lock-builtin-face)))) - '(font-latex-string-face ((t (:inherit default)))) - '(font-lock-keyword-face ((t (:foreground "gray33")))) ; Darken a bit (was gray40) - '(git-annex-dired-annexed-available ((t (:inherit font-lock-type-face)))) - '(git-annex-dired-annexed-unavailable ((t (:inherit font-lock-string-face)))) - '(gnus-button ((t (:inherit default)))) - '(gnus-cite-1 ((t (:inherit font-lock-function-name-face)))) - '(gnus-cite-2 ((t (:inherit font-lock-string-face)))) - '(gnus-group-mail-1 ((t (:inherit gnus-group-mail-1-empty :weight bold)))) - '(gnus-group-mail-1-empty ((t (:inherit font-lock-string-face)))) - '(gnus-group-mail-2 ((t (:inherit gnus-group-mail-2-empty :weight bold)))) - '(gnus-group-mail-2-empty ((t (:inherit font-lock-function-name-face)))) - '(gnus-group-mail-3 ((t (:inherit gnus-group-mail-3-empty :weight bold)))) - '(gnus-group-mail-3-empty ((t (:inherit font-lock-type-face)))) - '(gnus-header-content ((t (:inherit default)))) - '(gnus-header-name ((t (:inherit font-lock-constant-face)))) - '(gnus-header-subject ((t (:inherit font-lock-doc-face)))) - '(gnus-subject ((t (:inherit font-lock-doc-face)))) - '(gnus-summary-normal-read ((t (:inherit font-lock-comment-face)))) - '(helm-grep-file ((t (:inherit compilation-info)))) - '(helm-grep-finish ((t (:inherit compilation-mode-line-exit)))) - '(helm-grep-lineno ((t (:inherit compilation-line-number)))) - '(helm-match-item ((t (:inherit lazy-highlight)))) - '(helm-selection ((t (:inherit region)))) - '(helm-swoop-target-line-block-face ((t (:inherit match)))) - '(helm-swoop-target-line-face ((t (:inherit match)))) - '(helm-swoop-target-word-face ((t (:inherit lazy-highlight)))) - '(isearch ((t (:inherit match)))) - '(magit-cherry-equivalent ((t (:inherit font-lock-constant-face)))) - '(magit-cherry-unmatched ((t (:inherit font-lock-string-face)))) - '(magit-diff-added ((t (:foreground "DarkGreen" :background "grey98")))) - '(magit-diff-added-highlight ((t (:foreground "DarkGreen" :background "grey98")))) - '(magit-diff-context ((t (:foreground "grey50" :background "grey98")))) - '(magit-diff-context-highlight ((t (:foreground "grey50" :background "grey98")))) - '(magit-diff-file-heading ((t (:inherit default :weight bold)))) - '(magit-diff-file-heading-selection ((t (:inherit default :weight bold)))) - '(magit-diff-hunk-heading ((t (:foreground "gray30" :background "grey90")))) - '(magit-diff-hunk-heading-highlight ((t (:foreground "gray30" :background "grey80")))) - '(magit-diff-removed ((t (:foreground "#aa2222" :background "grey98")))) - '(magit-diff-removed-highlight ((t (:foreground "#aa2222" :background "grey98")))) - '(magit-popup-argument ((t (:inherit font-lock-string-face)))) - '(magit-reflog-amend ((t (:inherit font-lock-function-name-face)))) - '(magit-reflog-checkout ((t (:inherit font-lock-builtin-face)))) - '(magit-reflog-commit ((t (:inherit default)))) - '(magit-reflog-merge ((t (:inherit font-lock-doc-face)))) - '(magit-reflog-other ((t (:inherit font-lock-type-face)))) - '(magit-reflog-rebase ((t (:inherit font-lock-string-face)))) - '(magit-reflog-remote ((t (:inherit font-lock-variable-name-face)))) - '(magit-reflog-reset ((t (:inherit font-lock-warning-face)))) - '(magit-section-heading ((t (:inherit font-lock-constant-face :weight bold)))) - '(magit-section-highlight ((t (:background "white")))) - '(magit-section-secondary-heading ((t (:inherit default)))) - '(match ((t (:inherit default :background "PaleGreen1")))) - '(mm-uu-extract ((t (:background "gray95")))) - '(org-agenda-calendar-event ((t (:inherit font-lock-function-name-face)))) - '(org-agenda-calendar-sexp ((t (:inherit font-lock-variable-name-face)))) - '(org-agenda-clocking ((t (:inherit lazy-highlight)))) - '(org-agenda-date ((t (:foreground "gray40")))) - '(org-agenda-date-today ((t (:weight bold)))) - '(org-agenda-date-weekend ((t (:inherit org-agenda-date)))) - '(org-agenda-restriction-lock ((t (:background "white")))) - '(org-agenda-structure ((t (:foreground "gray60")))) - '(org-date ((t (:inherit font-lock-type-face)))) - '(org-done ((t (:foreground "#557755" :background "gray95")))) - '(org-scheduled ((t (:inherit default)))) - '(org-scheduled-today ((t (:inherit org-scheduled)))) - '(org-todo ((t (:inherit font-lock-string-face :background "gray95")))) - '(org-upcoming-deadline ((t (:inherit default)))) - '(org-warning ((t (:inherit font-lock-string-face)))) - '(outline-1 ((t (:inherit font-lock-doc-face)))) - '(outline-2 ((t (:inherit font-lock-function-name-face)))) - '(outline-3 ((t (:inherit font-lock-constant-face)))) - '(term-color-black ((t (:inherit default)))) - '(term-color-blue ((t (:inherit font-lock-function-name-face)))) - '(term-color-cyan ((t (:foreground "#008b8b")))) - '(term-color-green ((t (:foreground "#3cb371")))) - '(term-color-magenta ((t (:foreground "#8b008b")))) - '(term-color-red ((t (:inherit font-lock-string-face)))) - '(term-color-yellow ((t (:inherit font-lock-doc-face)))) - '(whitespace-indentation ((t (:background "gray90")))) - '(whitespace-trailing ((t (:background "gray90"))))) +(let ((bg "white") + (bg-mid "gray96") + (bg-dark "gray92") + (fg-light "gray30") + (diff-added "DarkGreen") + (diff-removed "#aa2222")) + (custom-theme-set-faces + 'stekene-light + '(Info-quoted ((t (:inherit default)))) + '(compilation-info ((t (:inherit font-lock-function-name-face)))) + '(cursor ((t (:background "#f08080")))) + `(default ((t (:background ,bg)))) + `(diff-added ((t (:foreground ,diff-added :background "grey98")))) + '(diff-context ((t (:foreground "grey10" :background "grey98")))) + `(diff-removed ((t (:foreground ,diff-removed :background "grey98")))) + '(dired-subtree-depth-1-face ((t (:background "gray80")))) + '(dired-subtree-depth-2-face ((t (:background "gray90")))) + '(dired-subtree-depth-3-face ((t (:background "gray95")))) + '(dired-symlink ((t (:inherit font-lock-constant-face)))) + '(font-latex-math-face ((t (:inherit font-lock-builtin-face)))) + '(font-latex-string-face ((t (:inherit default)))) + '(font-lock-keyword-face ((t (:foreground "gray33")))) ; Darken a bit (was gray40) + '(git-annex-dired-annexed-available ((t (:inherit font-lock-type-face)))) + '(git-annex-dired-annexed-unavailable ((t (:inherit font-lock-string-face)))) + '(gnus-button ((t (:inherit default)))) + '(gnus-cite-1 ((t (:inherit font-lock-function-name-face)))) + '(gnus-cite-2 ((t (:inherit font-lock-string-face)))) + '(gnus-group-mail-1 ((t (:inherit gnus-group-mail-1-empty :weight bold)))) + '(gnus-group-mail-1-empty ((t (:inherit font-lock-string-face)))) + '(gnus-group-mail-2 ((t (:inherit gnus-group-mail-2-empty :weight bold)))) + '(gnus-group-mail-2-empty ((t (:inherit font-lock-function-name-face)))) + '(gnus-group-mail-3 ((t (:inherit gnus-group-mail-3-empty :weight bold)))) + '(gnus-group-mail-3-empty ((t (:inherit font-lock-type-face)))) + '(gnus-header-content ((t (:inherit default)))) + '(gnus-header-name ((t (:inherit font-lock-constant-face)))) + '(gnus-header-subject ((t (:inherit font-lock-doc-face)))) + '(gnus-subject ((t (:inherit font-lock-doc-face)))) + '(gnus-summary-normal-read ((t (:inherit font-lock-comment-face)))) + '(helm-grep-file ((t (:inherit compilation-info)))) + '(helm-grep-finish ((t (:inherit compilation-mode-line-exit)))) + '(helm-grep-lineno ((t (:inherit compilation-line-number)))) + '(helm-match-item ((t (:inherit lazy-highlight)))) + '(helm-selection ((t (:inherit region)))) + '(helm-swoop-target-line-block-face ((t (:inherit match)))) + '(helm-swoop-target-line-face ((t (:inherit match)))) + '(helm-swoop-target-word-face ((t (:inherit lazy-highlight)))) + '(isearch ((t (:inherit match)))) + '(magit-cherry-equivalent ((t (:inherit font-lock-constant-face)))) + '(magit-cherry-unmatched ((t (:inherit font-lock-string-face)))) + `(magit-diff-added ((t (:foreground ,diff-added :background "grey98")))) + `(magit-diff-added-highlight ((t (:foreground ,diff-added :background "grey98")))) + '(magit-diff-context ((t (:foreground "grey50" :background "grey98")))) + '(magit-diff-context-highlight ((t (:foreground "grey50" :background "grey98")))) + '(magit-diff-file-heading ((t (:inherit default :weight bold)))) + '(magit-diff-file-heading-selection ((t (:inherit default :weight bold)))) + `(magit-diff-hunk-heading ((t (:foreground ,fg-light :background "grey90")))) + `(magit-diff-hunk-heading-highlight ((t (:foreground ,fg-light :background "grey80")))) + `(magit-diff-removed ((t (:foreground ,diff-removed :background "grey98")))) + `(magit-diff-removed-highlight ((t (:foreground ,diff-removed :background "grey98")))) + '(magit-popup-argument ((t (:inherit font-lock-string-face)))) + '(magit-reflog-amend ((t (:inherit font-lock-function-name-face)))) + '(magit-reflog-checkout ((t (:inherit font-lock-builtin-face)))) + '(magit-reflog-commit ((t (:inherit default)))) + '(magit-reflog-merge ((t (:inherit font-lock-doc-face)))) + '(magit-reflog-other ((t (:inherit font-lock-type-face)))) + '(magit-reflog-rebase ((t (:inherit font-lock-string-face)))) + '(magit-reflog-remote ((t (:inherit font-lock-variable-name-face)))) + '(magit-reflog-reset ((t (:inherit font-lock-warning-face)))) + '(magit-section-heading ((t (:inherit font-lock-constant-face :weight bold)))) + `(magit-section-highlight ((t (:background ,bg)))) + '(magit-section-secondary-heading ((t (:inherit default)))) + '(match ((t (:inherit default :background "PaleGreen1")))) + '(mm-uu-extract ((t (:background "gray95")))) + '(org-agenda-calendar-event ((t (:inherit font-lock-function-name-face)))) + '(org-agenda-calendar-sexp ((t (:inherit font-lock-variable-name-face)))) + '(org-agenda-clocking ((t (:inherit lazy-highlight)))) + '(org-agenda-date ((t (:foreground "gray40")))) + '(org-agenda-date-today ((t (:weight bold)))) + '(org-agenda-date-weekend ((t (:inherit org-agenda-date)))) + `(org-agenda-restriction-lock ((t (:background ,bg)))) + '(org-agenda-structure ((t (:foreground "gray60")))) + '(org-date ((t (:inherit font-lock-type-face)))) + '(org-done ((t (:foreground "#557755" :background "gray95")))) + '(org-scheduled ((t (:inherit default)))) + '(org-scheduled-today ((t (:inherit org-scheduled)))) + '(org-todo ((t (:inherit font-lock-string-face :background "gray95")))) + '(org-upcoming-deadline ((t (:inherit default)))) + '(org-warning ((t (:inherit font-lock-string-face)))) + '(outline-1 ((t (:inherit font-lock-doc-face)))) + '(outline-2 ((t (:inherit font-lock-function-name-face)))) + '(outline-3 ((t (:inherit font-lock-constant-face)))) + '(term-color-black ((t (:inherit default)))) + '(term-color-blue ((t (:inherit font-lock-function-name-face)))) + '(term-color-cyan ((t (:foreground "#008b8b")))) + '(term-color-green ((t (:foreground "#3cb371")))) + '(term-color-magenta ((t (:foreground "#8b008b")))) + '(term-color-red ((t (:inherit font-lock-string-face)))) + '(term-color-yellow ((t (:inherit font-lock-doc-face)))) + '(whitespace-indentation ((t (:background "gray90")))) + '(whitespace-trailing ((t (:background "gray90")))))) (provide 'km-theme) ;;; km-theme.el ends here -- cgit v1.2.3 From 6f59c3fea091387b5a7defff36ded50b577a16b0 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:41:56 -0400 Subject: theme: Tweak diff colors --- lisp/km-theme.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index 2fc1fe7..7aa62bc 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -26,8 +26,8 @@ (bg-mid "gray96") (bg-dark "gray92") (fg-light "gray30") - (diff-added "DarkGreen") - (diff-removed "#aa2222")) + (diff-added "#1d771d") + (diff-removed "#e60000")) (custom-theme-set-faces 'stekene-light '(Info-quoted ((t (:inherit default)))) -- cgit v1.2.3 From abbd996c09750ed49e9ede9d20174ecc59e79856 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:44:45 -0400 Subject: theme: Drop term customization --- lisp/km-theme.el | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index 7aa62bc..a129d76 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -113,13 +113,6 @@ '(outline-1 ((t (:inherit font-lock-doc-face)))) '(outline-2 ((t (:inherit font-lock-function-name-face)))) '(outline-3 ((t (:inherit font-lock-constant-face)))) - '(term-color-black ((t (:inherit default)))) - '(term-color-blue ((t (:inherit font-lock-function-name-face)))) - '(term-color-cyan ((t (:foreground "#008b8b")))) - '(term-color-green ((t (:foreground "#3cb371")))) - '(term-color-magenta ((t (:foreground "#8b008b")))) - '(term-color-red ((t (:inherit font-lock-string-face)))) - '(term-color-yellow ((t (:inherit font-lock-doc-face)))) '(whitespace-indentation ((t (:background "gray90")))) '(whitespace-trailing ((t (:background "gray90")))))) -- cgit v1.2.3 From 1534e0927589f61ecc910846d991a567d61e7498 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:43:24 -0400 Subject: theme: Replace many values with closest fg- or bg- color --- lisp/km-theme.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index a129d76..9dc4319 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -34,9 +34,9 @@ '(compilation-info ((t (:inherit font-lock-function-name-face)))) '(cursor ((t (:background "#f08080")))) `(default ((t (:background ,bg)))) - `(diff-added ((t (:foreground ,diff-added :background "grey98")))) - '(diff-context ((t (:foreground "grey10" :background "grey98")))) - `(diff-removed ((t (:foreground ,diff-removed :background "grey98")))) + `(diff-added ((t (:foreground ,diff-added :background ,bg-mid)))) + `(diff-context ((t (:foreground ,fg-light :background ,bg-mid)))) + `(diff-removed ((t (:foreground ,diff-removed :background ,bg-mid)))) '(dired-subtree-depth-1-face ((t (:background "gray80")))) '(dired-subtree-depth-2-face ((t (:background "gray90")))) '(dired-subtree-depth-3-face ((t (:background "gray95")))) @@ -71,16 +71,16 @@ '(isearch ((t (:inherit match)))) '(magit-cherry-equivalent ((t (:inherit font-lock-constant-face)))) '(magit-cherry-unmatched ((t (:inherit font-lock-string-face)))) - `(magit-diff-added ((t (:foreground ,diff-added :background "grey98")))) - `(magit-diff-added-highlight ((t (:foreground ,diff-added :background "grey98")))) - '(magit-diff-context ((t (:foreground "grey50" :background "grey98")))) - '(magit-diff-context-highlight ((t (:foreground "grey50" :background "grey98")))) + `(magit-diff-added ((t (:foreground ,diff-added :background ,bg-mid)))) + `(magit-diff-added-highlight ((t (:foreground ,diff-added :background ,bg-mid)))) + `(magit-diff-context ((t (:foreground ,fg-light :background ,bg-mid)))) + `(magit-diff-context-highlight ((t (:foreground ,fg-light :background ,bg-mid)))) '(magit-diff-file-heading ((t (:inherit default :weight bold)))) '(magit-diff-file-heading-selection ((t (:inherit default :weight bold)))) - `(magit-diff-hunk-heading ((t (:foreground ,fg-light :background "grey90")))) + `(magit-diff-hunk-heading ((t (:foreground ,fg-light :background ,bg-dark)))) `(magit-diff-hunk-heading-highlight ((t (:foreground ,fg-light :background "grey80")))) - `(magit-diff-removed ((t (:foreground ,diff-removed :background "grey98")))) - `(magit-diff-removed-highlight ((t (:foreground ,diff-removed :background "grey98")))) + `(magit-diff-removed ((t (:foreground ,diff-removed :background ,bg-mid)))) + `(magit-diff-removed-highlight ((t (:foreground ,diff-removed :background ,bg-mid)))) '(magit-popup-argument ((t (:inherit font-lock-string-face)))) '(magit-reflog-amend ((t (:inherit font-lock-function-name-face)))) '(magit-reflog-checkout ((t (:inherit font-lock-builtin-face)))) @@ -94,7 +94,7 @@ `(magit-section-highlight ((t (:background ,bg)))) '(magit-section-secondary-heading ((t (:inherit default)))) '(match ((t (:inherit default :background "PaleGreen1")))) - '(mm-uu-extract ((t (:background "gray95")))) + `(mm-uu-extract ((t (:background ,bg-mid)))) '(org-agenda-calendar-event ((t (:inherit font-lock-function-name-face)))) '(org-agenda-calendar-sexp ((t (:inherit font-lock-variable-name-face)))) '(org-agenda-clocking ((t (:inherit lazy-highlight)))) @@ -113,8 +113,8 @@ '(outline-1 ((t (:inherit font-lock-doc-face)))) '(outline-2 ((t (:inherit font-lock-function-name-face)))) '(outline-3 ((t (:inherit font-lock-constant-face)))) - '(whitespace-indentation ((t (:background "gray90")))) - '(whitespace-trailing ((t (:background "gray90")))))) + `(whitespace-indentation ((t (:background ,bg-dark)))) + `(whitespace-trailing ((t (:background ,bg-dark)))))) (provide 'km-theme) ;;; km-theme.el ends here -- cgit v1.2.3 From c27dda02f4addf9a674015e822c2055122daa120 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:52:21 -0400 Subject: theme: Customize a few more Magit faces --- lisp/km-theme.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index 9dc4319..1a52faf 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -81,7 +81,12 @@ `(magit-diff-hunk-heading-highlight ((t (:foreground ,fg-light :background "grey80")))) `(magit-diff-removed ((t (:foreground ,diff-removed :background ,bg-mid)))) `(magit-diff-removed-highlight ((t (:foreground ,diff-removed :background ,bg-mid)))) + `(magit-diffstat-added ((t (:foreground ,diff-added)))) + `(magit-diffstat-removed ((t (:foreground ,diff-removed)))) + '(magit-hash ((t (:foreground "#8a939a")))) '(magit-popup-argument ((t (:inherit font-lock-string-face)))) + `(magit-process-ng ((t (:foreground ,diff-removed)))) + `(magit-process-ok ((t (:foreground ,diff-added)))) '(magit-reflog-amend ((t (:inherit font-lock-function-name-face)))) '(magit-reflog-checkout ((t (:inherit font-lock-builtin-face)))) '(magit-reflog-commit ((t (:inherit default)))) -- cgit v1.2.3 From 8019c7f5417b3cf93fdcabe4d3b04c9fa8bf58e9 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Aug 2019 22:33:45 -0400 Subject: theme: Tweak --- lisp/km-theme.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/km-theme.el b/lisp/km-theme.el index 1a52faf..df807f6 100644 --- a/lisp/km-theme.el +++ b/lisp/km-theme.el @@ -43,7 +43,8 @@ '(dired-symlink ((t (:inherit font-lock-constant-face)))) '(font-latex-math-face ((t (:inherit font-lock-builtin-face)))) '(font-latex-string-face ((t (:inherit default)))) - '(font-lock-keyword-face ((t (:foreground "gray33")))) ; Darken a bit (was gray40) + '(font-lock-keyword-face ((t (:foreground "#4e5656")))) + '(font-lock-comment-face ((t (:foreground "#745f5f")))) '(git-annex-dired-annexed-available ((t (:inherit font-lock-type-face)))) '(git-annex-dired-annexed-unavailable ((t (:inherit font-lock-string-face)))) '(gnus-button ((t (:inherit default)))) @@ -95,7 +96,7 @@ '(magit-reflog-rebase ((t (:inherit font-lock-string-face)))) '(magit-reflog-remote ((t (:inherit font-lock-variable-name-face)))) '(magit-reflog-reset ((t (:inherit font-lock-warning-face)))) - '(magit-section-heading ((t (:inherit font-lock-constant-face :weight bold)))) + '(magit-section-heading ((t (:inherit font-lock-keyword-face :weight bold)))) `(magit-section-highlight ((t (:background ,bg)))) '(magit-section-secondary-heading ((t (:inherit default)))) '(match ((t (:inherit default :background "PaleGreen1")))) @@ -103,21 +104,21 @@ '(org-agenda-calendar-event ((t (:inherit font-lock-function-name-face)))) '(org-agenda-calendar-sexp ((t (:inherit font-lock-variable-name-face)))) '(org-agenda-clocking ((t (:inherit lazy-highlight)))) - '(org-agenda-date ((t (:foreground "gray40")))) + '(org-agenda-date ((t (:inherit font-lock-keyword-face)))) '(org-agenda-date-today ((t (:weight bold)))) '(org-agenda-date-weekend ((t (:inherit org-agenda-date)))) `(org-agenda-restriction-lock ((t (:background ,bg)))) - '(org-agenda-structure ((t (:foreground "gray60")))) + '(org-agenda-structure ((t (:inherit font-lock-comment-face)))) '(org-date ((t (:inherit font-lock-type-face)))) - '(org-done ((t (:foreground "#557755" :background "gray95")))) + `(org-done ((t (:foreground ,diff-added)))) '(org-scheduled ((t (:inherit default)))) '(org-scheduled-today ((t (:inherit org-scheduled)))) - '(org-todo ((t (:inherit font-lock-string-face :background "gray95")))) + `(org-todo ((t (:foreground ,diff-removed)))) '(org-upcoming-deadline ((t (:inherit default)))) '(org-warning ((t (:inherit font-lock-string-face)))) '(outline-1 ((t (:inherit font-lock-doc-face)))) '(outline-2 ((t (:inherit font-lock-function-name-face)))) - '(outline-3 ((t (:inherit font-lock-constant-face)))) + '(outline-3 ((t (:inherit font-lock-keyword-face)))) `(whitespace-indentation ((t (:background ,bg-dark)))) `(whitespace-trailing ((t (:background ,bg-dark)))))) -- cgit v1.2.3