Skip to content

Commit 5127232

Browse files
committed
Use hex triplets for color definitions
Allow using colors at runtime (`require 'melange.palettes.dark'`), without requiring Lush.
1 parent b2f6047 commit 5127232

File tree

2 files changed

+54
-52
lines changed

2 files changed

+54
-52
lines changed

lua/melange/palettes/dark.lua

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
1-
local hsluv = require('lush').hsluv
2-
1+
-- stylua: ignore
32
return {
3+
-- Grays
44
a = {
5-
bg = hsluv(50, 20, 15),
6-
overbg = hsluv(50, 20, 20),
7-
sel = hsluv(50, 20, 30),
8-
com = hsluv(50, 30, 60),
9-
faded = hsluv(50, 30, 70),
10-
fg = hsluv(50, 30, 90),
5+
bg = "#2A2520",
6+
overbg = "#352F2A",
7+
sel = "#4D453E",
8+
com = "#A38D78",
9+
faded = "#C1A78E",
10+
fg = "#ECE1D7",
1111
},
12+
-- Bright colors
1213
b = {
13-
red = hsluv(20, 80, 65),
14-
yellow = hsluv(60, 70, 80),
15-
green = hsluv(130, 40, 80),
16-
cyan = hsluv(190, 40, 70),
17-
blue = hsluv(250, 40, 70),
18-
magenta = hsluv(310, 40, 70),
14+
red = "#F17C64",
15+
yellow = "#EBC06D",
16+
green = "#99D59D",
17+
cyan = "#88B3B2",
18+
blue = "#9AACCE",
19+
magenta = "#CE9BCB",
1920
},
21+
-- "regular" colors
2022
c = {
21-
red = hsluv(10, 40, 50),
22-
yellow = hsluv(40, 70, 70),
23-
green = hsluv(130, 30, 60),
24-
cyan = hsluv(190, 30, 65),
25-
blue = hsluv(250, 30, 50),
26-
magenta = hsluv(310, 30, 60),
23+
red = "#B65C60",
24+
yellow = "#E49B5D",
25+
green = "#78997A",
26+
cyan = "#86A3A3",
27+
blue = "#697893",
28+
magenta = "#B380B0",
2729
},
30+
-- dark colors (mainly for backgrounds)
2831
d = {
29-
red = hsluv(10, 60, 30),
30-
yellow = hsluv(60, 70, 50),
31-
green = hsluv(130, 50, 20),
32-
cyan = hsluv(190, 50, 20),
33-
blue = hsluv(250, 50, 20),
34-
magenta = hsluv(310, 50, 20),
32+
red = "#7D2A2F",
33+
yellow = "#8E733F",
34+
green = "#1F3521",
35+
cyan = "#213433",
36+
blue = "#243146",
37+
magenta = "#462445",
3538
},
3639
}

lua/melange/palettes/light.lua

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1-
local hsluv = require('lush').hsluv
2-
1+
-- stylua: ignore
32
return {
43
a = {
5-
bg = hsluv(50, 20, 95),
6-
overbg = hsluv(50, 20, 90),
7-
sel = hsluv(50, 20, 85),
8-
com = hsluv(50, 30, 60),
9-
faded = hsluv(50, 30, 50),
10-
fg = hsluv(50, 30, 40),
4+
bg = "#F4F0ED",
5+
overbg = "#E9E1DB",
6+
sel = "#DED2C8",
7+
com = "#A38D78",
8+
faded = "#867462",
9+
fg = "#6B5C4D",
1110
},
1211
b = {
13-
red = hsluv(20, 80, 50),
14-
yellow = hsluv(60, 90, 65),
15-
green = hsluv(130, 50, 60),
16-
cyan = hsluv(180, 50, 40),
17-
blue = hsluv(250, 50, 40),
18-
magenta = hsluv(310, 50, 40),
12+
red = "#C65333",
13+
yellow = "#C29830",
14+
green = "#659E69",
15+
cyan = "#436460",
16+
blue = "#485F84",
17+
magenta = "#854882",
1918
},
2019
c = {
21-
red = hsluv(10, 50, 65),
22-
yellow = hsluv(40, 90, 60),
23-
green = hsluv(130, 40, 70),
24-
cyan = hsluv(180, 40, 60),
25-
blue = hsluv(250, 40, 75),
26-
magenta = hsluv(310, 40, 60),
20+
red = "#D7898C",
21+
yellow = "#CC7F2B",
22+
green = "#83B887",
23+
cyan = "#729893",
24+
blue = "#ABB9D6",
25+
magenta = "#BE79BB",
2726
},
2827
d = {
29-
red = hsluv(20, 40, 80),
30-
yellow = hsluv(60, 50, 80),
31-
green = hsluv(130, 30, 90),
32-
cyan = hsluv(190, 30, 90),
33-
blue = hsluv(250, 30, 90),
34-
magenta = hsluv(310, 30, 90),
28+
red = "#E0BFBB",
29+
yellow = "#E2C28C",
30+
green = "#C6ECC8",
31+
cyan = "#C2EAE9",
32+
blue = "#DFE3EB",
33+
magenta = "#EBDFEA",
3534
},
3635
}

0 commit comments

Comments
 (0)