Add Magit faces (including ansi-color)

Also make code comments outline-compliant.

1 files changed, 39 insertions, 8 deletions

diff --git a/.emacs.d/eighters-theme.el b/.emacs.d/eighters-theme.el
index cca4ce3..5a8a473 100644
--- a/.emacs.d/eighters-theme.el
+++ b/.emacs.d/eighters-theme.el
@@ -52,6 +52,7 @@
     (fg-red "brown2")           (fg-red-dim "brown")        (fg-red-subtle "#ffb2b2")
     (bg-red "#560000")          (bg-red-dim "#2d0000")      (bg-red-dimmer "#1e0000")
     (fg-green "chartreuse2")    (fg-green-dim "#60ae13")    (fg-green-subtle "#d8ffb2")
+    (bg-green "#142800")        (bg-green-dim "#0a1400")    (bg-green-dimmer "#070f00")
     (fg-yellow "gold")          (fg-yellow-dim "gold3")     (fg-yellow-subtle "#fff3b2")
     (bg-yellow "#2d2600")       (bg-yellow-dim "#141100")   (bg-yellow-dimmer "#0f0c00")
     (fg-blue "steelblue1")                                  (fg-blue-subtle "#b2dcff")
@@ -59,7 +60,7 @@
     (fg-magenta "violet")       (fg-magenta-dim "#e64be6")  (fg-magenta-subtle "#ffb2ff")
     (bg-magenta "#470047")      (bg-magenta-dim "#280028")  (bg-magenta-dimmer "#190019")
     (fg-cyan "cadetblue2")                                  (fg-cyan-subtle "#b2f7ff")
