Merge pull request #268 from JarrodCTaylor/master

This commit is contained in:
Bailey Ling 2013-09-22 14:27:41 -04:00
parent 8dcc370d94
commit 5aacb96135

View File

@ -1,31 +1,12 @@
"-----------------------------------------------------------------------------------------------------------------------
" Airline will search for this variable. The # is a separator that maps with the directory structure.
" If this is wrong, Vim will complain loudly.
"-----------------------------------------------------------------------------------------------------------------------
let g:airline#themes#understated#palette = {} let g:airline#themes#understated#palette = {}
"-----------------------------------------------------------------------------------------------------------------------
" Declare colors for normal mode and add it to the dictionary. The all arrays in this file use the format
" [guifg, guibg, ctermfg, ctermbg, opts]
"-----------------------------------------------------------------------------------------------------------------------
let s:N1 = ['#FFFFFF', '#5F87FF', 15, 69] " Outside blocks in normal mode (mode and file position) let s:N1 = ['#FFFFFF', '#5F87FF', 15, 69] " Outside blocks in normal mode (mode and file position)
let s:N2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format) let s:N2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
let s:N3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block let s:N3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
"-----------------------------------------------------------------------------------------------------------------------
" Now let's declare some colors for normal mode and add it to the dictionary.
"-----------------------------------------------------------------------------------------------------------------------
let g:airline#themes#understated#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) let g:airline#themes#understated#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
"-----------------------------------------------------------------------------------------------------------------------
" Here we define overrides for when the buffer is modified. This will be
" applied after g:airline#themes#understated#palette.normal, hence why only certain keys are declared.
"-----------------------------------------------------------------------------------------------------------------------
let g:airline#themes#understated#palette.normal_modified = {'airline_c': ['#ffffff', '#5f005f', 144, 59, 'bold'] ,} let g:airline#themes#understated#palette.normal_modified = {'airline_c': ['#ffffff', '#5f005f', 144, 59, 'bold'] ,}
"-----------------------------------------------------------------------------------------------------------------------
" Define the same groups from above for insert mode
"-----------------------------------------------------------------------------------------------------------------------
let s:I1 = ['#FFFFFF', '#87AF5F', 15, 107] " Outside blocks in normal mode (mode and file position) let s:I1 = ['#FFFFFF', '#87AF5F', 15, 107] " Outside blocks in normal mode (mode and file position)
let s:I2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format) let s:I2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
let s:I3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block let s:I3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
@ -33,25 +14,16 @@ let g:airline#themes#understated#palette.insert = airline#themes#generate_color_
let g:airline#themes#understated#palette.insert_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,} let g:airline#themes#understated#palette.insert_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
let g:airline#themes#understated#palette.insert_paste = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, ''] ,} let g:airline#themes#understated#palette.insert_paste = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, ''] ,}
"-----------------------------------------------------------------------------------------------------------------------
" Define colors for replace mode
"-----------------------------------------------------------------------------------------------------------------------
let g:airline#themes#understated#palette.replace = airline#themes#generate_color_map(s:I1, s:I2, s:I3) let g:airline#themes#understated#palette.replace = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
let g:airline#themes#understated#palette.replace.airline_a = ['#FFFFFF', '#870000', 15, 88, ''] let g:airline#themes#understated#palette.replace.airline_a = ['#FFFFFF', '#870000', 15, 88, '']
let g:airline#themes#understated#palette.replace_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,} let g:airline#themes#understated#palette.replace_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
"-----------------------------------------------------------------------------------------------------------------------
" Define colors for visual mode
"-----------------------------------------------------------------------------------------------------------------------
let s:V1 = ['#FFFFFF', '#AF5F00', 15, 130] let s:V1 = ['#FFFFFF', '#AF5F00', 15, 130]
let s:V2 = ['#AFAF87', '#5F5F5F', 144, 59] let s:V2 = ['#AFAF87', '#5F5F5F', 144, 59]
let s:V3 = ['#AFAF87', '#5F5F5F', 144, 59] let s:V3 = ['#AFAF87', '#5F5F5F', 144, 59]
let g:airline#themes#understated#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) let g:airline#themes#understated#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
let g:airline#themes#understated#palette.visual_modified = {'airline_c': [ '#AFAF87', '#5f005f', 144, 59, 'bold'] ,} let g:airline#themes#understated#palette.visual_modified = {'airline_c': [ '#AFAF87', '#5f005f', 144, 59, 'bold'] ,}
"-----------------------------------------------------------------------------------------------------------------------
" Define colors for inactive mode
"-----------------------------------------------------------------------------------------------------------------------
let s:V1 = ['#080808', '#FFAF00', 232, 214] let s:V1 = ['#080808', '#FFAF00', 232, 214]
let s:IA1 = ['#4E4E4E', '#1C1C1C', 239, 234, ''] let s:IA1 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, ''] let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
@ -59,15 +31,8 @@ let s:IA3 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
let g:airline#themes#understated#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3) let g:airline#themes#understated#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
let g:airline#themes#understated#palette.inactive_modified = {'airline_c': ['#4E4E4E', '', 239, '', 'bold'] ,} let g:airline#themes#understated#palette.inactive_modified = {'airline_c': ['#4E4E4E', '', 239, '', 'bold'] ,}
"-----------------------------------------------------------------------------------------------------------------------
" Define accent colors
"-----------------------------------------------------------------------------------------------------------------------
let g:airline#themes#understated#palette.accents = {'red': ['#FF0000', '', 88, '']} let g:airline#themes#understated#palette.accents = {'red': ['#FF0000', '', 88, '']}
"-----------------------------------------------------------------------------------------------------------------------
" Here we define the color map for ctrlp. We check for the g:loaded_ctrlp
" variable so that related functionality is loaded only if the user is using ctrlp.
"-----------------------------------------------------------------------------------------------------------------------
if !get(g:, 'loaded_ctrlp', 0) if !get(g:, 'loaded_ctrlp', 0)
finish finish
endif endif
@ -75,3 +40,4 @@ let g:airline#themes#understated#palette.ctrlp = airline#extensions#ctrlp#genera
\ ['#FFFFFF', '#1C1C1C', 15, 234, '' ], \ ['#FFFFFF', '#1C1C1C', 15, 234, '' ],
\ ['#FFFFFF', '#262626', 15, 235, '' ], \ ['#FFFFFF', '#262626', 15, 235, '' ],
\ ['#FFFFFF', '#303030', 15, 236, 'bold']) \ ['#FFFFFF', '#303030', 15, 236, 'bold'])