Merge b70d729283 into f65aca556d

assets/js/sidebar.js

@@ -1,5 +1,5 @@
 document.addEventListener("DOMContentLoaded", function () {
-  scrollToActiveItem();
+  restoreSidebarPosition();
   enableCollapsibles();
 });
 
@@ -16,21 +16,28 @@ function enableCollapsibles() {
   });
 }
 
-function scrollToActiveItem() {
+function saveSidebarPosition() {
   const sidebarScrollbar = document.querySelector("aside.sidebar-container > .hextra-scrollbar");
-  const activeItems = document.querySelectorAll(".sidebar-active-item");
+  if (sidebarScrollbar) {
-  const visibleActiveItem = Array.from(activeItems).find(function (activeItem) {
+    const scrollPosition = sidebarScrollbar.scrollTop;
-    return activeItem.getBoundingClientRect().height > 0;
+    sessionStorage.setItem('sidebarScrollPosition', scrollPosition);
-  });
-
-  if (!visibleActiveItem) {
-    return;
   }
-
-  const yOffset = visibleActiveItem.clientHeight;
-  const yDistance = visibleActiveItem.getBoundingClientRect().top - sidebarScrollbar.getBoundingClientRect().top;
-  sidebarScrollbar.scrollTo({
-    behavior: "instant",
-    top: yDistance - yOffset
-  });
 }
+
+function restoreSidebarPosition() {
+  const sidebarScrollbar = document.querySelector("aside.sidebar-container > .hextra-scrollbar");
+  if (sidebarScrollbar) {
+    const savedPosition = sessionStorage.getItem('sidebarScrollPosition');
+    
+    if (savedPosition !== null) {
+      sidebarScrollbar.scrollTo({
+        top: parseInt(savedPosition),
+        behavior: 'instant'
+      });
+    }
+
+    sidebarScrollbar.addEventListener('scroll', function() {
+      saveSidebarPosition();
+    });
+  }
+}

layouts/partials/navbar.html

@@ -42,7 +42,7 @@
 
         {{/* Display icon menu item */}}
         {{- if .Params.icon -}}
-          {{- $rel := cond (eq .Params.icon "mastodon") "noreferer me" "noreferer" }}
+          {{- $rel := cond (eq .Params.icon "mastodon") "noreferrer me" "noreferrer" }}
           <a class="hx-p-2 hx-text-current" {{ if $external }}target="_blank" rel="{{ $rel }}"{{ end }} href="{{ $link }}" title="{{ or (T .Identifier) .Name | safeHTML }}">
             {{- partial "utils/icon.html" (dict "name" .Params.icon "attributes" "height=24") -}}
             <span class="hx-sr-only">{{ or (T .Identifier) .Name | safeHTML }}</span>
@@ -53,7 +53,7 @@
           <a
             title="{{ or (T .Identifier) .Name | safeHTML }}"
             href="{{ $link }}"
-            {{ if $external }}target="_blank" rel="noreferer"{{ end }}
+            {{ if $external }}target="_blank" rel="noreferrer"{{ end }}
             class="hx-text-sm contrast-more:hx-text-gray-700 contrast-more:dark:hx-text-gray-100 hx-relative -hx-ml-2 hx-hidden hx-whitespace-nowrap hx-p-2 md:hx-inline-block {{ $activeClass }}"
           >
             <span class="hx-text-center">{{ or (T .Identifier) .Name | safeHTML }}</span>

layouts/partials/sidebar.html

@@ -160,7 +160,7 @@
       hx-text-gray-500 hover:hx-bg-gray-100 hover:hx-text-gray-900 contrast-more:hx-border contrast-more:hx-border-transparent contrast-more:hx-text-gray-900 contrast-more:hover:hx-border-gray-900 dark:hx-text-neutral-400 dark:hover:hx-bg-primary-100/5 dark:hover:hx-text-gray-50 contrast-more:dark:hx-text-gray-50 contrast-more:dark:hover:hx-border-gray-50
     {{- end -}}"
     href="{{ .link }}"
-    {{ if $external }}target="_blank" rel="noreferer"{{ end }}
+    {{ if $external }}target="_blank" rel="noreferrer"{{ end }}
   >
     {{- .title -}}
     {{- with .context }}

layouts/partials/toc.html

@@ -38,7 +38,7 @@
               {{- $editURL = urls.JoinPath $editURL $sourceDir $path -}}
             {{- end -}}
           {{- end -}}
-          <a class="hx-text-xs hx-font-medium hx-text-gray-500 hover:hx-text-gray-900 dark:hx-text-gray-400 dark:hover:hx-text-gray-100 contrast-more:hx-text-gray-800 contrast-more:dark:hx-text-gray-50" href="{{ $editURL }}" target="_blank" rel="noreferer">{{ $editThisPage }}</a>
+          <a class="hx-text-xs hx-font-medium hx-text-gray-500 hover:hx-text-gray-900 dark:hx-text-gray-400 dark:hover:hx-text-gray-100 contrast-more:hx-text-gray-800 contrast-more:dark:hx-text-gray-50" href="{{ $editURL }}" target="_blank" rel="noreferrer">{{ $editThisPage }}</a>
         {{- end -}}
         {{/* Scroll To Top */}}
         <button aria-hidden="true" id="backToTop" onClick="scrollUp();" class="hx-transition-all hx-duration-75 hx-opacity-0 hx-text-xs hx-font-medium hx-text-gray-500 hover:hx-text-gray-900 dark:hx-text-gray-400 dark:hover:hx-text-gray-100 contrast-more:hx-text-gray-800 contrast-more:dark:hx-text-gray-50">