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.

Sign up for GitHub

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

Jump to bottom

chore: Enhance current Statusline and Popup selection colors #266

Merged
merged 1 commit into from
May 29, 2023
Merged

chore: Enhance current Statusline and Popup selection colors #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changes

- Enhance Current Statusline and Popup selection with blue tint

### Issues Fix

- Fixed Interactive mode in compiled colorscheme
Expand Down
7 changes: 5 additions & 2 deletions lua/github-theme/group/editor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
local C = require('github-theme.lib.color')

local M = {}

function M.get(spec, config)
Expand All @@ -17,6 +19,7 @@ function M.get(spec, config)
end

local c = spec.palette
local sts_bg = C.from_hex(spec.bg0):blend(C.from_hex(c.blue.base), 0.7):to_css()

-- stylua: ignore start
local groups = {
Expand Down Expand Up @@ -63,7 +66,7 @@ function M.get(spec, config)
Pmenu = { fg = spec.fg1, bg = spec.bg0 }, -- Popup menu: normal item.
PmenuSel = { bg = spec.sel1 }, -- Popup menu: selected item.
PmenuSbar = { link = 'Pmenu' }, -- Popup menu: scrollbar.
PmenuThumb = { bg = spec.sel1 }, -- Popup menu: Thumb of the scrollbar.
PmenuThumb = { bg = spec.sel0 }, -- Popup menu: Thumb of the scrollbar.
Question = { link = 'MoreMsg' }, -- |hit-enter| prompt and yes/no questions
QuickFixLine = { link = 'CursorLine' }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.

Expand All @@ -76,7 +79,7 @@ function M.get(spec, config)
SpellCap = { sp = spec.diag.warn, style = 'undercurl' }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
SpellLocal = { sp = spec.diag.info, style = 'undercurl' }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
SpellRare = { sp = spec.diag.info, style = 'undercurl' }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise.
StatusLine = { fg = spec.fg2, bg = spec.bg0 }, -- status line of current window
StatusLine = { fg = spec.bg0, bg = sts_bg }, -- status line of current window
StatusLineNC = { fg = spec.fg3, bg = spec.bg0 }, -- status lines of not-current windows Note: if this is equal to 'StatusLine' Vim will use '^^^' in the status line of the current window.

TabLine = { fg = spec.fg2, bg = spec.bg2 }, -- tab pages line, not active tab page label
Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_dark.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = pal.scale.gray[6], -- Lighter bg (cursor line)
Expand All @@ -179,7 +179,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.30), -- Visual selection bg
sel1 = alpha(C(pal.fg.subtle), 0.05), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.scale.yellow[1]), 0.20), -- Search bg
}

Expand Down
2 changes: 1 addition & 1 deletion lua/github-theme/palette/github_dark_colorblind.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.45), -- Visual selection bg
sel1 = alpha(C(pal.fg.subtle), 0.05), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.scale.yellow[3]), 0.60), -- Search bg
}

Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_dark_dimmed.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = alpha(C(pal.fg.default), 0.1), -- Lighter bg (cursor line)
Expand All @@ -179,7 +179,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.40), -- Visual selection bg
sel1 = alpha(C(pal.fg.subtle), 0.05), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.scale.yellow[1]), 0.20), -- Search bg
}

Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_dark_high_contrast.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = alpha(C(pal.fg.default), 0.1), -- Lighter bg (cursor line)
Expand All @@ -179,7 +179,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.30), -- Visual selection bg
sel1 = alpha(C(pal.fg.subtle), 0.05), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.scale.yellow[1]), 0.20), -- Search bg
}

Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_dark_tritanopia.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = pal.scale.gray[6], -- Lighter bg (cursor line)
Expand All @@ -179,7 +179,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.30), -- Visual selection bg
sel1 = alpha(C(pal.fg.subtle), 0.05), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.scale.yellow[1]), 0.20), -- Search bg
}

Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_light.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = alpha(C(pal.scale.blue[9]), 0.1), -- Lighter bg (cursor line)
Expand All @@ -180,7 +180,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.15), -- Visual selection bg
sel1 = alpha(C(pal.accent.fg), 0.2), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.attention.emphasis), 0.3) -- Search bg
}

Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_light_colorblind.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = alpha(C(pal.scale.blue[9]), 0.1), -- Lighter bg (cursor line)
Expand All @@ -180,7 +180,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.15), -- Visual selection bg
sel1 = alpha(C(pal.accent.fg), 0.3), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.attention.emphasis), 0.3) -- Search bg
}

Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_light_high_contrast.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = pal.scale.gray[2], -- Lighter bg (cursor line)
Expand All @@ -180,7 +180,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.2), -- Visual selection bg
sel1 = alpha(C(pal.accent.fg), 0.3), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.attention.emphasis), 0.3) -- Search bg
}

Expand Down
4 changes: 2 additions & 2 deletions lua/github-theme/palette/github_light_tritanopia.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ local palette = {
local function generate_spec(pal)
-- stylua: ignore start
local spec = {
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
bg1 = pal.canvas.default, -- Default bg
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
bg3 = pal.scale.gray[2], -- Lighter bg (cursor line)
Expand All @@ -180,7 +180,7 @@ local function generate_spec(pal)
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)

sel0 = alpha(C(pal.accent.fg), 0.2), -- Visual selection bg
sel1 = alpha(C(pal.accent.fg), 0.3), -- Popup sel bg
sel1 = alpha(C(pal.accent.muted), 0.90), -- Popup sel bg
sel2 = alpha(C(pal.attention.emphasis), 0.3) -- Search bg
}

Expand Down