WIP

assets/css/bobastyle.css

@@ -295,15 +295,35 @@ body {
   margin: 0;
 }
 
-.main-container {
+/* body-module types:
-  margin: var(--page-margin) auto;
+ *
-  /* use padding because otherwise there's no way to have margin be both auto, and a minimum value */
+ * full-width: no max-width, no margin from the sides of the page
-  padding: 0 var(--page-margin);
+ * full-padded: no max-width, but has margin from the left/right page edges
-  max-width: calc(720px + 2 * var(--page-margin)); /* padding is included in the element's width */
+ * 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);
+}
+
+.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: var(--page-margin) 0;
+  margin-bottom: var(--page-margin);
   text-align: center;
   font-size: smaller;
 }
@@ -376,10 +396,6 @@ footer p {
 
 /* 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/authors/list.html

@@ -1,24 +1,26 @@
 {{ define "main" }}
-    <h1>
+    <section class="body-module--center">
-        {{ partial "icon.html" "user-circle" }}
+        <h1>
-        {{ .Title | markdownify }}
+            {{ partial "icon.html" "user-circle" }}
-    </h1>
+            {{ .Title | markdownify }}
+        </h1>
 
-    {{ with .Content }}
+        {{ with .Content }}
-        {{ . }}
+            {{ . }}
-    {{ end }}
-
-    <div class="page-list">
-        {{ with .Paginator.Pages }}
-            {{ range . }}
-                <article class="page">
-                    {{ .Render "summary" }}
-                </article>
-            {{ end }}
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
         {{ end }}
-    </div>
+
+        <div class="page-list">
+            {{ with .Paginator.Pages }}
+                {{ range . }}
+                    <article class="page">
+                        {{ .Render "summary" }}
+                    </article>
+                {{ end }}
+            {{ else }}
+                <div>
+                    {{ i18n "no_posts" }}
+                </div>
+            {{ end }}
+        </div>
+    </section>
 {{ end }}

layouts/baseof.html

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

layouts/home.html

@@ -1,13 +1,15 @@
 {{ define "main" }}
     {{ with .Content }}
-        <article class="homepage-content">
+        <article class="body-module--center">
             {{ . }}
         </article>
-        <hr>
+        <hr class="body-module--center">
     {{ end }}
+{{ end }}
 
+{{ define "post-body" }}
     {{ if .Site.Params.homepageLatestPosts }}
-        <div class="homepage-latest-posts">
+        <div class="body-module--center">
             <h1>
                 {{ i18n "latest_posts" }}
                 {{ partial "rss-link.html" . }}

layouts/page.html

@@ -1,81 +1,83 @@
 {{ define "main" }}
-    <div class="page-title">
+    <article class="body-module--center">
-        <h1>
+        <div class="page-title">
-            {{ .Title | markdownify }}
+            <h1>
-            {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
+                {{ .Title | markdownify }}
-        </h1>
+                {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
-    </div>
+            </h1>
+        </div>
 
-    {{ partial "page-metadata/post-full.html" . }}
+        {{ partial "page-metadata/post-full.html" . }}
-    {{ partial "series-box.html" . }}
+        {{ partial "series-box.html" . }}
 
-    {{ if .Params.Toc }}
+        {{ if .Params.Toc }}
-        <div class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
+            <div class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
-            <details>
+                <details>
-                <summary>{{ i18n "table_of_contents" }}</summary>
+                    <summary>{{ i18n "table_of_contents" }}</summary>
+                    {{ .TableOfContents }}
+                </details>
+            </div>
+            <div class="table-of-contents print">
+                {{ i18n "table_of_contents" }}
                 {{ .TableOfContents }}
-            </details>
+            </div>
-        </div>
+        {{ end }}
-        <div class="table-of-contents print">
-            {{ i18n "table_of_contents" }}
-            {{ .TableOfContents }}
-        </div>
-    {{ end }}
 
-    {{ partial "feature-figure.html" . }}
+        {{ partial "feature-figure.html" . }}
 
-    <article class="post-content" data-pagefind-body>
+        <article class="post-content" data-pagefind-body>
-        {{ .Content }}
+            {{ .Content }}
+        </article>
+
+        {{ partial "series-box.html" . }}
+
+        {{ if or .NextInSection .PrevInSection }}
+            <div class="prevnext">
+                {{ with .NextInSection }}
+                    <a class="prev" href="{{ .Permalink }}">
+                        <div class="prev-caption">
+                            &larr; {{ i18n "newer_post" }}
+                        </div>
+                        <div class="prev-post">
+                            {{ .Title | markdownify }}
+                        </div>
+                    </a>
+                {{ else }}
+                    <div class="prev"></div>
+                {{ end }}
+
+                {{ with .PrevInSection }}
+                    <a class="next" href="{{ .Permalink }}">
+                        <div class="next-caption">
+                            {{ i18n "older_post" }} &rarr;
+                        </div>
+                        <div class="next-post">
+                            {{ .Title | markdownify }}
+                        </div>
+                    </a>
+                {{ else }}
+                    <div class="next"></div>
+                {{ end }}
+            </div>
+        {{ end }}
+
+        {{ if .Site.Params.shareButtons }}
+            {{ partial "share.html" . }}
+        {{ end }}
+
+        {{ if .Params.comments }}
+            <div class="comments">
+                {{ partial "comments.html" . }}
+            </div>
+        {{ end }}
     </article>
-
-    {{ partial "series-box.html" . }}
-
-    {{ if or .NextInSection .PrevInSection }}
-        <div class="prevnext">
-            {{ with .NextInSection }}
-                <a class="prev" href="{{ .Permalink }}">
-                    <div class="prev-caption">
-                        &larr; {{ i18n "newer_post" }}
-                    </div>
-                    <div class="prev-post">
-                        {{ .Title | markdownify }}
-                    </div>
-                </a>
-            {{ else }}
-                <div class="prev"></div>
-            {{ end }}
-
-            {{ with .PrevInSection }}
-                <a class="next" href="{{ .Permalink }}">
-                    <div class="next-caption">
-                        {{ i18n "older_post" }} &rarr;
-                    </div>
-                    <div class="next-post">
-                        {{ .Title | markdownify }}
-                    </div>
-                </a>
-            {{ else }}
-                <div class="next"></div>
-            {{ end }}
-        </div>
-    {{ end }}
-
-    {{ if .Site.Params.shareButtons }}
-        {{ partial "share.html" . }}
-    {{ end }}
-
-    {{ if .Params.comments }}
-        <div class="comments">
-            {{ partial "comments.html" . }}
-        </div>
-    {{ end }}
 {{ end }}
 
 
 {{ 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" . }}