Solarized modifications.

- Remove 'reduced' option
- Use yellow for insert, red for replace mode
This commit is contained in:
Evgeni Kolev 2013-09-20 21:51:45 +03:00
parent e787b570e9
commit a3df71463e

View File

@ -4,7 +4,6 @@ function! s:generate()
"""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""
" Options " Options
"""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""
let s:reduced = get(g:, 'airline_solarized_reduced', 1)
let s:background = get(g:, 'airline_solarized_bg', &background) let s:background = get(g:, 'airline_solarized_bg', &background)
let s:ansi_colors = get(g:, 'solarized_termcolors', 16) != 256 && &t_Co >= 16 ? 1 : 0 let s:ansi_colors = get(g:, 'solarized_termcolors', 16) != 256 && &t_Co >= 16 ? 1 : 0
let s:tty = &t_Co == 8 let s:tty = &t_Co == 8
@ -46,7 +45,6 @@ function! s:generate()
let s:N3 = [s:base1, s:base2, ''] let s:N3 = [s:base1, s:base2, '']
endif endif
let s:NF = [s:orange, s:N3[1], ''] let s:NF = [s:orange, s:N3[1], '']
let s:NM = [s:orange, s:N3[1], '']
let s:NW = [s:base3, s:orange, ''] let s:NW = [s:base3, s:orange, '']
if s:background == 'dark' if s:background == 'dark'
let s:NM = [s:base1, s:N3[1], ''] let s:NM = [s:base1, s:N3[1], '']
@ -55,44 +53,25 @@ function! s:generate()
endif endif
" Insert mode " Insert mode
if s:reduced let s:I1 = [s:N1[0], s:yellow, 'bold']
let s:I1 = [s:N1[0], s:green, 'bold'] let s:I2 = s:N2
let s:I2 = s:N2
else
let s:I1 = [s:N1[0], s:orange, 'bold']
if s:background == 'dark'
let s:I2 = [s:base1, (s:tty ? s:base01 : s:base00), '']
else
let s:I2 = [(s:tty ? s:base01 : s:base2), s:base0, '']
endif
endif
let s:I3 = s:N3 let s:I3 = s:N3
let s:IF = s:NF let s:IF = s:NF
let s:IM = s:NM let s:IM = s:NM
" Visual mode " Visual mode
if s:reduced let s:V1 = [s:N1[0], s:magenta, 'bold']
let s:V1 = [s:N1[0], s:orange, 'bold'] let s:V2 = s:N2
let s:V2 = s:N2 let s:V3 = s:N3
let s:V3 = s:N3
else
let s:V1 = [s:N1[0], s:magenta, 'bold']
let s:V2 = s:I2
let s:V3 = s:I3
endif
let s:VF = s:NF let s:VF = s:NF
if s:reduced let s:VM = s:NM
let s:VM = s:NM
else
let s:VM = s:IM
endif
" Replace mode " Replace mode
let s:R1 = [s:N1[0], s:magenta, ''] let s:R1 = [s:N1[0], s:red, '']
let s:R2 = s:N2 let s:R2 = s:N2
let s:R3 = s:N3 let s:R3 = s:N3
let s:RM = s:NM let s:RM = s:NM
let s:RF = s:NF let s:RF = s:NF
" Inactive " Inactive
if s:background == 'dark' if s:background == 'dark'