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.

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

fix!: colors contrast #15

Merged
merged 3 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions lua/lightline/colorscheme/pastelnight.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ pastelnight.normal = {
left = {
{ colors.bg, colors.purple, 'bold' },
{ colors.purple300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
right = {
{ colors.bg, colors.purple, 'bold' },
{ colors.purple300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
middle = { { colors.base300, colors.bg_statusline } },
warning = { { colors.black, colors.warning } },
Expand All @@ -22,67 +22,67 @@ pastelnight.insert = {
left = {
{ colors.bg, colors.blue, 'bold' },
{ colors.blue300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
right = {
{ colors.bg, colors.blue, 'bold' },
{ colors.blue300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
}

pastelnight.visual = {
left = {
{ colors.bg, colors.yellow, 'bold' },
{ colors.yellow300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
right = {
{ colors.bg, colors.yellow, 'bold' },
{ colors.yellow300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
}

pastelnight.replace = {
left = {
{ colors.bg, colors.green, 'bold' },
{ colors.green300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
right = {
{ colors.bg, colors.green, 'bold' },
{ colors.green300, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
}

pastelnight.inactive = {
left = {
{ colors.bg_statusline, colors.purple, 'bold' },
{ colors.base400, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
right = {
{ colors.bg_statusline, colors.purple, 'bold' },
{ colors.base400, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
middle = { { colors.base300, colors.bg_statusline } },
}

pastelnight.tabline = {
left = {
{ colors.bg_statusline, colors.purple, 'bold' },
{ colors.base400, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
right = {
{ colors.bg_statusline, colors.purple, 'bold' },
{ colors.base400, colors.bg_statusline },
{ colors.base400, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
{ colors.base300, colors.bg_statusline },
},
tabsel = { { colors.purple, colors.bg }, { colors.base400, colors.bg } },
tabsel = { { colors.purple, colors.bg }, { colors.base300, colors.bg } },
middle = { { colors.base300, colors.bg_statusline } },
}

Expand Down
16 changes: 8 additions & 8 deletions lua/lualine/themes/pastelnight.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,43 @@ local pastelnight = {}
pastelnight.normal = {
a = { bg = colors.purple, fg = colors.bg, gui = 'bold' },
b = { bg = colors.bg_statusline, fg = colors.purple300 },
c = { bg = colors.bg_statusline, fg = colors.base400 },
c = { bg = colors.bg_statusline, fg = colors.base300 },
}

pastelnight.insert = {
a = { bg = colors.blue, fg = colors.bg, gui = 'bold' },
b = { bg = colors.bg_statusline, fg = colors.blue300 },
c = { bg = colors.bg_statusline, fg = colors.base400 },
c = { bg = colors.bg_statusline, fg = colors.base300 },
}

pastelnight.command = {
a = { bg = colors.purple, fg = colors.bg, gui = 'bold' },
b = { bg = colors.bg_statusline, fg = colors.purple300 },
c = { bg = colors.bg_statusline, fg = colors.base400 },
c = { bg = colors.bg_statusline, fg = colors.base300 },
}

pastelnight.visual = {
a = { bg = colors.yellow, fg = colors.bg, gui = 'bold' },
b = { bg = colors.bg_statusline, fg = colors.yellow300 },
c = { bg = colors.bg_statusline, fg = colors.base400 },
c = { bg = colors.bg_statusline, fg = colors.base300 },
}

pastelnight.replace = {
a = { bg = colors.green, fg = colors.bg, gui = 'bold' },
b = { bg = colors.bg_statusline, fg = colors.green300 },
c = { bg = colors.bg_statusline, fg = colors.base400 },
c = { bg = colors.bg_statusline, fg = colors.base300 },
}

pastelnight.terminal = {
a = { bg = colors.pink, fg = colors.bg, gui = 'bold' },
b = { bg = colors.bg_statusline, fg = colors.pink300 },
c = { bg = colors.bg_statusline, fg = colors.base400 },
c = { bg = colors.bg_statusline, fg = colors.base300 },
}

pastelnight.inactive = {
a = { bg = colors.bg_statusline, fg = colors.purple, gui = 'bold' },
b = { bg = colors.bg_statusline, fg = colors.base400 },
c = { bg = colors.bg_statusline, fg = colors.base400 },
b = { bg = colors.bg_statusline, fg = colors.base300 },
c = { bg = colors.bg_statusline, fg = colors.base300 },
}

if config.lualine_bold then
Expand Down
4 changes: 2 additions & 2 deletions lua/pastelnight/extra/alacritty.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ colors:

# Normal colors
normal:
black: '${base900}'
black: '${black}'
red: '${red}'
green: '${green}'
yellow: '${yellow}'
Expand All @@ -33,7 +33,7 @@ colors:

# Bright colors
bright:
black: '${black}'
black: '${base200}'
red: '${red}'
green: '${green}'
yellow: '${yellow}'
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/foot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ regular5=${purple}
regular6=${sky}
regular7=${base50}

bright0=${base900}
bright0=${base200}
bright1=${red}
bright2=${green}
bright3=${yellow}
Expand Down
6 changes: 3 additions & 3 deletions lua/pastelnight/extra/iterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,13 @@ function M.generate(colors)
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>${base900.b}</real>
<real>${base200.b}</real>
<key>Color Space</key>
<string>sRGB</string>
<key>Green Component</key>
<real>${base900.g}</real>
<real>${base200.g}</real>
<key>Red Component</key>
<real>${base900.r}</real>
<real>${base200.r}</real>
</dict>
<key>Ansi 9 Color</key>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/kitty.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ color6 ${sky}
color7 ${base50}

# bright
color8 ${base900}
color8 ${base200}
color9 ${red}
color10 ${green}
color11 ${yellow}
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/terminator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function M.generate(colors)
local terminator = util.template(
[=[
[[${_style_name}]]
palette = "${black}:${red}:${green}:${yellow}:${blue}:${purple}:${sky}:${base50}:${base900}:${red}:${green}:${yellow}:${blue}:${purple}:${sky}:${purple}"
palette = "${black}:${red}:${green}:${yellow}:${blue}:${purple}:${sky}:${base50}:${base200}:${red}:${green}:${yellow}:${blue}:${purple}:${sky}:${purple}"
background_color = "${bg}"
foreground_color = "${fg}"
]=],
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/tilix.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function M.generate(colors)
"${purple}",
"${sky}",
"${base50}",
"${base900}",
"${base200}",
"${red}",
"${green}",
"${yellow}",
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/warp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ details: darker
foreground: '${fg}'
terminal_colors:
bright:
black: '${base900}'
black: '${base200}'
blue: '${blue}'
cyan: '${sky}'
green: '${green}'
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ selection_bg = "${base400}"
selection_fg = "${fg}"
ansi = ["${black}", "${red}", "${green}", "${yellow}", "${blue}", "${purple}", "${sky}", "${base50}"]
brights = ["${base900}", "${red}", "${green}", "${yellow}", "${blue}", "${purple}", "${sky}", "${fg}"]
brights = ["${base200}", "${red}", "${green}", "${yellow}", "${blue}", "${purple}", "${sky}", "${fg}"]
[colors.tab_bar]
inactive_tab_edge = "${base600}"
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/windows_terminal.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function M.generate(colors)
"background": "${bg}",
"black": "${black}",
"blue": "${blue}",
"brightBlack": "${base900}",
"brightBlack": "${base200}",
"brightBlue": "${blue}",
"brightCyan": "${sky}",
"brightGreen": "${green}",
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/xfceterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ColorForeground=${fg}
ColorSelectionBackground=${base400}
ColorSelection=${fg}

ColorPalette=${black};${red};${green};${yellow};${blue};${purple};${sky};${base50};${base900};${red};${green};${yellow};${blue};${purple};${sky};${fg}
ColorPalette=${black};${red};${green};${yellow};${blue};${purple};${sky};${base50};${base200};${red};${green};${yellow};${blue};${purple};${sky};${fg}
]],
colors
)
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/xresources.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function M.generate(colors)
*color6: ${sky}
*color7: ${base50}

*color8: ${base900}
*color8: ${base200}
*color9: ${red}
*color10: ${green}
*color11: ${yellow}
Expand Down
2 changes: 1 addition & 1 deletion lua/pastelnight/extra/zathura.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function M.generate(colors)
set notification-error-bg "${red}"
set notification-error-fg "${fg}"
set notification-warning-bg "${yellow}"
set notification-warning-fg "${base900}"
set notification-warning-fg "${base200}"
set notification-bg "${bg}"
set notification-fg "${fg}"
set completion-bg "${bg}"
Expand Down
Loading