Skip to content

Commit 188ea91

Browse files
committed
feat: 'light_colorblind (beta)' theme added #96
1 parent 815abc0 commit 188ea91

11 files changed

+578
-3
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12-
- Github Dark ColorBlind theme added 🎉 #96
12+
- Github Dark ColorBlind(Beta) added 🎉 #96
13+
- Github Light ColorBlind(Beta) added 🎉 #96
1314
- Dark background color for inactive statusline and lualine
1415
- Minimal look (`hide_inactive_statusline`) removed from lualine
1516
- `terminal` highlight added for lualine

Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ kitty_light: kitty_pre
3838
kitty_light_default: kitty_pre
3939
@cat $(exts)/kitty/github_light_default.conf > $(kitty_theme)
4040

41+
kitty_light_colorblind: kitty_pre
42+
@cat $(exts)/kitty/github_light_colorblind.conf > $(kitty_theme)
43+
4144
# reload tmux theme
4245
tmux_theme = ~/.github-theme.tmux
4346

@@ -62,3 +65,6 @@ tmux_light: tmux_pre
6265

6366
tmux_light_default: tmux_pre
6467
@cat $(exts)/tmux/github_light_default.tmux > $(tmux_theme)
68+
69+
tmux_light_colorblind: tmux_pre
70+
@cat $(exts)/tmux/github_light_colorblind.tmux > $(tmux_theme)

colors/github_light_colorblind.vim

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
lua << EOF
2+
require("github-theme").setup({theme_style = "light_colorblind"})
3+
EOF
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
local util = require('github-theme.util')
2+
local light_default_palette = require('github-theme.palette.light_default')
3+
4+
return function()
5+
---@type gt.ColorPalette
6+
local palette = {
7+
-- -- Background Colors
8+
-- bg = '#ffffff',
9+
-- bg2 = '#f6f8fa',
10+
11+
-- -- Foreground Colors
12+
-- fg = '#24292e',
13+
-- fg_dark = '#424242',
14+
-- fg_gutter = '#24292e',
15+
-- fg_light = '#24292e',
16+
-- fg_term = '#4d5566',
17+
18+
-- -- Background Highlights Colors
19+
-- bg_highlight = '#d5e5f6',
20+
-- bg_search = '#fff2be',
21+
-- bg_visual = '#e1e4e8',
22+
-- bg_visual_selection = '#dbe9f9',
23+
-- border = '#044289',
24+
25+
-- -- Cursor & LineNumber Colors
26+
cursor = '#0969da',
27+
-- cursor_line_nr = '#24292e',
28+
-- line_nr = '#959da5',
29+
30+
-- -- LSP & Diagnostic Colors
31+
-- error = '#cb2431',
32+
-- warning = '#bf8803',
33+
-- info = '#75beff',
34+
-- hint = '#6c6c6c',
35+
-- lsp = { ref_txt = '#ccf3d5' },
36+
37+
-- -- Auto-Complication Colors
38+
-- pmenu = {
39+
-- bg = '#f6f8fa',
40+
-- sbar = '#e7e9eb',
41+
-- },
42+
43+
-- -- Git & Diff Colors
44+
-- git = {
45+
-- add = '#22863a',
46+
-- change = '#b08800',
47+
-- delete = '#cb2431',
48+
-- conflict = '#b08800',
49+
-- -- ignore = '#959da5',
50+
-- -- renamed = '#007100',
51+
-- },
52+
-- diff = {
53+
-- add = '#d4f8db',
54+
-- add_fg = '#22863a',
55+
-- change = '#fff5b1',
56+
-- change_fg = '#b08800',
57+
-- delete = '#fae5e7',
58+
-- delete_fg = '#cb2431',
59+
-- },
60+
61+
-- Syntax Colors
62+
syntax = {
63+
-- comment = '#6a737d',
64+
-- constant = '#005cc5',
65+
-- string = '#032f62',
66+
variable = '#953800',
67+
keyword = '#AC5E00',
68+
-- func = '#6f42c1',
69+
-- func_param = '#24292e',
70+
-- match_paren_bg = '#ccf3d5',
71+
tag = '#24292F',
72+
-- html_arg = '#b31d28',
73+
-- param = '#e36209',
74+
-- json_label = '#005cc5',
75+
},
76+
77+
-- -- Terminal Colors
78+
-- orange = '#d18616',
79+
-- black = '#24292e',
80+
-- bright_black = '#586069',
81+
-- white = '#6a737d',
82+
-- bright_white = '#959da5',
83+
-- red = '#d73a49',
84+
-- bright_red = '#cb2431',
85+
-- green = '#22863a',
86+
-- bright_green = '#28a745',
87+
-- yellow = '#b08800',
88+
-- bright_yellow = '#dbab09',
89+
-- blue = '#0366d6',
90+
-- bright_blue = '#2188ff',
91+
-- magenta = '#6f42c1',
92+
-- bright_magenta = '#8a63d2',
93+
-- cyan = '#1b7c83',
94+
-- bright_cyan = '#3192aa',
95+
96+
-- -- Plugin Colors
97+
-- git_signs = {
98+
-- add = '#34d058',
99+
-- change = '#f9c513',
100+
-- delete = '#d73a49'
101+
-- },
102+
}
103+
104+
return util.color_overrides(light_default_palette(), palette)
105+
end

