branch: elpa/monokai-theme
commit ca30989af259c2d4eec429e3e1cafb370c4f7d48
Author: Kelvin Smith <[email protected]>
Commit: Kelvin Smith <[email protected]>
Update some of the look and feel
---
monokai-theme.el | 162 +++++++++++++++++++++++++++----------------------------
1 file changed, 81 insertions(+), 81 deletions(-)
diff --git a/monokai-theme.el b/monokai-theme.el
index ca25d6b..9afff1c 100644
--- a/monokai-theme.el
+++ b/monokai-theme.el
@@ -312,10 +312,10 @@ Also affects 'linum-mode' background."
:weight bold))))
`(link-visited
- ((,class (:foreground ,blue
+ ((,class (:foreground ,violet
:underline t
:weight normal))
- (,terminal-class (:foreground ,terminal-blue
+ (,terminal-class (:foreground ,terminal-violet
:underline t
:weight normal))))
@@ -333,7 +333,7 @@ Also affects 'linum-mode' background."
`(lazy-highlight
((,class (:foreground ,monokai-bg
- :background ,yellow
+ :background ,monokai-comments
:weight normal))
(,terminal-class (:foreground ,terminal-monokai-bg
:background ,terminal-yellow
@@ -459,7 +459,7 @@ Also affects 'linum-mode' background."
`(cua-rectangle
((,class (:inherit region
- :background ,magenta
+ :background ,violet
:foreground ,monokai-bg))
(,terminal-class (:inherit region
:background ,terminal-magenta
@@ -534,15 +534,15 @@ Also affects 'linum-mode' background."
;; dropdown
`(dropdown-list-face
((,class (:background ,monokai-hl
- :foreground ,cyan))
+ :foreground ,blue))
(,terminal-class (:background ,terminal-monokai-hl
- :foreground ,terminal-cyan))))
+ :foreground ,terminal-blue))))
`(dropdown-list-selection-face
- ((,class (:background ,cyan-lc
- :foreground ,cyan-hc))
- (,terminal-class (:background ,terminal-cyan-lc
- :foreground ,terminal-cyan-hc))))
+ ((,class (:background ,green
+ :foreground ,monokai-bg))
+ (,terminal-class (:background ,terminal-green
+ :foreground ,terminal-monokai-bg))))
;; ecb
`(ecb-default-highlight-face
@@ -674,7 +674,7 @@ Also affects 'linum-mode' background."
;; faces used by isearch
`(isearch
((,class (:foreground ,monokai-bg
- :background ,magenta
+ :background ,violet
:weight normal))
(,terminal-class (:foreground ,terminal-monokai-bg
:background ,terminal-magenta
@@ -1004,21 +1004,21 @@ Also affects 'linum-mode' background."
;; auto-complete
`(ac-candidate-face
((,class (:background ,monokai-hl
- :foreground ,cyan))
+ :foreground ,blue))
(,terminal-class (:background ,terminal-monokai-hl
- :foreground ,terminal-cyan))))
+ :foreground ,terminal-blue))))
`(ac-selection-face
- ((,class (:background ,cyan-lc
- :foreground ,cyan-hc))
- (,terminal-class (:background ,terminal-cyan-lc
- :foreground ,terminal-cyan-hc))))
+ ((,class (:background ,blue
+ :foreground ,monokai-bg))
+ (,terminal-class (:background ,terminal-blue
+ :foreground ,terminal-monokai-bg))))
`(ac-candidate-mouse-face
- ((,class (:background ,cyan-hc
- :foreground ,cyan-lc))
- (,terminal-class (:background ,terminal-cyan-hc
- :foreground ,terminal-cyan-lc))))
+ ((,class (:background ,blue
+ :foreground ,monokai-bg))
+ (,terminal-class (:background ,terminal-blue
+ :foreground ,terminal-monokai-bg))))
`(ac-completion-face
((,class (:foreground ,monokai-emph
@@ -1033,10 +1033,10 @@ Also affects 'linum-mode' background."
:foreground ,terminal-blue))))
`(ac-gtags-selection-face
- ((,class (:background ,blue-lc
- :foreground ,blue-hc))
- (,terminal-class (:background ,terminal-blue-lc
- :foreground ,terminal-blue-hc))))
+ ((,class (:background ,blue
+ :foreground ,monokai-bg))
+ (,terminal-class (:background ,terminal-blue
+ :foreground ,terminal-monokai-bg))))
`(ac-yasnippet-candidate-face
((,class (:background ,monokai-hl
@@ -1045,10 +1045,10 @@ Also affects 'linum-mode' background."
:foreground ,terminal-yellow))))
`(ac-yasnippet-selection-face
- ((,class (:background ,yellow-lc
- :foreground ,yellow-hc))
- (,terminal-class (:background ,terminal-yellow-lc
- :foreground ,terminal-yellow-hc))))
+ ((,class (:background ,yellow
+ :foreground ,monokai-bg))
+ (,terminal-class (:background ,terminal-yellow
+ :foreground ,terminal-monokai-bg))))
;; auto highlight symbol
`(ahs-definition-face
@@ -1077,7 +1077,7 @@ Also affects 'linum-mode' background."
(,terminal-class (:foreground ,terminal-magenta
:background unspecified ))))
- `(ahs-plugin-defalt-face
+ `(ahs-plugin-default-face
((,class (:foreground ,magenta
:background unspecified))
(,terminal-class (:foreground ,terminal-magenta
@@ -1298,67 +1298,67 @@ Also affects 'linum-mode' background."
;; company-mode
`(company-tooltip
((,class (:background ,monokai-hl
- :foreground ,cyan))
+ :foreground ,monokai-emph))
(,terminal-class (:background ,terminal-monokai-hl
- :foreground ,terminal-cyan))))
+ :foreground ,terminal-monokai-emph))))
`(company-tooltip-selection
- ((,class (:background ,cyan-lc
- :foreground ,cyan-hc))
- (,terminal-class (:background ,terminal-cyan-lc
- :foreground ,terminal-cyan-hc))))
+ ((,class (:background ,blue
+ :foreground ,monokai-bg))
+ (,terminal-class (:background ,terminal-blue
+ :foreground ,terminal-monokai-bg))))
`(company-tooltip-mouse
- ((,class (:background ,cyan-hc
- :foreground ,cyan-lc))
- (,terminal-class (:background ,terminal-cyan-hc
- :foreground ,terminal-cyan-lc))))
+ ((,class (:background ,blue
+ :foreground ,monokai-bg))
+ (,terminal-class (:background ,terminal-blue
+ :foreground ,terminal-monokai-bg))))
`(company-tooltip-common
- ((,class (:foreground ,monokai-emph
+ ((,class (:foreground ,blue
:underline t))
- (,terminal-class (:foreground ,terminal-monokai-emph
+ (,terminal-class (:foreground ,terminal-blue
:underline t))))
`(company-tooltip-common-selection
- ((,class (:foreground ,monokai-emph
+ ((,class (:foreground ,monokai-bg
:underline t))
- (,terminal-class (:foreground ,terminal-monokai-emph
+ (,terminal-class (:foreground ,terminal-monokai-bg
:underline t))))
`(company-preview
((,class (:background ,monokai-hl
- :foreground ,cyan))
+ :foreground ,monokai-emph))
(,terminal-class (:background ,terminal-monokai-hl
- :foreground ,terminal-cyan))))
+ :foreground ,terminal-monokai-emph))))
`(company-preview-common
- ((,class (:foreground ,monokai-emph
+ ((,class (:foreground ,blue
:underline t))
- (,terminal-class (:foreground ,terminal-monokai-emph
+ (,terminal-class (:foreground ,terminal-blue
:underline t))))
`(company-scrollbar-bg
- ((,class (:background ,gray-l))
- (,terminal-class (:background ,terminal-gray-l))))
+ ((,class (:background ,monokai-hl))
+ (,terminal-class (:background ,terminal-monokai-hl))))
`(company-scrollbar-fg
- ((,class (:background ,yellow-d))
- (,terminal-class (:background ,terminal-yellow-d))))
+ ((,class (:background ,monokai-comments))
+ (,terminal-class (:background ,terminal-monokai-comments))))
;; company-mode tooltip annnotations
`(company-tooltip-annotation
((,class (:background ,monokai-hl
- :foreground ,green-l))
+ :foreground ,green))
(,terminal-class (:background ,terminal-monokai-hl
:foreground ,terminal-green))))
;; company-mode templates
`(company-template-field
((,class (:background ,monokai-hl
- :foreground ,cyan))
+ :foreground ,blue))
(,terminal-class (:background ,terminal-monokai-hl
- :foreground ,terminal-cyan))))
+ :foreground ,terminal-blue))))
;; CSCOPE
`(cscope-file-face
@@ -4097,36 +4097,36 @@ Also affects 'linum-mode' background."
;; rainbow-delimiters
`(rainbow-delimiters-depth-1-face
- ((,class (:foreground ,cyan))
- (,terminal-class (:foreground ,terminal-cyan))))
+ ((,class (:foreground ,violet))
+ (,terminal-class (:foreground ,terminal-violet))))
`(rainbow-delimiters-depth-2-face
- ((,class (:foreground ,yellow))
- (,terminal-class (:foreground ,terminal-yellow))))
-
- `(rainbow-delimiters-depth-3-face
((,class (:foreground ,blue))
(,terminal-class (:foreground ,terminal-blue))))
- `(rainbow-delimiters-depth-4-face
- ((,class (:foreground ,orange))
- (,terminal-class (:foreground ,terminal-orange))))
-
- `(rainbow-delimiters-depth-5-face
+ `(rainbow-delimiters-depth-3-face
((,class (:foreground ,green))
(,terminal-class (:foreground ,terminal-green))))
- `(rainbow-delimiters-depth-6-face
+ `(rainbow-delimiters-depth-4-face
((,class (:foreground ,yellow))
(,terminal-class (:foreground ,terminal-yellow))))
+ `(rainbow-delimiters-depth-5-face
+ ((,class (:foreground ,orange))
+ (,terminal-class (:foreground ,terminal-orange))))
+
+ `(rainbow-delimiters-depth-6-face
+ ((,class (:foreground ,red))
+ (,terminal-class (:foreground ,terminal-red))))
+
`(rainbow-delimiters-depth-7-face
- ((,class (:foreground ,blue))
- (,terminal-class (:foreground ,terminal-blue))))
+ ((,class (:foreground ,violet))
+ (,terminal-class (:foreground ,terminal-violet))))
`(rainbow-delimiters-depth-8-face
- ((,class (:foreground ,orange))
- (,terminal-class (:foreground ,terminal-orange))))
+ ((,class (:foreground ,blue))
+ (,terminal-class (:foreground ,terminal-blue))))
`(rainbow-delimiters-depth-9-face
((,class (:foreground ,green))
@@ -4137,13 +4137,13 @@ Also affects 'linum-mode' background."
(,terminal-class (:foreground ,terminal-yellow))))
`(rainbow-delimiters-depth-11-face
- ((,class (:foreground ,blue))
- (,terminal-class (:foreground ,terminal-blue))))
-
- `(rainbow-delimiters-depth-12-face
((,class (:foreground ,orange))
(,terminal-class (:foreground ,terminal-orange))))
+ `(rainbow-delimiters-depth-12-face
+ ((,class (:foreground ,red))
+ (,terminal-class (:foreground ,terminal-red))))
+
`(rainbow-delimiters-unmatched-face
((,class (:foreground ,monokai-fg
:background ,monokai-bg
@@ -4312,11 +4312,11 @@ Also affects 'linum-mode' background."
(,terminal-class (:inherit highlight))))
`(sp-show-pair-match-face
- ((,class (:foreground ,cyan
+ ((,class (:foreground ,orange
:background ,monokai-bg
:weight normal
:inverse-video t))
- (,terminal-class (:foreground ,terminal-cyan
+ (,terminal-class (:foreground ,terminal-orange
:background ,terminal-monokai-bg
:weight normal
:inverse-video t))))
@@ -4333,11 +4333,11 @@ Also affects 'linum-mode' background."
;; show-paren
`(show-paren-match
- ((,class (:foreground ,cyan
+ ((,class (:foreground ,orange
:background ,monokai-bg
:weight normal
:inverse-video t))
- (,terminal-class (:foreground ,terminal-cyan
+ (,terminal-class (:foreground ,terminal-orange
:background ,terminal-monokai-bg
:weight normal
:inverse-video t))))
@@ -4354,11 +4354,11 @@ Also affects 'linum-mode' background."
;; mic-paren
`(paren-face-match
- ((,class (:foreground ,cyan
+ ((,class (:foreground ,orange
:background ,monokai-bg
:weight normal
:inverse-video t))
- (,terminal-class (:foreground ,terminal-cyan
+ (,terminal-class (:foreground ,terminal-orange
:background ,terminal-monokai-bg
:weight normal
:inverse-video t))))
