Compare commits

..

9 Commits

Author SHA1 Message Date
a7c9b66e27 Add configuration options to enable visual padding 2023-11-28 11:35:21 -05:00
60d631c9c8 Update docstring 2023-11-28 11:24:09 -05:00
9fb2b85d8c 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
2023-11-28 16:20:07 +00:00
3d984e1183 Point README at new issue tracker 2023-11-28 11:17:06 -05:00
26551fcda4 Bump version number 2023-11-15 21:58:10 -05:00
4576c6c89c Add support for eldoc-box 2023-11-15 21:57:52 -05:00
61facfb767 Improve legibility of tempel template fields 2023-11-15 21:57:30 -05:00
32b00f23ee Add foreground color for OSD/tooltip 2023-11-15 21:56:31 -05:00
Fabrizio Contigiani
b974201e00 Make outline faces colorful by default 2023-10-24 12:10:09 -03:00
2 changed files with 43 additions and 18 deletions

View File

@ -44,7 +44,7 @@ To enable custom fringe bitmaps for [flymake](https://www.emacswiki.org/emacs/Fl
## Feedback ## Feedback
If you experience any issues with this package, please 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. on the issue tracker.
Suggestions for improvements and feature requests are always appreciated, as well! Suggestions for improvements and feature requests are always appreciated, as well!

View File

@ -3,7 +3,7 @@
;; Author: Jessie Hildebrandt <jessieh.net> ;; Author: Jessie Hildebrandt <jessieh.net>
;; Homepage: https://gitlab.com/jessieh/adwaita-dark-theme ;; Homepage: https://gitlab.com/jessieh/adwaita-dark-theme
;; Keywords: mode-line faces ;; Keywords: mode-line faces
;; Version: 1.1.1 ;; Version: 1.2.0
;; Package-Requires: ((emacs "27.1")) ;; Package-Requires: ((emacs "27.1"))
;; ;;
;; This file is not part of GNU Emacs. ;; This file is not part of GNU Emacs.
@ -117,6 +117,21 @@
;; Variable definitions ;; Variable definitions
;; ---------------------------------- ;; ;; ---------------------------------- ;;
(defcustom adwaita-dark-theme-pad-mode-line nil
"When non-nil, mode line faces will be padded similarly to GTK header bars."
:group 'adwaita-dark-theme
:type 'boolean)
(defcustom adwaita-dark-theme-pad-tab-line nil
"When non-nil, `tab-line-mode' faces will be padded similarly to GTK header bars."
:group 'adwaita-dark-theme
:type 'boolean)
(defcustom adwaita-dark-theme-pad-tab-bar nil
"When non-nil, `tab-bar-mode' faces will be padded similarly to GTK header bars."
:group 'adwaita-dark-theme
:type 'boolean)
(defcustom adwaita-dark-theme-no-completions-first-difference nil (defcustom adwaita-dark-theme-no-completions-first-difference nil
"When non-nil, `completions-first-difference' will be set to an empty face." "When non-nil, `completions-first-difference' will be set to an empty face."
:group 'adwaita-dark-theme :group 'adwaita-dark-theme
@ -132,6 +147,11 @@
:group 'adwaita-dark-theme :group 'adwaita-dark-theme
:type 'boolean) :type 'boolean)
(defcustom adwaita-dark-theme-gray-outlines nil
"When non-nil, `outline-mode' faces will be alternating shades of gray."
:group 'adwaita-dark-theme
:type 'boolean)
;; -------------------------------------------------------------------------- ;; ;; -------------------------------------------------------------------------- ;;
;; ;;
;; Theme code ;; Theme code
@ -168,6 +188,7 @@
;; [True color | 256-compatible] ;; [True color | 256-compatible]
(fg (if true-color-available-p "#deddda" "gray86")) ; #dbdbdb (fg (if true-color-available-p "#deddda" "gray86")) ; #dbdbdb
(fg-alt (if true-color-available-p "#77767b" "gray47")) ; #787878 (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 (gray (if true-color-available-p "#3d3846" "gray23")) ; #3b3b3b
(red (if true-color-available-p "#ff6c6b" "indianred2")) ; #ee6363 (red (if true-color-available-p "#ff6c6b" "indianred2")) ; #ee6363
(orange (if true-color-available-p "#ffa348" "orange2")) ; #ee9a00 (orange (if true-color-available-p "#ffa348" "orange2")) ; #ee9a00
@ -203,7 +224,7 @@
`(cursor ((,class (:background ,fg)))) `(cursor ((,class (:background ,fg))))
`(shadow ((,class (:foreground ,base-5)))) `(shadow ((,class (:foreground ,base-5))))
`(minibuffer-prompt ((,class (:foreground ,base-7)))) `(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)))) `(secondary-selection ((,class (:background ,gray))))
`(fill-column-indicator ((,class (:foreground ,base-3)))) `(fill-column-indicator ((,class (:foreground ,base-3))))
`(match ((,class (:foreground ,green :weight bold)))) `(match ((,class (:foreground ,green :weight bold))))
@ -236,8 +257,8 @@
`(font-lock-regexp-grouping-construct ((,class (:foreground ,teal :weight bold)))) `(font-lock-regexp-grouping-construct ((,class (:foreground ,teal :weight bold))))
;; mode-line/header-line ;; mode-line/header-line
`(mode-line ((,class (:background ,base-3 :foreground ,fg :box (:line-width ,mode-line-padding :color ,base-3))))) `(mode-line ((,class (:background ,base-3 :foreground ,fg :box ,(when adwaita-dark-theme-pad-mode-line `(:line-width ,mode-line-padding :color ,base-3))))))
`(mode-line-inactive ((,class (:background ,bg-alt :foreground ,base-5 :box (:line-width ,mode-line-padding :color ,bg-alt))))) `(mode-line-inactive ((,class (:background ,bg-alt :foreground ,base-5 :box ,(when adwaita-dark-theme-pad-mode-line `(:line-width ,mode-line-padding :color ,bg-alt))))))
`(mode-line-emphasis ((,class (:foreground ,blue)))) `(mode-line-emphasis ((,class (:foreground ,blue))))
`(mode-line-highlight ((,class (:foreground ,fg)))) `(mode-line-highlight ((,class (:foreground ,fg))))
`(mode-line-buffer-id ((,class (:foreground ,base-8 :weight bold)))) `(mode-line-buffer-id ((,class (:foreground ,base-8 :weight bold))))
@ -437,14 +458,14 @@
`(message-cited-text ((,class (:foreground ,magenta)))) `(message-cited-text ((,class (:foreground ,magenta))))
;; outline ;; outline
`(outline-1 ((,class (:foreground ,base-6 :weight bold)))) `(outline-1 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 blue) :weight bold))))
`(outline-2 ((,class (:foreground ,base-7 :weight bold)))) `(outline-2 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-7 magenta) :weight bold))))
`(outline-3 ((,class (:foreground ,base-6 :weight bold)))) `(outline-3 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 green) :weight bold))))
`(outline-4 ((,class (:foreground ,base-5 :weight bold)))) `(outline-4 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-5 violet) :weight bold))))
`(outline-5 ((,class (:foreground ,base-6 :weight bold)))) `(outline-5 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 teal) :weight bold))))
`(outline-6 ((,class (:foreground ,base-7 :weight bold)))) `(outline-6 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-7 blue) :weight bold))))
`(outline-7 ((,class (:foreground ,base-6 :weight bold)))) `(outline-7 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-6 magenta) :weight bold))))
`(outline-8 ((,class (:foreground ,base-5 :weight bold)))) `(outline-8 ((,class (:foreground ,(if adwaita-dark-theme-gray-outlines base-5 green) :weight bold))))
;; pulse ;; pulse
`(pulse-highlight-start-face ((,class (:background ,base-5 :extend t)))) `(pulse-highlight-start-face ((,class (:background ,base-5 :extend t))))
@ -461,15 +482,15 @@
;; tab-line ;; tab-line
`(tab-line ((,class (:background ,bg-alt)))) `(tab-line ((,class (:background ,bg-alt))))
`(tab-line-tab ((,class (:background ,bg :foreground ,fg :box (:line-width ,mode-line-padding :color ,bg))))) `(tab-line-tab ((,class (:background ,bg :foreground ,fg :box ,(when adwaita-dark-theme-pad-tab-line `(:line-width ,mode-line-padding :color ,bg))))))
`(tab-line-tab-inactive ((,class (:background ,bg-alt :foreground ,fg-alt :box (:line-width ,mode-line-padding :color ,bg-alt))))) `(tab-line-tab-inactive ((,class (:background ,bg-alt :foreground ,fg-alt :box ,(when adwaita-dark-theme-pad-tab-line `(:line-width ,mode-line-padding :color ,bg-alt))))))
`(tab-line-tab-current ((,class (:inherit tab-line-tab)))) `(tab-line-tab-current ((,class (:inherit tab-line-tab))))
`(tab-line-highlight ((,class (:inherit tab-line-tab)))) `(tab-line-highlight ((,class (:inherit tab-line-tab))))
;; tab-bar ;; tab-bar
`(tab-bar ((,class (:background ,bg-alt)))) `(tab-bar ((,class (:background ,bg-alt))))
`(tab-bar-tab ((,class (:background ,bg :foreground ,fg :box (:line-width ,mode-line-padding :color ,bg))))) `(tab-bar-tab ((,class (:background ,bg :foreground ,fg :box ,(when adwaita-dark-theme-pad-tab-bar `(:line-width ,mode-line-padding :color ,bg))))))
`(tab-bar-tab-inactive ((,class (:background ,bg-alt :foreground ,fg-alt :box (:line-width ,mode-line-padding :color ,bg-alt))))) `(tab-bar-tab-inactive ((,class (:background ,bg-alt :foreground ,fg-alt :box ,(when adwaita-dark-theme-pad-tab-bar `(:line-width ,mode-line-padding :color ,bg-alt))))))
;; which-func ;; which-func
`(which-func ((,class (:inherit font-lock-function-name-face)))) `(which-func ((,class (:inherit font-lock-function-name-face))))
@ -561,6 +582,10 @@
`(diff-hl-delete ((,class (:foreground ,red)))) `(diff-hl-delete ((,class (:foreground ,red))))
`(diff-hl-insert ((,class (:foreground ,green)))) `(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-mode
`(fic-face ((,class (:foreground ,yellow :weight bold)))) `(fic-face ((,class (:foreground ,yellow :weight bold))))
@ -835,7 +860,7 @@
;; tempel ;; tempel
`(tempel-form ((,class (:foreground unspecified)))) `(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)))) `(tempel-default ((,class (:foreground unspecified :underline t))))
;; transient ;; transient