Skip to content

Commit 543a16c

Browse files
cormullioncormullion
authored
Merge pull request #141 from daviehh/Catppuccin_revise
change ordering according to palette, and add to catalogue
2 parents 28c6335 + b1815aa commit 543a16c

File tree

2 files changed

+127
-115
lines changed

2 files changed

+127
-115
lines changed

‎data/catppuccin_scheme.jl‎

Lines changed: 112 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
1-
loadcolorscheme(:catppuccin_mocha, [
2-
RGB(0.9607843137254902, 0.8784313725490196, 0.8627450980392157),
3-
RGB(0.9764705882352941, 0.8862745098039215, 0.6862745098039216),
4-
RGB(0.803921568627451, 0.8392156862745098, 0.9568627450980393),
5-
RGB(0.9490196078431372, 0.803921568627451, 0.803921568627451),
6-
RGB(0.6509803921568628, 0.8901960784313725, 0.6313725490196078),
7-
RGB(0.5803921568627451, 0.8862745098039215, 0.8352941176470589),
8-
RGB(0.9607843137254902, 0.7607843137254902, 0.9058823529411765),
9-
RGB(0.5372549019607843, 0.8627450980392157, 0.9215686274509803),
10-
RGB(0.9803921568627451, 0.7019607843137254, 0.5294117647058824),
11-
RGB(0.7294117647058823, 0.7607843137254902, 0.8705882352941177),
12-
RGB(0.7058823529411765, 0.7450980392156863, 0.996078431372549),
13-
RGB(0.4549019607843137, 0.7803921568627451, 0.9254901960784314),
14-
RGB(0.796078431372549, 0.6509803921568628, 0.9686274509803922),
15-
RGB(0.9215686274509803, 0.6274509803921569, 0.6745098039215687),
16-
RGB(0.5372549019607843, 0.7058823529411765, 0.9803921568627451),
17-
RGB(0.6509803921568628, 0.6784313725490196, 0.7843137254901961),
18-
RGB(0.9529411764705882, 0.5450980392156862, 0.6588235294117647),
19-
RGB(0.5764705882352941, 0.6, 0.6980392156862745),
20-
RGB(0.4980392156862745, 0.5176470588235295, 0.611764705882353),
21-
RGB(0.4235294117647059, 0.4392156862745098, 0.5254901960784314),
22-
RGB(0.34509803921568627, 0.3568627450980392, 0.4392156862745098),
23-
RGB(0.27058823529411763, 0.2784313725490196, 0.35294117647058826),
24-
RGB(0.19215686274509805, 0.19607843137254902, 0.26666666666666666),
25-
RGB(0.11764705882352941, 0.11764705882352941, 0.1803921568627451),
26-
RGB(0.09411764705882353, 0.09411764705882353, 0.1450980392156863),
27-
RGB(0.06666666666666667, 0.06666666666666667, 0.10588235294117647),
28-
], "catppuccin", "")
1+
loadcolorscheme(:Catppuccin_latte, [
2+
RGB{N0f8}(0.863, 0.541, 0.471),
3+
RGB{N0f8}(0.867, 0.471, 0.471),
4+
RGB{N0f8}(0.918, 0.463, 0.796),
5+
RGB{N0f8}(0.533, 0.224, 0.937),
6+
RGB{N0f8}(0.824, 0.059, 0.224),
7+
RGB{N0f8}(0.902, 0.271, 0.325),
8+
RGB{N0f8}(0.996, 0.392, 0.043),
9+
RGB{N0f8}(0.875, 0.557, 0.114),
10+
RGB{N0f8}(0.251, 0.627, 0.169),
11+
RGB{N0f8}(0.09, 0.573, 0.6),
12+
RGB{N0f8}(0.016, 0.647, 0.898),
13+
RGB{N0f8}(0.125, 0.624, 0.71),
14+
RGB{N0f8}(0.118, 0.4, 0.961),
15+
RGB{N0f8}(0.447, 0.529, 0.992),
16+
RGB{N0f8}(0.298, 0.31, 0.412),
17+
RGB{N0f8}(0.361, 0.373, 0.467),
18+
RGB{N0f8}(0.424, 0.435, 0.522),
19+
RGB{N0f8}(0.486, 0.498, 0.576),
20+
RGB{N0f8}(0.549, 0.561, 0.631),
21+
RGB{N0f8}(0.612, 0.627, 0.69),
22+
RGB{N0f8}(0.675, 0.69, 0.745),
23+
RGB{N0f8}(0.737, 0.753, 0.8),
24+
RGB{N0f8}(0.8, 0.816, 0.855),
25+
RGB{N0f8}(0.937, 0.945, 0.961),
26+
RGB{N0f8}(0.902, 0.914, 0.937),
27+
RGB{N0f8}(0.863, 0.878, 0.91),
28+
], "Catppuccin", "Catppuccin theme: latte flavor.")
2929

