[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/spacemacs-theme 0f65b5de3c 076/336: Support ediff (fix #8)
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/spacemacs-theme 0f65b5de3c 076/336: Support ediff (fix #8) |
Date: |
Fri, 14 Jan 2022 10:59:11 -0500 (EST) |
branch: elpa/spacemacs-theme
commit 0f65b5de3c8e7e7db8e77e5aa53f00102b92e7fe
Author: nashamri <designernasser@gmail.com>
Commit: nashamri <designernasser@gmail.com>
Support ediff (fix #8)
---
spacemacs-common.el | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index ba4c583d66..b251af1024 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -81,7 +81,7 @@
(active1 (if (eq variant 'dark) (if (display-graphic-p)
"#222226" "#121212") (if (display-graphic-p) "#e7e5eb" "#d7dfff")))
(active2 (if (eq variant 'dark) (if (display-graphic-p)
"#5d4d7a" "#444444") (if (display-graphic-p) "#d3d3e7" "#afafd7")))
(inactive (if (eq variant 'dark) (if (display-graphic-p)
"#5d4d7a" "#111111") (if (display-graphic-p) "#9f8fbd" "#af87d7")))
- (m-line-brdr (if (eq variant 'dark) (if (display-graphic-p)
"#5d4d7a" "#111111") (if (display-graphic-p) "#B3B9BE" "#B3B9BE")))
+ (m-line-brdr (if (eq variant 'dark) (if (display-graphic-p)
"#5d4d7a" "#111111") (if (display-graphic-p) "#b3b9be" "#b3b9be")))
(org-block-bg (if (eq variant 'dark) (if (display-graphic-p)
"#232528" "#262626") (if (display-graphic-p) "#d9e6dd" "#ffffff")))
(org-h1-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293239" "#121212") (if (display-graphic-p) "#edf1ed" "#ffffff")))
(org-h2-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293235" "#262626") (if (display-graphic-p) "#edf2e9" "#ffffff")))
@@ -170,6 +170,24 @@
`(dired-symlink ((,class (:foreground ,cyan :background ,bg1 :weight
bold))))
`(dired-warning ((,class (:foreground ,war))))
+;;;;; ediff
+ `(ediff-current-diff-A ((,class(:background ,org-h1-bg :foreground
,inf))))
+ `(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-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-odd-diff-A ((,class(:background ,bg4))))
+ `(ediff-odd-diff-Ancestor ((,class(:background ,bg4))))
+ `(ediff-odd-diff-B ((,class(:background ,bg4))))
+ `(ediff-odd-diff-C ((,class(:background ,bg4))))
+
;;;;; ein
`(ein:cell-input-area((,class (:background ,bg2))))
`(ein:cell-input-prompt ((,class (:foreground ,(if (eq variant 'dark) suc
green)))))
- [nongnu] elpa/spacemacs-theme bd0c0ee967 038/336: Customizable comments background, (continued)
- [nongnu] elpa/spacemacs-theme bd0c0ee967 038/336: Customizable comments background, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme ac5001d111 045/336: Improvements to org headings, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 00e8d8a4e8 048/336: Fixed highlighting issue with magit hunks, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme c66de5149a 050/336: Option to use varying heights of org headings, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 62ade01f71 053/336: More prep for MELPA, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme e37bca62a3 057/336: Small notes in the README, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme fd7ecbb35e 060/336: Renamed the common file contents, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 42b77f470d 067/336: Fix issue #4, thanks @travisbhartwell, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme af46476073 079/336: Support for shm (fix #13), ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 20d6c7db6a 080/336: Tweaking var face (fixes #14), ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 0f65b5de3c 076/336: Support ediff (fix #8),
ELPA Syncer <=
- [nongnu] elpa/spacemacs-theme 4ca1b82e91 077/336: Support which-key, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 294bf47e29 073/336: polish - mode-line same height active / inactive, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 8aa747a15b 078/336: Fix #12, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 8a023785f4 087/336: Support diff-hl, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme d22b0c42bb 092/336: Revamp of company tooltips, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme d9c256ab7c 089/336: linum-relative support, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme e5f95e427e 105/336: Merge pull request #24 from xuchunyang/support-which-function-mode, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 20753b88d8 112/336: Make org-agenda respect spacemacs-theme-org-height, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 2f16b73cb8 111/336: Merge pull request #28 from nixmaniack/enh_mode_face_enhancement, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme b608285378 116/336: Make org schedules and tasks more readable, ELPA Syncer, 2022/01/14