From 9b3a1e8cad34ce7a2780909b4f14e81afc66cb22 Mon Sep 17 00:00:00 2001
From: Arthur Lu <alu@tronnet.net>
Date: Thu, 19 Oct 2023 17:26:37 +0000
Subject: [PATCH] fix nav styling, fix linting

---
 css/nav.css      | 13 +++++++------
 css/style.css    |  2 +-
 scripts/utils.js |  2 +-
 settings.html    |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/css/nav.css b/css/nav.css
index f4ab1c7..6cb667c 100644
--- a/css/nav.css
+++ b/css/nav.css
@@ -32,6 +32,7 @@ header h1 {
 	margin: 0;
 	background-color: var(--nav-header-bg-color);
 	color: var(--nav-header-text-color);
+	width: fit-content;
 }
 
 nav {
@@ -64,20 +65,20 @@ label[for="navtoggle"], #navtoggle {
 		align-items: center;
 	}
 
-	nav a[aria-current="page"], nav a:hover {
+	nav a:hover, nav a[aria-current="page"] {
 		color: var(--nav-link-active-text-color);
 		background-color: var(--nav-link-active-bg-color);
 	}
+	
+	nav:hover a[aria-current="page"] {
+		color: var(--nav-text-color);
+		background-color: var(--nav-bg-color);
+	}
 
 	nav:hover a[aria-current="page"]:hover {
 		color: var(--nav-link-active-text-color);
 		background-color: var(--nav-link-active-bg-color);
 	}
-	
-	nav:hover a[aria-current="page"]:has(~ a:hover) {
-		color: var(--nav-text-color);
-		background-color: var(--nav-bg-color);
-	}
 }
 
 @media screen and (width <= 600px){
diff --git a/css/style.css b/css/style.css
index 3fe69bb..ad538d1 100644
--- a/css/style.css
+++ b/css/style.css
@@ -44,7 +44,7 @@ main, dialog {
 }
 
 main {
-	padding: 0 16px 16px 16px;
+	padding: 0 16px 16px;
 }
 
 .w3-card {
diff --git a/scripts/utils.js b/scripts/utils.js
index 1df55e2..bb410a9 100644
--- a/scripts/utils.js
+++ b/scripts/utils.js
@@ -231,7 +231,7 @@ async function request (url, content) {
 		}
 	}
 	catch (error) {
-		return {status: 400, error: error};
+		return { status: 400, error };
 	}
 }
 
diff --git a/settings.html b/settings.html
index 409b8d2..4b5de2c 100644
--- a/settings.html
+++ b/settings.html
@@ -44,7 +44,7 @@
 			</nav>
 		</header>
 		<main>
-			<section class="w3-container">
+			<section>
 				<h2>Settings</h2>
 				<form id = "settings">
 					<div class="w3-card w3-padding">