From c767ea0da9297599838a3e286f4bddc3b1f66dda Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 12 Oct 2021 09:23:38 +0800 Subject: [PATCH] adjust DiffAdd fg saturation --- colors/zenbones.vim | 2 +- colors/zenflesh.vim | 2 +- lua/zenbones/specs/dark.lua | 11 ++++------- lua/zenbones/specs/light.lua | 11 ++++------- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 5eb3a28..9db2e69 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -51,7 +51,7 @@ highlight DiagnosticUnderlineInfo guifg=#286486 guibg=NONE guisp=NONE gui=underc highlight DiagnosticUnderlineWarn guifg=#944927 guibg=NONE guisp=NONE gui=undercurl highlight DiagnosticVirtualTextError guifg=#A8334C guibg=#E7DDDE guisp=NONE gui=NONE highlight DiagnosticVirtualTextWarn guifg=#944927 guibg=#F0E6E4 guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#D8E7CD guisp=NONE gui=NONE +highlight DiffAdd guifg=NONE guibg=#BFE2A3 guisp=NONE gui=NONE highlight DiffChange guifg=NONE guibg=#C0DAF2 guisp=NONE gui=NONE highlight DiffDelete guifg=NONE guibg=#E7CBCE guisp=NONE gui=NONE highlight DiffText guifg=#2C363C guibg=#99C6E9 guisp=NONE gui=NONE diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index bdd9152..17a5938 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -51,7 +51,7 @@ highlight DiagnosticUnderlineInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=underc highlight DiagnosticUnderlineWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=undercurl highlight DiagnosticVirtualTextError guifg=#DE6E7C guibg=#3A2A2C guisp=NONE gui=NONE highlight DiagnosticVirtualTextWarn guifg=#B77E64 guibg=#362C28 guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#333C2C guisp=NONE gui=NONE +highlight DiffAdd guifg=NONE guibg=#374030 guisp=NONE gui=NONE highlight DiffChange guifg=NONE guibg=#2D404E guisp=NONE gui=NONE highlight DiffDelete guifg=NONE guibg=#5B2E33 guisp=NONE gui=NONE highlight DiffText guifg=#B4BDC3 guibg=#455C6F guisp=NONE gui=NONE diff --git a/lua/zenbones/specs/dark.lua b/lua/zenbones/specs/dark.lua index 22fb982..a313c90 100644 --- a/lua/zenbones/specs/dark.lua +++ b/lua/zenbones/specs/dark.lua @@ -2,14 +2,11 @@ local lush = require "lush" local function generate(p, opt) local normal_bg = p.bg - local diff_bg_l = 0 if opt.darkness == "stark" then normal_bg = p.bg_stark - diff_bg_l = -3 elseif opt.darkness == "warm" then normal_bg = p.bg_warm - diff_bg_l = 3 elseif opt.darkness ~= nil then local error_msg = "Unknown darkness value: " .. vim.inspect(darkness) vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) @@ -55,10 +52,10 @@ local function generate(p, opt) CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. ColorColumn { bg = p.wood.de(40).da(38) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = p.leaf.de(28).da(60).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = p.water.de(24).da(58).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = p.rose.de(40).da(58).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = p.water.de(28).da(38).abs_da(diff_bg_l), fg = p.fg }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = p.leaf.de(28).da(58) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = p.water.de(24).da(58) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = p.rose.de(40).da(58) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = p.water.de(28).da(38), fg = p.fg }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.li(30) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed diff --git a/lua/zenbones/specs/light.lua b/lua/zenbones/specs/light.lua index 9293b16..0e4ec06 100644 --- a/lua/zenbones/specs/light.lua +++ b/lua/zenbones/specs/light.lua @@ -2,14 +2,11 @@ local lush = require "lush" local function generate(p, opt) local normal_bg = p.bg - local diff_bg_l = 0 if opt.lightness == "bright" then normal_bg = p.bg_bright - diff_bg_l = -4 elseif opt.lightness == "dim" then normal_bg = p.bg_dim - diff_bg_l = 4 elseif opt.lightness ~= nil then local error_msg = "Unknown lightness value: " .. vim.inspect(lightness) vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) @@ -55,10 +52,10 @@ local function generate(p, opt) CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. ColorColumn { bg = p.wood.de(38).li(80) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = p.leaf.de(77).li(82).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = p.water.de(22).li(76).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = p.rose.de(37).li(74).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = p.water.de(24).li(64).abs_da(diff_bg_l), fg = p.fg }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = p.leaf.de(42).li(76) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = p.water.de(22).li(76) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = p.rose.de(37).li(74) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = p.water.de(24).li(64), fg = p.fg }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.da(32) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed