diff options
| author | David Robillard <d@drobilla.net> | 2019-01-12 22:56:14 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-01-12 22:56:14 +0100 |
| commit | e0e80c63412e380fae67f858e562230b71f51747 (patch) | |
| tree | 12e850b0756bf0d56591834faae9fce504d22961 /emacs | |
| parent | b1597d1d04111259b2deed336826ff1a85a51328 (diff) | |
| download | dotfiles-e0e80c63412e380fae67f858e562230b71f51747.tar.gz dotfiles-e0e80c63412e380fae67f858e562230b71f51747.tar.bz2 dotfiles-e0e80c63412e380fae67f858e562230b71f51747.zip | |
Add missing merge colours to theme
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/drobillized-theme.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/emacs/.emacs.d/drobillized-theme.el b/emacs/.emacs.d/drobillized-theme.el index 1a5b240..d0add9e 100644 --- a/emacs/.emacs.d/drobillized-theme.el +++ b/emacs/.emacs.d/drobillized-theme.el @@ -217,6 +217,10 @@ Reload the theme after changing anything in this group." `(secondary-selection ((t (:background "#344E00")))) `(smerge-refined-change ((t (:background "grey20"))) t) `(smerge-refined-changed ((t (:background "grey20")))) + `(smerge-base ((t (:foreground ,green-d))) t) + `(smerge-lower ((t (:foreground ,orange-d))) t) + `(smerge-markers ((t (:inherit diff-header :background "grey20")))) + `(smerge-upper ((t (:foreground ,red-d))) t) `(spaceline-highlight-face ((t (:background "#272A2A" :foreground "#FFFFFF" :inherit (quote mode-line))))) `(spaceline-modified ((t (:background "#A66" :foreground "#3E3D31" :inherit (quote mode-line))))) `(spaceline-unmodified ((t (:background "#777" :foreground "#3E3D31" :inherit (quote mode-line))))) |