WIP

assets/css/bobastyle.css

@@ -295,15 +295,28 @@ body {
   margin: 0;
 }
 
-.main-container {
+.body-module {
-  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);
+.body-module--marginless {
-  max-width: calc(720px + 2 * var(--page-margin)); /* padding is included in the element's width */
+  margin: 0;
+}
+
+.body-module--full-width {
+  margin: 0 var(--page-margin);
+  /*
+  margin-left: var(--page-margin);
+  margin-right: var(--page-margin);
+  */
+}
+.body-module--wide {
+  margin-left: var(--page-margin);
+  margin-right: var(--page-margin);
+  max-width: 720px;
 }
 
 footer {
-  margin: var(--page-margin) 0;
+  margin-bottom: var(--page-margin);
   text-align: center;
   font-size: smaller;
 }
@@ -376,10 +389,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 body-module--wide breadcrumb" aria-label="{{ i18n "aria_breadcrumbnav" }}">
     <ul>
         {{ template "breadcrumbnav" (dict "p1" . "p2" .) }}
     </ul>

layouts/_partials/top.html

@@ -1,4 +1,4 @@
-<header class="top">
+<header class="body-module body-module--marginless top">
     <div class="brand">
         <a href="{{ .Site.Home.Permalink | absLangURL }}">
             {{ .Site.Title | markdownify }}

layouts/baseof.html

@@ -8,19 +8,24 @@
 
         {{ partial "top.html" . }}
 
-        <div class="main-container">
         {{ if not .IsHome }}
             {{ partial "breadcrumb.html" . }}
         {{ end }}
 
+        {{ 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" . }}
+            {{/* currently this is only used for related posts */}}
+        {{ end }}
+
         {{ if or .Site.Copyright .Site.Params.footer }}
-                <footer>
+            <footer class="body-module body-module--wide">
                 {{ with .Site.Copyright }}
                     {{ . | safeHTML }}
                 {{ end }}
@@ -30,11 +35,6 @@
                 {{ end }}
             </footer>
         {{ end }}
-        </div>
-
-        {{ block "post-body" . }}
-            {{/* currently this is only used for related posts */}}
-        {{ end }}
     </body>
 
 </html>

layouts/home.html

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

layouts/page.html

@@ -1,4 +1,5 @@
 {{ define "main" }}
+    <article class="body-module body-module--wide">
         <div class="page-title">
             <h1>
                 {{ .Title | markdownify }}
@@ -69,13 +70,14 @@
                 {{ partial "comments.html" . }}
             </div>
         {{ end }}
+    </article>
 {{ end }}
 
 
 {{ define "post-body" }}
     {{ $related := .Site.RegularPages.Related . | first 10 }}
     {{ with $related }}
-        <div class="related-posts">
+        <div class="related-posts body-module body-module--full-width">
             <hr>
             <h1>{{ i18n "related_posts" }}</h1>
             {{ partial "page-list.html" . }}