Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mhartington committed Jan 4, 2018
1 parent 312fcb8 commit e068c75
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -0,0 +1 @@
.DS_Store
19 changes: 14 additions & 5 deletions autoload/airline/themes/oceanicnext.vim
Expand Up @@ -23,7 +23,7 @@
let s:base10=['#ffffff', '15']
" }}}

let s:normal1 = [s:base10[0], s:base0D[0], s:base10[1], s:base0D[1]]
let s:normal1 = [s:base10[0], s:base0C[0], s:base10[1], s:base0C[1]]
let s:normal2 = [s:base07[0], s:base03[0], s:base07[1], s:base03[1]]
let s:normal3 = [s:base07[0], s:base01[0], s:base07[1], s:base01[1]]
let s:inactive1 = [s:base07[0], s:base03[0], s:base07[1], s:base03[1]]
Expand All @@ -41,17 +41,26 @@ let s:visual3 = [s:base07[0], s:base01[0], s:base07[1], s:base01[1]]
let s:ctrlp1 = [s:base10[0], s:base01[0], s:base10[1], s:base01[1]]
let s:ctrlp2 = [s:base10[0], s:base03[0], s:base10[1], s:base03[1]]
let s:ctrlp3 = [s:base10[0], s:base0D[0], s:base10[1], s:base0D[1]]
let s:warning = [s:base00[0], s:base09[0], s:base00[1], s:base09[1]]
let s:error = [s:base00[0], s:base08[0], s:base00[1], s:base08[1]]
let s:warning = [s:base09[0], s:base01[0], s:base09[1], s:base01[1]]
let s:error = [s:base08[0], s:base01[0], s:base08[1], s:base01[1]]

let g:airline#themes#oceanicnext#palette = {}
let g:airline#themes#oceanicnext#palette.normal = airline#themes#generate_color_map(s:normal1, s:normal2, s:normal3)
let g:airline#themes#oceanicnext#palette.normal.airline_warning = s:warning
let g:airline#themes#oceanicnext#palette.normal.airline_error = s:error
let g:airline#themes#oceanicnext#palette.insert = airline#themes#generate_color_map(s:insert1, s:insert2, s:insert3)
let g:airline#themes#oceanicnext#palette.insert.airline_warning = s:warning
let g:airline#themes#oceanicnext#palette.insert.airline_error = s:error
let g:airline#themes#oceanicnext#palette.replace = airline#themes#generate_color_map(s:replace1, s:replace2, s:replace3)
let g:airline#themes#oceanicnext#palette.replace.airline_warning = s:warning
let g:airline#themes#oceanicnext#palette.replace.airline_error = s:error
let g:airline#themes#oceanicnext#palette.visual = airline#themes#generate_color_map(s:visual1, s:visual2, s:visual3)
let g:airline#themes#oceanicnext#palette.visual.airline_warning = s:warning
let g:airline#themes#oceanicnext#palette.visual.airline_error = s:error
let g:airline#themes#oceanicnext#palette.inactive = airline#themes#generate_color_map(s:inactive1, s:inactive2, s:inactive3)
let g:airline#themes#oceanicnext#palette.normal.airline_warning = s:warning
let g:airline#themes#oceanicnext#palette.normal.airline_error = s:error
let g:airline#themes#oceanicnext#palette.inactive.airline_warning = s:warning
let g:airline#themes#oceanicnext#palette.inactive.airline_error = s:error


if !get(g:, 'loaded_ctrlp', 0)
finish
Expand Down
18 changes: 13 additions & 5 deletions autoload/airline/themes/oceanicnextlight.vim
Expand Up @@ -23,7 +23,7 @@
let s:base10 =['#ffffff', '15']
" }}}

