From 493c593f405b9ed1bdc27b93e398bf515a4ed1fd Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Fri, 14 Oct 2016 13:14:25 +0200 Subject: [PATCH] Vice theme note correctly defined --- autoload/airline/themes/vice.vim | 34 +++++++++++++------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/autoload/airline/themes/vice.vim b/autoload/airline/themes/vice.vim index 3858858..7f88f6d 100644 --- a/autoload/airline/themes/vice.vim +++ b/autoload/airline/themes/vice.vim @@ -1,5 +1,3 @@ -let g:airline#themes#vice#palette = {} - " Color definitions let s:white = [231, "#ffffff"] let s:grey0 = [102, "#878787"] "lightest grey @@ -24,45 +22,41 @@ let s:lavender = [183, "#dfafff"] let s:gray_purple = [146, "#afafd7"] let s:dark_lavender = [97, "#875faf"] +let s:modified = { 'airline_c': [s:dark_mint[1], s:grey2[1], s:dark_mint[0], s:grey2[0] ] } + let g:airline#themes#vice#palette = {} -let s:modified = { 'airline_c': s:MakeCol(s:dark_mint, s:grey2) } - -function! s:MakeCol(fg, bg) - return [ a:fg[1], a:bg[1], a:fg[0], a:bg[0] ] -endfun - " Normal mode -let s:N1 = s:MakeCol(s:grey1, s:teal) -let s:N2 = s:MakeCol(s:white, s:grey2) -let s:N3 = s:MakeCol(s:mint, s:grey2) +let s:N1 = [s:grey1[1], s:teal[1], s:grey1[0], s:teal[0] ] +let s:N2 = [s:white[1], s:grey2[1], s:white[0], s:grey2[0] ] +let s:N3 = [s:mint[1], s:grey2[1], s:mint[0], s:grey2[0] ] let g:airline#themes#vice#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) let g:airline#themes#vice#palette.normal_modified = s:modified " Insert mode -let s:I1 = s:MakeCol(s:grey1, s:mint) +let s:I1 = [s:grey1[1], s:mint[1], s:grey1[0], s:mint[0] ] let s:I2 = s:N2 let s:I3 = s:N3 let g:airline#themes#vice#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) let g:airline#themes#vice#palette.insert_modified = s:modified " Visual mode -let s:V1 = s:MakeCol(s:grey1, s:pink) +let s:V1 = [s:grey1[1], s:pink[1], s:grey1[0], s:pink[0] ] let s:V2 = s:N2 let s:V3 = s:I3 let g:airline#themes#vice#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) let g:airline#themes#vice#palette.visual_modified = s:modified " Replace mode -let s:R1 = s:MakeCol(s:hot_pink, s:grey2) +let s:R1 = [s:hot_pink[1], s:grey2[1], s:hot_pink[0], s:grey2[0] ] let s:R2 = s:N2 let s:R3 = s:I3 let g:airline#themes#vice#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) let g:airline#themes#vice#palette.replace_modified = s:modified " Inactive mode -let s:IN1 = s:MakeCol(s:grey0, s:grey1) -let s:IN2 = s:MakeCol(s:grey0, s:grey1) -let s:IN3 = s:MakeCol(s:grey0, s:grey1) +let s:IN1 = [s:grey0[1], s:grey1[1], s:grey0[0], s:grey1[0] ] +let s:IN2 = [s:grey0[1], s:grey1[1], s:grey0[0], s:grey1[0] ] +let s:IN3 = [s:grey0[1], s:grey1[1], s:grey0[0], s:grey1[0] ] let g:airline#themes#vice#palette.inactive = airline#themes#generate_color_map(s:IN1, s:IN2, s:IN3) let g:airline#themes#vice#palette.inactive_modified = s:modified @@ -71,8 +65,8 @@ if !get(g:, 'loaded_ctrlp', 0) finish endif -let s:CP1 = s:MakeCol(s:white, s:grey1) -let s:CP2 = s:MakeCol(s:white, s:grey1) -let s:CP3 = s:MakeCol(s:white, s:grey1) +let s:CP1 = [s:white[1], s:grey1[1], s:white[0], s:grey1[0] ] +let s:CP2 = [s:white[1], s:grey1[1], s:white[0], s:grey1[0] ] +let s:CP3 = [s:white[1], s:grey1[1], s:white[0], s:grey1[0] ] let g:airline#themes#vice#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(s:CP1, s:CP2, s:CP3)