From 84840d9fa05c961f1c82d29ed65bb19eff22bb3c Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Sat, 9 Oct 2021 16:02:47 +0200
Subject: [PATCH] dsfsfd

---
 files/templates/header.html                |  2 +-
 files/templates/mobile_navigation_bar.html | 12 ++++++------
 files/templates/notifications.html         |  2 +-
 files/templates/settings.html              | 11 -----------
 files/templates/settings_security.html     | 16 ++++++++++++----
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/files/templates/header.html b/files/templates/header.html
index 15414bd7e..bfb1dfe9f 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -96,7 +96,7 @@
 							<div><img loading="lazy" src="{{v.profile_url}}" class="profile-pic-35"></div>
 							<div class="text-left pl-2">
 								<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}};"{% endif %}>{{v.username}}</span></div>
-								<div class="text-small-extra text-purple"><img class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/assets/images/emojis/marseycoin.webp" title="" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}"><span id="user-coins-amount">{{v.coins}}</span> {{'COINS_NAME' | app_config}}</div>
+								<div class="text-small-extra text-primary"><img class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/assets/images/emojis/marseycoin.webp" title="" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}"><span id="user-coins-amount">{{v.coins}}</span> {{'COINS_NAME' | app_config}}</div>
 							</div>
 						</div>
 					</a>
diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html
index 72466e002..49e65868a 100644
--- a/files/templates/mobile_navigation_bar.html
+++ b/files/templates/mobile_navigation_bar.html
@@ -13,7 +13,7 @@
 
 				<button type="button" class="col px-0 ml-3 btn btn-dead m-0" style="background: None !important; border: None;">
 						<a href="/" class="text-decoration-none" role="button">
-								<div class="text-center {% if request.path=='/' and request.full_path!='/?sort=hot&t=all' and request.full_path!='/?sort=new&t=all' %}text-purple{% else %}text-muted{% endif %}">
+								<div class="text-center {% if request.path=='/' and request.full_path!='/?sort=hot&t=all' and request.full_path!='/?sort=new&t=all' %}text-primary{% else %}text-muted{% endif %}">
 										<i class="fas fa-home-alt text-lg"></i>
 										<div class="text-small">Home</div>
 								</div>
@@ -22,7 +22,7 @@
 {% if v and v.defaultsorting == 'new' %}
 				<button type="button" class="col px-0 btn btn-dead m-0" style="background: None !important; border: None;">
 						<a href="/?sort=hot&t=all" class="text-decoration-none" role="button">
-								<div class="text-center {% if request.full_path=='/?sort=hot&t=all' %}text-purple{% else %}text-muted{% endif %}">
+								<div class="text-center {% if request.full_path=='/?sort=hot&t=all' %}text-primary{% else %}text-muted{% endif %}">
 										<i class="fas fa-fire text-lg"></i>
 										<div class="text-small">Hot</div>
 								</div>
@@ -31,7 +31,7 @@
 {% else %}
 				<button type="button" class="col px-0 btn btn-dead m-0" style="background: None !important; border: None;">
 						<a href="/?sort=new&t=all" class="text-decoration-none" role="button">
-								<div class="text-center {% if request.full_path=='/?sort=new&t=all' %}text-purple{% else %}text-muted{% endif %}">
+								<div class="text-center {% if request.full_path=='/?sort=new&t=all' %}text-primary{% else %}text-muted{% endif %}">
 										<i class="fas fa-sparkles text-lg"></i>
 										<div class="text-small">New</div>
 								</div>
@@ -40,7 +40,7 @@
 {% endif %}
 				<button type="button" class="col px-2 btn btn-dead m-0" style="background: None !important; border: None;">
 						<a href="/comments" class="text-decoration-none" role="button">
-								<div class="text-center {% if request.path=='/comments' %}text-purple{% else %}text-muted{% endif %}">
+								<div class="text-center {% if request.path=='/comments' %}text-primary{% else %}text-muted{% endif %}">
 										<i class="fas fa-comment-dots text-lg"></i>
 										<div class="text-small">Comments</div>
 								</div>
