From 4fd16c5a8e1fa2b0ef6abdd3085560f0d077a6d5 Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Mon, 6 Oct 2025 20:19:28 -0400
Subject: [PATCH 1/2] Fix main layout width when toggling sidebar

---
 css/style.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/css/style.css b/css/style.css
index d29f4fa3..0fe1b238 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1799,7 +1799,10 @@ body.sidebar-open #sidebarOverlay {
 
   #app {
     margin-left: var(--sidebar-width);
-    transition: margin-left 200ms ease;
+    width: calc(100vw - var(--sidebar-width));
+    max-width: calc(100vw - var(--sidebar-width));
+    box-sizing: border-box;
+    transition: margin-left 200ms ease, width 200ms ease;
   }
 
   body.sidebar-collapsed,

From 25e53c08e383f54ab36d137c70f0e33d52209cd1 Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Mon, 6 Oct 2025 20:30:36 -0400
Subject: [PATCH 2/2] Bump asset version for sidebar layout fix

---
 .../iframe_forms/iframe-application-form.html |  2 +-
 .../iframe_forms/iframe-bug-fix-form.html     |  2 +-
 .../iframe-content-appeals-form.html          |  2 +-
 .../iframe_forms/iframe-feedback-form.html    |  2 +-
 .../iframe_forms/iframe-request-form.html     |  2 +-
 config/asset-version.js                       |  2 +-
 css/style.css                                 |  5 +++-
 index.html                                    | 28 +++++++++----------
 8 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/components/iframe_forms/iframe-application-form.html b/components/iframe_forms/iframe-application-form.html
index 380f40e2..2b3693ac 100644
--- a/components/iframe_forms/iframe-application-form.html
+++ b/components/iframe_forms/iframe-application-form.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>bitvid Whitelist Application Form</title>
     <!-- Link to your main stylesheet -->
-    <link rel="stylesheet" href="../../css/style.css?v=2024.10.22" />
+    <link rel="stylesheet" href="../../css/style.css?v=2024.10.23" />
     <style>
       /* Override for form page to match modal field styling */
 
diff --git a/components/iframe_forms/iframe-bug-fix-form.html b/components/iframe_forms/iframe-bug-fix-form.html
index deb20533..0cfb7099 100644
--- a/components/iframe_forms/iframe-bug-fix-form.html
+++ b/components/iframe_forms/iframe-bug-fix-form.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>bitvid Bug Report Form</title>
     <!-- Link to your main stylesheet -->
-    <link rel="stylesheet" href="../../css/style.css?v=2024.10.22" />
+    <link rel="stylesheet" href="../../css/style.css?v=2024.10.23" />
     <style>
       /* Override for form page to match modal field styling */
 
diff --git a/components/iframe_forms/iframe-content-appeals-form.html b/components/iframe_forms/iframe-content-appeals-form.html
index 0c36a83c..c246acd7 100644
--- a/components/iframe_forms/iframe-content-appeals-form.html
+++ b/components/iframe_forms/iframe-content-appeals-form.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>bitvid Content Appeals Form</title>
     <!-- Link to your main stylesheet -->
-    <link rel="stylesheet" href="../../css/style.css?v=2024.10.22" />
+    <link rel="stylesheet" href="../../css/style.css?v=2024.10.23" />
     <style>
       /* Override for form page to match modal field styling */
 
diff --git a/components/iframe_forms/iframe-feedback-form.html b/components/iframe_forms/iframe-feedback-form.html
index 36805194..5b543011 100644
--- a/components/iframe_forms/iframe-feedback-form.html
+++ b/components/iframe_forms/iframe-feedback-form.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>bitvid General Feedback Form</title>
     <!-- Link to your main stylesheet -->
-    <link rel="stylesheet" href="../../css/style.css?v=2024.10.22" />
+    <link rel="stylesheet" href="../../css/style.css?v=2024.10.23" />
     <style>
       /* Override for form page to match modal field styling */
 
diff --git a/components/iframe_forms/iframe-request-form.html b/components/iframe_forms/iframe-request-form.html
index cdf3e6ae..963008d6 100644
--- a/components/iframe_forms/iframe-request-form.html
+++ b/components/iframe_forms/iframe-request-form.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>bitvid Feature Request Form</title>
     <!-- Link to your main stylesheet -->
