[nongnu] elpa/moe-theme c8e0e68354 009/352: 1. Add Rainbow-delimiters

[ELPA Syncer]

branch: elpa/moe-theme
commit c8e0e683548488099790bb80bf40aa511cea073e
Author: kuanyui <azazabc123@gmail.com>
Commit: kuanyui <azazabc123@gmail.com>

    1. Add Rainbow-delimiters
    2. Improve the faces for Dired+, popup, org-mode...etc
---
 moe-dark-theme.el  | 50 ++++++++++++++++++++++----------------
 moe-light-theme.el | 70 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 822e0873a9..2296f0b9f3 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -22,7 +22,7 @@ Moe, moe, chew!")
       (white-1 "#dadada") (white-2 "#c6c6c6") (white-3 "#b2b2b2") (LIGHT_BG 
"#ffffd7")
       (black-1 "#a8a8a8") (black-2 "#8a8a8a") (black-3 "#4e4e4e")
 
-      (green-01 "#d7ff00")
+      (green-01 "#d7ff00") (white-0 "#ffffff")
       (green-0 "#d7ff5f") (blue-0 "#8cc4ff") (purple-0 "#e6a8df") (yellow-0 
"#ffff87")
       (red-0 "#ff4b4b")  (black-4 "#3a3a3a") (black-5 "#303030") (orange-0 
"#ffaf87")
       (green-00 "#d7ff87") (yellow-00 "#ffffaf") (blue-00 "#d7d7ff"))
@@ -40,7 +40,7 @@ Moe, moe, chew!")
 
    ;; Highlighting faces
    `(fringe ((,class (:foreground ,black-3 :background ,white-3))))
-   `(linum ((,class (:foreground ,white-2 :background ,black-2))))
+   `(linum ((,class (:foreground ,white-1 :background ,black-2))))
    `(highlight ((,class (:background ,black-3))))
    `(hl-line ((,class (:background ,black-3)))) ;;這裡遇到輸入法會有問題orz
    `(region ((,class (:foreground ,black-3 :background ,green-2))))
@@ -53,7 +53,7 @@ Moe, moe, chew!")
    ;; Mode line & frames' faces
    `(mode-line ((,class
                 (:box (:line-width -1 :style released-button)
-                 :background ,white-1 :foreground ,blue-2))))
+                 :background ,white-0 :foreground ,blue-2))))
    `(mode-line-inactive ((,class
                          (:box (:line-width -1 :style released-button)
                           :background ,black-3 :foreground ,white-1))))
@@ -109,7 +109,6 @@ Moe, moe, chew!")
    `(org-level-6 ((,class (:foreground ,magenta-2))))
    `(org-level-7 ((,class (:foreground ,purple-2))))
    `(org-level-8 ((,class (:foreground ,black-2))))
-   `(org-link ((,class (:foreground ,blue-1 :underline t))))
    `(org-tag ((,class (:background ,white-1 :foreground ,black-2 :bold t 
:weight bold))))
    `(org-column ((,class (:background ,white-3 :foreground ,black-5))))
    `(org-column-title ((,class (:background ,green-2 :foreground ,black-5 
:underline t :weight bold))))
@@ -121,12 +120,12 @@ Moe, moe, chew!")
    `(org-table ((,class (:foreground ,green-2))))
    `(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 :underline 
nil))))
+   `(org-warning ((,class (:bold t :foreground ,red-3 :weight bold))))
    `(org-formula ((,class (:foreground ,yellow-2))))
    `(org-headline-done ((,class (:foreground ,green-2))))
    `(org-hide ((,class (:foreground ,black-2))))
    `(org-code ((,class (:foreground ,yellow-1))))
-   `(org-link ((,class (:foreground ,blue-1))))
+   `(org-link ((,class (:foreground ,blue-1 :underline ,blue-1))))
    `(org-footnote ((,class (:foreground ,magenta-3))))
    `(org-ellipsis ((,class (:foreground ,red-2))))
    `(org-agenda-clocking ((,class (:foreground ,blue-3 :background ,blue-0 
:bold t))))
@@ -147,7 +146,7 @@ Moe, moe, chew!")
    `(undo-tree-visualizer-active-branch-face ((,class (:foreground ,red-2))))
    `(undo-tree-visualizer-register-face ((,class (:foreground ,yellow-2))))
 
-   ;; Markdown faces
+   ;; Markdown-mode
    `(markdown-blockquote-face ((,class (:foreground ,red-2 :italic t))))
    `(markdown-bold-face ((,class (:foreground ,white-1 :bold t))))
    `(markdown-comment-face ((,class (:foreground ,black-2 :italic t))))
