From 1b4876e206b0abb16e5fcb7bf5059c573e53a0c9 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 10 Aug 2024 20:30:18 +1200 Subject: [PATCH 1/3] feat: style smerge faces Closes #174 --- catppuccin-theme.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/catppuccin-theme.el b/catppuccin-theme.el index a399451..0c66c61 100644 --- a/catppuccin-theme.el +++ b/catppuccin-theme.el @@ -1093,6 +1093,14 @@ or `mocha'." ;; slime (slime-repl-inputed-output-face :foreground ,ctp-mauve) + ;; smerge + (smerge-lower :inherit diff-added :background nil) + (smerge-upper :inherit diff-removed :background nil) + (smerge-refined-added :inherit diff-refine-added + :background nil) + (smerge-refined-removed :inherit diff-refine-removed + :background nil) + ;; swiper ;;(swiper-line-face :inherit swiper-match-face1) ;;(swiper-line-face-1 :inherit swiper-match-face1) From 95269f70d060c20056f6f8c878f39d361665c094 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 10 Aug 2024 20:42:43 +1200 Subject: [PATCH 2/3] chore: centralise diff-mode faces --- catppuccin-theme.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catppuccin-theme.el b/catppuccin-theme.el index 0c66c61..8298f22 100644 --- a/catppuccin-theme.el +++ b/catppuccin-theme.el @@ -409,6 +409,8 @@ or `mocha'." (diff-hl-insert :inherit fringe :foreground ,ctp-green) ;; diff-mode + (diff-header :foreground ,ctp-blue) + (diff-hunk-header :foreground ,ctp-text :background ,ctp-surface2) (diff-added :background ,(catppuccin-darken ctp-green 60)) (diff-removed :background ,(catppuccin-darken ctp-red 60)) (diff-indicator-added :foreground ,ctp-green) @@ -854,8 +856,6 @@ or `mocha'." (magit-diffstat-added :foreground ,ctp-green) (magit-diffstat-removed :foreground ,ctp-red) (magit-hash :foreground ,ctp-subtext0) - (diff-header :foreground ,ctp-blue) - (diff-hunk-header :foreground ,ctp-text :background ,ctp-surface2) (magit-diff-hunk-heading :inherit diff-hunk-header) (magit-diff-hunk-heading-highlight :inherit diff-hunk-header :weight bold) (magit-log-author :foreground ,ctp-subtext0) From a28936fdbeb193659b9a03bd188882a849b2df95 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 13 Aug 2024 17:25:33 +1200 Subject: [PATCH 3/3] feat: style faces for changed parts of diffs Not sure where these are used, never seen them in use before but it's nice to have them styled in case external packages use them. --- catppuccin-theme.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/catppuccin-theme.el b/catppuccin-theme.el index 8298f22..6729821 100644 --- a/catppuccin-theme.el +++ b/catppuccin-theme.el @@ -417,6 +417,8 @@ or `mocha'." (diff-indicator-removed :foreground ,ctp-red) (diff-refine-added :background ,(catppuccin-darken ctp-green 40)) (diff-refine-removed :background ,(catppuccin-darken ctp-red 40)) + (diff-refine-changed :background ,ctp-yellow + :foreground ,ctp-base) ;; eshell (eshell-ls-archive :foreground ,ctp-mauve) @@ -1100,6 +1102,7 @@ or `mocha'." :background nil) (smerge-refined-removed :inherit diff-refine-removed :background nil) + (smerge-base :inherit diff-refine-changed :background nil) ;; swiper ;;(swiper-line-face :inherit swiper-match-face1)