From 9cea099a47114d65d3ddedf3b563b855f1aa0b0f Mon Sep 17 00:00:00 2001
From: Minecon724 <minecon724@noreply.git.m724.eu>
Date: Sat, 15 Mar 2025 15:44:07 +0100
Subject: [PATCH] Refactoring

---
 templates/user/auth/signup_inner.tmpl |  2 +-
 web_src/css/index.css                 | 29 +-------------------
 web_src/css/markup/dark.css           | 10 ++-----
 web_src/css/tweaks/tweaks-dark.css    |  5 ++++
 web_src/css/tweaks/tweaks.css         | 39 +++++++++++++++++++++++++++
 5 files changed, 48 insertions(+), 37 deletions(-)
 create mode 100644 web_src/css/tweaks/tweaks-dark.css
 create mode 100644 web_src/css/tweaks/tweaks.css

diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 97ca03492e..0a51746aaa 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -38,7 +38,7 @@
 				{{template "user/auth/captcha" .}}
 
 				{{ if (.PrivacyPolicyURL) }}
-					<div id="consent_container">
+					<div id="consent-container">
 						<label>
 							<input id="consent" name="consent" type="checkbox">
 							{{ ctx.Locale.Tr "consent_agree" .PrivacyPolicyURL }}
diff --git a/web_src/css/index.css b/web_src/css/index.css
index 843e73d8f0..a3e18e5a8d 100644
--- a/web_src/css/index.css
+++ b/web_src/css/index.css
@@ -77,31 +77,4 @@
 @tailwind utilities;
 @import "./helpers.css";
 
-/* git724 tweaks below this line */
-
-#consent_container {
-  margin-bottom: .6em;
-
-  label {
-    input {
-      margin-right: .75em;
-      margin-top: .2em;
-      margin-bottom: .4em;
-    }
-
-    &::after {
-      content: "*";
-      color: var(--color-red);
-    }
-  }
-
-  .help {
-    margin-left: 0 !important;
-  }
-}
-
-.captcha-img {
-  width: min(400px, 100%);
-
-  /* rest in markup/dark.css */
-}
+@import "./tweaks/tweaks.css";
diff --git a/web_src/css/markup/dark.css b/web_src/css/markup/dark.css
index 09957f2108..a6bd61aa24 100644
--- a/web_src/css/markup/dark.css
+++ b/web_src/css/markup/dark.css
@@ -12,11 +12,5 @@
   display: unset;
 }
 
-/*
-git724 tweaks; the reason we're doing this here is because dark vanilla templates use this
-there's no other way to do it
-*/
-
-.captcha-img {
-  filter: invert();
-}
+/* The reason we're doing this *here* is because dark vanilla templates always use this file, and there's no other way to detect dark theme */
+@import "../tweaks/tweaks-dark.css";
diff --git a/web_src/css/tweaks/tweaks-dark.css b/web_src/css/tweaks/tweaks-dark.css
new file mode 100644
index 0000000000..c878165d81
--- /dev/null
+++ b/web_src/css/tweaks/tweaks-dark.css
@@ -0,0 +1,5 @@
+/* git724 tweaks - dark theme only */
+
+.captcha-img {
+  filter: invert();
+}
diff --git a/web_src/css/tweaks/tweaks.css b/web_src/css/tweaks/tweaks.css
new file mode 100644
index 0000000000..131de5503e
--- /dev/null
+++ b/web_src/css/tweaks/tweaks.css
@@ -0,0 +1,39 @@
+/*
+git724 tweaks
+Note that not all changes are here, only those that don't belong anywhere else
+*/
+
+#consent-container {
+  margin-bottom: .6em;
+
+  label {
+    input {
+      margin-right: .75em;
+      margin-top: .2em;
+      margin-bottom: .4em;
+    }
+
+    &::after {
+      content: "*";
+      color: var(--color-red);
+    }
+  }
+
+  .help {
+    margin-left: 0 !important;
+  }
+}
+
+.captcha-img {
+  width: min(400px, 100%);
+}
+
+/* This removes hover fade transition from most buttons */
+.ui.menu .item, .ui.button {
+  transition: none !important;
+}
+
+/* Adds fade to buttons which don't have it */
+#oauth2-login-navigator-inner > a:hover {
+  background: var(--color-secondary-bg); /* Not perfect but good enough. There's no button hover var */
+}