[nongnu] elpa/gotham-theme c7182479af 112/214: Merge pull request #23 from drot/master

[ELPA Syncer]

branch: elpa/gotham-theme
commit c7182479afefcaa9a25b8ad94abba9bf987bc41e
Merge: ee4c1963cf 612d8bf1ba
Author: Vasilij Schneidermann <v.schneidermann@gmail.com>
Commit: Vasilij Schneidermann <v.schneidermann@gmail.com>

    Merge pull request #23 from drot/master
    
    Ivy and Diff-Hl support
---
 gotham-theme.el | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gotham-theme.el b/gotham-theme.el
index 1e14509508..f439545a13 100644
--- a/gotham-theme.el
+++ b/gotham-theme.el
@@ -413,6 +413,11 @@ depending on DISPLAY for keys which are either :foreground 
or
    (company-tooltip-mouse :foreground base7 :background base4)
    (company-tooltip-selection :foreground base7 :background base4)
 
+   ;; diff-hl
+   (diff-hl-change :background blue)
+   (diff-hl-delete :foreground red)
+   (diff-hl-insert :foreground green)
+
    ;; ecb
    (ecb-default-highlight-face :background violet)
    (ecb-method-non-semantic-face :foreground orange)
@@ -479,6 +484,19 @@ depending on DISPLAY for keys which are either :foreground 
or
    (hydra-face-pink :foreground orange :bold t)
    (hydra-face-amaranth :foreground magenta :bold t)
 
+   ;; ivy
+   (ivy-confirm-face :foreground cyan)
+   (ivy-current-match :foreground base6 :background base3)
+   (ivy-match-required :foreground red)
+   (ivy-minibuffer-match-face-1 :foreground base0 :background base4)
+   (ivy-minibuffer-match-face-2 :foreground base0 :background magenta)
+   (ivy-minibuffer-match-face-3 :foreground base0 :background green)
+   (ivy-minibuffer-match-face-4 :foreground base0 :background base5)
+   (ivy-modified-buffer :foreground yellow)
+   (ivy-remote :foreground violet)
+   (ivy-subdir :foreground red)
+   (ivy-virtual :foreground green)
+
    ;; jabber
    (jabber-activity-face :foreground green)
    (jabber-activity-personal-face :foreground cyan)
@@ -694,7 +712,7 @@ depending on DISPLAY for keys which are either :foreground 
or
    (sml/read-only :foreground yellow)
 
    ;; volatile-highlights
-   (vhl/default-face :background base2)
+   (vhl/default-face :inherit highlight)
 
    ;; web-mode
    (web-mode-block-attr-name-face :foreground green)