30-
loadcolorscheme(:catppuccin_latte, [
31-
RGB(0.9372549019607843, 0.9450980392156862, 0.9607843137254902),
32-
RGB(0.9019607843137255, 0.9137254901960784, 0.9372549019607843),
33-
RGB(0.8627450980392157, 0.8784313725490196, 0.9098039215686274),
34-
RGB(0.8, 0.8156862745098039, 0.8549019607843137),
35-
RGB(0.7372549019607844, 0.7529411764705882, 0.8),
36-
RGB(0.6745098039215687, 0.6901960784313725, 0.7450980392156863),
37-
RGB(0.611764705882353, 0.6274509803921569, 0.6901960784313725),
38-
RGB(0.8745098039215686, 0.5568627450980392, 0.11372549019607843),
39-
RGB(0.9176470588235294, 0.4627450980392157, 0.796078431372549),
40-
RGB(0.8627450980392157, 0.5411764705882353, 0.47058823529411764),
41-
RGB(0.01568627450980392, 0.6470588235294118, 0.8980392156862745),
42-
RGB(0.996078431372549, 0.39215686274509803, 0.043137254901960784),
43-
RGB(0.8666666666666667, 0.47058823529411764, 0.47058823529411764),
44-
RGB(0.12549019607843137, 0.6235294117647059, 0.7098039215686275),
45-
RGB(0.4470588235294118, 0.5294117647058824, 0.9921568627450981),
46-
RGB(0.5490196078431373, 0.5607843137254902, 0.6313725490196078),
47-
RGB(0.25098039215686274, 0.6274509803921569, 0.16862745098039217),
48-
RGB(0.09019607843137255, 0.5725490196078431, 0.6),
49-
RGB(0.9019607843137255, 0.27058823529411763, 0.3254901960784314),
50-
RGB(0.48627450980392156, 0.4980392156862745, 0.5764705882352941),
51-
RGB(0.11764705882352941, 0.4, 0.9607843137254902),
52-
RGB(0.4235294117647059, 0.43529411764705883, 0.5215686274509804),
53-
RGB(0.5333333333333333, 0.2235294117647059, 0.9372549019607843),
54-
RGB(0.8235294117647058, 0.058823529411764705, 0.2235294117647059),
55-
RGB(0.3607843137254902, 0.37254901960784315, 0.4666666666666667),
56-
RGB(0.2980392156862745, 0.30980392156862746, 0.4117647058823529),
57-
], "catppuccin", "")
30+
loadcolorscheme(:Catppuccin_frappe, [
31+
RGB{N0f8}(0.949, 0.835, 0.812),
32+
RGB{N0f8}(0.933, 0.745, 0.745),
33+
RGB{N0f8}(0.957, 0.722, 0.894),
34+
RGB{N0f8}(0.792, 0.62, 0.902),
35+
RGB{N0f8}(0.906, 0.51, 0.518),
36+
RGB{N0f8}(0.918, 0.6, 0.612),
37+
RGB{N0f8}(0.937, 0.624, 0.463),
38+
RGB{N0f8}(0.898, 0.784, 0.565),
39+
RGB{N0f8}(0.651, 0.82, 0.537),
40+
RGB{N0f8}(0.506, 0.784, 0.745),
41+
RGB{N0f8}(0.6, 0.82, 0.859),
42+
RGB{N0f8}(0.522, 0.757, 0.863),
43+
RGB{N0f8}(0.549, 0.667, 0.933),
44+
RGB{N0f8}(0.729, 0.733, 0.945),
45+
RGB{N0f8}(0.776, 0.816, 0.961),
46+
RGB{N0f8}(0.71, 0.749, 0.886),
47+
RGB{N0f8}(0.647, 0.678, 0.808),
48+
RGB{N0f8}(0.58, 0.612, 0.733),
49+
RGB{N0f8}(0.514, 0.545, 0.655),
50+
RGB{N0f8}(0.451, 0.475, 0.58),
51+
RGB{N0f8}(0.384, 0.408, 0.502),
52+
RGB{N0f8}(0.318, 0.341, 0.427),
53+
RGB{N0f8}(0.255, 0.271, 0.349),
54+
RGB{N0f8}(0.188, 0.204, 0.275),
55+
RGB{N0f8}(0.161, 0.173, 0.235),
56+
RGB{N0f8}(0.137, 0.149, 0.204),
57+
], "Catppuccin", "Catppuccin theme: frappe flavor.")
5858

