From f66b7345a15afeb371b292d6c67daa108de4759a Mon Sep 17 00:00:00 2001 From: TKNGUE Date: Sun, 26 Jul 2015 20:51:39 +0900 Subject: [PATCH] Update papercolor scheme --- autoload/lightline/colorscheme/papercolor.vim | 11 ++++++++++ .../lightline/colorscheme/papercolor_dark.vim | 19 ++++++++++++---- .../colorscheme/papercolor_light.vim | 22 +++++++++---------- 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 autoload/lightline/colorscheme/papercolor.vim diff --git a/autoload/lightline/colorscheme/papercolor.vim b/autoload/lightline/colorscheme/papercolor.vim new file mode 100644 index 0000000..b754e6c --- /dev/null +++ b/autoload/lightline/colorscheme/papercolor.vim @@ -0,0 +1,11 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/papercolor.vim +" Author: TKNGUE +" License: MIT License +" Last Change: 2015-07-26 20:34 +" ============================================================================= +if &background ==# 'light' + let g:lightline#colorscheme#papercolor#palette = g:lightline#colorscheme#papercolor_light#palette +else + let g:lightline#colorscheme#papercolor#palette = g:lightline#colorscheme#papercolor_dark#palette +endif diff --git a/autoload/lightline/colorscheme/papercolor_dark.vim b/autoload/lightline/colorscheme/papercolor_dark.vim index 84202e4..e53a0ce 100644 --- a/autoload/lightline/colorscheme/papercolor_dark.vim +++ b/autoload/lightline/colorscheme/papercolor_dark.vim @@ -202,11 +202,23 @@ fun! grey_number(x) "{{{ return [a:color, rgb(a:color)] endfun"}}} +let s:red = X("#df0000") +let s:green = X("#008700") +let s:blue = X("#00afaf") + +let s:pink = X("#afdf00") +let s:olive = X("#dfaf5f") +let s:navy = X("#df875f") + +let s:orange = X("#d75f00") +let s:purple = X("#8959a8") +let s:aqua = X("#3e999f") + " Basics: let s:foreground = X("#d0d0d0") let s:background = X("#444444") let s:window = X("#efefef") -let s:status = s:aqua +let s:status = X("#c6c6c6") let s:error = X("#5f0000") " Tabline: @@ -233,7 +245,7 @@ let s:p.normal.middle = [ [ s:statusline_active_fg, s:statusline_active_bg ]] let s:p.inactive.right = [ [ s:foreground, s:background ], [ s:foreground, s:background ] ] let s:p.inactive.left = [ [ s:foreground, s:background ], [ s:foreground, s:background ] ] let s:p.inactive.middle = [ [ s:foreground, s:background ], ] -let s:p.insert.left = [ [ s:blue, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] +let s:p.insert.left = [ [ s:background, s:blue], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] let s:p.replace.left = [ [ s:background, s:pink ], [s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] let s:p.visual.left = [ [ s:visual_fg, s:visual_bg ], [s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] let s:p.tabline.left = [ [s:tabline_inactive_fg, s:tabline_inactive_bg ]] @@ -241,6 +253,5 @@ let s:p.tabline.tabsel = [ [s:tabline_active_fg, s:tabline_active_bg ] ] let s:p.tabline.middle = [ [s:tabline_bg, s:tabline_bg]] let s:p.tabline.right = copy(s:p.normal.right) let s:p.normal.error = [ [ s:background, s:error ] ] -let s:p.normal.warning = [ [ s:background, s:olive ] ] -let lightline#colorscheme#papercolor_dark#palette = lightline#colorscheme#flatten(s:p) +let g:lightline#colorscheme#papercolor_dark#palette = lightline#colorscheme#flatten(s:p) diff --git a/autoload/lightline/colorscheme/papercolor_light.vim b/autoload/lightline/colorscheme/papercolor_light.vim index 66052ad..0e441ee 100644 --- a/autoload/lightline/colorscheme/papercolor_light.vim +++ b/autoload/lightline/colorscheme/papercolor_light.vim @@ -240,20 +240,20 @@ let s:visual_fg = s:background let s:visual_bg = s:blue let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.normal.left = [ [ s:foreground, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] -let s:p.normal.right = [ [ s:foreground, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] -let s:p.normal.middle = [ [ s:statusline_active_fg, s:statusline_active_bg ]] -let s:p.inactive.right = [ [ s:foreground, s:background ], [ s:foreground, s:background ] ] -let s:p.inactive.left = [ [ s:foreground, s:background ], [ s:foreground, s:background ] ] -let s:p.inactive.middle = [ [ s:foreground, s:background ], ] -" let s:p.insert.left = [ [ s:base0, s:base0 ], [ s:base3, s:base01 ] ] +let s:p.normal.left = [ [ s:foreground, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] +let s:p.normal.right = [ [ s:foreground, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] +let s:p.normal.middle = [ [ s:statusline_active_fg, s:statusline_active_bg ]] +let s:p.inactive.right = [ [ s:foreground, s:background ], [ s:foreground, s:background ] ] +let s:p.inactive.left = [ [ s:foreground, s:background ], [ s:foreground, s:background ] ] +let s:p.inactive.middle = [ [ s:foreground, s:background ], ] +let s:p.insert.left = [ [ s:blue, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] let s:p.replace.left = [ [ s:background, s:pink ], [s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] let s:p.visual.left = [ [ s:background, s:blue ], [s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] -let s:p.tabline.left = [ [s:tabline_inactive_fg, s:tabline_inactive_bg ]] -let s:p.tabline.tabsel = [ [s:tabline_active_fg, s:tabline_active_bg ] ] -let s:p.tabline.middle = [ [s:tabline_bg, s:tabline_bg]] +let s:p.tabline.left = [ [s:tabline_inactive_fg, s:tabline_inactive_bg ]] +let s:p.tabline.tabsel = [ [s:tabline_active_fg, s:tabline_active_bg ] ] +let s:p.tabline.middle = [ [s:tabline_bg, s:tabline_bg]] let s:p.tabline.right = copy(s:p.normal.right) let s:p.normal.error = [ [ s:background, s:error ] ] let s:p.normal.warning = [ [ s:background, s:olive ] ] -let lightline#colorscheme#papercolor_light#palette = lightline#colorscheme#flatten(s:p) +let g:lightline#colorscheme#papercolor_light#palette = lightline#colorscheme#flatten(s:p)