misc cleanups for diffing
This commit is contained in:
parent
733e04f48b
commit
2b32dda9f9
2 changed files with 10 additions and 5 deletions
|
|
@ -84,10 +84,10 @@ M.midnight = {
|
||||||
-- Generated via: M.blend(base_color, '#121212', 0.4)
|
-- Generated via: M.blend(base_color, '#121212', 0.4)
|
||||||
-- diff_add = M.blend('#98c379', '#121212', 0.4) -- green
|
-- diff_add = M.blend('#98c379', '#121212', 0.4) -- green
|
||||||
-- diff_delete = M.blend('#ff6b6b', '#121212', 0.4) -- red
|
-- diff_delete = M.blend('#ff6b6b', '#121212', 0.4) -- red
|
||||||
-- diff_change = M.blend('#e5c07b', '#121212', 0.4) -- yellow
|
-- diff_change = M.blend('#7aa2f7', '#121212', 0.4) -- blue
|
||||||
diff_add = '#0c2f1e',
|
diff_add = '#0c2f1e',
|
||||||
diff_delete = '#291f27',
|
diff_delete = '#291f27',
|
||||||
diff_change = '#66583c',
|
diff_change = '#3a4a6d',
|
||||||
}
|
}
|
||||||
|
|
||||||
---@type Palette
|
---@type Palette
|
||||||
|
|
@ -122,7 +122,7 @@ M.daylight = {
|
||||||
-- Generated via: M.blend(base_color, '#f5f5f5', 0.4)
|
-- Generated via: M.blend(base_color, '#f5f5f5', 0.4)
|
||||||
diff_add = '#a5c5ab',
|
diff_add = '#a5c5ab',
|
||||||
diff_delete = '#e2a1b2',
|
diff_delete = '#e2a1b2',
|
||||||
diff_change = '#d0bc93',
|
diff_change = '#a9b7e5',
|
||||||
}
|
}
|
||||||
|
|
||||||
---@return Palette
|
---@return Palette
|
||||||
|
|
|
||||||
|
|
@ -148,8 +148,13 @@ function M.apply()
|
||||||
hi('@attribute.diff', { fg = cs.background })
|
hi('@attribute.diff', { fg = cs.background })
|
||||||
hi('DiffAdd', { bg = cs.diff_add, fg = cs.green }, { '@text.diff.add', 'diffAdded' })
|
hi('DiffAdd', { bg = cs.diff_add, fg = cs.green }, { '@text.diff.add', 'diffAdded' })
|
||||||
hi('DiffDelete', { bg = cs.diff_delete, fg = cs.red }, { '@text.diff.delete', 'diffRemoved' })
|
hi('DiffDelete', { bg = cs.diff_delete, fg = cs.red }, { '@text.diff.delete', 'diffRemoved' })
|
||||||
hi('DiffChange', { bg = cs.diff_change, fg = cs.yellow })
|
hi('DiffChange', { bg = cs.diff_change, fg = cs.blue })
|
||||||
hi('DiffText', { fg = cs.foreground, bg = cs.blue })
|
hi('DiffText', { bg = cs.blue, fg = cs.foreground })
|
||||||
|
|
||||||
|
hi('DiffsDiffAdd', { bg = cs.diff_add })
|
||||||
|
hi('DiffsDiffDelete', { bg = cs.diff_delete })
|
||||||
|
hi('DiffsDiffChange', { bg = cs.diff_change })
|
||||||
|
hi('DiffsDiffText', { bg = cs.blue })
|
||||||
|
|
||||||
hi('@constructor.lua', { fg = cs.background })
|
hi('@constructor.lua', { fg = cs.background })
|
||||||
hi('@markup.heading.gitcommit', { none = true })
|
hi('@markup.heading.gitcommit', { none = true })
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue