branch: elpa/spacemacs-theme
commit 3c43532474164ff5829a7558b49173b5b565a048
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Fix issue (#79)
---
README.md | 3 ++-
spacemacs-common.el | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 5feb001d00..923f112a55 100644
--- a/README.md
+++ b/README.md
@@ -137,12 +137,13 @@ There is also explicit colors variables that can be
customized:
* red-bg-s
* blue
* blue-bg
+* blue-bg-s
* magenta
* yellow
* yellow-bg
The `green` and `red` colors have two background versions. The `green-bg` and
`red-bg` are normal light background colors.
-The `green-bg-s` and `red-bg-s` are a stronger version and are used in `ediff`
and places were text is added or deleted.
+The `green-bg-s`, `red-bg-s`, and `blue-bg-s` are a stronger version and are
used in `ediff` and places were text is added, deleted or changed.
Here are some screenshots of the various variables:
diff --git a/spacemacs-common.el b/spacemacs-common.el
index 43731edbfc..0ffbae2179 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -144,6 +144,7 @@ to 'auto, tags may not be properly aligned. "
(red-bg-s (if (eq variant 'dark) (if (true-color-p) "#512e31"
"#262626") (if (true-color-p) "#eed9d2" "#ffffff")))
(blue (if (eq variant 'dark) (if (true-color-p) "#4f97d7"
"#268bd2") (if (true-color-p) "#3a81c3" "#268bd2")))
(blue-bg (if (eq variant 'dark) (if (true-color-p) "#293239"
"#262626") (if (true-color-p) "#edf1ed" "#d7d7ff")))
+ (blue-bg-s (if (eq variant 'dark) (if (true-color-p) "#2d4252"
"#262626") (if (true-color-p) "#d1dcdf" "#d7d7ff")))
(magenta (if (eq variant 'dark) (if (true-color-p) "#a31db1"
"#af00df") (if (true-color-p) "#a31db1" "#800080")))
(yellow (if (eq variant 'dark) (if (true-color-p) "#b1951d"
"#875f00") (if (true-color-p) "#b1951d" "#875f00")))
(yellow-bg (if (eq variant 'dark) (if (true-color-p) "#32322c"
"#262626") (if (true-color-p) "#f6f1e1" "#ffffff")))
@@ -735,7 +736,7 @@ to 'auto, tags may not be properly aligned. "
`(smerge-mine ((,class (:background ,red-bg))))
`(smerge-other ((,class (:background ,green-bg))))
`(smerge-refined-added ((,class (:background ,green-bg-s :foreground
,green))))
- `(smerge-refined-changed ((,class (:background ,blue-bg :foreground
,blue))))
+ `(smerge-refined-changed ((,class (:background ,blue-bg-s :foreground
,blue))))
`(smerge-refined-removed ((,class (:background ,red-bg-s :foreground
,red))))
;;;;; spaceline
