From af9456193c6241345172128b8b947a613681b04f Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Fri, 8 Mar 2024 14:01:03 -0500
Subject: themes/default/layouts/partials: Merge meta

---
 themes/default/layouts/_default/home.xslt.rss.xsl      | 4 ++--
 themes/default/layouts/_default/section.following.html | 8 ++++----
 themes/default/layouts/_default/summary.html           | 8 +++-----
 themes/default/layouts/partials/author-card.html       | 8 ++++----
 themes/default/layouts/partials/card-meta-header.html  | 4 ++--
 themes/default/layouts/partials/menu-datetime.html     | 4 ++--
 themes/default/layouts/partials/menu-embed.html        | 4 ++--
 themes/default/layouts/partials/menu-markdown.html     | 4 ++--
 themes/default/layouts/partials/menu-permalink.html    | 4 ++--
 themes/default/layouts/partials/menu-plain.html        | 4 ++--
 themes/default/layouts/partials/meta-anchored.html     | 4 ++--
 themes/default/layouts/partials/meta-datetime.html     | 4 ++--
 themes/default/layouts/partials/meta-draft.html        | 4 ++--
 themes/default/layouts/partials/meta-expirydate.html   | 4 ++--
 themes/default/layouts/partials/meta-handle.html       | 4 ++--
 themes/default/layouts/partials/meta-name.html         | 4 ++--
 themes/default/layouts/partials/meta-readtime.html     | 4 ++--
 themes/default/layouts/partials/meta-unlisted.html     | 4 ++--
 themes/default/layouts/partials/meta-view.html         | 4 ++--
 themes/default/layouts/partials/meta-wordcount.html    | 4 ++--
 20 files changed, 45 insertions(+), 47 deletions(-)

(limited to 'themes/default/layouts')

diff --git a/themes/default/layouts/_default/home.xslt.rss.xsl b/themes/default/layouts/_default/home.xslt.rss.xsl
index af7bb63..587d119 100644
--- a/themes/default/layouts/_default/home.xslt.rss.xsl
+++ b/themes/default/layouts/_default/home.xslt.rss.xsl
@@ -70,7 +70,7 @@
           <main>
             <xsl:for-each select="/rss/channel/item">
               <micro-card>
-                <micro-thumbnail>
+                <header>
                   <figure>
                     <a>
                       <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
@@ -83,7 +83,7 @@
                       </span>
                     </a>
                   </figure>
-                </micro-thumbnail>
+                </header>
                 <article>
                   <h2>
                     <a>
diff --git a/themes/default/layouts/_default/section.following.html b/themes/default/layouts/_default/section.following.html
index 9e937c6..eb74049 100644
--- a/themes/default/layouts/_default/section.following.html
+++ b/themes/default/layouts/_default/section.following.html
@@ -26,7 +26,7 @@
 
       <micro-author>
         <micro-card>
-          <micro-thumbnail>
+          <header>
             <figure>
               <a
                 title="{{ $distinct.FeedName }}"
@@ -41,8 +41,8 @@
                 </picture>
               </a>
             </figure>
-          </micro-thumbnail>
-          <micro-header>
+          </header>
+          <article>
             <h2>
               <b>{{ $distinct.FeedName }}</b>
             </h2>
@@ -60,7 +60,7 @@
               datetime="{{ $distinct.FeedDateTime }}">
               {{ $distinct.FeedDate -}}
             </time>
-          </micro-header>
+          </article>
           <a
             title="Follow {{ $distinct.FeedName }}"
             href="{{ $href }}">
diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html
index 036efcd..e820b24 100644
--- a/themes/default/layouts/_default/summary.html
+++ b/themes/default/layouts/_default/summary.html
@@ -9,12 +9,10 @@
   {{ if .ExpiryDate }}data-expires{{ end }}
 >
   <a href="{{ $href }}"></a>
-  <micro-metadata>
-    <micro-thumbnail>
-      {{ partial "profile-picture.html" . }}
-    </micro-thumbnail>
+  <header>
+    {{ partial "profile-picture.html"  . }}
     {{ partial "card-meta-header.html" . }}
