branch: elpa/moe-theme
commit 39384a7a9e6886f3a3d79efac4009fcd800a4a14
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
moe-dark for Magit 2
---
moe-dark-theme.el | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
moe-light-theme.el | 4 +--
2 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 83b80050b0..b2485f15e3 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -382,6 +382,80 @@ Moe, moe, kyun!")
`(diredp-write-priv ((,class (:foreground ,blue-5 :background ,blue-0))))
`(diredp-exec-priv ((,class (:foreground ,red-3 :background ,orange-0))))
+ ;; Magit >= 2.1.0
+ `(magit-bisect-bad ((,class (:foreground ,red-3 :background ,red-00))))
+ `(magit-bisect-good ((,class (:foreground ,green-4 :background ,green-0))))
+ `(magit-bisect-skip ((,class (:foreground ,yellow-4 :background
,orange-00))))
+ `(magit-blame-date ((,class (:foreground ,orange-2 :background ,black-3))))
+ `(magit-blame-hash ((,class (:foreground ,orange-2 :background ,black-3))))
+ `(magit-blame-heading ((,class (:foreground ,white-1 :background
,black-3))))
+ `(magit-blame-name ((,class (:foreground ,green-1 :background ,black-3))))
+ `(magit-blame-summary ((,class (:foreground ,white-2 :background
,black-3))))
+ `(magit-branch-current ((,class (:foreground ,orange-4 :background
,orange-00 :bold t :underline t))))
+ `(magit-branch-local ((,class (:foreground ,green-4 :background ,green-00
:bold t :underline t))))
+ `(magit-branch-remote ((,class (:foreground ,blue-3 :background ,blue-0
:bold t :underline t))))
+ `(magit-cherry-equivalent ((,class (:foreground ,purple-2))))
+ `(magit-cherry-unmatched ((,class (:foreground ,cyan-4))))
+ `(magit-diff-added ((,class (:foreground ,green-0 :background nil :bold
t))))
+ `(magit-diff-added-highlight ((,class (:foreground ,green-0 :bold t
:inherit (magit-section-highlight)))))
+ `(magit-diff-base ((,class (:foreground ,yellow-1 :background nil))))
+ `(magit-diff-base-highlight ((,class (:foreground ,yellow-1 :bold t
:inherit (magit-section-highlight)))))
+ `(magit-diff-conflict-heading ((,class (:foreground ,white-0 :background
,orange-2))))
+ `(magit-diff-context ((,class (:foreground ,white-1 :background nil))))
+ `(magit-diff-context-highlight ((,class (:foreground ,white-1 :inherit
(magit-section-highlight)))))
+ `(magit-diff-file-heading ((,class (:foreground ,white-0 :bold t))))
+ `(magit-diff-file-heading-highlight ((,class (:background ,blue-3 :bold
t))))
+ `(magit-diff-file-heading-selection ((,class (:foreground ,white-0
:background ,black-2 :bold t))))
+ `(magit-diff-hunk-heading ((,class (:foreground ,black-2 :background
,black-3 :bold t))))
+ `(magit-diff-hunk-heading-highlight ((,class (:foreground ,black-4
:background ,blue-01))))
+ `(magit-diff-hunk-heading-selection ((,class (:foreground ,white-1
:background ,white-1))))
+ `(magit-diff-lines-boundary ((,class (:foreground ,white-1 :background
,red-0))))
+ `(magit-diff-lines-heading ((,class (:foreground ,white-1 :background
,red-0))))
+ `(magit-diff-our ((,class (:foreground ,magenta-3))))
+ `(magit-diff-our-highlight ((,class (:foreground ,magenta-3 :background
,magenta-00))))
+ `(magit-diff-removed ((,class (:foreground ,red-0 :background nil :bold
t))))
+ `(magit-diff-removed-highlight ((,class (:foreground ,red-0 :bold t
:inherit (magit-section-highlight)))))
+ `(magit-diff-their ((,class (:foreground ,cyan-4)))) ;
+ `(magit-diff-their-highlight ((,class (:foreground ,cyan-6 :background
,cyan-1))))
+ `(magit-diff-whitespace-warning ((,class (:foreground ,red-3 :background
,red-3))))
+ `(magit-diffstat-added ((,class (:foreground ,green-3 :background ,green-0
:bold t))))
+ `(magit-diffstat-removed ((,class (:foreground ,red-3 :background ,red-0
:bold t))))
+ `(magit-dimmed ((,class (:foreground ,black-2))))
+ `(magit-filename ((,class (:foreground ,blue-1))))
+ `(magit-hash ((,class (:foreground ,orange-2 :background nil))))
+ `(magit-head ((,class (:foreground ,orange-4 :background ,orange-000))))
+ `(magit-header-line ((,class (:foreground ,orange-2))))
+ `(magit-log-author ((,class (:foreground ,green-2 :background nil))))
+ `(magit-log-date ((,class (:foreground ,black-2 :background nil))))
+ `(magit-log-graph ((,class (:foreground ,black-2 :background nil))))
+ `(magit-process-ng ((,class (:foreground ,red-3 :background ,red-00
:underline t))))
+ `(magit-process-ok ((,class (:foreground ,green-3 :background ,green-00
:underline t))))
+ `(magit-reflog-amend ((,class (:foreground ,magenta-3 :background
,magenta-00))))
+ `(magit-reflog-checkout ((,class (:foreground ,green-3 :background
,green-00))))
+ `(magit-reflog-cherry-pick ((,class (:foreground ,orange-4 :background
,orange-00))))
+ `(magit-reflog-commit ((,class (:foreground ,yellow-4 :background
,yellow-0))))
+ `(magit-reflog-merge ((,class (:foreground ,purple-4 :background
,purple-00))))
+ `(magit-reflog-other ((,class (:foreground ,white-0 :background ,black-3))))
+ `(magit-reflog-rebase ((,class (:foreground ,cyan-6 :background ,cyan-2))))
+ `(magit-reflog-remote ((,class (:foreground ,blue-4 :background ,blue-0))))
+ `(magit-reflog-reset ((,class (:foreground ,red-3 :background ,red-00))))
+ `(magit-section-heading ((,class (:foreground ,orange-3 :background nil
:bold t :underline t))))
+ `(magit-section-heading-selection ((,class (:background ,blue-0))))
+ `(magit-section-highlight ((,class (:background ,black-3))))
+ `(magit-sequence-done ((,class (:foreground ,green-3))))
+ `(magit-sequence-drop ((,class (:foreground ,orange-2))))
+ `(magit-sequence-head ((,class (:foreground ,blue-2))))
+ `(magit-sequence-onto ((,class (:foreground ,purple-2))))
+ `(magit-sequence-part ((,class (:foreground ,cyan-4))))
+ `(magit-sequence-pick ((,class (:foreground ,magenta-2))))
+ `(magit-sequence-stop ((,class (:foreground ,red-3))))
+ `(magit-signature-bad ((,class (:foreground ,red-2))))
+ `(magit-signature-good ((,class (:foreground ,green-3))))
+ `(magit-signature-untrusted ((,class (:foreground ,yellow-3))))
+ `(magit-tag ((,class (:foreground ,blue-3 :background ,blue-0))))
+ `(magit-valid-signature ((,class (:foreground ,cyan-4 :background ,LIGHT_BG
:bold t))))
+ `(magit-whitespace-warning-face ((,class (:foreground ,white-0 :background
,red-2 :bold t))))
+
;; Magit
`(magit-branch ((,class (:foreground ,green-4 :background ,green-01 :bold t
:underline t))))
`(magit-diff-add ((,class (:foreground ,green-0 :background nil :bold t))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 2782c2e6b9..539c2a5896 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -416,8 +416,8 @@ Moe, moe, kyun!")
`(magit-diff-their ((,class (:foreground ,cyan-4)))) ;
`(magit-diff-their-highlight ((,class (:foreground ,cyan-6 :background
,cyan-1))))
`(magit-diff-whitespace-warning ((,class (:foreground ,red-3 :background
,red-3))))
- `(magit-diffstat-added ((,class (:foreground ,green-3))))
- `(magit-diffstat-removed ((,class (:foreground ,red-3))))
+ `(magit-diffstat-added ((,class (:foreground ,green-3 :background ,green-0
:bold t))))
+ `(magit-diffstat-removed ((,class (:foreground ,red-3 :background ,red-0
:bold t))))
`(magit-dimmed ((,class (:foreground ,white-3))))
`(magit-filename ((,class (:foreground ,blue-3))))
`(magit-hash ((,class (:foreground ,orange-2 :background nil))))
