From e19bbe554ec89e57970aaeb532001306dbc52494 Mon Sep 17 00:00:00 2001
From: Rhiannon Morris <rhi@rhiannon.website>
Date: Tue, 4 Aug 2020 18:26:36 +0200
Subject: [PATCH] fix some markup bits

---
 make-pages/SinglePage.hs | 22 ++++++++++------------
 style/shiny/single.css   |  9 ++++++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs
index 254cee6..362489d 100644
--- a/make-pages/SinglePage.hs
+++ b/make-pages/SinglePage.hs
@@ -56,19 +56,17 @@ make' nsfw dir info@(Info {date, title, artist}) = [b|@0
         </a>
       </figure>
 
-      <section id=info>
+      <div id=info>
         $descSection
 
         $tagsList
 
         $linksList
-      </section>
+      </div>
     </main>
 
     <footer>
-      <nav id=back>
-        <a href=$@undir>back to gallery</a>
-      </nav>
+      <a href=$@undir>back to gallery</a>
     </footer>
   |]
   where
@@ -121,7 +119,7 @@ makeButtonBar title images =
     0 -> throw $ NoEligibleImages title
     1 -> ""
     _ -> [b|@0
-      <nav id=alts>
+      <nav id=alts aria-label="alternate versions">
         <ul class="buttonbar choice">
           $4.alts
         </ul>
@@ -147,12 +145,12 @@ altButton i (Image {label, path, nsfw, warning}) = [b|@4
 makeTags :: [Strict.Text] -> Builder
 makeTags tags =
   if null tags then "" else [b|@4
-    <section id=tags>
+    <nav id=tags class=info-section>
       <h2>tags</h2>
       <ul class=buttonbar>
         $8.tagList
       </ul>
-    </section>
+    </nav>
   |]
  where
   tagList = map makeTag tags
@@ -161,17 +159,17 @@ makeTags tags =
 extLinks :: [Link] -> Builder
 extLinks links =
   if null links then "" else [b|@4
-    <section id=links>
+    <nav id=links class=info-section>
       <h2>links</h2>
-      <ul class=buttonbar>
+      <ul class="buttonbar bb-links">
         $8.linkList
       </ul>
-    </section>
+    </nav>
   |]
   where linkList = map extLink links
 
 extLink :: Link -> Builder
-extLink (Link {title, url}) = [b|@6
+extLink (Link {title, url}) = [b|@8
     <li>
       <a href="$*url">
         $*title
diff --git a/style/shiny/single.css b/style/shiny/single.css
index 734e04a..e67ef82 100644
--- a/style/shiny/single.css
+++ b/style/shiny/single.css
@@ -75,13 +75,16 @@ body {
   content: url(../18_plus.svg);
 }
 
-#info section {
+#info {
+  max-width: 80%;
+  margin: auto;
+}
+
+.info-section {
   display: grid;
   grid-template-columns: 10% auto;
   grid-gap: 2em;
   align-items: baseline;
-  max-width: 80%;
-  margin: auto;
 }
 
 #info h2, #info ul, #info p {