Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No background color when resolving conflicts with onedark colorscheme #235

Open
phuongpd2k opened this issue Oct 18, 2024 · 0 comments
Open

Comments

@phuongpd2k
Copy link

How do I display colors when resolving conflicts? Currently, when I switch to other color schemes, the background color is shown when resolving conflicts, but when I switch back to onedark, the background disappears

This is example using gruvbox:
image

This is example using onedark:
image

This is my config:

return {
  "navarasu/onedark.nvim",
  opts = {
    style = "warm", -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light'
    transparent = true, -- Show/hide background
    term_colors = true, -- Change terminal color as per the selected theme style
    ending_tildes = false, -- Show the end-of-buffer tildes. By default they are hidden
    cmp_itemkind_reverse = false, -- reverse item kind highlights in cmp menu

    -- toggle theme style ---
    toggle_style_key = nil, -- keybind to toggle theme style. Leave it nil to disable it, or set it to a string, for example "<leader>ts"
    toggle_style_list = { "dark", "darker", "cool", "deep", "warm", "warmer", "light" }, -- List of styles to toggle between

    -- Change code style ---
    -- Options are italic, bold, underline, none
    -- You can configure multiple style with comma separated, For e.g., keywords = 'italic,bold'
    code_style = {
      comments = "italic",
      keywords = "none",
      functions = "none",
      strings = "none",
      variables = "none",
    },

    -- Lualine options --
    lualine = {
      transparent = true, -- lualine center bar transparency
    },

    -- Custom Highlights --
    colors = {}, -- Override default colors
    highlights = {
          -- make floating windows transparent
          -- NormalFloat = { bg = "none" },
          -- FloatBorder = { bg = "none" },
          -- -- but keep background for Lazy and Mason
          -- LazyNormal = { fg = '$fg', bg = '$bg1' },
          -- MasonNormal = { fg = '$fg', bg = '$bg1' },
          -- reverse colors for visual selection
          Visual = { fmt = 'reverse'  },
        },
    -- Plugins Config --
    diagnostics = {
      darker = true, -- darker colors for diagnostic
      undercurl = true, -- use undercurl instead of underline for diagnostics
      background = true, -- use background color for virtual text
    },
  },
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant