[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/spacemacs-theme 76921450e3 113/336: Fix ediff colors
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/spacemacs-theme 76921450e3 113/336: Fix ediff colors |
Date: |
Fri, 14 Jan 2022 10:59:21 -0500 (EST) |
branch: elpa/spacemacs-theme
commit 76921450e380b69cb9ee5f803ffca9e374c3bc68
Author: nashamri <designernasser@gmail.com>
Commit: nashamri <designernasser@gmail.com>
Fix ediff colors
Deleted sections are now shown in red and added sections are in green.
Thanks @nixmaniack :)
---
spacemacs-common.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index 2b621518e9..9332d14a89 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -195,18 +195,18 @@
`(dired-warning ((,class (:foreground ,war))))
;;;;; ediff
- `(ediff-current-diff-A ((,class(:background ,org-h1-bg :foreground
,inf))))
+ `(ediff-current-diff-A ((,class(:background ,red-bg :foreground ,red))))
`(ediff-current-diff-Ancestor ((,class(:background ,org-h2-bg :foreground
,str))))
- `(ediff-current-diff-B ((,class(:background ,org-h4-bg :foreground
,yellow))))
- `(ediff-current-diff-C ((,class(:background ,org-h3-bg :foreground
,green))))
+ `(ediff-current-diff-B ((,class(:background ,green-bg :foreground
,green))))
+ `(ediff-current-diff-C ((,class(:background ,org-h1-bg :foreground
,inf))))
`(ediff-even-diff-A ((,class(:background ,bg3))))
`(ediff-even-diff-Ancestor ((,class(:background ,bg3))))
`(ediff-even-diff-B ((,class(:background ,bg3))))
`(ediff-even-diff-C ((,class(:background ,bg3))))
- `(ediff-fine-diff-A ((,class(:background nil :bold t :underline t))))
- `(ediff-fine-diff-Ancestor ((,class(:background nil :bold t :underline
t))))
- `(ediff-fine-diff-B ((,class(:background nil :bold t :underline t))))
- `(ediff-fine-diff-C ((,class(:background nil :bold t :underline t))))
+ `(ediff-fine-diff-A ((,class(:background nil :bold t))))
+ `(ediff-fine-diff-Ancestor ((,class(:background nil :bold t))))
+ `(ediff-fine-diff-B ((,class(:background nil :bold t))))
+ `(ediff-fine-diff-C ((,class(:background nil :bold t))))
`(ediff-odd-diff-A ((,class(:background ,bg4))))
`(ediff-odd-diff-Ancestor ((,class(:background ,bg4))))
`(ediff-odd-diff-B ((,class(:background ,bg4))))
- [nongnu] elpa/spacemacs-theme 4857e6eb7e 335/336: Bump version to 0.2, (continued)
- [nongnu] elpa/spacemacs-theme 4857e6eb7e 335/336: Bump version to 0.2, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 71bddf98da 221/336: Merge pull request #90 from chasinglogic/emacs-26, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 860969da2a 259/336: Account for new ESS faces, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 58f167d9ae 070/336: Fix #7, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 1ca313fbbd 074/336: Merge pull request #1 from ahmadseleem/ahmadseleem-mline, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme a079fcb66a 086/336: Making rainbow mismatched parens stand out a bit, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 856ba8cc52 088/336: Fix #20 python highlighting, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 155d9e6325 106/336: Fix #26 org clocking face not visible, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 3dc15c690a 118/336: Reorder colors, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 3e6998c4bd 121/336: Refactor and change org meta line, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 76921450e3 113/336: Fix ediff colors,
ELPA Syncer <=
- [nongnu] elpa/spacemacs-theme 0d5d8ca186 122/336: Refactor ,suc, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 6fff09febb 131/336: spaceline errors, warnings and info, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme bc74e92646 130/336: Add new local var, base-dim, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme c25b356aad 136/336: Support ivy (fix #34), ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme c4a8f2f0c6 142/336: Swiper/ivy yet again, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 928e31dbc0 139/336: Tweak swiper/ivy yet again, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 38904aa6cf 140/336: search highlighting tweaks, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 71b3f8c241 137/336: Swiper/ivy support (fix #34), ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme f6aef03df6 187/336: Add additional support for elfeed., ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 12aaaf3bb6 164/336: Initial support for mu4e (#45), ELPA Syncer, 2022/01/14