@@ -174,17 +173,16 @@ Moe, moe, chew!")
    `(twittering-timeline-header-face ((,class (:foreground ,white-3))))
 
    ;; popup
-   `(popup-face ((,class (:background ,white-2 :foreground ,black-3))))
+   `(popup-face ((,class (:background ,blue-00 :foreground ,blue-3))))
    `(popup-isearch-match ((,class (:background ,cyan-1 :foreground ,black-3))))
-   `(popup-menu-face ((,class (:background ,white-2 :foreground ,black-3))))
-;;   `(popup-menu-mouse-face ((,class (:background ,white-2 :foreground 
,black-3))))
-;;   `(popup-menu-selection-face ((,class (:background ,white-2 :foreground 
,black-3))))
-;;   `(popup-menu-summary-face ((,class (:background ,white-2 :foreground 
,black-3))))
-   `(popup-scroll-bar-background-face ((,class (:background ,white-3 
:foreground ,white-3))))
-   `(popup-scroll-bar-foreground-face ((,class (:background ,black-2 
:foreground ,black-2))))
-;;   `(popup-summary-face ((,class (:background ,white-2 :foreground 
,black-3))))
-   `(popup-tip-face ((,class (:background ,yellow-0 :foreground ,black-3))))
-   
+   `(popup-menu-face ((,class (:background ,blue-00 :foreground ,blue-3))))
+   `(popup-menu-selection-face ((,class (:background ,blue-1 :foreground 
,white-1))))
+   `(popup-menu-summary-face ((,class (:background ,blue-00 :foreground 
,blue-3))))
+   `(popup-scroll-bar-background-face ((,class (:background ,blue-0 
:foreground ,blue-0))))
+   `(popup-scroll-bar-foreground-face ((,class (:background ,blue-3 
:foreground ,blue-3))))
+   `(popup-summary-face ((,class (:background ,blue-00 :foreground ,blue-3))))
+   `(popup-tip-face ((,class (:background ,yellow-00 :foreground ,black-3))))  
 
+
    ;; Button and link faces
    `(link ((,class (:underline t :foreground ,blue-1))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
@@ -260,9 +258,9 @@ Moe, moe, chew!")
    `(diredp-other-priv ((,class (:foreground ,white-1 :background ,blue-3))))
    `(diredp-rare-priv ((,class (:foreground ,white-1 :background ,purple-2))))
    `(diredp-symlink ((,class (:foreground ,magenta-3))))
-   `(diredp-read-priv ((,class (:foreground ,red-3 :background ,orange-0))))
+   `(diredp-read-priv ((,class (:foreground ,green-4 :background ,green-0))))
    `(diredp-write-priv ((,class (:foreground ,blue-5 :background ,blue-0))))
-   `(diredp-exec-priv ((,class (:foreground ,green-4 :background ,green-0))))
+   `(diredp-exec-priv ((,class (:foreground ,red-3 :background ,orange-0))))
 
    ;; Message faces
    `(message-header-name ((,class (:foreground ,blue-1))))
@@ -316,8 +314,20 @@ Moe, moe, chew!")
    `(ace-jump-face-background ((,class (:foreground ,black-2))))
    `(ace-jump-face-foreground ((,class (:foreground ,red-2))))
 
+   ;; Rainbow-delimiters
+   `(rainbow-delimiters-depth-1-face ((,class (:foreground ,red-1))))
+   `(rainbow-delimiters-depth-2-face ((,class (:foreground ,blue-1))))
+   `(rainbow-delimiters-depth-3-face ((,class (:foreground ,orange-2))))
+   `(rainbow-delimiters-depth-4-face ((,class (:foreground ,green-2))))
+   `(rainbow-delimiters-depth-5-face ((,class (:foreground ,magenta-2))))
+   `(rainbow-delimiters-depth-6-face ((,class (:foreground ,cyan-1))))
+   `(rainbow-delimiters-depth-7-face ((,class (:foreground ,purple-2))))
+   `(rainbow-delimiters-depth-8-face ((,class (:foreground ,white-1))))
+   `(rainbow-delimiters-depth-9-face ((,class (:foreground ,yellow-2))))
+   `(rainbow-delimiters-unmatched-face ((,class (:foreground ,white-1 
:background ,red-3 :bold t))))
+
    ;; Flymake
-   `(flymake-warnline ((,class (:underline ,orange-1))))
+   `(flymake-warnline ((,class (:underline ,orange-2))))
    `(flymake-errline ((,class (:underline ,red-2)))))
 
   (custom-theme-set-variables
diff --git a/moe-light-theme.el b/moe-light-theme.el
index b72bc84191..fa337d1c66 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -24,7 +24,7 @@ Moe, moe, chew!")
 
       (green-01 "#d7ff00")
       (green-0 "#d7ff5f") (blue-0 "#afd7ff") (purple-0 "#e6a8df") (yellow-0 
"#ffff87")
-      (red-0 "#ff4b4b")  (black-4 "#626262") (black-5 "#5f5f5f") (orange-0 
"#ffaf87")
+      (red-0 "#ff4b4b")  (black-4 "#626262") (black-5 "#5f5f5f") (black-6 
"#3a3a3a") (orange-0 "#ffaf87")
       (green-00 "#d7ff87") (yellow-00 "#ffffaf") (blue-00 "#d7d7ff"))
 
   (custom-theme-set-faces
@@ -57,11 +57,11 @@ Moe, moe, chew!")
    `(mode-line-inactive ((,class
                          (:box (:line-width -1 :style released-button)
                           :background ,blue-00 :foreground ,black-1))))
-   `(mode-line-buffer-id ((,class (:foreground ,black-3 :background ,blue-1))))
+   `(mode-line-buffer-id ((,class (:foreground ,black-6 :background ,blue-1 
:bold t))))
    `(vertical-border ((,class (:foreground ,white-3 :background ,white-3))))
 
    ;; Escape and prompt faces
-   `(minibuffer-prompt ((,class (:foreground ,black-3 :background ,green-2))))
+   `(minibuffer-prompt ((,class (:foreground ,black-6 :background ,green-2))))
    `(escape-glyph ((,class (:foreground ,yellow-3))))
    `(error ((,class (:foreground ,red-0))))
    `(warning ((,class (:foreground ,orange-1))))
@@ -101,7 +101,7 @@ Moe, moe, chew!")
                               :box (:line-width 1 :style none)))))
    `(org-todo ((,class (:bold t :weight bold :foreground ,white-1 :background 
,red-2
                               :box (:line-width 1 :style none)))))
-   `(org-level-1 ((,class (:bold t :foreground ,blue-2 :height 1.3))))
+   `(org-level-1 ((,class (:bold t :foreground ,blue-1 :height 1.3))))
    `(org-level-2 ((,class (:bold t :foreground ,green-2 :height 1.2))))
    `(org-level-3 ((,class (:bold t :foreground ,orange-2 :height 1.1))))
    `(org-level-4 ((,class (:bold t :foreground ,cyan-3))))
@@ -109,7 +109,6 @@ Moe, moe, chew!")
    `(org-level-6 ((,class (:bold t :foreground ,magenta-2))))
    `(org-level-7 ((,class (:bold t :foreground ,purple-2))))
    `(org-level-8 ((,class (:bold t :foreground ,yellow-2))))
-   `(org-link ((,class (:foreground ,blue-1 :underline t))))
    `(org-tag ((,class (:background ,black-1 :foreground ,white-1 :bold t 
:weight bold))))
    `(org-column ((,class (:background ,white-3 :foreground ,black-5))))
    `(org-column-title ((,class (:background ,green-2 :foreground ,black-5 
:underline t :weight bold))))
@@ -121,12 +120,12 @@ Moe, moe, chew!")
    `(org-table ((,class (:background ,yellow-0 :foreground ,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 :underline 
nil))))
+   `(org-warning ((,class (:bold t :foreground ,red-3 :weight bold))))
    `(org-formula ((,class (:foreground ,purple-2))))
    `(org-headline-done ((,class (:foreground ,green-2))))
    `(org-hide ((,class (:foreground ,black-2))))
    `(org-code ((,class (:foreground ,blue-2))))
-   `(org-link ((,class (:foreground ,blue-1))))
+   `(org-link ((,class (:foreground ,blue-2 :underline ,blue-2))))
    `(org-footnote ((,class (:foreground ,magenta-3))))
    `(org-ellipsis ((,class (:foreground ,red-2))))
    `(org-agenda-clocking ((,class (:foreground ,blue-3 :background ,blue-0 
:bold t))))
@@ -147,7 +146,7 @@ Moe, moe, chew!")
    `(undo-tree-visualizer-active-branch-face ((,class (:foreground ,red-2))))
    `(undo-tree-visualizer-register-face ((,class (:foreground ,yellow-2))))
 
-   ;; Markdown faces
+   ;; Markdown-mode
    `(markdown-blockquote-face ((,class (:foreground ,green-3 :background 
,green-00 :italic t))))
    `(markdown-bold-face ((,class (:foreground ,black-5 :bold t))))
    `(markdown-comment-face ((,class (:foreground ,white-3 :italic t))))
@@ -157,34 +156,33 @@ Moe, moe, chew!")
    `(markdown-header-face-4 ((,class (:foreground ,orange-2 :bold t))))
    `(markdown-header-face-5 ((,class (:foreground ,orange-2 :bold t))))
    `(markdown-header-face-6 ((,class (:foreground ,orange-2 :bold t))))
-   `(markdown-link-face ((,class (:foreground ,magenta-1 :bold t :underline 
t))))
+   `(markdown-link-face ((,class (:foreground ,magenta-1 :bold t :underline 
,magenta-1))))
    `(markdown-inline-code-face ((,class (:foreground ,blue-3 :background 
,blue-00))))
-   `(markdown-italic-face ((,class (:foreground ,black-5 :italic t))))
+   `(markdown-italci-face ((,class (:foreground ,black-5 :italic t))))
    `(markdown-list-face ((,class (:foreground ,black-5 :bold t))))
    `(markdown-math-face ((,class (:foreground ,purple-2))))
    `(markdown-missing-link-face ((,class (:foreground ,red-1 :bold t))))
    `(markdown-pre-face ((,class (:foreground ,blue-2))))
    `(markdown-reference-face ((,class (:foreground ,orange-2 :italic t))))
-   `(markdown-url-face ((,class (:foreground ,magenta-3 :underline t))))
+   `(markdown-url-face ((,class (:foreground ,magenta-3 :underline 
,magenta-3))))
 
    ;; Twittering-mode
    `(twittering-username-face ((,class (:foreground ,blue-3 :background 
,blue-00))))
-   `(twittering-uri-face ((,class (:foreground ,blue-2 :underline t))))
+   `(twittering-uri-face ((,class (:foreground ,blue-2 :underline ,blue-2))))
    `(twittering-timeline-footer-face ((,class (:foreground ,black-1 :bold t))))
    `(twittering-timeline-header-face ((,class (:foreground ,black-1 :bold t))))
 
    ;; popup
-   `(popup-face ((,class (:background ,white-2 :foreground ,black-3))))
+   `(popup-face ((,class (:background ,blue-00 :foreground ,blue-3))))
    `(popup-isearch-match ((,class (:background ,cyan-1 :foreground ,black-3))))
-   `(popup-menu-face ((,class (:background ,white-2 :foreground ,black-3))))
-;;   `(popup-menu-mouse-face ((,class (:background ,white-2 :foreground 
,black-3))))
-;;   `(popup-menu-selection-face ((,class (:background ,white-2 :foreground 
,black-3))))
-;;   `(popup-menu-summary-face ((,class (:background ,white-2 :foreground 
,black-3))))
-   `(popup-scroll-bar-background-face ((,class (:background ,white-3 
:foreground ,white-3))))
-   `(popup-scroll-bar-foreground-face ((,class (:background ,black-2 
:foreground ,black-2))))
-;;   `(popup-summary-face ((,class (:background ,white-2 :foreground 
,black-3))))
-   `(popup-tip-face ((,class (:background ,yellow-0 :foreground ,black-3))))
-   
+   `(popup-menu-face ((,class (:background ,blue-00 :foreground ,blue-3))))
+   `(popup-menu-selection-face ((,class (:background ,blue-1 :foreground 
,white-1))))
+   `(popup-menu-summary-face ((,class (:background ,blue-00 :foreground 
,blue-3))))
+   `(popup-scroll-bar-background-face ((,class (:background ,blue-0 
:foreground ,blue-0))))
+   `(popup-scroll-bar-foreground-face ((,class (:background ,blue-3 
:foreground ,blue-3))))
+   `(popup-summary-face ((,class (:background ,blue-00 :foreground ,blue-3))))
+   `(popup-tip-face ((,class (:background ,yellow-00 :foreground ,black-3))))
+
    ;; Button and link faces
    `(link ((,class (:underline t :foreground ,blue-1))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
@@ -230,7 +228,7 @@ Moe, moe, chew!")
    `(helm-ff-invalid-symlink ((,class (:foreground ,white-1 :background 
,red-2))))
    `(helm-ff-prefix ((,class (:foreground ,white-1 :background ,orange-2))))
 
-   ;;Dired+
+   ;; Dired+
    `(dired-directory ((,class (:foreground ,blue-1 :bold t))))
    `(dired-flagged ((,class (:foreground ,red-1))))
    `(dired-header ((,class (:foreground ,blue-1))))
@@ -244,8 +242,8 @@ Moe, moe, chew!")
    `(diredp-date-time ((,class (:foreground ,blue-3 :background ,blue-00))))
    `(diredp-deletion ((,class (:foreground ,white-1, :background ,red-3))))
    `(diredp-deletion-file-name ((,class (:foreground ,red-2))))
-   `(diredp-dir-heading ((,class (:foreground ,black-5 :background ,white-1))))
-   `(diredp-dir-priv ((,class (:foreground ,blue-1 :bold t))))
+   `(diredp-dir-heading ((,class (:foreground ,black-5 :background ,green-01 
:bold t))))
+   `(diredp-dir-priv ((,class (:foreground ,blue-1 :background ,LIGHT_BG :bold 
t))))
    `(diredp-display-msg ((,class (:foreground ,orange-2))))
    `(diredp-executable-tag ((,class (:foreground ,green-2))))
    `(diredp-file-name ((,class (:foreground ,black-5))))
@@ -261,10 +259,9 @@ Moe, moe, chew!")
    `(diredp-other-priv ((,class (:foreground ,white-1 :background ,blue-3))))
    `(diredp-rare-priv ((,class (:foreground ,white-1 :background ,purple-2))))
    `(diredp-symlink ((,class (:foreground ,magenta-3))))
-   `(diredp-read-priv ((,class (:foreground ,red-3 :background ,orange-0))))
+   `(diredp-read-priv ((,class (:foreground ,green-4 :background ,green-0))))
    `(diredp-write-priv ((,class (:foreground ,blue-5 :background ,blue-0))))
-   `(diredp-exec-priv ((,class (:foreground ,green-4 :background ,green-0))))
-
+   `(diredp-exec-priv ((,class (:foreground ,red-3 :background ,orange-0))))
    
    ;; Message faces
    `(message-header-name ((,class (:foreground ,blue-3))))
@@ -318,8 +315,23 @@ Moe, moe, chew!")
    `(ace-jump-face-background ((,class (:foreground ,white-3))))
    `(ace-jump-face-foreground ((,class (:foreground ,red-2 :bold t))))
 
+   ;; Rainbow-delimiters
+   `(rainbow-delimiters-depth-1-face ((,class (:foreground ,red-2))))
+   `(rainbow-delimiters-depth-2-face ((,class (:foreground ,blue-2))))
+   `(rainbow-delimiters-depth-3-face ((,class (:foreground ,orange-3))))
+   `(rainbow-delimiters-depth-4-face ((,class (:foreground ,green-2))))
+   `(rainbow-delimiters-depth-5-face ((,class (:foreground ,magenta-3))))
+   `(rainbow-delimiters-depth-6-face ((,class (:foreground ,cyan-3))))
+   `(rainbow-delimiters-depth-7-face ((,class (:foreground ,purple-3))))
+   `(rainbow-delimiters-depth-8-face ((,class (:foreground ,black-5))))
+   `(rainbow-delimiters-depth-9-face ((,class (:foreground ,yellow-2))))
+   `(rainbow-delimiters-unmatched-face ((,class (:foreground ,white-1 
:background ,red-3 :bold t))))
+
+   ;; which-function-mode
+   `(which-func ((,class (:foreground ,white-1 :background ,orange-2))))
+
    ;; Flymake
-   `(flymake-warnline ((,class (:underline ,orange-1))))
+   `(flymake-warnline ((,class (:underline ,orange-2))))
    `(flymake-errline ((,class (:underline ,red-2)))))