From 7a1c0532a74678c20595416afb9152e907055792 Mon Sep 17 00:00:00 2001 From: CPea Date: Mon, 4 Aug 2025 01:47:48 +0700 Subject: [PATCH] feat(highlight): update `git-conflict` colors --- lua/one_monokai/highlights/groups.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/one_monokai/highlights/groups.lua b/lua/one_monokai/highlights/groups.lua index 0602078..d081c82 100644 --- a/lua/one_monokai/highlights/groups.lua +++ b/lua/one_monokai/highlights/groups.lua @@ -469,10 +469,10 @@ local defaults = { BlinkCmpKindVariable = { fg = colors.cyan }, -- git-conflict - GitConflictCurrent = { bg = colors.cyan:darken(0.4) }, - GitConflictIncoming = { bg = colors.green:darken(0.4) }, - GitConflictCurrentLabel = { fg = colors.white }, - GitConflictIncomingLabel = { fg = colors.white }, + GitConflictCurrent = { bg = colors.cyan:darken(0.3) }, + GitConflictIncoming = { bg = colors.aqua:darken(0.3) }, + GitConflictCurrentLabel = { fg = colors.fg, bg = colors.cyan:darken(0.6) }, + GitConflictIncomingLabel = { fg = colors.fg, bg = colors.aqua:darken(0.6) }, -- lazy LazyButton = { fg = colors.white, bg = colors.vulcan },