From 5d5a8a558855225f8251a8a093a1bbd7871fe5c6 Mon Sep 17 00:00:00 2001 From: nashamri Date: Thu, 17 Jan 2019 21:18:11 +0300 Subject: [PATCH] Latest theme updates Summary: - Update diff and ediff colors (thanks @duianto). - Support hl-todo mode. --- core/libs/spacemacs-theme/README.md | 3 +- core/libs/spacemacs-theme/spacemacs-common.el | 40 ++++++++++++++----- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/core/libs/spacemacs-theme/README.md b/core/libs/spacemacs-theme/README.md index 47e91a5a9..2b5d00984 100644 --- a/core/libs/spacemacs-theme/README.md +++ b/core/libs/spacemacs-theme/README.md @@ -161,8 +161,7 @@ There is also explicit colors variables that can be customized: * yellow * yellow-bg -The `green` and `red` colors have two background versions. The `green-bg` and `red-bg` are normal light background colors. -The `green-bg-s`, `red-bg-s`, and `blue-bg-s` are a stronger version and are used in `ediff` and places were text is added, deleted or changed. +The `green` and `red` colors have two background versions. The `green-bg` and `red-bg` are normal light background colors. The `green-bg-s`, `red-bg-s`, and `blue-bg-s` are stronger versions. Here are some screenshots of the various variables: diff --git a/core/libs/spacemacs-theme/spacemacs-common.el b/core/libs/spacemacs-theme/spacemacs-common.el index 8bea942cc..d439a2f88 100644 --- a/core/libs/spacemacs-theme/spacemacs-common.el +++ b/core/libs/spacemacs-theme/spacemacs-common.el @@ -282,15 +282,15 @@ to 'auto, tags may not be properly aligned. " ;;;;; diff `(diff-added ((,class :background nil :foreground ,green))) - `(diff-changed ((,class :background nil :foreground ,keyword))) + `(diff-changed ((,class :background nil :foreground ,blue))) `(diff-header ((,class :background ,cblk-ln-bg :foreground ,func))) `(diff-file-header ((,class :background ,cblk-ln-bg :foreground ,cblk))) `(diff-indicator-added ((,class :background nil :foreground ,green))) - `(diff-indicator-changed ((,class :background nil :foreground ,keyword))) + `(diff-indicator-changed ((,class :background nil :foreground ,blue))) `(diff-indicator-removed ((,class :background nil :foreground ,red))) - `(diff-refine-added ((,class :background ,green :foreground ,bg4))) - `(diff-refine-changed ((,class :background ,keyword :foreground ,bg4))) - `(diff-refine-removed ((,class :background ,red :foreground ,bg4))) + `(diff-refine-added ((,class :background ,green :foreground ,bg1))) + `(diff-refine-changed ((,class :background ,blue :foreground ,bg1))) + `(diff-refine-removed ((,class :background ,red :foreground ,bg1))) `(diff-removed ((,class :background nil :foreground ,red))) ;;;;; diff-hl @@ -310,18 +310,18 @@ to 'auto, tags may not be properly aligned. " `(dired-warning ((,class (:foreground ,war)))) ;;;;; ediff - `(ediff-current-diff-A ((,class(:background ,red-bg-s :foreground ,red)))) + `(ediff-current-diff-A ((,class(:background ,red-bg :foreground ,red)))) `(ediff-current-diff-Ancestor ((,class(:background ,aqua-bg :foreground ,aqua)))) - `(ediff-current-diff-B ((,class(:background ,green-bg-s :foreground ,green)))) + `(ediff-current-diff-B ((,class(:background ,green-bg :foreground ,green)))) `(ediff-current-diff-C ((,class(:background ,blue-bg :foreground ,blue)))) `(ediff-even-diff-A ((,class(:background ,bg3)))) `(ediff-even-diff-Ancestor ((,class(:background ,bg3)))) `(ediff-even-diff-B ((,class(:background ,bg3)))) `(ediff-even-diff-C ((,class(:background ,bg3)))) - `(ediff-fine-diff-A ((,class(:background nil :inherit bold)))) + `(ediff-fine-diff-A ((,class(:background ,red :foreground ,bg1)))) `(ediff-fine-diff-Ancestor ((,class(:background nil :inherit bold)))) - `(ediff-fine-diff-B ((,class(:background nil :inherit bold)))) - `(ediff-fine-diff-C ((,class(:background nil :inherit bold)))) + `(ediff-fine-diff-B ((,class(:background ,green :foreground ,bg1)))) + `(ediff-fine-diff-C ((,class(:background ,blue :foreground ,bg1)))) `(ediff-odd-diff-A ((,class(:background ,bg4)))) `(ediff-odd-diff-Ancestor ((,class(:background ,bg4)))) `(ediff-odd-diff-B ((,class(:background ,bg4)))) @@ -937,8 +937,28 @@ to 'auto, tags may not be properly aligned. " (custom-theme-set-variables theme-name + +;;;;; ansi-color-names `(ansi-color-names-vector [,bg4 ,red ,green ,yellow ,blue ,magenta ,cyan ,base]) +;;;;; hl-todo + `(hl-todo-keyword-faces '(("TODO" . ,war) + ("NEXT" . ,war) + ("THEM" . ,aqua) + ("PROG" . ,blue) + ("OKAY" . ,blue) + ("DONT" . ,red) + ("FAIL" . ,red) + ("DONE" . ,suc) + ("NOTE" . ,yellow) + ("KLUDGE" . ,yellow) + ("HACK" . ,yellow) + ("TEMP" . ,yellow) + ("FIXME" . ,war) + ("XXX" . ,war) + ("XXXX" . ,war) + ("???" . ,war))) + ;;;;; pdf-tools `(pdf-view-midnight-colors '(,base . ,bg1))) ))