let s:normal1 = [s:base10[0], s:base0D[0], s:base10[1], s:base0D[1]]
let s:normal1 = [s:base10[0], s:base0C[0], s:base10[1], s:base0C[1]]
let s:normal2 = [s:base07[0], s:base03[0], s:base07[1], s:base03[1]]
let s:normal3 = [s:base07[0], s:base01[0], s:base07[1], s:base01[1]]
let s:inactive1 = [s:base07[0], s:base03[0], s:base07[1], s:base03[1]]
Expand All @@ -41,17 +41,25 @@ let s:visual3 = [s:base07[0], s:base01[0], s:base07[1], s:base01[1]]
let s:ctrlp1 = [s:base10[0], s:base01[0], s:base10[1], s:base01[1]]
let s:ctrlp2 = [s:base10[0], s:base03[0], s:base10[1], s:base03[1]]
let s:ctrlp3 = [s:base10[0], s:base0D[0], s:base10[1], s:base0D[1]]
let s:warning = [s:base00[0], s:base09[0], s:base00[1], s:base09[1]]
let s:error = [s:base00[0], s:base08[0], s:base00[1], s:base08[1]]
let s:warning = [s:base09[0], s:base01[0], s:base09[1], s:base01[1]]
let s:error = [s:base08[0], s:base01[0], s:base08[1], s:base01[1]]

let g:airline#themes#oceanicnextlight#palette = {}
let g:airline#themes#oceanicnextlight#palette.normal = airline#themes#generate_color_map(s:normal1, s:normal2, s:normal3)
let g:airline#themes#oceanicnextlight#palette.normal.airline_warning = s:warning
let g:airline#themes#oceanicnextlight#palette.normal.airline_error = s:error
let g:airline#themes#oceanicnextlight#palette.insert = airline#themes#generate_color_map(s:insert1, s:insert2, s:insert3)
let g:airline#themes#oceanicnextlight#palette.insert.airline_warning = s:warning
let g:airline#themes#oceanicnextlight#palette.insert.airline_error = s:error
let g:airline#themes#oceanicnextlight#palette.replace = airline#themes#generate_color_map(s:replace1, s:replace2, s:replace3)
let g:airline#themes#oceanicnextlight#palette.replace.airline_warning = s:warning
let g:airline#themes#oceanicnextlight#palette.replace.airline_error = s:error
let g:airline#themes#oceanicnextlight#palette.visual = airline#themes#generate_color_map(s:visual1, s:visual2, s:visual3)
let g:airline#themes#oceanicnextlight#palette.visual.airline_warning = s:warning
let g:airline#themes#oceanicnextlight#palette.visual.airline_error = s:error
let g:airline#themes#oceanicnextlight#palette.inactive = airline#themes#generate_color_map(s:inactive1, s:inactive2, s:inactive3)
let g:airline#themes#oceanicnext#palette.normal.airline_warning = s:warning
let g:airline#themes#oceanicnext#palette.normal.airline_error = s:error
let g:airline#themes#oceanicnextlight#palette.inactive.airline_warning = s:warning
let g:airline#themes#oceanicnextlight#palette.inactive.airline_error = s:error

if !get(g:, 'loaded_ctrlp', 0)
finish
Expand Down
17 changes: 9 additions & 8 deletions colors/OceanicNext.vim
Expand Up @@ -44,6 +44,7 @@
let s:base0F=['#ab7967', '137']
let s:base10=['#ffffff', '15']
let s:none=['NONE', 'NONE']

" }}}
" {{{ Highlight function
function! <sid>hi(group, fg, bg, attr, attrsp)
Expand Down Expand Up @@ -101,7 +102,7 @@ call <sid>hi('StatusLineNC', s:base03, s:base01, '', '')
call <sid>hi('VertSplit', s:base00, s:base02, '', '')
call <sid>hi('ColorColumn', '', s:base01, '', '')
call <sid>hi('CursorColumn', '', s:base01, '', '')
call <sid>hi('CursorLine', '', s:base01, '', '')
call <sid>hi('CursorLine', '', s:base01, 'NONE', '')
call <sid>hi('CursorLineNR', s:base00, s:base00, '', '')
call <sid>hi('CursorLineNr', s:base03, s:base01, '', '')
call <sid>hi('PMenu', s:base04, s:base01, '', '')
Expand Down Expand Up @@ -143,10 +144,10 @@ call <sid>hi('Todo', s:base0A, s:base01, '', '')
call <sid>hi('Type', s:base0A, '', '', '')
call <sid>hi('Typedef', s:base0A, '', '', '')

call <sid>hi('SpellBad', '', s:base00, 'undercurl', '')
call <sid>hi('SpellLocal', '', s:base00, 'undercurl', '')
call <sid>hi('SpellCap', '', s:base00, 'undercurl', '')
call <sid>hi('SpellRare', '', s:base00, 'undercurl', '')
call <sid>hi('SpellBad', '', '', 'undercurl', '')
call <sid>hi('SpellLocal', '', '', 'undercurl', '')
call <sid>hi('SpellCap', '', '', 'undercurl', '')
call <sid>hi('SpellRare', '', '', 'undercurl', '')

