fix: merge conflict

3 years ago · 9de299f8f1
parent 35f3a24d77 baefa5dbb5
commit 9de299f8f1
150 changed files with 2566 additions and 104 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+node_modules/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -2,6 +2,8 @@

 🎉 First off, thanks for taking the time to contribute! 🎉

+> Note: if you are here because you want to submit a port/learn how to port Catppuccin to a program please refer to the [documentation](https://github.com/catppuccin/catppuccin/blob/main/docs/contributing.md)
+
 ## Guidelines

 The following is a set of guidelines for contributing to this project. Use your best judgment, and feel free to propose changes to this document in a pull request.
--- a/README.md
+++ b/README.md
--- a/assets/palette/circles/black0.png
+++ b/assets/palette/circles/black0.png
--- a/assets/palette/circles/black1.png
+++ b/assets/palette/circles/black1.png
--- a/assets/palette/circles/black2.png
+++ b/assets/palette/circles/black2.png
--- a/assets/palette/circles/black3.png
+++ b/assets/palette/circles/black3.png
--- a/assets/palette/circles/black4.png
+++ b/assets/palette/circles/black4.png
--- a/assets/palette/circles/blue.png
+++ b/assets/palette/circles/blue.png
--- a/assets/palette/circles/flamingo.png
+++ b/assets/palette/circles/flamingo.png
--- a/assets/palette/circles/frappe_base.png
+++ b/assets/palette/circles/frappe_base.png
--- a/assets/palette/circles/frappe_blue.png
+++ b/assets/palette/circles/frappe_blue.png
--- a/assets/palette/circles/frappe_crust.png
+++ b/assets/palette/circles/frappe_crust.png
--- a/assets/palette/circles/frappe_flamingo.png
+++ b/assets/palette/circles/frappe_flamingo.png
--- a/assets/palette/circles/frappe_green.png
+++ b/assets/palette/circles/frappe_green.png
--- a/assets/palette/circles/frappe_lavender.png
+++ b/assets/palette/circles/frappe_lavender.png
--- a/assets/palette/circles/frappe_mantle.png
+++ b/assets/palette/circles/frappe_mantle.png
--- a/assets/palette/circles/frappe_maroon.png
+++ b/assets/palette/circles/frappe_maroon.png
--- a/assets/palette/circles/frappe_mauve.png
+++ b/assets/palette/circles/frappe_mauve.png
--- a/assets/palette/circles/frappe_overlay0.png
+++ b/assets/palette/circles/frappe_overlay0.png
--- a/assets/palette/circles/frappe_overlay1.png
+++ b/assets/palette/circles/frappe_overlay1.png
--- a/assets/palette/circles/frappe_overlay2.png
+++ b/assets/palette/circles/frappe_overlay2.png
--- a/assets/palette/circles/frappe_peach.png
+++ b/assets/palette/circles/frappe_peach.png
--- a/assets/palette/circles/frappe_pink.png
+++ b/assets/palette/circles/frappe_pink.png
--- a/assets/palette/circles/frappe_red.png
+++ b/assets/palette/circles/frappe_red.png
--- a/assets/palette/circles/frappe_rosewater.png
+++ b/assets/palette/circles/frappe_rosewater.png
--- a/assets/palette/circles/frappe_sapphire.png
+++ b/assets/palette/circles/frappe_sapphire.png
--- a/assets/palette/circles/frappe_sky.png
+++ b/assets/palette/circles/frappe_sky.png
--- a/assets/palette/circles/frappe_subtext0.png
+++ b/assets/palette/circles/frappe_subtext0.png
--- a/assets/palette/circles/frappe_subtext1.png
+++ b/assets/palette/circles/frappe_subtext1.png
--- a/assets/palette/circles/frappe_surface0.png
+++ b/assets/palette/circles/frappe_surface0.png
--- a/assets/palette/circles/frappe_surface1.png
+++ b/assets/palette/circles/frappe_surface1.png
--- a/assets/palette/circles/frappe_surface2.png
+++ b/assets/palette/circles/frappe_surface2.png
--- a/assets/palette/circles/frappe_teal.png
+++ b/assets/palette/circles/frappe_teal.png
--- a/assets/palette/circles/frappe_text.png
+++ b/assets/palette/circles/frappe_text.png
--- a/assets/palette/circles/frappe_yellow.png
+++ b/assets/palette/circles/frappe_yellow.png
--- a/assets/palette/circles/gray0.png
+++ b/assets/palette/circles/gray0.png
--- a/assets/palette/circles/gray1.png
+++ b/assets/palette/circles/gray1.png
--- a/assets/palette/circles/gray2.png
+++ b/assets/palette/circles/gray2.png
--- a/assets/palette/circles/green.png
+++ b/assets/palette/circles/green.png
--- a/assets/palette/circles/latte_base.png
+++ b/assets/palette/circles/latte_base.png
--- a/assets/palette/circles/latte_blue.png
+++ b/assets/palette/circles/latte_blue.png
--- a/assets/palette/circles/latte_crust.png
+++ b/assets/palette/circles/latte_crust.png
--- a/assets/palette/circles/latte_flamingo.png
+++ b/assets/palette/circles/latte_flamingo.png
--- a/assets/palette/circles/latte_green.png
+++ b/assets/palette/circles/latte_green.png
--- a/assets/palette/circles/latte_lavender.png
+++ b/assets/palette/circles/latte_lavender.png
--- a/assets/palette/circles/latte_mantle.png
+++ b/assets/palette/circles/latte_mantle.png
--- a/assets/palette/circles/latte_maroon.png
+++ b/assets/palette/circles/latte_maroon.png
--- a/assets/palette/circles/latte_mauve.png
+++ b/assets/palette/circles/latte_mauve.png
--- a/assets/palette/circles/latte_overlay0.png
+++ b/assets/palette/circles/latte_overlay0.png
--- a/assets/palette/circles/latte_overlay1.png
+++ b/assets/palette/circles/latte_overlay1.png
--- a/assets/palette/circles/latte_overlay2.png
+++ b/assets/palette/circles/latte_overlay2.png
--- a/assets/palette/circles/latte_peach.png
+++ b/assets/palette/circles/latte_peach.png
--- a/assets/palette/circles/latte_pink.png
+++ b/assets/palette/circles/latte_pink.png
--- a/assets/palette/circles/latte_red.png
+++ b/assets/palette/circles/latte_red.png
--- a/assets/palette/circles/latte_rosewater.png
+++ b/assets/palette/circles/latte_rosewater.png
--- a/assets/palette/circles/latte_sapphire.png
+++ b/assets/palette/circles/latte_sapphire.png
--- a/assets/palette/circles/latte_sky.png
+++ b/assets/palette/circles/latte_sky.png
--- a/assets/palette/circles/latte_subtext0.png
+++ b/assets/palette/circles/latte_subtext0.png
--- a/assets/palette/circles/latte_subtext1.png
+++ b/assets/palette/circles/latte_subtext1.png
--- a/assets/palette/circles/latte_surface0.png
+++ b/assets/palette/circles/latte_surface0.png
--- a/assets/palette/circles/latte_surface1.png
+++ b/assets/palette/circles/latte_surface1.png
--- a/assets/palette/circles/latte_surface2.png
+++ b/assets/palette/circles/latte_surface2.png
--- a/assets/palette/circles/latte_teal.png
+++ b/assets/palette/circles/latte_teal.png
--- a/assets/palette/circles/latte_text.png
+++ b/assets/palette/circles/latte_text.png
--- a/assets/palette/circles/latte_yellow.png
+++ b/assets/palette/circles/latte_yellow.png
--- a/assets/palette/circles/lavender.png
+++ b/assets/palette/circles/lavender.png
--- a/assets/palette/circles/macchiato_base.png
+++ b/assets/palette/circles/macchiato_base.png
--- a/assets/palette/circles/macchiato_blue.png
+++ b/assets/palette/circles/macchiato_blue.png
--- a/assets/palette/circles/macchiato_crust.png
+++ b/assets/palette/circles/macchiato_crust.png
--- a/assets/palette/circles/macchiato_flamingo.png
+++ b/assets/palette/circles/macchiato_flamingo.png
--- a/assets/palette/circles/macchiato_green.png
+++ b/assets/palette/circles/macchiato_green.png
--- a/assets/palette/circles/macchiato_lavender.png
+++ b/assets/palette/circles/macchiato_lavender.png
--- a/assets/palette/circles/macchiato_mantle.png
+++ b/assets/palette/circles/macchiato_mantle.png
--- a/assets/palette/circles/macchiato_maroon.png
+++ b/assets/palette/circles/macchiato_maroon.png
--- a/assets/palette/circles/macchiato_mauve.png
+++ b/assets/palette/circles/macchiato_mauve.png
--- a/assets/palette/circles/macchiato_overlay0.png
+++ b/assets/palette/circles/macchiato_overlay0.png
--- a/assets/palette/circles/macchiato_overlay1.png
+++ b/assets/palette/circles/macchiato_overlay1.png
--- a/assets/palette/circles/macchiato_overlay2.png
+++ b/assets/palette/circles/macchiato_overlay2.png
--- a/assets/palette/circles/macchiato_peach.png
+++ b/assets/palette/circles/macchiato_peach.png
--- a/assets/palette/circles/macchiato_pink.png
+++ b/assets/palette/circles/macchiato_pink.png
--- a/assets/palette/circles/macchiato_red.png
+++ b/assets/palette/circles/macchiato_red.png
--- a/assets/palette/circles/macchiato_rosewater.png
+++ b/assets/palette/circles/macchiato_rosewater.png
--- a/assets/palette/circles/macchiato_sapphire.png
+++ b/assets/palette/circles/macchiato_sapphire.png
--- a/assets/palette/circles/macchiato_sky.png
+++ b/assets/palette/circles/macchiato_sky.png
--- a/assets/palette/circles/macchiato_subtext0.png
+++ b/assets/palette/circles/macchiato_subtext0.png
--- a/assets/palette/circles/macchiato_subtext1.png
+++ b/assets/palette/circles/macchiato_subtext1.png
--- a/assets/palette/circles/macchiato_surface0.png
+++ b/assets/palette/circles/macchiato_surface0.png
--- a/assets/palette/circles/macchiato_surface1.png
+++ b/assets/palette/circles/macchiato_surface1.png
--- a/assets/palette/circles/macchiato_surface2.png
+++ b/assets/palette/circles/macchiato_surface2.png
--- a/assets/palette/circles/macchiato_teal.png
+++ b/assets/palette/circles/macchiato_teal.png
--- a/assets/palette/circles/macchiato_text.png
+++ b/assets/palette/circles/macchiato_text.png
--- a/assets/palette/circles/macchiato_yellow.png
+++ b/assets/palette/circles/macchiato_yellow.png
--- a/assets/palette/circles/maroon.png
+++ b/assets/palette/circles/maroon.png
--- a/assets/palette/circles/mauve.png
+++ b/assets/palette/circles/mauve.png
--- a/assets/palette/circles/mocha_base.png
+++ b/assets/palette/circles/mocha_base.png
--- a/assets/palette/circles/mocha_blue.png
+++ b/assets/palette/circles/mocha_blue.png
--- a/assets/palette/circles/mocha_crust.png
+++ b/assets/palette/circles/mocha_crust.png
--- a/assets/palette/circles/mocha_flamingo.png
+++ b/assets/palette/circles/mocha_flamingo.png
--- a/assets/palette/circles/mocha_green.png
+++ b/assets/palette/circles/mocha_green.png
--- a/Show More
+++ b/Show More