themes tweaks

5 files changed, 34 insertions, 47 deletions

diff --git a/themes/dark-ec b/themes/dark-ec
index caed4f4..0574ef8 100755
--- a/themes/dark-ec
+++ b/themes/dark-ec
@@ -1,12 +1,9 @@
 #!/bin/bash
 
-# font=${EC_TERM_FACE:-xft:Andale Mono:size=11}
-font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=iso8859-7]xft:Andale Mono:size=12}
-# font=${EC_TERM_FACE:-xft:Terminus:size=12,[codeset=iso8859-7]xft:Andale Mono:size=12}
-# font=${EC_TERM_FACE:-xft:DejaVu Sans Mono:size=11}
+font=${EC_TERM_FACE:-xft:Terminus:size=12,[codeset=iso8859-7]xft:Andale Mono:size=12}
 
 frg="grey50"
-bkg="black"
+bkg="#050505"
 bw=${EC_TERM_BORDER:-2}
 tr=${EC_TRANS_SPEC}
 
@@ -19,7 +16,7 @@ exec urxvtcd -cr tomato -sl 0 +ptab +rv +ssr -b $bw -bd "$bkg" \
              -xrm "*color8: grey20" \
              -xrm "*color1: lightgoldenrod3" \
              -xrm "*color9: sienna3" \
-             -xrm "*color2: darkslategray" \
+             -xrm "*color2: darkseagreen4" \
              -xrm "*color10: #44836e" \
              -xrm "*color3: grey40" \
              -xrm "*color11: #648f81" \
@@ -28,15 +25,7 @@ exec urxvtcd -cr tomato -sl 0 +ptab +rv +ssr -b $bw -bd "$bkg" \
              -xrm "*color5: paleturquoise4" \
              -xrm "*color13: aquamarine4" \
              -xrm "*color6: grey7" \
-             -xrm "*color14: azure4" \
+             -xrm "*color14: grey40" \
              -xrm "*color7: ${frg}" \
              -xrm "*color15: grey50" \
              -e emacsclient -t $*
-
-
-#             -xrm "*color6: #3F4D5C" \
-
-# fname=${EC_XTERM_FN:-Inconsolata}
-# fsize=${EC_XTERM_FS:-11}
-# exec xterm -cr tomato -sl 0 +rv -b 4 -bg "$bkg" -bd "$bkg" -fg "$frg" \
-#            -bdc -ulc -u8 -fa "$fname" -fs $fsize -name "emacsclient" \
diff --git a/themes/jao-dark-theme.el b/themes/jao-dark-theme.el
index 7976337..d5aea11 100644
--- a/themes/jao-dark-theme.el
+++ b/themes/jao-dark-theme.el
@@ -5,29 +5,27 @@
             (button ((c 11) nul))
             (hilite ((c nil 8)))
             (strike-through ((c 8)))
-            (italic ((c 13)))
-            (link ((c 5) ul))
-            (visited-link ((c 3) ul))
+            (italic ((c 101) nul))
+            (link ((c 2) nul))
+            (visited-link ((c 2) nul))
             (tab-sel ((c 9 8) nbf))
             (tab-unsel ((c 15 6) bx))
             (comment ((c 3)))
-;;            (keyword ((c 12) nbf))
-            (keyword ((c 11) nbf))
+            (keyword ((c 36) nbf nul))
             (type ((c 11) nbf))
-;;            (function ((c 10) nbf))
-            (function ((c 10) nbf))
+            (function ((c 10) nul nbf))
             (variable-name ((c nil)))
             (constant ((c 3)))
-            (string ((c 14)))
-            (warning ((c 1)))
+            (string ((c 2)))
+            (warning ((c 144)))
             (error ((c 9)))
             (dimm ((c 3)))
             (gnus-mail ((c 15 nil)))
             (gnus-news ((c 15 nil)))
             (outline ((c 7)))
-            (f00 ((c 5)))
-            (f01 ((c 11)))
-            (f02 ((c 10)))
+            (f00 ((c 11)))
+            (f01 ((c 10)))
+            (f02 ((c 29)))
             (f10 ((p f00)))
             (f11 ((p f01)))
             (f12 ((p f02))))
@@ -38,7 +36,7 @@
           (mode-line (c 7 8) nbf nul)
           (mode-line-inactive (c 8 6) nbf nul)
           (org-hide (c 0 nil))
-          (rcirc-other-nick (c 14))
+          (rcirc-other-nick (c 14) bf)
           (vertical-border (c 8 nil) :inherit nil)
           (w3m-image (c 1))
           (w3m-tab-background (c 0 0))
@@ -55,9 +53,9 @@
             (w3m-image (c 9))
             (w3m-tab-background (c 0 0))
             (widget-button (c nil nil) nul))
