From c8e542e883c8fec8b4a101bcd55c4d771b377e80 Mon Sep 17 00:00:00 2001
From: SayaAndy <montferrat@tuta.io>
Date: Sat, 3 Jan 2026 20:41:07 +0700
Subject: feat: nextstep-like buttons for toolbar

---
 views/layouts/general-page.html | 32 +++++++++++++++++---------------
 views/pages/global-map.html     | 30 ++++++++++++++++--------------
 2 files changed, 33 insertions(+), 29 deletions(-)

(limited to 'views')

diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html
index fe6bc78..f9a30ef 100644
--- a/views/layouts/general-page.html
+++ b/views/layouts/general-page.html
@@ -173,23 +173,25 @@
     <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-20 h-20 [@media(max-height:32rem)]:h-dvh shadow-[0_0_1rem_black]">
+        <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] text-stroke-(--sidebar-stroke-color) text-stroke-[0.1dvw] flex flex-row [@media(max-height:32rem)]:flex-col gap-0 relative z-20">
-                <a href="./" id="sidebar-back-button" class="w-20 h-20 hidden">
-                    <i onclick="return changeUrl('/../', true);" class="fas fa-circle-left flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+                <a href="./" id="sidebar-back-button" class="toolbar-button w-fit h-fit hidden" draggable="false">
+                    <i onclick="return changeUrl('/../', true);" class="fas fa-circle-left flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg select-none"></i>
                 </a>
-                <a href="/{{ .Lang }}" id="sidebar-home-button" class="w-20 h-20 hidden">
-                    <i onclick="return changeUrl('/{{ .Lang }}');" class="fas fa-home flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+                <a href="/{{ .Lang }}" id="sidebar-home-button" class="toolbar-button w-fit h-fit hidden" draggable="false">
+                    <i onclick="return changeUrl('/{{ .Lang }}');" class="fas fa-home flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg select-none"></i>
                 </a>
-                <a href="/{{ .Lang }}/blog" id="sidebar-blog-button" class="w-20 h-20 hidden">
-                    <i onclick="return changeUrl('/{{ .Lang }}/blog');" class="fas fa-search flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+                <a href="/{{ .Lang }}/blog" id="sidebar-blog-button" class="toolbar-button w-fit h-fit hidden" draggable="false">
+                    <i onclick="return changeUrl('/{{ .Lang }}/blog');" class="fas fa-search flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg select-none"></i>
                 </a>
-                <a href="/{{ .Lang }}/map" id="sidebar-map-button" class="w-20 h-20 hidden">
-                    <i class="fas fa-map flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+                <a href="/{{ .Lang }}/map" id="sidebar-map-button" class="toolbar-button w-fit h-fit hidden" draggable="false">
+                    <i class="fas fa-map flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg select-none"></i>
                 </a>
-                <i onclick="toggleThemeWheel();" id="sidebar-theme-button" class="fas fa-swatchbook flex w-20 h-20 content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 rounded-lg"></i>
-                <a href="/{{ .Lang }}/user" id="sidebar-user-button" class="w-20 h-20 hidden">
-                    <i onclick="return changeUrl('/{{ .Lang }}/user');" class="fas fa-user flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+                <div id="toolbar-theme-button" onclick="toggleThemeWheel();" class="toolbar-button w-fit h-fit" draggable="false">
+                    <i id="toolbar-theme-button-content" class="fas fa-swatchbook flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 rounded-lg select-none"></i>
+                </div>
+                <a href="/{{ .Lang }}/user" id="sidebar-user-button" class="toolbar-button w-fit h-fit hidden" draggable="false">
+                    <i onclick="return changeUrl('/{{ .Lang }}/user');" class="fas fa-user flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg select-none"></i>
                 </a>
             </div>
             <div class="theme-wheel" id="theme-wheel">
