WIP

assets/css/bobastyle.css

@@ -295,20 +295,40 @@ body {
   margin: 0;
 }
 
-.main-container {
-  margin: var(--page-margin) auto;
-  /* use padding because otherwise there's no way to have margin be both auto, and a minimum value */
-  padding: 0 var(--page-margin);
-  max-width: calc(720px + 2 * var(--page-margin)); /* padding is included in the element's width */
+/* body-module types:
+ *
+ * full-width: no max-width, no margin from the sides of the page
+ * full-padded: no max-width, but has margin from the left/right page edges
+ * center: max-width 720px, centered when too large, padded when screen is narrow
+ */
+
+.body-module--full-width,
+.body-module--full-padded,
+.body-module--center-wide {
+  margin-block: var(--page-margin);
 }
 
-.site-footer {
-  margin: var(--page-margin) 0;
+.body-module--full-width {
+  margin-inline: 0;
+}
+.body-module-full-padded {
+  margin-inline: var(--page-margin);
+}
+.body-module--center {
+  margin-inline: auto;
+  /* add the minimum margin here because we are using auto for its centering */
+  padding-inline: var(--page-margin);
+  /* account for the padding being included in the element's calculated width */
+  max-width: calc(720px + 2 * var(--page-margin));
+}
+
+footer {
+  margin-bottom: var(--page-margin);
   text-align: center;
   font-size: smaller;
 }
 
-.site-footer p {
+footer p {
   margin: 0;
 }
 
@@ -376,10 +396,6 @@ body {
 
 /* Breadcrumb navigation {{{ */
 
-.breadcrumb {
-  margin: var(--page-margin) 0;
-}
-
 .breadcrumb ul {
   margin: 0;
   padding: 0;

layouts/_partials/breadcrumb.html

@@ -1,4 +1,4 @@
-<nav class="breadcrumb" aria-label="{{ i18n "aria_breadcrumbnav" }}">
+<nav class="body-module--center breadcrumb" aria-label="{{ i18n "aria_breadcrumbnav" }}">
     <ul>
         {{ template "breadcrumbnav" (dict "p1" . "p2" .) }}
     </ul>

layouts/_partials/page-metadata/post-full.html

@@ -1,5 +1,5 @@
 {{ if or .Date .Params.authors .Site.Params.readingtime .Site.Params.gitFileURL }}
-    <section class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
+    <div class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
         {{ if .Date }}
             <span class="page-metadata-item" aria-label="{{ i18n "aria_post_meta_date" }}">
                 {{ partial "icon.html" "calendar" }}
@@ -26,5 +26,5 @@
         {{ partial "page-metadata/item/categories.html" . }}
 
         {{ partial "page-metadata/item/tags.html" . }}
-    </section>
+    </div>
 {{ end }}

layouts/_partials/page-metadata/post-short.html

@@ -1,5 +1,5 @@
 {{ if or .Date .Params.authors .Site.Params.readingtime }}
-    <section class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
+    <div class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
         {{ if .Date }}
             <span class="page-metadata-item" aria-label="date">
                 {{ partial "icon.html" "calendar" }}
@@ -14,5 +14,5 @@
         {{ partial "page-metadata/item/series.html" . }}
         {{ partial "page-metadata/item/categories.html" . }}
         {{ partial "page-metadata/item/tags.html" . }}
-    </section>
+    </div>
 {{ end }}

layouts/_partials/share.html

@@ -1,4 +1,4 @@
-<section class="share-buttons">
+<div class="share-buttons">
     {{ if .Site.Params.shareButtons.twitter }}
         <a class="twitter-share"
            target="_blank"
@@ -66,4 +66,4 @@
             {{- partial "icon.html" "printer" -}}
         </a>
     {{ end }}
-</section>
+</div>

layouts/authors/list.html

@@ -1,7 +1,5 @@
 {{ define "main" }}
-    <section>
-        {{ if .Content }}<article>{{ end }}
-
+    <section class="body-module--center">
         <h1>
             {{ partial "icon.html" "user-circle" }}
             {{ .Title | markdownify }}
@@ -11,9 +9,7 @@
             {{ . }}
         {{ end }}
 
-        {{ if .Content }}</article>{{ end }}
-
-        <section class="page-list">
+        <div class="page-list">
             {{ with .Paginator.Pages }}
                 {{ range . }}
                     <article class="page">
@@ -25,6 +21,6 @@
                     {{ i18n "no_posts" }}
                 </div>
             {{ end }}
-        </section>
+        </div>
     </section>
 {{ end }}

layouts/baseof.html

@@ -8,32 +8,30 @@
 
         {{ partial "top.html" . }}
 
-        <div class="main-container">
-            {{ if not .IsHome }}
-                {{ partial "breadcrumb.html" . }}
-            {{ end }}
+        {{ if not .IsHome }}
+            {{ partial "breadcrumb.html" . }}
+        {{ end }}
 
-            <main id="main-content">
-                {{ block "main" . }}
-                    THIS TEXT SHOULD NOT SHOW. YUZSIQGHE (that string is so I can grep for it)
+        {{ block "pre-body" . }}{{ end }}
+
+        <main id="main-content">
+            {{ block "main" . }}
+                THIS TEXT SHOULD NOT SHOW. YUZSIQGHE (that string is so I can grep for it)
+            {{ end }}
+        </main>
+
+        {{ block "post-body" . }}{{ end }}
+
+        {{ if or .Site.Copyright .Site.Params.footer }}
+            <footer class="body-module--center">
+                {{ with .Site.Copyright }}
+                    {{ . | safeHTML }}
                 {{ end }}
-            </main>
 
-            {{ if or .Site.Copyright .Site.Params.footer }}
-                <footer class="site-footer">
-                    {{ with .Site.Copyright }}
-                        {{ . | safeHTML }}
-                    {{ end }}
-
-                    {{ with .Site.Params.footer }}
-                        {{ . | $.RenderString (dict "display" "block") }}
-                    {{ end }}
-                </footer>
-            {{ end }}
-        </div>
-
-        {{ block "post-body" . }}
-            {{/* currently this is only used for related posts */}}
+                {{ with .Site.Params.footer }}
+                    {{ . | $.RenderString (dict "display" "block") }}
+                {{ end }}
+            </footer>
         {{ end }}
     </body>
 

layouts/home.html

@@ -1,13 +1,15 @@
 {{ define "main" }}
     {{ with .Content }}
-        <article class="homepage-content">
+        <article class="body-module--center">
             {{ . }}
         </article>
+        <hr class="body-module--center">
     {{ end }}
+{{ end }}
 
+{{ define "post-body" }}
     {{ if .Site.Params.homepageLatestPosts }}
-        <hr>
-        <section class="homepage-latest-posts">
+        <div class="body-module--center">
             <h1>
                 {{ i18n "latest_posts" }}
                 {{ partial "rss-link.html" . }}
@@ -16,6 +18,6 @@
             {{ partial "page-list.html" (.Paginate .Site.RegularPages).Pages }}
 
             {{ partial "pagination.html" . }}
-        </section>
+        </div>
     {{ end }}
 {{ end }}

layouts/page.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-    <article>
+    <article class="body-module--center">
         <div class="page-title">
             <h1>
                 {{ .Title | markdownify }}
@@ -11,12 +11,12 @@
         {{ partial "series-box.html" . }}
 
         {{ if .Params.Toc }}
-            <section class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
+            <div class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
                 <details>
                     <summary>{{ i18n "table_of_contents" }}</summary>
                     {{ .TableOfContents }}
                 </details>
-            </section>
+            </div>
             <div class="table-of-contents print">
                 {{ i18n "table_of_contents" }}
                 {{ .TableOfContents }}
@@ -25,14 +25,14 @@
 
         {{ partial "feature-figure.html" . }}
 
-        <div class="post-content" data-pagefind-body>
+        <article class="post-content" data-pagefind-body>
             {{ .Content }}
-        </div>
+        </article>
 
         {{ partial "series-box.html" . }}
 
         {{ if or .NextInSection .PrevInSection }}
-            <nav class="prevnext">
+            <div class="prevnext">
                 {{ with .NextInSection }}
                     <a class="prev" href="{{ .Permalink }}">
                         <div class="prev-caption">
@@ -58,7 +58,7 @@
                 {{ else }}
                     <div class="next"></div>
                 {{ end }}
-            </nav>
+            </div>
         {{ end }}
 
         {{ if .Site.Params.shareButtons }}
@@ -66,9 +66,9 @@
         {{ end }}
 
         {{ if .Params.comments }}
-            <section class="comments">
+            <div class="comments">
                 {{ partial "comments.html" . }}
-            </section>
+            </div>
         {{ end }}
     </article>
 {{ end }}
@@ -77,7 +77,7 @@
 {{ define "post-body" }}
     {{ $related := .Site.RegularPages.Related . | first 10 }}
     {{ with $related }}
-        <div class="related-posts">
+        <div class="body-module--full-width related-posts">
             <hr>
             <h1>{{ i18n "related_posts" }}</h1>
             {{ partial "page-list.html" . }}

layouts/section.html

@@ -1,27 +1,25 @@
 {{ define "main" }}
-    <section>
-        <h1>
-            {{ with .Params.icon }}{{ partial "icon.html" . }}{{ end }}
-            {{ .Title | markdownify }}
-            {{ partial "rss-link.html" . }}
-        </h1>
+    <h1>
+        {{ with .Params.icon }}{{ partial "icon.html" . }}{{ end }}
+        {{ .Title | markdownify }}
+        {{ partial "rss-link.html" . }}
+    </h1>
 
-        {{ with .Content }}
-            {{ . }}
+    {{ with .Content }}
+        {{ . }}
+    {{ end }}
+
+    <div class="list-page-container">
+        {{ with .Sections }}
+            <div class="sections">
+                {{ range . }}
+                    {{ .Render "summary" }}
+                {{ end }}
+            </div>
         {{ end }}
 
-        <div class="list-page-container">
-            {{ with .Sections }}
-                <div class="sections">
-                    {{ range . }}
-                        {{ .Render "summary" }}
-                    {{ end }}
-                </div>
-            {{ end }}
+        {{ partial "page-list.html" .Paginator.Pages }}
+    </div>
 
-            {{ partial "page-list.html" .Paginator.Pages }}
-        </div>
-
-        {{ partial "pagination.html" . }}
-    </section>
+    {{ partial "pagination.html" . }}
 {{ end }}