59-
loadcolorscheme(:catppuccin_frappe, [
60-
RGB(0.9490196078431372, 0.8352941176470589, 0.8117647058823529),
61-
RGB(0.7764705882352941, 0.8156862745098039, 0.9607843137254902),
62-
RGB(0.8980392156862745, 0.7843137254901961, 0.5647058823529412),
63-
RGB(0.9568627450980393, 0.7215686274509804, 0.8941176470588236),
64-
RGB(0.9333333333333333, 0.7450980392156863, 0.7450980392156863),
65-
RGB(0.6, 0.8196078431372549, 0.8588235294117647),
66-
RGB(0.6509803921568628, 0.8196078431372549, 0.5372549019607843),
67-
RGB(0.7098039215686275, 0.7490196078431373, 0.8862745098039215),
68-
RGB(0.7294117647058823, 0.7333333333333333, 0.9450980392156862),
69-
RGB(0.5058823529411764, 0.7843137254901961, 0.7450980392156863),
70-
RGB(0.5215686274509804, 0.7568627450980392, 0.8627450980392157),
71-
RGB(0.9372549019607843, 0.6235294117647059, 0.4627450980392157),
72-
RGB(0.792156862745098, 0.6196078431372549, 0.9019607843137255),
73-
RGB(0.9176470588235294, 0.6, 0.611764705882353),
74-
RGB(0.6470588235294118, 0.6784313725490196, 0.807843137254902),
75-
RGB(0.5490196078431373, 0.6666666666666666, 0.9333333333333333),
76-
RGB(0.9058823529411765, 0.5098039215686274, 0.5176470588235295),
77-
RGB(0.5803921568627451, 0.611764705882353, 0.7333333333333333),
78-
RGB(0.5137254901960784, 0.5450980392156862, 0.6549019607843137),
79-
RGB(0.45098039215686275, 0.4745098039215686, 0.5803921568627451),
80-
RGB(0.3843137254901961, 0.40784313725490196, 0.5019607843137255),
81-
RGB(0.3176470588235294, 0.3411764705882353, 0.42745098039215684),
82-
RGB(0.2549019607843137, 0.27058823529411763, 0.34901960784313724),
83-
RGB(0.18823529411764706, 0.20392156862745098, 0.27450980392156865),
84-
RGB(0.1607843137254902, 0.17254901960784313, 0.23529411764705882),
85-
RGB(0.13725490196078433, 0.14901960784313725, 0.20392156862745098),
86-
], "catppuccin", "")
59+
loadcolorscheme(:Catppuccin_macchiato, [
60+
RGB{N0f8}(0.957, 0.859, 0.839),
61+
RGB{N0f8}(0.941, 0.776, 0.776),
62+
RGB{N0f8}(0.961, 0.741, 0.902),
63+
RGB{N0f8}(0.776, 0.627, 0.965),
64+
RGB{N0f8}(0.929, 0.529, 0.588),
65+
RGB{N0f8}(0.933, 0.6, 0.627),
66+
RGB{N0f8}(0.961, 0.663, 0.498),
67+
RGB{N0f8}(0.933, 0.831, 0.624),
68+
RGB{N0f8}(0.651, 0.855, 0.584),
69+
RGB{N0f8}(0.545, 0.835, 0.792),
70+
RGB{N0f8}(0.569, 0.843, 0.89),
71+
RGB{N0f8}(0.49, 0.769, 0.894),
72+
RGB{N0f8}(0.541, 0.678, 0.957),
73+
RGB{N0f8}(0.718, 0.741, 0.973),
74+
RGB{N0f8}(0.792, 0.827, 0.961),
75+
RGB{N0f8}(0.722, 0.753, 0.878),
76+
RGB{N0f8}(0.647, 0.678, 0.796),
77+
RGB{N0f8}(0.576, 0.604, 0.718),
78+
RGB{N0f8}(0.502, 0.529, 0.635),
79+
RGB{N0f8}(0.431, 0.451, 0.553),
80+
RGB{N0f8}(0.357, 0.376, 0.471),
81+
RGB{N0f8}(0.286, 0.302, 0.392),
82+
RGB{N0f8}(0.212, 0.227, 0.31),
83+
RGB{N0f8}(0.141, 0.153, 0.227),
84+
RGB{N0f8}(0.118, 0.125, 0.188),
85+
RGB{N0f8}(0.094, 0.098, 0.149),
86+
], "Catppuccin", "Catppuccin theme: macchiato flavor.")
8787

