Merge TOC into page content

assets/page/main.html

@@ -66,4 +66,4 @@
 <script src="/_/page/sidebar-fab.js"></script>
 {{end}}
 
-{{define "sidebar"}}{{if .SidebarWidget}}{{.SidebarWidget}}{{end}}{{end}}
+{{define "aside"}}{{if .SidebarWidget}}<aside class="sidebar">{{.SidebarWidget}}</aside>{{end}}{{end}}

assets/page/sidebar-fab.js

@@ -1,8 +1,3 @@
-// Mobile: the right-rail FAB is stacked ABOVE the tree FAB and opens the right
-// rail (TOC + page widgets) in the full-viewport Overlay (overlay.js). It only
-// appears when the rail actually has content — runs after toc.js has had a
-// chance to populate the rail (script order in page/main.html), so an
-// otherwise-empty rail shows no FAB. Hidden on desktop by .fab CSS.
 document.addEventListener("DOMContentLoaded", function () {
   var aside = document.querySelector("aside.sidebar");
   if (!aside || !aside.children.length) return;

assets/page/toc.js

@@ -6,7 +6,7 @@ document.addEventListener("DOMContentLoaded", function () {
   if (headings.length < 2) return;
 
   var nav = document.createElement("nav");
-  nav.className = "toc panel panel-sidebar";
+  nav.className = "toc panel";
 
   var header = document.createElement("div");
   header.className = "panel-header";
@@ -28,7 +28,5 @@ document.addEventListener("DOMContentLoaded", function () {
   });
   nav.appendChild(list);
 
-  // Stack the TOC on top of any server-rendered widget(s) already in the rail.
-  var rail = document.querySelector("aside.sidebar");
-  rail.insertBefore(nav, rail.firstChild);
+  content.insertBefore(nav, content.firstChild);
 });