From 318883d498a68ed0727cb2025fd77f118b00f81e Mon Sep 17 00:00:00 2001
From: Pau Garcia Chiner <49660697+pauchiner@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:31:43 +0100
Subject: [PATCH 1/3] fix(lualine): increase contrasts for 'c' sections
---
lua/lualine/themes/pastelnight.lua | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lua/lualine/themes/pastelnight.lua b/lua/lualine/themes/pastelnight.lua
index 9e2e308..244bcae 100644
--- a/lua/lualine/themes/pastelnight.lua
+++ b/lua/lualine/themes/pastelnight.lua
@@ -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
From a61bfc1c6cb0e4e081b645cd7d201e647e28fb31 Mon Sep 17 00:00:00 2001
From: Pau Garcia Chiner <49660697+pauchiner@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:32:13 +0100
Subject: [PATCH 2/3] fix(lightline): increase contrasts for third sections
---
lua/lightline/colorscheme/pastelnight.lua | 34 +++++++++++------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/lua/lightline/colorscheme/pastelnight.lua b/lua/lightline/colorscheme/pastelnight.lua
index f4d20df..ada3ba7 100644
--- a/lua/lightline/colorscheme/pastelnight.lua
+++ b/lua/lightline/colorscheme/pastelnight.lua
@@ -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 } },
@@ -22,12 +22,12 @@ 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 },
},
}
@@ -35,12 +35,12 @@ 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 },
},
}
@@ -48,25 +48,25 @@ 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 } },
}
@@ -74,15 +74,15 @@ pastelnight.inactive = {
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 } },
}
From 241f9f3b2fe37077c5c24ee044c1d9791c0f254a Mon Sep 17 00:00:00 2001
From: Pau Garcia Chiner <49660697+pauchiner@users.noreply.github.com>
Date: Tue, 13 Feb 2024 10:36:12 +0100
Subject: [PATCH 3/3] fix!(extra): update black bright colors for the terminals
due to contrast issues
---
lua/pastelnight/extra/alacritty.lua | 4 ++--
lua/pastelnight/extra/foot.lua | 2 +-
lua/pastelnight/extra/iterm.lua | 6 +++---
lua/pastelnight/extra/kitty.lua | 2 +-
lua/pastelnight/extra/terminator.lua | 2 +-
lua/pastelnight/extra/tilix.lua | 2 +-
lua/pastelnight/extra/warp.lua | 2 +-
lua/pastelnight/extra/wezterm.lua | 2 +-
lua/pastelnight/extra/windows_terminal.lua | 2 +-
lua/pastelnight/extra/xfceterm.lua | 2 +-
lua/pastelnight/extra/xresources.lua | 2 +-
lua/pastelnight/extra/zathura.lua | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/lua/pastelnight/extra/alacritty.lua b/lua/pastelnight/extra/alacritty.lua
index bf9eb62..6410d58 100644
--- a/lua/pastelnight/extra/alacritty.lua
+++ b/lua/pastelnight/extra/alacritty.lua
@@ -22,7 +22,7 @@ colors:
# Normal colors
normal:
- black: '${base900}'
+ black: '${black}'
red: '${red}'
green: '${green}'
yellow: '${yellow}'
@@ -33,7 +33,7 @@ colors:
# Bright colors
bright:
- black: '${black}'
+ black: '${base200}'
red: '${red}'
green: '${green}'
yellow: '${yellow}'
diff --git a/lua/pastelnight/extra/foot.lua b/lua/pastelnight/extra/foot.lua
index cce6678..2370a08 100644
--- a/lua/pastelnight/extra/foot.lua
+++ b/lua/pastelnight/extra/foot.lua
@@ -32,7 +32,7 @@ regular5=${purple}
regular6=${sky}
regular7=${base50}
-bright0=${base900}
+bright0=${base200}
bright1=${red}
bright2=${green}
bright3=${yellow}
diff --git a/lua/pastelnight/extra/iterm.lua b/lua/pastelnight/extra/iterm.lua
index f0cdbda..3feccc0 100644
--- a/lua/pastelnight/extra/iterm.lua
+++ b/lua/pastelnight/extra/iterm.lua
@@ -213,13 +213,13 @@ function M.generate(colors)
Alpha Component
1
Blue Component
- ${base900.b}
+ ${base200.b}
Color Space
sRGB
Green Component
- ${base900.g}
+ ${base200.g}
Red Component
- ${base900.r}
+ ${base200.r}
Ansi 9 Color
diff --git a/lua/pastelnight/extra/kitty.lua b/lua/pastelnight/extra/kitty.lua
index e28a581..eef4022 100644
--- a/lua/pastelnight/extra/kitty.lua
+++ b/lua/pastelnight/extra/kitty.lua
@@ -44,7 +44,7 @@ color6 ${sky}
color7 ${base50}
# bright
-color8 ${base900}
+color8 ${base200}
color9 ${red}
color10 ${green}
color11 ${yellow}
diff --git a/lua/pastelnight/extra/terminator.lua b/lua/pastelnight/extra/terminator.lua
index f77996b..3fbab22 100644
--- a/lua/pastelnight/extra/terminator.lua
+++ b/lua/pastelnight/extra/terminator.lua
@@ -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}"
]=],
diff --git a/lua/pastelnight/extra/tilix.lua b/lua/pastelnight/extra/tilix.lua
index ebe9348..2429b9a 100644
--- a/lua/pastelnight/extra/tilix.lua
+++ b/lua/pastelnight/extra/tilix.lua
@@ -21,7 +21,7 @@ function M.generate(colors)
"${purple}",
"${sky}",
"${base50}",
- "${base900}",
+ "${base200}",
"${red}",
"${green}",
"${yellow}",
diff --git a/lua/pastelnight/extra/warp.lua b/lua/pastelnight/extra/warp.lua
index 1128785..7de2894 100644
--- a/lua/pastelnight/extra/warp.lua
+++ b/lua/pastelnight/extra/warp.lua
@@ -12,7 +12,7 @@ details: darker
foreground: '${fg}'
terminal_colors:
bright:
- black: '${base900}'
+ black: '${base200}'
blue: '${blue}'
cyan: '${sky}'
green: '${green}'
diff --git a/lua/pastelnight/extra/wezterm.lua b/lua/pastelnight/extra/wezterm.lua
index 73a39af..d59c42b 100644
--- a/lua/pastelnight/extra/wezterm.lua
+++ b/lua/pastelnight/extra/wezterm.lua
@@ -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}"
diff --git a/lua/pastelnight/extra/windows_terminal.lua b/lua/pastelnight/extra/windows_terminal.lua
index 3832909..cb46027 100644
--- a/lua/pastelnight/extra/windows_terminal.lua
+++ b/lua/pastelnight/extra/windows_terminal.lua
@@ -12,7 +12,7 @@ function M.generate(colors)
"background": "${bg}",
"black": "${black}",
"blue": "${blue}",
- "brightBlack": "${base900}",
+ "brightBlack": "${base200}",
"brightBlue": "${blue}",
"brightCyan": "${sky}",
"brightGreen": "${green}",
diff --git a/lua/pastelnight/extra/xfceterm.lua b/lua/pastelnight/extra/xfceterm.lua
index 8519bc4..d13d50c 100644
--- a/lua/pastelnight/extra/xfceterm.lua
+++ b/lua/pastelnight/extra/xfceterm.lua
@@ -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
)
diff --git a/lua/pastelnight/extra/xresources.lua b/lua/pastelnight/extra/xresources.lua
index a6ba108..050b72e 100644
--- a/lua/pastelnight/extra/xresources.lua
+++ b/lua/pastelnight/extra/xresources.lua
@@ -20,7 +20,7 @@ function M.generate(colors)
*color6: ${sky}
*color7: ${base50}
-*color8: ${base900}
+*color8: ${base200}
*color9: ${red}
*color10: ${green}
*color11: ${yellow}
diff --git a/lua/pastelnight/extra/zathura.lua b/lua/pastelnight/extra/zathura.lua
index 3fc34bb..f3de248 100644
--- a/lua/pastelnight/extra/zathura.lua
+++ b/lua/pastelnight/extra/zathura.lua
@@ -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}"