Resolve conflict

dev
nullchilly 2 years ago
commit a98f370d86

@ -12,18 +12,14 @@ end
function M.get()
if not get_prepared() then
local catppuccin = require("catppuccin")
if catppuccin.after_loading ~= nil then
catppuccin.after_loading = function()
catppuccin.after_loading()
set_prepared(vim.api.nvim_create_autocmd("User", {
pattern = "CatppuccinLoaded",
callback = function()
if pcall(require, "leap") then
require("leap").init_highlight(true)
end
else
catppuccin.after_loading = function()
require("leap").init_highlight(true)
end
end
set_prepared(true)
end,
}))
end
return {

@ -19,15 +19,15 @@ local color_palette = {
blue = "#8CAAEE",
lavender = "#BABBF1",
text = "#D1D9F8",
subtext1 = "#B5BFE2",
subtext0 = "#A5ADCE",
overlay2 = "#949CBB",
overlay1 = "#838BA7",
overlay0 = "#737994",
surface2 = "#626880",
surface1 = "#51576D",
surface0 = "#414559",
text = "#CED7F7",
subtext1 = "#BCC5E3",
subtext0 = "#ABB3D0",
overlay2 = "#99A1BC",
overlay1 = "#888FA8",
overlay0 = "#767C95",
surface2 = "#656A81",
surface1 = "#53586D",
surface0 = "#42465A",
base = "#303446",
mantle = "#292C3C",

Loading…
Cancel
Save