@@ -235,7 +237,7 @@
             </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-5rem)] [@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-[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 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">
@@ -310,7 +312,7 @@
 
     <script>
         const themeWheel = document.getElementById('theme-wheel');
-        const themeButton = document.getElementById('sidebar-theme-button');
+        const themeButton = document.getElementById('toolbar-theme-button');
         const themeIcons = document.querySelectorAll('.theme-icon');
         const themeWheelRadius = convertRemToPixels(6);
 
@@ -426,7 +428,7 @@
         themeWheel.addEventListener('mouseleave', hideThemeWheel);
 
         document.addEventListener('click', (e) => {
-            if (!themeWheel.contains(e.target) && e.target !== themeButton) {
+            if (!themeWheel.contains(e.target) && e.target !== themeButton && !e.target.classList.contains("toolbar-theme-button-content")) {
                 hideThemeWheel();
             }
         });
diff --git a/views/pages/global-map.html b/views/pages/global-map.html
index 306f442..c13a5f4 100644
--- a/views/pages/global-map.html
+++ b/views/pages/global-map.html
@@ -42,23 +42,25 @@
         }
     </script>
 
-    <div id="sidebar" class="bg-sidebar block fixed shadow-[0_0_0.4rem_black] z-1001 w-[5rem] h-auto">
+    <div id="sidebar" class="bg-sidebar block fixed shadow-[0_0_0.4rem_black] z-1001 w-fit h-auto">
         <div class="text-[3rem] text-stroke-(--sidebar-stroke-color) text-stroke-[0.1dvw] flex flex-col gap-0 relative z-1001">
-            <a href="./" class="w-[5rem] h-[5rem]">
-                <i class="fas fa-circle-left flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+            <a href="./" class="toolbar-button w-fit h-fit" draggable="false">
+                <i class="fas fa-circle-left flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
             </a>
-            <a href="/{{ .Lang }}" class="w-[5rem] h-[5rem]">
-                <i class="fas fa-home flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+            <a href="/{{ .Lang }}" class="toolbar-button w-fit h-fit" draggable="false">
+                <i class="fas fa-home flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
             </a>
-            <a href="/{{ .Lang }}/blog" class="w-[5rem] h-[5rem]">
-                <i class="fas fa-search flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+            <a href="/{{ .Lang }}/blog" class="toolbar-button w-fit h-fit" draggable="false">
+                <i class="fas fa-search flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
             </a>
-            <a href="/{{ .Lang }}/map" class="w-[5rem] h-[5rem]">
-                <i class="fas fa-map flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+            <a href="/{{ .Lang }}/map" class="toolbar-button w-fit h-fit" draggable="false">
+                <i class="fas fa-map flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
             </a>
-            <i onclick="toggleThemeWheel();" id="theme-button" class="fas fa-swatchbook flex w-[5rem] h-[5rem] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 rounded-lg"></i>
-            <a href="/{{ .Lang }}/user" id="sidebar-user-button" class="w-[5rem] h-[5rem]">
-                <i onclick="return changeUrl('/{{ .Lang }}/user');" class="fas fa-user flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
+            <div id="toolbar-theme-button" onclick="toggleThemeWheel();" class="toolbar-button w-fit h-fit" draggable="false">
+                <i id="toolbar-theme-button-content" class="fas fa-swatchbook flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 rounded-lg"></i>
+            </div>
+            <a href="/{{ .Lang }}/user" id="sidebar-user-button" class="toolbar-button w-fit h-fit" draggable="false">
+                <i onclick="return changeUrl('/{{ .Lang }}/user');" class="fas fa-user flex w-18 h-18 content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i>
             </a>
         </div>
         <div class="theme-wheel" id="theme-wheel">
@@ -79,7 +81,7 @@
 
     <script>
         const themeWheel = document.getElementById('theme-wheel');
-        const themeButton = document.getElementById('theme-button');
+        const themeButton = document.getElementById('toolbar-theme-button');
         const themeIcons = document.querySelectorAll('.theme-icon');
         const themeWheelRadius = convertRemToPixels(6);
 
@@ -195,7 +197,7 @@
         themeWheel.addEventListener('mouseleave', hideThemeWheel);
 
         document.addEventListener('click', (e) => {
-            if (!themeWheel.contains(e.target) && e.target !== themeButton) {
+            if (!themeWheel.contains(e.target) && e.target !== themeButton && !e.target.classList.contains("toolbar-theme-button-content")) {
                 hideThemeWheel();
             }
         });
-- 
cgit v1.3.1+13