From 55fa91d7f24a3cee6a42a3d2c64bc6f3df76a7dc Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Wed, 12 Oct 2022 19:44:46 -0400
Subject: themes/default/layouts/_default/summary: Use data-expires attribute

---
 assets/css/default.css                       |  1 -
 themes/default/layouts/_default/summary.html | 47 ++++++++++++++--------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/assets/css/default.css b/assets/css/default.css
index 4770202..8401235 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -782,7 +782,6 @@ column-middle {
 
 micro-card,
 micro-tags,
-micro-expires,
 micro-article {
   display: block;
 }
diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html
index 7ccaa12..e5b1154 100644
--- a/themes/default/layouts/_default/summary.html
+++ b/themes/default/layouts/_default/summary.html
@@ -1,31 +1,32 @@
 {{- $limit := gt .WordCount 75 -}}
 {{- if $limit -}}<input hidden type="checkbox" id="expand-{{ partial "card-id.html" . }}" />{{- end -}}
+
 <micro-card
   id="{{ partial "card-id.html" . }}"
   {{ if .Weight }}pinned{{ end }}
   {{ if $limit }}limit{{ end }}
+  {{ if .Draft }}draft{{ end }}
+  {{ if .ExpiryDate }}data-expires{{ end }}
 >
-  {{ if .ExpiryDate }}<micro-expires>{{ end }}
-    <micro-summary {{ if .Draft }}draft{{ end }} title="{{- partial "meta-title.html" . -}}">
-      <micro-thumbnail>
-        {{ partial "profile-picture.html" . }}
-      </micro-thumbnail>
-      <micro-content>
-        {{ if $limit }}
-          <micro-overlay>
-            <micro-expand>
-              <label for="expand-{{ partial "card-id.html" . }}">Click to Show</label>
-            </micro-expand>
-          </micro-overlay>
-        {{ end }}
-        <micro-metadata>
-          {{ partial "card-meta-header.html" . }}
-        </micro-metadata>
-        {{ if .Params.unsafe }}{{ partial "card-unsafe.html" "begin" }}{{ end }}
-          {{- partial "function-content.html" .Content | safeHTML -}}
-        {{ if .Params.unsafe }}{{ partial "card-unsafe.html" "end" }}{{ end }}
-        <micro-tags>{{ partial "meta-tags.html" . }}</micro-tags>
-      </micro-content>
-    </micro-summary>
-  {{ if .ExpiryDate }}</micro-expires>{{ end }}
+  <micro-summary title="{{- partial "meta-title.html" . -}}">
+    <micro-thumbnail>
+      {{ partial "profile-picture.html" . }}
+    </micro-thumbnail>
+    <micro-content>
+      {{ if $limit }}
+        <micro-overlay>
+          <micro-expand>
+            <label for="expand-{{ partial "card-id.html" . }}">Click to Show</label>
+          </micro-expand>
+        </micro-overlay>
+      {{ end }}
+      <micro-metadata>
+        {{ partial "card-meta-header.html" . }}
+      </micro-metadata>
+      {{ if .Params.unsafe }}{{ partial "card-unsafe.html" "begin" }}{{ end }}
+        {{- partial "function-content.html" .Content | safeHTML -}}
+      {{ if .Params.unsafe }}{{ partial "card-unsafe.html" "end" }}{{ end }}
+      <micro-tags>{{ partial "meta-tags.html" . }}</micro-tags>
+    </micro-content>
+  </micro-summary>
 </micro-card>
-- 
cgit v1.2.3