Skip to content

Commit f788903

Browse files
committed
add smerge background color adjustments
1 parent 53fb649 commit f788903

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

starlit-theme.el

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,14 @@ Each element has the form (NAME . HEX).")
6666
("cyan" . "#30f2f1")
6767
("shadow" . "#cdc9c9")
6868
("comment" . "#969896")
69-
("greendark" . "#155903")
69+
("backgroundgreen" . "#193a26")
70+
("backgroundgreenhighlight" . "#136102")
7071
("aqua" . "#70c0b1")
7172
("greenlight" . "#4df094")
7273
("green" . "#a2cd5a")
7374
("purple" . "#b387d8")
75+
("backgroundred" . "#522621")
76+
("backgroundredhighlight" . "#7c1224")
7477
("redhighlight" . "#ee0212")
7578
("red" . "#de4e53")
7679
("softred" . "#f08080")
@@ -223,7 +226,7 @@ in the theme."
223226
`(helm-ff-file ((,colorful (:foreground ,.foreground))))
224227
`(helm-ff-file-extension ((,colorful (:foreground ,.white))))
225228
`(helm-ff-directory ((,colorful (:foreground ,.bluelight :weight bold))))
226-
`(helm-selection ((,colorful (:background ,.greendark))))
229+
`(helm-selection ((,colorful (:background ,.backgroundgreenhighlight))))
227230
`(helm-selection-line ((,colorful (:inherit highlight))))
228231
`(helm-source-header ((,colorful (:inherit helm-header :foreground ,.foreground :background ,.bluedark :weight bold :box nil :height 1.2 :extend t))))
229232
`(highlight ((,colorful (:inverse-video nil :background ,.current-line))))
@@ -336,6 +339,10 @@ in the theme."
336339
`(slime-repl-output-face ((,colorful (:foreground ,.blue :background ,.background))))
337340
`(slime-repl-prompt-face ((,colorful (:underline nil :weight bold :foreground ,.purple))))
338341
`(slime-repl-result-face ((,colorful (:foreground ,.green))))
342+
`(smerge-lower ((,colorful (:background ,.backgroundgreen))))
343+
`(smerge-refined-added ((,colorful (:background ,.backgroundgreenhighlight))))
344+
`(smerge-refined-removed ((,colorful (:background ,.backgroundredhighlight))))
345+
`(smerge-upper ((,colorful (:background ,.backgroundred))))
339346
`(sp-show-pair-match-face ((,colorful (:foreground nil :background nil :inherit show-paren-match))))
340347
`(sp-show-pair-mismatch-face ((,colorful (:foreground nil :background nil :inherit show-paren-mismatch))))
341348
`(term ((,colorful (:foreground nil :background nil :inherit default))))

0 commit comments

Comments
 (0)