branch: elpa/spacemacs-theme
commit 5d3ccc192ff5785e5a9e960c48252e0b3ab9e88c
Author: Lucius Hu <lebenster...@users.noreply.github.com>
Commit: Lucius Hu <lebenster...@users.noreply.github.com>
update face-attributes to latest conventions
Changed `nil` values in `:foreground` and `:background` attributes to
`'unspecified`.
Changed `:bold t` and `:bold nil` to `:weight 'bold` and `:weight 'normal`
respectively.
Changed `:italic t` and `:italic nil` to `:slant 'italic` and `:slant
'normal`
respectively.
---
spacemacs-common.el | 88 ++++++++++++++++++++++++++---------------------------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index 591e782ef3..9e033403ea 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -173,7 +173,7 @@ to 'auto, tags may not be properly aligned. "
`(cursor ((,class (:background ,cursor))))
`(custom-button ((,class :background ,bg2 :foreground ,base :box
(:line-width 2 :style released-button))))
`(default ((,class (:background ,bg1 :foreground ,base))))
- `(default-italic ((,class (:italic t))))
+ `(default-italic ((,class (:slant italic))))
`(error ((,class (:foreground ,err))))
`(eval-sexp-fu-flash ((,class (:background ,suc :foreground ,bg1))))
`(eval-sexp-fu-flash-error ((,class (:background ,err :foreground ,bg1))))
@@ -205,7 +205,7 @@ to 'auto, tags may not be properly aligned. "
`(secondary-selection ((,class (:background ,bg3))))
`(shadow ((,class (:foreground ,base-dim))))
`(success ((,class (:foreground ,suc))))
- `(tooltip ((,class (:background ,ttip-sl :foreground ,base :bold nil
:italic nil :underline nil))))
+ `(tooltip ((,class (:background ,ttip-sl :foreground ,base :weight normal
:slant normal :underline nil))))
`(vertical-border ((,class (:foreground ,border))))
`(warning ((,class (:foreground ,war))))
`(widget-button-pressed ((,class (:foreground ,green))))
@@ -277,11 +277,11 @@ to 'auto, tags may not be properly aligned. "
`(centaur-tabs-modified-marker-unselected ((,class (:inherit
'centaur-tabs-unselected :foreground,keyword))))
;;;;; cider
- `(cider-enlightened ((,class (:background nil :box (:color ,yellow
:line-width -1 :style nil) :foreground ,yellow))))
+ `(cider-enlightened ((,class (:background unspecified :box (:color
,yellow :line-width -1 :style nil) :foreground ,yellow))))
`(cider-enlightened-local ((,class (:foreground ,yellow))))
`(cider-fringe-good-face ((,class (:foreground ,suc))))
- `(cider-instrumented-face ((,class (:background nil :box (:color ,red
:line-width -1 :style nil) :foreground ,red))))
- `(cider-result-overlay-face ((,class (:background nil :box (:color ,blue
:line-width -1 :style nil) :foreground ,blue))))
+ `(cider-instrumented-face ((,class (:background unspecified :box (:color
,red :line-width -1 :style nil) :foreground ,red))))
+ `(cider-result-overlay-face ((,class (:background unspecified :box
(:color ,blue :line-width -1 :style nil) :foreground ,blue))))
`(cider-test-error-face ((,class (:background ,war :foreground ,bg1))))
`(cider-test-failure-face ((,class (:background ,err :foreground ,bg1))))
`(cider-test-success-face ((,class (:background ,suc :foreground ,bg1))))
@@ -304,17 +304,17 @@ to 'auto, tags may not be properly aligned. "
`(company-tooltip-selection ((,class (:background ,ttip-sl :foreground
,base))))
;;;;; diff
- `(diff-added ((,class :background nil :foreground ,green
:extend t)))
- `(diff-changed ((,class :background nil :foreground ,blue)))
+ `(diff-added ((,class :background unspecified :foreground
,green :extend t)))
+ `(diff-changed ((,class :background unspecified :foreground
,blue)))
`(diff-header ((,class :background ,cblk-ln-bg :foreground
,func :extend t)))
`(diff-file-header ((,class :background ,cblk-ln-bg :foreground
,cblk :extend t)))
- `(diff-indicator-added ((,class :background nil :foreground ,green
:extend t)))
- `(diff-indicator-changed ((,class :background nil :foreground ,blue)))
- `(diff-indicator-removed ((,class :background nil :foreground ,red)))
+ `(diff-indicator-added ((,class :background unspecified :foreground
,green :extend t)))
+ `(diff-indicator-changed ((,class :background unspecified :foreground
,blue)))
+ `(diff-indicator-removed ((,class :background unspecified :foreground
,red)))
`(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
:extend t)))
+ `(diff-removed ((,class :background unspecified :foreground
,red :extend t)))
;;;;; diff-hl
`(diff-hl-insert ((,class :background ,green :foreground ,green)))
@@ -345,7 +345,7 @@ to 'auto, tags may not be properly aligned. "
`(ediff-even-diff-B ((,class(:background ,bg3 :extend t))))
`(ediff-even-diff-C ((,class(:background ,bg3 :extend t))))
`(ediff-fine-diff-A ((,class(:background ,red :foreground ,bg1 :extend
t))))
- `(ediff-fine-diff-Ancestor ((,class(:background nil :inherit bold :extend
t))))
+ `(ediff-fine-diff-Ancestor ((,class(:background unspecified :inherit bold
:extend t))))
`(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 :extend t))))
@@ -544,9 +544,9 @@ to 'auto, tags may not be properly aligned. "
`(helm-grep-file ((,class (:foreground ,base :background ,bg1))))
`(helm-grep-finish ((,class (:foreground ,base :background ,bg1))))
`(helm-grep-lineno ((,class (:foreground ,type :background ,bg1 :inherit
bold))))
- `(helm-grep-match ((,class (:foreground nil :background nil :inherit
helm-match))))
+ `(helm-grep-match ((,class (:foreground unspecified :background
unspecified :inherit helm-match))))
`(helm-header ((,class (:foreground ,base :background ,bg1 :underline nil
:box nil))))
- `(helm-header-line-left-margin ((,class (:foreground ,keyword :background
,nil))))
+ `(helm-header-line-left-margin ((,class (:foreground ,keyword :background
unspecified))))
`(helm-match ((,class (:background ,head1-bg :foreground ,head1))))
`(helm-match-item ((,class (:background ,head1-bg :foreground ,head1))))
`(helm-moccur-buffer ((,class (:foreground ,var :background ,bg1))))
@@ -591,7 +591,7 @@ to 'auto, tags may not be properly aligned. "
`(info-menu ((,class (:foreground ,suc))))
`(info-node ((,class (:foreground ,func :inherit bold))))
`(info-quoted-name ((,class (:foreground ,keyword))))
- `(info-reference-item ((,class (:background nil :underline t :inherit
bold))))
+ `(info-reference-item ((,class (:background unspecified :underline t
:inherit bold))))
`(info-string ((,class (:foreground ,str))))
`(info-title-1 ((,class (:height 1.4 :inherit bold))))
`(info-title-2 ((,class (:height 1.3 :inherit bold))))
@@ -611,15 +611,15 @@ to 'auto, tags may not be properly aligned. "
;;;;; latex
`(font-latex-bold-face ((,class (:foreground ,comp))))
- `(font-latex-italic-face ((,class (:foreground ,keyword :italic t))))
+ `(font-latex-italic-face ((,class (:foreground ,keyword :slant italic))))
`(font-latex-match-reference-keywords ((,class (:foreground ,const))))
`(font-latex-match-variable-keywords ((,class (:foreground ,var))))
`(font-latex-sectioning-0-face ((,class (:inherit bold :foreground ,head3
:height ,(if spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight head3-bg)))))
`(font-latex-sectioning-1-face ((,class (:inherit bold :foreground ,head4
:height ,(if spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight head4-bg)))))
`(font-latex-sectioning-2-face ((,class (:inherit bold :foreground ,head1
:height ,(if spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight head1-bg)))))
`(font-latex-sectioning-3-face ((,class (:inherit bold :foreground ,head2
:height ,(if spacemacs-theme-org-height 1.2 1.0) :background ,(when
spacemacs-theme-org-highlight head2-bg)))))
- `(font-latex-sectioning-4-face ((,class (:bold nil :foreground ,head3
:height ,(if spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight head3-bg)))))
- `(font-latex-sectioning-5-face ((,class (:bold nil :foreground ,head4
:background ,(when spacemacs-theme-org-highlight head4-bg)))))
+ `(font-latex-sectioning-4-face ((,class (:weight normal :foreground
,head3 :height ,(if spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight head3-bg)))))
+ `(font-latex-sectioning-5-face ((,class (:weight normal :foreground
,head4 :background ,(when spacemacs-theme-org-highlight head4-bg)))))
`(font-latex-string-face ((,class (:foreground ,str))))
`(font-latex-warning-face ((,class (:foreground ,war))))
@@ -697,10 +697,10 @@ to 'auto, tags may not be properly aligned. "
;;;;; markdown
`(markdown-header-face-1 ((,class (:inherit bold :foreground ,head1
:height ,(if spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight head1-bg)))))
`(markdown-header-face-2 ((,class (:inherit bold :foreground ,head2
:height ,(if spacemacs-theme-org-height 1.2 1.0) :background ,(when
spacemacs-theme-org-highlight head2-bg)))))
- `(markdown-header-face-3 ((,class (:bold nil :foreground ,head3 :height
,(if spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight head3-bg)))))
- `(markdown-header-face-4 ((,class (:bold nil :foreground ,head4
:background ,(when spacemacs-theme-org-highlight head4-bg)))))
- `(markdown-header-face-5 ((,class (:bold nil :foreground ,head1))))
- `(markdown-header-face-6 ((,class (:bold nil :foreground ,head2))))
+ `(markdown-header-face-3 ((,class (:weight normal :foreground ,head3
:height ,(if spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight head3-bg)))))
+ `(markdown-header-face-4 ((,class (:weight normal :foreground ,head4
:background ,(when spacemacs-theme-org-highlight head4-bg)))))
+ `(markdown-header-face-5 ((,class (:weight normal :foreground ,head1))))
+ `(markdown-header-face-6 ((,class (:weight normal :foreground ,head2))))
`(markdown-table-face ((,class (:foreground ,base :background
,head1-bg))))
;;;;; mode-line
@@ -775,18 +775,18 @@ to 'auto, tags may not be properly aligned. "
`(org-headline-todo ((,class (:foreground ,meta))))
`(org-hide ((,class (:foreground ,base))))
`(org-kbd ((,class (:inherit region :foreground ,base :box (:line-width 1
:style released-button)))))
- `(org-level-1 ((,class (:inherit bold :bold ,(if spacemacs-theme-org-bold
'unspecified nil) :foreground ,head1 :height ,(if spacemacs-theme-org-height
1.3 1.0) :background ,(when spacemacs-theme-org-highlight head1-bg)))))
- `(org-level-2 ((,class (:inherit bold :bold ,(if spacemacs-theme-org-bold
'unspecified nil) :foreground ,head2 :height ,(if spacemacs-theme-org-height
1.2 1.0) :background ,(when spacemacs-theme-org-highlight head2-bg)))))
- `(org-level-3 ((,class (:bold nil :foreground ,head3 :height ,(if
spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight head3-bg)))))
- `(org-level-4 ((,class (:bold nil :foreground ,head4 :background ,(when
spacemacs-theme-org-highlight head4-bg)))))
- `(org-level-5 ((,class (:bold nil :foreground ,head1))))
- `(org-level-6 ((,class (:bold nil :foreground ,head2))))
- `(org-level-7 ((,class (:bold nil :foreground ,head3))))
- `(org-level-8 ((,class (:bold nil :foreground ,head4))))
+ `(org-level-1 ((,class (:inherit bold :weight ,(if
spacemacs-theme-org-bold 'unspecified 'normal) :foreground ,head1 :height ,(if
spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight head1-bg)))))
+ `(org-level-2 ((,class (:inherit bold :weight ,(if
spacemacs-theme-org-bold 'unspecified 'normal) :foreground ,head2 :height ,(if
spacemacs-theme-org-height 1.2 1.0) :background ,(when
spacemacs-theme-org-highlight head2-bg)))))
+ `(org-level-3 ((,class (:weight normal :foreground ,head3 :height ,(if
spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight head3-bg)))))
+ `(org-level-4 ((,class (:weight normal :foreground ,head4 :background
,(when spacemacs-theme-org-highlight head4-bg)))))
+ `(org-level-5 ((,class (:weight normal :foreground ,head1))))
+ `(org-level-6 ((,class (:weight normal :foreground ,head2))))
+ `(org-level-7 ((,class (:weight normal :foreground ,head3))))
+ `(org-level-8 ((,class (:weight normal :foreground ,head4))))
`(org-link ((,class (:underline t :foreground ,comment))))
`(org-meta-line ((,class (:foreground ,meta))))
`(org-mode-line-clock-overrun ((,class (:foreground ,err))))
- `(org-priority ((,class (:foreground ,war :inherit bold :bold ,(if
spacemacs-theme-org-priority-bold 'unspecified nil)))))
+ `(org-priority ((,class (:foreground ,war :inherit bold :weight ,(if
spacemacs-theme-org-priority-bold 'unspecified 'normal)))))
`(org-quote ((,class (:inherit org-block :slant italic))))
`(org-scheduled ((,class (:foreground ,comp))))
`(org-scheduled-today ((,class (:foreground ,func :height ,(if
spacemacs-theme-org-agenda-height 1.2 1.0)))))
@@ -830,7 +830,7 @@ to 'auto, tags may not be properly aligned. "
`(popup-menu-mouse-face ((,class (:inherit highlight))))
`(popup-scroll-bar-background-face ((,class (:background ,bg2))))
`(popup-scroll-bar-foreground-face ((,class (:background ,act2))))
- `(popup-tip-face ((,class (:background ,ttip-sl :foreground ,base :bold
nil :italic nil :underline nil))))
+ `(popup-tip-face ((,class (:background ,ttip-sl :foreground ,base :weight
normal :slant normal :underline nil))))
;;;;; powerline
`(powerline-active1 ((,class (:background ,act2 :foreground ,base))))
@@ -872,7 +872,7 @@ to 'auto, tags may not be properly aligned. "
`(show-paren-mismatch ((,class (:foreground ,err :inherit bold :underline
,(when spacemacs-theme-underline-parens t)))))
;;;;; smartparens
- `(sp-pair-overlay-face ((,class (:background ,highlight :foreground
nil))))
+ `(sp-pair-overlay-face ((,class (:background ,highlight :foreground
unspecified))))
`(sp-show-pair-match-face ((,class (:foreground ,mat :inherit bold
:underline ,(when spacemacs-theme-underline-parens t)))))
;;;;; smerge
@@ -897,7 +897,7 @@ to 'auto, tags may not be properly aligned. "
`(spaceline-python-venv ((,class (:foreground ,comp))))
;;;;; spacemacs-specific
- `(spacemacs-transient-state-title-face ((,class (:background nil
:foreground ,comp :box nil :inherit bold))))
+ `(spacemacs-transient-state-title-face ((,class (:background unspecified
:foreground ,comp :box nil :inherit bold))))
;;;;; swiper
`(swiper-line-face ((,class (:background ,highlight :inherit bold))))
@@ -982,21 +982,21 @@ to 'auto, tags may not be properly aligned. "
`(which-key-command-description-face ((,class (:foreground ,base))))
`(which-key-group-description-face ((,class (:foreground ,keyword))))
`(which-key-key-face ((,class (:foreground ,func :inherit bold))))
- `(which-key-separator-face ((,class (:background nil :foreground ,str))))
+ `(which-key-separator-face ((,class (:background unspecified :foreground
,str))))
`(which-key-special-key-face ((,class (:background ,func :foreground
,bg1))))
;;;;; which-function-mode
`(which-func ((,class (:foreground ,func))))
;;;;; whitespace-mode
- `(whitespace-empty ((,class (:background nil :foreground ,yellow))))
- `(whitespace-indentation ((,class (:background nil :foreground ,war))))
- `(whitespace-line ((,class (:background nil :foreground ,comp))))
- `(whitespace-newline ((,class (:background nil :foreground ,comp))))
- `(whitespace-space ((,class (:background nil :foreground ,act2))))
- `(whitespace-space-after-tab ((,class (:background nil :foreground
,yellow))))
- `(whitespace-space-before-tab ((,class (:background nil :foreground
,yellow))))
- `(whitespace-tab ((,class (:background nil :foreground ,act2))))
+ `(whitespace-empty ((,class (:background unspecified :foreground
,yellow))))
+ `(whitespace-indentation ((,class (:background unspecified :foreground
,war))))
+ `(whitespace-line ((,class (:background unspecified :foreground ,comp))))
+ `(whitespace-newline ((,class (:background unspecified :foreground
,comp))))
+ `(whitespace-space ((,class (:background unspecified :foreground ,act2))))
+ `(whitespace-space-after-tab ((,class (:background unspecified
:foreground ,yellow))))
+ `(whitespace-space-before-tab ((,class (:background unspecified
:foreground ,yellow))))
+ `(whitespace-tab ((,class (:background unspecified :foreground ,act2))))
`(whitespace-trailing ((,class (:background ,err :foreground ,war))))
;;;;; other, need more work
@@ -1018,7 +1018,7 @@ to 'auto, tags may not be properly aligned. "
`(js3-jsdoc-tag-face ((,class (:foreground ,keyword))))
`(js3-warning-face ((,class (:underline ,keyword))))
`(slime-repl-inputed-output-face ((,class (:foreground ,comp))))
- `(trailing-whitespace ((,class :foreground nil :background ,err)))
+ `(trailing-whitespace ((,class :foreground unspecified :background ,err)))
`(undo-tree-visualizer-current-face ((,class :foreground ,keyword)))
`(undo-tree-visualizer-default-face ((,class :foreground ,base)))
`(undo-tree-visualizer-register-face ((,class :foreground ,comp)))
