From 365e41abc0b22d4f324fdf2d39189a4e474903d2 Mon Sep 17 00:00:00 2001
From: isabel <isabelroseslive@gmail.com>
Date: Fri, 31 Mar 2023 20:22:33 +0100
Subject: [PATCH 1/3] mixins and accents and flavors

---
 less/catppuccin-accents.less |  45 +++++++++++++
 less/catppuccin-flavour.less | 118 +++++++++++++++++++++++++++++++++++
 less/catppuccin-mixins.less  |  46 ++++++++++++++
 3 files changed, 209 insertions(+)
 create mode 100644 less/catppuccin-accents.less
 create mode 100644 less/catppuccin-flavour.less

diff --git a/less/catppuccin-accents.less b/less/catppuccin-accents.less
new file mode 100644
index 0000000..4bb704f
--- /dev/null
+++ b/less/catppuccin-accents.less
@@ -0,0 +1,45 @@
+s#accent(@accent) when (@accent =rosewater) {
+    @accent-colour: @rosewater;
+}
+#accent(@accent) when (@accent =flamingo) {
+    @accent-colour: @flamingo;
+}
+#accent(@accent) when (@accent =pink) {
+    @accent-colour: @pink;
+}
+#accent(@accent) when (@accent =mauve) {
+    @accent-colour: @mauve;
+}
+#accent(@accent) when (@accent =red) {
+    @accent-colour: @red;
+}
+#accent(@accent) when (@accent =maroon) {
+    @accent-colour: @maroon;
+}
+#accent(@accent) when (@accent =peach) {
+    @accent-colour: @peach;
+}
+#accent(@accent) when (@accent =yellow) {
+    @accent-colour: @yellow;
+}
+#accent(@accent) when (@accent =green) {
+    @accent-colour: @green;
+}
+#accent(@accent) when (@accent =teal) {
+    @accent-colour: @teal;
+}
+#accent(@accent) when (@accent =blue) {
+    @accent-colour: @blue;
+}
+#accent(@accent) when (@accent =sapphire) {
+    @accent-colour: @sapphire;
+}
+#accent(@accent) when (@accent =sky) {
+    @accent-colour: @sky;
+}
+#accent(@accent) when (@accent =lavender) {
+    @accent-colour: @lavender;
+}
+#accent(@accent) when (@accent =subtext0) {
+    @accent-colour: @subtext0;
+}
\ No newline at end of file
diff --git a/less/catppuccin-flavour.less b/less/catppuccin-flavour.less
new file mode 100644
index 0000000..7496458
--- /dev/null
+++ b/less/catppuccin-flavour.less
@@ -0,0 +1,118 @@
+#catppuccin(@flavour) when (@flavour = latte) {
+  @rosewater: #dc8a78;
+  @flamingo: #dd7878;
+  @pink: #ea76cb;
+  @mauve: #8839ef;
+  @red: #d20f39;
+  @maroon: #e64553;
+  @peach: #fe640b;
+  @yellow: #df8e1d;
+  @green: #40a02b;
+  @teal: #179299;
+  @sky: #04a5e5;
+  @sapphire: #209fb5;
+  @blue: #1e66f5;
+  @lavender: #7287fd;
+  @text: #4c4f69;
+  @subtext1: #5c5f77;
+  @subtext0: #6c6f85;
+  @overlay2: #7c7f93;
+  @overlay1: #8c8fa1;
+  @overlay0: #9ca0b0;
+  @surface2: #acb0be;
+  @surface1: #bcc0cc;
+  @surface0: #ccd0da;
+  @crust: #dce0e8;
+  @mantle: #e6e9ef;
+  @base: #eff1f5;
+}
+
+#catppuccin(@flavour) when (@flavour = frappe) {
+  @rosewater: #f2d5cf;
+  @flamingo: #eebebe;
+  @pink: #f4b8e4;
+  @mauve: #ca9ee6;
+  @red: #e78284;
+  @maroon: #ea999c;
+  @peach: #ef9f76;
+  @yellow: #e5c890;
+  @green: #a6d189;
+  @teal: #81c8be;
+  @sky: #99d1db;
+  @sapphire: #85c1dc;
+  @blue: #8caaee;
+  @lavender: #babbf1;
+  @text: #c6d0f5;
+  @subtext1: #b5bfe2;
+  @subtext0: #a5adce;
+  @overlay2: #949cbb;
+  @overlay1: #838ba7;
+  @overlay0: #737994;
+  @surface2: #626880;
+  @surface1: #51576d;
+  @surface0: #414559;
+  @base: #303446;
+  @mantle: #292c3c;
+  @crust: #232634;
+
+}
+
+#catppuccin(@flavour) when (@flavour = macchiato) {
+  @rosewater: #f4dbd6;
+  @flamingo: #f0c6c6;
+  @pink: #f5bde6;
+  @mauve: #c6a0f6;
+  @red: #ed8796;
+  @maroon: #ee99a0;
+  @peach: #f5a97f;
+  @yellow: #eed49f;
+  @green: #a6da95;
+  @teal: #8bd5ca;
+  @sky: #91d7e3;
+  @sapphire: #7dc4e4;
+  @blue: #8aadf4;
+  @lavender: #b7bdf8;
+  @text: #cad3f5;
+  @subtext1: #b8c0e0;
+  @subtext0: #a5adcb;
+  @overlay2: #939ab7;
+  @overlay1: #8087a2;
+  @overlay0: #6e738d;
+  @surface2: #5b6078;
+  @surface1: #494d64;
+  @surface0: #363a4f;
+  @base: #24273a;
+  @mantle: #1e2030;
+  @crust: #181926;
+
+}
+
+#catppuccin(@flavour) when (@flavour = mocha) {
+  @rosewater: #f5e0dc;
+  @flamingo: #f2cdcd;
+  @pink: #f5c2e7;
+  @mauve: #cba6f7;
+  @red: #f38ba8;
+  @maroon: #eba0ac;
+  @peach: #fab387;
+  @yellow: #f9e2af;
+  @green: #a6e3a1;
+  @teal: #94e2d5;
+  @sky: #89dceb;
+  @sapphire: #74c7ec;
+  @blue: #89b4fa;
+  @lavender: #b4befe;
+  @text: #cdd6f4;
+  @subtext1: #bac2de;
+  @subtext0: #a6adc8;
+  @overlay2: #9399b2;
+  @overlay1: #7f849c;
+  @overlay0: #6c7086;
+  @surface2: #585b70;
+  @surface1: #45475a;
+  @surface0: #313244;
+  @base: #1e1e2e;
+  @mantle: #181825;
+  @crust: #11111b;
+
+}
diff --git a/less/catppuccin-mixins.less b/less/catppuccin-mixins.less
index 7496458..ce1f56c 100644
--- a/less/catppuccin-mixins.less
+++ b/less/catppuccin-mixins.less
@@ -116,3 +116,49 @@
   @crust: #11111b;
 
 }