@@ -48,7 +48,7 @@
 				</button>
 				<button type="button" class="col px-0 btn btn-dead m-0" style="background: None !important; border: None;">
 						<a href="/leaderboard" class="text-decoration-none" role="button">
-								<div class="text-center {% if request.path=='/leaderboard' %}text-purple{% else %}text-muted{% endif %}">
+								<div class="text-center {% if request.path=='/leaderboard' %}text-primary{% else %}text-muted{% endif %}">
 										<i class="fas fa-trophy text-lg"></i>
 										<div class="text-small">Users</div>
 								</div>
@@ -57,7 +57,7 @@
 {% if v %}
 				<button type="button" class="col px-0 mr-3 btn btn-dead m-0" style="background: None !important; border: None;">
 						<a href="{{v.url}}" class="text-decoration-none" role="button">
-								<div class="text-center {% if request.path==v.url %}text-purple{% else %}text-muted{% endif %}">
+								<div class="text-center {% if request.path==v.url %}text-primary{% else %}text-muted{% endif %}">
 										<i class="fas fa-user-circle text-lg"></i>
 										<div class="text-small">Profile</div>
 								</div>
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index 16519e117..ad87131be 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -22,7 +22,7 @@
 	</li>
 	<li class="nav-item">
 		<a class="nav-link py-3{% if '/notifications?posts=true' in request.full_path %} active{% endif %}" href="/notifications?posts=true">
-		Posts{% if v.post_notifications_count %} <span class="text-purple font-weight-bold">({{v.post_notifications_count}})</span>{% endif %}
+		Posts{% if v.post_notifications_count %} <span class="text-primary font-weight-bold">({{v.post_notifications_count}})</span>{% endif %}
 		</a>
 	</li>
 	<li class="nav-item">
diff --git a/files/templates/settings.html b/files/templates/settings.html
index cbec4fd06..f273f833e 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -12,17 +12,6 @@
 				myToast.show();
 				console.log(e);
 		});
-
-
-		document.getElementById('new_email').addEventListener('input', function () {
-			var id = document.getElementById("email-password");
-			var id2 = document.getElementById("email-password-label");
-			var id3 = document.getElementById("emailpasswordRequired");
-
-			id.classList.remove("d-none");
-			id2.classList.remove("d-none");
-			id3.classList.remove("d-none");
-		});
 		
 		function emailVerifyText() {
 			document.getElementById("email-verify-text").innerHTML = "Verification email sent! Please check your inbox.";
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index 15ce7d06a..fe64af897 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -4,16 +4,24 @@
 
 {% block content %}
 
+<script>
+	function newemail() {
+		var id = document.getElementById("email-password");
+		var id2 = document.getElementById("email-password-label");
+		var id3 = document.getElementById("emailpasswordRequired");
 
+		id.classList.remove("d-none");
+		id2.classList.remove("d-none");
+		id3.classList.remove("d-none");
+	});
+</script>
 
 		<div class="row">
 
 			<div class="col col-lg-8">
 
 				<div class="settings">
-
-
-
+			
 					<h2 class="h5">Email</h2>
 
 					<p class="text-small text-muted">Change the email address used to sign in to your account.</p>
@@ -24,7 +32,7 @@
 								<div class="d-lg-flex">
 									<label for="new-email" class="w-lg-25">Email</label>
 									<div class="w-lg-100">
-										<input class="form-control" id="new_email" {% if v.email %}placeholder="{{v.email}}"{% else %}placeholder="Your email"{% endif %}
+										<input class="form-control" oninput="newemail()" {% if v.email %}placeholder="{{v.email}}"{% else %}placeholder="Your email"{% endif %}
 										aria-describedby="new_email" type="email" name="new_email" required>
 										{% if v.email and not v.is_activated %}
 											<div class="text-danger text-small-extra mt-1" id="email-verify-text">Email not verified. You will not be able to recover your account with this email until you verify it. <u><a href="javascript:void(0)" onclick="post_toast('/verify_email');emailVerifyText();" class="text-danger">Verify now.</a></u></div>