[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/moe-theme da3380bf1c 118/352: Diff & EDiff.
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/moe-theme da3380bf1c 118/352: Diff & EDiff. |
Date: |
Fri, 7 Jan 2022 03:59:12 -0500 (EST) |
branch: elpa/moe-theme
commit da3380bf1ca7cb5ff15a2e7e98866f7fc8e178c8
Author: kuanyui <azazabc123@gmail.com>
Commit: kuanyui <azazabc123@gmail.com>
Diff & EDiff.
---
moe-dark-theme.el | 44 +++++++++++++++++++++++++++++++++++---------
moe-light-theme.el | 44 +++++++++++++++++++++++++++++++++++---------
2 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index d6c7d6428c..a699d522ef 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -372,15 +372,41 @@ Moe, moe, kyun!")
`(grep-hit-face ((,class (:foreground ,green-2))))
`(grep-match-face ((,class (:foreground nil :background nil :inherit
match))))
- ;; Ediff faces
- `(ediff-current-diff-A ((,class (:background ,black-2))))
- `(ediff-fine-diff-A ((,class (:background ,blue-3))))
- `(ediff-even-diff-A ((,class (:background ,black-4))))
- `(ediff-odd-diff-A ((,class (:background ,black-4))))
- `(ediff-current-diff-B ((,class (:background ,black-2))))
- `(ediff-fine-diff-B ((,class (:background ,magenta-3))))
- `(ediff-even-diff-B ((,class (:background ,black-4))))
- `(ediff-odd-diff-B ((,class (:background ,black-4))))
+ ;; Diff
+ `(diff-added ((,class (:foreground ,green-0 :bold t))))
+ `(diff-changed ((,class (:foreground ,yellow-2 :bold t))))
+ `(diff-context ((,class (:foreground ,black-2-5))))
+ `(diff-file-header ((,class (:foreground ,white-0 :background ,black-3
:bold t))))
+ `(diff-function ((,class (:foreground ,black-4 :background ,white-2))))
+ `(diff-header ((,class (:foreground ,black-4 :background ,white-2))))
+ `(diff-hunk-header ((,class (:foreground ,black-4 :background ,white-2))))
+ `(diff-index ((,class (:foreground ,black-4 :background ,white-3 :bold t))))
+ `(diff-indicator-added ((,class (:foreground ,green-1 :bold t))))
+ `(diff-indicator-changed ((,class (:foreground ,yellow-2 :bold t))))
+ `(diff-indicator-removed ((,class (:foreground ,red-1 :bold t))))
+ `(diff-nonexistent ((,class (:foreground ,white-0 :background ,red-3 :bold
t ))))
+ `(diff-refine-added ((,class (:foreground ,green-2))))
+ `(diff-refine-change ((,class (:foreground ,yellow-3 :bold t))))
+ `(diff-refine-removed ((,class (:foreground ,red-2 :bold t))))
+ `(diff-removed ((,class (:foreground ,red-0 :bold t))))
+
+ ;; Ediff
+ `(ediff-current-diff-A ((,class (:background ,yellow-4))))
+ `(ediff-current-diff-Ancestor ((,class (:background ,blue-3))))
+ `(ediff-current-diff-B ((,class (:background ,green-5))))
+ `(ediff-current-diff-C ((,class (:background ,orange-3))))
+ `(ediff-even-diff-A ((,class (:background ,black-3))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,black-3))))
+ `(ediff-even-diff-B ((,class (:background ,black-3))))
+ `(ediff-even-diff-C ((,class (:background ,black-3))))
+ `(ediff-fine-diff-A ((,class (:foreground ,white-0 :background ,magenta-3
:bold t))))
+ `(ediff-fine-diff-Ancestor ((,class (:foreground ,white-0 :background
,magenta-3 :bold t))))
+ `(ediff-fine-diff-B ((,class (:foreground ,white-0 :background ,magenta-3
:bold t))))
+ `(ediff-fine-diff-C ((,class (:foreground ,white-0 :background ,magenta-3
:bold t))))
+ `(ediff-odd-diff-A ((,class (:background ,black-3))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,black-3))))
+ `(ediff-odd-diff-B ((,class (:background ,black-3))))
+ `(ediff-odd-diff-C ((,class (:background ,black-3))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 69b2d9b88f..c8deca0c36 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -372,15 +372,41 @@ Moe, moe, kyun!")
`(grep-hit-face ((,class (:foreground ,green-2))))
`(grep-match-face ((,class (:foreground nil :background nil :inherit
match))))
- ;; Ediff faces
- `(ediff-current-diff-A ((,class (:background ,magenta-1))))
- `(ediff-fine-diff-A ((,class (:background ,green-1))))
- `(ediff-even-diff-A ((,class (:background ,yellow-0))))
- `(ediff-odd-diff-A ((,class (:background ,orange-0))))
- `(ediff-current-diff-B ((,class (:background ,magenta-1))))
- `(ediff-fine-diff-B ((,class (:background ,green-1))))
- `(ediff-even-diff-B ((,class (:background ,yellow-0))))
- `(ediff-odd-diff-B ((,class (:background ,orange-0))))
+ ;; Diff
+ `(diff-added ((,class (:foreground ,green-3 :bold t))))
+ `(diff-changed ((,class (:foreground ,yellow-4 :background ,yellow-0 :bold
t))))
+ `(diff-context ((,class (:foreground ,white-4))))
+ `(diff-file-header ((,class (:foreground ,black-4 :background ,white-3
:bold t))))
+ `(diff-function ((,class (:foreground ,black-2 :background ,white-2))))
+ `(diff-header ((,class (:foreground ,black-2 :background ,white-2))))
+ `(diff-hunk-header ((,class (:foreground ,black-2 :background ,white-2))))
+ `(diff-index ((,class (:foreground ,black-4 :background ,white-3 :bold t))))
+ `(diff-indicator-added ((,class (:foreground ,green-3 :bold t))))
+ `(diff-indicator-changed ((,class (:foreground ,yellow-4 :bold t))))
+ `(diff-indicator-removed ((,class (:foreground ,red-3 :bold t))))
+ `(diff-nonexistent ((,class (:foreground ,white-0 :background ,red-3 :bold
t ))))
+ `(diff-refine-added ((,class (:foreground ,green-3))))
+ `(diff-refine-change ((,class (:foreground ,yellow-4 :background ,yellow-0
:bold t))))
+ `(diff-refine-removed ((,class (:foreground ,red-3 :bold t))))
+ `(diff-removed ((,class (:foreground ,red-3 :bold t))))
+
+ ;; Ediff
+ `(ediff-current-diff-A ((,class (:background ,yellow-0))))
+ `(ediff-current-diff-Ancestor ((,class (:background ,blue-0))))
+ `(ediff-current-diff-B ((,class (:background ,green-00))))
+ `(ediff-current-diff-C ((,class (:background ,orange-00))))
+ `(ediff-even-diff-A ((,class (:background ,white-3))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,white-3))))
+ `(ediff-even-diff-B ((,class (:background ,white-3))))
+ `(ediff-even-diff-C ((,class (:background ,white-3))))
+ `(ediff-fine-diff-A ((,class (:foreground ,white-0 :background ,magenta-2
:bold t))))
+ `(ediff-fine-diff-Ancestor ((,class (:foreground ,white-0 :background
,magenta-2 :bold t))))
+ `(ediff-fine-diff-B ((,class (:foreground ,white-0 :background ,magenta-2
:bold t))))
+ `(ediff-fine-diff-C ((,class (:foreground ,white-0 :background ,magenta-2
:bold t))))
+ `(ediff-odd-diff-A ((,class (:background ,white-3))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,white-3))))
+ `(ediff-odd-diff-B ((,class (:background ,white-3))))
+ `(ediff-odd-diff-C ((,class (:background ,white-3))))
;; smerge
`(smerge-refined-change ((,class (:background ,blue-3 :foreground
,white-0))))
- [nongnu] elpa/moe-theme d5682989fd 058/352: 1. Try again., (continued)
- [nongnu] elpa/moe-theme d5682989fd 058/352: 1. Try again., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 611053d766 060/352: 1. `fringe` and `vertical-border` changed for looks under GUI., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 2ed81ceb40 085/352: * moe-dark-theme.el: Lighter `red-2`., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 79e5a2464a 100/352: Merge remote-tracking branch 'upstream/master', ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 870ce6a117 103/352: Update faces for new Magit., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme a99afddb3e 107/352: Add support for ido-mode, ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 35106fd492 147/352: Update manuals., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme ff7692b0bf 122/352: Mode line subtle modification., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 6664bbbe98 136/352: Some new faces for latest version Magit, ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme f6a6348b67 133/352: Flycheck and Malabar, ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme da3380bf1c 118/352: Diff & EDiff.,
ELPA Syncer <=
- [nongnu] elpa/moe-theme c1e9a7f8a4 178/352: I've hesitated for a long time -- Which type-face looks better, clear, and distinguishing..., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 3388d3590c 146/352: Fix typo bug., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 799540922e 160/352: If (featurep 'powerline) is nil, don't defun powerline-moe-theme., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme ac0bff2881 151/352: Avoid unnecessary load-theme and screen flashing when changing color of, ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 76cf341926 129/352: gnus, ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme d369c07469 176/352: Improve org-document-* faces., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 1e806b04e5 119/352: Improve faces for Diff., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 60d72ee906 167/352: Merge branch 'master' of github.com:kuanyui/moe-theme.el, ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme 8d423f5aad 149/352: Correct installation guide., ELPA Syncer, 2022/01/07
- [nongnu] elpa/moe-theme ddc6c495e1 226/352: Merge pull request #39 from oppenlander/remove-cl-dependency, ELPA Syncer, 2022/01/07