call <sid>hi('csClass', s:base0A, '', '', '')
call <sid>hi('csAttribute', s:base0A, '', '', '')
Expand Down Expand Up @@ -195,9 +196,9 @@ call <sid>hi('markdownBold', s:base0A, '', s:bold, '')
call <sid>hi('markdownCodeDelimiter', s:base0F, '', s:italic, '')
call <sid>hi('markdownError', s:base05, s:base00, '', '')

call <sid>hi('NeomakeErrorSign', s:base08, s:base01, '', '')
call <sid>hi('NeomakeWarningSign', s:base0A, s:base01, '', '')
call <sid>hi('NeomakeInfoSign', s:base10, s:base01, '', '')
call <sid>hi('NeomakeErrorSign', s:base08, s:base00, '', '')
call <sid>hi('NeomakeWarningSign', s:base0A, s:base00, '', '')
call <sid>hi('NeomakeInfoSign', s:base10, s:base00, '', '')
call <sid>hi('NeomakeError', s:base08, '', 'undercurl', s:base08)
call <sid>hi('NeomakeWarning', s:base08, '', 'undercurl', s:base08)

Expand Down
16 changes: 8 additions & 8 deletions colors/OceanicNextLight.vim
Expand Up @@ -101,7 +101,7 @@ call <sid>hi('StatusLineNC', s:base03, s:base01, '', '')
call <sid>hi('VertSplit', s:base00, s:base02, '', '')
call <sid>hi('ColorColumn', '', s:base01, '', '')
call <sid>hi('CursorColumn', '', s:base01, '', '')
call <sid>hi('CursorLine', '', s:base01, '', '')
call <sid>hi('CursorLine', '', s:base01, 'NONE', '')
call <sid>hi('CursorLineNR', s:base00, s:base00, '', '')
call <sid>hi('CursorLineNr', s:base03, s:base01, '', '')
call <sid>hi('PMenu', s:base04, s:base01, '', '')
Expand Down Expand Up @@ -143,10 +143,10 @@ call <sid>hi('Todo', s:base0A, s:base01, '', '')
call <sid>hi('Type', s:base0A, '', '', '')
call <sid>hi('Typedef', s:base0A, '', '', '')

call <sid>hi('SpellBad', '', s:base00, 'undercurl', '')
call <sid>hi('SpellLocal', '', s:base00, 'undercurl', '')
call <sid>hi('SpellCap', '', s:base00, 'undercurl', '')
call <sid>hi('SpellRare', '', s:base00, 'undercurl', '')
call <sid>hi('SpellBad', '', '', 'undercurl', '')
call <sid>hi('SpellLocal', '', '', 'undercurl', '')
call <sid>hi('SpellCap', '', '', 'undercurl', '')
call <sid>hi('SpellRare', '', '', 'undercurl', '')

call <sid>hi('csClass', s:base0A, '', '', '')
call <sid>hi('csAttribute', s:base0A, '', '', '')
Expand Down Expand Up @@ -195,9 +195,9 @@ call <sid>hi('markdownBold', s:base0A, '', s:bold, '')
call <sid>hi('markdownCodeDelimiter', s:base0F, '', s:italic, '')
call <sid>hi('markdownError', s:base05, s:base00, '', '')

call <sid>hi('NeomakeErrorSign', s:base08, s:base01, '', '')
call <sid>hi('NeomakeWarningSign', s:base0A, s:base01, '', '')
call <sid>hi('NeomakeInfoSign', s:base10, s:base01, '', '')
call <sid>hi('NeomakeErrorSign', s:base08, s:base00, '', '')
call <sid>hi('NeomakeWarningSign', s:base0A, s:base00, '', '')
call <sid>hi('NeomakeInfoSign', s:base10, s:base00, '', '')
call <sid>hi('NeomakeError', s:base08, '', 'undercurl', s:base08)
call <sid>hi('NeomakeWarning', s:base08, '', 'undercurl', s:base08)

Expand Down

0 comments on commit e068c75

Please sign in to comment.