From ee2d1a5aad7e258a53908ef6ef347f70dd302831 Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Sat, 5 Nov 2016 03:52:44 -0500 Subject: [PATCH 1/8] Added a Molokai ColorScheme --- autoload/lightline/colorscheme/molokai.vim | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 autoload/lightline/colorscheme/molokai.vim diff --git a/autoload/lightline/colorscheme/molokai.vim b/autoload/lightline/colorscheme/molokai.vim new file mode 100644 index 0000000..839cc38 --- /dev/null +++ b/autoload/lightline/colorscheme/molokai.vim @@ -0,0 +1,36 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/molokai.vim +" Author: challsted +" License: MIT License +" ============================================================================= +" +let s:black = '#1A1A1A' +let s:gray = '#44475a' +let s:white = '#f8f8f2' +let s:darkblue = '#1B388D' +let s:cyan = '#66D9EF' +let s:green = '#37E42E' +let s:orange = '#FF8000' +let s:pink = '#FB26BF' +let s:purple = '#8000FF' +let s:red = '#FF0000' +let s:yellow = '#E6DB74' + +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} +let s:p.insert.left = [ [ s:black, s:green ], [ s:black, s:darkblue ] ] +let s:p.visual.left = [ [ s:black, s:orange ], [ s:darkblue, s:black ] ] +let s:p.replace.left = [ [ s:black, s:red ], [ s:orange, s:black ] ] +let s:p.normal.left = [ [ s:black, s:pink ], [ s:black, s:orange ] ] +let s:p.normal.middle = [ [ s:pink, s:black ] ] +let s:p.normal.right = [ [ s:white, s:gray ], [ s:white, s:gray ] ] +let s:p.normal.error = [ [ s:red, s:black ] ] +let s:p.normal.warning = [ [ s:yellow, s:black ] ] +let s:p.inactive.right = [ [ s:black, s:gray ], [ s:white, s:black ] ] +let s:p.inactive.middle = [ [ s:white, s:gray ] ] +let s:p.inactive.left = [ [ s:yellow, s:black ], [ s:white, s:black ] ] +let s:p.tabline.left = [ [ s:pink, s:black ] ] +let s:p.tabline.tabsel = [ [ s:black, s:pink ] ] +let s:p.tabline.middle = [ [ s:pink, s:black] ] +let s:p.tabline.right = copy(s:p.normal.right) + +let g:lightline#colorscheme#molokai#palette = lightline#colorscheme#fill(s:p) From 1c42f374529a6023c80a5fc03cfdadab6d02e0e2 Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Sun, 6 Nov 2016 12:59:17 -0600 Subject: [PATCH 2/8] Converted to lowercase hex values --- autoload/lightline/colorscheme/molokai.vim | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/autoload/lightline/colorscheme/molokai.vim b/autoload/lightline/colorscheme/molokai.vim index 839cc38..9b7e0f3 100644 --- a/autoload/lightline/colorscheme/molokai.vim +++ b/autoload/lightline/colorscheme/molokai.vim @@ -4,17 +4,17 @@ " License: MIT License " ============================================================================= " -let s:black = '#1A1A1A' +let s:black = '#1a1a1a' let s:gray = '#44475a' let s:white = '#f8f8f2' -let s:darkblue = '#1B388D' -let s:cyan = '#66D9EF' -let s:green = '#37E42E' -let s:orange = '#FF8000' -let s:pink = '#FB26BF' -let s:purple = '#8000FF' -let s:red = '#FF0000' -let s:yellow = '#E6DB74' +let s:darkblue = '#1b388d' +let s:cyan = '#66d9ef' +let s:green = '#37e42e' +let s:orange = '#ff8000' +let s:pink = '#fb26bf' +let s:purple = '#8000ff' +let s:red = '#ff0000' +let s:yellow = '#e6db74' let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p.insert.left = [ [ s:black, s:green ], [ s:black, s:darkblue ] ] From 224c94fe9244e78c7a444ba48dfff7e0558925b0 Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Tue, 8 Nov 2016 08:33:50 -0600 Subject: [PATCH 3/8] Added CUI and removed bloat Added CTERM Colors as requested by itchyny and removed colors that were not being called by the colorscheme. Things that need to be done still: No idea what the "Inactive" colors are for.... they are kind of just defaulting to what they origionally were... --- autoload/lightline/colorscheme/molokai.vim | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/autoload/lightline/colorscheme/molokai.vim b/autoload/lightline/colorscheme/molokai.vim index 9b7e0f3..a450ab2 100644 --- a/autoload/lightline/colorscheme/molokai.vim +++ b/autoload/lightline/colorscheme/molokai.vim @@ -4,26 +4,24 @@ " License: MIT License " ============================================================================= " -let s:black = '#1a1a1a' -let s:gray = '#44475a' -let s:white = '#f8f8f2' -let s:darkblue = '#1b388d' -let s:cyan = '#66d9ef' -let s:green = '#37e42e' -let s:orange = '#ff8000' -let s:pink = '#fb26bf' -let s:purple = '#8000ff' -let s:red = '#ff0000' -let s:yellow = '#e6db74' +let s:black = [ '#232526', 199 ] +let s:gray = [ '#808080', 244 ] +let s:white = [ '#f8f8f2', 234 ] +let s:cyan = [ '#66d9ef', 81 ] +let s:green = [ '#a6e22e', 118 ] +let s:orange = [ '#ef5939', 166 ] +let s:pink = [ '#f92672', 161 ] +let s:red = [ '#ff0000', 52 ] +let s:yellow = [ '#e6db74', 229 ] let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.insert.left = [ [ s:black, s:green ], [ s:black, s:darkblue ] ] -let s:p.visual.left = [ [ s:black, s:orange ], [ s:darkblue, s:black ] ] -let s:p.replace.left = [ [ s:black, s:red ], [ s:orange, s:black ] ] -let s:p.normal.left = [ [ s:black, s:pink ], [ s:black, s:orange ] ] +let s:p.insert.left = [ [ s:black, s:green ], [ s:cyan, s:black ] ] +let s:p.visual.left = [ [ s:black, s:orange ], [ s:black, s:cyan ] ] +let s:p.replace.left = [ [ s:black, s:red ], [ s:black, s:orange ] ] +let s:p.normal.left = [ [ s:black, s:pink ], [ s:orange, s:black ] ] let s:p.normal.middle = [ [ s:pink, s:black ] ] let s:p.normal.right = [ [ s:white, s:gray ], [ s:white, s:gray ] ] -let s:p.normal.error = [ [ s:red, s:black ] ] +let s:p.normal.error = [ [ s:pink, s:black ] ] let s:p.normal.warning = [ [ s:yellow, s:black ] ] let s:p.inactive.right = [ [ s:black, s:gray ], [ s:white, s:black ] ] let s:p.inactive.middle = [ [ s:white, s:gray ] ] @@ -33,4 +31,4 @@ let s:p.tabline.tabsel = [ [ s:black, s:pink ] ] let s:p.tabline.middle = [ [ s:pink, s:black] ] let s:p.tabline.right = copy(s:p.normal.right) -let g:lightline#colorscheme#molokai#palette = lightline#colorscheme#fill(s:p) +let g:lightline#colorscheme#molokai#palette = lightline#colorscheme#flatten(s:p) From 46f8839e387301d45bbf337e5321aa127f71366b Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Tue, 8 Nov 2016 09:02:13 -0600 Subject: [PATCH 4/8] Fixed a few CTerms --- autoload/lightline/colorscheme/molokai.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/lightline/colorscheme/molokai.vim b/autoload/lightline/colorscheme/molokai.vim index a450ab2..f46987f 100644 --- a/autoload/lightline/colorscheme/molokai.vim +++ b/autoload/lightline/colorscheme/molokai.vim @@ -4,14 +4,14 @@ " License: MIT License " ============================================================================= " -let s:black = [ '#232526', 199 ] +let s:black = [ '#232526', 233 ] let s:gray = [ '#808080', 244 ] let s:white = [ '#f8f8f2', 234 ] let s:cyan = [ '#66d9ef', 81 ] let s:green = [ '#a6e22e', 118 ] let s:orange = [ '#ef5939', 166 ] let s:pink = [ '#f92672', 161 ] -let s:red = [ '#ff0000', 52 ] +let s:red = [ '#ff0000', 160 ] let s:yellow = [ '#e6db74', 229 ] let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} @@ -19,7 +19,7 @@ let s:p.insert.left = [ [ s:black, s:green ], [ s:cyan, s:black ] ] let s:p.visual.left = [ [ s:black, s:orange ], [ s:black, s:cyan ] ] let s:p.replace.left = [ [ s:black, s:red ], [ s:black, s:orange ] ] let s:p.normal.left = [ [ s:black, s:pink ], [ s:orange, s:black ] ] -let s:p.normal.middle = [ [ s:pink, s:black ] ] +let s:p.normal.middle = [ [ s:black, s:black ] ] let s:p.normal.right = [ [ s:white, s:gray ], [ s:white, s:gray ] ] let s:p.normal.error = [ [ s:pink, s:black ] ] let s:p.normal.warning = [ [ s:yellow, s:black ] ] From ff130894847cd166cbb88e52d3f8a0e801c214a0 Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Fri, 11 Nov 2016 10:14:55 -0600 Subject: [PATCH 5/8] Added doc for future Colorscheme Contributors --- doc/lightline.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/lightline.txt b/doc/lightline.txt index b86be50..12e7827 100644 --- a/doc/lightline.txt +++ b/doc/lightline.txt @@ -636,6 +636,16 @@ compiled version of your colorscheme. < Then copy and paste the result to the colorscheme file. +If you want to contribute a new colorscheme that is not currently available +please follow the following rules: + *) All hex codes should be lowercase only + *) Use 2 space soft tabs + *) If your colorscheme has both light and dark variants, use a single file + *) Normal Mode should default to Cyan + *) Insert Mode should default to Green + *) Visual Mode should default to Yellow + *) Replace Mode should default to Red + ============================================================================== EXAMPLES *lightline-examples* You can configure the appearance of statusline. From c410c2876d3059efd18fa1a615980b569b171efb Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Fri, 11 Nov 2016 10:18:00 -0600 Subject: [PATCH 6/8] Added Colorscheme to list --- doc/lightline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lightline.txt b/doc/lightline.txt index 12e7827..8b0a580 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, one, Dracula, and 16color are available. + PaperColor, seoul256, landscape, one, Dracula, Molokai and 16color are available. The default value is: > let g:lightline.colorscheme = 'default' From 4da31a8670d814b660a2d006437a342afa4236db Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Fri, 11 Nov 2016 10:18:22 -0600 Subject: [PATCH 7/8] Converted to use default colors and a flag --- autoload/lightline/colorscheme/molokai.vim | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/autoload/lightline/colorscheme/molokai.vim b/autoload/lightline/colorscheme/molokai.vim index f46987f..804275c 100644 --- a/autoload/lightline/colorscheme/molokai.vim +++ b/autoload/lightline/colorscheme/molokai.vim @@ -15,10 +15,27 @@ let s:red = [ '#ff0000', 160 ] let s:yellow = [ '#e6db74', 229 ] let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.insert.left = [ [ s:black, s:green ], [ s:cyan, s:black ] ] -let s:p.visual.left = [ [ s:black, s:orange ], [ s:black, s:cyan ] ] + +" Use 'lightline_molokai_alternative = 1' in your .vimrc or init.vim to use a +" slightly more molokai like appearnace for your bar +if exists("g:lightline_molokai_alternative") + let s:lightline_molokai_alternative = g:lightline_molokai_alternative +else + let s:lightline_molokai_alternative = 0 +endif + + + +if s:lightline_molokai_alternative == 1 + let s:p.visual.left = [ [ s:black, s:orange ], [ s:black, s:cyan ] ] + let s:p.normal.left = [ [ s:black, s:pink ], [ s:orange, s:black ] ] +else + let s:p.visual.left = [ [ s:black, s:yellow ], [ s:black, s:cyan ] ] + let s:p.normal.left = [ [ s:black, s:cyan ], [ s:orange, s:black ] ] +end + let s:p.replace.left = [ [ s:black, s:red ], [ s:black, s:orange ] ] -let s:p.normal.left = [ [ s:black, s:pink ], [ s:orange, s:black ] ] +let s:p.insert.left = [ [ s:black, s:green ], [ s:cyan, s:black ] ] let s:p.normal.middle = [ [ s:black, s:black ] ] let s:p.normal.right = [ [ s:white, s:gray ], [ s:white, s:gray ] ] let s:p.normal.error = [ [ s:pink, s:black ] ] From 44b25f4b7a2d0926dfee0652ce4065bc7c1f9c3b Mon Sep 17 00:00:00 2001 From: Chase Hallsted Date: Mon, 14 Nov 2016 09:43:24 -0600 Subject: [PATCH 8/8] Revamped colorscheme to match Itchyny's standards Removed g: flag that allowed for alternate as well as moved colors around to make them make more sence. I actually like this better now --- autoload/lightline/colorscheme/molokai.vim | 42 +++++++++------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/autoload/lightline/colorscheme/molokai.vim b/autoload/lightline/colorscheme/molokai.vim index 804275c..0c77f4f 100644 --- a/autoload/lightline/colorscheme/molokai.vim +++ b/autoload/lightline/colorscheme/molokai.vim @@ -16,36 +16,28 @@ let s:yellow = [ '#e6db74', 229 ] let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -" Use 'lightline_molokai_alternative = 1' in your .vimrc or init.vim to use a -" slightly more molokai like appearnace for your bar -if exists("g:lightline_molokai_alternative") - let s:lightline_molokai_alternative = g:lightline_molokai_alternative -else - let s:lightline_molokai_alternative = 0 -endif - - - -if s:lightline_molokai_alternative == 1 - let s:p.visual.left = [ [ s:black, s:orange ], [ s:black, s:cyan ] ] - let s:p.normal.left = [ [ s:black, s:pink ], [ s:orange, s:black ] ] -else - let s:p.visual.left = [ [ s:black, s:yellow ], [ s:black, s:cyan ] ] - let s:p.normal.left = [ [ s:black, s:cyan ], [ s:orange, s:black ] ] -end - -let s:p.replace.left = [ [ s:black, s:red ], [ s:black, s:orange ] ] -let s:p.insert.left = [ [ s:black, s:green ], [ s:cyan, s:black ] ] -let s:p.normal.middle = [ [ s:black, s:black ] ] -let s:p.normal.right = [ [ s:white, s:gray ], [ s:white, s:gray ] ] +let s:p.normal.left = [ [ s:black, s:cyan ], [ s:orange, s:black ] ] +let s:p.normal.middle = [ [ s:orange, s:black ] ] +let s:p.normal.right = [ [ s:pink, s:black ], [ s:black, s:pink ] ] let s:p.normal.error = [ [ s:pink, s:black ] ] let s:p.normal.warning = [ [ s:yellow, s:black ] ] -let s:p.inactive.right = [ [ s:black, s:gray ], [ s:white, s:black ] ] + +let s:p.insert.left = [ [ s:black, s:green ], [ s:cyan, s:black ] ] +let s:p.insert.middle = [ [ s:black, s:green ], [ s:cyan, s:black ] ] + +let s:p.visual.left = [ [ s:black, s:yellow ], [ s:black, s:orange ] ] +let s:p.visual.middle = [ [ s:yellow, s:black ] ] + +let s:p.replace.left = [ [ s:black, s:red ], [ s:black, s:cyan ] ] +let s:p.replace.middle = [ [ s:red, s:black ] ] + +let s:p.inactive.left = [ [ s:pink, s:black ], [ s:white, s:black ] ] let s:p.inactive.middle = [ [ s:white, s:gray ] ] -let s:p.inactive.left = [ [ s:yellow, s:black ], [ s:white, s:black ] ] +let s:p.inactive.right = [ [ s:white, s:pink ], [ s:pink, s:black ] ] + let s:p.tabline.left = [ [ s:pink, s:black ] ] -let s:p.tabline.tabsel = [ [ s:black, s:pink ] ] let s:p.tabline.middle = [ [ s:pink, s:black] ] let s:p.tabline.right = copy(s:p.normal.right) +let s:p.tabline.tabsel = [ [ s:black, s:pink ] ] let g:lightline#colorscheme#molokai#palette = lightline#colorscheme#flatten(s:p)