From e978453dbc5a05f5a32410cb376312fd24ba90af Mon Sep 17 00:00:00 2001 From: Eleanor Bartle Date: Tue, 20 Aug 2024 16:38:15 +1000 Subject: [PATCH 1/3] fix(tokyo-night): Italic comments/keywords To match variants. Ripped verbatim from #835. --- themes/doom-tokyo-night-theme.el | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/themes/doom-tokyo-night-theme.el b/themes/doom-tokyo-night-theme.el index 551ae78e..5c696f81 100644 --- a/themes/doom-tokyo-night-theme.el +++ b/themes/doom-tokyo-night-theme.el @@ -150,10 +150,12 @@ (font-lock-comment-face :foreground comments - :background (if doom-tokyo-night-comment-bg (doom-lighten bg 0.05) 'unspecified)) + :background (if doom-tokyo-night-comment-bg (doom-lighten bg 0.05) 'unspecified) + :slant 'italic) (font-lock-doc-face :inherit 'font-lock-comment-face :foreground doc-comments) + (font-lock-keyword-face :foreground keywords :slant 'italic) ;;; Doom Modeline (doom-modeline-bar :background (if -modeline-bright modeline-bg highlight)) @@ -171,6 +173,11 @@ (mode-line-buffer-id :foreground highlight) + ;;; Doom Dashboard + (doom-dashboard-banner :foreground comments :slant 'normal) + (doom-dashboard-loaded :foreground comments :slant 'normal) + (doom-dashboard-menu-title :foreground magenta :slant 'normal) + ;;; Indentation (whitespace-indentation :background bg) (whitespace-tab :background bg) @@ -271,6 +278,7 @@ ;;; web-mode (web-mode-json-context-face :foreground brown) (web-mode-json-key-face :foreground teal) + (web-mode-keyword-face :inherit 'font-lock-keyword-face) ;;;; Block (web-mode-block-delimiter-face :foreground yellow) ;;;; Code @@ -280,6 +288,8 @@ (web-mode-css-pseudo-class-face :foreground orange) (web-mode-css-property-name-face :foreground blue) (web-mode-css-selector-face :foreground teal) + (web-mode-css-selector-class-face :foreground keywords :slant 'nil) + (web-mode-css-selector-tag-face :inherit 'web-mode-css-selector-class-face) (web-mode-css-function-face :foreground yellow) ;;;; HTML (web-mode-html-attr-engine-face :foreground yellow) From 1929fcca0db2772e322d0b5bf82f93c62fe18f31 Mon Sep 17 00:00:00 2001 From: Eleanor Bartle Date: Tue, 20 Aug 2024 21:55:05 +1000 Subject: [PATCH 2/3] fix(tokyo-night): Use a valid `slant` value Co-authored-by: Foster Hangdaan <156146315+foster-hangdaan@users.noreply.github.com> --- themes/doom-tokyo-night-theme.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/doom-tokyo-night-theme.el b/themes/doom-tokyo-night-theme.el index 5c696f81..ee49ca30 100644 --- a/themes/doom-tokyo-night-theme.el +++ b/themes/doom-tokyo-night-theme.el @@ -288,7 +288,7 @@ (web-mode-css-pseudo-class-face :foreground orange) (web-mode-css-property-name-face :foreground blue) (web-mode-css-selector-face :foreground teal) - (web-mode-css-selector-class-face :foreground keywords :slant 'nil) + (web-mode-css-selector-class-face :foreground keywords :slant 'normal) (web-mode-css-selector-tag-face :inherit 'web-mode-css-selector-class-face) (web-mode-css-function-face :foreground yellow) ;;;; HTML From f8f1e75a6f96bb25da08b86afc45c6a728973de8 Mon Sep 17 00:00:00 2001 From: Eleanor Bartle Date: Fri, 30 Aug 2024 07:44:06 +1000 Subject: [PATCH 3/3] refactor: Change colour of `type` face to `teal` For Tokyo Night, in line with #835. --- themes/doom-tokyo-night-theme.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/doom-tokyo-night-theme.el b/themes/doom-tokyo-night-theme.el index ee49ca30..856330d5 100644 --- a/themes/doom-tokyo-night-theme.el +++ b/themes/doom-tokyo-night-theme.el @@ -109,7 +109,7 @@ (keywords magenta) (methods blue) (operators dark-cyan) - (type base8) + (type teal) (strings dark-green) (variables base8) (numbers orange)