-  </micro-metadata>
+  </header>
   <article aria-label="article">
     {{- $content -}}
     <micro-tags>
diff --git a/themes/default/layouts/partials/author-card.html b/themes/default/layouts/partials/author-card.html
index 70ec252..65228cc 100644
--- a/themes/default/layouts/partials/author-card.html
+++ b/themes/default/layouts/partials/author-card.html
@@ -38,7 +38,7 @@
 
 <micro-author>
   <micro-card>
-    <micro-thumbnail>
+    <header>
       <figure>
         <a title="{{ .Data.name }}" href="{{ "" | absURL }}/{{ .Data.user }}/">
           <picture>
@@ -54,8 +54,8 @@
           </picture>
         </a>
       </figure>
-    </micro-thumbnail>
-    <micro-header>
+    </header>
+    <article>
       <h2>
         <b>{{ .Data.name }}</b>
       </h2>
@@ -71,7 +71,7 @@
       >
         {{ $date }}
       </time>
-    </micro-header>
+    </article>
     <p>{{ .Data.description | markdownify | plainify | htmlUnescape | truncate 60 "..." }}</p>
     <a title="Follow with RSS Reader" href="{{ "" | absURL }}/{{ .Data.user }}/rss.xml">
       {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/rss.svg")) }}
diff --git a/themes/default/layouts/partials/card-meta-header.html b/themes/default/layouts/partials/card-meta-header.html
index 5672972..72b67b8 100644
--- a/themes/default/layouts/partials/card-meta-header.html
+++ b/themes/default/layouts/partials/card-meta-header.html
@@ -1,4 +1,4 @@
-<header>
+<meta-data>
 
   {{- partial "meta-anchored.html" . -}}
 
@@ -22,4 +22,4 @@
 
   {{- partial "meta-expirydate.html" . -}}
 
-</header>
+</meta-data>
diff --git a/themes/default/layouts/partials/menu-datetime.html b/themes/default/layouts/partials/menu-datetime.html
index 5b2acf1..20ef50e 100644
--- a/themes/default/layouts/partials/menu-datetime.html
+++ b/themes/default/layouts/partials/menu-datetime.html
@@ -1,6 +1,6 @@
 {{- $href := print .Permalink -}}
 
-<micro-metadata-datetime>
+<meta-datetime>
   <a href="{{ $href }}">
     {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/calendar.svg")) -}}
     <time
@@ -19,4 +19,4 @@
       {{ .Date | time.Format "15:04 MST" -}}
     </time>
   </a>
-</micro-metadata-datetime>
+</meta-datetime>
diff --git a/themes/default/layouts/partials/menu-embed.html b/themes/default/layouts/partials/menu-embed.html
index 7890102..1b03d27 100644
--- a/themes/default/layouts/partials/menu-embed.html
+++ b/themes/default/layouts/partials/menu-embed.html
@@ -1,8 +1,8 @@
 {{- $href := print .Permalink -}}
 
-<micro-metadata-embed>
+<meta-embed>
   <a href="{{ print $href "embed.html" }}">
     {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/code.svg")) -}}
     <span>Embed</span>
   </a>
-</micro-metadata-embed>
+</meta-embed>
diff --git a/themes/default/layouts/partials/menu-markdown.html b/themes/default/layouts/partials/menu-markdown.html
index 7098fa5..6e54238 100644
--- a/themes/default/layouts/partials/menu-markdown.html
+++ b/themes/default/layouts/partials/menu-markdown.html
@@ -4,10 +4,10 @@
   {{- $href   := print .Site.BaseURL "/" (partial "function-paths.html").markdown $source -}}
   {{- $title  := .File.LogicalName -}}
 
-  <micro-metadata-source>
+  <meta-source>
     <a href="{{ $href }}" title="{{ $title }}">
       {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/square-letter-m.svg")) -}}
       <span>Markdown</span>
     </a>
-  </micro-metadata-source>
+  </meta-source>
 {{- end -}}
diff --git a/themes/default/layouts/partials/menu-permalink.html b/themes/default/layouts/partials/menu-permalink.html
index 2af4e8a..6f19559 100644
--- a/themes/default/layouts/partials/menu-permalink.html
+++ b/themes/default/layouts/partials/menu-permalink.html
@@ -1,11 +1,11 @@
 {{- $href := print .Permalink "#" (partial "card-id.html" .) -}}
 
-<micro-metadata-permalink>
+<meta-permalink>
   <a title="#{{ partial "card-id.html" . }}" href="{{ $href }}">
     {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/link.svg")) -}}
     <span>Permalink</span>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   </a>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-</micro-metadata-permalink>
+</meta-permalink>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/menu-plain.html b/themes/default/layouts/partials/menu-plain.html
index 3886945..3dee808 100644
--- a/themes/default/layouts/partials/menu-plain.html
+++ b/themes/default/layouts/partials/menu-plain.html
@@ -1,9 +1,9 @@
 {{- $href   := print .Permalink -}}
 {{- $plain  := print $href "index.txt" -}}
 
-<micro-metadata-plain>
+<meta-plain>
   <a href="{{ $plain }}">
     {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/notes.svg")) -}}
     <span>Plaintext</span>
   </a>
-</micro-metadata-plain>
+</meta-plain>
diff --git a/themes/default/layouts/partials/meta-anchored.html b/themes/default/layouts/partials/meta-anchored.html
index d19bcde..872f98e 100644
--- a/themes/default/layouts/partials/meta-anchored.html
+++ b/themes/default/layouts/partials/meta-anchored.html
@@ -1,5 +1,5 @@
 {{- if or .Weight .Params.Liked .Params.feed -}}
-  <micro-metadata-anchored>
+  <meta-anchored>
     {{- $author := .Section -}}
     {{- partial "meta-via.html" . -}}
 
@@ -20,5 +20,5 @@
        <span>Marked</span>
       </a>
     {{- end -}}
-  </micro-metadata-anchored>
+  </meta-anchored>
 {{- end -}}
diff --git a/themes/default/layouts/partials/meta-datetime.html b/themes/default/layouts/partials/meta-datetime.html
index 1dc50f3..e0329bb 100644
--- a/themes/default/layouts/partials/meta-datetime.html
+++ b/themes/default/layouts/partials/meta-datetime.html
@@ -1,4 +1,4 @@
-<micro-metadata-datetime
+<meta-datetime
 title="{{ .Date | time.Format "Posted: Monday January 2 2006 at 15:04:05 MST" }}
 {{ if .Lastmod.After .Date }}{{ .Lastmod | time.Format "Edited: Monday January 2 2006 at 15:04:05 MST" }}{{ end }}">
   {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/calendar.svg")) -}}
@@ -10,5 +10,5 @@ title="{{ .Date | time.Format "Posted: Monday January 2 2006 at 15:04:05 MST" }}
     <span>(edited)</span>
   {{- end -}}
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-</micro-metadata-datetime>
+</meta-datetime>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/meta-draft.html b/themes/default/layouts/partials/meta-draft.html
index 6fff438..d441b9a 100644
--- a/themes/default/layouts/partials/meta-draft.html
+++ b/themes/default/layouts/partials/meta-draft.html
@@ -1,5 +1,5 @@
 {{- if .Draft -}}
-  <micro-metadata-draft>
+  <meta-draft>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
     <em>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
@@ -11,5 +11,5 @@
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
     </em>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-  </micro-metadata-draft>
+  </meta-draft>
 {{- end -}}
diff --git a/themes/default/layouts/partials/meta-expirydate.html b/themes/default/layouts/partials/meta-expirydate.html
index 6eef09e..1feefd1 100644
--- a/themes/default/layouts/partials/meta-expirydate.html
+++ b/themes/default/layouts/partials/meta-expirydate.html
@@ -8,7 +8,7 @@
     {{- $title = print "Self destructed" " " $date -}}
   {{- end -}}
 
-  <micro-metadata-expiry
+  <meta-expiry
     title="{{ $title }}">
     {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/trash-2.svg")) -}}
     <time datetime= "{{- .ExpiryDate | time.Format "2006-01-02T15:04:05Z" -}}">
@@ -16,5 +16,5 @@
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
     </time>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-  </micro-metadata-expiry>
+  </meta-expiry>
 {{- end -}}
diff --git a/themes/default/layouts/partials/meta-handle.html b/themes/default/layouts/partials/meta-handle.html
index c738c6b..ee0cc50 100644
--- a/themes/default/layouts/partials/meta-handle.html
+++ b/themes/default/layouts/partials/meta-handle.html
@@ -11,7 +11,7 @@
   {{- $title = $.Params.feed.domain -}}
 {{- end -}}
 
-<micro-metadata-handle>
+<meta-handle>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   <a
     title="{{ $title }}"
@@ -21,5 +21,5 @@
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   </a>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-</micro-metadata-handle>
+</meta-handle>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/meta-name.html b/themes/default/layouts/partials/meta-name.html
index 44abdfc..7c2ca61 100644
--- a/themes/default/layouts/partials/meta-name.html
+++ b/themes/default/layouts/partials/meta-name.html
@@ -10,8 +10,8 @@
   {{- $title = $name -}}
 {{- end -}}
 
-<micro-metadata-name title="{{ $title }}">
+<meta-name title="{{ $title }}">
   <b><a href="{{ $href }}">{{ $name }}</a></b>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-</micro-metadata-name>
+</meta-name>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/meta-readtime.html b/themes/default/layouts/partials/meta-readtime.html
index 1af03e7..43b5303 100644
--- a/themes/default/layouts/partials/meta-readtime.html
+++ b/themes/default/layouts/partials/meta-readtime.html
@@ -4,9 +4,9 @@
   {{- $seconds = "1" -}}
 {{- end -}}
 
-<micro-metadata-readtime title="{{ $seconds }} second{{- if not (eq $seconds "1") -}}s{{- end }} to read">
+<meta-readtime title="{{ $seconds }} second{{- if not (eq $seconds "1") -}}s{{- end }} to read">
   {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/eye.svg")) }}
   <span>{{ $seconds }}s read</span>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-</micro-metadata-readtime>
+</meta-readtime>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/meta-unlisted.html b/themes/default/layouts/partials/meta-unlisted.html
index 827de3c..df67e4e 100644
--- a/themes/default/layouts/partials/meta-unlisted.html
+++ b/themes/default/layouts/partials/meta-unlisted.html
@@ -1,7 +1,7 @@
 {{- if .Params.Unlisted -}}
-  <micro-metadata-unlisted title="This message is off the record">
+  <meta-unlisted title="This message is off the record">
    {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/eye-off.svg")) -}}
    <span>unlisted</span>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-  </micro-metadata-unlisted>
+  </meta-unlisted>
 {{- end -}}
diff --git a/themes/default/layouts/partials/meta-view.html b/themes/default/layouts/partials/meta-view.html
index ea22d5d..33aee6b 100644
--- a/themes/default/layouts/partials/meta-view.html
+++ b/themes/default/layouts/partials/meta-view.html
@@ -1,6 +1,6 @@
 {{- $href := or .Params.Feed.link .Permalink -}}
 
-<micro-metadata-view>
+<meta-view>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   <a href="{{ $href }}" title="{{- partial "meta-title.html" . -}}">
     {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/external-link.svg")) -}}
@@ -8,5 +8,5 @@
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   </a>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-</micro-metadata-view>
+</meta-view>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/meta-wordcount.html b/themes/default/layouts/partials/meta-wordcount.html
index 5fd5451..b6ec95e 100644
--- a/themes/default/layouts/partials/meta-wordcount.html
+++ b/themes/default/layouts/partials/meta-wordcount.html
@@ -4,7 +4,7 @@
 {{- $overLimit := sub .WordCount $limit -}}
 {{- $bitCount  := lang.FormatNumberCustom 0 (len .Content) -}}
 
-<micro-metadata-wordcount
+<meta-wordcount
 title="
 {{- if $wordLimit -}}
   {{ $overLimit }} words over the limit
@@ -29,5 +29,5 @@ title="
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   </word-limit>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-</micro-metadata-wordcount>
+</meta-wordcount>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
-- 
cgit v1.2.3