From 3c865e366119084894b7241ff9bb071e0899811d Mon Sep 17 00:00:00 2001
From: SayaAndy <montferrat@tuta.io>
Date: Thu, 8 Jan 2026 22:48:03 +0700
Subject: feat: use floating sidebar for general pages if screen is wide enough
 feat: content stays wider with wider screens fix: problem with resizing
 content when galleries are in it ci: update checkout action from v4 to v6

---
 .github/workflows/build-and-deploy-prod.yml  |  2 +-
 .github/workflows/build-and-deploy-stage.yml |  2 +-
 views/layouts/general-page.html              | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml
index d57e872..413f402 100644
--- a/.github/workflows/build-and-deploy-prod.yml
+++ b/.github/workflows/build-and-deploy-prod.yml
@@ -12,7 +12,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Generate output.css with tailwindcss
         uses: ZoeyVid/tailwindcss-update@main
         with:
diff --git a/.github/workflows/build-and-deploy-stage.yml b/.github/workflows/build-and-deploy-stage.yml
index 16e6563..c6e222b 100644
--- a/.github/workflows/build-and-deploy-stage.yml
+++ b/.github/workflows/build-and-deploy-stage.yml
@@ -11,7 +11,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Generate output.css with tailwindcss
         uses: ZoeyVid/tailwindcss-update@main
diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html
index 97b412c..01043c6 100644
--- a/views/layouts/general-page.html
+++ b/views/layouts/general-page.html
@@ -172,9 +172,12 @@
 
     <div class="grow bg-split-left"></div>
 
-    <div class="flex flex-col [@media(max-height:32rem)]:flex-row">
-        <div id="sidebar" class="bg-sidebar flex sticky flex-col z-20 w-dvw xs:w-[90dvw] sm:w-[80dvw] md:w-[75dvw] lg:w-[70dvw] xl:w-[65dvw] 2xl:w-[60dvw] [@media(max-height:32rem)]:w-fit h-fit [@media(max-height:32rem)]:h-dvh shadow-[0_0_1rem_black]">
-            <div class="text-[3rem] flex flex-row [@media(max-height:32rem)]:flex-col gap-0 relative z-20">
+    <div class="flex flex-col sm:flex-row">
+        <div id="sidebar" class="bg-sidebar flex
+            flex-row sticky w-dvw h-fit xs:w-[90dvw]
+            sm:left-0 sm:flex-col sm:fixed sm:w-fit
+            z-20 shadow-[0_0_1rem_black]">
+            <div class="text-[3rem] flex flex-row sm:flex-col gap-0 relative z-20">
                 <a onclick="return changeUrl('/../', true);" href="./" id="sidebar-back-button" class="themed-button themed-button-sidebar w-fit h-fit hidden" draggable="false">
                     <i class="fas fa-circle-left flex w-18 h-18 content-center text-center text-sidebar"></i>
                 </a>
@@ -237,10 +240,10 @@
             </script>
         </div>
 
-        <div class="bg-background-dark @container/main flex z-10 w-dvw xs:w-[90dvw] sm:w-[80dvw] md:w-[75dvw] lg:w-[70dvw] xl:w-[65dvw] 2xl:w-[60dvw] grow-0 h-[calc(100dvh-5.1rem)] [@media(max-height:32rem)]:h-dvh shadow-[0_0_1rem_black]">
+        <div class="bg-background-dark @container/main flex z-10 w-dvw xs:w-[90dvw] sm:w-[85dvw] md:w-[80dvw] lg:w-[75dvw] xl:w-[70dvw] 2xl:w-[60dvw] 3xl:w-[50dvw] grow-0 h-[calc(100dvh-5rem)] sm:h-dvh shadow-[0_0_1rem_black]">
             <div class="bg-background-dark border-r-2 border-dashed border-main-hard"></div>
 
-            <div class="max-h-100% flex flex-col grow bg-background-dark relative pt-4 ml-8 pr-4">
+            <div class="max-h-full max-w-full flex flex-col grow bg-background-dark relative pt-4 ml-8 pr-4">
                 <div id="general-page-header" class="max-xs:hidden [@media(max-height:32rem)]:hidden flex flex-col basis-8"
                     hx-get="/api/v1/general-page/header{{ if .QueryString }}?{{ .QueryString }}{{ end }}" hx-trigger="load" hx-target="this" hx-swap="innerHTML">
                 </div>
-- 
cgit v1.3.1+13