88-
loadcolorscheme(:catppuccin_macchiato, [
89-
RGB(0.9568627450980393, 0.8588235294117647, 0.8392156862745098),
90-
RGB(0.9333333333333333, 0.8313725490196079, 0.6235294117647059),
91-
RGB(0.792156862745098, 0.8274509803921568, 0.9607843137254902),
92-
RGB(0.9411764705882353, 0.7764705882352941, 0.7764705882352941),
93-
RGB(0.9607843137254902, 0.7411764705882353, 0.9019607843137255),
94-
RGB(0.6509803921568628, 0.8549019607843137, 0.5843137254901961),
95-
RGB(0.5686274509803921, 0.8431372549019608, 0.8901960784313725),
96-
RGB(0.5450980392156862, 0.8352941176470589, 0.792156862745098),
97-
RGB(0.7215686274509804, 0.7529411764705882, 0.8784313725490196),
98-
RGB(0.7176470588235294, 0.7411764705882353, 0.9725490196078431),
99-
RGB(0.49019607843137253, 0.7686274509803922, 0.8941176470588236),
100-
RGB(0.9607843137254902, 0.6627450980392157, 0.4980392156862745),
101-
RGB(0.7764705882352941, 0.6274509803921569, 0.9647058823529412),
102-
RGB(0.9333333333333333, 0.6, 0.6274509803921569),
103-
RGB(0.6470588235294118, 0.6784313725490196, 0.796078431372549),
104-
RGB(0.5411764705882353, 0.6784313725490196, 0.9568627450980393),
105-
RGB(0.9294117647058824, 0.5294117647058824, 0.5882352941176471),
106-
RGB(0.5764705882352941, 0.6039215686274509, 0.7176470588235294),
107-
RGB(0.5019607843137255, 0.5294117647058824, 0.6352941176470588),
108-
RGB(0.43137254901960786, 0.45098039215686275, 0.5529411764705883),
109-
RGB(0.3568627450980392, 0.3764705882352941, 0.47058823529411764),
110-
RGB(0.28627450980392155, 0.30196078431372547, 0.39215686274509803),
111-
RGB(0.21176470588235294, 0.22745098039215686, 0.30980392156862746),
112-
RGB(0.1411764705882353, 0.15294117647058825, 0.22745098039215686),
113-
RGB(0.11764705882352941, 0.12549019607843137, 0.18823529411764706),
114-
RGB(0.09411764705882353, 0.09803921568627451, 0.14901960784313725),
115-
], "catppuccin", "")
88+
loadcolorscheme(:Catppuccin_mocha, [
89+
RGB{N0f8}(0.961, 0.878, 0.863),
90+
RGB{N0f8}(0.949, 0.804, 0.804),
91+
RGB{N0f8}(0.961, 0.761, 0.906),
92+
RGB{N0f8}(0.796, 0.651, 0.969),
93+
RGB{N0f8}(0.953, 0.545, 0.659),
94+
RGB{N0f8}(0.922, 0.627, 0.675),
95+
RGB{N0f8}(0.98, 0.702, 0.529),
96+
RGB{N0f8}(0.976, 0.886, 0.686),
97+
RGB{N0f8}(0.651, 0.89, 0.631),
98+
RGB{N0f8}(0.58, 0.886, 0.835),
99+
RGB{N0f8}(0.537, 0.863, 0.922),
100+
RGB{N0f8}(0.455, 0.78, 0.925),
101+
RGB{N0f8}(0.537, 0.706, 0.98),
102+
RGB{N0f8}(0.706, 0.745, 0.996),
103+
RGB{N0f8}(0.804, 0.839, 0.957),
104+
RGB{N0f8}(0.729, 0.761, 0.871),
105+
RGB{N0f8}(0.651, 0.678, 0.784),
106+
RGB{N0f8}(0.576, 0.6, 0.698),
107+
RGB{N0f8}(0.498, 0.518, 0.612),
108+
RGB{N0f8}(0.424, 0.439, 0.525),
109+
RGB{N0f8}(0.345, 0.357, 0.439),
110+
RGB{N0f8}(0.271, 0.278, 0.353),
111+
RGB{N0f8}(0.192, 0.196, 0.267),
112+
RGB{N0f8}(0.118, 0.118, 0.18),
113+
RGB{N0f8}(0.094, 0.094, 0.145),
114+
RGB{N0f8}(0.067, 0.067, 0.106),
115+
], "Catppuccin", "Catppuccin theme: mocha flavor.")
116116