-    <link rel="stylesheet" href="../../css/style.css?v=2024.10.22" />
+    <link rel="stylesheet" href="../../css/style.css?v=2024.10.23" />
     <style>
       /* Override for form page to match modal field styling */
 
diff --git a/config/asset-version.js b/config/asset-version.js
index 05edddf3..25b06b99 100644
--- a/config/asset-version.js
+++ b/config/asset-version.js
@@ -1 +1 @@
-export const ASSET_VERSION = "2024.10.22";
+export const ASSET_VERSION = "2024.10.23";
diff --git a/css/style.css b/css/style.css
index d29f4fa3..0fe1b238 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1799,7 +1799,10 @@ body.sidebar-open #sidebarOverlay {
 
   #app {
     margin-left: var(--sidebar-width);
-    transition: margin-left 200ms ease;
+    width: calc(100vw - var(--sidebar-width));
+    max-width: calc(100vw - var(--sidebar-width));
+    box-sizing: border-box;
+    transition: margin-left 200ms ease, width 200ms ease;
   }
 
   body.sidebar-collapsed,
diff --git a/index.html b/index.html
index 924a971b..d9a7347e 100644
--- a/index.html
+++ b/index.html
@@ -50,10 +50,10 @@
       so browsers pick up the latest sidebar markup and styling without
       hard-refreshing around CDN caches.
     -->
-    <script src="js/tracking.js?v=2024.10.22" defer></script>
-    <link href="css/tailwind.generated.css?v=2024.10.22" rel="stylesheet" />
-    <link href="css/style.css?v=2024.10.22" rel="stylesheet" />
-    <link href="css/markdown.css?v=2024.10.22" rel="stylesheet" />
+    <script src="js/tracking.js?v=2024.10.23" defer></script>
+    <link href="css/tailwind.generated.css?v=2024.10.23" rel="stylesheet" />
+    <link href="css/style.css?v=2024.10.23" rel="stylesheet" />
+    <link href="css/markdown.css?v=2024.10.23" rel="stylesheet" />
   </head>
   <body class="sidebar-collapsed">
     <!--
@@ -211,16 +211,16 @@
 
     <!-- Additional Scripts -->
     <!-- Bootstraps nostr-tools before other modules rely on nostrToolsReady -->
-      <script type="module" src="js/nostrToolsBootstrap.js?v=2024.10.22"></script>
-      <script type="module" src="js/config.js?v=2024.10.22"></script>
-      <script type="module" src="js/lists.js?v=2024.10.22"></script>
-      <script type="module" src="js/accessControl.js?v=2024.10.22"></script>
-      <script type="module" src="js/webtorrent.js?v=2024.10.22"></script>
-      <script type="module" src="js/nostr.js?v=2024.10.22"></script>
-    <script type="module" src="js/viewManager.js?v=2024.10.22"></script>
-    <script type="module" src="js/bootstrap.js?v=2024.10.22"></script>
-    <script type="module" src="js/disclaimer.js?v=2024.10.22"></script>
-    <script type="module" src="js/index.js?v=2024.10.22"></script>
+      <script type="module" src="js/nostrToolsBootstrap.js?v=2024.10.23"></script>
+      <script type="module" src="js/config.js?v=2024.10.23"></script>
+      <script type="module" src="js/lists.js?v=2024.10.23"></script>
+      <script type="module" src="js/accessControl.js?v=2024.10.23"></script>
+      <script type="module" src="js/webtorrent.js?v=2024.10.23"></script>
+      <script type="module" src="js/nostr.js?v=2024.10.23"></script>
+    <script type="module" src="js/viewManager.js?v=2024.10.23"></script>
+    <script type="module" src="js/bootstrap.js?v=2024.10.23"></script>
+    <script type="module" src="js/disclaimer.js?v=2024.10.23"></script>
+    <script type="module" src="js/index.js?v=2024.10.23"></script>
     <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.7.0/highlight.min.js"></script>
   </body>