branch: elpa/moe-theme
commit 7a878928871162e4b61bffbaefeafc99e4ecda98
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
1. Fix invisible secondary-selection and smerge.
---
moe-dark-theme.el | 5 ++++-
moe-light-theme.el | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 6bd9903615..ad8c603384 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -44,7 +44,7 @@ Moe, moe, chew!")
`(highlight ((,class (:background ,black-3))))
`(hl-line ((,class (:background ,black-3)))) ;;這裡遇到輸入法會有問題orz
`(region ((,class (:foreground ,black-3 :background ,green-2))))
- `(secondary-selection ((,class (:background ,blue-3))))
+ `(secondary-selection ((,class (:background ,blue-3 :foreground ,white-0))))
`(isearch ((,class (:foreground ,white-1 :background ,orange-3))))
`(lazy-highlight ((,class (:background ,magenta-3 :foreground ,white-1))))
`(trailing-whitespace ((,class (:background ,red-3))))
@@ -326,6 +326,9 @@ Moe, moe, chew!")
`(ediff-even-diff-B ((,class (:background ,black-4))))
`(ediff-odd-diff-B ((,class (:background ,black-4))))
+ ;; smerge
+ `(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
+
;; Flyspell faces
`(flyspell-duplicate ((,class (:underline t foreground-color,orange-1))))
`(flyspell-incorrect ((,class (:background ,red-1 :foreground ,white-1
:bold t))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 339c6606b4..ce82cbdaf2 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -44,12 +44,11 @@ Moe, moe, chew!")
`(highlight ((,class (:background ,green-0))))
`(hl-line ((,class (:background ,green-00)))) ;;這裡遇到輸入法會有問題orz
`(region ((,class (:foreground ,white-0 :background ,blue-1))))
- `(secondary-selection ((,class (:background ,blue-3))))
+ `(secondary-selection ((,class (:background ,blue-3 :foreground ,white-0))))
`(isearch ((,class (:foreground ,white-0 :background ,orange-3))))
`(lazy-highlight ((,class (:background ,magenta-3 :foreground ,white-0))))
`(trailing-whitespace ((,class (:background ,red-3))))
`(show-paren-match ((,class (:background ,blue-00))))
-
;; Mode line & frames' faces
`(mode-line ((,class
(:box (:line-width -1 :style released-button)
@@ -140,6 +139,7 @@ Moe, moe, chew!")
`(org-mode-line-clock ((,class (:foreground ,blue-3 :background ,blue-0
:bold t))))
`(org-mode-line-clock-overrun ((,class (:foreground ,white-0 :background
,red-1 :bold t))))
+
;; undo-tree
`(undo-tree-visualizer-default-face ((,class (:foreground ,black-5))))
`(undo-tree-visualizer-current-face ((,class (:foreground ,green-2 :weight
bold))))
@@ -326,6 +326,9 @@ Moe, moe, chew!")
`(ediff-even-diff-B ((,class (:background ,yellow-0))))
`(ediff-odd-diff-B ((,class (:background ,orange-0))))
+ ;; smerge
+ `(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
+
;; Flyspell faces
`(flyspell-duplicate ((,class (:underline t foreground-color,orange-1))))
`(flyspell-incorrect ((,class (:background ,red-1 :foreground ,white-0
:bold t))))
