Skip to content

Commit f09a14e

Browse files
ful1e5ful1e5
authored
Merge pull request projekt0n#266 from projekt0n/enhance-statusline
chore: Enhance current Statusline and Popup selection colors
2 parents 5a3ce78 + a270df2 commit f09a14e

11 files changed

+24
-19
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414

1515
### Changes
1616

17+
- Enhance Current Statusline and Popup selection with blue tint
18+
1719
### Issues Fix
1820

1921
- Fixed Interactive mode in compiled colorscheme

‎lua/github-theme/group/editor.lua

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
local C = require('github-theme.lib.color')
2+
13
local M = {}
24

35
function M.get(spec, config)
@@ -17,6 +19,7 @@ function M.get(spec, config)
1719
end
1820

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

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

@@ -76,7 +79,7 @@ function M.get(spec, config)
7679
SpellCap = { sp = spec.diag.warn, style = 'undercurl' }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
7780
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.
7881
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.
79-
StatusLine = { fg = spec.fg2, bg = spec.bg0 }, -- status line of current window
82+
StatusLine = { fg = spec.bg0, bg = sts_bg }, -- status line of current window
8083
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.
8184

8285
TabLine = { fg = spec.fg2, bg = spec.bg2 }, -- tab pages line, not active tab page label

‎lua/github-theme/palette/github_dark.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ local palette = {
167167
local function generate_spec(pal)
168168
-- stylua: ignore start
169169
local spec = {
170-
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
170+
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
171171
bg1 = pal.canvas.default, -- Default bg
172172
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
173173
bg3 = pal.scale.gray[6], -- Lighter bg (cursor line)
@@ -179,7 +179,7 @@ local function generate_spec(pal)
179179
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)
180180

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

‎lua/github-theme/palette/github_dark_colorblind.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ local function generate_spec(pal)
179179
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)
180180

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

‎lua/github-theme/palette/github_dark_dimmed.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ local palette = {
167167
local function generate_spec(pal)
168168
-- stylua: ignore start
169169
local spec = {
170-
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
170+
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
171171
bg1 = pal.canvas.default, -- Default bg
172172
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
173173
bg3 = alpha(C(pal.fg.default), 0.1), -- Lighter bg (cursor line)
@@ -179,7 +179,7 @@ local function generate_spec(pal)
179179
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)
180180

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

‎lua/github-theme/palette/github_dark_high_contrast.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ local palette = {
167167
local function generate_spec(pal)
168168
-- stylua: ignore start
169169
local spec = {
170-
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
170+
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
171171
bg1 = pal.canvas.default, -- Default bg
172172
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
173173
bg3 = alpha(C(pal.fg.default), 0.1), -- Lighter bg (cursor line)
@@ -179,7 +179,7 @@ local function generate_spec(pal)
179179
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)
180180

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

‎lua/github-theme/palette/github_dark_tritanopia.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ local palette = {
167167
local function generate_spec(pal)
168168
-- stylua: ignore start
169169
local spec = {
170-
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (status line, popup and float)
170+
bg0 = alpha(C(pal.canvas.inset), 0.75), -- Dark bg (popup and float)
171171
bg1 = pal.canvas.default, -- Default bg
172172
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
173173
bg3 = pal.scale.gray[6], -- Lighter bg (cursor line)
@@ -179,7 +179,7 @@ local function generate_spec(pal)
179179
fg3 = pal.scale.gray[5], -- Darker fg (line numbers, fold columns)
180180

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

‎lua/github-theme/palette/github_light.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ local palette = {
168168
local function generate_spec(pal)
169169
-- stylua: ignore start
170170
local spec = {
171-
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
171+
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
172172
bg1 = pal.canvas.default, -- Default bg
173173
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
174174
bg3 = alpha(C(pal.scale.blue[9]), 0.1), -- Lighter bg (cursor line)
@@ -180,7 +180,7 @@ local function generate_spec(pal)
180180
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)
181181

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

‎lua/github-theme/palette/github_light_colorblind.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ local palette = {
168168
local function generate_spec(pal)
169169
-- stylua: ignore start
170170
local spec = {
171-
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
171+
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
172172
bg1 = pal.canvas.default, -- Default bg
173173
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
174174
bg3 = alpha(C(pal.scale.blue[9]), 0.1), -- Lighter bg (cursor line)
@@ -180,7 +180,7 @@ local function generate_spec(pal)
180180
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)
181181

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

‎lua/github-theme/palette/github_light_high_contrast.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ local palette = {
168168
local function generate_spec(pal)
169169
-- stylua: ignore start
170170
local spec = {
171-
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
171+
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
172172
bg1 = pal.canvas.default, -- Default bg
173173
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
174174
bg3 = pal.scale.gray[2], -- Lighter bg (cursor line)
@@ -180,7 +180,7 @@ local function generate_spec(pal)
180180
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)
181181

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

‎lua/github-theme/palette/github_light_tritanopia.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ local palette = {
168168
local function generate_spec(pal)
169169
-- stylua: ignore start
170170
local spec = {
171-
bg0 = pal.canvas.inset, -- Dark bg (status line, popup and float)
171+
bg0 = pal.canvas.inset, -- Dark bg (popup and float)
172172
bg1 = pal.canvas.default, -- Default bg
173173
bg2 = alpha(C(pal.neutral.emphasis), 0.1), -- Lighter bg (colorcolumn Folds)
174174
bg3 = pal.scale.gray[2], -- Lighter bg (cursor line)
@@ -180,7 +180,7 @@ local function generate_spec(pal)
180180
fg3 = pal.scale.gray[7], -- Darker fg (line numbers, fold columns)
181181

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

0 commit comments

Comments
 (0)