-    (bg-cyan "#063237")
+    (bg-cyan "#00292d")         (bg-cyan-dim "#001719")     (bg-cyan-dimmer "#000d0f")
     (fg "#fff") (fg-dim "#bbb") (fg-dimmer "#888")))
 
 (defun eighters-show-palette ()
@@ -70,6 +71,8 @@
 
 (defface eighters-button nil
   "Face for elements that can be \"pushed\" with RET.")
+(defface eighters-markup nil
+  "Face for text that describes \"structure\" rather than content.")
 (defface eighters-title-1 nil
   "Face for level 1 headings.")
 (defface eighters-title-2 nil
@@ -91,8 +94,9 @@
 (eighters-with-palette
  (custom-theme-set-faces
   'eighters
-  ;; Theme faces.
+;;; Theme faces.
   `(eighters-button ((t (:background ,bg-hl-dimmer :box (:color ,bg-hl :style released-button) :inherit eighters-ui))))
+  `(eighters-markup ((t (:foreground ,fg-dim))))
   `(eighters-title-1 ((t (:foreground ,fg-cyan-subtle :weight bold :height 1.40 :inherit variable-pitch))))
   `(eighters-title-2 ((t (:foreground ,fg-green-subtle :weight bold :height 1.24 :inherit variable-pitch))))
   `(eighters-title-3 ((t (:foreground ,fg-yellow-subtle :weight bold :height 1.18 :inherit variable-pitch))))
@@ -100,7 +104,23 @@
   `(eighters-title-5 ((t (:foreground ,fg-magenta-subtle :weight bold :inherit variable-pitch))))
   `(eighters-title-6 ((t (:foreground ,fg-blue-subtle :slant italic :inherit variable-pitch))))
   `(eighters-ui ((t (:inherit variable-pitch))))
-  ;; Standard faces.
+;;; Standard faces.
+  `(ansi-color-black ((t (:foreground ,bg :background ,bg))))
+  `(ansi-color-red ((t (:foreground ,fg-red :background ,bg-red-dim))))
+  `(ansi-color-green ((t (:foreground ,fg-green :background ,bg-green-dim))))
+  `(ansi-color-yellow ((t (:foreground ,fg-yellow :background ,bg-yellow-dim))))
+  `(ansi-color-blue ((t (:foreground ,fg-blue :background ,bg-blue-dim))))
+  `(ansi-color-magenta ((t (:foreground ,fg-magenta :background ,bg-magenta-dim))))
+  `(ansi-color-cyan ((t (:foreground ,fg-cyan :background ,bg-cyan-dim))))
+  `(ansi-color-white ((t (:foreground ,fg-dim :background ,fg-dim))))
+  `(ansi-color-bright-black ((t (:foreground ,bg-hl :background ,bg-hl))))
+  `(ansi-color-bright-red ((t (:foreground ,fg-red-subtle :background ,bg-red))))
+  `(ansi-color-bright-green ((t (:foreground ,fg-green-subtle :background ,bg-green))))
+  `(ansi-color-bright-yellow ((t (:foreground ,fg-yellow-subtle :background ,bg-yellow))))
+  `(ansi-color-bright-blue ((t (:foreground ,fg-blue-subtle :background ,bg-blue))))
+  `(ansi-color-bright-magenta ((t (:foreground ,fg-magenta-subtle :background ,bg-magenta))))
+  `(ansi-color-bright-cyan ((t (:foreground ,fg-cyan-subtle :background ,bg-cyan))))
+  `(ansi-color-bright-white ((t (:foreground ,fg :background ,fg))))
   `(button ((t (:inherit eighters-button))))
   `(completions-common-part ((t (:foreground ,fg-dimmer))))
   `(custom-button ((t (:inherit eighters-button))))
@@ -168,7 +188,7 @@
   `(vertical-border ((t (:foreground ,bg-hl))))
   `(warning ((t (:foreground ,fg-yellow :weight bold))))
   `(widget-field ((t (:background ,bg-hl-dim))))
-  ;;; diff faces.
+;;;; diff faces.
   `(diff-header ((t (:background ,bg-hl-dimmer :foreground ,fg-dim))))
   `(diff-file-header ((t (:background ,bg-hl-dimmer :foreground ,fg :weight bold))))
   `(diff-hunk-header ((t (:background ,bg-hl-dim :foreground ,fg-dim))))
@@ -199,14 +219,25 @@
   `(ediff-fine-diff-B ((t (:inherit diff-refine-added))))
   `(ediff-fine-diff-C ((t (:inherit diff-refine-changed))))
   `(ediff-fine-diff-Ancestor ((t (:background ,bg-magenta))))
-  ;; Third-party faces.
+;;; Third-party faces.
   `(diff-hl-delete ((t (:foreground ,fg-red :background ,bg-red))))
   `(diff-hl-insert ((t (:foreground ,fg-blue :background ,bg-blue))))
   `(diff-hl-change ((t (:foreground ,fg-yellow :background ,bg-yellow))))
   `(which-key-group-description-face ((t (:foreground ,fg-green-dim))))
   `(which-key-key-face ((t :weight bold :inherit help-key-binding)))
-  ;;; Magit.
-  ;;;; Section backgrounds.
+;;;; Magit.
+  `(magit-blame-highlight ((t (:foreground ,fg-dim :background ,bg-yellow-dimmer))))
+  `(magit-branch-current ((t (:inverse-video t :inherit magit-branch-local))))
+  `(magit-branch-local ((t (:foreground ,fg-blue))))
+  `(magit-branch-remote ((t (:foreground ,fg-green-dim))))
+  `(magit-branch-remote-head ((t (:inverse-video t :inherit magit-branch-remote))))
+  `(magit-hash ((t (:inherit shadow))))
+  `(magit-log-author ((t (:foreground ,fg-red-dim))))
+  `(magit-log-graph ((t (:inherit eighters-markup))))
+  ;; FIXME: Teach magit-section overlays to de-prioritize their
+  ;; :background so that tags can have one.
+  `(magit-tag ((t (:foreground ,fg-yellow))))
+;;;;; Section backgrounds.
   `(magit-section-highlight ((t :background ,bg-hl-dimmer)))
   `(magit-diff-revision-summary ((t (:inherit (magit-diff-hunk-heading eighters-title-1)))))
   `(magit-section-heading ((t (:inherit eighters-title-2))))
@@ -215,7 +246,7 @@
   `(magit-diff-context-highlight ((t (:background ,bg-hl-dimmer :inherit magit-diff-context))))
   `(magit-diff-hunk-heading ((t (:background ,bg-hl-dim))))
   `(magit-diff-hunk-heading-highlight ((t (:background ,bg-hl))))
-  ;;;; Diffs.
+;;;;; Diffs.
   `(magit-diff-removed ((t (:foreground ,fg-dim :inherit diff-removed))))
   `(magit-diff-removed-highlight ((t (:background ,bg-red-dim))))
   `(magit-diffstat-removed ((t (:foreground ,fg-red))))