From 848cc7c1f76f950ea7b0cd72c8303a1d73bcf15b Mon Sep 17 00:00:00 2001 From: mhartington Date: Mon, 8 Feb 2016 20:21:47 -0500 Subject: [PATCH 1/2] refactor(jellybeans): update colors Closes #6 --- autoload/airline/themes/jellybeans.vim | 125 +++++++++++++++---------- 1 file changed, 78 insertions(+), 47 deletions(-) diff --git a/autoload/airline/themes/jellybeans.vim b/autoload/airline/themes/jellybeans.vim index 201068c..dc4cf0f 100644 --- a/autoload/airline/themes/jellybeans.vim +++ b/autoload/airline/themes/jellybeans.vim @@ -1,52 +1,83 @@ +" Color palette +let s:gui00 = "#151515" +let s:gui01 = "#262626" +let s:gui02 = "#4f5b66" +let s:gui03 = "#65737e" +let s:gui04 = "#a7adba" +let s:gui05 = "#c0c5ce" +let s:gui06 = "#cdd3de" +let s:gui07 = "#d8dee9" +let s:gui08 = "#700009" +let s:gui09 = "#f99157" +let s:gui0A = "#fac863" +let s:gui0B = "#437019" +let s:gui0C = "#5fb3b3" +let s:gui0D = "#345FA8" +let s:gui0E = "#c594c5" +let s:gui0F = "#ab7967" + +let s:cterm00 = "234" +let s:cterm01 = "235" +let s:cterm02 = "239" +let s:cterm03 = "59" +let s:cterm04 = "145" +let s:cterm05 = "152" +let s:cterm06 = "188" +let s:cterm07 = "15" +let s:cterm08 = "124" +let s:cterm09 = "209" +let s:cterm0A = "221" +let s:cterm0B = "28" +let s:cterm0C = "73" +let s:cterm0D = "68" +let s:cterm0E = "176" +let s:cterm0F = "137" + +let s:guiWhite = "#ffffff" +let s:ctermWhite = "15" + +" Normal mode +let s:N1 = [ s:guiWhite , s:gui0D , s:ctermWhite , s:cterm0D ] +let s:N2 = [ s:gui02 , s:gui01 , s:cterm03 , s:cterm01 ] +let s:N3 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm00 ] + + +" Insert mode +let s:I1 = [ s:guiWhite , s:gui0B , s:ctermWhite , s:cterm0B ] +let s:I2 = [ s:gui02 , s:gui01 , s:cterm03 , s:cterm01 ] +let s:I3 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm00 ] + +" Visual mode +let s:V1 = [ s:guiWhite , s:gui08 , s:ctermWhite , s:cterm08 ] +let s:V2 = [ s:gui02 , s:gui01 , s:cterm03 , s:cterm01 ] +let s:V3 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm00 ] + + +" Replace mode +let s:R1 = [ s:gui08 , s:gui01 , s:cterm08, s:cterm00 ] +let s:R2 = [ s:gui02 , s:gui01 , s:cterm03 , s:cterm01 ] +let s:R3 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm00 ] + let g:airline#themes#jellybeans#palette = {} +let g:airline#themes#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) +let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) +let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) +let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) +let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) -" The name of the function must be 'refresh'. -function! airline#themes#jellybeans#refresh() - " This theme is an example of how to use helper functions to extract highlight - " values from the corresponding colorscheme. It was written in a hurry, so it - " is very minimalistic. If you are a jellybeans user and want to make updates, - " please send pull requests. +" Inactive mode +let s:IN1 = [ s:gui07 , s:gui03 , s:cterm07 , s:cterm03 ] +let s:IN2 = [ s:gui07 , s:gui01 , s:cterm07 , s:cterm01 ] +let s:IA = [ s:IN1[1] , s:IN2[1] , s:IN1[3] , s:IN2[3] , '' ] +let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA) - " Here are examples where the entire highlight group is copied and an airline - " compatible color array is generated. - let s:N1 = airline#themes#get_highlight('DbgCurrent', 'bold') - let s:N2 = airline#themes#get_highlight('Folded') - let s:N3 = airline#themes#get_highlight('NonText') +" CtrlP +if !get(g:, 'loaded_ctrlp', 0) + finish +endif - let g:airline#themes#jellybeans#palette.accents = { - \ 'red': airline#themes#get_highlight('Constant'), - \ } - - let g:airline#themes#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) - let g:airline#themes#jellybeans#palette.normal_modified = { - \ 'airline_c': [ '#ffb964', '', 215, '', '' ] - \ } - - let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold') - let s:I2 = s:N2 - let s:I3 = s:N3 - let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) - let g:airline#themes#jellybeans#palette.insert_modified = g:airline#themes#jellybeans#palette.normal_modified - - let s:R1 = airline#themes#get_highlight('WildMenu', 'bold') - let s:R2 = s:N2 - let s:R3 = s:N3 - let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) - let g:airline#themes#jellybeans#palette.replace_modified = g:airline#themes#jellybeans#palette.normal_modified - - " Sometimes you want to mix and match colors from different groups, you can do - " that with this method. - let s:V1 = airline#themes#get_highlight2(['TabLineSel', 'bg'], ['DiffDelete', 'bg'], 'bold') - let s:V2 = s:N2 - let s:V3 = s:N3 - let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) - let g:airline#themes#jellybeans#palette.visual_modified = g:airline#themes#jellybeans#palette.normal_modified - - " And of course, you can always do it manually as well. - let s:IA = [ '#444444', '#1c1c1c', 237, 234 ] - let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA) - let g:airline#themes#jellybeans#palette.inactive_modified = g:airline#themes#jellybeans#palette.normal_modified -endfunction - -call airline#themes#jellybeans#refresh() +let s:CP1 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm01 ] +let s:CP2 = [ s:guiWhite , s:gui03 , s:ctermWhite , s:cterm01 ] +let s:CP3 = [ s:guiWhite , s:gui0D , s:ctermWhite , s:cterm0D ] +let g:airline#themes#jellybeans#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(s:CP1, s:CP2, s:CP3) From 91721e3c0d86f44c7831a54f2609959b8edf57cc Mon Sep 17 00:00:00 2001 From: mhartington Date: Mon, 8 Feb 2016 20:27:28 -0500 Subject: [PATCH 2/2] fix(jellybeans): use correct red --- autoload/airline/themes/jellybeans.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/airline/themes/jellybeans.vim b/autoload/airline/themes/jellybeans.vim index dc4cf0f..85b08e8 100644 --- a/autoload/airline/themes/jellybeans.vim +++ b/autoload/airline/themes/jellybeans.vim @@ -7,7 +7,7 @@ let s:gui04 = "#a7adba" let s:gui05 = "#c0c5ce" let s:gui06 = "#cdd3de" let s:gui07 = "#d8dee9" -let s:gui08 = "#700009" +let s:gui08 = "#870000" let s:gui09 = "#f99157" let s:gui0A = "#fac863" let s:gui0B = "#437019" @@ -24,7 +24,7 @@ let s:cterm04 = "145" let s:cterm05 = "152" let s:cterm06 = "188" let s:cterm07 = "15" -let s:cterm08 = "124" +let s:cterm08 = "88" let s:cterm09 = "209" let s:cterm0A = "221" let s:cterm0B = "28"