[nongnu] elpa/moe-theme e23567dd8a 182/352: Merge pull request #29 from kuanyui/pr/28

[ELPA Syncer]

branch: elpa/moe-theme
commit e23567dd8a49db63d37c4b72ad0bd17b5284a2bf
Merge: c1e9a7f8a4 05f673b4d7
Author: kuanyui <azazabc123@gmail.com>
Commit: kuanyui <azazabc123@gmail.com>

    Merge pull request #29 from kuanyui/pr/28
    
    Rewrite Popup/AC, Company
---
 moe-dark-theme.el  | 35 ++++++++++++++++++++++++++---------
 moe-light-theme.el | 35 ++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 1c9acc0427..ac7d77f64d 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -193,15 +193,32 @@ Moe, moe, kyun!")
    `(twittering-timeline-header-face ((,class (:foreground ,white-3))))
 
    ;; popup
-   `(popup-face ((,class (:background ,blue-00 :foreground ,blue-3))))
-   `(popup-isearch-match ((,class (:background ,cyan-1 :foreground ,black-3))))
-   `(popup-menu-face ((,class (:background ,blue-00 :foreground ,blue-3))))
-   `(popup-menu-selection-face ((,class (:background ,blue-1 :foreground 
,white-0))))
-   `(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))))
+   `(popup-face ((,class (:background ,black-3 :foreground ,blue-1))))
+   `(popup-isearch-match ((,class (:background ,black-3 :foreground ,magenta-2 
:bold t))))
+   `(popup-menu-face ((,class (:background ,black-3 :foreground ,blue-1))))
+   `(popup-menu-mouse-face ((,class (:background ,green-0 :foreground 
,black-4))))
+   `(popup-menu-selection-face ((,class (:background ,blue-3 :foreground 
,blue-0))))
+   `(popup-menu-summary-face ((,class (:background ,black-3 :foreground 
,blue-1))))
+   `(popup-scroll-bar-background-face ((,class (:background ,black-3 
:foreground ,black-3))))
+   `(popup-scroll-bar-foreground-face ((,class (:background ,black-2 
:foreground ,white-3))))
+   `(popup-summary-face ((,class (:background ,black-3 :foreground ,blue-1))))
+   `(popup-tip-face ((,class (:background ,black-2-5 :foreground ,white-1))))
+   
+   ;; company
+   `(company-echo ((,class (:background nil :foreground ,white-1))))
+   `(company-echo-common ((,class (:background ,black-3 :foreground ,red-1))))
+   `(company-preview ((,class (:background ,black-5 :foreground ,magenta-2))))
+   `(company-preview-common ((,class (:background ,black-5 :foreground 
,magenta-2))))
+   `(company-preview-search ((,class (:background ,black-4 :foreground 
,magenta-2 :bold t))))
+   `(company-scrollbar-bg ((,class (:background ,black-3))))
+   `(company-scrollbar-fg ((,class (:background ,white-3))))
+   `(company-template-field ((,class (:background ,yellow-00 :foreground 
,black-4))))
+   `(company-tooltip ((,class (:background ,black-3 :foreground ,blue-1))))
+   `(company-tooltip-annotation ((,class (:background ,black-4 :foreground 
,red-1))))
+   `(company-tooltip-common ((,class (:background ,black-2-5 :foreground 
,blue-0))))
+   `(company-tooltip-common-selection ((,class (:background ,blue-3 
:foreground ,blue-0 :bold t))))
+   `(company-tooltip-mouse ((,class (:background ,green-0 :foreground 
,black-5))))
+   `(company-tooltip-selection ((,class (:background ,blue-3 :foreground 
,blue-0))))
 
    ;; Button and link faces
    `(link ((,class (:underline t :foreground ,blue-1))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 460a6139bf..d0ee2c7def 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -191,15 +191,32 @@ Moe, moe, kyun!")
    `(twittering-timeline-header-face ((,class (:foreground ,black-1 :bold t))))
 
    ;; popup
-   `(popup-face ((,class (:background ,blue-00 :foreground ,blue-3))))
-   `(popup-isearch-match ((,class (:background ,cyan-1 :foreground ,black-3))))
-   `(popup-menu-face ((,class (:background ,blue-00 :foreground ,blue-3))))
-   `(popup-menu-selection-face ((,class (:background ,blue-1 :foreground 
,white-0))))
-   `(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))))
+   `(popup-face ((,class (:background ,black-5 :foreground ,blue-1))))
+   `(popup-isearch-match ((,class (:background ,black-5 :foreground ,magenta-2 
:bold t))))
+   `(popup-menu-face ((,class (:background ,black-5 :foreground ,blue-1))))
+   `(popup-menu-mouse-face ((,class (:background ,green-0 :foreground 
,black-5))))
+   `(popup-menu-selection-face ((,class (:background ,black-2 :foreground 
,blue-00))))
+   `(popup-menu-summary-face ((,class (:background ,black-5 :foreground 
,blue-1))))
+   `(popup-scroll-bar-background-face ((,class (:background ,black-5 
:foreground ,black-5))))
+   `(popup-scroll-bar-foreground-face ((,class (:background ,black-2 
:foreground ,white-3))))
+   `(popup-summary-face ((,class (:background ,black-5 :foreground ,blue-1))))
+   `(popup-tip-face ((,class (:background ,black-2 :foreground ,white-1))))
+
+   ;; company
+   `(company-echo ((,class (:background nil :foreground ,black-5))))
+   `(company-echo-common ((,class (:background ,red-000 :foreground ,red-2))))
+   `(company-preview ((,class (:background ,black-5 :foreground ,magenta-2))))
+   `(company-preview-common ((,class (:background ,black-5 :foreground 
,magenta-2))))
+   `(company-preview-search ((,class (:background ,black-4 :foreground 
,magenta-2 :bold t))))
+   `(company-scrollbar-bg ((,class (:background ,black-5))))
+   `(company-scrollbar-fg ((,class (:background ,black-1))))
+   `(company-template-field ((,class (:background ,yellow-00 :foreground 
,black-4))))
+   `(company-tooltip ((,class (:background ,black-6 :foreground ,blue-1))))
+   `(company-tooltip-annotation ((,class (:background ,black-4 :foreground 
,red-1))))
+   `(company-tooltip-common ((,class (:background ,black-5 :foreground 
,blue-1))))
+   `(company-tooltip-common-selection ((,class (:background ,black-3 
:foreground ,blue-0 :bold t))))
+   `(company-tooltip-mouse ((,class (:background ,green-0 :foreground 
,black-5))))
+   `(company-tooltip-selection ((,class (:background ,black-4 :foreground 
,blue-0))))
 
    ;; Button and link faces
    `(link ((,class (:underline t :foreground ,blue-1))))