Merge branch 'redesign'

layouts/partials/development/page_info.html

@@ -0,0 +1,11 @@
+{{ if not hugo.IsProduction }}
+<div class="platter" id="debug-page-info">
+    <details>
+        <summary>Debug Page Info</summary>
+        <table>
+        <tr><td>.Section</td><td>{{ .Section }}</td></tr>
+        <tr><td>.Type</td><td>{{ .Type }}</td></tr>
+        </table>
+    </details>
+</div>
+{{ end }}

layouts/partials/footer.html

@@ -1,4 +1,10 @@
-<footer class="footer">
-  <p class="slogans"><span>Trans rights are human rights.</span> <span>Black lives matter.</span> <span>Get vaccinated.</span></p>
-  <p>Copyright © <time datetime="{{ now.Year }}">{{ now.Year }}</time> <a href="{{ `` | absURL }}">Eryn Wells</a></p>
+<footer class="site">
+  <div>
+    <ul class="slogans">
+      <li>Trans rights are human rights.</li>
+      <li>Black lives matter.</li>
+      <li>Get vaccinated.</li>
+    </ul>
+    <p>Copyright © <time datetime="{{ now.Year }}">{{ now.Year }}</time> <a href="{{ `` | absURL }}">Eryn Wells</a></p>
+  </div>
 </footer>

layouts/partials/head.html

@@ -13,22 +13,6 @@
   <meta name="author" content="{{ site.Author.name }}">
   {{ end }}
 
-  <link rel="preload stylesheet" as="style" href="{{ `/styles/main.css` | absURL }}">
-  {{ if or (eq .Kind "list") (eq .Kind "term") }}
-  <link rel="preload stylesheet" as="style" href="{{ `styles/list.css` | absURL }}">
-  {{ end }}
-  {{ if and .IsPage (.Page.Scratch.Get "includes_railroad_diagram") }}
-  <link rel="preload stylesheet" as="style" href="{{ `styles/railroad.css` | absURL }}">
-  {{ end }}
-  {{ range $stylesheet := .Resources.Match "*.css" }}
-  <link rel="preload stylesheet" as="style" href="{{ $stylesheet.Permalink }}">
-  {{ end }}
-  {{ if in (.Site.BaseURL | string) "localhost" }}
-  <link rel="preload stylesheet" as="style" href="/styles/development.css">
-  {{ end }}
-  {{ if .IsPage }}
-  <link rel="preload stylesheet" as="style" href="{{ `styles/monokai.css` | absURL }}">
-  {{ end }}
 
   {{ range $.Scratch.Get "social-list" }}
   <link rel="preload" as="image" href="{{ printf `%s.svg` . | absURL }}">
@@ -43,6 +27,7 @@
   <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink }}" title="{{ site.Title }}">
   {{ end }}
 
+  <!-- Misc -->
   {{ if or hugo.IsProduction (eq site.Params.env "production") }}
   {{ template "_internal/schema.html" . }}
   {{ template "_internal/twitter_cards.html" . }}

layouts/partials/header.html

@@ -1,27 +1,31 @@
-<header class="header">
-  <div class="title-and-menu">
-    <h1><a class="site-name" href="{{ `` | absURL }}">Eryn Wells</a></h1>
+<header class="site">
+  <div class="platter">
+    <div class="grid">
+      <h1 class="site">
+        <a class="site-name" href="{{ `` | absURL }}">Eryn Wells</a>
+      </h1>
 
-    {{ $url := .RelPermalink }}
-    {{ with site.Menus.main }}
-    <nav class="menu">
-      <menu>
-      {{ range . }}
-        <li><a class="{{ if eq .URL $url }}active{{ end }}" href="{{ .URL }}"><span>{{ .Name }}</span></a></li>
+      {{ $url := .RelPermalink }}
+      {{ with site.Menus.main }}
+      <nav class="site bulleted">
+        {{ range . }}
+          {{ if eq .URL $url }}
+          <li class="active"><span>{{ .Name }}</span></li>
+          {{ else }}
+          <li><a href="{{ .URL }}"><span>{{ .Name }}</span></a></li>
+          {{ end }}
+        {{ end }}
+      </nav>
       {{ end }}
-      </menu>
-    </nav>
-    {{ end }}
+
+      <nav class="site social">
+        <li><a style="--url: var(--twitter-icon)" href="https://twitter.com/erynofwales" target="_blank" aria-label="twitter"><span>tw</span></a></li>
+        <li><a style="--url: var(--github-icon)" href="https://github.com/erynofwales" target="_blank" aria-label="github"><span>gh</span></a></li>
+        <li><a style="--url: var(--instagram-icon)" href="https://instagram.com/erynofwales" target="_blank" aria-label="instagram"><span>ig</span></a></li>
+        {{ with .OutputFormats.Get "rss" }}
+        <li><a style="--url: var(--rss-icon)" href="{{ .RelPermalink }}" aria-label="rss"><span>rss</span></a></li>
+        {{ end }}
+      </nav>
+    </div>
   </div>
-
-  <nav class="social">
-    <menu>
-      <li><a style="--url: var(--twitter-icon)" href="https://twitter.com/erynofwales" target="_blank" aria-label="twitter"><span>tw</span></a></li>
-      <li><a style="--url: var(--github-icon)" href="https://github.com/erynofwales" target="_blank" aria-label="github"><span>gh</span></a></li>
-      <li><a style="--url: var(--instagram-icon)" href="https://instagram.com/erynofwales" target="_blank" aria-label="instagram"><span>ig</span></a></li>
-      {{ with .OutputFormats.Get "rss" }}
-      <li><a style="--url: var(--rss-icon)" href="{{ .RelPermalink }}" aria-label="rss"><span>rss</span></a></li>
-      {{ end }}
-    </menu>
-  </nav>
 </header>

layouts/partials/single_main.html

@@ -0,0 +1,37 @@
+<article class="post-single">
+  <header>
+    {{ partial "development/draft_tag.html" . }}
+    <div class="post-title">
+      <h1>{{ .Title }}</h1>
+      {{ if not (eq .Type "page") }}
+      <div class="post-date"><time>{{ .Date | time.Format "January 2, 2006" }}</time></div>
+      {{ end }}
+    </div>
+  </header>
+
+  <section class="post-content">
+    {{ .Content }}
+  </section>
+
+  <footer>
+    {{ if .Params.tags }}
+    <ul class="tags">
+    {{ range .Params.tags }} {{ $href := print (absURL "tags/") (urlize .) }}
+      <li><a href="{{ $href }}">{{ . }}</a></li>
+    {{ end }}
+    </ul>
+    {{ end }}
+
+    {{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
+    {{ if and (gt (len $pages) 1) (in $pages . ) }}
+    <nav class="post-nav">
+      {{ with $pages.Prev . }}
+      <a class="prev" href="{{ .Permalink }}"><span>←</span><span>{{ .Name }}</span></a>
+      {{ end }}
+      {{ with $pages.Next . }}
+      <a class="next" href="{{ .Permalink }}"><span>{{ .Name }}</span><span>→</span></a>
+      {{ end }}
+    </nav>
+  {{ end }}
+  </footer>
+</article>