Merge branch 'master' into dev

This commit is contained in:
Bailey Ling 2013-09-06 20:33:51 +00:00
commit b636c28ae2

View File

@ -52,3 +52,11 @@ let g:airline#themes#luna#palette.ctrlp = airline#extensions#ctrlp#generate_colo
\ [ '#ffffff' , '#002b2b' , 231 , 23 , '' ] , \ [ '#ffffff' , '#002b2b' , 231 , 23 , '' ] ,
\ [ '#ffffff' , '#005252' , 231 , 36 , '' ] , \ [ '#ffffff' , '#005252' , 231 , 36 , '' ] ,
\ [ '#ffffff' , '#973d45' , 231 , 95 , '' ] ) \ [ '#ffffff' , '#973d45' , 231 , 95 , '' ] )
let g:airline#themes#luna#palette.tabline = {
\ 'airline_tab': ['#2aa198', '#003f3f', 231, 29, ''],
\ 'airline_tabsel': ['#ffffff', '#2e8b57', 231, 36, ''],
\ 'airline_tabtype': ['#ffffff', '#005252', 231, 36, ''],
\ 'airline_tabfill': ['#ffffff', '#002b2b', 231, 23, ''],
\ 'airline_tabmod': ['#ffffff', '#780000', 231, 88, ''],
\ }