Skip to content

Commit

Permalink
fix: colorcolumn, incsearch, floatborder
Browse files Browse the repository at this point in the history
remove foreground color for colorcolumn
disable background color for incsearch and floatborder when transparent is enabled
  • Loading branch information
maxmx03 committed Jul 6, 2023
1 parent 8c59d89 commit 7b0181d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion doc/solarized.nvim.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*solarized.nvim.txt* For NVIM v0.9.1 Last change: 2023 July 01
*solarized.nvim.txt* For NVIM v0.9.1 Last change: 2023 July 06

==============================================================================
Table of Contents *solarized.nvim-table-of-contents*
Expand Down
4 changes: 2 additions & 2 deletions lua/solarized/themes/default/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ return function(c, config)
local utils = require('solarized.utils')
local set_hl = utils.set_hl

set_hl('ColorColumn', { fg = c.base02, bg = c.base02 }) -- used for columns
set_hl('ColorColumn', { bg = c.base02 }) -- used for columns
set_hl('Conceal', { fg = c.blue }) -- placeholder characters
set_hl('CurSearch', { fg = c.base2, bg = c.base02 }) -- highlight under cursor
set_hl('Cursor', { fg = c.base03, bg = c.base0 }) -- character under cursor
set_hl('lCursor', { link = 'Cursor' }) -- character under the cursor
set_hl('CursorIM', { link = 'Cursor' }) -- like cursor, but IME mode
set_hl('CursorColumn', { bg = c.base02 }) -- screen-column at the cursor
set_hl('CursorColumn', { link = 'ColorColumn' }) -- screen-column at the cursor
set_hl('CursorLine', { bg = c.base02, sp = c.base1 }) -- screen-line at the cursor
set_hl('Directory', { fg = c.blue }) -- directory names
set_hl('DiffAdd', { fg = c.add, reverse = true }) -- Added line
Expand Down
10 changes: 5 additions & 5 deletions lua/solarized/themes/neo/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ return function(c, config)
local set_hl = utils.set_hl

if config.transparent then
set_hl('ColorColumn', { fg = c.base02, bg = c.base02 }) -- used for columns
set_hl('ColorColumn', { bg = c.base02 }) -- used for columns
else
set_hl('ColorColumn', { fg = c.base04, bg = c.base04 }) -- used for columns
set_hl('ColorColumn', { bg = c.base04 }) -- used for columns
end

-- set_hl('ColorColumn', { fg = c.base04, bg = c.base04 }) -- used for columns
Expand All @@ -14,7 +14,7 @@ return function(c, config)
set_hl('Cursor', { fg = c.base03, bg = c.cyan }) -- character under cursor
set_hl('lCursor', { link = 'Cursor' }) -- character under the cursor
set_hl('CursorIM', { link = 'Cursor' }) -- like cursor, but IME mode
set_hl('CursorColumn', { bg = c.base04 }) -- screen-column at the cursor
set_hl('CursorColumn', { link = 'ColorColumn' }) -- screen-column at the cursor
set_hl('CursorLine') -- screen-line at the cursor
set_hl('Directory', { fg = c.orange }) -- directory names
set_hl('DiffAdd', { fg = c.add }) -- Added line
Expand All @@ -29,7 +29,7 @@ return function(c, config)
set_hl('Folded', { fg = c.base0, bg = c.base02 }) -- Line used for closed folds
set_hl('FoldColumn', { fg = c.base0, bg = c.base04 }) -- 'foldcolumn'
set_hl('SignColumn', { fg = c.base0, bg = c.base03 }, { transparent = config.transparent }) -- Column were signs are displayed
set_hl('IncSearch', { fg = c.base3, bg = c.base04 }) -- 'incsearch' highlighting, also for the text replaced
set_hl('IncSearch', { fg = c.base3, bg = c.base04 }, { transparent = config.transparent }) -- 'incsearch' highlighting, also for the text replaced
set_hl('Substitute', { fg = c.orange, reverse = true }) -- :substitute replacement text highlight
set_hl('LineNr', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Line number for ":number" and ":#" commands
set_hl('LineNrAbove', { link = 'LineNr' }) -- Line number, above the cursor line
Expand All @@ -45,7 +45,7 @@ return function(c, config)
set_hl('NonText', { fg = c.base00 }) -- '@' at the end of the window
set_hl('Normal', { fg = c.base0, bg = c.base03 }, { transparent = config.transparent }) -- Normal text
set_hl('NormalFloat', { fg = c.base0, bg = c.base04 }) -- Normal text in floating windows
set_hl('FloatBorder', { fg = c.cyan, bg = c.base04 }) -- Border of floating windows.
set_hl('FloatBorder', { link = 'WinSeparator' }) -- Border of floating windows.
set_hl('FloatTitle', { fg = c.orange }) -- Title of float windows.
set_hl('NormalNC', { link = 'Normal' }) -- Normal text in non-current windows.
set_hl('Pmenu', { fg = c.base0, bg = c.base04 }, { transparent = config.transparent }) -- Popup menu: Normal item
Expand Down

0 comments on commit 7b0181d

Please sign in to comment.