lua/github-theme/theme.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ theme.setup = function(cfg)
385385
GitSignsAdd = { fg = c.git_signs.add }, -- diff mode: Added line |diff.txt|
386386
GitSignsChange = { fg = c.git_signs.change }, -- diff mode: Changed line |diff.txt|
387387
GitSignsDelete = { fg = c.git_signs.delete }, -- diff mode: Deleted line |diff.txt|
388-
GitSignsCurrentLineBlame = { fg = util.darken(c.syntax.comment, 0.4) }, -- diff mode: Deleted line |diff.txt|
388+
GitSignsCurrentLineBlame = { fg = util.darken(c.syntax.comment, 0.6) }, -- diff mode: Deleted line |diff.txt|
389389

390390
-- Telescope
391391
TelescopeBorder = { fg = c.border },

lua/github-theme/types/gt.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
---@diagnostic disable: duplicate-doc-class
22
local gt = {}
33

4-
---@alias gt.ThemeStyle "'dark'" | "'dark_default'" | "'dark_colorblind'" | "'dimmed'" | "'light'" | "'light_default'"
4+
---@alias gt.ThemeStyle "'dark'" | "'dark_default'" | "'dark_colorblind'" | "'dimmed'" | "'light'" | "'light_default'" | " 'light_colorblind'"
55
gt.ThemeStyle = {}
66
gt.ThemeStyle.Dark = 'dark'
77
gt.ThemeStyle.DarkDefault = 'dark_default'
88
gt.ThemeStyle.DarkColorblind = 'dark_colorblind'
99
gt.ThemeStyle.Dimmed = 'dimmed'
1010
gt.ThemeStyle.Light = 'light'
1111
gt.ThemeStyle.LightDefault = 'light_default'
12+
gt.ThemeStyle.LightColorblind = 'light_colorblind'
1213

1314
---@alias gt.HighlightStyle "'NONE'" | "'bold'" | "'underline'" | "'undercurl'" | "'undercurl'" | "'inverse'" | "'italic'" | "'stanout'" | "'nocombine'" | "'strikethrough'"
1415
gt.HighlightStyle = {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# github Alacritty Colors
2+
colors:
3+
# Default colors
4+
primary:
5+
background: '0xffffff'
6+
foreground: '0x4d5566'
7+
8+
# Normal colors
9+
normal:
10+
black: '0x24292e'
11+
red: '0xd73a49'
12+
green: '0x22863a'
13+
yellow: '0xb08800'
14+
blue: '0x0366d6'
15+
magenta: '0x6f42c1'
16+
cyan: '0x1b7c83'
17+
white: '0x4d5566'
18+
19+
# Bright colors
20+
bright:
21+
black: '0x586069'
22+
red: '0xcb2431'
23+
green: '0x28a745'
24+
yellow: '0xdbab09'
25+
blue: '0x2188ff'
26+
magenta: '0x8a63d2'
27+
cyan: '0x1b7c83'
28+
white: '0x4d5566'
29+
30+
indexed_colors:
31+
- { index: 16, color: '0xd18616' }
32+
- { index: 17, color: '0xcb2431' }

0 commit comments

Comments
 (0)