More color consolidation to variables

- Color Alignments with iterm theme / internally
- the gui and cterm colors were out of alignment in a number of places.
  I typically opted for one or the other and plan to reconcile with variables.
This commit is contained in:
Matthew Lyon
2014-01-21 14:26:05 -02:00
parent 7e284d14fe
commit 126069fae7

View File

@@ -1,12 +1,8 @@
" Vim Color File
" Name: pencil.vim
" Version: 0.1
" Maintainer: github.com/reedes
"
" based on bubblegum and others
"
" Maintainer: github.com/reedes github.com/mattly
" set background=light
hi clear
if exists('syntax on')
@@ -19,25 +15,26 @@ let g:colors_name='pencil'
let s:black = { "gui": "#212121", "cterm": "0" }
let s:light_black = { "gui": "#424242", "cterm": "8" }
let s:medium_grey = { "gui": "#808080", "cterm": "240" }
let s:light_grey = { "gui": "#D9D9D9", "cterm": "254" }
let s:lighter_grey = { "gui": "#E5E6E6", "cterm": "255" }
let s:light_grey = { "gui": "#D9D9D9", "cterm": "253" }
let s:lighter_grey = { "gui": "#E5E6E6", "cterm": "254" }
let s:white = { "gui": "#F1F1F1", "cterm": "15" }
let s:actual_white = { "gui": "#FFFFFF", "cterm": "231" }
let s:pink = { "gui": "#C30771", "cterm": "9" }
let s:pink = { "gui": "#fb007a", "cterm": "9" }
let s:red = { "gui": "#C30771", "cterm": "1" }
let s:orange = { "gui": "#D75F5F", "cterm": "167" }
let s:blue = { "gui": "#20BBFC", "cterm": "12" }
let s:light_blue = { "gui": "#b6d6fd", "cterm": "153" }
let s:dark_blue = { "gui": "#008EC4", "cterm": "4" }
let s:cyan = { "gui": "#20A5BA", "cterm": "6" }
let s:light_cyan = { "gui": "#4FB8CC", "cterm": "14" }
let s:green = { "gui": "#10A778", "cterm": "2" }
let s:purple = { "gui": "#8F8FB7", "cterm": "5" }
let s:yellow = { "gui": "#F3E430", "cterm": "220" }
let s:dark_yellow = { "gui": "#DFCF1D", "cterm": "3" }
let s:light_green = { "gui": "#5FD7A7", "cterm": "10" }
let s:purple = { "gui": "#523C79", "cterm": "5" }
let s:yellow = { "gui": "#F3E430", "cterm": "11" }
let s:dark_yellow = { "gui": "#A89C14", "cterm": "3" }
@@ -92,10 +89,10 @@ endfunction
call s:h("Normal", {"bg": s:bg, "fg": s:norm})
call s:h("Cursor", {"bg": s:blue, "fg": s:norm })
call s:h("Comment", {"fg": s:green, "gui": "italic"})
call s:h("Comment", {"fg": s:medium_grey, "gui": "italic"})
" yellow (was #c033ff)
call s:h("Constant", {"fg": s:dark_yellow})
" yellow
call s:h("Constant", {"fg": s:green})
hi! link String Constant
hi! link Character Constant
hi! link Number Constant
@@ -108,7 +105,7 @@ hi! link Function Identifier
" blue
call s:h("Statement", {"fg": s:dark_blue})
hi! link Condiitonal Statement
hi! link Conditonal Statement
hi! link Repeat Statement
hi! link Label Statement
hi! link Operator Statement
@@ -116,7 +113,7 @@ hi! link Keyword Statement
hi! link Exception Statement
" green
call s:h("PreProc", {"fg": s:green})
call s:h("PreProc", {"fg": s:cyan})
hi! link Include PreProc
hi! link Include Define
hi! link Include Macro
@@ -145,46 +142,46 @@ call s:h("Todo", {"fg": s:actual_white, "bg": s:pink, "gui": "bold", "cterm":
" ui chrome ====================================================================
" ordered according to `:help hitest.vim`
hi SpecialKey guifg=#87D787 ctermfg=114
hi NonText guifg=DarkRed ctermfg=244
hi Directory guifg=#8787AF ctermfg=103
hi ErrorMsg guifg=#FF8787 guibg=bg ctermfg=210 ctermbg=bg
call s:h("IncSearch", {"bg": s:yellow, "fg": s:norm})
call s:h("Search", {"bg": s:yellow, "fg": s:norm})
hi MoreMsg guifg=DarkBlue ctermfg=darkblue
hi ModeMsg guifg=DarkGreen ctermfg=darkgreen
call s:h("LineNr", {"fg": s:light_grey})
call s:h("CursorLineNr", {"fg": s:blue, "bg": s:lighter_grey})
hi Question guifg=DarkRed ctermfg=38
call s:h("StatusLine", {"bg": s:light_grey})
call s:h("StatusLineNC", {"bg": s:light_grey, "fg": s:medium_grey})
call s:h("VertSplit", {"bg": s:light_grey, "fg": s:light_grey})
hi Title guifg=DarkBlue ctermfg=109
call s:h("Visual", {"bg": s:light_blue})
call s:h("VisualNOS", {"bg": s:light_grey})
hi WarningMsg guifg=#AF87D7 ctermfg=140
hi WildMenu guifg=#F1F1F1 guibg=#262626 gui=none ctermfg=71 ctermbg=bg cterm=none
call s:h("Folded", {"fg": s:medium_grey})
hi FoldColumn guifg=#5FD7AF guibg=bg ctermfg=79 ctermbg=bg
hi DiffAdd guifg=#10A778 guibg=NONE ctermfg=darkgreen ctermbg=bg
hi DiffDelete guifg=#C30771 guibg=NONE ctermfg=darkred ctermbg=bg
hi DiffChange guifg=#F3E430 guibg=NONE ctermfg=darkyellow ctermbg=bg
hi DiffText guifg=#008EC4 guibg=NONE ctermfg=darkblue ctermbg=bg
hi SignColumn guifg=#5FD7AF guibg=bg ctermfg=79 ctermbg=bg
call s:h("SpecialKey", {"fg": s:light_green})
call s:h("NonText", {"fg": s:medium_grey})
call s:h("Directory", {"fg": s:blue})
call s:h("ErrorMsg", {"fg": s:pink})
call s:h("IncSearch", {"bg": s:yellow, "fg": s:norm})
call s:h("Search", {"bg": s:yellow, "fg": s:norm})
call s:h("MoreMsg", {"fg": s:medium_grey, "cterm": "bold", "gui": "bold"})
hi! link ModeMsg MoreMsg
call s:h("LineNr", {"fg": s:light_grey})
call s:h("CursorLineNr", {"fg": s:blue, "bg": s:lighter_grey})
call s:h("Question", {"fg": s:red})
call s:h("StatusLine", {"bg": s:light_grey})
call s:h("StatusLineNC", {"bg": s:light_grey, "fg": s:medium_grey})
call s:h("VertSplit", {"bg": s:light_grey, "fg": s:light_grey})
call s:h("Title", {"fg": s:dark_blue})
call s:h("Visual", {"bg": s:light_blue})
call s:h("VisualNOS", {"bg": s:light_grey})
call s:h("WarningMsg", {"fg": s:red})
call s:h("WildMenu", {"fg": s:bg, "bg": s:norm})
call s:h("Folded", {"fg": s:medium_grey})
call s:h("FoldColumn", {"fg": s:light_green})
call s:h("DiffAdd", {"fg": s:green})
call s:h("DiffDelete", {"fg": s:red})
call s:h("DiffChange", {"fg": s:dark_yellow})
call s:h("DiffText", {"fg": s:dark_blue})
call s:h("SignColumn", {"fg": s:light_green})
" hi Conceal
hi SpellBad guifg=fg guibg=bg gui=undercurl guisp=#cc0000 ctermfg=210 ctermbg=bg cterm=underline
hi SpellCap guifg=fg guibg=bg gui=undercurl guisp=#22cc22 ctermfg=174 ctermbg=bg cterm=underline
hi SpellRare guifg=fg guibg=bg gui=undercurl ctermfg=181 ctermbg=bg cterm=underline
hi SpellLocal guifg=fg guibg=bg gui=undercurl ctermfg=180 ctermbg=bg cterm=underline
hi Pmenu guifg=#F1F1F1 guibg=#545454 ctermfg=fg ctermbg=bg
hi PmenuSel guifg=#F1F1F1 guibg=#2C81FB ctermfg=231 ctermbg=244
hi PmenuSbar guifg=#F1F1F1 guibg=#545454 ctermfg=231 ctermbg=244
hi PmenuThumb guifg=#F1F1F1 guibg=#545454
hi TabLine guifg=#F1F1F1 guibg=#545454 gui=none ctermfg=fg ctermbg=bg cterm=none
hi TabLineSel guifg=#F1F1F1 guibg=#2C81FB gui=none ctermfg=253 ctermbg=238 cterm=none
hi TabLineFill guifg=#F1F1F1 guibg=#181818 gui=none ctermfg=fg ctermbg=bg cterm=none
call s:h("CursorColumn", {"bg": s:lighter_grey})
call s:h("CursorLine", {"bg": s:lighter_grey})
call s:h("Pmenu", {"fg": s:norm, "bg": s:light_grey})
call s:h("PmenuSel", {"fg": s:norm, "bg": s:blue})
call s:h("PmenuSbar", {"fg": s:norm, "bg": s:light_grey})
call s:h("PmenuThumb", {"fg": s:norm, "bg": s:light_grey})
call s:h("TabLine", {"fg": s:norm, "bg": s:light_grey})
call s:h("TabLineSel", {"fg": s:norm, "bg": s:blue})
call s:h("TabLineFill", {"fg": s:norm, "bg": s:light_grey})
call s:h("CursorColumn", {"bg": s:lighter_grey})
call s:h("CursorLine", {"bg": s:lighter_grey})
hi ColorColumn guifg=#5FD7AF guibg=#D9D9D9 ctermbg=79