branch: elpa/moe-theme
commit ec58d728f56731bc993e7323b6d5e0399a689f82
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
Improve some faces. Fix wrong #000000 faces under terminal.
---
moe-theme.el | 60 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/moe-theme.el b/moe-theme.el
index c985955263..cae21e1a3a 100644
--- a/moe-theme.el
+++ b/moe-theme.el
@@ -284,20 +284,20 @@ DO NOT CHANGE ITS VALUE.")
(set-face-attribute 'minibuffer-prompt nil :foreground "#fce94f"
:background "#3a3a3a"))
((eq moe-theme-mode-line-color 'purple)
(set-face-attribute 'mode-line nil :background "#af5fd7" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#af5fd7"
:foreground "#000000")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#af5fd7"
:background "#000000"))
+ (set-face-attribute 'mode-line-buffer-id nil :background "#af5fd7"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#af5fd7"
:background "#080808"))
((eq moe-theme-mode-line-color 'red)
(set-face-attribute 'mode-line nil :background "#ff4b4b" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#ff4b4b"
:foreground "#000000")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#ff4b4b"
:background "#000000"))
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ff4b4b"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#ff4b4b"
:background "#080808"))
((eq moe-theme-mode-line-color 'cyan)
(set-face-attribute 'mode-line nil :background "#5faf87" :foreground
"#ffffff")
(set-face-attribute 'mode-line-buffer-id nil :background "#5faf87"
:foreground "#3a3a3a")
(set-face-attribute 'minibuffer-prompt nil :foreground "#5faf87"
:background "#3a3a3a"))
((eq moe-theme-mode-line-color 'w/b)
(set-face-attribute 'mode-line nil :background "#8a8a8a" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#8a8a8a"
:foreground "#000000")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#8a8a8a"
:background "#000000")))
+ (set-face-attribute 'mode-line-buffer-id nil :background "#8a8a8a"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#8a8a8a"
:background "#080808")))
(if (null moe-theme-highlight-buffer-id)
(set-face-attribute 'mode-line-buffer-id nil :background nil))
@@ -312,40 +312,40 @@ DO NOT CHANGE ITS VALUE.")
(load-theme 'moe-dark t))
(moe-theme-resize-font-size)
(cond ((eq moe-theme-mode-line-color 'blue) ;要考慮到powerline的顏色搭配...orz
- (set-face-attribute 'mode-line nil :background "#afd7ff" :foreground
"#005f87")
- (set-face-attribute 'mode-line-buffer-id nil :background "#5fafd7"
:foreground "#3a3a3a")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#1f5bff"
:background "#ffffff"))
+ (set-face-attribute 'mode-line nil :background "#5fafd7" :foreground
"#ffffff")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#5fafd7"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#005f87"
:background "#afd7ff"))
((eq moe-theme-mode-line-color 'green)
(set-face-attribute 'mode-line nil :background "#d7ff5f" :foreground
"#005f00")
- (set-face-attribute 'mode-line-buffer-id nil :background "#a1db00"
:foreground "#3a3a3a")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#5faf00"
:background "#ffffff"))
+ (set-face-attribute 'mode-line-buffer-id nil :background "#d7ff5f"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#005f00"
:background "#a1db00"))
((eq moe-theme-mode-line-color 'orange)
- (set-face-attribute 'mode-line nil :background "#ff8700" :foreground
"#3a3a3a")
- (set-face-attribute 'mode-line-buffer-id nil :background "#ff8700"
:foreground "#000000")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#ff5d17"
:background "#ffffff"))
+ (set-face-attribute 'mode-line nil :background "#ff8700" :foreground
"#ffffff")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ff8700"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#080808"
:background "#ffaf5f"))
((eq moe-theme-mode-line-color 'magenta)
(set-face-attribute 'mode-line nil :background "#ff4ea3" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#ff4ea3"
:foreground "#000000")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ff4ea3"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#ff1f8b"
:background "#ffffff"))
((eq moe-theme-mode-line-color 'yellow)
(set-face-attribute 'mode-line nil :background "#fce94f" :foreground
"#875f00")
- (set-face-attribute 'mode-line-buffer-id nil :background "#fce94f"
:foreground "#3a3a3a")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#875f00"
:background "#ffffff"))
+ (set-face-attribute 'mode-line-buffer-id nil :background "#fce94f"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#875f00"
:background "#ffff87"))
((eq moe-theme-mode-line-color 'purple)
- (set-face-attribute 'mode-line nil :background "#9a08ff" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#9a08ff"
:foreground "#000000")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#6c0099"
:background "#ffffff"))
+ (set-face-attribute 'mode-line nil :background "#af5fff" :foreground
"#ffffff")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#9a08ff"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#6c0099"
:background "#e6a8df"))
((eq moe-theme-mode-line-color 'red)
- (set-face-attribute 'mode-line nil :background "#ff4b4b" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#ff4b4b"
:foreground "#000000")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#a40000"
:background "#ffffff"))
+ (set-face-attribute 'mode-line nil :background "#ef2929" :foreground
"#ffffff")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ef2929"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#a40000"
:background "#ffafaf"))
((eq moe-theme-mode-line-color 'cyan)
(set-face-attribute 'mode-line nil :background "#5faf87" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#5faf87"
:foreground "#3a3a3a")
- (set-face-attribute 'minibuffer-prompt nil :foreground "#005f5f"
:background "#ffffff"))
+ (set-face-attribute 'mode-line-buffer-id nil :background "#5faf87"
:foreground "#080808")
+ (set-face-attribute 'minibuffer-prompt nil :foreground "#005f5f"
:background "#87d7af"))
((eq moe-theme-mode-line-color 'w/b)
(set-face-attribute 'mode-line nil :background "#ffffff" :foreground
"#3a3a3a")
- (set-face-attribute 'mode-line-buffer-id nil :background "#9e9e9e"
:foreground "#000000")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#9e9e9e"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#3e3e3e"
:background "#ffffff")))
(if (null moe-theme-highlight-buffer-id)
@@ -373,7 +373,7 @@ You may also like `moe-theme-random-color'"
"Select a color: "
'((blue) (green) (orange) (magenta) (yellow) (purple) (red)
(cyan) (w/b))
nil t "" nil nil t)))
- (let (moe-theme-revert-theme)
+ (let (moe-theme-revert-theme) ;set to nil to change only mode-line's color
(if (eq (frame-parameter nil 'background-mode) 'light)
(moe-light)
(moe-dark)))
@@ -390,7 +390,7 @@ You may also like `moe-theme-random-color'"
(moe-theme-random-color)
(setq moe-theme-mode-line-color (elt color-list n)))
- (let (moe-theme-revert-theme)
+ (let (moe-theme-revert-theme) ;set to nil to change only mode-line's color
(if (eq (frame-parameter nil 'background-mode) 'light)
(moe-light)
(moe-dark)))
@@ -446,7 +446,7 @@ as long as setq `moe-theme-mode-line-color' first."
(set-face-attribute 'powerline-active1 nil :background
"#bcbcbc" :foreground "#3a3a3a")
(set-face-attribute 'mode-line-buffer-id nil :background
nil :foreground "#ffffff"))))
((eq (frame-parameter nil 'background-mode) 'dark)
- (set-face-attribute 'mode-line-buffer-id nil :background nil
:foreground "#000000")
+ (set-face-attribute 'mode-line-buffer-id nil :background nil
:foreground "#080808")
(set-face-attribute 'mode-line-inactive nil :background "#4e4e4e"
:foreground "#9e9e9e")
(set-face-attribute 'powerline-active2 nil :background "#ffffff"
:foreground "#3a3a3a")
(set-face-attribute 'powerline-inactive1 nil :background
"#626262" :foreground "#eeeeee")
@@ -476,7 +476,7 @@ as long as setq `moe-theme-mode-line-color' first."
(set-face-attribute 'mode-line nil :background "#5faf87"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#87d7af" :foreground "#005f5f"))
((eq moe-theme-mode-line-color 'w/b)
- (set-face-attribute 'mode-line nil :background "#ffffff"
:foreground "#000000")
+ (set-face-attribute 'mode-line nil :background "#ffffff"
:foreground "#080808")
(set-face-attribute 'powerline-active1 nil :background
"#bcbcbc" :foreground "#3a3a3a")
(set-face-attribute 'mode-line-buffer-id nil :background
nil :foreground "#3a3a3a")))))
(powerline-default-theme)
