Skip to content

Commit

Permalink
Merge branch 'master' of github.com:chriskempson/vim-tomorrow-theme
Browse files Browse the repository at this point in the history
* 'master' of github.com:chriskempson/vim-tomorrow-theme:
  Fixing Tomorrow theme
  SignColumn is not 7.3 specific
  support for signcolumn & showmarks

Conflicts:
	colors/Tomorrow.vim
  • Loading branch information
Chris Kempson committed Mar 13, 2012
2 parents cc6b5cb + 5c467ec commit edeb419
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
7 changes: 7 additions & 0 deletions colors/Tomorrow-Night.vim
Expand Up @@ -264,6 +264,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("CursorColumn", "", s:line, "none")
call <SID>X("PMenu", s:foreground, s:selection, "none")
call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
call <SID>X("SignColumn", "", s:background, "none")
end
if version >= 703
call <SID>X("ColorColumn", "", s:line, "none")
Expand Down Expand Up @@ -336,6 +337,12 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("diffAdded", s:green, "", "")
call <SID>X("diffRemoved", s:red, "", "")

" ShowMarks Highlighting
call <SID>X("ShowMarksHLl", s:orange, s:background, "none")
call <SID>X("ShowMarksHLo", s:purple, s:background, "none")
call <SID>X("ShowMarksHLu", s:yellow, s:background, "none")
call <SID>X("ShowMarksHLm", s:aqua, s:background, "none")

" Delete Functions
delf <SID>X
delf <SID>rgb
Expand Down
11 changes: 6 additions & 5 deletions colors/Tomorrow.vim
Expand Up @@ -5,13 +5,14 @@

" Default GUI Colours
let s:foreground = "4d4d4c"
let s:background = "ffffff"
let s:selection = "c5cce9"
let s:line = "e9efff"
let s:background = "fafafafa"
let s:selection = "d6d6d6"
let s:line = "efefef"
let s:comment = "8e908c"
let s:red = "c82829"
let s:orange = "f5871f"
let s:yellow = "eab700"
let s:aqua = "3e999f"
let s:green = "718c00"
let s:aqua = "3e999f"
let s:blue = "4271ae"
Expand Down Expand Up @@ -234,10 +235,10 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256

" Vim Highlighting
call <SID>X("Normal", s:foreground, s:background, "")
call <SID>X("LineNr", s:selection, "", "")
highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE
call <SID>X("NonText", s:selection, "", "")
call <SID>X("SpecialKey", s:selection, "", "")
call <SID>X("Search", s:background, s:yellow, "")
call <SID>X("Search", s:foreground, s:yellow, "")
call <SID>X("TabLine", s:foreground, s:background, "reverse")
call <SID>X("StatusLine", s:window, s:yellow, "reverse")
call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
Expand Down

0 comments on commit edeb419

Please sign in to comment.