molokai: revert bright orange

The recent change f0e613782d to the molokai theme made people
really unhappy. Therefore revert to the old behaviour. People who liked
the current behaviour can set `:let g:airline_molokai_bright=1` to
enable it again.

fixes #132
This commit is contained in:
Christian Brabandt 2018-04-18 21:19:10 +02:00
parent 206a8e3154
commit 1b264ccec1
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 33 additions and 19 deletions

View File

@ -1,13 +1,15 @@
let g:airline#themes#molokai#palette = {} let g:airline#themes#molokai#palette = {}
let g:airline#themes#molokai#palette.accents = { let g:airline#themes#molokai#palette.accents = {
\ 'red': [ '#66d9ef' , '' , 81 , '' , '' ], \ 'red': [ '#66d9ef' , '' , 81 , '' , '' ],
\ } \ }
" Normal mode " Normal mode
let s:N1 = [ '#080808' , '#e6db74' , 232 , 144 ] " mode let s:N1 = [ '#080808' , '#e6db74' , 232 , 144 ] " mode
let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 208 ] " info if get(g:, 'airline_molokai_bright', 0)
let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 208 ] " info
else
let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 16 ] " info
endif
let s:N3 = [ '#f8f8f0' , '#465457' , 253 , 67 ] " statusline let s:N3 = [ '#f8f8f0' , '#465457' , 253 , 67 ] " statusline
let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
@ -15,10 +17,13 @@ let g:airline#themes#molokai#palette.normal_modified = {
\ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] , \ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
\ } \ }
" Insert mode " Insert mode
let s:I1 = [ '#080808' , '#66d9ef' , 232 , 81 ] let s:I1 = [ '#080808' , '#66d9ef' , 232 , 81 ]
let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 208 ] if get(g:, 'airline_molokai_bright', 0)
let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 208 ]
else
let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
endif
let s:I3 = [ '#f8f8f0' , '#465457' , 253 , 67 ] let s:I3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
@ -26,10 +31,13 @@ let g:airline#themes#molokai#palette.insert_modified = {
\ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] , \ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
\ } \ }
" Replace mode " Replace mode
let s:R1 = [ '#080808' , '#f92672' , 232 , 161 ] let s:R1 = [ '#080808' , '#f92672' , 232 , 161 ]
let s:R2 = [ '#f8f8f0' , '#232526' , 253 , 208 ] if get(g:, 'airline_molokai_bright', 0)
let s:R2 = [ '#f8f8f0' , '#232526' , 253 , 208 ]
else
let s:R2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
endif
let s:R3 = [ '#f8f8f0' , '#465457' , 253 , 67 ] let s:R3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
let g:airline#themes#molokai#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) let g:airline#themes#molokai#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
@ -37,10 +45,13 @@ let g:airline#themes#molokai#palette.replace_modified = {
\ 'airline_c': [ '#080808' , '#f92672' , 232 , 161 , '' ] , \ 'airline_c': [ '#080808' , '#f92672' , 232 , 161 , '' ] ,
\ } \ }
" Visual mode " Visual mode
let s:V1 = [ '#080808' , '#a6e22e' , 232 , 118 ] let s:V1 = [ '#080808' , '#a6e22e' , 232 , 118 ]
let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 208 ] if get(g:, 'airline_molokai_bright', 0)
let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 208 ]
else
let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
endif
let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67 ] let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
@ -48,7 +59,6 @@ let g:airline#themes#molokai#palette.visual_modified = {
\ 'airline_c': [ '#080808' , '#a6e22e' , 232 , 118 , '' ] , \ 'airline_c': [ '#080808' , '#a6e22e' , 232 , 118 , '' ] ,
\ } \ }
" Inactive " Inactive
let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ] let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ]
let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA) let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
@ -56,7 +66,6 @@ let g:airline#themes#molokai#palette.inactive_modified = {
\ 'airline_c': [ '#f8f8f0' , '' , 253 , '' , '' ] , \ 'airline_c': [ '#f8f8f0' , '' , 253 , '' , '' ] ,
\ } \ }
" CtrlP " CtrlP
if !get(g:, 'loaded_ctrlp', 0) if !get(g:, 'loaded_ctrlp', 0)
finish finish
@ -65,4 +74,3 @@ let g:airline#themes#molokai#palette.ctrlp = airline#extensions#ctrlp#generate_c
\ [ '#f8f8f0' , '#465457' , 253 , 67 , '' ] , \ [ '#f8f8f0' , '#465457' , 253 , 67 , '' ] ,
\ [ '#f8f8f0' , '#232526' , 253 , 16 , '' ] , \ [ '#f8f8f0' , '#232526' , 253 , 16 , '' ] ,
\ [ '#080808' , '#e6db74' , 232 , 144 , 'bold' ] ) \ [ '#080808' , '#e6db74' , 232 , 144 , 'bold' ] )

