themes tweaks

3 files changed, 45 insertions, 20 deletions

diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index 26bbc46..2492d1c 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -3,7 +3,8 @@
             (bg unspecified "white")
             (box "grey80" "antiquewhite3")
             (button ((c 13 nil) nbf nul) (~ mode-line-inactive))
-            (hilite ((c nil "grey90")) ((c nil "#EFEBE7"))) ;; 5
+;;            (hilite ((c nil "grey90")) ((c nil "#EFEBE7"))) ;; 5
+            (hilite ((c nil "grey90")) ((c nil "#F4F4F4"))) ;; 5
             (strike-through ((c 1)) (st))
 ;;            (italic ((c nil) it :family "DejaVu Sans Mono" :height 90))
 ;;            (italic ((c "darkslategray4")))
@@ -66,11 +67,14 @@
             (button (c "darkslategray") nbf nul)
             (gnus-button (c nil nil) nbf)
             (compilation-info (c "#223142" nil) nbf)
+            (company-scrollbar-bg (c nil "grey95"))
+            (company-scrollbar-fg (c nil "grey90"))
             (cursor (c "sienna3" "sienna3"))
             (diary (p error) nbf)
             (diff-hl-change (c "white" "lightsteelblue1"))
             (diff-hl-insert (c "white" "honeydew2"))
             (diff-hl-delete (c "white" "wheat1"))
+            (fill-column-indicator (c "grey80"))
             (fringe (c "grey70" nil))
             (gnus-summary-selected (c "#597B59") nbf)
             (gnus-summary-cancelled (c "sienna3") st)
@@ -81,12 +85,14 @@
             ;;                     :box (:line-width -1 :color "grey90"))
             ;; (mode-line (c "grey20" "grey90") :box nil)
             ;; (mode-line-inactive (c "grey40" "grey96") :box nil)
+            (magit-diff-context-highlight (c nil "cornsilk"))
+            (magit-diff-hunk-heading-highlight (c nil "cornsilk") it bf)
             (mode-line (c "grey10" "grey95") :box nil)
             (mode-line-inactive (c "grey55" "grey90") :box nil)
             (mode-line-buffer-id (c "orange4") nbf nit)
-            (spaceline-read-only (c nil "lightgoldenrod2") niv)
-            (spaceline-modified (c nil "goldenrod1") bf nit)
-            (spaceline-unmodified (c nil "lightsteelblue") niv)
+            (spaceline-read-only (c nil "white") bf)
+            (spaceline-modified (c "darkorange3" "white") bf nit)
+            (spaceline-unmodified (c "royalblue4" "white") bf)
             (org-hide (c "white" "white"))
             (vertical-border (c "grey70" nil))
             (w3m-image (c "midnightblue" "azure2"))
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 44d3eb1..bab1c07 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -410,6 +410,7 @@
             (factor-font-lock-word (~ font-lock-function-name-face))
             (ffap)
             (file-name-shadow (p dimm))
+            (fill-column-indicator (p dimm))
             (fixed-pitch :family ,jao-themes--face-family)
             (flyspell-duplicate nbf (p warning))
             (flyspell-incorrect nbf (p error))
@@ -581,10 +582,10 @@
             (ivy-highlight-face (p hilite))
             (ivy-match-required-face (p warning))
             (ivy-minibuffer-match-highlight (c nil nil) ul)
