branch: elpa/moe-theme
commit c4b9980e5925dd7f0d4bb6f8eab9d47b472936fb
Author: kuanyui <[email protected]>
Commit: kuanyui <[email protected]>
moe-light for upcoming Magit2. (unfinished) @ department classroom
---
moe-light-theme.el | 104 +++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 94 insertions(+), 10 deletions(-)
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 46a2fb6e69..6e319602b4 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -11,13 +11,13 @@ Moe, moe, kyun!")
(let ((class '((class color) (min-colors 89)))
;; Palette colors.
- (yellow-1 "#fce94f") (yellow-2 "#ffd700") (yellow-3 "#c4a000") (yellow-4
"#875f00")
+ (yellow-1 "#fce94f") (yellow-2 "#ffd700") (yellow-3 "#c4a000")
(yellow-3-5 "#aaaa11") (yellow-4 "#875f00")
(orange-1 "#ffaf5f") (orange-2 "#ff8700") (orange-3 "#ff5d17") (orange-4
"#d75f00")
(magenta-1 "#ff7bbb") (magenta-2 "#ff4ea3") (magenta-3 "#ff1f8b")
(green-1 "#afff00") (green-2 "#a1db00") (green-3 "#00af00") (green-4
"#008700") (green-5 "#005f00")
(blue-1 "#5fafd7") (blue-2 "#1f5bff") (blue-3 "#005f87") (blue-4
"#005faf") (blue-5 "#0000af")
- (cyan-1 "#87ffff") (cyan-2 "#5fd7af") (cyan-3 "#00d7af") (cyan-4
"#00ac8a") (cyan-5 "#5faf87") (cyan-6 "#005f5f") (cyan-7 "#005f87") (cyan-8
"#00af87")
- (purple-1 "#d18aff") (purple-2 "#9a08ff") (purple-3 "#6c0099") (purple-4
"#6c0099")
+ (cyan-1 "#87ffff") (cyan-2 "#5fd7af") (cyan-3 "#00d7af") (cyan-4
"#00ac8a") (cyan-5 "#18b2b2") (cyan-6 "#005f5f") (cyan-7 "#005f87") (cyan-8
"#00af87")
+ (purple-1 "#d18aff") (purple-2 "#b218b2") (purple-3 "#6c0099") (purple-4
"#6c0099")
(red-1 "#ef2929") (red-2 "#cc0000") (red-3 "#a40000")
(white-1 "#eeeeee") (white-2 "#dadada") (white-3 "#c6c6c6") (white-4
"#b2b2b2") (black-1 "#9e9e9e")
(black-2 "#8a8a8a") (black-3 "#767676") (black-4 "#626262") (black-5
"#5f5f5f") (black-6 "#3a3a3a")
@@ -36,11 +36,11 @@ Moe, moe, kyun!")
'moe-light
;; Ensure sufficient contrast on low-color terminals.
`(default ((((class color) (min-colors 4096))
- (:foreground ,black-5 :background ,LIGHT_BG))
- (((class color) (min-colors 256))
- (:foreground ,black-5 :background ,LIGHT_BG))
- (,class
- (:foreground ,black-5 :background ,LIGHT_BG))))
+ (:foreground ,black-5 :background ,LIGHT_BG))
+ (((class color) (min-colors 256))
+ (:foreground ,black-5 :background ,LIGHT_BG))
+ (,class
+ (:foreground ,black-5 :background ,LIGHT_BG))))
`(cursor ((,class (:background ,black-5))))
;; Highlighting faces
@@ -96,7 +96,7 @@ Moe, moe, kyun!")
`(org-document-info-keyword ((,class (:foreground ,orange-4 :background
,yellow-00))))
`(org-archived ((,class (:slant italic))))
`(org-checkbox ((,class (:background ,white-2 :foreground ,black-3
- :box (:line-width 1 :style
released-button)))))
+ :box (:line-width 1 :style
released-button)))))
`(org-date ((,class (:foreground ,blue-2 :underline t))))
`(org-done ((,class (:bold t :weight bold :foreground ,green-4 :background
,green-00
:box (:line-width 1 :style none)))))
@@ -380,6 +380,89 @@ 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
,yellow-00))))
+ `(magit-blame-hash ((,class (:foreground ,orange-2 :background
,yellow-00))))
+ `(magit-blame-heading ((,class (:foreground ,white-4 :background
,yellow-00))))
+ `(magit-blame-name ((,class (:foreground ,green-3 :background ,yellow-00))))
+ `(magit-blame-summary ((,class (:foreground ,black-2 :background
,yellow-00))))
+ `(magit-branch-current ((,class (:foreground ,white-0 :background ,orange-2
:bold 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-3 :background nil :bold
t))))
+ `(magit-diff-added-highlight ((,class (:foreground ,green-3 :background
,green-00 :bold t))))
+ `(magit-diff-base ((,class (:foreground ,yellow-4 :background nil))))
+ `(magit-diff-base-highlight ((,class (:foreground ,yellow-4 :background
,yellow-00))))
+ `(magit-diff-conflict-heading ((,class (:foreground ,white-0 :background
,orange-2))))
+ `(magit-diff-context ((,class (:foreground ,black-4 :background nil))))
+ `(magit-diff-context-highlight ((,class (:foreground ,black-4 :background
,white-1))))
+ `(magit-diff-file-heading ((,class (:foreground ,black-6 :background
,white-3 :bold t))))
+ `(magit-diff-file-heading-highlight ((,class (:foreground ,white-0
:background ,black-3 :bold t))))
+ `(magit-diff-file-heading-selection ((,class (:foreground ,white-0
:background ,black-4 :bold t))))
+ `(magit-diff-hunk-heading ((,class (:foreground ,black-3 :background
,white-2 :bold t))))
+ `(magit-diff-hunk-heading-highlight ((,class (:foreground ,white-0
:background ,black-3))))
+ `(magit-diff-hunk-heading-selection ((,class (:foreground ,white-1
:background ,black-4))))
+ `(magit-diff-lines-boundary ((,class (:foreground ,black-5 :background
,red-0))))
+ `(magit-diff-lines-heading ((,class (:foreground ,black-5 :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-3 :background nil :bold
t))))
+ `(magit-diff-removed-highlight ((,class (:foreground ,red-3 :background
,red-00 :bold t))))
+ `(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-dimmed ((,class (:foreground ,white-3))))
+ `(magit-filename ((,class (:foreground ,blue-3))))
+ `(magit-hash ((,class (:foreground ,orange-2 :background nil))))
+ `(magit-head ((,class (:foreground ,orange-4 :background ,orange-000))))
+ `(magit-header ((,class (:foreground ,blue-2 :background ,white-0
:underline ,blue-2))))
+ `(magit-header-line ((,class (:foreground ,orange-2))))
+ `(magit-item-highlight ((,class (:background ,yellow-00 :foreground
,black-5))))
+ `(magit-item-mark ((,class (:foreground ,white-0 :background ,magenta-2))))
+ `(magit-log-author ((,class (:foreground ,green-3 :background ,LIGHT_BG))))
+ `(magit-log-author-date-cutoff ((,class (:foreground ,red-1 :bold t))))
+ `(magit-log-date ((,class (:foreground ,black-1 :background ,LIGHT_BG))))
+ `(magit-log-graph ((,class (:foreground ,black-2 :background ,LIGHT_BG))))
+ `(magit-log-head-label-default ((,class (:foreground ,green-4 :background
,green-2 :bold t :underline t))))
+ `(magit-log-head-label-head ((,class (:foreground ,green-4 :background
,green-01 :bold t :underline t))))
+ `(magit-log-head-label-patches ((,class (:foreground ,orange-4 :background
,orange-0 :bold t :underline t))))
+ `(magit-log-head-label-tags ((,class (:foreground ,yellow-4 :background
,yellow-00 :bold t :underline t))))
+ `(magit-log-head-label-wip ((,class (:foreground ,black-2 :background
,white-2 :bold t :underline t))))
+ `(magit-log-message ((,class (:foreground ,black-5 :background nil))))
+ `(magit-popup-argument ((,class (:foreground ,)))) ;
+ `(magit-popup-disabled-argument ((,class (:foreground ,)))) ;
+ `(magit-popup-heading ((,class (:foreground ,)))) ;
+ `(magit-popup-key ((,class (:foreground ,)))) ;
+ `(magit-popup-option-value ((,class (:foreground ,)))) ;
+ `(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-0))))
+ `(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-2 :background nil,
:bold t))))
+ `(magit-section-heading-selection ((,class (:background ,blue-0))))
+ `(magit-section-highlight ((,class (:background ,white-1))))
+ `(magit-section-title ((,class (:foreground ,orange-3 :background ,LIGHT_BG
:underline ,orange-3 :bold ,t))))
+ `(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-0 :bold t
:underline t))))
`(magit-diff-add ((,class (:foreground ,green-3 :background nil :bold t))))
@@ -400,7 +483,7 @@ Moe, moe, kyun!")
`(magit-log-graph ((,class (:foreground ,black-2 :background ,LIGHT_BG))))
`(magit-log-head-label-bisect-bad ((,class (:foreground ,red-3 :background
,red-00))))
`(magit-log-head-label-bisect-good ((,class (:foreground ,green-4
:background ,green-0))))
- `(magit-log-head-label-bisect-skip ((,class (:foreground ,yellow-3
:background ,orange-00))))
+ `(magit-log-head-label-bisect-skip ((,class (:foreground ,yellow-4
:background ,orange-00))))
`(magit-log-head-label-default ((,class (:foreground ,green-4 :background
,green-2 :bold t :underline t))))
`(magit-log-head-label-head ((,class (:foreground ,green-4 :background
,green-01 :bold t :underline t))))
`(magit-log-head-label-local ((,class (:foreground ,green-4 :background
,green-00 :bold t :underline t))))
@@ -429,6 +512,7 @@ Moe, moe, kyun!")
`(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))))
+
;; git-commit-mode
`(git-commit-branch-face ((,class (:foreground ,blue-4 :background ,blue-0
:underline t))))
`(git-commit-comment-action-face ((,class (:foreground ,orange-3
:background ,LIGHT_BG :underline t))))
