Skip to content

Commit

Permalink
fix: regressions from #18 (#22)
Browse files Browse the repository at this point in the history 
Fix ANSI colour 15 & cursor line contrast

We miss you Winston <3
  • Loading branch information
@MatthiasPortzel
MatthiasPortzel authored Jul 10, 2024
1 parent 7a71cf4 commit 6b5765b
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 74 deletions.
4 changes: 2 additions & 2 deletions build.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ const termcolors = (flavorName: FlavorName, suffix?: "Dark" | "Light") => {
"Ansi 12 Color": colors.blue,
"Ansi 13 Color": colors.pink,
"Ansi 14 Color": colors.teal,
"Ansi 15 Color": dark ? colors.surface1 : colors.subtext0,
"Ansi 15 Color": dark ? colors.subtext0 : colors.surface1,
"Background Color": colors.base,
"Foreground Color": colors.text,
"Link Color": colors.sky,
"Bold Color": colors.text,
"Cursor Color": colors.rosewater,
"Cursor Text Color": colors.base,
"Cursor Guide Color": { ...colors.text, alpha: 0.07 },
"Cursor Guide Color": { ...colors.text, "Alpha Component": 0.07 },
"Selection Color": colors.surface2,
"Selected Text Color": colors.text,
};
Expand Down
30 changes: 12 additions & 18 deletions colors/catppuccin-frappe.itermcolors
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@
<key>Blue Component</key>
<real>0.9607843137254902</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color</key>
<dict>
Expand Down Expand Up @@ -124,11 +122,11 @@
<key>Ansi 15 Color</key>
<dict>
<key>Red Component</key>
<real>0.3176470588235294</real>
<real>0.6470588235294118</real>
<key>Green Component</key>
<real>0.3411764705882353</real>
<real>0.6784313725490196</real>
<key>Blue Component</key>
<real>0.42745098039215684</real>
<real>0.807843137254902</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -364,11 +362,9 @@
<key>Blue Component</key>
<real>0.4117647058823529</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Light)</key>
<dict>
Expand Down Expand Up @@ -451,11 +447,11 @@
<key>Ansi 15 Color (Light)</key>
<dict>
<key>Red Component</key>
<real>0.4235294117647059</real>
<real>0.7372549019607844</real>
<key>Green Component</key>
<real>0.43529411764705883</real>
<real>0.7529411764705882</real>
<key>Blue Component</key>
<real>0.5215686274509804</real>
<real>0.8</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -691,11 +687,9 @@
<key>Blue Component</key>
<real>0.9607843137254902</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Dark)</key>
<dict>
Expand Down Expand Up @@ -778,11 +772,11 @@
<key>Ansi 15 Color (Dark)</key>
<dict>
<key>Red Component</key>
<real>0.3176470588235294</real>
<real>0.6470588235294118</real>
<key>Green Component</key>
<real>0.3411764705882353</real>
<real>0.6784313725490196</real>
<key>Blue Component</key>
<real>0.42745098039215684</real>
<real>0.807843137254902</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down
30 changes: 12 additions & 18 deletions colors/catppuccin-latte.itermcolors
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@
<key>Blue Component</key>
<real>0.4117647058823529</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color</key>
<dict>
Expand Down Expand Up @@ -124,11 +122,11 @@
<key>Ansi 15 Color</key>
<dict>
<key>Red Component</key>
<real>0.4235294117647059</real>
<real>0.7372549019607844</real>
<key>Green Component</key>
<real>0.43529411764705883</real>
<real>0.7529411764705882</real>
<key>Blue Component</key>
<real>0.5215686274509804</real>
<real>0.8</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -364,11 +362,9 @@
<key>Blue Component</key>
<real>0.4117647058823529</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Light)</key>
<dict>
Expand Down Expand Up @@ -451,11 +447,11 @@
<key>Ansi 15 Color (Light)</key>
<dict>
<key>Red Component</key>
<real>0.4235294117647059</real>
<real>0.7372549019607844</real>
<key>Green Component</key>
<real>0.43529411764705883</real>
<real>0.7529411764705882</real>
<key>Blue Component</key>
<real>0.5215686274509804</real>
<real>0.8</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -691,11 +687,9 @@
<key>Blue Component</key>
<real>0.4117647058823529</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Dark)</key>
<dict>
Expand Down Expand Up @@ -778,11 +772,11 @@
<key>Ansi 15 Color (Dark)</key>
<dict>
<key>Red Component</key>
<real>0.4235294117647059</real>
<real>0.7372549019607844</real>
<key>Green Component</key>
<real>0.43529411764705883</real>
<real>0.7529411764705882</real>
<key>Blue Component</key>
<real>0.5215686274509804</real>
<real>0.8</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down
30 changes: 12 additions & 18 deletions colors/catppuccin-macchiato.itermcolors
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@
<key>Blue Component</key>
<real>0.9607843137254902</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color</key>
<dict>
Expand Down Expand Up @@ -124,11 +122,11 @@
<key>Ansi 15 Color</key>
<dict>
<key>Red Component</key>
<real>0.28627450980392155</real>
<real>0.6470588235294118</real>
<key>Green Component</key>
<real>0.30196078431372547</real>
<real>0.6784313725490196</real>
<key>Blue Component</key>
<real>0.39215686274509803</real>
<real>0.796078431372549</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -364,11 +362,9 @@
<key>Blue Component</key>
<real>0.4117647058823529</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Light)</key>
<dict>
Expand Down Expand Up @@ -451,11 +447,11 @@
<key>Ansi 15 Color (Light)</key>
<dict>
<key>Red Component</key>
<real>0.4235294117647059</real>
<real>0.7372549019607844</real>
<key>Green Component</key>
<real>0.43529411764705883</real>
<real>0.7529411764705882</real>
<key>Blue Component</key>
<real>0.5215686274509804</real>
<real>0.8</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -691,11 +687,9 @@
<key>Blue Component</key>
<real>0.9607843137254902</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Dark)</key>
<dict>
Expand Down Expand Up @@ -778,11 +772,11 @@
<key>Ansi 15 Color (Dark)</key>
<dict>
<key>Red Component</key>
<real>0.28627450980392155</real>
<real>0.6470588235294118</real>
<key>Green Component</key>
<real>0.30196078431372547</real>
<real>0.6784313725490196</real>
<key>Blue Component</key>
<real>0.39215686274509803</real>
<real>0.796078431372549</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down
30 changes: 12 additions & 18 deletions colors/catppuccin-mocha.itermcolors
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@
<key>Blue Component</key>
<real>0.9568627450980393</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color</key>
<dict>
Expand Down Expand Up @@ -124,11 +122,11 @@
<key>Ansi 15 Color</key>
<dict>
<key>Red Component</key>
<real>0.27058823529411763</real>
<real>0.6509803921568628</real>
<key>Green Component</key>
<real>0.2784313725490196</real>
<real>0.6784313725490196</real>
<key>Blue Component</key>
<real>0.35294117647058826</real>
<real>0.7843137254901961</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -364,11 +362,9 @@
<key>Blue Component</key>
<real>0.4117647058823529</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Light)</key>
<dict>
Expand Down Expand Up @@ -451,11 +447,11 @@
<key>Ansi 15 Color (Light)</key>
<dict>
<key>Red Component</key>
<real>0.4235294117647059</real>
<real>0.7372549019607844</real>
<key>Green Component</key>
<real>0.43529411764705883</real>
<real>0.7529411764705882</real>
<key>Blue Component</key>
<real>0.5215686274509804</real>
<real>0.8</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down Expand Up @@ -691,11 +687,9 @@
<key>Blue Component</key>
<real>0.9568627450980393</real>
<key>Alpha Component</key>
<integer>1</integer>
<real>0.07</real>
<key>Color Space</key>
<string>sRGB</string>
<key>alpha</key>
<real>0.07</real>
</dict>
<key>Cursor Text Color (Dark)</key>
<dict>
Expand Down Expand Up @@ -778,11 +772,11 @@
<key>Ansi 15 Color (Dark)</key>
<dict>
<key>Red Component</key>
<real>0.27058823529411763</real>
<real>0.6509803921568628</real>
<key>Green Component</key>
<real>0.2784313725490196</real>
<real>0.6784313725490196</real>
<key>Blue Component</key>
<real>0.35294117647058826</real>
<real>0.7843137254901961</real>
<key>Alpha Component</key>
<integer>1</integer>
<key>Color Space</key>
Expand Down

0 comments on commit 6b5765b

Please sign in to comment.