diff --git a/colors/elementary-light.vim b/colors/elementary-light.vim index 28129c9..6502797 100644 --- a/colors/elementary-light.vim +++ b/colors/elementary-light.vim @@ -1,10 +1,10 @@ " elementary-light.vim " -" Original Author: Xavier Noria +" Framework Created By: Xavier Noria " License: MIT -" Modified By: Jake Bauer +" Theme By: Jake Bauer -set background=dark +set background=light hi clear if exists('syntax_on') @@ -68,22 +68,22 @@ endfunction " --- Vim interface ------------------------------------------------------------ call s:hi('Normal', s:default_fg, s:default_bg) -call s:hi('Cursor', s:white, s:white) -call s:hi('CursorLine', s:white, s:cursorline, s:none) -call s:hi('CursorLineNr', s:white, s:default_bg, s:bold) -call s:hi('ColorColumn', s:white, s:faded) +call s:hi('Cursor', s:default_bg, s:default_fg) +call s:hi('CursorLine', s:default_fg, s:cursorline, s:none) +call s:hi('CursorLineNr', s:default_fg, s:default_bg, s:bold) +call s:hi('ColorColumn', s:default_fg, s:faded) call s:hi('Search', s:white, s:accent) call s:hi('Visual', s:white, s:accent) call s:hi('ErrorMsg', s:red, s:default_bg) " Status bar -call s:hi('StatusLine', s:white, s:faded) -call s:hi('StatusLineNC', s:white, s:faded) +call s:hi('StatusLine', s:default_fg, s:faded) +call s:hi('StatusLineNC', s:default_fg, s:faded) " Tabs -call s:hi('TabLine', s:white, s:faded) -call s:hi('TabLineSel', s:white, s:accent, s:bold) -call s:hi('TabLineFill', s:white, s:black) +call s:hi('TabLine', s:default_fg, s:faded) +call s:hi('TabLineSel', s:default_fg, s:accent, s:bold) +call s:hi('TabLineFill', s:default_fg, s:default_bg) " Tildes at the bottom of a buffer, etc. call s:hi('NonText', s:faded) @@ -99,7 +99,7 @@ call s:hi('LineNr', s:accent) call s:hi('SpecialKey', s:accent, s:default_bg, s:bold) " File browsers. -call s:hi('Directory', s:white, s:default_bg, s:bold) +call s:hi('Directory', s:default_fg, s:default_bg, s:bold) " Help. call s:hi('helpSpecial') @@ -107,7 +107,7 @@ call s:hi('helpHyperTextJump', s:accent, s:default_bg, s:underline) call s:hi('helpNote') " Popup menu. -call s:hi('Pmenu', s:white, s:accent) +call s:hi('Pmenu', s:default_fg, s:accent) call s:hi('PmenuSel', s:accent, s:white) " Signs. @@ -116,7 +116,7 @@ call s:hi('SignColumn') " --- Diff Mode ---------------------------------------------------------------- call s:hi('DiffAdd', s:green, s:default_bg) call s:hi('DiffDelete', s:red, s:default_bg) -call s:hi('DiffChange', s:white, s:default_bg) +call s:hi('DiffChange', s:default_fg, s:default_bg) call s:hi('DiffText', s:yellow, s:default_bg) " --- Programming ---------------------------------------------------- @@ -130,7 +130,7 @@ call s:hi('Type', s:purple, s:default_bg) call s:hi('Function', s:yellow) call s:hi('Identifier', s:default_fg, s:default_bg, s:none) call s:hi('Special') -call s:hi('MatchParen', s:white, s:black, s:underline) +call s:hi('MatchParen', s:default_fg, s:default_bg, s:underline) call s:hi('Error', s:red, s:black, s:bold) call s:hi('Todo', s:red, s:default_bg, s:bold) @@ -199,9 +199,9 @@ call s:hi('diffAdded', s:green) call s:hi('diffRemoved', s:red) " --- Markdown ----------------------------------------------------------------- -call s:hi('Title', s:white, s:default_bg, s:bold) -call s:hi('markdownHeadingDelimiter', s:white, s:default_bg, s:bold) -call s:hi('markdownHeadingRule', s:white, s:default_bg, s:bold) +call s:hi('Title', s:default_fg, s:default_bg, s:bold) +call s:hi('markdownHeadingDelimiter', s:default_fg, s:default_bg, s:bold) +call s:hi('markdownHeadingRule', s:default_fg, s:default_bg, s:bold) call s:hi('markdownLinkText', s:blue, s:default_bg, s:underline) " --- HTML --------------------------------------------------------------------- @@ -214,8 +214,8 @@ hi link cssBraces Noise " --- Gemini ------------------------------------------------------------------- " Based on this plugin: https://tildegit.org/sloum/gemini-vim-syntax -call s:hi('gmiHeader', s:white, s:default_bg, s:bold) -call s:hi('gmiLinkStart', s:white, s:default_bg, s:bold) +call s:hi('gmiHeader', s:default_fg, s:default_bg, s:bold) +call s:hi('gmiLinkStart', s:default_fg, s:default_bg, s:bold) call s:hi('gmiLinkURL', s:blue, s:default_bg, s:underline) call s:hi('gmiLinkTitle', s:accent, s:default_bg, s:none) call s:hi('gmiMono', s:accent, s:default_bg, s:bold) @@ -223,6 +223,6 @@ call s:hi('gmiQuoteLine', s:accent, s:default_bg, s:bold) " --- Spelling ----------------------------------------------------------------- call s:hi('SpellBad', s:red, s:default_bg, s:bold, s:underline) -call s:hi('SpellCap', s:white, s:default_bg, s:bold) +call s:hi('SpellCap', s:default_fg, s:default_bg, s:bold) call s:hi('SpellLocal', s:default_fg, s:default_bg, s:none) call s:hi('SpellRare', s:default_fg, s:default_bg, s:none) diff --git a/colors/elementary.vim b/colors/elementary.vim index 58f5de9..70cd8ff 100644 --- a/colors/elementary.vim +++ b/colors/elementary.vim @@ -1,8 +1,8 @@ " elementary.vim " -" Original Author: Xavier Noria +" Framework Created By: Xavier Noria " License: MIT -" Modified By: Jake Bauer +" Theme By: Jake Bauer set background=dark @@ -67,8 +67,8 @@ endfunction " --- Vim interface ------------------------------------------------------------ -call s:hi('Normal', s:white, s:black) -call s:hi('Cursor', s:white, s:white) +call s:hi('Normal', s:default_fg, s:default_bg) +call s:hi('Cursor', s:default_bg, s:default_fg) call s:hi('CursorLine', s:white, s:cursorline, s:none) call s:hi('CursorLineNr', s:white, s:default_bg, s:bold) call s:hi('ColorColumn', s:white, s:faded) @@ -77,13 +77,13 @@ call s:hi('Visual', s:white, s:accent) call s:hi('ErrorMsg', s:red, s:default_bg) " Status bar -call s:hi('StatusLine', s:white, s:faded) -call s:hi('StatusLineNC', s:white, s:faded) +call s:hi('StatusLine', s:default_fg, s:faded) +call s:hi('StatusLineNC', s:default_fg, s:faded) " Tabs -call s:hi('TabLine', s:white, s:faded) -call s:hi('TabLineSel', s:white, s:accent, s:bold) -call s:hi('TabLineFill', s:white, s:black) +call s:hi('TabLine', s:default_fg, s:faded) +call s:hi('TabLineSel', s:default_fg, s:accent, s:bold) +call s:hi('TabLineFill', s:default_fg, s:default_bg) " Tildes at the bottom of a buffer, etc. call s:hi('NonText', s:faded) @@ -99,7 +99,7 @@ call s:hi('LineNr', s:accent) call s:hi('SpecialKey', s:accent, s:default_bg, s:bold) " File browsers. -call s:hi('Directory', s:white, s:default_bg, s:bold) +call s:hi('Directory', s:default_fg, s:default_bg, s:bold) " Help. call s:hi('helpSpecial') @@ -107,7 +107,7 @@ call s:hi('helpHyperTextJump', s:accent, s:default_bg, s:underline) call s:hi('helpNote') " Popup menu. -call s:hi('Pmenu', s:white, s:accent) +call s:hi('Pmenu', s:default_fg, s:accent) call s:hi('PmenuSel', s:accent, s:white) " Signs. @@ -116,7 +116,7 @@ call s:hi('SignColumn') " --- Diff Mode ---------------------------------------------------------------- call s:hi('DiffAdd', s:green, s:default_bg) call s:hi('DiffDelete', s:red, s:default_bg) -call s:hi('DiffChange', s:white, s:default_bg) +call s:hi('DiffChange', s:default_fg, s:default_bg) call s:hi('DiffText', s:yellow, s:default_bg) " --- Programming ---------------------------------------------------- @@ -130,7 +130,7 @@ call s:hi('Type', s:purple, s:default_bg) call s:hi('Function', s:yellow) call s:hi('Identifier', s:default_fg, s:default_bg, s:none) call s:hi('Special') -call s:hi('MatchParen', s:white, s:black, s:underline) +call s:hi('MatchParen', s:default_fg, s:default_bg, s:underline) call s:hi('Error', s:red, s:black, s:bold) call s:hi('Todo', s:red, s:default_bg, s:bold) @@ -199,9 +199,9 @@ call s:hi('diffAdded', s:green) call s:hi('diffRemoved', s:red) " --- Markdown ----------------------------------------------------------------- -call s:hi('Title', s:white, s:default_bg, s:bold) -call s:hi('markdownHeadingDelimiter', s:white, s:default_bg, s:bold) -call s:hi('markdownHeadingRule', s:white, s:default_bg, s:bold) +call s:hi('Title', s:default_fg, s:default_bg, s:bold) +call s:hi('markdownHeadingDelimiter', s:default_fg, s:default_bg, s:bold) +call s:hi('markdownHeadingRule', s:default_fg, s:default_bg, s:bold) call s:hi('markdownLinkText', s:blue, s:default_bg, s:underline) " --- HTML --------------------------------------------------------------------- @@ -214,8 +214,8 @@ hi link cssBraces Noise " --- Gemini ------------------------------------------------------------------- " Based on this plugin: https://tildegit.org/sloum/gemini-vim-syntax -call s:hi('gmiHeader', s:white, s:default_bg, s:bold) -call s:hi('gmiLinkStart', s:white, s:default_bg, s:bold) +call s:hi('gmiHeader', s:default_fg, s:default_bg, s:bold) +call s:hi('gmiLinkStart', s:default_fg, s:default_bg, s:bold) call s:hi('gmiLinkURL', s:blue, s:default_bg, s:underline) call s:hi('gmiLinkTitle', s:accent, s:default_bg, s:none) call s:hi('gmiMono', s:accent, s:default_bg, s:bold) @@ -223,6 +223,6 @@ call s:hi('gmiQuoteLine', s:accent, s:default_bg, s:bold) " --- Spelling ----------------------------------------------------------------- call s:hi('SpellBad', s:red, s:default_bg, s:bold, s:underline) -call s:hi('SpellCap', s:white, s:default_bg, s:bold) +call s:hi('SpellCap', s:default_fg, s:default_bg, s:bold) call s:hi('SpellLocal', s:default_fg, s:default_bg, s:none) call s:hi('SpellRare', s:default_fg, s:default_bg, s:none)