FIX: sidebar scrollable in all schemes [22].

Not affix if sidebar taller then content (to prevent bottom jumping).
iissnan · Sep 28, 2017 · 1280837 · 1280837 · stevenjoezhang · Jul 3, 2020
1 parent 22569da
commit 1280837
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/source/js/src/schemes/pisces.js b/source/js/src/schemes/pisces.js
@@ -7,16 +7,21 @@ $(document).ready(function () {
 
   function initAffix () {
     var headerOffset = getHeaderOffset(),
-        footerOffset = getFooterOffset();
-
-    sidebarInner.affix({
-      offset: {
-        top: headerOffset - CONFIG.sidebar.offset,
-        bottom: footerOffset
-      }
-    });
-
-    setSidebarMarginTop(headerOffset).show();
+        footerOffset = getFooterOffset(),
+        sidebarHeight = $('#sidebar').height() + NexT.utils.getSidebarb2tHeight(),
+        contentHeight = $('#content').height();
+
+    // Not affix if sidebar taller then content (to prevent bottom jumping).
+    if (headerOffset + sidebarHeight < contentHeight) {
+      sidebarInner.affix({
+        offset: {
+          top: headerOffset - CONFIG.sidebar.offset,
+          bottom: footerOffset
+        }
+      });
+    }
+
+    setSidebarMarginTop(headerOffset).css({ 'margin-left': 'initial' });
   }
 
   function resizeListener () {