‎docs/src/catalogue.md‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ function generate_scheme_svg(schemename;
3636
<div class="schemename"><h2>$(schemename)
3737
3838
<span class="hovertext" data-hover=
39-
"name: $(schemename),
40-
length: $(length(colorschemes[schemename])),
39+
"name: $(schemename),
40+
length: $(length(colorschemes[schemename])),
4141
category: $(colorschemes[schemename].category), notes: $(colorschemes[schemename].notes).">※</span>
4242
4343
</h2>
@@ -236,8 +236,20 @@ using Luxor, ColorSchemes # hide
236236
ColorSchemeCategory("Ghibli") # hide
237237
```
238238

239+
# Catppuccin
240+
241+
Catppuccin is a community-driven pastel theme that aims to be the middle
242+
ground between low and high contrast themes. It consists of 4 soothing
243+
warm flavors with 26 eye-candy colors each, perfect for coding, designing,
244+
and much more! See [Catppuccin main project](https://github.com/catppuccin)
245+
246+
```@example catalog
247+
using Luxor, ColorSchemes # hide
248+
ColorSchemeCategory("Catppuccin") # hide
249+
```
250+
239251
# + Feathers
240-
Palattes derived from the plumage of Australian birds. See [Shandiya's github
252+
Palattes derived from the plumage of Australian birds. See [Shandiya's github
241253
repository](https://github.com/shandiya/feathers).
242254

243255
```@example catalog

0 commit comments

Comments
 (0)