feat: migrated misleading color name (magenta -> mauve)

dev
Pocco81 3 years ago
parent aaac829c3a
commit bfa735fc85

@ -1,7 +1,7 @@
local color_palette = { local color_palette = {
rosewater = "#F5E0DC", -- Rosewater rosewater = "#F5E0DC", -- Rosewater
flamingo = "#F2CDCD", -- Flamingo flamingo = "#F2CDCD", -- Flamingo
magenta = "#DFB1EB", -- Magenta mauve = "#DFB1EB", -- Mauve
pink = "#F5C2E7", -- Pink pink = "#F5C2E7", -- Pink
red = "#F08FA9", -- Red red = "#F08FA9", -- Red
maroon = "#E8A2AF", -- Maroon maroon = "#E8A2AF", -- Maroon

@ -10,7 +10,7 @@ function M.get(cp)
CmpItemAbbrMatchFuzzy = { fg = cp.white, style = "bold" }, CmpItemAbbrMatchFuzzy = { fg = cp.white, style = "bold" },
-- kind support -- kind support
CmpItemKindSnippet = { fg = cp.magenta }, CmpItemKindSnippet = { fg = cp.mauve },
CmpItemKindKeyword = { fg = cp.red }, CmpItemKindKeyword = { fg = cp.red },
CmpItemKindText = { fg = cp.teal }, CmpItemKindText = { fg = cp.teal },
CmpItemKindMethod = { fg = cp.blue }, CmpItemKindMethod = { fg = cp.blue },

@ -31,7 +31,7 @@ local clrs = require("catppuccin.core.color_palette")
-- settings -- settings
local sett = { local sett = {
bkg = clrs.black3, bkg = clrs.black3,
diffs = clrs.magenta, diffs = clrs.mauve,
extras = clrs.gray1, extras = clrs.gray1,
curr_file = clrs.maroon, curr_file = clrs.maroon,
curr_dir = clrs.flamingo, curr_dir = clrs.flamingo,
@ -56,7 +56,7 @@ local mode_colors = {
["ce"] = { "COMMAND", clrs.peach }, ["ce"] = { "COMMAND", clrs.peach },
["r"] = { "PROMPT", clrs.teal }, ["r"] = { "PROMPT", clrs.teal },
["rm"] = { "MORE", clrs.teal }, ["rm"] = { "MORE", clrs.teal },
["r?"] = { "CONFIRM", clrs.magenta }, ["r?"] = { "CONFIRM", clrs.mauve },
["!"] = { "SHELL", clrs.green }, ["!"] = { "SHELL", clrs.green },
} }
@ -136,8 +136,8 @@ components.active[1][3] = {
-- there is a dilema: we need to hide Diffs if ther is no git info. We can do that, but this will -- there is a dilema: we need to hide Diffs if ther is no git info. We can do that, but this will
-- leave the right_semicircle colored with purple, and since we can't change the color conditonally -- leave the right_semicircle colored with purple, and since we can't change the color conditonally
-- then the solution is to create two right_semicircles: one with a magenta sett.bkg and the other one normal -- then the solution is to create two right_semicircles: one with a mauve sett.bkg and the other one normal
-- sett.bkg; both have the same fg (vi mode). The magenta one appears if there is git info, else the one with -- sett.bkg; both have the same fg (vi mode). The mauve one appears if there is git info, else the one with
-- the normal sett.bkg appears. Fixed :) -- the normal sett.bkg appears. Fixed :)
-- enable if git diffs are not available -- enable if git diffs are not available

@ -30,8 +30,8 @@ function M.get(cp)
return { return {
LightspeedLabel = {bg = cp.black4, fg = cp.white}, LightspeedLabel = {bg = cp.black4, fg = cp.white},
LightspeedOverlapped = {bg = cp.black4, fg = cp.white}, LightspeedOverlapped = {bg = cp.black4, fg = cp.white},
LightspeedLabelDistant = {bg = cp.magenta, fg = cp.white}, LightspeedLabelDistant = {bg = cp.mauve, fg = cp.white},
LightspeedLabelDistantOverlapped = {bg = cp.magenta, fg = cp.white}, LightspeedLabelDistantOverlapped = {bg = cp.mauve, fg = cp.white},
LightspeedShortcut = {bg = cp.black2, fg = cp.peach, style = "italic"}, LightspeedShortcut = {bg = cp.black2, fg = cp.peach, style = "italic"},
LightspeedShortcutOverlapped = {bg = cp.black2, fg = cp.peach, style = "bold"}, LightspeedShortcutOverlapped = {bg = cp.black2, fg = cp.peach, style = "bold"},
LightspeedMaskedChar = {bg = cp.black2, fg = cp.red, style = "undercurl"}, LightspeedMaskedChar = {bg = cp.black2, fg = cp.red, style = "undercurl"},

@ -3,7 +3,7 @@ local M = {}
function M.get(cp) function M.get(cp)
local delimeters = cp.gray1 local delimeters = cp.gray1
local operators = cp.sky local operators = cp.sky
local cl = cp.magenta -- conditionals, loops local cl = cp.mauve -- conditionals, loops
local keywords = cp.red local keywords = cp.red
local math_logic = cp.peach local math_logic = cp.peach
@ -65,7 +65,7 @@ function M.get(cp)
-- TSSymbol = { }; -- For identifiers referring to symbols or atoms. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms.
TSType = { fg = cp.yellow }, -- For types. TSType = { fg = cp.yellow }, -- For types.
TSVariable = { fg = cp.white, style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp. TSVariable = { fg = cp.white, style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp.
TSTagAttribute = { fg = cp.magenta, style = "italic" }, -- Tags like html tag names. TSTagAttribute = { fg = cp.mauve, style = "italic" }, -- Tags like html tag names.
TSTag = { fg = cp.peach }, -- Tags like html tag names. TSTag = { fg = cp.peach }, -- Tags like html tag names.
TSTagDelimiter = { fg = cp.maroon }, -- Tag delimiter like < > / TSTagDelimiter = { fg = cp.maroon }, -- Tag delimiter like < > /
TSText = { fg = cp.white }, -- For strings considerated text in a markup language. TSText = { fg = cp.white }, -- For strings considerated text in a markup language.
@ -97,7 +97,7 @@ function M.get(cp)
javaTSConstant = { fg = cp.teal }, javaTSConstant = { fg = cp.teal },
-- typescript -- typescript
typescriptTSProperty = { fg = cp.magenta, style = "italic" }, -- Same as TSField. typescriptTSProperty = { fg = cp.mauve, style = "italic" }, -- Same as TSField.
-- css -- css
cssTSType = { fg = cp.lavender }, cssTSType = { fg = cp.lavender },

@ -91,7 +91,7 @@ local function get_base()
Boolean = { fg = cp.peach }, -- a boolean constant: TRUE, false Boolean = { fg = cp.peach }, -- a boolean constant: TRUE, false
Identifier = { fg = cp.flamingo, style = cnf.styles.variables }, -- (preferred) any variable name Identifier = { fg = cp.flamingo, style = cnf.styles.variables }, -- (preferred) any variable name
Function = { fg = cp.blue, style = cnf.styles.functions }, -- function name (also: methods for classes) Function = { fg = cp.blue, style = cnf.styles.functions }, -- function name (also: methods for classes)
Statement = { fg = cp.magenta }, -- (preferred) any statement Statement = { fg = cp.mauve }, -- (preferred) any statement
Conditional = { fg = cp.red }, -- if, then, else, endif, switch, etcp. Conditional = { fg = cp.red }, -- if, then, else, endif, switch, etcp.
Repeat = { fg = cp.red }, -- for, do, while, etcp. Repeat = { fg = cp.red }, -- for, do, while, etcp.
Label = { fg = cp.peach }, -- case, default, etcp. Label = { fg = cp.peach }, -- case, default, etcp.

@ -14,7 +14,7 @@ catppuccin.insert = {
} }
catppuccin.visual = { catppuccin.visual = {
left = { { cp.black1, cp.magenta }, { cp.blue, cp.black2 } }, left = { { cp.black1, cp.mauve }, { cp.blue, cp.black2 } },
} }
catppuccin.replace = { catppuccin.replace = {

@ -18,8 +18,8 @@ catppuccin.command = {
} }
catppuccin.visual = { catppuccin.visual = {
a = { bg = cp.magenta, fg = cp.black2, gui = "bold" }, a = { bg = cp.mauve, fg = cp.black2, gui = "bold" },
b = { bg = cp.black4, fg = cp.magenta }, b = { bg = cp.black4, fg = cp.mauve },
} }
catppuccin.replace = { catppuccin.replace = {

Loading…
Cancel
Save