Skip to content

Commit 276cd76

Browse files
committed
Update diff colors
1 parent 5261653 commit 276cd76

File tree

1 file changed

+29
-9
lines changed

1 file changed

+29
-9
lines changed

tomorrow-night-deepblue-theme.el

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@
7777
(fg-changed . "#efef80")
7878
(fg-added . "#a0e0a0")
7979
(bg-removed . "#450f1f")
80-
(bg-changed . "#363300")
81-
(bg-changed . "#363300")
80+
(bg-changed . "#335533")
81+
(bg-added . "#335533") ;; mod
82+
(bg-added-refine . "#3f6234")
83+
(bg-changed-refine . "#615f1f")
84+
(bg-removed-refine . "#7f3325")
8285
(darkblue . "#00005f")))))
8386

8487
(defmacro tomorrow-night-deepblue-theme--with-colors (mode &rest body)
@@ -97,6 +100,9 @@ night-bright."
97100
(bg-removed (cdr (assoc 'bg-removed colors)))
98101
(bg-added (cdr (assoc 'bg-added colors)))
99102
(bg-changed (cdr (assoc 'bg-changed colors)))
103+
(bg-added-refine (cdr (assoc 'bg-added-refine colors)))
104+
(bg-changed-refine (cdr (assoc 'bg-changed-refine colors)))
105+
(bg-removed-refine (cdr (assoc 'bg-removed-refine colors)))
100106
(code (cdr (assoc 'code colors)))
101107
(code2 (cdr (assoc 'code2 colors)))
102108
(hl-line (cdr (assoc 'hl-line colors)))
@@ -369,17 +375,31 @@ names to which it refers are bound."
369375
(diff-added ((,class (:background ,bg-added :foreground ,fg-added))))
370376
(diff-changed ((,class (:background ,bg-changed :foreground ,fg-changed :extend t))))
371377
(diff-removed ((,class (:background ,bg-removed :foreground ,fg-removed))))
378+
;; `(diff-indicator-added ((,c :inherit diff-added :foreground ,fg-added)))
372379
(diff-indicator-added ((,class (:inherit diff-added :foreground ,fg-added))))
380+
;; `(diff-indicator-changed ((,c :inherit diff-changed :foreground ,fg-changed)))
373381
(diff-indicator-changed ((,class (:inherit diff-changed :foreground ,fg-changed))))
382+
;; `(diff-indicator-removed ((,c :inherit diff-removed :foreground ,fg-removed)))
374383
(diff-indicator-removed ((,class (:inherit diff-removed :foreground ,fg-removed))))
384+
;; `(diff-file-header ((,c :inherit bold)))
375385
(diff-file-header ((,class (:background ,selection))))
376386
(diff-header ((,class (:background ,current-line))))
377-
(diff-hl-change ((,class (:foreground ,background :background ,blue))))
387+
(diff-hl-change ((,class (:background ,bg-changed-refine))))
388+
;; `(diff-hl-delete ((,c :background ,bg-removed-refine)))
378389
(diff-hl-delete ((,class (:foreground ,background :background ,red))))
379-
(diff-hl-insert ((,class (:foreground ,background :background ,green))))
390+
(diff-hl-insert ((,class (:background ,bg-added-refine))))
391+
;; `(diff-hunk-header ((,c :inherit bold :background ,bg-alt)))
380392
(diff-hunk-header ((,class (:background ,current-line :foreground ,purple))))
381-
(diff-refine-added ((,class (:background ,darkblue))))
382-
(diff-refine-removed ((,class (:foreground ,red))))
393+
(diff-refine-added ((,class (:background ,bg-added-refine :foreground ,fg-added))))
394+
(diff-refine-removed ((,class (:background ,bg-removed-refine :foreground ,fg-removed))))
395+
;; `(diff-hl-reverted-hunk-highlight ((,c :background ,fg-main :foreground ,bg-main)))
396+
;; `(diff-changed-unspecified ((,c :inherit diff-changed)))
397+
;; `(diff-refine-changed ((,c :background ,bg-changed-refine :foreground ,fg-changed)))
398+
;; `(diff-context (( )))
399+
;; `(diff-error ((,c :inherit error)))
400+
;; `(diff-function ((,c :background ,bg-alt)))
401+
;; `(diff-index ((,c :inherit italic)))
402+
;; `(diff-nonexistent ((,c :inherit bold)))
383403
(dired-async-failures ((,class (:inherit error))))
384404
(dired-async-message ((,class (:inherit success))))
385405
(dired-async-mode-message ((,class (:inherit warning))))
@@ -439,20 +459,20 @@ names to which it refers are bound."
439459
(e2wm:face-history-list-normal ((,class (:foreground ,foreground :background ,background))))
440460
(e2wm:face-history-list-select1 ((,class (:foreground ,aqua :background ,background))))
441461
(e2wm:face-history-list-select2 ((,class (:foreground ,yellow :background ,background))))
442-
(ediff-current-diff-Ancestor ((,class (:foreground ,aqua :background ,highlight))))
443462
(ediff-current-diff-A ((,class (:foreground ,comment :inverse-video t))))
463+
(ediff-current-diff-Ancestor ((,class (:foreground ,aqua :background ,highlight))))
444464
(ediff-current-diff-B ((,class (:foreground ,comment :inverse-video t))))
445465
(ediff-current-diff-C ((,class (:foreground ,comment :inverse-video t))))
446466
(ediff-even-diff-A ((,class (:foreground ,blue :background ,contrast-bg :extend t))))
447467
(ediff-even-diff-Ancestor ((,class (:foreground ,purple :background ,highlight))))
448468
(ediff-even-diff-B ((,class (:foreground ,blue :background ,contrast-bg :extend t))))
449469
(ediff-even-diff-C ((,class (:foreground ,blue :background ,contrast-bg :extend t))))
450-
(ediff-fine-diff-Ancestor ((,class (:foreground ,yellow :background ,highlight))))
451470
(ediff-fine-diff-A ((,class (:foreground ,background :background ,blue))))
471+
(ediff-fine-diff-Ancestor ((,class (:foreground ,yellow :background ,highlight))))
452472
(ediff-fine-diff-B ((,class (:foreground ,background :background ,blue))))
453473
(ediff-fine-diff-C ((,class (:foreground ,background :background ,blue))))
454-
(ediff-odd-diff-Ancestor ((,class (:foreground ,red :background ,highlight))))
455474
(ediff-odd-diff-A ((,class (:foreground ,comment :background ,highlight :extend t))))
475+
(ediff-odd-diff-Ancestor ((,class (:foreground ,red :background ,highlight))))
456476
(ediff-odd-diff-B ((,class (:foreground ,comment :background ,highlight :extend t))))
457477
(ediff-odd-diff-C ((,class (:foreground ,comment :background ,highlight :extend t))))
458478
(edts-face-error-line ((,class (:background unspecified :inherit flymake-errline))))

0 commit comments

Comments
 (0)