+
+#accent(@accent) when (@accent =rosewater) {
+    @accent-colour: @rosewater;
+}
+#accent(@accent) when (@accent =flamingo) {
+    @accent-colour: @flamingo;
+}
+#accent(@accent) when (@accent =pink) {
+    @accent-colour: @pink;
+}
+#accent(@accent) when (@accent =mauve) {
+    @accent-colour: @mauve;
+}
+#accent(@accent) when (@accent =red) {
+    @accent-colour: @red;
+}
+#accent(@accent) when (@accent =maroon) {
+    @accent-colour: @maroon;
+}
+#accent(@accent) when (@accent =peach) {
+    @accent-colour: @peach;
+}
+#accent(@accent) when (@accent =yellow) {
+    @accent-colour: @yellow;
+}
+#accent(@accent) when (@accent =green) {
+    @accent-colour: @green;
+}
+#accent(@accent) when (@accent =teal) {
+    @accent-colour: @teal;
+}
+#accent(@accent) when (@accent =blue) {
+    @accent-colour: @blue;
+}
+#accent(@accent) when (@accent =sapphire) {
+    @accent-colour: @sapphire;
+}
+#accent(@accent) when (@accent =sky) {
+    @accent-colour: @sky;
+}
+#accent(@accent) when (@accent =lavender) {
+    @accent-colour: @lavender;
+}
+#accent(@accent) when (@accent =subtext0) {
+    @accent-colour: @subtext0;
+}
\ No newline at end of file