View File

@ -156,19 +156,19 @@ Base16 Shell. To enable it: >
> >
See also https://github.com/blueyed/vim-colors-solarized/commit/92f2f994. See also https://github.com/blueyed/vim-colors-solarized/commit/92f2f994.
*g:airline_solarized_normal_green* *g:airline_solarized_normal_green*
Turns the outer-most section of the statusline Solarized green, making it Turns the outer-most section of the statusline Solarized green, making it
look more like classic powerline in normal mode. To enable it: > look more like classic powerline in normal mode. To enable it: >
let g:airline_solarized_normal_green = 1 let g:airline_solarized_normal_green = 1
< <
*g:airline_solarized_dark_text* *g:airline_solarized_dark_text*
Turns the text color of the outer-most sections of the statusline to be dark. Turns the text color of the outer-most sections of the statusline to be dark.
To enable it: > To enable it: >
let g:airline_solarized_dark_text = 1 let g:airline_solarized_dark_text = 1
< <
*g:airline_solarized_dark_inactive_border* *g:airline_solarized_dark_inactive_border*
Changes inactive window panes to have a dark bottom border instead Changes inactive window panes to have a dark bottom border instead
of light by default. To enable it: > of light by default. To enable it: >
@ -181,13 +181,13 @@ Base16 is a popular theme from Chris Kempson
The default theme is base16, all other base16-themes have been generated and The default theme is base16, all other base16-themes have been generated and
might not support all options. might not support all options.
*g:airline_base16_improved_contrast* *g:airline_base16_improved_contrast*
Improves the contrast for the inactive statusline. To enable it: > Improves the contrast for the inactive statusline. To enable it: >
let g:airline_base16_improved_contrast = 1 let g:airline_base16_improved_contrast = 1
< <
*airline#themes#base16#constant* *airline#themes#base16#constant*
Uses a predefined colorpalette for defining the colors, instead of guessing Uses a predefined colorpalette for defining the colors, instead of guessing
the values from other highlight groups. To enable it: > the values from other highlight groups. To enable it: >
@ -202,7 +202,7 @@ colors in the terminal: (https://github.com/chriskempson/base16-shell). The
colors used in this theme are within the 21 term colors set by Base16 Shell. colors used in this theme are within the 21 term colors set by Base16 Shell.
The theme supports 2 options described below. The theme supports 2 options described below.
*g:airline_base16_solarized* *g:airline_base16_solarized*
Adjusts the colors to match base16_solarized shell theme. You may also try to Adjusts the colors to match base16_solarized shell theme. You may also try to
use it with other Base16 Shell themes. To enable it: > use it with other Base16 Shell themes. To enable it: >
@ -240,7 +240,7 @@ Has no effect if using true/24-bit color. To enable 16-color mode: >
let g:onedark_termcolors = 16 let g:onedark_termcolors = 16
< <
*airline-theme-zenburn* *airline-theme-zenburn*
*g:zenburn_high_Contrast* *g:zenburn_high_Contrast*
Enable higher contrast colors for the zenburn colorscheme and the Enable higher contrast colors for the zenburn colorscheme and the
corresponding airline theme. Must be set before switching to the zenburn corresponding airline theme. Must be set before switching to the zenburn
@ -250,6 +250,12 @@ colorscheme >
The zenburn colorscheme also supports a couple of other configuration The zenburn colorscheme also supports a couple of other configuration
variables, that possibly also influence the colors in the zenburn airline variables, that possibly also influence the colors in the zenburn airline
theme. Please check the zenburn color scheme on how to configure it. theme. Please check the zenburn color scheme on how to configure it.
*airline-theme-molokai*
Enable brighter molokai theme. Mainly, the branch and filetype sections will
be shown in a nice orange. >
let g:airline_molokai_bright = 1
============================================================================== ==============================================================================
CONTRIBUTIONS *airline-themes-contributions* CONTRIBUTIONS *airline-themes-contributions*