From c1e6284bdef195bb6b5557ad0f8677207593813d Mon Sep 17 00:00:00 2001 From: Josh Dick Date: Fri, 24 Feb 2017 01:34:48 -0500 Subject: [PATCH 1/2] onedark.vim: Add 16-color support --- autoload/airline/themes/onedark.vim | 48 ++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/autoload/airline/themes/onedark.vim b/autoload/airline/themes/onedark.vim index 53a5fbd..26a925f 100644 --- a/autoload/airline/themes/onedark.vim +++ b/autoload/airline/themes/onedark.vim @@ -6,15 +6,35 @@ " It is based on vim-airline's ["tomorrow" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/tomorrow.vim). function! airline#themes#onedark#refresh() + if get(g:, 'onedark_termcolors', 256) == 16 + let s:term_red = 1 + let s:term_green = 2 + let s:term_yellow = 3 + let s:term_blue = 4 + let s:term_purple = 5 + let s:term_white = 7 + let s:term_black = 0 + let s:term_grey = 8 + else + let s:term_red = 204 + let s:term_green = 114 + let s:term_yellow = 180 + let s:term_blue = 39 + let s:term_purple = 170 + let s:term_white = 145 + let s:term_black = 235 + let s:term_grey = 236 + endif + let g:airline#themes#onedark#palette = {} let g:airline#themes#onedark#palette.accents = { - \ 'red': [ '#E06C75', '', 204, 0 ] + \ 'red': [ '#E06C75', '', s:term_red, 0 ] \ } - let s:N1 = [ '#282C34', '#98C379', 235, 114 ] - let s:N2 = [ '#ABB2BF', '#3E4452', 145, 237 ] - let s:N3 = [ '#98C379', '#282C34', 114, 235 ] + let s:N1 = [ '#282C34', '#98C379', s:term_black, s:term_green ] + let s:N2 = [ '#ABB2BF', '#3E4452', s:term_white, s:term_grey ] + let s:N3 = [ '#98C379', '#282C34', s:term_green, '' ] let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) let group = airline#themes#get_highlight('vimCommand') @@ -22,26 +42,26 @@ function! airline#themes#onedark#refresh() \ 'airline_c': [ group[0], '', group[2], '', '' ] \ } - let s:I1 = [ '#282C34', '#61AFEF', 235, 39 ] + let s:I1 = [ '#282C34', '#61AFEF', s:term_black, s:term_blue ] let s:I2 = s:N2 - let s:I3 = [ '#61AFEF', '#282C34', 39, 235 ] + let s:I3 = [ '#61AFEF', '#282C34', s:term_blue, '' ] let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified - let s:R1 = [ '#282C34', '#E06C75', 235, 204 ] + let s:R1 = [ '#282C34', '#E06C75', s:term_black, s:term_red ] let s:R2 = s:N2 - let s:R3 = [ '#E06C75', '#282C34', 204, 235 ] + let s:R3 = [ '#E06C75', '#282C34', s:term_red, '' ] let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified - let s:V1 = [ '#282C34', '#C678DD', 235, 170 ] + let s:V1 = [ '#282C34', '#C678DD', s:term_black, s:term_purple ] let s:V2 = s:N2 - let s:V3 = [ '#C678DD', '#282C34', 170, 235 ] + let s:V3 = [ '#C678DD', '#282C34', s:term_purple, '' ] let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified - let s:IA1 = [ '#282C34', '#ABB2BF', 235, 145 ] - let s:IA2 = [ '#ABB2BF', '#3E4452', 145, 237 ] + let s:IA1 = [ '#282C34', '#ABB2BF', s:term_black, s:term_white ] + let s:IA2 = [ '#ABB2BF', '#3E4452', s:term_white, s:term_grey ] let s:IA3 = s:N2 let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3) let g:airline#themes#onedark#palette.inactive_modified = { @@ -51,7 +71,7 @@ function! airline#themes#onedark#refresh() " Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim) " Warnings - let s:WI = [ '#282C34', '#E5C07B', 235, 180 ] + let s:WI = [ '#282C34', '#E5C07B', s:term_black, s:term_yellow ] let g:airline#themes#onedark#palette.normal.airline_warning = [ \ s:WI[0], s:WI[1], s:WI[2], s:WI[3] \ ] @@ -78,7 +98,7 @@ function! airline#themes#onedark#refresh() \ g:airline#themes#onedark#palette.normal.airline_warning " Errors - let s:ER = [ '#282C34', '#E06C75', 235, 204 ] + let s:ER = [ '#282C34', '#E06C75', s:term_black, s:term_red ] let g:airline#themes#onedark#palette.normal.airline_error = [ \ s:ER[0], s:ER[1], s:ER[2], s:ER[3] \ ] From 1f024697a9de98eaeb8395bb24b01490baf9399d Mon Sep 17 00:00:00 2001 From: Josh Dick Date: Mon, 6 Mar 2017 19:00:40 -0500 Subject: [PATCH 2/2] Doc: Document and fix some other minor issues. --- doc/airline-themes.txt | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/doc/airline-themes.txt b/doc/airline-themes.txt index a61d8ab..0005cc5 100644 --- a/doc/airline-themes.txt +++ b/doc/airline-themes.txt @@ -28,8 +28,8 @@ Currently this repository contains the following themes: * aurora * badcat * badwolf - * base16(|airline-theme-base16|) - * base16_shell(|airline-theme-base16_shell|) + * base16 (|airline-theme-base16|) + * base16_shell (|airline-theme-base16_shell|) * base16_3024 * base16_apathy * base16_ashes @@ -88,7 +88,7 @@ Currently this repository contains the following themes: * molokai * monochrome * murmur - * onedark + * onedark (|airline-theme-onedark|) * papercolor * powerlineish * qwq @@ -137,6 +137,7 @@ Turns the outer-most section of the statusline Solarized green, making it look more like classic powerline in normal mode. To enable it: > let g:airline_solarized_normal_green = 1 +< *g:airline_solarized_dark_inactive_border* @@ -144,8 +145,8 @@ Changes inactive window panes to have a dark bottom border instead of light by default. To enable it: > let g:airline_solarized_dark_inactive_border = 1 - - *airline-theme-base16* +< + *airline-theme-base16* Base16 is a popular theme from Chris Kempson (https://github.com/chriskempson/base16-vim) @@ -177,11 +178,25 @@ The theme supports 2 options described below. *g:airline_base16_solarized* -Adjusts the colors to match base16_solirazed 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: > let g:airline_base16_solarized = 1 < + *airline-theme-onedark* + +*g:onedark_termcolors* + +Set to 256 for 256-color mode (the default), or 16 for 16-color mode. +Has no effect if using true/24-bit color. To enable 16-color mode: > + + let g:onedark_termcolors = 16 +< + +16-color mode is intended to be used with specific terminal colors as +described in the installation notes for the joshdick/onedark.vim colorscheme: +(https://github.com/joshdick/onedark.vim#installation) + ============================================================================== CONTRIBUTIONS *airline-themes-contributions*