[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/ujelly-theme 8af68aa 110/137: add smerge customizations
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/ujelly-theme 8af68aa 110/137: add smerge customizations |
Date: |
Thu, 21 Oct 2021 18:12:22 -0400 (EDT) |
branch: elpa/ujelly-theme
commit 8af68aa0b2c1360b79f7359e9605774d6d40b4bd
Author: Mark Tran <mark.tran@gmail.com>
Commit: Mark Tran <mark.tran@gmail.com>
add smerge customizations
---
ujelly-theme.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ujelly-theme.el b/ujelly-theme.el
index d659cbd..3111666 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.1.27
+;; Version: 1.1.28
;; Inspired by jellybeans:
http://www.vim.org/scripts/script.php?script_id=2555.
(deftheme ujelly "The ujelly color theme")
@@ -169,6 +169,8 @@
`(shm-current-face ((,class (:background ,ujelly-grey-4))))
`(shm-quarantine-face ((,class (:background ,ujelly-red-1))))
`(smerge-markers ((,class (:foreground ,ujelly-yellow-0 :background
,ujelly-grey-2))))
+ `(smerge-mine ((,class (:foreground ,ujelly-fg :background
,ujelly-purple-4))))
+ `(smerge-other ((,class (:foreground ,ujelly-fg :background
,ujelly-green-1))))
`(smerge-refined-change ((,class (:foreground ,ujelly-green-0))))
`(sp-pair-overlay-face ((,class (:background ,ujelly-grey-4))))
`(sp-show-pair-match-face ((,class (:background ,ujelly-grey-5))))
- [nongnu] elpa/ujelly-theme f422e7e 054/137: magit face tweaks, (continued)
- [nongnu] elpa/ujelly-theme f422e7e 054/137: magit face tweaks, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 2db6f0a 126/137: add faces, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme b9e0608 092/137: change helm ag colors, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 3778626 067/137: add company-mode customizations, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 1055417 062/137: Merge pull request #7 from asok/font-lock-regexp-grouping-faces, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 08ada3f 080/137: change magit-blame-heading foreground, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 30efb05 131/137: use background color set by terminal, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme f5facea 061/137: Add font-lock-regexp-grouping-\\(construct\\|backslash\\) faces., ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 0be4877 058/137: remove space in magit autoload comment, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 7727cb7 076/137: Merge pull request #13 from marktran/update_magit_faces, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 8af68aa 110/137: add smerge customizations,
ELPA Syncer <=
- [nongnu] elpa/ujelly-theme e640bfa 102/137: update org-level customizations, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 3f9938f 134/137: create LICENSE.md, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme b62d64b 114/137: change color of ivy-minibuffer-match-face, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 2ca923e 097/137: add helm/diredp customizations for directories, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme c9ae717 125/137: add more colors; update faces, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme d08fe8e 136/137: Merge pull request #21 from au/company-tweak, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme c975c80 082/137: add magit-diffstat face customizations, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme bf724ce 137/137: add customizations for magit-mode-line-process*, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme 7d5945f 124/137: set web-mode-constant-face, ELPA Syncer, 2021/10/21
- [nongnu] elpa/ujelly-theme c0082c1 111/137: add bm-face customization, ELPA Syncer, 2021/10/21