Merge branch 'main' into 'main'

Make outline faces colorful by default and add option for gray-scale

See merge request jessieh/adwaita-dark-theme!1

README.md

@@ -44,7 +44,7 @@ To enable custom fringe bitmaps for [flymake](https://www.emacswiki.org/emacs/Fl
 ## Feedback
 
 If you experience any issues with this package, please
-[open an issue](https://gitlab.com/jessieh/adwaita-dark-theme/issues/new)
+[open an issue](https://git.tty.dog/jessieh/adwaita-dark-theme/issues/new)
 on the issue tracker.
 
 Suggestions for improvements and feature requests are always appreciated, as well!

adwaita-dark-theme.el

@@ -3,7 +3,7 @@
 ;; Author: Jessie Hildebrandt <jessieh.net>
 ;; Homepage: https://gitlab.com/jessieh/adwaita-dark-theme
 ;; Keywords: mode-line faces
-;; Version: 1.1.1
+;; Version: 1.2.0
 ;; Package-Requires: ((emacs "27.1"))
 ;;
 ;; This file is not part of GNU Emacs.
@@ -132,6 +132,12 @@
   :group 'adwaita-dark-theme
   :type 'boolean)
 
+
+(defcustom adwaita-dark-theme-gray-outlines nil
+  "When non-nil, outline faces will be the same shade of gray."
+  :group 'adwaita-dark-theme
+  :type 'boolean)
+
 ;; -------------------------------------------------------------------------- ;;
 ;;
 ;; Theme code
@@ -168,6 +174,7 @@
        ;; [True color | 256-compatible]
        (fg (if true-color-available-p "#deddda" "gray86"))               ; #dbdbdb
        (fg-alt (if true-color-available-p "#77767b" "gray47"))           ; #787878
+       (fg-osd (if true-color-available-p "#f0f0f0" "gray94"))           ; #f0f0f0
        (gray (if true-color-available-p "#3d3846" "gray23"))             ; #3b3b3b
        (red (if true-color-available-p "#ff6c6b" "indianred2"))          ; #ee6363
        (orange (if true-color-available-p "#ffa348" "orange2"))          ; #ee9a00
@@ -203,7 +210,7 @@
    `(cursor ((,class (:background ,fg))))
    `(shadow ((,class (:foreground ,base-5))))
    `(minibuffer-prompt ((,class (:foreground ,base-7))))
-   `(tooltip ((,class (:background ,bg-osd :foreground ,fg))))
+   `(tooltip ((,class (:background ,bg-osd :foreground ,fg-osd))))
    `(secondary-selection ((,class (:background ,gray))))
    `(fill-column-indicator ((,class (:foreground ,base-3))))
    `(match ((,class (:foreground ,green :weight bold))))
@@ -437,14 +444,14 @@
    `(message-cited-text ((,class (:foreground ,magenta))))
 
    ;; outline
-   `(outline-1 ((,class (:foreground ,base-6 :weight bold))))
-   `(outline-2 ((,class (:foreground ,base-7 :weight bold))))
-   `(outline-3 ((,class (:foreground ,base-6 :weight bold))))
-   `(outline-4 ((,class (:foreground ,base-5 :weight bold))))
-   `(outline-5 ((,class (:foreground ,base-6 :weight bold))))
-   `(outline-6 ((,class (:foreground ,base-7 :weight bold))))
-   `(outline-7 ((,class (:foreground ,base-6 :weight bold))))
-   `(outline-8 ((,class (:foreground ,base-5 :weight bold))))
+   `(outline-1 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 blue) :weight bold))))
+   `(outline-2 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-7 magenta) :weight bold))))
+   `(outline-3 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 green) :weight bold))))
+   `(outline-4 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-5 violet) :weight bold))))
+   `(outline-5 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 teal) :weight bold))))
+   `(outline-6 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-7 blue) :weight bold))))
+   `(outline-7 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 magenta) :weight bold))))
+   `(outline-8 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-5 green) :weight bold))))
 
    ;; pulse
    `(pulse-highlight-start-face ((,class (:background ,base-5 :extend t))))
@@ -561,6 +568,10 @@
    `(diff-hl-delete ((,class (:foreground ,red))))
    `(diff-hl-insert ((,class (:foreground ,green))))
 
+   ;; eldoc-box
+   `(eldoc-box-body ((,class (:inherit (tooltip variable-pitch-text)))))
+   `(eldoc-box-border ((,class (:background ,base-3))))
+
    ;; fic-mode
    `(fic-face ((,class (:foreground ,yellow :weight bold))))
 
@@ -835,7 +846,7 @@
 
    ;; tempel
    `(tempel-form ((,class (:foreground unspecified))))
-   `(tempel-field ((,class (:foreground unspecified))))
+   `(tempel-field ((,class (:foreground unspecified :underline (:color ,base-5)))))
    `(tempel-default ((,class (:foreground unspecified :underline t))))
 
    ;; transient