.vim, git: change colors

Change git colors to be closer to default.
Change vim diff colors to be closer to git.

diff --git a/.vim/colors/phd.vim b/.vim/colors/phd.vim
index e4d086cc90bb074a3682fe805552e6beda5a3325..bc92411e300af34b2c37c61281bc14afdc002b56 100644 (file)
--- a/.vim/colors/phd.vim
+++ b/.vim/colors/phd.vim
@@ -40,6 +40,13 @@ if &background == 'light'
    highlight Type ctermfg=black guifg=black
    highlight pythonExceptions ctermfg=darkred guifg=darkred
 
+   if &diff
+      highlight DiffAdd ctermfg=green ctermbg=grey guifg=green guibg=grey90
+      highlight DiffChange ctermfg=black ctermbg=grey guifg=black guibg=grey90
+      highlight DiffDelete ctermfg=red ctermbg=grey guifg=red guibg=grey90
+      highlight DiffText ctermfg=white ctermbg=magenta guifg=white guibg=magenta
+   endif
+
    if &filetype == 'mail'
       highlight Statement cterm=none ctermfg=black gui=none guifg=black
       highlight Type ctermfg=blue guifg=blue
@@ -64,6 +71,13 @@ else
    highlight Type ctermfg=white guifg=white
    highlight pythonExceptions ctermfg=red guifg=red
 
+   if &diff
+      highlight DiffAdd ctermfg=green ctermbg=black guifg=green guibg=black
+      highlight DiffChange ctermfg=white ctermbg=black guifg=black guibg=black
+      highlight DiffDelete ctermfg=red ctermbg=black guifg=red guibg=black
+      highlight DiffText ctermfg=white ctermbg=magenta guifg=white guibg=magenta
+   endif
+
    if &filetype == 'mail'
       highlight Statement cterm=none ctermfg=white gui=none guifg=white
       highlight Type cterm=bold gui=bold

diff --git a/lib/config/git/dark_bg b/lib/config/git/dark_bg
index 12c9f7ce5af1aaa6bbf7375044532b520003a28f..6c6e25bfce6ccc5cf1dc96379e163103df7ff3ae 100644 (file)
--- a/lib/config/git/dark_bg
+++ b/lib/config/git/dark_bg
@@ -1,27 +1,30 @@
-[color "branch"]
-       current = green
-       local = normal
-       plain = normal
-       remote = magenta
+#[color "branch"]
+#      current = green
+#      local = normal
+#      plain = normal
+#      remote = red
+#[color "decorate"]
+#      HEAD = cyan bold
+#      tag = yellow bold
 [color "diff"]
-       commit = bold yellow
-       frag = cyan
-       meta = cyan
-       new = green
-       old = magenta
-       plain = normal
-       whitespace = normal red
-[color "grep"]
-       match = normal
-[color "interactive"]
-       error = normal
-       header = normal
-       help = normal
-       prompt = normal
-[color "status"]
-       added = cyan
-       changed = magenta
-       header = normal
-       nobranch = red
-       untracked = red
-       updated = green
+#      commit = yellow
+#      frag = cyan
+       meta = blue
+#      new = green
+#      old = red
+#      plain = normal
+#      whitespace = normal red
+#[color "grep"]
+#      match = normal
+#[color "interactive"]
+#      error = normal
+#      header = normal
+#      help = normal
+#      prompt = normal
+#[color "status"]
+#      added = green
+#      changed = red
+#      header = normal
+#      nobranch = red
+#      untracked = red
+#      updated = magenta

diff --git a/lib/config/git/light_bg b/lib/config/git/light_bg
index 12fffdd3b1c43cd4fab4630cee99b9dfff1aaa31..d25dc78023b40c484fc5c9d9c09d3a5c6f42f4fa 100644 (file)
--- a/lib/config/git/light_bg
+++ b/lib/config/git/light_bg
@@ -1,25 +1,31 @@
 # Adapted from http://shallowsky.com/blog/programming/gitcolors.html
 # and http://www.ansdb.com/649-git-colors-for-light-background
 [color "branch"]
-       current = blue
+       current = green
        local = normal
        plain = normal
-       remote = magenta
-       upstream = normal
+       remote = red
+[color "decorate"]
+       HEAD = blue bold
+       tag = blue bold
 [color "diff"]
-       commit = normal bold
+       commit = yellow
        frag = cyan
        meta = bold
-       new = blue
-       old = magenta
+       new = green
+       old = red
        plain = normal
        whitespace = normal red
-[color "decorate"]
-       HEAD = blue
-       tag = blue
+#[color "grep"]
+#      match = normal
+#[color "interactive"]
+#      error = normal
+#      header = normal
+#      help = normal
+#      prompt = normal
 [color "status"]
        added = blue
-       changed = blue
+       changed = red
        header = normal
        nobranch = red
        untracked = red