Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates from my fork. smerge-tool, magit, notmuch #123

Closed
wants to merge 3 commits into from
Closed

Updates from my fork. smerge-tool, magit, notmuch #123

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6622453
Add smerge-tool support
AdeAttwood Nov 21, 2021
f1883d8
Add missing magit diff faces
AdeAttwood Nov 21, 2021
427b51f
Add notmuch face support
AdeAttwood Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions base16-theme.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,14 @@ return the actual color value. Otherwise return the value unchanged."
(diff-file-header :background base02)
(diff-hunk-header :foreground base0E :background base01)

;;;; smerge-tool
(smerge-lower :background base00)
(smerge-upper :background base00)
(smerge-base :background base00)
(smerge-markers :background base02 :weight bold)
(smerge-refined-added :inherit 'diff-added :inverse-video t)
(smerge-refined-removed :inherit 'diff-removed :inverse-video t)

;;;; dired
(dired-filetype-plain :foreground base05 :background base00)

Expand Down Expand Up @@ -720,6 +728,10 @@ return the actual color value. Otherwise return the value unchanged."
(magit-hunk-heading-highlight :background base03)
(magit-diff-hunk-heading :background base01)
(magit-diff-hunk-heading-highlight :background base01)
(magit-diff-added :foreground base0B)
(magit-diff-added-highlight :foreground base0B :weight bold)
(magit-diff-removed :foreground base08)
(magit-diff-removed-highlight :foreground base08 :weight bold)
(magit-item-highlight :background base01)
(magit-log-author :foreground base0D)
(magit-process-ng :foreground base08 :inherit magit-section-heading)
Expand Down Expand Up @@ -768,6 +780,35 @@ return the actual color value. Otherwise return the value unchanged."
(mmm-comment-submode-face :inherit font-lock-comment-face)
(mmm-output-submode-face :background base03)

;;;; notmuch
(notmuch-message-summary-face :foreground base04 :background nil)
(notmuch-search-count :foreground base04)
(notmuch-search-date :foreground base04)
(notmuch-search-flagged-face :foreground base08)
(notmuch-search-matching-authors :foreground base0D)
(notmuch-search-non-matching-authors :foreground base05)
(notmuch-search-subject :foreground base05)
(notmuch-search-unread-face :weight bold)
(notmuch-tag-added :foreground base0B :weight normal)
(notmuch-tag-deleted :foreground base08 :weight normal)
(notmuch-tag-face :foreground base0A :weight normal)
(notmuch-tag-flagged :foreground base0A :weight normal)
(notmuch-tag-unread :foreground base0A :weight normal)
(notmuch-tree-match-author-face :foreground base0D :weight bold)
(notmuch-tree-match-date-face :foreground base04 :weight bold)
(notmuch-tree-match-face :foreground base05)
(notmuch-tree-match-subject-face :foreground base05)
(notmuch-tree-match-tag-face :foreground base0A)
(notmuch-tree-match-tree-face :foreground base08)
(notmuch-tree-no-match-author-face :foreground base0D)
(notmuch-tree-no-match-date-face :foreground base04)
(notmuch-tree-no-match-face :foreground base04)
(notmuch-tree-no-match-subject-face :foreground base04)
(notmuch-tree-no-match-tag-face :foreground base0A)
(notmuch-tree-no-match-tree-face :foreground base0A)
(notmuch-wash-cited-text :foreground base04)
(notmuch-wash-toggle-button :foreground base04)

;;;; nxml-mode
(nxml-name-face :foreground unspecified :inherit font-lock-constant-face)
(nxml-attribute-local-name-face :foreground unspecified :inherit font-lock-variable-name-face)
Expand Down