-            (ivy-minibuffer-match-face-1 (c nil "grey90"))
-            (ivy-minibuffer-match-face-2 (c nil "grey92"))
-            (ivy-minibuffer-match-face-3 (c nil "grey94"))
-            (ivy-minibuffer-match-face-4 (c nil "grey96"))
+            (ivy-minibuffer-match-face-1 (p f00) ul)
+            (ivy-minibuffer-match-face-2 (p f00) ul)
+            (ivy-minibuffer-match-face-3 (p f00) ul)
+            (ivy-minibuffer-match-face-4 (p f00) ul)
             (ivy-modified-buffer bf)
             (ivy-subdir (p f12)))
           `((jabber-activity-face dbg dfg nbf)
@@ -733,12 +734,12 @@
             (org-warning bf (p warning))
             (outline-1 bf (p outline))
             (outline-2 bf (p outline))
-            (outline-3 nbf (p outline))
-            (outline-4 nbf (p outline))
-            (outline-5 nbf (p outline))
-            (outline-6 nbf (p outline))
-            (outline-7 nbf (p outline))
-            (outline-8 nbf (p outline)))
+            (outline-3 bf (p outline))
+            (outline-4 bf (p outline))
+            (outline-5 nbf ul (p outline))
+            (outline-6 nbf ul (p outline))
+            (outline-7 nbf ul (p outline))
+            (outline-8 nbf ul (p outline)))
           `((powerline-active1 (~ mode-line))
             (powerline-active2 (~ mode-line-inactive))
             (powerline-inactive1 (~ mode-line-inactive))
@@ -774,6 +775,8 @@
             (show-paren-mismatch (p error))
             (slack-channel-button-face (~ link))
             (slack-message-mention-face (p f01))
+            (slack-message-mention-keyword-face (p f01))
+            (slack-message-mention-me-face (p error))
             (slack-message-output-header (p f00) it)
             (slack-message-output-text nil)
             (slack-new-message-marker-face (p warning))
@@ -805,6 +808,7 @@
             (tool-bar nil)
             (tooltip :family ,jao-themes--face-family (c nil "lightyellow"))
             (trailing-whitespace (p error))
+            (treemacs-root-face nul bf :scale 1.1)
             (twittering-uri-face (~ link))
             (twittering-username-face (p f01)))
           `((underline nul))
@@ -822,6 +826,10 @@
              :box (:line-width 3 :color ,jao-themes--bg) dfg dbg)
             (w3m-header-line-location-title
              :box (:line-width 3 :color ,jao-themes--bg) dfg dbg)
+            (w3m-header-line-content
+             :box (:line-width 3 :color ,jao-themes--bg) dfg dbg)
+            (w3m-header-line-title
+             :box (:line-width 3 :color ,jao-themes--bg) dfg dbg)
             (w3m-history-current-url (c nil nil) ul)
             (w3m-image (p f10))
             (w3m-image-anchor (c nil nil))
diff --git a/themes/jao-zenburn-theme.el b/themes/jao-zenburn-theme.el
index f14db14..dc57f3b 100644
--- a/themes/jao-zenburn-theme.el
+++ b/themes/jao-zenburn-theme.el
@@ -35,12 +35,12 @@
                (diredp-write-priv (c ,zenburn-yellow-2))
                (font-lock-function-name-face (c ,zenburn-yellow) nbf)
                (fringe (c nil nil))
-               (gnus-group-mail-1 (c ,zenburn-fg))
-               (gnus-group-mail-2 (c ,zenburn-fg))
-               (gnus-group-mail-3 (c ,zenburn-fg))
-               (gnus-group-mail-4 (c ,zenburn-fg))
-               (gnus-group-mail-5 (c ,zenburn-fg))
-               (gnus-group-mail-6 (c ,zenburn-fg))
+               (gnus-group-mail-1 (c ,zenburn-fg+1))
+               (gnus-group-mail-2 (c ,zenburn-fg+1))
+               (gnus-group-mail-3 (c ,zenburn-fg+1))
+               (gnus-group-mail-4 (c ,zenburn-fg+1))
+               (gnus-group-mail-5 (c ,zenburn-fg+1))
+               (gnus-group-mail-6 (c ,zenburn-fg+1))
                (gnus-group-news-1-empty (c "grey50"))
                (gnus-group-news-2-empty (c "grey50"))
                (gnus-group-news-3-empty (c "grey50"))
@@ -71,6 +71,17 @@
                (spaceline-read-only (c "black" ,zenburn-blue-3))
                (spaceline-modified (c "black" ,zenburn-blue-2))
                (spaceline-unmodified (c nil ,zenburn-green-1))
+               (slack-channel-button-face (~ link))
+               (slack-message-mention-face (p f01))
+               (slack-message-mention-keyword-face (p f01))
+               (slack-message-mention-me-face (p error))
+               (slack-message-output-header (c ,zenburn-yellow) it)
+               (slack-message-output-text nil)
+               (slack-new-message-marker-face (p warning))
+               (slack-preview-face (c ,zenburn-green))
+               (slack-search-result-message-header-face it)
+               (slack-user-profile-header-face (p f01))
+               (slack-user-profile-property-name-face bf)
                (TeX-error-description-error (c ,zenburn-red))
                (vertical-border (c ,zenburn-bg+2))
                (w3m-anchor (~ link))