Skip to content

Commit

Permalink
Merge branch 'mr-upstream-131' into develop (sonph#131)
Browse files Browse the repository at this point in the history
Fixes sonph#90

* mr-upstream-131:
  Add config for onehalflight too
  Add vim-signify settings
  Highlighting in diffs
  • Loading branch information
dwettstein committed Nov 13, 2023
2 parents 04745f7 + 2483dd1 commit 0d6afad
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
13 changes: 9 additions & 4 deletions vim/colors/onehalfdark.vim
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ call s:h("CursorLine", "", s:cursor_line, "")
call s:h("LineNr", s:gutter_fg, s:gutter_bg, "")
call s:h("CursorLineNr", s:fg, "", "")

call s:h("DiffAdd", s:green, "", "")
call s:h("DiffChange", s:yellow, "", "")
call s:h("DiffDelete", s:red, "", "")
call s:h("DiffText", s:blue, "", "")
call s:h("DiffAdd", s:black, s:green, "")
call s:h("DiffChange", s:black, s:yellow, "")
call s:h("DiffDelete", s:black, s:red, "")
call s:h("DiffText", s:black, s:blue, "")

call s:h("IncSearch", s:bg, s:yellow, "")
call s:h("Search", s:bg, s:yellow, "")
Expand Down Expand Up @@ -179,6 +179,11 @@ call s:h("GitGutterChangeDelete", s:red, s:gutter_bg, "")
" Fugitive
call s:h("diffAdded", s:green, "", "")
call s:h("diffRemoved", s:red, "", "")
" vim-signify
call s:h("SignifySignAdd", s:green, s:gutter_bg, "")
call s:h("SignifySignDelete", s:red, s:gutter_bg, "")
call s:h("SignifySignChange", s:yellow, s:gutter_bg, "")
call s:h("SignifySignChangeDelete", s:red, s:gutter_bg, "")
" }


Expand Down
13 changes: 9 additions & 4 deletions vim/colors/onehalflight.vim
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ call s:h("CursorLine", "", s:cursor_line, "")
call s:h("LineNr", s:gutter_fg, s:gutter_bg, "")
call s:h("CursorLineNr", s:fg, "", "")

call s:h("DiffAdd", s:green, "", "")
call s:h("DiffChange", s:yellow, "", "")
call s:h("DiffDelete", s:red, "", "")
call s:h("DiffText", s:blue, "", "")
call s:h("DiffAdd", s:white, s:green, "")
call s:h("DiffChange", s:white, s:yellow, "")
call s:h("DiffDelete", s:white, s:red, "")
call s:h("DiffText", s:white, s:blue, "")

call s:h("IncSearch", s:bg, s:yellow, "")
call s:h("Search", s:bg, s:yellow, "")
Expand Down Expand Up @@ -179,6 +179,11 @@ call s:h("GitGutterChangeDelete", s:red, s:gutter_bg, "")
" Fugitive
call s:h("diffAdded", s:green, "", "")
call s:h("diffRemoved", s:red, "", "")
" vim-signify
call s:h("SignifySignAdd", s:green, s:gutter_bg, "")
call s:h("SignifySignDelete", s:red, s:gutter_bg, "")
call s:h("SignifySignChange", s:yellow, s:gutter_bg, "")
call s:h("SignifySignChangeDelete", s:red, s:gutter_bg, "")
" }


Expand Down

0 comments on commit 0d6afad

Please sign in to comment.