Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Catppuccin for all variants #687

Merged
merged 3 commits into from Oct 30, 2022

Conversation

jolheiser
Copy link
Contributor

Resolves #686

❗ I've removed the catppuccin theme and replaced it with catppuccin-mocha in order to make them all standard. Let me know if you want me to change it back to just catppuccin, I realize it's potentially a breaking change but there hasn't been a new release cut and it's only been merged for a few days, so I changed it for now.

The following previews are HTML of the HTML code of these variants, because inception is cool and the Go lexer doesn't show off enough of the colors based on just the style's Go file. πŸ˜…

Latte

latte

Frappe

frappe

Macchiato

macchiato

Mocha

mocha

Signed-off-by: jolheiser <john.olheiser@gmail.com>
Copy link

@nekowinston nekowinston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are just the things that immediately jumped out to me.
I'd either like to spend some more time tomorrow reviewing the highlights, or send another PR to implement those changes, should I find any.

styles/catppuccin-frappe.go Outdated Show resolved Hide resolved
styles/catppuccin-latte.go Outdated Show resolved Hide resolved
styles/catppuccin-macchiato.go Outdated Show resolved Hide resolved
styles/catppuccin-mocha.go Outdated Show resolved Hide resolved
styles/catppuccin-latte.go Outdated Show resolved Hide resolved
styles/catppuccin-mocha.go Outdated Show resolved Hide resolved
styles/catppuccin-frappe.go Outdated Show resolved Hide resolved
styles/catppuccin-latte.go Outdated Show resolved Hide resolved
styles/catppuccin-macchiato.go Outdated Show resolved Hide resolved
styles/catppuccin-mocha.go Outdated Show resolved Hide resolved
Co-authored-by: winston <hey@winston.sh>
@jolheiser
Copy link
Contributor Author

@nekowinston did you want to do another review or should I appease the linter gods?

@alecthomas
Copy link
Owner

I don't suppose either of you have encountered a commonly used machine-readable format for themes?

Signed-off-by: jolheiser <john.olheiser@gmail.com>
@jolheiser
Copy link
Contributor Author

jolheiser commented Oct 19, 2022

I don't suppose either of you have encountered a commonly used machine-readable format for themes?

I haven't, because most have their own set of keys/values available.
Most of what I've seen is in JSON, but I've seen XML used here and there.


I've appeased the linter, I think this is ready to go. Anything further can happen in a follow-up, as it wouldn't change names and so shouldn't break anything,

@sgoudham
Copy link

Looks πŸ”₯ πŸ”₯ Excited to see this get merged!

@alecthomas
Copy link
Owner

I think we're waiting for another pass by @nekowinston , let's give it another day or two then remind me to merge it.

@jolheiser
Copy link
Contributor Author

@alecthomas I think we're okay to merge this. πŸš€
If @catppuccin requires further changes we can address a follow-up PR. At least then it will only be color changes, the names should remain stable.

Copy link

@nekowinston nekowinston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for causing a delay here - this seems fine. We should really work on a more defined styleguide, so that we have more defined docs which colors should map to which tokens; but this seems good for now.

@alecthomas alecthomas merged commit 5e27ea4 into alecthomas:master Oct 30, 2022
@alecthomas
Copy link
Owner

πŸ‘

Thanks everyone!

@jolheiser jolheiser deleted the ctp-variants branch October 30, 2022 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Other Catppuccin variants
4 participants