diff --git a/autoload/lightline/colorscheme/solarized.vim b/autoload/lightline/colorscheme/solarized.vim index 053840e..5d759ee 100644 --- a/autoload/lightline/colorscheme/solarized.vim +++ b/autoload/lightline/colorscheme/solarized.vim @@ -3,49 +3,10 @@ " Version: 0.0 " Author: itchyny " License: MIT License -" Last Change: 2013/08/27 00:35:38. +" Last Change: 2013/08/27 10:24:28. " ============================================================================= -let s:base03 = [ '#002b36', 234 ] -let s:base02 = [ '#073642', 235 ] -let s:base01 = [ '#586e75', 240 ] -let s:base00 = [ '#657b83', 241 ] -let s:base0 = [ '#839496', 244 ] -let s:base1 = [ '#93a1a1', 245 ] -let s:base2 = [ '#eee8d5', 254 ] -let s:base3 = [ '#fdf6e3', 230 ] -let s:yellow = [ '#b58900', 136 ] -let s:orange = [ '#cb4b16', 166 ] -let s:red = [ '#dc322f', 160 ] -let s:magenta = [ '#d33682', 125 ] -let s:violet = [ '#6c71c4', 61 ] -let s:blue = [ '#268bd2', 33 ] -let s:cyan = [ '#2aa198', 37 ] -let s:green = [ '#859900', 64 ] if &background ==# 'light' - let [s:base03, s:base3] = [s:base3, s:base03] - let [s:base02, s:base2] = [s:base2, s:base02] - let [s:base01, s:base1] = [s:base1, s:base01] - let [s:base00, s:base0] = [s:base0, s:base00] + let g:lightline#colorscheme#solarized#palette = g:lightline#colorscheme#solarized_light#palette +else + let g:lightline#colorscheme#solarized#palette = g:lightline#colorscheme#solarized_dark#palette endif -let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}} -let s:p.normal.left = [ [ s:base3, s:blue ], [ s:base3, s:base01 ] ] -let s:p.normal.right = [ [ s:base02, s:base0 ], [ s:base1, s:base01 ] ] -let s:p.inactive.right = [ [ s:base02, s:base01 ], [ s:base00, s:base02 ] ] -let s:p.inactive.left = [ [ s:base0, s:base02 ], [ s:base00, s:base02 ] ] -let s:p.insert.left = [ [ s:base3, s:green ], [ s:base3, s:base01 ] ] -let s:p.replace.left = [ [ s:base3, s:red ], [ s:base3, s:base01 ] ] -let s:p.visual.left = [ [ s:base3, s:magenta ], [ s:base3, s:base01 ] ] -let s:p.normal.middle = [ [ s:base00, s:base02 ] ] -let s:p.inactive.middle = [ [ s:base00, s:base02 ] ] - -function! s:flatten(p) - for k in values(a:p) - for l in values(k) - for m in range(len(l)) - let l[m] = [l[m][0][0], l[m][1][0], l[m][0][1], l[m][1][1]] - endfor - endfor - endfor - return a:p -endfunction -let g:lightline#colorscheme#solarized#palette = s:flatten(s:p) diff --git a/autoload/lightline/colorscheme/solarized_dark.vim b/autoload/lightline/colorscheme/solarized_dark.vim new file mode 100644 index 0000000..ed128c2 --- /dev/null +++ b/autoload/lightline/colorscheme/solarized_dark.vim @@ -0,0 +1,51 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/solarized_dark.vim +" Version: 0.0 +" Author: itchyny +" License: MIT License +" Last Change: 2013/08/27 10:25:46. +" ============================================================================= +let s:base03 = [ '#002b36', 234 ] +let s:base02 = [ '#073642', 235 ] +let s:base01 = [ '#586e75', 240 ] +let s:base00 = [ '#657b83', 241 ] +let s:base0 = [ '#839496', 244 ] +let s:base1 = [ '#93a1a1', 245 ] +let s:base2 = [ '#eee8d5', 254 ] +let s:base3 = [ '#fdf6e3', 230 ] +let s:yellow = [ '#b58900', 136 ] +let s:orange = [ '#cb4b16', 166 ] +let s:red = [ '#dc322f', 160 ] +let s:magenta = [ '#d33682', 125 ] +let s:violet = [ '#6c71c4', 61 ] +let s:blue = [ '#268bd2', 33 ] +let s:cyan = [ '#2aa198', 37 ] +let s:green = [ '#859900', 64 ] +" if &background ==# 'light' +" let [s:base03, s:base3] = [s:base3, s:base03] +" let [s:base02, s:base2] = [s:base2, s:base02] +" let [s:base01, s:base1] = [s:base1, s:base01] +" let [s:base00, s:base0] = [s:base0, s:base00] +" endif +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}} +let s:p.normal.left = [ [ s:base3, s:blue ], [ s:base3, s:base01 ] ] +let s:p.normal.right = [ [ s:base02, s:base0 ], [ s:base1, s:base01 ] ] +let s:p.inactive.right = [ [ s:base02, s:base01 ], [ s:base00, s:base02 ] ] +let s:p.inactive.left = [ [ s:base0, s:base02 ], [ s:base00, s:base02 ] ] +let s:p.insert.left = [ [ s:base3, s:green ], [ s:base3, s:base01 ] ] +let s:p.replace.left = [ [ s:base3, s:red ], [ s:base3, s:base01 ] ] +let s:p.visual.left = [ [ s:base3, s:magenta ], [ s:base3, s:base01 ] ] +let s:p.normal.middle = [ [ s:base00, s:base02 ] ] +let s:p.inactive.middle = [ [ s:base00, s:base02 ] ] + +function! s:flatten(p) + for k in values(a:p) + for l in values(k) + for m in range(len(l)) + let l[m] = [l[m][0][0], l[m][1][0], l[m][0][1], l[m][1][1]] + endfor + endfor + endfor + return a:p +endfunction +let g:lightline#colorscheme#solarized_dark#palette = s:flatten(s:p) diff --git a/autoload/lightline/colorscheme/solarized_light.vim b/autoload/lightline/colorscheme/solarized_light.vim new file mode 100644 index 0000000..1562a5e --- /dev/null +++ b/autoload/lightline/colorscheme/solarized_light.vim @@ -0,0 +1,51 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/solarized_light.vim +" Version: 0.0 +" Author: itchyny +" License: MIT License +" Last Change: 2013/08/27 10:25:51. +" ============================================================================= +let s:base03 = [ '#002b36', 234 ] +let s:base02 = [ '#073642', 235 ] +let s:base01 = [ '#586e75', 240 ] +let s:base00 = [ '#657b83', 241 ] +let s:base0 = [ '#839496', 244 ] +let s:base1 = [ '#93a1a1', 245 ] +let s:base2 = [ '#eee8d5', 254 ] +let s:base3 = [ '#fdf6e3', 230 ] +let s:yellow = [ '#b58900', 136 ] +let s:orange = [ '#cb4b16', 166 ] +let s:red = [ '#dc322f', 160 ] +let s:magenta = [ '#d33682', 125 ] +let s:violet = [ '#6c71c4', 61 ] +let s:blue = [ '#268bd2', 33 ] +let s:cyan = [ '#2aa198', 37 ] +let s:green = [ '#859900', 64 ] +" if &background ==# 'light' + let [s:base03, s:base3] = [s:base3, s:base03] + let [s:base02, s:base2] = [s:base2, s:base02] + let [s:base01, s:base1] = [s:base1, s:base01] + let [s:base00, s:base0] = [s:base0, s:base00] +" endif +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}} +let s:p.normal.left = [ [ s:base3, s:blue ], [ s:base3, s:base01 ] ] +let s:p.normal.right = [ [ s:base02, s:base0 ], [ s:base1, s:base01 ] ] +let s:p.inactive.right = [ [ s:base02, s:base01 ], [ s:base00, s:base02 ] ] +let s:p.inactive.left = [ [ s:base0, s:base02 ], [ s:base00, s:base02 ] ] +let s:p.insert.left = [ [ s:base3, s:green ], [ s:base3, s:base01 ] ] +let s:p.replace.left = [ [ s:base3, s:red ], [ s:base3, s:base01 ] ] +let s:p.visual.left = [ [ s:base3, s:magenta ], [ s:base3, s:base01 ] ] +let s:p.normal.middle = [ [ s:base00, s:base02 ] ] +let s:p.inactive.middle = [ [ s:base00, s:base02 ] ] + +function! s:flatten(p) + for k in values(a:p) + for l in values(k) + for m in range(len(l)) + let l[m] = [l[m][0][0], l[m][1][0], l[m][0][1], l[m][1][1]] + endfor + endfor + endfor + return a:p +endfunction +let g:lightline#colorscheme#solarized_light#palette = s:flatten(s:p) diff --git a/doc/lightline.txt b/doc/lightline.txt index 0ddfbbf..f9a1488 100644 --- a/doc/lightline.txt +++ b/doc/lightline.txt @@ -4,7 +4,7 @@ Version: 0.0 Author: itchyny (https://github.com/itchyny) License: MIT License Repository: https://github.com/itchyny/lightline.vim -Last Change: 2013/08/27 04:42:21. +Last Change: 2013/08/27 09:13:05. CONTENTS *lightline-contents* @@ -243,7 +243,7 @@ In order to define your own component: \ 'myfilename': 'MyFilename', \ 'myreadonly': 'MyReadonly', \ 'mymodified': 'MyModified', - \ }, + \ } \ } function! MyFilename() return ('' != MyReadonly() ? MyReadonly() . ' ' : '') . @@ -263,8 +263,8 @@ In order to define your own component: Separators settings: > let g:lightline = { - \ 'separator': { 'left': '▶', 'right': '◀' }, - \ 'subseparator': { 'left': '>', 'right': '<' } + \ 'separator': { 'left': '', 'right': '' }, + \ 'subseparator': { 'left': '|', 'right': '|' } \ } <