diff options
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | lib/themes/jao-light-term-theme.el | 122 | ||||
| -rw-r--r-- | lib/themes/jao-light-theme.el | 23 |
3 files changed, 131 insertions, 16 deletions
@@ -325,7 +325,7 @@ (defvar jao-theme-dark 'jao-dark) (defvar jao-theme-light 'jao-light) (defvar jao-theme-term-dark 'modus-vivendi) -(defvar jao-theme-term-light 'jao-light) +(defvar jao-theme-term-light 'jao-light-term) (defun jao-themes-setup () (let* ((dark (jao-colors-scheme-dark-p)) diff --git a/lib/themes/jao-light-term-theme.el b/lib/themes/jao-light-term-theme.el new file mode 100644 index 0000000..e3d884d --- /dev/null +++ b/lib/themes/jao-light-term-theme.el @@ -0,0 +1,122 @@ +;;; jao-light-term-theme.el --- a light theme -*- lexical-binding: t; -*- + +;; Author: jao <mail@jao.io> +;; Keywords: themes + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <https://www.gnu.org/licenses/>. + +(jao-define-custom-theme jao-light-term + (:names (bg-lightest "gray98") + (bg-light "gray95") + + (light-gray "gray80") + + (black "black") + (dark-gray "gray30") + (fg-light "gray40") + + ;; (hl "#f2f2f2") + (hl "ivory2") + (dimm "lemonchiffon4") + + (warning "orange4") + (red "burlywood4") + (blue "#023770") + (green "#005555") + (lightgreen "darkgreen") + (yellow "lightyellow")) + (:face-size 9) + (:face-family "Fira Code") + (:bold-weight 'bold) + (:palette (fg "#000000") + (bg "#ffffff") + (box "gray80") + (hilite (c nil hl)) + (link (c green) nbf nul) + (visited-link (c green)) + (tab-sel (~ mode-line)) + (tab-unsel (~ mode-line-inactive)) + (comment (c fg-light) it) + (keyword (c blue) bf) + (type (c blue) nbf) + (function (c green)) + (variable-name (c black)) + (constant (c dark-gray)) + (string (c blue) nit) + (warning (c warning)) + (error (c red) bf) + (dimm (c dimm)) + (gnus-mail (c "black")) + (gnus-news (c "black")) + (outline (c "black") bf) + (outline-1 (c green) nbf nul ex) + (outline-2 (c blue) nbf) + (outline-3 (c lightgreen)) + (outline-4 (c blue) nul nbf) + (outline-5 (c blue) nul nbf) + (f00 (c green)) + (f01 (c blue)) + (f02 (c dark-gray)) + (f10 (p f00)) + (f11 (p f01)) + (f12 (p f02))) + (:x-faces (button (c blue bg-lightest)) + (compilation-info (c "#223142" nil) nbf) + (completions-group-separator (c nil ni) (st "grey80")) + (corfu-default (~ default) (c "black" "grey95")) + (corfu-bar (c nil "grey80")) ;; moving part of the bar + (corfu-border (~ corfu-background)) ;; background of the bar + (corfu-current (c "black" "grey95") nbf nit (ul "grey70")) + (cursor (c "sienna3" "sienna3")) + (diff-hl-margin-change (c "lightcyan2" nil)) + (diff-hl-margin-insert (c "honeydew2" nil)) + (diff-hl-margin-delete (c "wheat1" nil)) + (eww-form-text (p hilite)) + (fill-column-indicator (c "grey80")) + (fringe (c "grey70" nil)) + (gnus-button (c blue)) + (gnus-cite-1 (c "darkslategray" nil)) + (gnus-cite-2 (c "slate gray" nil)) + (gnus-cite-3 (c "slate gray" nil)) + (gnus-cite-4 (c "slate gray" nil)) + (gnus-header-name (c fg-light)) + (gnus-summary-selected (c green) nbf) + (gnus-summary-cancelled (c "sienna3" nil) st) + (header-line (c dark-gray bg-lightest) + :box (:line-width 1 :color "grey90")) + (magit-diff-context-highlight (c nil hl) ex) + (magit-diff-hunk-heading-highlight (c nil hl) it bf) + (mode-line (c "grey30" bg-light) + :box (:line-width -1 :color "grey90")) + (mode-line-inactive (c "grey40" "white") + :box (:line-width -1 :color "grey90")) + (mode-line-buffer-id (~ default) (c dark-blue-2 nil) nit) + (mode-line-emphasis (c green nil)) + (mode-line-highlight (c green nil)) + (org-link (p link) (ul "grey80")) + (scroll-bar (c "grey80" nil)) + (show-paren-match (c nil "grey85")) + (shr-text (c nil nil)) + (shr-link (~ link) (ul light-gray)) + (shr-code (c blue nil)) + (success (c green)) + (vertical-border (c "grey70" nil)) + (vertico-current (c nil yellow) nul ext) + (widget-button (c blue nil) nit nul) + (widget-field (c nil bg-light) nit nul))) + +;; (enable-theme 'jao-light-term) +;; (jao-mode-line-adjust-faces) + +(provide 'jao-light-term-theme) diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el index 4eaee2c..b61d444 100644 --- a/lib/themes/jao-light-theme.el +++ b/lib/themes/jao-light-theme.el @@ -17,8 +17,7 @@ ;; along with this program. If not, see <https://www.gnu.org/licenses/>. (defvar jao-theme-light-bold - (cond ((not (display-graphic-p)) 'regular) - ((> emacs-major-version 28) 'medium) + (cond ((> emacs-major-version 28) 'medium) (t 'semibold))) (jao-define-custom-theme jao-light @@ -31,8 +30,7 @@ (dark-gray "gray30") (fg-light "gray40") - ;; (hl "#f2f2f2") - (hl "ivory") + (hl "#f2f2f2") (dimm "lemonchiffon4") (warning "orange4") @@ -51,12 +49,9 @@ (bg "white") (box "gray80") (hilite (c nil hl)) - (button (c blue bg-lightest)) - (link (c green) nbf nul) - (visited-link (c lightgreen)) - ;; (button (c fg-light bg-lightest) (ul light-gray)) - ;; (link (c green) nbf (ul light-gray)) - ;; (visited-link (ul light-gray) nbf) + (button (c fg-light bg-lightest) (ul light-gray)) + (link (c green) nbf (ul light-gray)) + (visited-link (ul light-gray) nbf) (tab-sel (~ mode-line)) (tab-unsel (~ mode-line-inactive)) (comment (c fg-light) it) @@ -73,11 +68,10 @@ (gnus-news (c "black")) (outline (c "black") bf) (outline-1 (c green) bf) - (outline-2 (c blue) nbf) - (outline-3 (c lightgreen)) + (outline-2 (c green) nbf) + (outline-3 (c blue) nul nbf) (outline-4 (c blue) nul nbf) (outline-5 (c blue) nul nbf) - (outline-minor-1 (c green hl) nbf ext) (f00 (c green)) (f01 (c blue)) (f02 (c dark-gray)) @@ -123,8 +117,7 @@ (shr-code (c blue nil)) (success (c green)) (vertical-border (c "grey70" nil)) - (vertico-current (c nil yellow) nul ext) - (widget-button (c blue) nit nul))) ;; (ul "grey80") + (widget-button (~ default) nit (ul "grey80")))) ;; (enable-theme 'jao-light) ;; (jao-mode-line-adjust-faces) |