From 12b461c3c80b28a014aa1c1fd58d12418ee8481f Mon Sep 17 00:00:00 2001
From: isabel <isabelroseslive@gmail.com>
Date: Fri, 31 Mar 2023 22:26:18 +0100
Subject: [PATCH 2/3] fixes for PR

---
 less/catppuccin-accents.less |  30 ++++-----
 less/catppuccin-flavour.less | 118 -----------------------------------
 less/catppuccin-mixins.less  |  46 --------------
 3 files changed, 15 insertions(+), 179 deletions(-)
 delete mode 100644 less/catppuccin-flavour.less

diff --git a/less/catppuccin-accents.less b/less/catppuccin-accents.less
index 4bb704f..f4ec836 100644
--- a/less/catppuccin-accents.less
+++ b/less/catppuccin-accents.less
@@ -1,45 +1,45 @@
-s#accent(@accent) when (@accent =rosewater) {
+#accent(@accent) when (@accent = rosewater) {
     @accent-colour: @rosewater;
 }
-#accent(@accent) when (@accent =flamingo) {
+#accent(@accent) when (@accent = flamingo) {
     @accent-colour: @flamingo;
 }
-#accent(@accent) when (@accent =pink) {
+#accent(@accent) when (@accent = pink) {
     @accent-colour: @pink;
 }
-#accent(@accent) when (@accent =mauve) {
+#accent(@accent) when (@accent = mauve) {
     @accent-colour: @mauve;
 }
-#accent(@accent) when (@accent =red) {
+#accent(@accent) when (@accent = red) {
     @accent-colour: @red;
 }
-#accent(@accent) when (@accent =maroon) {
+#accent(@accent) when (@accent = maroon) {
     @accent-colour: @maroon;
 }
-#accent(@accent) when (@accent =peach) {
+#accent(@accent) when (@accent = peach) {
     @accent-colour: @peach;
 }
-#accent(@accent) when (@accent =yellow) {
+#accent(@accent) when (@accent = yellow) {
     @accent-colour: @yellow;
 }
-#accent(@accent) when (@accent =green) {
+#accent(@accent) when (@accent = green) {
     @accent-colour: @green;
 }
-#accent(@accent) when (@accent =teal) {
+#accent(@accent) when (@accent = teal) {
     @accent-colour: @teal;
 }
-#accent(@accent) when (@accent =blue) {
+#accent(@accent) when (@accent = blue) {
     @accent-colour: @blue;
 }
-#accent(@accent) when (@accent =sapphire) {
+#accent(@accent) when (@accent = sapphire) {
     @accent-colour: @sapphire;
 }
-#accent(@accent) when (@accent =sky) {
+#accent(@accent) when (@accent = sky) {
     @accent-colour: @sky;
 }
-#accent(@accent) when (@accent =lavender) {
+#accent(@accent) when (@accent = lavender) {
     @accent-colour: @lavender;
 }
-#accent(@accent) when (@accent =subtext0) {
+#accent(@accent) when (@accent = subtext0) {
     @accent-colour: @subtext0;
 }
