fix(float): make float and pemu colors more consistent across themes

thesimonho · Feb 26, 2025 · d7be442 · d7be442
1 parent 9d994f9
commit d7be442
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/lua/kanagawa-paper/colors.lua b/lua/kanagawa-paper/colors.lua
@@ -158,7 +158,7 @@ local palette = {
 	canvasWhite1 = "#d3d0c3",
 	canvasWhite2 = "#d8d8d2",
 	canvasWhite3 = "#e1e1de", -- main bg
-	canvasWhite4 = "#e9e9e0",
+	canvasWhite4 = "#e6e6e3",
 	canvasWhite5 = "#ecece8",
 	canvasYellow = "#a67337",
 	canvasYellow2 = "#c08a48",

diff --git a/lua/kanagawa-paper/groups/plugins/blink.lua b/lua/kanagawa-paper/groups/plugins/blink.lua
@@ -5,9 +5,9 @@ function M.get(colors, opts)
 
 	return {
 		BlinkCmpMenu = { link = "Pmenu" },
-		BlinkCmpMenuBorder = { fg = theme.ui.bg_search, bg = theme.ui.pmenu.bg },
+		BlinkCmpMenuBorder = { fg = theme.ui.pmenu.fg_border, bg = theme.ui.pmenu.bg_border },
 		BlinkCmpMenuSelection = { link = "PmenuSel" },
-		BlinkCmpScrollBarThumb = { bg = theme.ui.scrollbar },
+		BlinkCmpScrollBarThumb = { bg = theme.ui.pmenu.bg_thumb },
 		BlinkCmpScrollBarGutter = { bg = theme.ui.fg },
 		BlinkCmpLabel = { fg = theme.ui.pmenu.fg },
 		BlinkCmpLabelMatch = { fg = theme.syn.fun },

diff --git a/lua/kanagawa-paper/groups/plugins/noice.lua b/lua/kanagawa-paper/groups/plugins/noice.lua
@@ -6,7 +6,7 @@ function M.get(colors, opts)
 	return {
 		NoiceCmdline = { fg = theme.ui.bg_search },
 		NoiceVirtualText = { fg = theme.ui.bg_search },
-		NoicePopupBorder = { fg = theme.ui.bg_p2, bg = theme.ui.bg_p1 },
+		NoicePopupBorder = { fg = theme.ui.float.fg_border, bg = theme.ui.float.bg_border },
 		NoiceLspProgressTitle = { fg = theme.ui.fg_gray },
 	}
 end

diff --git a/lua/kanagawa-paper/themes/canvas.lua b/lua/kanagawa-paper/themes/canvas.lua
@@ -58,16 +58,18 @@ M.get = function(opts, palette)
 			pmenu = {
 				fg = palette.canvasInk1,
 				fg_sel = "none", -- This is important to make highlights pass-through
-				bg = palette.canvasWhite2,
-				bg_sel = palette.canvasViolet1,
-				bg_sbar = palette.canvasWhite2,
-				bg_thumb = palette.canvasBlue2,
+				fg_border = palette.canvasWhite2,
+				bg_border = palette.canvasWhite5,
+				bg = palette.canvasWhite5,
+				bg_sel = palette.canvasWhite1,
+				bg_sbar = palette.canvasWhite5,
+				bg_thumb = palette.canvasGray2,
 			},
 			float = {
 				fg = palette.canvasInk1,
-				bg = palette.canvasWhite3,
-				fg_border = palette.canvasGray3,
-				bg_border = palette.canvasWhite3,
+				bg = palette.canvasWhite5,
+				fg_border = palette.canvasWhite2,
+				bg_border = palette.canvasWhite5,
 			},
 		},
 		accent = {

diff --git a/lua/kanagawa-paper/themes/init.lua b/lua/kanagawa-paper/themes/init.lua
@@ -115,10 +115,12 @@
 ---@class MenuElements
 ---@field bg ColorSpec
 ---@field fg ColorSpec
+---@field fg_border ColorSpec
 ---@field fg_sel ColorSpec
 ---@field bg_sel ColorSpec
 ---@field bg_sbar ColorSpec
 ---@field bg_thumb ColorSpec
+---@field bg_border ColorSpec
 
 ---@class RainbowColors
 ---@field rainbow1 ColorSpec

diff --git a/lua/kanagawa-paper/themes/ink.lua b/lua/kanagawa-paper/themes/ink.lua
@@ -59,16 +59,18 @@ M.get = function(opts, palette)
 			pmenu = {
 				fg = palette.fujiWhite,
 				fg_sel = "none", -- This is important to make highlights pass-through
+				fg_border = palette.sumiInk5,
+				bg_border = palette.sumiInk4,
 				bg = palette.sumiInk4,
-				bg_sel = palette.sumiInk6,
-				bg_sbar = palette.sumiInk5,
+				bg_sel = palette.sumiInk5,
+				bg_sbar = palette.sumiInk4,
 				bg_thumb = palette.sumiInk6,
 			},
 			float = {
 				fg = palette.oldWhite,
 				bg = palette.sumiInk4,
-				fg_border = palette.sumiInk6,
-				bg_border = "none",
+				fg_border = palette.sumiInk5,
+				bg_border = palette.sumiInk4,
 			},
 		},
 		accent = {