Skip to content

Commit

Permalink
Update terminal colors for light theme, #62
Browse files Browse the repository at this point in the history
  • Loading branch information
cocopon committed May 15, 2020
1 parent 0cdfb04 commit 63bf6ae
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 28 deletions.
20 changes: 20 additions & 0 deletions autoload/iceberg/palette/dark.vim
Expand Up @@ -99,6 +99,26 @@ function! iceberg#palette#dark#create() abort
let g.wildmenu_bg = pgmnt#color#lighten(g.statusline_bg, 0.30)
let g.wildmenu_fg = g.statusline_fg

" ansi colors
let g.term_colors = [
\ g.cursorline_bg,
\ g.red,
\ g.green,
\ g.orange,
\ g.blue,
\ g.purple,
\ g.lblue,
\ g.normal_fg,
\ g.comment_fg,
\ pgmnt#color#adjust_color(g.red, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.green, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.orange, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.blue, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.purple, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.lblue, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.normal_fg, {'saturation': +0.05, 'lightness': +0.05}),
\ ]

" airline/lightline
let g.xline_base_bg = g.statuslinenc_bg
let g.xline_base_fg = g.statuslinenc_fg
Expand Down
20 changes: 20 additions & 0 deletions autoload/iceberg/palette/light.vim
Expand Up @@ -103,6 +103,26 @@ function! iceberg#palette#light#create() abort
let g.wildmenu_bg = pgmnt#color#darken(g.statusline_bg, 0.30)
let g.wildmenu_fg = g.statusline_fg

" ansi colors
let g.term_colors = [
\ g.cursorline_bg,
\ g.red,
\ g.green,
\ g.orange,
\ g.blue,
\ g.purple,
\ g.lblue,
\ g.normal_fg,
\ g.comment_fg,
\ pgmnt#color#adjust_color(g.red, {'saturation': +0.05, 'lightness': -0.05}),
\ pgmnt#color#adjust_color(g.green, {'saturation': +0.05, 'lightness': -0.05}),
\ pgmnt#color#adjust_color(g.orange, {'saturation': +0.05, 'lightness': -0.05}),
\ pgmnt#color#adjust_color(g.blue, {'saturation': +0.05, 'lightness': -0.05}),
\ pgmnt#color#adjust_color(g.purple, {'saturation': +0.05, 'lightness': -0.05}),
\ pgmnt#color#adjust_color(g.lblue, {'saturation': +0.05, 'lightness': -0.05}),
\ pgmnt#color#adjust_color(g.normal_fg, {'saturation': +0.05, 'lightness': -0.05}),
\ ]

" airline/lightline
let g.xline_base_bg = pgmnt#color#darken(g.normal_bg, 0.15)
let g.xline_base_fg = pgmnt#color#adjust_color(
Expand Down
18 changes: 9 additions & 9 deletions colors/iceberg.vim
Expand Up @@ -8,7 +8,7 @@
"
" File: iceberg.vim
" Maintainer: cocopon <cocopon@me.com>
" Modified: 2020-05-13 11:45+0900
" Modified: 2020-04-18 11:00+0900
" License: MIT


Expand Down Expand Up @@ -243,15 +243,15 @@ if &background == 'light'
let g:terminal_color_6 = '#3f83a6'
let g:terminal_color_7 = '#33374c'
let g:terminal_color_8 = '#8389a3'
let g:terminal_color_9 = '#d65f87'
let g:terminal_color_10 = '#72a53e'
let g:terminal_color_11 = '#d17f46'
let g:terminal_color_12 = '#2c5bb7'
let g:terminal_color_13 = '#8365c1'
let g:terminal_color_14 = '#3f93be'
let g:terminal_color_15 = '#393f5f'
let g:terminal_color_9 = '#cc3768'
let g:terminal_color_10 = '#598030'
let g:terminal_color_11 = '#b6662d'
let g:terminal_color_12 = '#22478e'
let g:terminal_color_13 = '#6845ad'
let g:terminal_color_14 = '#327698'
let g:terminal_color_15 = '#262a3f'
else
let g:terminal_ansi_colors = ['#dcdfe7', '#cc517a', '#668e3d', '#c57339', '#2d539e', '#7759b4', '#3f83a6', '#33374c', '#8389a3', '#d65f87', '#72a53e', '#d17f46', '#2c5bb7', '#8365c1', '#3f93be', '#393f5f']
let g:terminal_ansi_colors = ['#dcdfe7', '#cc517a', '#668e3d', '#c57339', '#2d539e', '#7759b4', '#3f83a6', '#33374c', '#8389a3', '#cc3768', '#598030', '#b6662d', '#22478e', '#6845ad', '#327698', '#262a3f']
endif
else
hi Normal ctermbg=234 ctermfg=252 guibg=#161821 guifg=#c6c8d1
Expand Down
20 changes: 1 addition & 19 deletions src/iceberg.vim
Expand Up @@ -736,26 +736,8 @@ function! s:create_colors(palette) abort
\ }))
" }}}

let term_colors = [
\ g.cursorline_bg,
\ g.red,
\ g.green,
\ g.orange,
\ g.blue,
\ g.purple,
\ g.lblue,
\ g.normal_fg,
\ g.comment_fg,
\ pgmnt#color#adjust_color(g.red, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.green, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.orange, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.blue, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.purple, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.lblue, {'saturation': +0.05, 'lightness': +0.05}),
\ pgmnt#color#adjust_color(g.normal_fg, {'saturation': +0.05, 'lightness': +0.05}),
\ ]
let quoted_term_colors = map(
\ copy(term_colors),
\ copy(g.term_colors),
\ '"''" . v:val . "''"')

let neovim_term_defs = map(
Expand Down

0 comments on commit 63bf6ae

Please sign in to comment.