Merge pull request #6 from mcchrish/dev

Overall color adjustment
This commit is contained in:
Michael Chris Lopez
2021-08-28 16:56:34 +08:00
committed by GitHub
6 changed files with 80 additions and 76 deletions

View File

@@ -63,21 +63,21 @@ or customizing the colors to your likings.
<details>
<summary>Diff highlights</summary>
<img width="1128" alt="Vim diff" src="https://user-images.githubusercontent.com/7200153/130730698-38c2f493-4161-4146-bb68-00cd9a87d2bd.png">
<img width="1120" alt="Vim diff" src="https://user-images.githubusercontent.com/7200153/131212101-3a3b4083-f3ae-4dfc-ab1f-133cf3600a01.png">
</details>
<details>
<summary>Search</summary>
<img width="1128" alt="Search" src="https://user-images.githubusercontent.com/7200153/130731292-928fcffc-c252-425c-8c61-e292df3fa478.png">
<img width="1128" alt="Search" src="https://user-images.githubusercontent.com/7200153/131212102-620323dc-01db-4e40-ae74-640a00368121.png">
</details>
<details>
<summary>Diagnostics</summary>
<img width="1128" alt="Diagnostics" src="https://user-images.githubusercontent.com/7200153/130927693-00cd8a6e-7a75-4ebb-9f23-b9322de7933a.png">
<img width="1128" alt="Diagnostics" src="https://user-images.githubusercontent.com/7200153/131212106-b515ba76-d157-46b3-b1cb-c72811abbff3.png">
</details>

View File

