s/color/palette/

This commit is contained in:
itchyny
2013-08-22 01:28:02 +09:00
parent dd63ba863a
commit e8fbd0f0e9
3 changed files with 7 additions and 7 deletions

View File

@@ -50,13 +50,13 @@ function! lightline#init()
let g:lightline.subseparator = get(g:lightline, 'subseparator', {}) let g:lightline.subseparator = get(g:lightline, 'subseparator', {})
let g:lightline.subseparator.left = get(g:lightline.subseparator, 'left', '') let g:lightline.subseparator.left = get(g:lightline.subseparator, 'left', '')
let g:lightline.subseparator.right = get(g:lightline.subseparator, 'right', '') let g:lightline.subseparator.right = get(g:lightline.subseparator, 'right', '')
let g:lightline.color = get(g:lightline, 'color', {}) let g:lightline.palette = get(g:lightline, 'palette', {})
let g:lightline.colorscheme = get(g:lightline, 'colorscheme', 'default') let g:lightline.colorscheme = get(g:lightline, 'colorscheme', 'default')
for m in ['normal', 'insert', 'replace', 'visual', 'inactive'] for m in ['normal', 'insert', 'replace', 'visual', 'inactive']
let g:lightline.color[m] = get(g:lightline.color, m, {}) let g:lightline.palette[m] = get(g:lightline.palette, m, {})
endfor endfor
try try
let g:lightline.color = g:lightline#colorscheme#{g:lightline.colorscheme}#color let g:lightline.palette = g:lightline#colorscheme#{g:lightline.colorscheme}#palette
for m in ['normal', 'insert', 'replace', 'visual', 'inactive', 'command'] for m in ['normal', 'insert', 'replace', 'visual', 'inactive', 'command']
call lightline#highlight(m) call lightline#highlight(m)
endfor endfor
@@ -82,8 +82,8 @@ function! lightline#mode()
endfunction endfunction
function! lightline#highlight(mode) function! lightline#highlight(mode)
let d = has_key(g:lightline.color, a:mode) ? a:mode : 'normal' let d = has_key(g:lightline.palette, a:mode) ? a:mode : 'normal'
let c = g:lightline.color let c = g:lightline.palette
let left = d == 'inactive' ? g:lightline.inactive.left : g:lightline.active.left let left = d == 'inactive' ? g:lightline.inactive.left : g:lightline.active.left
let right = d == 'inactive' ? g:lightline.inactive.right : g:lightline.active.right let right = d == 'inactive' ? g:lightline.inactive.right : g:lightline.active.right
let l = has_key(c, d) && has_key(c[d], 'left') ? c[d].left : c.normal.left let l = has_key(c, d) && has_key(c[d], 'left') ? c[d].left : c.normal.left

View File

@@ -9,4 +9,4 @@ let s:c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff
let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ] let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ]
let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ] let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ]
let g:lightline#colorscheme#default#color = s:c let g:lightline#colorscheme#default#palette = s:c

View File

@@ -9,4 +9,4 @@ let s:c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff
let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ] let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ]
let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ] let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ]
let g:lightline#colorscheme#landscape#color = s:c let g:lightline#colorscheme#landscape#palette = s:c