From 6978bdf2d701743d77e38bce78562b1f00a59cf1 Mon Sep 17 00:00:00 2001 From: Zoltan Dalmadi Date: Wed, 2 Nov 2016 15:27:33 +0100 Subject: [PATCH 1/3] Added one color theme --- autoload/lightline/colorscheme/one.vim | 12 +++++ autoload/lightline/colorscheme/one_dark.vim | 46 ++++++++++++++++++++ autoload/lightline/colorscheme/one_light.vim | 46 ++++++++++++++++++++ doc/lightline.txt | 2 +- 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 autoload/lightline/colorscheme/one.vim create mode 100644 autoload/lightline/colorscheme/one_dark.vim create mode 100644 autoload/lightline/colorscheme/one_light.vim diff --git a/autoload/lightline/colorscheme/one.vim b/autoload/lightline/colorscheme/one.vim new file mode 100644 index 0000000..48fe271 --- /dev/null +++ b/autoload/lightline/colorscheme/one.vim @@ -0,0 +1,12 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/one.vim +" Author: Zoltan Dalmadi +" License: MIT License +" Last Change: 2016/11/2 14:56:14. +" ============================================================================= + +if &background ==# 'light' + let g:lightline#colorscheme#one#palette = g:lightline#colorscheme#one_light#palette +else + let g:lightline#colorscheme#one#palette = g:lightline#colorscheme#one_dark#palette +endif diff --git a/autoload/lightline/colorscheme/one_dark.vim b/autoload/lightline/colorscheme/one_dark.vim new file mode 100644 index 0000000..d36f3ca --- /dev/null +++ b/autoload/lightline/colorscheme/one_dark.vim @@ -0,0 +1,46 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/one_dark.vim +" Author: Zoltan Dalmadi +" License: MIT License +" Last Change: 2016/11/2 14:56:23. +" ============================================================================= + +let s:bg = '#282c34' +let s:gray1 = '#5c6370' +let s:gray2 = '#2c323d' +let s:gray3 = '#3e4452' +let s:fg = '#abb2bf' +let s:blue = '#61afef' +let s:green = '#98c379' +let s:purple = '#c678dd' +let s:red1 = '#e06c75' +let s:red2 = '#be5046' +let s:yellow = '#e5c07b' + +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} + +let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:fg, s:gray3 ] ] +let s:p.normal.middle = [ [ s:fg, s:gray2 ] ] +let s:p.normal.right = [ [ s:bg, s:green, 'bold' ], [ s:bg, s:green, 'bold' ] ] +let s:p.normal.error = [ [ s:red2, s:bg ] ] +let s:p.normal.warning = [ [ s:yellow, s:bg ] ] + +let s:p.inactive.left = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] +let s:p.inactive.middle = [ [ s:gray1, s:gray2 ] ] +let s:p.inactive.right = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] + +let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:fg, s:gray3 ] ] +let s:p.insert.right = [ [ s:bg, s:blue, 'bold' ], [ s:bg, s:blue, 'bold' ] ] + +let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:fg, s:gray3 ] ] +let s:p.replace.right = [ [ s:bg, s:red1, 'bold' ], [ s:bg, s:red1, 'bold' ] ] + +let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:fg, s:gray3 ] ] +let s:p.visual.right = [ [ s:bg, s:purple, 'bold' ], [ s:bg, s:purple, 'bold' ] ] + +let s:p.tabline.left = [ [ s:bg, s:gray3 ] ] +let s:p.tabline.tabsel = [ [ s:bg, s:purple, 'bold' ] ] +let s:p.tabline.middle = [ [ s:gray3, s:gray2 ] ] +let s:p.tabline.right = copy(s:p.normal.right) + +let g:lightline#colorscheme#one_dark#palette = lightline#colorscheme#fill(s:p) diff --git a/autoload/lightline/colorscheme/one_light.vim b/autoload/lightline/colorscheme/one_light.vim new file mode 100644 index 0000000..7c27e30 --- /dev/null +++ b/autoload/lightline/colorscheme/one_light.vim @@ -0,0 +1,46 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/one_light.vim +" Author: Zoltan Dalmadi +" License: MIT License +" Last Change: 2016/11/2 14:56:38. +" ============================================================================= + +let s:bg = '#fafafa' +let s:gray1 = '#494b53' +let s:gray2 = '#f0f0f0' +let s:gray3 = '#d0d0d0' +let s:fg = '#abb2bf' +let s:blue = '#61afef' +let s:green = '#98c379' +let s:purple = '#c678dd' +let s:red1 = '#e06c75' +let s:red2 = '#be5046' +let s:yellow = '#e5c07b' + +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} + +let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:gray1, s:gray3 ] ] +let s:p.normal.middle = [ [ s:gray1, s:gray2 ] ] +let s:p.normal.right = [ [ s:bg, s:green, 'bold' ], [ s:bg, s:green, 'bold' ] ] +let s:p.normal.error = [ [ s:red2, s:bg ] ] +let s:p.normal.warning = [ [ s:yellow, s:bg ] ] + +let s:p.inactive.left = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] +let s:p.inactive.middle = [ [ s:gray3, s:gray2 ] ] +let s:p.inactive.right = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] + +let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:gray1, s:gray3 ] ] +let s:p.insert.right = [ [ s:bg, s:blue, 'bold' ], [ s:bg, s:blue, 'bold' ] ] + +let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:gray1, s:gray3 ] ] +let s:p.replace.right = [ [ s:bg, s:red1, 'bold' ], [ s:bg, s:red1, 'bold' ] ] + +let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:gray1, s:gray3 ] ] +let s:p.visual.right = [ [ s:bg, s:purple, 'bold' ], [ s:bg, s:purple, 'bold' ] ] + +let s:p.tabline.left = [ [ s:bg, s:gray3 ] ] +let s:p.tabline.tabsel = [ [ s:bg, s:purple, 'bold' ] ] +let s:p.tabline.middle = [ [ s:gray3, s:gray2 ] ] +let s:p.tabline.right = copy(s:p.normal.right) + +let g:lightline#colorscheme#one_light#palette = lightline#colorscheme#fill(s:p) diff --git a/doc/lightline.txt b/doc/lightline.txt index 22f9b0e..b86be50 100644 --- a/doc/lightline.txt +++ b/doc/lightline.txt @@ -223,7 +223,7 @@ OPTIONS *lightline-option* The colorscheme for lightline.vim. Currently, wombat, solarized, powerline, jellybeans, Tomorrow, Tomorrow_Night, Tomorrow_Night_Blue, Tomorrow_Night_Eighties, - PaperColor, seoul256, landscape, Dracula, and 16color are available. + PaperColor, seoul256, landscape, one, Dracula, and 16color are available. The default value is: > let g:lightline.colorscheme = 'default' From 23e62bd2fe69fbdb24374b6f3f42ba48713e757d Mon Sep 17 00:00:00 2001 From: Zoltan Dalmadi Date: Wed, 2 Nov 2016 17:36:10 +0100 Subject: [PATCH 2/3] Merged dark and light variants into one file --- autoload/lightline/colorscheme/one.vim | 57 ++++++++++++++++++-- autoload/lightline/colorscheme/one_dark.vim | 46 ---------------- autoload/lightline/colorscheme/one_light.vim | 46 ---------------- 3 files changed, 54 insertions(+), 95 deletions(-) delete mode 100644 autoload/lightline/colorscheme/one_dark.vim delete mode 100644 autoload/lightline/colorscheme/one_light.vim diff --git a/autoload/lightline/colorscheme/one.vim b/autoload/lightline/colorscheme/one.vim index 48fe271..c58ef41 100644 --- a/autoload/lightline/colorscheme/one.vim +++ b/autoload/lightline/colorscheme/one.vim @@ -2,11 +2,62 @@ " Filename: autoload/lightline/colorscheme/one.vim " Author: Zoltan Dalmadi " License: MIT License -" Last Change: 2016/11/2 14:56:14. +" Last Change: 2016/11/2 17:34:27. " ============================================================================= +" Common colors +let s:fg = '#abb2bf' +let s:blue = '#61afef' +let s:green = '#98c379' +let s:purple = '#c678dd' +let s:red1 = '#e06c75' +let s:red2 = '#be5046' +let s:yellow = '#e5c07b' + +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} + if &background ==# 'light' - let g:lightline#colorscheme#one#palette = g:lightline#colorscheme#one_light#palette + " Light variant + let s:bg = '#fafafa' + let s:gray1 = '#494b53' + let s:gray2 = '#f0f0f0' + let s:gray3 = '#d0d0d0' + + let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:gray1, s:gray3 ] ] + let s:p.normal.middle = [ [ s:gray1, s:gray2 ] ] + let s:p.inactive.left = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] + let s:p.inactive.middle = [ [ s:gray3, s:gray2 ] ] + let s:p.inactive.right = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] + let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:gray1, s:gray3 ] ] + let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:gray1, s:gray3 ] ] + let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:gray1, s:gray3 ] ] else - let g:lightline#colorscheme#one#palette = g:lightline#colorscheme#one_dark#palette + " Dark variant + let s:bg = '#282c34' + let s:gray1 = '#5c6370' + let s:gray2 = '#2c323d' + let s:gray3 = '#3e4452' + + let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:fg, s:gray3 ] ] + let s:p.normal.middle = [ [ s:fg, s:gray2 ] ] + let s:p.inactive.left = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] + let s:p.inactive.middle = [ [ s:gray1, s:gray2 ] ] + let s:p.inactive.right = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] + let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:fg, s:gray3 ] ] + let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:fg, s:gray3 ] ] + let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:fg, s:gray3 ] ] endif + +" Common +let s:p.normal.right = [ [ s:bg, s:green, 'bold' ], [ s:bg, s:green, 'bold' ] ] +let s:p.normal.error = [ [ s:red2, s:bg ] ] +let s:p.normal.warning = [ [ s:yellow, s:bg ] ] +let s:p.insert.right = [ [ s:bg, s:blue, 'bold' ], [ s:bg, s:blue, 'bold' ] ] +let s:p.replace.right = [ [ s:bg, s:red1, 'bold' ], [ s:bg, s:red1, 'bold' ] ] +let s:p.visual.right = [ [ s:bg, s:purple, 'bold' ], [ s:bg, s:purple, 'bold' ] ] +let s:p.tabline.left = [ [ s:bg, s:gray3 ] ] +let s:p.tabline.tabsel = [ [ s:bg, s:purple, 'bold' ] ] +let s:p.tabline.middle = [ [ s:gray3, s:gray2 ] ] +let s:p.tabline.right = copy(s:p.normal.right) + +let g:lightline#colorscheme#one#palette = lightline#colorscheme#fill(s:p) diff --git a/autoload/lightline/colorscheme/one_dark.vim b/autoload/lightline/colorscheme/one_dark.vim deleted file mode 100644 index d36f3ca..0000000 --- a/autoload/lightline/colorscheme/one_dark.vim +++ /dev/null @@ -1,46 +0,0 @@ -" ============================================================================= -" Filename: autoload/lightline/colorscheme/one_dark.vim -" Author: Zoltan Dalmadi -" License: MIT License -" Last Change: 2016/11/2 14:56:23. -" ============================================================================= - -let s:bg = '#282c34' -let s:gray1 = '#5c6370' -let s:gray2 = '#2c323d' -let s:gray3 = '#3e4452' -let s:fg = '#abb2bf' -let s:blue = '#61afef' -let s:green = '#98c379' -let s:purple = '#c678dd' -let s:red1 = '#e06c75' -let s:red2 = '#be5046' -let s:yellow = '#e5c07b' - -let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} - -let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:fg, s:gray3 ] ] -let s:p.normal.middle = [ [ s:fg, s:gray2 ] ] -let s:p.normal.right = [ [ s:bg, s:green, 'bold' ], [ s:bg, s:green, 'bold' ] ] -let s:p.normal.error = [ [ s:red2, s:bg ] ] -let s:p.normal.warning = [ [ s:yellow, s:bg ] ] - -let s:p.inactive.left = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] -let s:p.inactive.middle = [ [ s:gray1, s:gray2 ] ] -let s:p.inactive.right = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] - -let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:fg, s:gray3 ] ] -let s:p.insert.right = [ [ s:bg, s:blue, 'bold' ], [ s:bg, s:blue, 'bold' ] ] - -let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:fg, s:gray3 ] ] -let s:p.replace.right = [ [ s:bg, s:red1, 'bold' ], [ s:bg, s:red1, 'bold' ] ] - -let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:fg, s:gray3 ] ] -let s:p.visual.right = [ [ s:bg, s:purple, 'bold' ], [ s:bg, s:purple, 'bold' ] ] - -let s:p.tabline.left = [ [ s:bg, s:gray3 ] ] -let s:p.tabline.tabsel = [ [ s:bg, s:purple, 'bold' ] ] -let s:p.tabline.middle = [ [ s:gray3, s:gray2 ] ] -let s:p.tabline.right = copy(s:p.normal.right) - -let g:lightline#colorscheme#one_dark#palette = lightline#colorscheme#fill(s:p) diff --git a/autoload/lightline/colorscheme/one_light.vim b/autoload/lightline/colorscheme/one_light.vim deleted file mode 100644 index 7c27e30..0000000 --- a/autoload/lightline/colorscheme/one_light.vim +++ /dev/null @@ -1,46 +0,0 @@ -" ============================================================================= -" Filename: autoload/lightline/colorscheme/one_light.vim -" Author: Zoltan Dalmadi -" License: MIT License -" Last Change: 2016/11/2 14:56:38. -" ============================================================================= - -let s:bg = '#fafafa' -let s:gray1 = '#494b53' -let s:gray2 = '#f0f0f0' -let s:gray3 = '#d0d0d0' -let s:fg = '#abb2bf' -let s:blue = '#61afef' -let s:green = '#98c379' -let s:purple = '#c678dd' -let s:red1 = '#e06c75' -let s:red2 = '#be5046' -let s:yellow = '#e5c07b' - -let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} - -let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:gray1, s:gray3 ] ] -let s:p.normal.middle = [ [ s:gray1, s:gray2 ] ] -let s:p.normal.right = [ [ s:bg, s:green, 'bold' ], [ s:bg, s:green, 'bold' ] ] -let s:p.normal.error = [ [ s:red2, s:bg ] ] -let s:p.normal.warning = [ [ s:yellow, s:bg ] ] - -let s:p.inactive.left = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] -let s:p.inactive.middle = [ [ s:gray3, s:gray2 ] ] -let s:p.inactive.right = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] - -let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:gray1, s:gray3 ] ] -let s:p.insert.right = [ [ s:bg, s:blue, 'bold' ], [ s:bg, s:blue, 'bold' ] ] - -let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:gray1, s:gray3 ] ] -let s:p.replace.right = [ [ s:bg, s:red1, 'bold' ], [ s:bg, s:red1, 'bold' ] ] - -let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:gray1, s:gray3 ] ] -let s:p.visual.right = [ [ s:bg, s:purple, 'bold' ], [ s:bg, s:purple, 'bold' ] ] - -let s:p.tabline.left = [ [ s:bg, s:gray3 ] ] -let s:p.tabline.tabsel = [ [ s:bg, s:purple, 'bold' ] ] -let s:p.tabline.middle = [ [ s:gray3, s:gray2 ] ] -let s:p.tabline.right = copy(s:p.normal.right) - -let g:lightline#colorscheme#one_light#palette = lightline#colorscheme#fill(s:p) From f7941cedf37df1e82d16515e4a305484cef5e378 Mon Sep 17 00:00:00 2001 From: Zoltan Dalmadi Date: Thu, 3 Nov 2016 10:57:56 +0100 Subject: [PATCH 3/3] Changed indentation to soft tabs (2 spaces) --- autoload/lightline/colorscheme/one.vim | 52 +++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/autoload/lightline/colorscheme/one.vim b/autoload/lightline/colorscheme/one.vim index c58ef41..f50de8c 100644 --- a/autoload/lightline/colorscheme/one.vim +++ b/autoload/lightline/colorscheme/one.vim @@ -17,35 +17,35 @@ let s:yellow = '#e5c07b' let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} if &background ==# 'light' - " Light variant - let s:bg = '#fafafa' - let s:gray1 = '#494b53' - let s:gray2 = '#f0f0f0' - let s:gray3 = '#d0d0d0' + " Light variant + let s:bg = '#fafafa' + let s:gray1 = '#494b53' + let s:gray2 = '#f0f0f0' + let s:gray3 = '#d0d0d0' - let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:gray1, s:gray3 ] ] - let s:p.normal.middle = [ [ s:gray1, s:gray2 ] ] - let s:p.inactive.left = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] - let s:p.inactive.middle = [ [ s:gray3, s:gray2 ] ] - let s:p.inactive.right = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] - let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:gray1, s:gray3 ] ] - let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:gray1, s:gray3 ] ] - let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:gray1, s:gray3 ] ] + let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:gray1, s:gray3 ] ] + let s:p.normal.middle = [ [ s:gray1, s:gray2 ] ] + let s:p.inactive.left = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] + let s:p.inactive.middle = [ [ s:gray3, s:gray2 ] ] + let s:p.inactive.right = [ [ s:bg, s:gray3 ], [ s:bg, s:gray3 ] ] + let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:gray1, s:gray3 ] ] + let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:gray1, s:gray3 ] ] + let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:gray1, s:gray3 ] ] else - " Dark variant - let s:bg = '#282c34' - let s:gray1 = '#5c6370' - let s:gray2 = '#2c323d' - let s:gray3 = '#3e4452' + " Dark variant + let s:bg = '#282c34' + let s:gray1 = '#5c6370' + let s:gray2 = '#2c323d' + let s:gray3 = '#3e4452' - let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:fg, s:gray3 ] ] - let s:p.normal.middle = [ [ s:fg, s:gray2 ] ] - let s:p.inactive.left = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] - let s:p.inactive.middle = [ [ s:gray1, s:gray2 ] ] - let s:p.inactive.right = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] - let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:fg, s:gray3 ] ] - let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:fg, s:gray3 ] ] - let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:fg, s:gray3 ] ] + let s:p.normal.left = [ [ s:bg, s:green, 'bold' ], [ s:fg, s:gray3 ] ] + let s:p.normal.middle = [ [ s:fg, s:gray2 ] ] + let s:p.inactive.left = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] + let s:p.inactive.middle = [ [ s:gray1, s:gray2 ] ] + let s:p.inactive.right = [ [ s:gray1, s:bg ], [ s:gray1, s:bg ] ] + let s:p.insert.left = [ [ s:bg, s:blue, 'bold' ], [ s:fg, s:gray3 ] ] + let s:p.replace.left = [ [ s:bg, s:red1, 'bold' ], [ s:fg, s:gray3 ] ] + let s:p.visual.left = [ [ s:bg, s:purple, 'bold' ], [ s:fg, s:gray3 ] ] endif " Common