Merge pull request #176 from seletskiy/solarized-contrast-fix

solarized: fix contrast and warningmsg
This commit is contained in:
Bailey Ling 2013-08-23 09:37:40 -07:00
commit ab59dfffe7

View File

@ -28,8 +28,8 @@ function! s:generate()
let s:blue = {'t': s:ansi_colors ? 4 : 33 , 'g': '#268bd2'} let s:blue = {'t': s:ansi_colors ? 4 : 33 , 'g': '#268bd2'}
let s:cyan = {'t': s:ansi_colors ? 6 : 37 , 'g': '#2aa198'} let s:cyan = {'t': s:ansi_colors ? 6 : 37 , 'g': '#2aa198'}
let s:green = {'t': s:ansi_colors ? 2 : 64 , 'g': '#859900'} let s:green = {'t': s:ansi_colors ? 2 : 64 , 'g': '#859900'}
let s:c218 = {'t': 218, 'g': '#ffafd7'} let s:color236= {'t': s:ansi_colors ? '0' : 236, 'g': '#303030'}
let s:c52 = {'t': 52, 'g': '#5f0000'} let s:color251= {'t': s:ansi_colors ? 14 : 251, 'g': '#c6c6c6'}
"""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""
" Simple mappings " Simple mappings
@ -42,31 +42,28 @@ function! s:generate()
let s:N2 = [s:base2, s:base01, ''] let s:N2 = [s:base2, s:base01, '']
let s:N3 = [s:base1, s:base02, ''] let s:N3 = [s:base1, s:base02, '']
else else
let s:N2 = [s:base2, s:base1, ''] let s:N2 = [s:base2, s:base00, '']
let s:N3 = [s:base00, s:base2, ''] let s:N3 = [s:base00, s:base2, '']
endif endif
let s:NF = [s:orange, s:N3[1], ''] let s:NF = [s:orange, s:N3[1], '']
if s:reduced let s:NM = [s:orange, s:N3[1], '']
if s:background == 'dark' let s:NW = [s:base3, s:orange, '']
let s:NM = [s:magenta, s:N3[1], ''] if s:background == 'dark'
else let s:NM = [s:orange, s:N3[1], '']
let s:NM = [s:magenta, s:N3[1], '']
endif
else else
if s:background == 'dark' let s:NM = [s:red, s:N3[1], '']
let s:NM = [s:c218, s:c52, '']
else
let s:NM = [s:red, s:c218, '']
endif
endif endif
" Insert mode " Insert mode
let s:I1 = [s:N1[0], s:green, 'bold'] let s:I1 = [s:N1[0], s:green, 'bold']
if s:reduced if s:reduced
let s:I2 = s:N2 let s:I2 = s:N2
else else
let s:I2 = [s:base3, s:base1, ''] if s:background == 'dark'
let s:I2 = [s:base00, s:color236, '']
else
let s:I2 = [s:base00, s:color251, '']
endif
endif endif
let s:I3 = s:N3 let s:I3 = s:N3
let s:IF = s:NF let s:IF = s:NF
@ -115,6 +112,9 @@ function! s:generate()
\ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]], \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]],
\ s:NFa) \ s:NFa)
let g:airline#themes#solarized#palette.normal.warningmsg = [
\ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
let g:airline#themes#solarized#palette.normal_modified = { let g:airline#themes#solarized#palette.normal_modified = {
\ 'airline_c': [s:NM[0].g, s:NM[1].g, \ 'airline_c': [s:NM[0].g, s:NM[1].g,
\ s:NM[0].t, s:NM[1].t, s:NM[2]]} \ s:NM[0].t, s:NM[1].t, s:NM[2]]}