branch: elpa/moe-theme
commit 35795cd1af84823c1fe3ff5608156daa0e532396
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
1. Fix mistake of org-table with moe-dark.
2. Improve the appearance of mode-bar under GUI.
3. Fonts of rainbow-delimiters in moe-dark is bold now, too.
4. Exchange some colors to improve rainbow-delimiters' readability with
moe-light.
---
moe-dark-theme.el | 30 +++++++++++++++---------------
moe-light-theme.el | 16 ++++++++--------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 427f924026..edc91d6aa8 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -52,10 +52,10 @@ Moe, moe, kyun!")
;; Mode line & frames' faces
`(mode-line ((,class
- (:box (:line-width -1 :style released-button)
+ (:box (:line-width -1 :style nil)
:background ,white-0 :foreground ,blue-2))))
`(mode-line-inactive ((,class
- (:box (:line-width -1 :style released-button)
+ (:box (:line-width -1 :style nil)
:background ,black-3 :foreground ,white-1))))
`(mode-line-buffer-id ((,class (:foreground ,black-3 :background ,blue-1
:bold t))))
`(vertical-border ((,class (:foreground ,black-2 :background ,black-2))))
@@ -69,11 +69,11 @@ Moe, moe, kyun!")
;; Font lock faces
`(font-lock-builtin-face ((,class (:foreground ,purple-1))))
- `(font-lock-comment-delimiter-face ((,class (:foreground ,red-2 :slant
italic))))
- `(font-lock-comment-face ((,class (:foreground ,red-2 :slant italic))))
+ `(font-lock-comment-delimiter-face ((,class (:foreground ,red-1 :slant
italic))))
+ `(font-lock-comment-face ((,class (:foreground ,red-1 :slant italic))))
`(font-lock-constant-face ((,class (:foreground ,blue-1))))
`(font-lock-doc-face ((,class (:foreground ,red-2))))
- `(font-lock-doc-string-face ((,class (:foreground ,yellow-1))))
+ `(font-lock-doc-string-face ((,class (:foreground ,yellow-3))))
`(font-lock-function-name-face ((,class (:foreground ,yellow-1))))
`(font-lock-keyword-face ((,class (:foreground ,green-1))))
`(font-lock-negation-char-face ((,class (:foreground ,green-2))))
@@ -117,7 +117,7 @@ Moe, moe, kyun!")
`(org-scheduled-previously ((,class (:foreground ,red-1))))
`(org-scheduled-today ((,class (:foreground ,blue-1))))
`(org-special-keyword ((,class (:foreground ,yellow-4 :background
,yellow-0))))
- `(org-table ((,class (:foregrond ,white-1 :background ,black-3))))
+ `(org-table ((,class (:foreground ,white-1 :background ,black-3))))
`(org-time-grid ((,class (:foreground ,orange-2))))
`(org-upcoming-deadline ((,class (:inherit font-lock-keyword-face))))
`(org-warning ((,class (:bold t :foreground ,red-3 :weight bold))))
@@ -354,15 +354,15 @@ Moe, moe, kyun!")
`(ace-jump-face-foreground ((,class (:foreground ,red-2))))
;; Rainbow-delimiters
- `(rainbow-delimiters-depth-1-face ((,class (:bold nil :foreground ,red-2))))
- `(rainbow-delimiters-depth-2-face ((,class (:bold nil :foreground
,blue-1))))
- `(rainbow-delimiters-depth-3-face ((,class (:bold nil :foreground
,green-2))))
- `(rainbow-delimiters-depth-4-face ((,class (:bold nil :foreground
,magenta-2))))
- `(rainbow-delimiters-depth-5-face ((,class (:bold nil :foreground
,cyan-3))))
- `(rainbow-delimiters-depth-6-face ((,class (:bold nil :foreground
,orange-2))))
- `(rainbow-delimiters-depth-7-face ((,class (:bold nil :foreground
,purple-2))))
- `(rainbow-delimiters-depth-8-face ((,class (:bold nil :foreground
,white-1))))
- `(rainbow-delimiters-depth-9-face ((,class (:bold nil :foreground
,yellow-2))))
+ `(rainbow-delimiters-depth-1-face ((,class (:bold t :foreground ,red-2))))
+ `(rainbow-delimiters-depth-2-face ((,class (:bold t :foreground ,blue-1))))
+ `(rainbow-delimiters-depth-3-face ((,class (:bold t :foreground ,green-2))))
+ `(rainbow-delimiters-depth-4-face ((,class (:bold t :foreground
,magenta-2))))
+ `(rainbow-delimiters-depth-5-face ((,class (:bold t :foreground ,cyan-3))))
+ `(rainbow-delimiters-depth-6-face ((,class (:bold t :foreground
,orange-2))))
+ `(rainbow-delimiters-depth-7-face ((,class (:bold t :foreground
,purple-2))))
+ `(rainbow-delimiters-depth-8-face ((,class (:bold t :foreground ,white-1))))
+ `(rainbow-delimiters-depth-9-face ((,class (:bold t :foreground
,yellow-2))))
`(rainbow-delimiters-unmatched-face ((,class (:foreground ,white-0
:background ,red-3 :bold t))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 1fdf1c098a..f270c37f39 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -51,11 +51,11 @@ Moe, moe, kyun!")
`(show-paren-match ((,class (:background ,blue-00))))
;; Mode line & frames' faces
`(mode-line ((,class
- (:box (:line-width -1 :style released-button)
+ (:box (:line-width -1 :style nil)
:background ,blue-1 :foreground ,white-0))))
`(mode-line-inactive ((,class
- (:box (:line-width -1 :style released-button)
- :background ,blue-00 :foreground ,black-1))))
+ (:box (:line-width -1 :style nil)
+ :background ,white-2 :foreground ,black-1))))
`(mode-line-buffer-id ((,class (:foreground ,black-6 :background ,blue-1
:bold t))))
`(vertical-border ((,class (:foreground "#d7d7af" :background "#d7d7af"))))
@@ -72,7 +72,7 @@ Moe, moe, kyun!")
`(font-lock-comment-face ((,class (:foreground ,red-2 :slant italic))))
`(font-lock-constant-face ((,class (:foreground ,blue-2))))
`(font-lock-doc-face ((,class (:foreground ,red-2))))
- `(font-lock-doc-string-face ((,class (:foreground ,orange-2))))
+ `(font-lock-doc-string-face ((,class (:foreground ,yellow-3))))
`(font-lock-function-name-face ((,class (:foreground ,orange-2))))
`(font-lock-keyword-face ((,class (:foreground ,green-3))))
`(font-lock-negation-char-face ((,class (:foreground ,green-3))))
@@ -356,13 +356,13 @@ Moe, moe, kyun!")
;; Rainbow-delimiters
`(rainbow-delimiters-depth-1-face ((,class (:bold t :foreground ,red-2))))
`(rainbow-delimiters-depth-2-face ((,class (:bold t :foreground ,blue-2))))
- `(rainbow-delimiters-depth-3-face ((,class (:bold t :foreground ,green-2))))
+ `(rainbow-delimiters-depth-3-face ((,class (:bold t :foreground ,green-3))))
`(rainbow-delimiters-depth-4-face ((,class (:bold t :foreground
,magenta-2))))
`(rainbow-delimiters-depth-5-face ((,class (:bold t :foreground ,cyan-3))))
`(rainbow-delimiters-depth-6-face ((,class (:bold t :foreground
,orange-2))))
- `(rainbow-delimiters-depth-7-face ((,class (:bold t :foreground
,purple-3))))
- `(rainbow-delimiters-depth-8-face ((,class (:bold t :foreground ,black-5))))
- `(rainbow-delimiters-depth-9-face ((,class (:bold t :foreground
,yellow-2))))
+ `(rainbow-delimiters-depth-7-face ((,class (:bold t :foreground
,purple-2))))
+ `(rainbow-delimiters-depth-8-face ((,class (:bold t :foreground
,yellow-2))))
+ `(rainbow-delimiters-depth-9-face ((,class (:bold t :foreground ,black-5))))
`(rainbow-delimiters-unmatched-face ((,class (:foreground ,white-0
:background ,red-3 :bold t))))
;; which-function-mode
