branch: elpa/moe-theme
commit 73e051af1f48d7b551938a0a9ca116a766f2fc32
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
Rearrange alllllll~ of the colors for mode-line
---
moe-theme.el | 59 +++++++++++++++++++++++++++++++----------------------------
1 file changed, 31 insertions(+), 28 deletions(-)
diff --git a/moe-theme.el b/moe-theme.el
index 272daf2460..f549ad9d51 100644
--- a/moe-theme.el
+++ b/moe-theme.el
@@ -277,40 +277,40 @@ Don't setq this manually.")
(set-foreground-color "#5f5f5f")))
(cond ((eq moe-theme-mode-line-color 'blue)
- (set-face-attribute 'mode-line nil :background "#5fafd7" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#5fafd7"
:foreground "#3a3a3a")
+ (set-face-attribute 'mode-line nil :background "#c3c9f8" :foreground
"#005f87")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#c3c9f8"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#5fafd7"
:background "#3a3a3a"))
((eq moe-theme-mode-line-color 'green)
- (set-face-attribute 'mode-line nil :background "#a1db00" :foreground
"#005f00")
+ (set-face-attribute 'mode-line nil :background "#afdf77" :foreground
"#005f00")
(set-face-attribute 'mode-line-buffer-id nil :background "#a1db00"
:foreground "#3a3a3a")
(set-face-attribute 'minibuffer-prompt nil :foreground "#a1db00"
:background "#3a3a3a"))
((eq moe-theme-mode-line-color 'orange)
- (set-face-attribute 'mode-line nil :background "#ff8700" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#ff8700"
:foreground "#1c1c1c")
+ (set-face-attribute 'mode-line nil :background "#ffd787" :foreground
"#d75f00")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ffd787"
:foreground "#1c1c1c")
(set-face-attribute 'minibuffer-prompt nil :foreground "#ff8700"
:background "#1c1c1c"))
((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 "#3a3a3a")
+ (set-face-attribute 'mode-line nil :background "#ffafd7" :foreground
"#cc1f8b")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ffafd7"
:foreground "#3a3a3a")
(set-face-attribute 'minibuffer-prompt nil :foreground "#ff4ea3"
:background "#3a3a3a"))
((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 "#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 "#080808")
+ (set-face-attribute 'mode-line nil :background "#e6a8df" :foreground
"#6c0099")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#e6a8df"
: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 "#080808")
+ (set-face-attribute 'mode-line nil :background "#ffafaf" :foreground
"#d40000")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ffafaf"
: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 'mode-line nil :background "#87d7af" :foreground
"#005f5f")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#87d7af"
:foreground "#080808")
(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 "#080808")
+ (set-face-attribute 'mode-line nil :background "#9b9b9b" :foreground
"#ffffff")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#9b9b9b"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#8a8a8a"
:background "#080808")))
(if (null moe-theme-highlight-buffer-id)
@@ -334,36 +334,36 @@ Don't setq this manually.")
(moe-theme-resize-font-size)
(cond ((eq moe-theme-mode-line-color 'blue)
- (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 'mode-line nil :background "#c3c9f8" :foreground
"#005f87")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#c3c9f8"
: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 "#d7ff5f"
:foreground "#080808")
+ (set-face-attribute 'mode-line nil :background "#afdf77" :foreground
"#005f00")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#afdf77"
: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
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#ff8700"
:foreground "#080808")
+ (set-face-attribute 'mode-line nil :background "#ffaf5f" :foreground
"#b75f00")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ffaf5f"
: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 "#080808")
+ (set-face-attribute 'mode-line nil :background "#ffafd7" :foreground
"#cc1f8b")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#ffafd7"
: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 "#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 "#af5fff" :foreground
"#ffffff")
- (set-face-attribute 'mode-line-buffer-id nil :background "#9a08ff"
:foreground "#080808")
+ (set-face-attribute 'mode-line nil :background "#e6a8df" :foreground
"#6c0099")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#e6a8df"
: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 "#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 "#080808")
+ (set-face-attribute 'mode-line nil :background "#87d7af" :foreground
"#005f5f")
+ (set-face-attribute 'mode-line-buffer-id nil :background "#87d7af"
: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")
@@ -416,7 +416,10 @@ You may also like `moe-theme-random-color'"
"Auto set `moe-theme-powerline-enable-p' to nil after `powerline-revert'
Because when `powerline-moe-theme' has been run, `moe-theme-select-color'
and `moe-theme-random-color' should call `powerline-moe-theme' again for
update."
- (setq moe-theme-powerline-enable-p nil))
+ (setq moe-theme-powerline-enable-p nil)
+ (if (eq (frame-parameter nil 'background-mode) 'light)
+ (moe-light)
+ (moe-dark))))
(defun powerline-moe-theme ()
"Powerline theme powered by moe-theme.el