@@ -9,17 +9,17 @@ set background=light
let g:colors_name = 'zenbones'
let g:terminal_color_0 = '#2c363c'
let g:terminal_color_1 = '#c23c55'
let g:terminal_color_1 = '#a8334c'
let g:terminal_color_2 = '#617437'
let g:terminal_color_3 = '#914b27'
let g:terminal_color_3 = '#944927'
let g:terminal_color_4 = '#286486'
let g:terminal_color_5 = '#88507d'
let g:terminal_color_6 = '#3b8992'
let g:terminal_color_7 = '#f0edec'
let g:terminal_color_8 = '#44525b'
let g:terminal_color_9 = '#b22e49'
let g:terminal_color_9 = '#9c2842'
let g:terminal_color_10 = '#55672a'
let g:terminal_color_11 = '#85421e'
let g:terminal_color_11 = '#87411e'
let g:terminal_color_12 = '#1f5a7a'
let g:terminal_color_13 = '#864079'
let g:terminal_color_14 = '#2f7c85'
@@ -46,62 +46,87 @@ if has('terminal')
\ ]
endif
"Theme built with Lush.nvim, exported at Fri Aug 27 06:47:26 2021
"Theme built with Lush.nvim, exported at Sat Aug 28 16:51:20 2021
highlight Constant guifg=#53636D guibg=NONE guisp=NONE gui=italic
highlight Identifier guifg=#44525B guibg=NONE guisp=NONE gui=NONE
highlight Function guifg=#2C363C guibg=NONE guisp=NONE gui=NONE
highlight Statement guifg=#2C363C guibg=NONE guisp=NONE gui=bold
highlight! link PreProc Statement
highlight Type guifg=#5C534F guibg=NONE guisp=NONE gui=NONE
highlight Special guifg=#53636D guibg=NONE guisp=NONE gui=bold
highlight Delimiter guifg=#8E817B guibg=NONE guisp=NONE gui=NONE
highlight SpecialComment guifg=#948985 guibg=NONE guisp=NONE gui=bold
highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline
highlight! link LspReferenceText ColorColumn
highlight! link LspReferenceRead ColorColumn
highlight! link LspReferenceWrite ColorColumn
highlight! link LspDiagnosticsDefaultError Error
highlight! link LspDiagnosticsDefaultWarning WarningMsg
highlight LspDiagnosticsDefaultInformation guifg=#286486 guibg=NONE guisp=NONE gui=NONE
highlight LspDiagnosticsDefaultHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE
highlight LspDiagnosticsVirtualTextError guifg=#A8334C guibg=#E7DDDE guisp=NONE gui=NONE
highlight LspDiagnosticsVirtualTextWarning guifg=#944927 guibg=#F0E6E4 guisp=NONE gui=NONE
highlight LspDiagnosticsUnderlineError guifg=#A8334C guibg=NONE guisp=NONE gui=undercurl
highlight LspDiagnosticsUnderlineWarning guifg=#944927 guibg=NONE guisp=NONE gui=undercurl
highlight LspDiagnosticsUnderlineInformation guifg=#286486 guibg=NONE guisp=NONE gui=undercurl
highlight LspDiagnosticsUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl
highlight! link TSVariable Identifier
highlight TSTag guifg=#4D5C65 guibg=NONE guisp=NONE gui=bold
highlight GitSignsAdd guifg=#617437 guibg=NONE guisp=NONE gui=NONE
highlight GitSignsChange guifg=#286486 guibg=NONE guisp=NONE gui=NONE
highlight GitSignsDelete guifg=#C23C55 guibg=NONE guisp=NONE gui=NONE
highlight GitSignsDelete guifg=#A8334C guibg=NONE guisp=NONE gui=NONE
highlight IndentBlanklineChar guifg=#D4CDCA guibg=NONE guisp=NONE gui=NONE
highlight! link TelescopeSelection CursorLine
highlight TelescopeSelectionCaret guifg=#C23C55 guibg=#E6E1DF guisp=NONE gui=NONE
highlight TelescopeSelectionCaret guifg=#A8334C guibg=#E6E1DF guisp=NONE gui=NONE
highlight TelescopeMatching guifg=#88507D guibg=NONE guisp=NONE gui=bold
highlight! link TelescopeBorder FloatBorder
highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic
highlight! link Sneak Search
highlight! link SneakLabel WildMenu
highlight! link ErrorMsg Error
highlight SneakLabelMask guifg=#88507D guibg=#88507D guisp=NONE gui=NONE
highlight! link BufferCurrent TabLineSel
highlight BufferVisible guifg=#596A76 guibg=NONE guisp=NONE gui=NONE
highlight WarningMsg guifg=#914B27 guibg=NONE guisp=NONE gui=NONE
highlight Normal guifg=#2C363C guibg=#F0EDEC guisp=NONE gui=NONE
highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline
highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold
highlight BufferVisibleIndex guifg=#596A76 guibg=NONE guisp=NONE gui=NONE
highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic
highlight Error guifg=#C23C55 guibg=NONE guisp=NONE gui=NONE
highlight Conceal guifg=#4D5C65 guibg=NONE guisp=NONE gui=bold,italic
highlight BufferVisibleSign guifg=#596A76 guibg=NONE guisp=NONE gui=NONE
highlight BufferVisibleIndex guifg=#596A76 guibg=NONE guisp=NONE gui=NONE
highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold
highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic
highlight Conceal guifg=#4D5C65 guibg=NONE guisp=NONE gui=bold,italic
highlight WarningMsg guifg=#944927 guibg=NONE guisp=NONE gui=NONE
highlight Cursor guifg=#F2F0EF guibg=#2C363C guisp=NONE gui=NONE
highlight lCursor guifg=#F2F0EF guibg=#4D5C65 guisp=NONE gui=NONE
highlight! link TermCursor Cursor
highlight! link TermCursorNC lCursor
highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic
highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline
highlight! link ErrorMsg Error
highlight Normal guifg=#2C363C guibg=#F0EDEC guisp=NONE gui=NONE
highlight CursorLine guifg=NONE guibg=#E6E1DF guisp=NONE gui=NONE
highlight! link CursorColumn CursorLine
highlight ColorColumn guifg=NONE guibg=#EED8D2 guisp=NONE gui=NONE
highlight DiffAdd guifg=NONE guibg=#BED09F guisp=NONE gui=NONE
highlight DiffChange guifg=NONE guibg=#A6CEEF guisp=NONE gui=NONE
highlight DiffDelete guifg=NONE guibg=#E6B5BA guisp=NONE gui=NONE
highlight DiffText guifg=#2C363C guibg=#7EBDE9 guisp=NONE gui=NONE
highlight ColorColumn guifg=NONE guibg=#EFD8D3 guisp=NONE gui=NONE
highlight DiffAdds guifg=NONE guibg=#E1ECD0 guisp=NONE gui=NONE
highlight DiffAdd guifg=NONE guibg=#DDE6CD guisp=NONE gui=NONE
highlight DiffChange guifg=NONE guibg=#C0DAF2 guisp=NONE gui=NONE
highlight DiffDelete guifg=NONE guibg=#E9CACE guisp=NONE gui=NONE
highlight DiffText guifg=#2C363C guibg=#99C6E9 guisp=NONE gui=NONE
highlight LineNr guifg=#9C8E87 guibg=NONE guisp=NONE gui=NONE
highlight! link SignColumn LineNr
highlight FoldColumn guifg=#9C8E87 guibg=NONE guisp=NONE gui=bold
highlight Folded guifg=#564E4A guibg=#CDC2BC guisp=NONE gui=NONE
highlight CursorLineNr guifg=#2C363C guibg=NONE guisp=NONE gui=bold
highlight MoreMsg guifg=#617437 guibg=NONE guisp=NONE gui=bold
highlight NormalFloat guifg=NONE guibg=#DFD9D6 guisp=NONE gui=NONE
highlight NormalFloat guifg=NONE guibg=#E1DCD9 guisp=NONE gui=NONE
highlight FloatBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE
highlight Pmenu guifg=NONE guibg=#D6CDC9 guisp=NONE gui=NONE
highlight PmenuSel guifg=NONE guibg=#C0B0A8 guisp=NONE gui=NONE
highlight PmenuSbar guifg=NONE guibg=#AD9E96 guisp=NONE gui=NONE
highlight Pmenu guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE
highlight PmenuSel guifg=NONE guibg=#C4B6AF guisp=NONE gui=NONE
highlight PmenuSbar guifg=NONE guibg=#B2A39B guisp=NONE gui=NONE
highlight PmenuThumb guifg=NONE guibg=#F7F6F5 guisp=NONE gui=NONE
highlight Search guifg=#2C363C guibg=#D2A6C8 guisp=NONE gui=NONE
highlight IncSearch guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold
highlight! link MatchParen Search
highlight SpellBad guifg=#A7535F guibg=NONE guisp=NONE gui=undercurl
highlight SneakLabelMask guifg=#88507D guibg=#88507D guisp=NONE gui=NONE
highlight SpellCap guifg=#A7535F guibg=NONE guisp=NONE gui=undercurl
highlight SpellBad guifg=#974352 guibg=NONE guisp=NONE gui=undercurl
highlight Error guifg=#A8334C guibg=NONE guisp=NONE gui=NONE
highlight SpellCap guifg=#974352 guibg=NONE guisp=NONE gui=undercurl
highlight! link SpellLocal SpellCap
highlight SpellRare guifg=#A7535F guibg=NONE guisp=NONE gui=undercurl
highlight SpellRare guifg=#974352 guibg=NONE guisp=NONE gui=undercurl
highlight StatusLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=NONE
highlight StatusLineNC guifg=#596A76 guibg=#DAD3CF guisp=NONE gui=NONE
highlight TabLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=italic
@@ -117,27 +142,3 @@ highlight WildMenu guifg=#F0EDEC guibg=#88507D guisp=NONE gui=NONE
highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold
highlight! link Question MoreMsg
highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold
highlight Constant guifg=#53636D guibg=NONE guisp=NONE gui=italic
highlight Identifier guifg=#44525B guibg=NONE guisp=NONE gui=NONE
highlight Function guifg=#2C363C guibg=NONE guisp=NONE gui=NONE
highlight Statement guifg=#2C363C guibg=NONE guisp=NONE gui=bold
highlight! link PreProc Statement
highlight Type guifg=#5C534F guibg=NONE guisp=NONE gui=NONE
highlight Special guifg=#53636D guibg=NONE guisp=NONE gui=bold
highlight Delimiter guifg=#8E817B guibg=NONE guisp=NONE gui=NONE
highlight SpecialComment guifg=#948985 guibg=NONE guisp=NONE gui=bold
highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline
highlight! link Sneak Search
highlight! link LspReferenceText ColorColumn
highlight! link LspReferenceRead ColorColumn
highlight! link LspReferenceWrite ColorColumn
highlight! link LspDiagnosticsDefaultError Error
highlight! link LspDiagnosticsDefaultWarning WarningMsg
highlight LspDiagnosticsDefaultInformation guifg=#286486 guibg=NONE guisp=NONE gui=NONE
highlight LspDiagnosticsDefaultHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE
highlight LspDiagnosticsVirtualTextError guifg=#C23C55 guibg=#EBE0E1 guisp=NONE gui=NONE
highlight LspDiagnosticsVirtualTextWarning guifg=#914B27 guibg=#EFDFDB guisp=NONE gui=NONE
highlight LspDiagnosticsUnderlineError guifg=#C23C55 guibg=NONE guisp=NONE gui=undercurl
highlight LspDiagnosticsUnderlineWarning guifg=#914B27 guibg=NONE guisp=NONE gui=undercurl
highlight LspDiagnosticsUnderlineInformation guifg=#286486 guibg=NONE guisp=NONE gui=undercurl
highlight LspDiagnosticsUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl

