From dc32e1d14277d50345bb095b5dcf7030b4de1de4 Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 17:44:17 -0500
Subject: [PATCH 1/8] syntax error go brrr

---
 public/themes/catppuccinLatte.css     | 2 +-
 public/themes/catppuccinMacchiato.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/themes/catppuccinLatte.css b/public/themes/catppuccinLatte.css
index 58feefb..d6bcb49 100644
--- a/public/themes/catppuccinLatte.css
+++ b/public/themes/catppuccinLatte.css
@@ -16,7 +16,7 @@
     --input-border-size: 1.3px !important;
     --navbar-logo-filter: none !important;
     --dropdown-option-hover-color: #dce0e8 !important;
-    --tab-color: #ccd0da; !important
+    --tab-color: #ccd0da !important;
 }
 
 .font-inter {
diff --git a/public/themes/catppuccinMacchiato.css b/public/themes/catppuccinMacchiato.css
index 9d1ba4f..97a4f9f 100644
--- a/public/themes/catppuccinMacchiato.css
+++ b/public/themes/catppuccinMacchiato.css
@@ -16,7 +16,7 @@
   --input-border-size: 1.3px !important;
   --navbar-logo-filter: none !important;
   --dropdown-option-hover-color: #181926 !important;
-  --tab-color: #363a4f;
+  --tab-color: #363a4f !important;
 }
 
 .font-inter {

From d8a975d531f72c3ee00d87033224f96e03e71c70 Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 17:51:56 -0500
Subject: [PATCH 2/8] Catppuccin theming was inconsistent

---
 src/pages/Settings/Dropdown.tsx |  6 +++---
 src/pages/discord.tsx           | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pages/Settings/Dropdown.tsx b/src/pages/Settings/Dropdown.tsx
index 52fcddb..0c5f86d 100644
--- a/src/pages/Settings/Dropdown.tsx
+++ b/src/pages/Settings/Dropdown.tsx
@@ -36,10 +36,10 @@ const Dropdown = ({
       >
         <div className="flex h-full w-full select-none flex-row items-center">
           <div className="h-full w-1/4"></div>
-          <div className="flex w-2/4 flex-col items-center">
+          <div className="flex w-2/4 flex-col items-center text-input-text">
             {options.find((o) => o.id === choice)?.label}
           </div>
-          <div className="flex w-1/4 flex-col items-center">
+          <div className="flex w-1/4 flex-col items-center text-input-text">
             <FaAngleDown />
           </div>
         </div>
@@ -48,7 +48,7 @@ const Dropdown = ({
             {options.map((option, index) => (
               <div
                 key={option.id}
-                className={`border border-input-border-color bg-input p-2 hover:bg-dropdown-option-hover-color ${
+                className={`border border-input-border-color bg-input p-2 text-input-text hover:bg-dropdown-option-hover-color ${
                   index === options.length - 1 ? "rounded-b-2xl" : ""
                 }`}
                 onClick={() => {
diff --git a/src/pages/discord.tsx b/src/pages/discord.tsx
index bdb7894..4526135 100644
--- a/src/pages/discord.tsx
+++ b/src/pages/discord.tsx
@@ -15,13 +15,15 @@ export function DiscordPage() {
         <div className="flex h-full flex-col items-center justify-center">
           <img src="/services.png" className="h-72 w-72"></img>
           <div className="flex flex-col items-center p-6">
-            <p className="font-roboto text-4xl font-bold">
+            <p className="font-roboto text-4xl font-bold text-input-text">
               {t("discord.title")}
             </p>
-            <span className="font-roboto text-3xl">{t("discord.sub")}</span>
+            <span className="font-roboto text-3xl text-input-text">
+              {t("discord.sub")}
+            </span>
           </div>
           <a href="https://discord.gg/unblocker" className="p-6">
-            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl placeholder:text-input-text focus:outline-none">
+            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl text-input-text focus:outline-none">
               {t("discord.button1")}
             </button>
           </a>
@@ -29,7 +31,7 @@ export function DiscordPage() {
             href="/~/uv/https%3A%2F%2Fdiscord.com%2Finvite%2Funblocker"
             className="p-6"
           >
-            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl placeholder:text-input-text focus:outline-none">
+            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl text-input-text focus:outline-none">
               {t("discord.button2")}
             </button>
           </a>

From c27ccc043ce9b4c6779b5fe7b25d538a392bc19f Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 17:52:40 -0500
Subject: [PATCH 3/8] prettier

---
 public/themes/catppuccinLatte.css | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/public/themes/catppuccinLatte.css b/public/themes/catppuccinLatte.css
index d6bcb49..721f3a6 100644
--- a/public/themes/catppuccinLatte.css
+++ b/public/themes/catppuccinLatte.css
@@ -1,30 +1,30 @@
 @import url("https://fonts.googleapis.com/css2?family=Dongle&family=Roboto:wght@100&display=swap");
 
 :root {
-    --background-primary: #eff1f5 !important;
-    --background-lighter: #dce0e8 !important;
-    --navbar-color: #dce0e8 !important;
-    --navbar-height: 60px !important;
-    --navbar-text-color: #8839ef !important;
-    --navbar-link-color: #1e66f5 !important;
-    --navbar-link-hover-color: #8839ef !important;
-    --navbar-font: "Roboto" !important;
-    --input-text-color: #4c4f69 !important;
-    --input-placeholder-color: #5c5f77 !important;
-    --input-background-color: #e6e9ef !important;
-    --input-border-color: #8839ef !important;
-    --input-border-size: 1.3px !important;
-    --navbar-logo-filter: none !important;
-    --dropdown-option-hover-color: #dce0e8 !important;
-    --tab-color: #ccd0da !important;
+  --background-primary: #eff1f5 !important;
+  --background-lighter: #dce0e8 !important;
+  --navbar-color: #dce0e8 !important;
+  --navbar-height: 60px !important;
+  --navbar-text-color: #8839ef !important;
+  --navbar-link-color: #1e66f5 !important;
+  --navbar-link-hover-color: #8839ef !important;
+  --navbar-font: "Roboto" !important;
+  --input-text-color: #4c4f69 !important;
+  --input-placeholder-color: #5c5f77 !important;
+  --input-background-color: #e6e9ef !important;
+  --input-border-color: #8839ef !important;
+  --input-border-size: 1.3px !important;
+  --navbar-logo-filter: none !important;
+  --dropdown-option-hover-color: #dce0e8 !important;
+  --tab-color: #ccd0da !important;
 }
 
 .font-inter {
-    font-family: "Inter", sans-serif;
-    font-weight: 300;
+  font-family: "Inter", sans-serif;
+  font-weight: 300;
 }
 
 .font-roboto {
-    font-family: "Roboto";
-    color: #4c4f69
-}
\ No newline at end of file
+  font-family: "Roboto";
+  color: #4c4f69;
+}

From d63602289890923775dc7c8880b5d6bb7d0252d6 Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 17:56:44 -0500
Subject: [PATCH 4/8] Fixed discord invite through proxy

---
 src/pages/discord.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/discord.tsx b/src/pages/discord.tsx
index 4526135..8903049 100644
--- a/src/pages/discord.tsx
+++ b/src/pages/discord.tsx
@@ -28,7 +28,11 @@ export function DiscordPage() {
             </button>
           </a>
           <a
-            href="/~/uv/https%3A%2F%2Fdiscord.com%2Finvite%2Funblocker"
+            onClick={() => {
+              window.location.href =
+                window.__uv$config.prefix +
+                window.__uv$config.encodeUrl("https://discord.gg/unblocker");
+            }}
             className="p-6"
           >
             <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl text-input-text focus:outline-none">

From 38231f4eaa6d5da08fc36a1ffc54eab06622c3b7 Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 18:21:20 -0500
Subject: [PATCH 5/8] Revert "prettier"

This reverts commit c27ccc043ce9b4c6779b5fe7b25d538a392bc19f.
---
 public/themes/catppuccinLatte.css | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/public/themes/catppuccinLatte.css b/public/themes/catppuccinLatte.css
index 721f3a6..d6bcb49 100644
--- a/public/themes/catppuccinLatte.css
+++ b/public/themes/catppuccinLatte.css
@@ -1,30 +1,30 @@
 @import url("https://fonts.googleapis.com/css2?family=Dongle&family=Roboto:wght@100&display=swap");
 
 :root {
-  --background-primary: #eff1f5 !important;
-  --background-lighter: #dce0e8 !important;
-  --navbar-color: #dce0e8 !important;
-  --navbar-height: 60px !important;
-  --navbar-text-color: #8839ef !important;
-  --navbar-link-color: #1e66f5 !important;
-  --navbar-link-hover-color: #8839ef !important;
-  --navbar-font: "Roboto" !important;
-  --input-text-color: #4c4f69 !important;
-  --input-placeholder-color: #5c5f77 !important;
-  --input-background-color: #e6e9ef !important;
-  --input-border-color: #8839ef !important;
-  --input-border-size: 1.3px !important;
-  --navbar-logo-filter: none !important;
-  --dropdown-option-hover-color: #dce0e8 !important;
-  --tab-color: #ccd0da !important;
+    --background-primary: #eff1f5 !important;
+    --background-lighter: #dce0e8 !important;
+    --navbar-color: #dce0e8 !important;
+    --navbar-height: 60px !important;
+    --navbar-text-color: #8839ef !important;
+    --navbar-link-color: #1e66f5 !important;
+    --navbar-link-hover-color: #8839ef !important;
+    --navbar-font: "Roboto" !important;
+    --input-text-color: #4c4f69 !important;
+    --input-placeholder-color: #5c5f77 !important;
+    --input-background-color: #e6e9ef !important;
+    --input-border-color: #8839ef !important;
+    --input-border-size: 1.3px !important;
+    --navbar-logo-filter: none !important;
+    --dropdown-option-hover-color: #dce0e8 !important;
+    --tab-color: #ccd0da !important;
 }
 
 .font-inter {
-  font-family: "Inter", sans-serif;
-  font-weight: 300;
+    font-family: "Inter", sans-serif;
+    font-weight: 300;
 }
 
 .font-roboto {
-  font-family: "Roboto";
-  color: #4c4f69;
-}
+    font-family: "Roboto";
+    color: #4c4f69
+}
\ No newline at end of file

From beefe7ab446aa1356a1c184cc6fb8fae922804cd Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 18:21:31 -0500
Subject: [PATCH 6/8] Revert "Catppuccin theming was inconsistent"

This reverts commit d8a975d531f72c3ee00d87033224f96e03e71c70.
---
 src/pages/Settings/Dropdown.tsx |  6 +++---
 src/pages/discord.tsx           | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/pages/Settings/Dropdown.tsx b/src/pages/Settings/Dropdown.tsx
index 0c5f86d..52fcddb 100644
--- a/src/pages/Settings/Dropdown.tsx
+++ b/src/pages/Settings/Dropdown.tsx
@@ -36,10 +36,10 @@ const Dropdown = ({
       >
         <div className="flex h-full w-full select-none flex-row items-center">
           <div className="h-full w-1/4"></div>
-          <div className="flex w-2/4 flex-col items-center text-input-text">
+          <div className="flex w-2/4 flex-col items-center">
             {options.find((o) => o.id === choice)?.label}
           </div>
-          <div className="flex w-1/4 flex-col items-center text-input-text">
+          <div className="flex w-1/4 flex-col items-center">
             <FaAngleDown />
           </div>
         </div>
@@ -48,7 +48,7 @@ const Dropdown = ({
             {options.map((option, index) => (
               <div
                 key={option.id}
-                className={`border border-input-border-color bg-input p-2 text-input-text hover:bg-dropdown-option-hover-color ${
+                className={`border border-input-border-color bg-input p-2 hover:bg-dropdown-option-hover-color ${
                   index === options.length - 1 ? "rounded-b-2xl" : ""
                 }`}
                 onClick={() => {
diff --git a/src/pages/discord.tsx b/src/pages/discord.tsx
index 8903049..a993dae 100644
--- a/src/pages/discord.tsx
+++ b/src/pages/discord.tsx
@@ -15,15 +15,13 @@ export function DiscordPage() {
         <div className="flex h-full flex-col items-center justify-center">
           <img src="/services.png" className="h-72 w-72"></img>
           <div className="flex flex-col items-center p-6">
-            <p className="font-roboto text-4xl font-bold text-input-text">
+            <p className="font-roboto text-4xl font-bold">
               {t("discord.title")}
             </p>
-            <span className="font-roboto text-3xl text-input-text">
-              {t("discord.sub")}
-            </span>
+            <span className="font-roboto text-3xl">{t("discord.sub")}</span>
           </div>
           <a href="https://discord.gg/unblocker" className="p-6">
-            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl text-input-text focus:outline-none">
+            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl placeholder:text-input-text focus:outline-none">
               {t("discord.button1")}
             </button>
           </a>
@@ -35,7 +33,7 @@ export function DiscordPage() {
             }}
             className="p-6"
           >
-            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl text-input-text focus:outline-none">
+            <button className="font-roboto h-14 w-56 rounded-2xl border border-input-border-color bg-input p-2 text-center text-xl placeholder:text-input-text focus:outline-none">
               {t("discord.button2")}
             </button>
           </a>

From a98fe44063cbd09bd4d5245e773550a95c27a0af Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 18:21:43 -0500
Subject: [PATCH 7/8] Revert "syntax error go brrr"

This reverts commit dc32e1d14277d50345bb095b5dcf7030b4de1de4.
---
 public/themes/catppuccinLatte.css     | 2 +-
 public/themes/catppuccinMacchiato.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/themes/catppuccinLatte.css b/public/themes/catppuccinLatte.css
index d6bcb49..58feefb 100644
--- a/public/themes/catppuccinLatte.css
+++ b/public/themes/catppuccinLatte.css
@@ -16,7 +16,7 @@
     --input-border-size: 1.3px !important;
     --navbar-logo-filter: none !important;
     --dropdown-option-hover-color: #dce0e8 !important;
-    --tab-color: #ccd0da !important;
+    --tab-color: #ccd0da; !important
 }
 
 .font-inter {
diff --git a/public/themes/catppuccinMacchiato.css b/public/themes/catppuccinMacchiato.css
index 97a4f9f..9d1ba4f 100644
--- a/public/themes/catppuccinMacchiato.css
+++ b/public/themes/catppuccinMacchiato.css
@@ -16,7 +16,7 @@
   --input-border-size: 1.3px !important;
   --navbar-logo-filter: none !important;
   --dropdown-option-hover-color: #181926 !important;
-  --tab-color: #363a4f !important;
+  --tab-color: #363a4f;
 }
 
 .font-inter {

From 323086c19da07b16ae40e2c587abfe0103500f88 Mon Sep 17 00:00:00 2001
From: incognitotgt <mashoor539@icloud.com>
Date: Tue, 2 Jan 2024 18:57:46 -0500
Subject: [PATCH 8/8] made title text and iframeheader icons not bland, fixed
 text readbility in Latte

---
 public/themes/catppuccinFrappe.css    | 4 ++--
 public/themes/catppuccinLatte.css     | 5 +++--
 public/themes/catppuccinMacchiato.css | 4 ++--
 public/themes/catppuccinMocha.css     | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/public/themes/catppuccinFrappe.css b/public/themes/catppuccinFrappe.css
index 1b15499..1e5c26e 100644
--- a/public/themes/catppuccinFrappe.css
+++ b/public/themes/catppuccinFrappe.css
@@ -5,7 +5,7 @@
   --background-lighter: #292c3c !important;
   --navbar-color: #292c3c !important;
   --navbar-height: 60px !important;
-  --navbar-text-color: #c6d0f5 !important;
+  --navbar-text-color: #ca9ee6 !important;
   --navbar-link-color: #8caaee !important;
   --navbar-link-hover-color: #ca9ee6 !important;
   --navbar-font: "Roboto" !important;
@@ -15,7 +15,7 @@
   --input-border-color: color-mix(in srgb, #232634, #ca9ee6 50%) !important;
   --input-border-size: 1.3px !important;
   --navbar-logo-filter: none !important;
-  --dropdown-option-hover-color: #232634 !important;
+  --dropdown-option-hover-color: #292c3c !important;
   --tab-color: #414559 !important;
   --active-color: #ca9ee6 !important;
 }
diff --git a/public/themes/catppuccinLatte.css b/public/themes/catppuccinLatte.css
index f96111d..c1fc34a 100644
--- a/public/themes/catppuccinLatte.css
+++ b/public/themes/catppuccinLatte.css
@@ -5,7 +5,7 @@
   --background-lighter: #e6e9ef !important;
   --navbar-color: #e6e9ef !important;
   --navbar-height: 60px !important;
-  --navbar-text-color: #4c4f69 !important;
+  --navbar-text-color: #8839ef !important;
   --navbar-link-color: #1e66f5 !important;
   --navbar-link-hover-color: #8839ef !important;
   --navbar-font: "Roboto" !important;
@@ -15,7 +15,7 @@
   --input-border-color: color-mix(in srgb, #dce0e8, #8839ef 50%) !important;
   --input-border-size: 1.3px !important;
   --navbar-logo-filter: none !important;
-  --dropdown-option-hover-color: #dce0e8 !important;
+  --dropdown-option-hover-color: #e6e9ef !important;
   --tab-color: #ccd0da !important;
   --active-color: #8839ef !important;
 }
@@ -27,4 +27,5 @@
 
 .font-roboto {
   font-family: "Roboto";
+  color: #4c4f69;
 }
diff --git a/public/themes/catppuccinMacchiato.css b/public/themes/catppuccinMacchiato.css
index 5daee45..6de5939 100644
--- a/public/themes/catppuccinMacchiato.css
+++ b/public/themes/catppuccinMacchiato.css
@@ -5,7 +5,7 @@
   --background-lighter: #1e2030 !important;
   --navbar-color: #1e2030 !important;
   --navbar-height: 60px !important;
-  --navbar-text-color: #cad3f5 !important;
+  --navbar-text-color: #c6a0f6 !important;
   --navbar-link-color: #8aadf4 !important;
   --navbar-link-hover-color: #c6a0f6 !important;
   --navbar-font: "Roboto" !important;
@@ -15,7 +15,7 @@
   --input-border-color: color-mix(in srgb, #181926, #c6a0f6 50%) !important;
   --input-border-size: 1.3px !important;
   --navbar-logo-filter: none !important;
-  --dropdown-option-hover-color: #181926 !important;
+  --dropdown-option-hover-color: #1e2030 !important;
   --tab-color: #363a4f !important;
   --active-color: #c6a0f6 !important;
 }
diff --git a/public/themes/catppuccinMocha.css b/public/themes/catppuccinMocha.css
index ec96a5a..fe35586 100644
--- a/public/themes/catppuccinMocha.css
+++ b/public/themes/catppuccinMocha.css
@@ -5,7 +5,7 @@
   --background-lighter: #181825 !important;
   --navbar-color: #181825 !important;
   --navbar-height: 60px !important;
-  --navbar-text-color: #cdd6f4 !important;
+  --navbar-text-color: #cba6f7 !important;
   --navbar-link-color: #89b4fa !important;
   --navbar-link-hover-color: #cba6f7 !important;
   --navbar-font: "Roboto" !important;
@@ -15,7 +15,7 @@
   --input-border-color: color-mix(in srgb, #11111b, #cba6f7 50%) !important;
   --input-border-size: 1.3px !important;
   --navbar-logo-filter: none !important;
-  --dropdown-option-hover-color: #11111b !important;
+  --dropdown-option-hover-color: #181825 !important;
   --tab-color: #313244 !important;
   --active-color: #cba6f7 !important;
 }