\ No newline at end of file
diff --git a/less/catppuccin-flavour.less b/less/catppuccin-flavour.less
deleted file mode 100644
index 7496458..0000000
--- a/less/catppuccin-flavour.less
+++ /dev/null
@@ -1,118 +0,0 @@
-#catppuccin(@flavour) when (@flavour = latte) {
-  @rosewater: #dc8a78;
-  @flamingo: #dd7878;
-  @pink: #ea76cb;
-  @mauve: #8839ef;
-  @red: #d20f39;
-  @maroon: #e64553;
-  @peach: #fe640b;
-  @yellow: #df8e1d;
-  @green: #40a02b;
-  @teal: #179299;
-  @sky: #04a5e5;
-  @sapphire: #209fb5;
-  @blue: #1e66f5;
-  @lavender: #7287fd;
-  @text: #4c4f69;
-  @subtext1: #5c5f77;
-  @subtext0: #6c6f85;
-  @overlay2: #7c7f93;
-  @overlay1: #8c8fa1;
-  @overlay0: #9ca0b0;
-  @surface2: #acb0be;
-  @surface1: #bcc0cc;
-  @surface0: #ccd0da;
-  @crust: #dce0e8;
-  @mantle: #e6e9ef;
-  @base: #eff1f5;
-}
-
-#catppuccin(@flavour) when (@flavour = frappe) {
-  @rosewater: #f2d5cf;
-  @flamingo: #eebebe;
-  @pink: #f4b8e4;
-  @mauve: #ca9ee6;
-  @red: #e78284;
-  @maroon: #ea999c;
-  @peach: #ef9f76;
-  @yellow: #e5c890;
-  @green: #a6d189;
-  @teal: #81c8be;
-  @sky: #99d1db;
-  @sapphire: #85c1dc;
-  @blue: #8caaee;
-  @lavender: #babbf1;
-  @text: #c6d0f5;
-  @subtext1: #b5bfe2;
-  @subtext0: #a5adce;
-  @overlay2: #949cbb;
-  @overlay1: #838ba7;
-  @overlay0: #737994;
-  @surface2: #626880;
-  @surface1: #51576d;
-  @surface0: #414559;
-  @base: #303446;
-  @mantle: #292c3c;
-  @crust: #232634;
-
-}
-
-#catppuccin(@flavour) when (@flavour = macchiato) {
-  @rosewater: #f4dbd6;
-  @flamingo: #f0c6c6;
-  @pink: #f5bde6;
-  @mauve: #c6a0f6;
-  @red: #ed8796;
-  @maroon: #ee99a0;
-  @peach: #f5a97f;
-  @yellow: #eed49f;
-  @green: #a6da95;
-  @teal: #8bd5ca;
-  @sky: #91d7e3;
-  @sapphire: #7dc4e4;
-  @blue: #8aadf4;
-  @lavender: #b7bdf8;
-  @text: #cad3f5;
-  @subtext1: #b8c0e0;
-  @subtext0: #a5adcb;
-  @overlay2: #939ab7;
-  @overlay1: #8087a2;
-  @overlay0: #6e738d;
-  @surface2: #5b6078;
-  @surface1: #494d64;
-  @surface0: #363a4f;
-  @base: #24273a;
-  @mantle: #1e2030;
-  @crust: #181926;
-
-}
-
-#catppuccin(@flavour) when (@flavour = mocha) {
-  @rosewater: #f5e0dc;
-  @flamingo: #f2cdcd;
-  @pink: #f5c2e7;
-  @mauve: #cba6f7;
-  @red: #f38ba8;
-  @maroon: #eba0ac;
-  @peach: #fab387;
-  @yellow: #f9e2af;
-  @green: #a6e3a1;
-  @teal: #94e2d5;
-  @sky: #89dceb;
-  @sapphire: #74c7ec;
-  @blue: #89b4fa;
-  @lavender: #b4befe;
-  @text: #cdd6f4;
-  @subtext1: #bac2de;
-  @subtext0: #a6adc8;
-  @overlay2: #9399b2;
-  @overlay1: #7f849c;
-  @overlay0: #6c7086;
-  @surface2: #585b70;
-  @surface1: #45475a;
-  @surface0: #313244;
-  @base: #1e1e2e;
-  @mantle: #181825;
-  @crust: #11111b;
-
-}
diff --git a/less/catppuccin-mixins.less b/less/catppuccin-mixins.less
index ce1f56c..5e659be 100644
--- a/less/catppuccin-mixins.less
+++ b/less/catppuccin-mixins.less
@@ -115,50 +115,4 @@
   @mantle: #181825;
   @crust: #11111b;
 
-}
-
-#accent(@accent) when (@accent =rosewater) {
-    @accent-colour: @rosewater;
-}
-#accent(@accent) when (@accent =flamingo) {
-    @accent-colour: @flamingo;
-}
-#accent(@accent) when (@accent =pink) {
-    @accent-colour: @pink;
-}
-#accent(@accent) when (@accent =mauve) {
-    @accent-colour: @mauve;
-}
-#accent(@accent) when (@accent =red) {
-    @accent-colour: @red;
-}
-#accent(@accent) when (@accent =maroon) {
-    @accent-colour: @maroon;
-}
-#accent(@accent) when (@accent =peach) {
-    @accent-colour: @peach;
-}
-#accent(@accent) when (@accent =yellow) {
-    @accent-colour: @yellow;
-}
-#accent(@accent) when (@accent =green) {
-    @accent-colour: @green;
-}
-#accent(@accent) when (@accent =teal) {
-    @accent-colour: @teal;
-}
-#accent(@accent) when (@accent =blue) {
-    @accent-colour: @blue;
-}
-#accent(@accent) when (@accent =sapphire) {
-    @accent-colour: @sapphire;
-}
-#accent(@accent) when (@accent =sky) {
-    @accent-colour: @sky;
-}
-#accent(@accent) when (@accent =lavender) {
-    @accent-colour: @lavender;
-}
-#accent(@accent) when (@accent =subtext0) {
-    @accent-colour: @subtext0;
 }
