[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/ujelly-theme 6d8cf8b 043/137: change smerge-markers
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/ujelly-theme 6d8cf8b 043/137: change smerge-markers |
Date: |
Thu, 21 Oct 2021 18:12:07 -0400 (EDT) |
branch: elpa/ujelly-theme
commit 6d8cf8b24ffff707b866b3bef22c78d43c83b325
Author: Mark Tran <mark.tran@gmail.com>
Commit: Mark Tran <mark.tran@gmail.com>
change smerge-markers
---
ujelly-theme.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ujelly-theme.el b/ujelly-theme.el
index 24aa68b..3a62149 100644
--- a/ujelly-theme.el
+++ b/ujelly-theme.el
@@ -2,7 +2,7 @@
;; Author: Mark Tran <mark.tran@gmail.com>
;; URL: http://github.com/marktran/color-theme-ujelly
-;; Version: 1.0.27
+;; Version: 1.0.28
;; Inspired by jellybeans:
http://www.vim.org/scripts/script.php?script_id=2555.
(deftheme ujelly "The ujelly color theme")
@@ -103,7 +103,7 @@
`(org-level-2 ((,class (:foreground ,ujelly-yellow-0))))
`(org-level-3 ((,class (:foreground ,ujelly-purple-0))))
`(region ((,class (:background ,ujelly-purple-1))))
- `(smerge-markers ((,class (:foreground ,ujelly-yellow-0))))
+ `(smerge-markers ((,class (:foreground ,ujelly-yellow-0 :background
,ujelly-grey-2))))
`(smerge-refined-change ((,class (:foreground ,ujelly-green-0))))
`(trailing-whitespace ((,class (:background ,ujelly-red-1))))
`(whitespace-trailing ((,class (:background ,ujelly-red-1))))))
- [nongnu] branch elpa/ujelly-theme created (now bf724ce), ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme c7282ea 003/137: magit-log-sha1 is now , ujelly-red-2, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme c1e190d 001/137: FIRST, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 779ba3e 039/137: set weight for magit-item-highlight, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 60aaf45e 036/137: add magit face, bump version, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 6d8cf8b 043/137: change smerge-markers,
ELPA Syncer <=
- [nongnu] elpa/ujelly-theme fce125e 014/137: change magit faces, bump version, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme f90c639 042/137: change isearch/lazy-highlight colors, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 0b4084e 018/137: bump version, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 6f8ec21 030/137: add ido-virtual, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 0637a83 031/137: add helm customizations, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 79798c3 053/137: add customization for git commit headings, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 030644f 091/137: change helm-source-header, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 8c67c84 113/137: update org colors, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme cd25fdf 103/137: add customization for helm-ff-symlink, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 66fef95 059/137: add match face, ELPA Syncer, 2021/10/21