Skip to content

Commit

Permalink
feat: 'light_colorblind (beta)' theme added #96
Browse files Browse the repository at this point in the history
  • Loading branch information
ful1e5 committed Jan 10, 2022
1 parent 815abc0 commit 188ea91
Show file tree
Hide file tree
Showing 11 changed files with 578 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Github Dark ColorBlind theme added 🎉 #96
- Github Dark ColorBlind(Beta) added 🎉 #96
- Github Light ColorBlind(Beta) added 🎉 #96
- Dark background color for inactive statusline and lualine
- Minimal look (`hide_inactive_statusline`) removed from lualine
- `terminal` highlight added for lualine
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ kitty_light: kitty_pre
kitty_light_default: kitty_pre
@cat $(exts)/kitty/github_light_default.conf > $(kitty_theme)

kitty_light_colorblind: kitty_pre
@cat $(exts)/kitty/github_light_colorblind.conf > $(kitty_theme)

# reload tmux theme
tmux_theme = ~/.github-theme.tmux

Expand All @@ -62,3 +65,6 @@ tmux_light: tmux_pre

tmux_light_default: tmux_pre
@cat $(exts)/tmux/github_light_default.tmux > $(tmux_theme)

tmux_light_colorblind: tmux_pre
@cat $(exts)/tmux/github_light_colorblind.tmux > $(tmux_theme)
3 changes: 3 additions & 0 deletions colors/github_light_colorblind.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
lua << EOF
require("github-theme").setup({theme_style = "light_colorblind"})
EOF
105 changes: 105 additions & 0 deletions lua/github-theme/palette/light_colorblind.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
local util = require('github-theme.util')
local light_default_palette = require('github-theme.palette.light_default')

return function()
---@type gt.ColorPalette
local palette = {
-- -- Background Colors
-- bg = '#ffffff',
-- bg2 = '#f6f8fa',

-- -- Foreground Colors
-- fg = '#24292e',
-- fg_dark = '#424242',
-- fg_gutter = '#24292e',
-- fg_light = '#24292e',
-- fg_term = '#4d5566',

-- -- Background Highlights Colors
-- bg_highlight = '#d5e5f6',
-- bg_search = '#fff2be',
-- bg_visual = '#e1e4e8',
-- bg_visual_selection = '#dbe9f9',
-- border = '#044289',

-- -- Cursor & LineNumber Colors
cursor = '#0969da',
-- cursor_line_nr = '#24292e',
-- line_nr = '#959da5',

-- -- LSP & Diagnostic Colors
-- error = '#cb2431',
-- warning = '#bf8803',
-- info = '#75beff',
-- hint = '#6c6c6c',
-- lsp = { ref_txt = '#ccf3d5' },

-- -- Auto-Complication Colors
-- pmenu = {
-- bg = '#f6f8fa',
-- sbar = '#e7e9eb',
-- },

-- -- Git & Diff Colors
-- git = {
-- add = '#22863a',
-- change = '#b08800',
-- delete = '#cb2431',
-- conflict = '#b08800',
-- -- ignore = '#959da5',
-- -- renamed = '#007100',
-- },
-- diff = {
-- add = '#d4f8db',
-- add_fg = '#22863a',
-- change = '#fff5b1',
-- change_fg = '#b08800',
-- delete = '#fae5e7',
-- delete_fg = '#cb2431',
-- },

-- Syntax Colors
syntax = {
-- comment = '#6a737d',
-- constant = '#005cc5',
-- string = '#032f62',
variable = '#953800',
keyword = '#AC5E00',
-- func = '#6f42c1',
-- func_param = '#24292e',
-- match_paren_bg = '#ccf3d5',
tag = '#24292F',
-- html_arg = '#b31d28',
-- param = '#e36209',
-- json_label = '#005cc5',
},

-- -- Terminal Colors
-- orange = '#d18616',
-- black = '#24292e',
-- bright_black = '#586069',
-- white = '#6a737d',
-- bright_white = '#959da5',
-- red = '#d73a49',
-- bright_red = '#cb2431',
-- green = '#22863a',
-- bright_green = '#28a745',
-- yellow = '#b08800',
-- bright_yellow = '#dbab09',
-- blue = '#0366d6',
-- bright_blue = '#2188ff',
-- magenta = '#6f42c1',
-- bright_magenta = '#8a63d2',
-- cyan = '#1b7c83',
-- bright_cyan = '#3192aa',

-- -- Plugin Colors
-- git_signs = {
-- add = '#34d058',
-- change = '#f9c513',
-- delete = '#d73a49'
-- },
}

return util.color_overrides(light_default_palette(), palette)
end
2 changes: 1 addition & 1 deletion lua/github-theme/theme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ theme.setup = function(cfg)
GitSignsAdd = { fg = c.git_signs.add }, -- diff mode: Added line |diff.txt|
GitSignsChange = { fg = c.git_signs.change }, -- diff mode: Changed line |diff.txt|
GitSignsDelete = { fg = c.git_signs.delete }, -- diff mode: Deleted line |diff.txt|
GitSignsCurrentLineBlame = { fg = util.darken(c.syntax.comment, 0.4) }, -- diff mode: Deleted line |diff.txt|
GitSignsCurrentLineBlame = { fg = util.darken(c.syntax.comment, 0.6) }, -- diff mode: Deleted line |diff.txt|

-- Telescope
TelescopeBorder = { fg = c.border },
Expand Down
3 changes: 2 additions & 1 deletion lua/github-theme/types/gt.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
---@diagnostic disable: duplicate-doc-class
local gt = {}

---@alias gt.ThemeStyle "'dark'" | "'dark_default'" | "'dark_colorblind'" | "'dimmed'" | "'light'" | "'light_default'"
---@alias gt.ThemeStyle "'dark'" | "'dark_default'" | "'dark_colorblind'" | "'dimmed'" | "'light'" | "'light_default'" | " 'light_colorblind'"
gt.ThemeStyle = {}
gt.ThemeStyle.Dark = 'dark'
gt.ThemeStyle.DarkDefault = 'dark_default'
gt.ThemeStyle.DarkColorblind = 'dark_colorblind'
gt.ThemeStyle.Dimmed = 'dimmed'
gt.ThemeStyle.Light = 'light'
gt.ThemeStyle.LightDefault = 'light_default'
gt.ThemeStyle.LightColorblind = 'light_colorblind'

---@alias gt.HighlightStyle "'NONE'" | "'bold'" | "'underline'" | "'undercurl'" | "'undercurl'" | "'inverse'" | "'italic'" | "'stanout'" | "'nocombine'" | "'strikethrough'"
gt.HighlightStyle = {}
Expand Down
32 changes: 32 additions & 0 deletions terminal/alacritty/github_light_colorblind.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# github Alacritty Colors
colors:
# Default colors
primary:
background: '0xffffff'
foreground: '0x4d5566'

# Normal colors
normal:
black: '0x24292e'
red: '0xd73a49'
green: '0x22863a'
yellow: '0xb08800'
blue: '0x0366d6'
magenta: '0x6f42c1'
cyan: '0x1b7c83'
white: '0x4d5566'

# Bright colors
bright:
black: '0x586069'
red: '0xcb2431'
green: '0x28a745'
yellow: '0xdbab09'
blue: '0x2188ff'
magenta: '0x8a63d2'
cyan: '0x1b7c83'
white: '0x4d5566'

indexed_colors:
- { index: 16, color: '0xd18616' }
- { index: 17, color: '0xcb2431' }
Loading

0 comments on commit 188ea91

Please sign in to comment.