Refactor color definitions for light theme

vvmk · Oct 17, 2018 · 0a18b0f · 0a18b0f
1 parent c4665cb
commit 0a18b0f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/autoload/iceberg/palette/dark.vim b/autoload/iceberg/palette/dark.vim
@@ -53,6 +53,10 @@ function! iceberg#palette#dark#create() abort
         \   'lightness': +0.50,
         \ })
 
+  " diff
+  let g.difftext_bg = pgmnt#color#mix(g.lblue, g.normal_bg, 0.6)
+  let g.difftext_fg = g.normal_fg
+
   " statusline
   let g.statusline_bg = pgmnt#color#hsl(hue_base, 0.09, 0.55)
   let g.statusline_fg = pgmnt#color#hsl(hue_base, 0.09, 0.10)
@@ -83,6 +87,8 @@ function! iceberg#palette#dark#create() abort
         \   'saturation': +0.08,
         \   'lightness': +0.09,
         \ })
+  let g.tablinesel_bg = g.normal_bg
+  let g.tablinesel_fg = pgmnt#color#mix(g.normal_fg, g.normal_bg, 0.75)
   let g.todo_bg = g.green_tint_bg
   let g.todo_fg = g.green
   let g.visual_bg = pgmnt#color#adjust_color(
@@ -142,6 +148,10 @@ function! iceberg#palette#dark#create() abort
   let c.cursorlinenr_bg = 237
   let c.cursorlinenr_fg = 253
 
+  " diff
+  let c.difftext_bg = 30
+  let c.difftext_fg = 195
+
   " statusline
   let c.statusline_bg = 245
   let c.statusline_fg = 234

diff --git a/colors/iceberg.vim b/colors/iceberg.vim
@@ -8,7 +8,7 @@
 "
 " File:       iceberg.vim
 " Maintainer: cocopon <[email protected]>
-" Modified:   2018-08-14 23:38+0900
+" Modified:   2018-10-18 01:01+0900
 " License:    MIT
 
 

diff --git a/src/iceberg.vim b/src/iceberg.vim
@@ -71,11 +71,11 @@ function! s:create_context() abort
   call extend(rules, pgmnt#hi#group(
         \ 'DiffText', {
         \   'cterm': 'NONE',
-        \   'ctermbg': 30,
-        \   'ctermfg': 195,
+        \   'ctermbg': c.difftext_bg,
+        \   'ctermfg': c.difftext_fg,
         \   'gui': 'NONE',
-        \   'guibg': pgmnt#color#mix(g.lblue, g.normal_bg, 0.6),
-        \   'guifg': g.normal_fg,
+        \   'guibg': g.difftext_bg,
+        \   'guifg': g.difftext_fg,
         \ }))
   call extend(rules, pgmnt#hi#group(
         \ 'Directory', {
@@ -309,8 +309,8 @@ function! s:create_context() abort
         \   'ctermbg': c.normal_bg,
         \   'ctermfg': c.normal_fg,
         \   'gui': 'NONE',
-        \   'guibg': g.normal_bg,
-        \   'guifg': pgmnt#color#mix(g.normal_fg, g.normal_bg, 0.75),
+        \   'guibg': g.tablinesel_bg,
+        \   'guifg': g.tablinesel_fg,
         \ }))
   call extend(rules, pgmnt#hi#group(
         \ 'Title', {