From a2be53bb14bfebac4ceab5ba05d5e68c67256e86 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 3 Jun 2022 21:49:39 +0100
Subject: themes tweaks with an eye on terminal

---
 lib/themes/jao-light-theme.el | 20 ++++++++++++--------
 lib/themes/jao-themes.el      |  7 +++++--
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index caf43d9..af50ea7 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -16,7 +16,10 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-(defvar jao-theme-light-bold (if (> emacs-major-version 28) 'medium 'semibold))
+(defvar jao-theme-light-bold
+  (cond ((not (display-graphic-p)) 'regular)
+        ((> emacs-major-version 28) 'medium)
+        (t 'semibold)))
 
 (jao-define-custom-theme jao-light
   (:names (bg-lightest "gray98")
@@ -31,16 +34,15 @@
           (hl "#f2f2f2")
           (dimm "lemonchiffon4")
 
-          (search   "#e8e800")
-          (search2  "#ffffb4")
-
           (warning "orange4")
           (red "burlywood4")
           (blue "#023770")
-          (green "#005555"))
+          (green "#005555")
+          (yellow "lightyellow"))
   (:face-size 9)
+  (:face-family "Fira Code")
   ;; (:face-family "Hack")
-  (:face-family "DejaVu Sans Mono")
+  ;; (:face-family "DejaVu Sans Mono")
   ;; (:face-family "Iosevka Comfy Fixed")
   (:bold-weight jao-theme-light-bold)
   (:palette (fg "black")
@@ -48,7 +50,8 @@
             (box "gray80")
             (button (c fg-light bg-lightest) (ul light-gray))
             (hilite (c nil hl))
-            (link (c green) nbf (ul light-gray))
+            ;; (link (c green) nbf (ul light-gray))
+            (link (c green) nbf nul)
             (visited-link (ul light-gray) nbf)
             (tab-sel (~ mode-line))
             (tab-unsel (~ mode-line-inactive))
@@ -115,7 +118,8 @@
             (shr-code (c blue nil))
             (success (c green))
             (vertical-border (c "grey70" nil))
-            (widget-button (~ default) nit (ul "grey80"))))
+            (vertico-current (c nil yellow) nul ext)
+            (widget-button (c blue) nit nul))) ;; (ul "grey80")
 
 ;; (enable-theme 'jao-light)
 ;; (jao-mode-line-adjust-faces)
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index 2c182f6..87cb93d 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -191,6 +191,8 @@
                            (nth clr jao-themes--default-cidxs)
                            (format "color-%s" clr)))
         ((and (symbolp clr) (cadr (assoc clr *jao-themes--color-names*))))
+        ((equal clr 'dfg) jao-themes--fg)
+        ((equal clr 'dbg) jao-themes--bg)
         (t 'unspecified)))
 
 (defun jao-themes--parse-face-sym (s)
@@ -300,7 +302,8 @@
             (jao-themes-f10 (p f10))
             (jao-themes-f11 (p f11))
             (jao-themes-f12 (p f12)))
-          `((ansi-color-bright-blue (c "steelblue3" "steelblue3"))
+          `((ansi-color-bold bf)
+            (ansi-color-bright-blue (c "steelblue3" "steelblue3"))
             (ansi-color-bright-cyan (c "cyan3" "cyan3"))
             (ansi-color-bright-green (c "darkseagreen3" "darkseagreen3"))
             (ansi-color-bright-magenta (c "lightpink4" "lightpink4"))
@@ -940,7 +943,7 @@
             (org-ellipsis (p dimm))
             (org-formula (p f02))
             (org-headline-done (p dimm))
-            (org-hide (c dbg dfg))
+            (org-hide (c dbg nil))
             (org-latex-and-export-specials (~ default))
             (org-level-1 (~ outline-1))
             (org-level-2 (~ outline-2))
-- 
cgit v1.2.3