branch: elpa/spacemacs-theme
commit 7862d9d4625d4d2125bc60add3e54b3faf17963a
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Fix #9
---
spacemacs-common.el | 55 +++++++++++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index b2c210697d..6d8c1b102e 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -66,7 +66,8 @@
(comment-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293234" "#262626") (if (display-graphic-p) "#eff3ea" "#ffffff")))
(func (if (eq variant 'dark) (if (display-graphic-p)
"#bc6ec5" "#d75fd7") (if (display-graphic-p) "#6c3163" "#8700af")))
(str (if (eq variant 'dark) (if (display-graphic-p)
"#2aa198" "#2aa198") (if (display-graphic-p) "#2aa198" "#2aa198")))
- (type (if (eq variant 'dark) (if (display-graphic-p)
"#c56ec3" "#d75fd7") (if (display-graphic-p) "#6c4173" "#8700af")))
+ (type (if (eq variant 'dark) (if (display-graphic-p)
"#38a882" "#5faf87") (if (display-graphic-p) "#428374" "#008787")))
+ (comp (if (eq variant 'dark) (if (display-graphic-p)
"#c56ec3" "#d75fd7") (if (display-graphic-p) "#6c4173" "#8700af")))
(var (if (eq variant 'dark) (if (display-graphic-p)
"#adaab3" "#adaab3") (if (display-graphic-p) "#656370" "#767676")))
(err (if (eq variant 'dark) (if (display-graphic-p)
"#e0211d" "#e0211d") (if (display-graphic-p) "#e0211d" "#e0211d")))
(war (if (eq variant 'dark) (if (display-graphic-p)
"#dc752f" "#dc752f") (if (display-graphic-p) "#dc752f" "#dc752f")))
@@ -116,7 +117,7 @@
`(isearch ((,class (:bold t :foreground ,bg1 :background ,inf))))
`(lazy-highlight ((,class (:foreground ,bg1 :background ,inf :weight
normal))))
`(link ((,class (:foreground ,comment :underline t))))
- `(link-visited ((,class (:foreground ,type :underline t))))
+ `(link-visited ((,class (:foreground ,comp :underline t))))
`(match ((,class (:background ,bg1 :foreground ,inf :weight bold))))
`(minibuffer-prompt ((,class (:bold t :foreground ,keyword))))
`(page-break-lines ((,class (:foreground ,active2))))
@@ -136,7 +137,7 @@
`(company-preview-common ((,class (:background ,bg2 :foreground
,keyword))))
`(company-preview-search ((,class (:background ,bg2 :foreground ,green))))
`(company-scrollbar-bg ((,class (:background ,bg2))))
- `(company-scrollbar-fg ((,class (:background ,type))))
+ `(company-scrollbar-fg ((,class (:background ,comp))))
`(company-template-field ((,class (:inherit region))))
`(company-tooltip ((,class (:background ,active2 :foreground ,(if (eq
variant 'dark) active1 str)))))
`(company-tooltip-annotation ((,class (:background ,active2 :foreground
,inf))))
@@ -160,9 +161,9 @@
;;;;; dired
`(dired-directory ((,class (:foreground ,key1 :background ,bg1 :weight
bold))))
`(dired-flagged ((,class (:foreground ,red))))
- `(dired-header ((,class (:foreground ,type :weight bold))))
+ `(dired-header ((,class (:foreground ,comp :weight bold))))
`(dired-ignored ((,class (:inherit shadow))))
- `(dired-mark ((,class (:foreground ,type :weight bold))))
+ `(dired-mark ((,class (:foreground ,comp :weight bold))))
`(dired-marked ((,class (:foreground ,violet :weight bold))))
`(dired-perm-write ((,class (:foreground ,base :underline t))))
`(dired-symlink ((,class (:foreground ,cyan :background ,bg1 :weight
bold))))
@@ -230,7 +231,7 @@
`(gnus-emphasis-highlight-words ((,class (:background ,(if (eq variant
'dark) err suc) :foreground ,(when (eq variant 'light) bg1)))))
`(gnus-header-content ((,class (:foreground ,keyword))))
`(gnus-header-from ((,class (:foreground ,var))))
- `(gnus-header-name ((,class (:foreground ,type))))
+ `(gnus-header-name ((,class (:foreground ,comp))))
`(gnus-header-subject ((,class (:foreground ,func :bold t))))
`(gnus-summary-cancelled ((,class (:background ,(if (eq variant 'dark)
err suc) :foreground ,bg1))))
@@ -242,13 +243,13 @@
;;;;; helm
`(helm-bookmark-directory ((,class (:inherit helm-ff-directory))))
`(helm-bookmark-file ((,class (:foreground ,base))))
- `(helm-bookmark-gnus ((,class (:foreground ,type))))
- `(helm-bookmark-info ((,class (:foreground ,type))))
- `(helm-bookmark-man ((,class (:foreground ,type))))
- `(helm-bookmark-w3m ((,class (:foreground ,type))))
+ `(helm-bookmark-gnus ((,class (:foreground ,comp))))
+ `(helm-bookmark-info ((,class (:foreground ,comp))))
+ `(helm-bookmark-man ((,class (:foreground ,comp))))
+ `(helm-bookmark-w3m ((,class (:foreground ,comp))))
`(helm-buffer-directory ((,class (:foreground ,base :background ,bg1))))
`(helm-buffer-file ((,class (:foreground ,base :background ,bg1))))
- `(helm-buffer-not-saved ((,class (:foreground ,type :background ,bg1))))
+ `(helm-buffer-not-saved ((,class (:foreground ,comp :background ,bg1))))
`(helm-buffer-process ((,class (:foreground ,builtin :background ,bg1))))
`(helm-buffer-saved-out ((,class (:foreground ,base :background ,bg1))))
`(helm-buffer-size ((,class (:foreground ,base :background ,bg1))))
@@ -272,10 +273,10 @@
`(helm-moccur-buffer ((,class (:foreground ,func :background ,bg1))))
`(helm-selection ((,class (:background ,highlight))))
`(helm-selection-line ((,class (:background ,bg2))))
- `(helm-separator ((,class (:foreground ,type :background ,bg1))))
- `(helm-source-header ((,class (:background ,type :foreground ,bg1 :bold
t))))
+ `(helm-separator ((,class (:foreground ,comp :background ,bg1))))
+ `(helm-source-header ((,class (:background ,comp :foreground ,bg1 :bold
t))))
`(helm-time-zone-current ((,class (:foreground ,builtin :background
,bg1))))
- `(helm-time-zone-home ((,class (:foreground ,type :background ,bg1))))
+ `(helm-time-zone-home ((,class (:foreground ,comp :background ,bg1))))
`(helm-visible-mark ((,class (:foreground ,bg1 :background ,bg3))))
;;;;; helm-swoop
@@ -284,10 +285,10 @@
`(helm-swoop-target-word-face ((,class (:foreground ,bg1 :background
,suc))))
;;;;; ido
- `(ido-first-match ((,class (:foreground ,type :bold t))))
+ `(ido-first-match ((,class (:foreground ,comp :bold t))))
`(ido-only-match ((,class (:foreground ,(if (eq variant 'dark) suc red)
:bold t))))
`(ido-subdir ((,class (:foreground ,key1))))
- `(ido-vertical-match-face ((,class (:foreground ,type :underline nil))))
+ `(ido-vertical-match-face ((,class (:foreground ,comp :underline nil))))
;;;;; info
`(info-header-xref ((,class (:foreground ,func :underline t))))
@@ -348,15 +349,15 @@
`(neo-root-dir-face ((,class (:foreground ,func :weight bold))))
;;;;; org
- `(org-agenda-clocking ((,class (:foreground ,type))))
+ `(org-agenda-clocking ((,class (:foreground ,comp))))
`(org-agenda-date ((,class (:foreground ,var :height 1.1))))
`(org-agenda-date-today ((,class (:weight bold :foreground ,keyword
:height 1.3))))
`(org-agenda-date-weekend ((,class (:weight normal :foreground ,base))))
`(org-agenda-done ((,class (:foreground ,(if (eq variant 'dark) suc
green) :bold t))))
- `(org-agenda-structure ((,class (:weight bold :foreground ,type))))
+ `(org-agenda-structure ((,class (:weight bold :foreground ,comp))))
`(org-block ((,class (:foreground ,base))))
`(org-block-background ((,class (:background ,org-block-bg))))
- `(org-clock-overlay ((,class (:foreground ,type))))
+ `(org-clock-overlay ((,class (:foreground ,comp))))
`(org-code ((,class (:foreground ,cyan))))
`(org-column ((,class (:background ,highlight))))
`(org-column-title ((,class (:background ,highlight))))
@@ -380,7 +381,7 @@
`(org-mode-line-clock-overrun ((,class (:foreground ,err))))
`(org-priority ((,class (:foreground ,war :bold t))))
`(org-quote ((,class (:inherit org-block :slant italic))))
- `(org-scheduled ((,class (:foreground ,type))))
+ `(org-scheduled ((,class (:foreground ,comp))))
`(org-scheduled-today ((,class (:foreground ,func :weight bold :height
1.2))))
`(org-sexp-date ((,class (:foreground ,base))))
`(org-special-keyword ((,class (:foreground ,func))))
@@ -425,14 +426,14 @@
;;;;; other, need more work
`(ac-completion-face ((,class (:underline t :foreground ,keyword))))
`(ffap ((,class (:foreground ,base))))
- `(flx-highlight-face ((,class (:foreground ,type :underline nil))))
- `(font-latex-bold-face ((,class (:foreground ,type))))
+ `(flx-highlight-face ((,class (:foreground ,comp :underline nil))))
+ `(font-latex-bold-face ((,class (:foreground ,comp))))
`(font-latex-italic-face ((,class (:foreground ,key2 :italic t))))
`(font-latex-match-reference-keywords ((,class (:foreground ,const))))
`(font-latex-match-variable-keywords ((,class (:foreground ,var))))
`(font-latex-string-face ((,class (:foreground ,str))))
`(icompletep-determined ((,class :foreground ,builtin)))
- `(js2-external-variable ((,class (:foreground ,type ))))
+ `(js2-external-variable ((,class (:foreground ,comp ))))
`(js2-function-param ((,class (:foreground ,const))))
`(js2-jsdoc-html-tag-delimiter ((,class (:foreground ,str))))
`(js2-jsdoc-html-tag-name ((,class (:foreground ,key1))))
@@ -447,13 +448,13 @@
`(js3-warning-face ((,class (:underline ,keyword))))
`(mu4e-cited-1-face ((,class (:foreground ,base))))
`(mu4e-cited-7-face ((,class (:foreground ,base))))
- `(mu4e-header-marks-face ((,class (:foreground ,type))))
- `(mu4e-view-url-number-face ((,class (:foreground ,type))))
- `(slime-repl-inputed-output-face ((,class (:foreground ,type))))
+ `(mu4e-header-marks-face ((,class (:foreground ,comp))))
+ `(mu4e-view-url-number-face ((,class (:foreground ,comp))))
+ `(slime-repl-inputed-output-face ((,class (:foreground ,comp))))
`(trailing-whitespace ((,class :foreground nil :background ,err)))
`(undo-tree-visualizer-current-face ((,class :foreground ,builtin)))
`(undo-tree-visualizer-default-face ((,class :foreground ,base)))
- `(undo-tree-visualizer-register-face ((,class :foreground ,type)))
+ `(undo-tree-visualizer-register-face ((,class :foreground ,comp)))
`(undo-tree-visualizer-unmodified-face ((,class :foreground ,var)))
`(web-mode-builtin-face ((,class (:inherit ,font-lock-builtin-face))))
`(web-mode-comment-face ((,class (:inherit ,font-lock-comment-face))))