View File

@@ -1,4 +1,4 @@
*zenbones.txt* For NVIM v0.4.3 Last change: 2021 August 27
*zenbones.txt* For NVIM v0.4.3 Last change: 2021 August 28
==============================================================================
Table of Contents *zenbones-table-of-contents*

View File

@@ -6,8 +6,8 @@ local colors = {
stone = hsluv(230, 30, 22),
leaf = hsluv(103, 72, 46),
water = hsluv(236, 84, 40),
rose = hsluv(5, 70, 46),
wood = hsluv(28, 80, 40),
rose = hsluv(4, 70, 40),
wood = hsluv(26, 80, 40),
blossom = hsluv(318, 42, 42),
sky = hsluv(204, 80, 53),
}

View File

@@ -37,12 +37,14 @@ local theme = lush(function()
CursorLine { bg = c.sand.da(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set.
CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
ColorColumn { bg = c.wood.de(40).li(80) }, -- used for the columns set with 'colorcolumn'
ColorColumn { bg = c.wood.de(38).li(80) }, -- used for the columns set with 'colorcolumn'
DiffAdd { bg = c.leaf.de(48).li(64) }, -- diff mode: Added line |diff.txt|
DiffChange { bg = c.water.de(18).li(68) }, -- diff mode: Changed line |diff.txt|
DiffDelete { bg = c.rose.de(22).li(60) }, -- diff mode: Deleted line |diff.txt|
DiffText { bg = c.water.de(18).li(56), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt|
DiffAdds { bg = c.leaf.de(74).li(86) }, -- diff mode: Added line |diff.txt|
DiffAdd { bg = c.leaf.de(77).li(82) }, -- diff mode: Added line |diff.txt|
DiffChange { bg = c.water.de(22).li(76) }, -- diff mode: Changed line |diff.txt|
DiffDelete { bg = c.rose.de(32).li(74) }, -- diff mode: Deleted line |diff.txt|
DiffText { bg = c.water.de(24).li(64), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt|
LineNr { fg = c.sand.da(36) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
SignColumn { LineNr }, -- column where |signs| are displayed
@@ -54,13 +56,13 @@ local theme = lush(function()
-- MsgArea { }, -- Area for messages and cmdline
-- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display'
MoreMsg { fg = c.leaf, gui = "bold" }, -- |more-prompt|
NormalFloat { bg = c.sand.da(7) }, -- Normal text in floating windows.
NormalFloat { bg = c.sand.da(6) }, -- Normal text in floating windows.
FloatBorder { fg = c.sand.da(50) }, -- Normal text in floating windows.
-- NormalNC { }, -- normal text in non-current windows
Pmenu { bg = c.sand.da(12) }, -- Popup menu: normal item.
PmenuSel { bg = c.sand.da(22) }, -- Popup menu: selected item.
PmenuSbar { bg = c.sand.da(30) }, -- Popup menu: scrollbar.
Pmenu { bg = c.sand.da(10) }, -- Popup menu: normal item.
PmenuSel { bg = c.sand.da(20) }, -- Popup menu: selected item.
PmenuSbar { bg = c.sand.da(28) }, -- Popup menu: scrollbar.
PmenuThumb { bg = c.white }, -- Popup menu: Thumb of the scrollbar.
Search { bg = c.blossom.de(10).lighten(54), fg = c.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out.
@@ -69,7 +71,7 @@ local theme = lush(function()
MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
-- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
SpellBad { fg = Error.fg.de(40), gui = "undercurl", guisp = Error.fg }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
SpellBad { fg = Error.fg.de(30), gui = "undercurl", guisp = Error.fg }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
SpellCap { SpellBad, guisp = Error.fg.li(10) }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
SpellRare { SpellBad, guisp = c.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise.
@@ -155,8 +157,8 @@ local theme = lush(function()
LspDiagnosticsDefaultInformation { fg = c.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsDefaultHint { fg = c.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(42).li(82) }, -- Used for "Error" diagnostic virtual text
LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(48).li(84) }, -- Used for "Warning" diagnostic virtual text
LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).li(82) }, -- Used for "Error" diagnostic virtual text
LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).li(86) }, -- Used for "Warning" diagnostic virtual text
-- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text
-- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text
@@ -249,10 +251,10 @@ local theme = lush(function()
SneakLabel { WildMenu },
SneakLabelMask { bg = c.blossom, fg = c.blossom },
BufferCurrent { TabLineSel },
BufferVisible { fg = StatusLineNC.fg },
BufferVisibleSign { fg = StatusLineNC.fg },
BufferVisibleIndex { fg = StatusLineNC.fg },
BufferCurrent { TabLineSel },
BufferVisible { fg = StatusLineNC.fg },
BufferVisibleSign { fg = StatusLineNC.fg },
BufferVisibleIndex { fg = StatusLineNC.fg },
}
end)
-- stylua: ignore end

View File

@@ -12,6 +12,7 @@ function M.print_terminal_colors()
for i, v in ipairs(terminal.colors) do
table.insert(lines, "ansi color" .. (i - 1) .. ": " .. v.hex)
-- table.insert(lines, "let g:terminal_color_" .. (i - 1) .. " = '" .. v.hex .. "'")
end
table.insert(lines, "cursor foreground: " .. t.Cursor.fg.hex)