jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed zenburn-theme

Browse source
This commit is contained in:
Bozhidar Batsov 2011-11-08 16:43:30 +02:00
parent f110d4c79e
commit 311b0ec6bb
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
themes/zenburn-theme.el
View file

@ -136,13 +136,9 @@
:box (:line-width -1 :style released-button))))) :box (:line-width -1 :style released-button)))))
`(mode-line-buffer-id ((,class (:foreground ,zenburn-yellow :weight bold)))) `(mode-line-buffer-id ((,class (:foreground ,zenburn-yellow :weight bold))))
`(mode-line-inactive `(mode-line-inactive
<<<<<<< HEAD
((,class (:foreground ,zenburn-green-1 ((,class (:foreground ,zenburn-green-1
:background ,zenburn-bg-1 :background ,zenburn-bg-05
:box (:line-width -1 :style released-button))))) :box (:line-width -1 :style released-button)))))
=======
((,class (:foreground ,zenburn-green-1 :background ,zenburn-bg-05))))
>>>>>>> b1ccc0ac7975473c30e8555c550733e0b192a0ae
`(region ((,class (:background ,zenburn-bg-1)))) `(region ((,class (:background ,zenburn-bg-1))))
`(secondary-selection ((,class (:background ,zenburn-bg+2)))) `(secondary-selection ((,class (:background ,zenburn-bg+2))))
`(trailing-whitespace ((,class (:background ,zenburn-red)))) `(trailing-whitespace ((,class (:background ,zenburn-red))))