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

feat: style smerge faces #176

Merged
merged 3 commits into from
Aug 13, 2024
Merged

feat: style smerge faces #176

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b4876e
feat: style smerge faces
jtbx Aug 10, 2024
95269f7
chore: centralise diff-mode faces
jtbx Aug 10, 2024
a28936f
feat: style faces for changed parts of diffs
jtbx Aug 13, 2024
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
15 changes: 13 additions & 2 deletions catppuccin-theme.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,16 @@ 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)
(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)
Expand Down Expand Up @@ -854,8 +858,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)
Expand Down Expand Up @@ -1093,6 +1095,15 @@ 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)
(smerge-base :inherit diff-refine-changed :background nil)

;; swiper
;;(swiper-line-face :inherit swiper-match-face1)
;;(swiper-line-face-1 :inherit swiper-match-face1)
Expand Down