\ No newline at end of file

From ff125b3365fa195ce388004e6a2e3144bce51845 Mon Sep 17 00:00:00 2001
From: Andreas Grafen <andreas@grafen.info>
Date: Fri, 31 Mar 2023 23:32:44 +0200
Subject: [PATCH 3/3] chore: fix file formmating

---
 less/catppuccin-accents.less | 32 ++++++++++++++++----------------
 less/catppuccin-mixins.less  |  5 +----
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/less/catppuccin-accents.less b/less/catppuccin-accents.less
index f4ec836..67dcf06 100644
--- a/less/catppuccin-accents.less
+++ b/less/catppuccin-accents.less
@@ -1,45 +1,45 @@
 #accent(@accent) when (@accent = rosewater) {
-    @accent-colour: @rosewater;
+  @accent-colour: @rosewater;
 }
 #accent(@accent) when (@accent = flamingo) {
-    @accent-colour: @flamingo;
+  @accent-colour: @flamingo;
 }
 #accent(@accent) when (@accent = pink) {
-    @accent-colour: @pink;
+  @accent-colour: @pink;
 }
 #accent(@accent) when (@accent = mauve) {
-    @accent-colour: @mauve;
+  @accent-colour: @mauve;
 }
 #accent(@accent) when (@accent = red) {
-    @accent-colour: @red;
+  @accent-colour: @red;
 }
 #accent(@accent) when (@accent = maroon) {
-    @accent-colour: @maroon;
+  @accent-colour: @maroon;
 }
 #accent(@accent) when (@accent = peach) {
-    @accent-colour: @peach;
+  @accent-colour: @peach;
 }
 #accent(@accent) when (@accent = yellow) {
-    @accent-colour: @yellow;
+  @accent-colour: @yellow;
 }
 #accent(@accent) when (@accent = green) {
-    @accent-colour: @green;
+  @accent-colour: @green;
 }
 #accent(@accent) when (@accent = teal) {
-    @accent-colour: @teal;
+  @accent-colour: @teal;
 }
 #accent(@accent) when (@accent = blue) {
-    @accent-colour: @blue;
+  @accent-colour: @blue;
 }
 #accent(@accent) when (@accent = sapphire) {
-    @accent-colour: @sapphire;
+  @accent-colour: @sapphire;
 }
 #accent(@accent) when (@accent = sky) {
-    @accent-colour: @sky;
+  @accent-colour: @sky;
 }
 #accent(@accent) when (@accent = lavender) {
-    @accent-colour: @lavender;
+  @accent-colour: @lavender;
 }
 #accent(@accent) when (@accent = subtext0) {
-    @accent-colour: @subtext0;
-}
\ No newline at end of file
+  @accent-colour: @subtext0;
+}
diff --git a/less/catppuccin-mixins.less b/less/catppuccin-mixins.less
index 5e659be..6da2e5b 100644
--- a/less/catppuccin-mixins.less
+++ b/less/catppuccin-mixins.less
@@ -54,7 +54,6 @@
   @base: #303446;
   @mantle: #292c3c;
   @crust: #232634;
-
 }
 
 #catppuccin(@flavour) when (@flavour = macchiato) {
@@ -84,7 +83,6 @@
   @base: #24273a;
   @mantle: #1e2030;
   @crust: #181926;
-
 }
 
 #catppuccin(@flavour) when (@flavour = mocha) {
@@ -114,5 +112,4 @@
   @base: #1e1e2e;
   @mantle: #181825;
   @crust: #11111b;
-
-}
\ No newline at end of file
+}