From cf6173cdd04777960de1a97362995dba72c90eac Mon Sep 17 00:00:00 2001 From: Nathanael Sandy Date: Thu, 23 Mar 2023 13:24:54 +0100 Subject: [PATCH] feat: fix yellow, config option for bold functions --- lua/flatwhite/groups.lua | 10 +++++----- lua/flatwhite/init.lua | 1 + lua/flatwhite/palette.lua | 8 ++++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lua/flatwhite/groups.lua b/lua/flatwhite/groups.lua index 311c751..fc06799 100644 --- a/lua/flatwhite/groups.lua +++ b/lua/flatwhite/groups.lua @@ -127,7 +127,7 @@ local function setup(configs) ["@constant"] = colors.fw_teal, ["@constant.builtin"] = colors.fw_teal, ["@symbol"] = colors.fw_base, - ["@comment"] = { fg = colors.base2, italic = true }, + ["@comment"] = {fg=colors.yellow_text, bg=colors.yellow_bg, italic=true}, --colors.fw_yellow, --{ fg = colors.base2, italic = true }, ["@constant.macro"] = colors.fw_teal, ["@string.regex"] = colors.fw_red, ["@string"] = colors.fw_green, @@ -139,12 +139,12 @@ local function setup(configs) ["@annotation"] = colors.fw_blue, ["@attribute"] = colors.fw_blue, ["@namespace"] = colors.fw_base, - ["@function.builtin"] = colors.fw_base_bold, - ["@function"] = colors.fw_yellow, - ["@function.macro"] = colors.fw_base_bold, + ["@function"] = configs.bold_function and colors.fw_base_bold or colors.fw_base, + ["@function.builtin"] = configs.bold_function and colors.fw_base_bold or colors.fw_base, + ["@function.macro"] = configs.bold_function and colors.fw_base_bold or colors.fw_base, ["@parameter"] = colors.fw_base, ["@parameter.reference"] = colors.fw_base, - ["@method"] = colors.fw_base, + ["@method"] = configs.bold_function and colors.fw_base_bold or colors.fw_base, ["@field"] = colors.fw_base, ["@string.field"] = colors.fw_base, ["@property"] = colors.fw_base, diff --git a/lua/flatwhite/init.lua b/lua/flatwhite/init.lua index 876a541..18fe900 100644 --- a/lua/flatwhite/init.lua +++ b/lua/flatwhite/init.lua @@ -13,6 +13,7 @@ local tbl_deep_extend = vim.tbl_deep_extend ---@field overrides table local DEFAULT_CONFIG = { italic_comment = false, + bold_function = true, transparent_bg = false, show_end_of_buffer = false, lualine_bg_color = nil, diff --git a/lua/flatwhite/palette.lua b/lua/flatwhite/palette.lua index e5ba897..c21eb22 100644 --- a/lua/flatwhite/palette.lua +++ b/lua/flatwhite/palette.lua @@ -9,9 +9,13 @@ local accent = "#6a4cff" local yellow_text = "#5b5a43" local yellow_text_sec = "#a9994c" -local yellow_bg = "#f3eec4" +-- local yellow_bg = "#f3eec4" -- local yellow_bg = "#F2EDC0" - +-- local yellow_bg = "#F2EaC0" +-- local yellow_bg = "#fcf2bf" +-- local yellow_bg = "#f3e7c4" +local yellow_bg = "#f9f0c2" +-- local yellow_bg = "#f9ebc3" local orange_text = "#5b5143" local orange_text_sec = "#957f5f" local orange_bg = "#f7e0c3" -- 2.30.2