[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/monokai-theme f4ef092 200/207: Merge pull request #95 from
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/monokai-theme f4ef092 200/207: Merge pull request #95 from sdwolfz/feature/diff-colors |
Date: |
Thu, 21 Oct 2021 18:08:01 -0400 (EDT) |
branch: elpa/monokai-theme
commit f4ef092129f4a35edaee0a9b2219c17e86309730
Merge: 1143c07 9d28eff
Author: Kelvin Smith <onekelvinsmith@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #95 from sdwolfz/feature/diff-colors
Better colors for smerge and ediff
---
monokai-theme.el | 63 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 55 insertions(+), 8 deletions(-)
diff --git a/monokai-theme.el b/monokai-theme.el
index 3337ad2..0620e67 100644
--- a/monokai-theme.el
+++ b/monokai-theme.el
@@ -193,6 +193,14 @@ Also affects 'linum-mode' background."
;; Definitions for guis that support 256 colors
(monokai-class '((class color) (min-colors 257)))
+ ;; Functionality specific colors
+ (monokai-diff-blue-base "#232438")
+ (monokai-diff-blue-emphasis "#1F204E")
+ (monokai-diff-green-base "#233E1E")
+ (monokai-diff-green-emphasis "#1F541A")
+ (monokai-diff-red-base "#3D241E")
+ (monokai-diff-red-emphasis "#53201A")
+
;; Darker and lighter accented colors
(monokai-yellow-d "#BEB244")
(monokai-yellow-l "#FFF7A8")
@@ -240,6 +248,15 @@ Also affects 'linum-mode' background."
;; Definitions for terminals that do not support 256 colors
(monokai-256-class '((class color) (min-colors 89)))
+
+ ;; Functionality specific colors
+ (monokai-256-diff-blue-base "#00005f")
+ (monokai-256-diff-blue-emphasis "#000087")
+ (monokai-256-diff-green-base "#005800")
+ (monokai-256-diff-green-emphasis "#008700")
+ (monokai-256-diff-red-base "#5f0000")
+ (monokai-256-diff-red-emphasis "#870000")
+
;; Primary colors
(monokai-256-yellow "#CDC673")
(monokai-256-orange "#FF8C00")
@@ -1646,20 +1663,28 @@ Also affects 'linum-mode' background."
;; ediff
`(ediff-fine-diff-A
- ((,monokai-class (:background ,monokai-orange-lc))
- (,monokai-256-class (:background ,monokai-256-orange-lc))))
+ ((,monokai-class (:background ,monokai-diff-red-emphasis))
+ (,monokai-256-class (:background ,monokai-256-diff-red-emphasis))))
`(ediff-fine-diff-B
- ((,monokai-class (:background ,monokai-green-lc))
- (,monokai-256-class (:background ,monokai-256-green-lc))))
+ ((,monokai-class (:background ,monokai-diff-green-emphasis))
+ (,monokai-256-class (:background ,monokai-256-diff-green-emphasis))))
`(ediff-fine-diff-C
- ((,monokai-class (:background ,monokai-yellow-lc))
- (,monokai-256-class (:background ,monokai-256-yellow-lc))))
+ ((,monokai-class (:background ,monokai-diff-blue-emphasis))
+ (,monokai-256-class (:background ,monokai-256-diff-blue-emphasis))))
+
+ `(ediff-current-diff-A
+ ((,monokai-class (:background ,monokai-diff-red-base))
+ (,monokai-256-class (:background ,monokai-256-diff-red-base))))
+
+ `(ediff-current-diff-B
+ ((,monokai-class (:background ,monokai-diff-green-base))
+ (,monokai-256-class (:background ,monokai-256-diff-green-base))))
`(ediff-current-diff-C
- ((,monokai-class (:background ,monokai-blue-lc))
- (,monokai-256-class (:background ,monokai-256-blue-lc))))
+ ((,monokai-class (:background ,monokai-diff-blue-base))
+ (,monokai-256-class (:background ,monokai-256-diff-blue-base))))
`(ediff-even-diff-A
((,monokai-class (:background ,monokai-comments
@@ -4933,6 +4958,28 @@ Also affects 'linum-mode' background."
((,monokai-class (:foreground ,monokai-red))
(,monokai-256-class (:foreground ,monokai-256-red))))
+ ;; smerge
+ `(smerge-base
+ ((,monokai-class (:background ,monokai-diff-blue-base))
+ (,monokai-256-class (:background ,monokai-256-diff-blue-base))))
+ `(smerge-upper
+ ((,monokai-class (:background ,monokai-diff-red-base))
+ (,monokai-256-class (:background ,monokai-256-diff-red-base))))
+ `(smerge-lower
+ ((,monokai-class (:background ,monokai-diff-green-base))
+ (,monokai-256-class (:background ,monokai-256-diff-green-base))))
+ ;; WARNING: defining this face will overwrite the next two when displaying a
+ ;; smerge diff in a file.
+ ;; `(smerge-refined-changed
+ ;; ((,monokai-class (:background ,monokai-diff-blue-emphasis))
+ ;; (,monokai-256-class (:background ,monokai-256-diff-blue-emphasis))))
+ `(smerge-refined-added
+ ((,monokai-class (:background ,monokai-diff-green-emphasis))
+ (,monokai-256-class (:background ,monokai-256-diff-green-emphasis))))
+ `(smerge-refined-removed
+ ((,monokai-class (:background ,monokai-diff-red-emphasis))
+ (,monokai-256-class (:background ,monokai-256-diff-red-emphasis))))
+
;; speedbar
`(speedbar-button-face
((,monokai-class (:inherit ,monokai-pitch
- [nongnu] elpa/monokai-theme 24bdf4c 138/207: Bump version, (continued)
- [nongnu] elpa/monokai-theme 24bdf4c 138/207: Bump version, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 3d6b967 146/207: Bump to version 3 after large update, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 7b42f20 141/207: Use monokai-highlight for helm-selection, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 61c0ff7 150/207: Bump version, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme ef704d3 159/207: Bump the version to 3.2.1, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 3939cb7 166/207: Merge pull request #79 from seagle0128/master, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme bd2e7d3 178/207: Makes isearch simmilar to sublime, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 2fc3148 180/207: Merge pull request #85 from sdwolf/fix/monokai-search, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme d2387fa 191/207: Merge pull request #1 from oneKelvinSmith/master, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 1143c07 198/207: Update version to 3.5.3, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme f4ef092 200/207: Merge pull request #95 from sdwolfz/feature/diff-colors,
ELPA Syncer <=
- [nongnu] elpa/monokai-theme 4281fc1 203/207: Fix bracket color in web mode (#102) (#103), ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 0e1463b 009/207: Change auto-complete popup background color to highlight background color. Change popup selection colors to orange and grey. Change popup help text color to orange. Make show-paren highlight orange for added visibility., ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme c9498c8 007/207: Correct typo and remove nil from hl-line options., ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme f470c76 018/207: fix typo in autoload, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme d5dc7f7 022/207: Add gray color scheme, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 819ff0d 027/207: Merge pull request #17 from chptx/master, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 949eb73 040/207: Face for highlighting current perspective in persp-mode., ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 86331bf 054/207: Fixes #40, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 2883242 061/207: On powerline, 'monokai-high-contrast-mode-line' support, ELPA Syncer, 2021/10/21
- [nongnu] elpa/monokai-theme 2844487 067/207: Update monokai-theme.el, ELPA Syncer, 2021/10/21