-  (:x-colors "black" "lightgoldenrod3" "darkslategray" "grey40" "lightcyan4"
-             "paleturquoise4" "#3F4D5C" "grey55"
-             "grey20" "lightgoldenrod4" "#44836e" "#648f81" "darkseagreen4"
+  (:x-colors "#050505" "lightgoldenrod3" "darkseagreen4" "grey40" "lightcyan4"
+             "paleturquoise4" "grey7" "grey60"
+             "grey20" "sienna4" "#44836e" "#648f81" "darkseagreen4"
              "aquamarine4" "azure4" "grey60"))
 
 (provide 'jao-dark-theme)
diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index 3b826b0..f7bc0c5 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -1,7 +1,7 @@
 (jao-define-custom-theme jao-light-theme
   (:palette (fg "black" "black")
             (bg "white" "#efebe7")
-            (box "color-86" "antiquewhite3")
+            (box "magenta" "antiquewhite3")
             (button ((c 13 nil) nbf nul) (bx))
             (hilite ((c nil 5)))
             (strike-through ((c 1)) (st))
@@ -11,12 +11,12 @@
             (tab-sel ((~ mode-line)))
             (tab-unsel ((~ mode-line-inactive)))
             (comment ((c 11) it)) ;; italic
-            (keyword ((c 14) nul bf))
-            (type ((c 4) nbf nul) ((c "grey30") bf))
-            (function ((c 0 nil) bf))
+            (keyword ((c 10) nul nbf) ((c 10) nul nbf))
+            (type ((c 14) nbf nul) ((c 14) nbf))
+            (function ((c 8 nil) nbf) ((c 8 nil) nbf))
             (variable-name ((c 0)))
             (constant ((c 8)) ((c "grey40")))
-            (string ((c 10)) ((c "dark olive green")))
+            (string ((c 2)) ((c "dark olive green")))
             (warning ((c 9)))
             (error ((c 1)))
             (dimm ((c 12)))
@@ -29,21 +29,21 @@
             (f10 ((p f00)))
             (f11 ((p f01)))
             (f12 ((p f02))))
-  (:faces (bold (c 80) bf)
+  (:faces (bold (c 0) bf)
           (company-tooltip-common (c 1 6) nbf)
           (company-tooltip-common-selection (~ company-tooltip-selection)
                                             (c nil 6) bf)
           (company-tooltip-selection (~ company-tooltip) bf nul)
           (compilation-info (c nil nil) bf)
           (diary (c 14) bf)
-          (gnus-summary-selected (c nil 79))
-          (jao-gnus-face-tree (c nil 78))
-          (header-line (c nil 79) nul)
+          (gnus-summary-selected (c 13 nil) nul)
+          (header-line (c nil 5) nul)
           (italic it)
           (mode-line (c 0 5) nbf nul)
           (mode-line-inactive (c 12 5) nbf nul)
           (org-hide (c 7 nil))
           (vertical-border (c 11 nil) :inherit nil)
+          (w3m-link-numbering (c 12))
           (w3m-bold (c nil nil) bf)
           (w3m-image (c 3))
           (w3m-tab-background (c 12 5)))
@@ -54,7 +54,7 @@
                                               (c nil 6) bf)
             (company-tooltip-selection (~ company-tooltip) bf nul)
             (compilation-info (c nil nil) bf)
-            (fringe (c 9 nil))
+            (fringe (c 11 nil))
             (gnus-summary-selected (c nil "white"))
             (header-line (~ mode-line-inactive) (c 14))
             (mode-line (c 0 7) :box (:line-width -1 :color "grey60"))
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 4411a40..7af22ec 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -476,6 +476,7 @@
             (magit-item-highlight (p hilite))
             (magit-item-mark (p warning))
             (magit-log-head-label (p keyword) bf)
+            (magit-log-graph bf)
             (magit-log-tag-label (p keyword))
             (match (p hilite))
             (menu nil)
diff --git a/themes/light-ec b/themes/light-ec
index bde38f9..218473e 100755
--- a/themes/light-ec
+++ b/themes/light-ec
@@ -1,18 +1,17 @@
 #!/bin/bash
 
-font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=iso8859-7]xft:Andale Mono:size=12,[codeset=japanese-jisx0208]xft:Andale Mono:size=12}
-ifont=${EC_TERM_FACE_ITALIC:-xft:Inconsolata-11:slant=italic}
-#font="xft:DejaVu Sans Mono-9"
-#ifont="xft:DejaVu Sans Mono-9:italic"
+font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=iso8859-7]xft:Andale Mono:size=12,[codeset=japanese-jisx0208]xft:Sazanami Gothic}
+# font="xft:Liberation Mono-9"
 
 frg="black"
 bkg="#EFEBE7"
 
-bw=${EC_TERM_BORDER:-2}
+bw=${EC_TERM_BORDER:-1}
 tr=${EC_TRANS_SPEC}
 
 exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \
-             -sl 0 +rv +ssr -b $bw +sbg -fn "${font}" -fi "${ifont}" \
+             -sl 0 +rv +ssr -b $bw +sbg -fn "${font}" \
+	     -tn "rxvt-256color" \
              -xrm "*colorBD: grey20" \
              -xrm "*colorUL: grey20" \
              -xrm "*color0: ${frg}" \