TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update with the latest changes of spacemacs-theme

This commit is contained in:
nashamri 2017-08-28 16:58:42 +03:00 committed by bmag
parent 27cb845d3c
commit 466d6e9b2e
8 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/libs/spacemacs-theme/README.md
View File

@ -3,20 +3,20 @@
[![MELPA](http://melpa.org/packages/spacemacs-theme-badge.svg)](http://melpa.org/#/spacemacs-theme) ![Made with Spacemacs](https://cdn.rawgit.com/syl20bnr/spacemacs/442d025779da2f62fc86c2082703697714db6514/assets/spacemacs-badge.svg)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nashamri/spacemacs-theme?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
![spacemacs-theme](/../screenshots/spacemacs-theme.png)
![spacemacs-theme](img/spacemacs-theme.png)
Spacemacs theme is an Emacs color theme that started as a theme for [spacemacs](https://github.com/syl20bnr/spacemacs).
The theme comes with dark and light variants and it should work well with 256 color terminals.
## Screenshots
![spacemacs-theme-preview](/../screenshots/preview.png)
![spacemacs-theme-preview](img/preview.png)
## Highlights
The theme has good support for org mode.
![spacemacs-theme-org](/../screenshots/org.png)
![spacemacs-theme-org](img/org.png)
## Installation
@ -30,6 +30,7 @@ M-x package-install RET spacemacs-theme
Some of the supported modes are:
* calfw
* company
* ein
* erc
@ -136,7 +137,7 @@ There is also explicit colors variables that can be customized:
* red-bg-s
* blue
* blue-bg
* violet
* magenta
* yellow
* yellow-bg
@ -145,11 +146,11 @@ The `green-bg-s` and `red-bg-s` are a stronger version and are used in `ediff` a
Here are some screenshots of the various variables:
![spacemacs-theme-guide-generic](/../screenshots/guide-generic.png)
![spacemacs-theme-guide-generic](img/guide-generic.png)
![spacemacs-theme-guide-org](/../screenshots/guide-org.png)
![spacemacs-theme-guide-org](img/guide-org.png)
![spacemacs-theme-guide-extra](/../screenshots/guide-extra.png)
![spacemacs-theme-guide-extra](img/guide-extra.png)
If you are using [spacemacs](https://github.com/syl20bnr/spacemacs), you can put this snippet in your `dotspacemacs/user-init` to override these colors:

BIN
core/libs/spacemacs-theme/img/guide-extra.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
core/libs/spacemacs-theme/img/guide-generic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 117 KiB

BIN
core/libs/spacemacs-theme/img/guide-org.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 KiB

BIN
core/libs/spacemacs-theme/img/org.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 144 KiB

BIN
core/libs/spacemacs-theme/img/preview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
core/libs/spacemacs-theme/img/spacemacs-theme.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 KiB

52
core/libs/spacemacs-theme/spacemacs-common.el
View File

@ -51,8 +51,12 @@
:type 'boolean
:group 'spacemacs-theme)
(defcustom spacemacs-theme-org-agenda-height t
"Use varying text heights for org agenda."
(defcustom spacemacs-theme-org-agenda-height nil
"If non-nil, use varying text heights for agenda items.
Note that if you change this to a non-nil value, you may want to
also adjust the value of `org-agenda-tags-column'. If that is set
to 'auto, tags may not be properly aligned. "
:type 'boolean
:group 'spacemacs-theme)
@ -161,7 +165,7 @@
`(font-lock-builtin-face ((,class (:foreground ,keyword))))
`(font-lock-comment-face ((,class (:foreground ,(if spacemacs-theme-comment-italic comment-light comment) :background ,(when spacemacs-theme-comment-bg comment-bg) :slant ,(if spacemacs-theme-comment-italic 'italic 'normal)))))
`(font-lock-constant-face ((,class (:foreground ,const))))
`(font-lock-doc-face ((,class (:foreground ,comment))))
`(font-lock-doc-face ((,class (:foreground ,meta))))
`(font-lock-function-name-face ((,class (:foreground ,func :inherit bold))))
`(font-lock-keyword-face ((,class (:inherit bold :foreground ,keyword))))
`(font-lock-negation-char-face ((,class (:foreground ,const))))
@ -206,6 +210,26 @@
`(avy-lead-face-1 ((,class (:background ,blue-bg :foreground ,magenta))))
`(avy-lead-face-2 ((,class (:background ,blue-bg :foreground ,blue))))
;;;;; calfw
`(cfw:face-title ((,class (:foreground ,head1 :height 2.0 :weight bold :inherit variable-pitch))))
`(cfw:face-header ((,class (:foreground ,base :weight bold))))
`(cfw:face-saturday ((,class (:foreground ,base :weight bold))))
`(cfw:face-sunday ((,class (:foreground ,base :weight bold))))
`(cfw:face-holiday ((,class (:foreground ,head1 :weight bold))))
`(cfw:face-grid ((,class (:foreground ,border))))
`(cfw:face-default-content ((,class (:foreground ,green))))
`(cfw:face-periods ((,class (:foreground ,cyan))))
`(cfw:face-day-title ((,class (:background ,head1-bg))))
`(cfw:face-default-day ((,class (:foreground ,base :weight bold))))
`(cfw:face-annotation ((,class (:foreground ,aqua))))
`(cfw:face-disable ((,class (:foreground ,base-dim))))
`(cfw:face-today-title ((,class (:background ,blue :weight bold))))
`(cfw:face-today ((,class (:background ,head1-bg :weight bold))))
`(cfw:face-select ((,class (:background ,magenta :weight bold))))
`(cfw:face-toolbar ((,class (:foreground ,base :background ,bg1))))
`(cfw:face-toolbar-button-off ((,class (:foreground ,base :weight bold))))
`(cfw:face-toolbar-button-on ((,class (:foreground ,base :weight bold))))
;;;;; cider
`(cider-enlightened ((,class (:background nil :box (:color ,yellow :line-width -1 :style nil) :foreground ,yellow))))
`(cider-enlightened-local ((,class (:foreground ,yellow))))
@ -489,7 +513,11 @@
`(ledger-occur-xact-face ((,class (:background ,bg2))))
;;;;; linum-mode
`(linum ((,class (:foreground ,lnum :background ,bg2))))
`(linum ((,class (:foreground ,lnum :background ,bg2 :inherit default))))
;;;;; line-numbers-mode (Emacs 26+)
(when (>= emacs-major-version 26)
`(line-number ((,class (:foreground ,lnum :background ,bg2)))))
;;;;; linum-relative
`(linum-relative-current-face ((,class (:foreground ,comp))))
@ -510,12 +538,8 @@
`(magit-branch-local ((,class (:background ,blue-bg :foreground ,blue :inherit bold))))
`(magit-branch-remote ((,class (:background ,aqua-bg :foreground ,aqua :inherit bold))))
`(magit-diff-context-highlight ((,class (:background ,bg2 :foreground ,base))))
`(magit-diff-file-header ((,class (:background ,comment-bg :foreground ,comment))))
`(magit-diff-file-heading ((,class (:background ,comment-bg :foreground ,comment))))
`(magit-diff-file-heading-highlight ((,class (:background ,comment-bg :foreground ,comment))))
`(magit-diff-hunk-header ((,class (:background ,ttip-bg :foreground ,ttip))))
`(magit-diff-hunk-heading ((,class (:background ,ttip-bg :foreground ,ttip))))
`(magit-diff-hunk-heading-highlight ((,class (:background ,ttip-bg :foreground ,ttip))))
`(magit-diff-hunk-heading-highlight ((,class (:background ,ttip-sl :foreground ,base))))
`(magit-hash ((,class (:foreground ,var))))
`(magit-hunk-heading ((,class (:background ,bg3))))
`(magit-hunk-heading-highlight ((,class (:background ,bg3))))
@ -569,21 +593,24 @@
`(mu4e-cited-5-face ((,class (:foreground ,head1))))
`(mu4e-cited-6-face ((,class (:foreground ,head2))))
`(mu4e-cited-7-face ((,class (:foreground ,head3))))
`(mu4e-contact-face ((,class (:foreground ,func))))
`(mu4e-draft-face ((,class (:foreground ,var))))
`(mu4e-flagged-face ((,class (:foreground ,yellow :inherit bold))))
`(mu4e-header-key-face ((,class (:foreground ,meta :inherit bold))))
`(mu4e-header-title-face ((,class (:foreground ,keyword :inherit bold))))
`(mu4e-header-marks-face ((,class (:foreground ,comp))))
`(mu4e-header-value-face ((,class (:foreground ,keyword :inherit bold))))
`(mu4e-header-highlight-face ((,class (:background ,highlight))))
`(mu4e-highlight-face ((,class (:foreground ,comp))))
`(mu4e-title-face ((,class (:foreground ,head1 :inherit bold))))
`(mu4e-title-face ((,class (:foreground ,head2 :inherit bold))))
`(mu4e-replied-face ((,class (:foreground ,green))))
`(mu4e-modeline-face ((,class (:foreground ,func))))
`(mu4e-special-header-value-face ((,class (:foreground ,green))))
`(mu4e-unread-face ((,class (:foreground ,type :inherit bold))))
`(mu4e-unread-face ((,class (:foreground ,head1 :inherit bold))))
`(mu4e-view-url-number-face ((,class (:foreground ,comp))))
;;;;; mu4e-maildirs
`(mu4e-maildirs-extension-maildir-hl-face ((,class (:foreground ,head2 :inherit bold))))
`(mu4e-maildirs-extension-maildir-hl-face ((,class (:foreground ,head1 :inherit bold))))
;;;;; notmuch
`(notmuch-search-date ((,class (:foreground ,func))))
@ -640,6 +667,7 @@
`(org-sexp-date ((,class (:foreground ,base))))
`(org-special-keyword ((,class (:foreground ,func))))
`(org-table ((,class (:foreground ,base :background ,head1-bg))))
`(org-tag ((,class (:foreground ,meta))))
`(org-time-grid ((,class (:foreground ,str))))
`(org-todo ((,class (:foreground ,war :inherit bold :background ,yellow-bg))))
`(org-verbatim ((,class (:foreground ,keyword))))