From 5c3ec52e391e5a88ac570115ff4d0c14b42f2187 Mon Sep 17 00:00:00 2001
From: nullishamy <git@amyerskine.me>
Date: Mon, 20 May 2024 12:54:33 +0100
Subject: [PATCH] fix: actually apply our accents (#199)

* fix: actually apply our accents

* chore: remove unused patches
---
 build.py                          |  7 ++---
 patches/colloid/sass-colors.patch | 47 -------------------------------
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 patches/colloid/sass-colors.patch

diff --git a/build.py b/build.py
index d125e946..2d445313 100755
--- a/build.py
+++ b/build.py
@@ -198,7 +198,7 @@ def build(ctx: BuildContext):
         )
 
 
-def tweaks_temp():
+def init_tweaks_temp():
     shutil.copyfile(f"{SRC_DIR}/sass/_tweaks.scss", f"{SRC_DIR}/sass/_tweaks-temp.scss")
 
 
@@ -262,7 +262,7 @@ def write_tweak(key, default, value):
 
 
 def apply_tweaks(ctx: BuildContext):
-    write_tweak("theme", "'default'", translate_accent(ctx.accent))
+    write_tweak("theme", "'default'", f"'{translate_accent(ctx.accent)}'")
 
     if ctx.size == "compact":
         write_tweak("compact", "'false'", "'true'")
@@ -477,7 +477,6 @@ def apply_colloid_patches():
     for patch in [
         "plank-dark.patch",
         "plank-light.patch",
-        "sass-colors.patch",
         "sass-palette-frappe.patch",
         "sass-palette-mocha.patch",
         "sass-palette-latte.patch",
@@ -644,7 +643,7 @@ def main():
             output_format=output_format,
         )
         logger.info("Building temp tweaks file")
-        tweaks_temp()
+        init_tweaks_temp()
         logger.info("Inserting gnome-shell imports")
         gnome_shell_version()
         logger.info("Building main theme")
diff --git a/patches/colloid/sass-colors.patch b/patches/colloid/sass-colors.patch
deleted file mode 100644
index 6367499a..00000000
--- a/patches/colloid/sass-colors.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
-index e8366fa0..97fa670c 100644
---- a/src/sass/_colors.scss
-+++ b/src/sass/_colors.scss
-@@ -57,9 +57,8 @@
-   @else { @return rgba($white, 0.1); }
- }
- 
--@function theme($color) {
-+@function theme() {
-   @if ($variant == 'light') {
--    @if ($theme == 'default') { @return $default-dark; }
-     @if ($theme == 'purple') { @return $purple-dark; }
-     @if ($theme == 'pink') { @return $pink-dark; }
-     @if ($theme == 'red') { @return $red-dark; }
-@@ -68,8 +67,9 @@
-     @if ($theme == 'green') { @return $green-dark; }
-     @if ($theme == 'teal') { @return $teal-dark; }
-     @if ($theme == 'grey') { @return $grey-600; }
-+
-+    @return $default-dark;
-   } @else {
--    @if ($theme == 'default') { @return $default-light; }
-     @if ($theme == 'purple') { @return $purple-light; }
-     @if ($theme == 'pink') { @return $pink-light; }
-     @if ($theme == 'red') { @return $red-light; }
-@@ -78,6 +78,8 @@
-     @if ($theme == 'green') { @return $green-light; }
-     @if ($theme == 'teal') { @return $teal-light; }
-     @if ($theme == 'grey') { @return $grey-200; }
-+
-+    @return $default-light;
-   }
- }
- 
-@@ -113,9 +115,9 @@
- // Basic colors
- //
- 
--$primary:                               theme(color);
-+$primary:                               theme();
- $drop_target_color:                     $orange-dark;
--$indicator:                             theme(color);
-+$indicator:                             theme();
- $titlebar-indicator:                    if($variant == 'dark', currentColor, $primary);
- $inverse-indicator:                     if($theme == 'grey', $white, $primary);
- $applet-primary:                        if($theme == 'grey' and variant == 'light' and $topbar == 'dark', $grey-200, $primary);