From f35a8ad88f5ba29df1a9240e331a65c0f252f2ea Mon Sep 17 00:00:00 2001 From: Sergio Alejandro Vargas Date: Fri, 22 Oct 2021 15:47:15 -0500 Subject: [PATCH 1/2] colors: Fix light variant background colors Use the same saturation levels as the dark variant. --- lua/melange/init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/melange/init.lua b/lua/melange/init.lua index 3a48601..724cf71 100644 --- a/lua/melange/init.lua +++ b/lua/melange/init.lua @@ -57,12 +57,12 @@ palette.dark = { palette.light = { a = { - bg = hsluv( 50, 30, 95); - overbg = hsluv( 50, 30, 90); - sel = hsluv( 50, 30, 85); - com = hsluv( 50, 40, 60); - faded = hsluv( 50, 40, 50); - fg = hsluv( 50, 40, 40); + bg = hsluv( 50, 20, 95); + overbg = hsluv( 50, 20, 90); + sel = hsluv( 50, 20, 85); + com = hsluv( 50, 30, 60); + faded = hsluv( 50, 30, 50); + fg = hsluv( 50, 30, 40); }; b = { red = hsluv( 20, 80, 50); From 15ff975d595d09bbf1cf707b881d0289a9404daa Mon Sep 17 00:00:00 2001 From: Sergio Alejandro Vargas Date: Fri, 22 Oct 2021 15:47:54 -0500 Subject: [PATCH 2/2] make --- colors/melange.vim | 44 ++++++++++++++++---------------- term/alacritty/melange_light.yml | 12 ++++----- term/kitty/melange_light.conf | 26 +++++++++---------- term/wezterm/melange_light.toml | 18 ++++++------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/colors/melange.vim b/colors/melange.vim index 6e694aa..d8ac2b9 100644 --- a/colors/melange.vim +++ b/colors/melange.vim @@ -131,9 +131,9 @@ else highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Boolean guifg=#854882 guibg=NONE guisp=NONE gui=NONE highlight Character guifg=#485F84 guibg=NONE guisp=NONE gui=NONE -highlight ColorColumn guifg=NONE guibg=#ECE1D7 guisp=NONE gui=NONE -highlight Comment guifg=#A88C6F guibg=NONE guisp=NONE gui=italic -highlight Conceal guifg=#8B735B guibg=NONE guisp=NONE gui=NONE +highlight ColorColumn guifg=NONE guibg=#E9E1DB guisp=NONE gui=NONE +highlight Comment guifg=#A38D78 guibg=NONE guisp=NONE gui=italic +highlight Conceal guifg=#867462 guibg=NONE guisp=NONE gui=NONE highlight Constant guifg=#BE79BB guibg=NONE guisp=NONE gui=NONE highlight CursorLineNr guifg=#CC7F2B guibg=NONE guisp=NONE gui=NONE highlight Delimiter guifg=#E2C28C guibg=NONE guisp=NONE gui=NONE @@ -152,37 +152,37 @@ highlight DiffText guifg=NONE guibg=#DFE3EB guisp=NONE gui=NONE highlight Directory guifg=#729893 guibg=NONE guisp=NONE gui=NONE highlight Error guifg=NONE guibg=#E0BFBB guisp=NONE gui=NONE highlight ErrorMsg guifg=NONE guibg=#E0BFBB guisp=NONE gui=NONE -highlight Folded guifg=#A88C6F guibg=#ECE1D7 guisp=NONE gui=NONE +highlight Folded guifg=#A38D78 guibg=#E9E1DB guisp=NONE gui=NONE highlight Function guifg=#C29830 guibg=NONE guisp=NONE gui=NONE highlight HelpHyperTextJump guifg=#CC7F2B guibg=NONE guisp=NONE gui=NONE -highlight Identifier guifg=#6E5B47 guibg=NONE guisp=NONE gui=NONE -highlight Ignore guifg=#A88C6F guibg=NONE guisp=NONE gui=NONE +highlight Identifier guifg=#6B5C4D guibg=NONE guisp=NONE gui=NONE +highlight Ignore guifg=#A38D78 guibg=NONE guisp=NONE gui=NONE highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight LineNr guifg=#E3D1C2 guibg=NONE guisp=NONE gui=NONE +highlight LineNr guifg=#DED2C8 guibg=NONE guisp=NONE gui=NONE highlight LspDiagnosticsUnderlineError guifg=NONE guibg=NONE guisp=NONE gui=undercurl highlight LspDiagnosticsUnderlineHint guifg=NONE guibg=NONE guisp=NONE gui=undercurl highlight LspDiagnosticsUnderlineInformation guifg=NONE guibg=NONE guisp=NONE gui=undercurl highlight LspDiagnosticsUnderlineWarning guifg=NONE guibg=NONE guisp=NONE gui=undercurl -highlight MatchParen guifg=#C29830 guibg=#E3D1C2 guisp=NONE gui=bold +highlight MatchParen guifg=#C29830 guibg=#DED2C8 guisp=NONE gui=bold highlight Melange guifg=NONE guibg=NONE guisp=NONE gui=NONE -highlight ModeMsg guifg=#8B735B guibg=NONE guisp=NONE gui=NONE +highlight ModeMsg guifg=#867462 guibg=NONE guisp=NONE gui=NONE highlight MoreMsg guifg=#83B887 guibg=NONE guisp=NONE gui=bold -highlight Normal guifg=#6E5B47 guibg=#F5F0EB guisp=NONE gui=NONE -highlight NormalFloat guifg=NONE guibg=#ECE1D7 guisp=NONE gui=NONE +highlight Normal guifg=#6B5C4D guibg=#F4F0ED guisp=NONE gui=NONE +highlight NormalFloat guifg=NONE guibg=#E9E1DB guisp=NONE gui=NONE highlight Number guifg=#854882 guibg=NONE guisp=NONE gui=NONE highlight Operator guifg=#C65333 guibg=NONE guisp=NONE gui=NONE -highlight PmenuSel guifg=NONE guibg=#E3D1C2 guisp=NONE gui=NONE +highlight PmenuSel guifg=NONE guibg=#DED2C8 guisp=NONE gui=NONE highlight PreProc guifg=#659E69 guibg=NONE guisp=NONE gui=NONE -highlight Search guifg=#F5F0EB guibg=#E2C28C guisp=NONE gui=NONE +highlight Search guifg=#F4F0ED guibg=#E2C28C guisp=NONE gui=NONE highlight Special guifg=#C29830 guibg=NONE guisp=NONE gui=NONE highlight SpellBad guifg=#D7898C guibg=NONE guisp=NONE gui=undercurl highlight SpellCap guifg=#ABB9D6 guibg=NONE guisp=NONE gui=undercurl highlight SpellLocal guifg=#CC7F2B guibg=NONE guisp=NONE gui=undercurl highlight SpellRare guifg=#C29830 guibg=NONE guisp=NONE gui=undercurl highlight Statement guifg=#CC7F2B guibg=NONE guisp=NONE gui=NONE -highlight StatusLineNC guifg=#8B735B guibg=#ECE1D7 guisp=NONE gui=NONE +highlight StatusLineNC guifg=#867462 guibg=#E9E1DB guisp=NONE gui=NONE highlight String guifg=#485F84 guibg=NONE guisp=NONE gui=italic -highlight Substitute guifg=#F5F0EB guibg=#E2C28C guisp=NONE gui=NONE +highlight Substitute guifg=#F4F0ED guibg=#E2C28C guisp=NONE gui=NONE highlight TSConstBuiltin guifg=#BE79BB guibg=NONE guisp=NONE gui=italic highlight TSMath guifg=#436460 guibg=NONE guisp=NONE gui=NONE highlight TSNamespace guifg=#83B887 guibg=NONE guisp=NONE gui=NONE @@ -190,18 +190,18 @@ highlight TSPunctDelimiter guifg=#D7898C guibg=NONE guisp=NONE gui=NONE highlight TSStrike guifg=NONE guibg=NONE guisp=NONE gui=strikethrough highlight TSStringEscape guifg=#ABB9D6 guibg=NONE guisp=NONE gui=NONE highlight TSStrong guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight TSSymbol guifg=#6E5B47 guibg=NONE guisp=NONE gui=italic +highlight TSSymbol guifg=#6B5C4D guibg=NONE guisp=NONE gui=italic highlight TSURI guifg=#485F84 guibg=NONE guisp=NONE gui=underline -highlight TSVariableBuiltin guifg=#6E5B47 guibg=NONE guisp=NONE gui=italic -highlight TabLineSel guifg=NONE guibg=#ECE1D7 guisp=NONE gui=bold +highlight TSVariableBuiltin guifg=#6B5C4D guibg=NONE guisp=NONE gui=italic +highlight TabLineSel guifg=NONE guibg=#E9E1DB guisp=NONE gui=bold highlight Title guifg=#CC7F2B guibg=NONE guisp=NONE gui=NONE -highlight Todo guifg=#8B735B guibg=NONE guisp=NONE gui=italic +highlight Todo guifg=#867462 guibg=NONE guisp=NONE gui=italic highlight Type guifg=#729893 guibg=NONE guisp=NONE gui=NONE highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline -highlight VertSplit guifg=#E3D1C2 guibg=NONE guisp=NONE gui=NONE -highlight Visual guifg=NONE guibg=#E3D1C2 guisp=NONE gui=NONE +highlight VertSplit guifg=#DED2C8 guibg=NONE guisp=NONE gui=NONE +highlight Visual guifg=NONE guibg=#DED2C8 guisp=NONE gui=NONE highlight WarningMsg guifg=#D7898C guibg=NONE guisp=NONE gui=NONE -highlight Whitespace guifg=#E3D1C2 guibg=NONE guisp=NONE gui=NONE +highlight Whitespace guifg=#DED2C8 guibg=NONE guisp=NONE gui=NONE highlight netrwExe guifg=#D7898C guibg=NONE guisp=NONE gui=NONE highlight netrwSymLink guifg=#BE79BB guibg=NONE guisp=NONE gui=NONE highlight texTitleArg guifg=NONE guibg=NONE guisp=NONE gui=bold diff --git a/term/alacritty/melange_light.yml b/term/alacritty/melange_light.yml index 4a80356..ba5b2bd 100644 --- a/term/alacritty/melange_light.yml +++ b/term/alacritty/melange_light.yml @@ -1,22 +1,22 @@ colors: primary: - foreground: '#6E5B47' - background: '#F5F0EB' + foreground: '#6B5C4D' + background: '#F4F0ED' normal: - black: '#ECE1D7' + black: '#E9E1DB' red: '#D7898C' green: '#83B887' yellow: '#C29830' blue: '#485F84' magenta: '#BE79BB' cyan: '#729893' - white: '#A88C6F' + white: '#A38D78' bright: - black: '#E3D1C2' + black: '#DED2C8' red: '#C65333' green: '#659E69' yellow: '#C29830' blue: '#485F84' magenta: '#854882' cyan: '#436460' - white: '#8B735B' + white: '#867462' diff --git a/term/kitty/melange_light.conf b/term/kitty/melange_light.conf index aca197c..52fe4c4 100644 --- a/term/kitty/melange_light.conf +++ b/term/kitty/melange_light.conf @@ -1,27 +1,27 @@ -background #F5F0EB -foreground #6E5B47 -cursor #6E5B47 +background #F4F0ED +foreground #6B5C4D +cursor #6B5C4D url_color #485F84 -selection_background #E3D1C2 -selection_foreground #6E5B47 -tab_bar_background #ECE1D7 -active_tab_background #ECE1D7 +selection_background #DED2C8 +selection_foreground #6B5C4D +tab_bar_background #E9E1DB +active_tab_background #E9E1DB active_tab_foreground #C29830 -inactive_tab_background #ECE1D7 -inactive_tab_foreground #8B735B -color0 #ECE1D7 +inactive_tab_background #E9E1DB +inactive_tab_foreground #867462 +color0 #E9E1DB color1 #D7898C color2 #83B887 color3 #C29830 color4 #485F84 color5 #BE79BB color6 #729893 -color7 #A88C6F -color8 #E3D1C2 +color7 #A38D78 +color8 #DED2C8 color9 #C65333 color10 #659E69 color11 #C29830 color12 #485F84 color13 #854882 color14 #436460 -color15 #8B735B +color15 #867462 diff --git a/term/wezterm/melange_light.toml b/term/wezterm/melange_light.toml index 6074798..fb4b354 100644 --- a/term/wezterm/melange_light.toml +++ b/term/wezterm/melange_light.toml @@ -1,10 +1,10 @@ [colors] -foreground = "#6E5B47" -background = "#F5F0EB" -cursor_bg = "#6E5B47" -cursor_border = "#6E5B47" -cursor_fg = "#F5F0EB" -selection_bg = "#E3D1C2" -selection_fg = "#6E5B47" -ansi = ["#ECE1D7", "#D7898C", "#83B887", "#C29830", "#485F84", "#BE79BB", "#729893", "#A88C6F"] -brights = ["#E3D1C2", "#C65333", "#659E69", "#C29830", "#485F84", "#854882", "#436460", "#8B735B"] +foreground = "#6B5C4D" +background = "#F4F0ED" +cursor_bg = "#6B5C4D" +cursor_border = "#6B5C4D" +cursor_fg = "#F4F0ED" +selection_bg = "#DED2C8" +selection_fg = "#6B5C4D" +ansi = ["#E9E1DB", "#D7898C", "#83B887", "#C29830", "#485F84", "#BE79BB", "#729893", "#A38D78"] +brights = ["#DED2C8", "#C65333", "#659E69", "#C29830", "#485F84", "#854882", "#436460", "#867462"]