diff --git a/autoload/airline/themes/gotham.vim b/autoload/airline/themes/gotham.vim index aa36e15..65cb2cf 100644 --- a/autoload/airline/themes/gotham.vim +++ b/autoload/airline/themes/gotham.vim @@ -8,7 +8,7 @@ let s:c.base0 = { 'gui': '#0c1014', 'cterm': 0 } let s:c.base1 = { 'gui': '#11151c', 'cterm': 8 } let s:c.base2 = { 'gui': '#091f2e', 'cterm': 10 } let s:c.base3 = { 'gui': '#0a3749', 'cterm': 12 } -let s:c.base4 = { 'gui': '#245361', 'cterm': 11 } +let s:c.base4 = { 'gui': '#1e6479', 'cterm': 11 } let s:c.base5 = { 'gui': '#599cab', 'cterm': 14 } let s:c.base6 = { 'gui': '#99d1ce', 'cterm': 7 } let s:c.base7 = { 'gui': '#d3ebe9', 'cterm': 15 } @@ -44,7 +44,7 @@ endfunction " Colors. let s:N1 = s:Array('base2', 'blue') let s:N2 = s:Array('base5', 'base2') -let s:N3 = s:Array('base4', 'base1') +let s:N3 = s:Array('blue', 'base1') let g:airline#themes#gotham#palette.normal = \ airline#themes#generate_color_map(s:N1, s:N2, s:N3) @@ -60,7 +60,7 @@ let g:airline#themes#gotham#palette.normal_modified = { " Colors. let s:I1 = s:Array('base2', 'green') let s:I2 = s:Array('base6', 'base3') -let s:I3 = s:Array('base4', 'base1') +let s:I3 = s:Array('blue', 'base1') " Override for when increased contrast is enabled if get(g:, 'gotham_airline_emphasised_insert', 1) @@ -88,7 +88,7 @@ let g:airline#themes#gotham#palette.insert_paste = { " Colors. let s:R1 = s:Array('base2', 'orange') let s:R2 = s:Array('base6', 'base3') -let s:R3 = s:Array('base4', 'base1') +let s:R3 = s:Array('blue', 'base1') let g:airline#themes#gotham#palette.replace = \ airline#themes#generate_color_map(s:R1, s:R2, s:R3) @@ -118,9 +118,9 @@ let g:airline#themes#gotham#palette.visual_modified = " Inactive mode (when the focus is not on the window) ========================= -let s:IA1 = s:Array('base4', 'base2') -let s:IA2 = s:Array('base4', 'base1') -let s:IA3 = s:Array('base4', 'base0') +let s:IA1 = s:Array('blue', 'base2') +let s:IA2 = s:Array('blue', 'base1') +let s:IA3 = s:Array('blue', 'base0') let g:airline#themes#gotham#palette.inactive = \ airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3) @@ -154,7 +154,7 @@ if !get(g:, 'loaded_ctrlp', 0) endif let s:CP1 = s:Array('base6', 'base2', '') -let s:CP2 = s:Array('base6', 'base4', '') +let s:CP2 = s:Array('base6', 'blue', '') let s:CP3 = s:Array('base7', 'green', 'bold') let g:airline#themes#gotham#palette.ctrlp = diff --git a/autoload/airline/themes/gotham256.vim b/autoload/airline/themes/gotham256.vim index 5edadc5..9ee0967 100644 --- a/autoload/airline/themes/gotham256.vim +++ b/autoload/airline/themes/gotham256.vim @@ -8,7 +8,7 @@ let s:c.base0 = { 'gui': '#0c1014', 'cterm': 232 } let s:c.base1 = { 'gui': '#11151c', 'cterm': 233 } let s:c.base2 = { 'gui': '#091f2e', 'cterm': 17 } let s:c.base3 = { 'gui': '#0a3749', 'cterm': 18 } -let s:c.base4 = { 'gui': '#245361', 'cterm': 24 } +let s:c.base4 = { 'gui': '#1e6479', 'cterm': 31 } let s:c.base5 = { 'gui': '#599cab', 'cterm': 81 } let s:c.base6 = { 'gui': '#99d1ce', 'cterm': 122 } let s:c.base7 = { 'gui': '#d3ebe9', 'cterm': 194 } @@ -44,7 +44,7 @@ endfunction " Colors. let s:N1 = s:Array('base2', 'blue') let s:N2 = s:Array('base5', 'base2') -let s:N3 = s:Array('base4', 'base1') +let s:N3 = s:Array('blue', 'base1') let g:airline#themes#gotham256#palette.normal = \ airline#themes#generate_color_map(s:N1, s:N2, s:N3) @@ -60,7 +60,7 @@ let g:airline#themes#gotham256#palette.normal_modified = { " Colors. let s:I1 = s:Array('base2', 'green') let s:I2 = s:Array('base6', 'base3') -let s:I3 = s:Array('base4', 'base1') +let s:I3 = s:Array('blue', 'base1') " Override for when increased contrast is enabled if get(g:, 'gotham_airline_emphasised_insert', 1) @@ -88,7 +88,7 @@ let g:airline#themes#gotham256#palette.insert_paste = { " Colors. let s:R1 = s:Array('base2', 'orange') let s:R2 = s:Array('base6', 'base3') -let s:R3 = s:Array('base4', 'base1') +let s:R3 = s:Array('blue', 'base1') let g:airline#themes#gotham#palette.replace = \ airline#themes#generate_color_map(s:R1, s:R2, s:R3) @@ -118,9 +118,9 @@ let g:airline#themes#gotham256#palette.visual_modified = " Inactive mode (when the focus is not on the window) ========================= -let s:IA1 = s:Array('base4', 'base2') -let s:IA2 = s:Array('base4', 'base1') -let s:IA3 = s:Array('base4', 'base0') +let s:IA1 = s:Array('blue', 'base2') +let s:IA2 = s:Array('blue', 'base1') +let s:IA3 = s:Array('blue', 'base0') let g:airline#themes#gotham256#palette.inactive = \ airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3) @@ -154,7 +154,7 @@ if !get(g:, 'loaded_ctrlp', 0) endif let s:CP1 = s:Array('base6', 'base2', '') -let s:CP2 = s:Array('base6', 'base4', '') +let s:CP2 = s:Array('base6', 'blue', '') let s:CP3 = s:Array('base7', 'green', 'bold') let g:airline#themes#gotham256#palette.ctrlp = diff --git a/autoload/lightline/colorscheme/gotham.vim b/autoload/lightline/colorscheme/gotham.vim index e023385..ceed8ff 100644 --- a/autoload/lightline/colorscheme/gotham.vim +++ b/autoload/lightline/colorscheme/gotham.vim @@ -2,7 +2,7 @@ let s:base03 = [ '#0c1014', '0' ] let s:base02 = [ '#11151c', '8' ] let s:base01 = [ '#091f2e', '10' ] let s:base00 = [ '#0a3749', '12' ] -let s:base0 = [ '#245361', '11' ] +let s:base0 = [ '#1e6479', '11' ] let s:base1 = [ '#599cab', '14' ] let s:base2 = [ '#99d1ce', '7' ] let s:base3 = [ '#d3ebe9', '15' ] @@ -19,16 +19,16 @@ let s:green = [ '#2aa889', '2' ] let s:p = { 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {} } let s:p.normal.left = [ [ s:base3, s:blue ], [ s:base1, s:base01 ] ] -let s:p.normal.right = [ [ s:base3, s:base0 ], [ s:base1, s:base01 ] ] -let s:p.inactive.left = [ [ s:base0, s:base02 ], [ s:base0, s:base02 ] ] -let s:p.inactive.right = [ [ s:base0, s:base01 ], [ s:base0, s:base02 ] ] +let s:p.normal.right = [ [ s:base3, s:blue ], [ s:base1, s:base01 ] ] +let s:p.inactive.left = [ [ s:blue, s:base02 ], [ s:blue, s:base02 ] ] +let s:p.inactive.right = [ [ s:blue, s:base01 ], [ s:blue, s:base02 ] ] let s:p.insert.left = [ [ s:base3, s:green ], [ s:base1, s:base01 ] ] let s:p.replace.left = [ [ s:base3, s:red ], [ s:base1, s:base01 ] ] let s:p.visual.left = [ [ s:base3, s:violet ], [ s:base1, s:base01 ] ] let s:p.normal.middle = [ [ s:base1, s:base02 ] ] -let s:p.inactive.middle = [ [ s:base0, s:base02 ] ] +let s:p.inactive.middle = [ [ s:blue, s:base02 ] ] let s:p.tabline.left = [ [ s:base1, s:base01 ] ] -let s:p.tabline.tabsel = [ [ s:base3, s:base0 ] ] +let s:p.tabline.tabsel = [ [ s:base3, s:blue ] ] let s:p.tabline.middle = [ [ s:base1, s:base02 ] ] let s:p.tabline.right = [ [ s:base1, s:base01 ] ] let s:p.normal.error = [ [ s:base3, s:red ] ] diff --git a/autoload/lightline/colorscheme/gotham256.vim b/autoload/lightline/colorscheme/gotham256.vim index 1d25a56..97d3708 100644 --- a/autoload/lightline/colorscheme/gotham256.vim +++ b/autoload/lightline/colorscheme/gotham256.vim @@ -2,7 +2,7 @@ let s:base03 = [ '#0c1014', '232' ] let s:base02 = [ '#11151c', '233' ] let s:base01 = [ '#091f2e', '17' ] let s:base00 = [ '#0a3749', '18' ] -let s:base0 = [ '#245361', '24' ] +let s:base0 = [ '#1e6479', '31' ] let s:base1 = [ '#599cab', '81' ] let s:base2 = [ '#99d1ce', '122' ] let s:base3 = [ '#d3ebe9', '194' ] @@ -19,16 +19,16 @@ let s:green = [ '#2aa889', '78' ] let s:p = { 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {} } let s:p.normal.left = [ [ s:base3, s:blue ], [ s:base1, s:base01 ] ] -let s:p.normal.right = [ [ s:base3, s:base0 ], [ s:base1, s:base01 ] ] -let s:p.inactive.left = [ [ s:base0, s:base02 ], [ s:base0, s:base02 ] ] -let s:p.inactive.right = [ [ s:base0, s:base01 ], [ s:base0, s:base02 ] ] +let s:p.normal.right = [ [ s:base3, s:blue ], [ s:base1, s:base01 ] ] +let s:p.inactive.left = [ [ s:blue, s:base02 ], [ s:blue, s:base02 ] ] +let s:p.inactive.right = [ [ s:blue, s:base01 ], [ s:blue, s:base02 ] ] let s:p.insert.left = [ [ s:base3, s:green ], [ s:base1, s:base01 ] ] let s:p.replace.left = [ [ s:base3, s:red ], [ s:base1, s:base01 ] ] let s:p.visual.left = [ [ s:base3, s:violet ], [ s:base1, s:base01 ] ] let s:p.normal.middle = [ [ s:base1, s:base02 ] ] -let s:p.inactive.middle = [ [ s:base0, s:base02 ] ] +let s:p.inactive.middle = [ [ s:blue, s:base02 ] ] let s:p.tabline.left = [ [ s:base1, s:base01 ] ] -let s:p.tabline.tabsel = [ [ s:base3, s:base0 ] ] +let s:p.tabline.tabsel = [ [ s:base3, s:blue ] ] let s:p.tabline.middle = [ [ s:base1, s:base02 ] ] let s:p.tabline.right = [ [ s:base1, s:base01 ] ] let s:p.normal.error = [ [ s:base3, s:red ] ] diff --git a/colors/gotham.vim b/colors/gotham.vim index 82c489e..35b77d7 100644 --- a/colors/gotham.vim +++ b/colors/gotham.vim @@ -72,7 +72,7 @@ let s:colors.base0 = { 'gui': '#0c1014', 'cterm': 0 } let s:colors.base1 = { 'gui': '#11151c', 'cterm': 8 } let s:colors.base2 = { 'gui': '#091f2e', 'cterm': 10 } let s:colors.base3 = { 'gui': '#0a3749', 'cterm': 12 } -let s:colors.base4 = { 'gui': '#245361', 'cterm': 11 } +let s:colors.base4 = { 'gui': '#1e6479', 'cterm': 11 } let s:colors.base5 = { 'gui': '#599cab', 'cterm': 14 } let s:colors.base6 = { 'gui': '#99d1ce', 'cterm': 7 } let s:colors.base7 = { 'gui': '#d3ebe9', 'cterm': 15 } @@ -120,7 +120,7 @@ call s:Col('CursorLine', '', 'base1') call s:Col('CursorColumn', '', 'base1') " Sign column, line numbers. -call s:Col('LineNr', 'base4', s:linenr_background) +call s:Col('LineNr', 'blue', s:linenr_background) call s:Col('CursorLineNr', 'base5', s:linenr_background) call s:Col('SignColumn', '', s:linenr_background) call s:Col('ColorColumn', '', s:linenr_background) @@ -129,7 +129,7 @@ call s:Col('ColorColumn', '', s:linenr_background) call s:Col('Visual', '', 'base3') " Easy-to-guess code elements. -call s:Col('Comment', 'base4') +call s:Col('Comment', 'blue') call s:Col('String', 'green') call s:Col('Number', 'orange') call s:Col('Statement', 'base5') @@ -154,7 +154,7 @@ call s:Col('Type', 'orange') call s:Col('PreProc', 'red') " Tildes on the bottom of the page. -call s:Col('NonText', 'base4') +call s:Col('NonText', 'blue') " Concealed stuff. call s:Col('Conceal', 'cyan', s:background) @@ -163,8 +163,8 @@ call s:Col('Conceal', 'cyan', s:background) call s:Col('Todo', 'magenta', s:background) " The column separating vertical splits. -call s:Col('VertSplit', 'base4', s:linenr_background) -call s:Col('StatusLineNC', 'base4', 'base2') +call s:Col('VertSplit', 'blue', s:linenr_background) +call s:Col('StatusLineNC', 'blue', 'base2') " Matching parenthesis. call s:Col('MatchParen', 'base1', 'orange') @@ -182,9 +182,9 @@ call s:Attr('IncSearch', 'reverse') " Popup menu. call s:Col('Pmenu', 'base6', 'base2') -call s:Col('PmenuSel', 'base7', 'base4') +call s:Col('PmenuSel', 'base7', 'blue') call s:Col('PmenuSbar', '', 'base2') -call s:Col('PmenuThumb', '', 'base4') +call s:Col('PmenuThumb', '', 'blue') " Command line stuff. call s:Col('ErrorMsg', 'red', 'base1') @@ -201,7 +201,7 @@ call s:Col('WildMenu', 'base7', 'cyan') call s:Col('Question', 'green') " Tab line. -call s:Col('TabLineSel', 'base7', 'base4') " the selected tab +call s:Col('TabLineSel', 'base7', 'blue') " the selected tab call s:Col('TabLine', 'base6', 'base2') " the non-selected tabs call s:Col('TabLineFill', 'base0', 'base0') " the rest of the tab line @@ -219,7 +219,7 @@ call s:Col('DiffText', 'base7', 'cyan') call s:Col('DiffAdded', 'green') call s:Col('DiffChanged', 'blue') call s:Col('DiffRemoved', 'red') -call s:Col('DiffSubname', 'base4') +call s:Col('DiffSubname', 'blue') " Directories (e.g. netrw). call s:Col('Directory', 'cyan') @@ -250,7 +250,7 @@ call s:Col('GitGutterChangeDelete', 'magenta', s:linenr_background) " CtrlP call s:Col('CtrlPNoEntries', 'base7', 'orange') " no entries call s:Col('CtrlPMatch', 'green') " matching part -call s:Col('CtrlPPrtBase', 'base4') " '>>>' prompt +call s:Col('CtrlPPrtBase', 'blue') " '>>>' prompt call s:Col('CtrlPPrtText', 'cyan') " text in the prompt call s:Col('CtrlPPtrCursor', 'base7') " cursor in the prompt diff --git a/colors/gotham256.vim b/colors/gotham256.vim index 4f99b0c..45c6c05 100644 --- a/colors/gotham256.vim +++ b/colors/gotham256.vim @@ -72,7 +72,7 @@ let s:colors.base0 = { 'gui': '#0c1014', 'cterm': 232 } let s:colors.base1 = { 'gui': '#11151c', 'cterm': 233 } let s:colors.base2 = { 'gui': '#091f2e', 'cterm': 17 } let s:colors.base3 = { 'gui': '#0a3749', 'cterm': 18 } -let s:colors.base4 = { 'gui': '#245361', 'cterm': 24 } +let s:colors.base4 = { 'gui': '#1e6479', 'cterm': 31 } let s:colors.base5 = { 'gui': '#599cab', 'cterm': 81 } let s:colors.base6 = { 'gui': '#99d1ce', 'cterm': 122 } let s:colors.base7 = { 'gui': '#d3ebe9', 'cterm': 194 } @@ -120,7 +120,7 @@ call s:Col('CursorLine', '', 'base1') call s:Col('CursorColumn', '', 'base1') " Sign column, line numbers. -call s:Col('LineNr', 'base4', s:linenr_background) +call s:Col('LineNr', 'blue', s:linenr_background) call s:Col('CursorLineNr', 'base5', s:linenr_background) call s:Col('SignColumn', '', s:linenr_background) call s:Col('ColorColumn', '', s:linenr_background) @@ -129,7 +129,7 @@ call s:Col('ColorColumn', '', s:linenr_background) call s:Col('Visual', '', 'base3') " Easy-to-guess code elements. -call s:Col('Comment', 'base4') +call s:Col('Comment', 'blue') call s:Col('String', 'green') call s:Col('Number', 'orange') call s:Col('Statement', 'base5') @@ -154,7 +154,7 @@ call s:Col('Type', 'orange') call s:Col('PreProc', 'red') " Tildes on the bottom of the page. -call s:Col('NonText', 'base4') +call s:Col('NonText', 'blue') " Concealed stuff. call s:Col('Conceal', 'cyan', s:background) @@ -164,7 +164,7 @@ call s:Col('Todo', 'magenta', s:background) " The column separating vertical splits. call s:Col('VertSplit', 'base2', s:linenr_background) -call s:Col('StatusLineNC', 'base4', 'base2') +call s:Col('StatusLineNC', 'blue', 'base2') " Matching parenthesis. call s:Col('MatchParen', 'base1', 'orange') @@ -182,9 +182,9 @@ call s:Attr('IncSearch', 'reverse') " Popup menu. call s:Col('Pmenu', 'base6', 'base2') -call s:Col('PmenuSel', 'base7', 'base4') +call s:Col('PmenuSel', 'base7', 'blue') call s:Col('PmenuSbar', '', 'base2') -call s:Col('PmenuThumb', '', 'base4') +call s:Col('PmenuThumb', '', 'blue') " Command line stuff. call s:Col('ErrorMsg', 'red', 'base1') @@ -201,7 +201,7 @@ call s:Col('WildMenu', 'base7', 'cyan') call s:Col('Question', 'green') " Tab line. -call s:Col('TabLineSel', 'base7', 'base4') " the selected tab +call s:Col('TabLineSel', 'base7', 'blue') " the selected tab call s:Col('TabLine', 'base6', 'base2') " the non-selected tabs call s:Col('TabLineFill', 'base0', 'base0') " the rest of the tab line @@ -219,7 +219,7 @@ call s:Col('DiffText', 'base7', 'cyan') call s:Col('DiffAdded', 'green') call s:Col('DiffChanged', 'blue') call s:Col('DiffRemoved', 'red') -call s:Col('DiffSubname', 'base4') +call s:Col('DiffSubname', 'blue') " Directories (e.g. netrw). call s:Col('Directory', 'cyan') @@ -251,7 +251,7 @@ call s:Col('GitGutterChangeDelete', 'magenta', s:linenr_background) " CtrlP call s:Col('CtrlPNoEntries', 'base7', 'orange') " no entries call s:Col('CtrlPMatch', 'green') " matching part -call s:Col('CtrlPPrtBase', 'base4') " '>>>' prompt +call s:Col('CtrlPPrtBase', 'blue') " '>>>' prompt call s:Col('CtrlPPrtText', 'cyan') " text in the prompt call s:Col('CtrlPPtrCursor', 'base7') " cursor in the prompt