assets/css/default: Merge micro-summary -> micro-card

4 files changed, 115 insertions, 123 deletions

diff --git a/themes/default/layouts/_default/home.xslt.rss.xsl b/themes/default/layouts/_default/home.xslt.rss.xsl
index f828f4f..1bde28d 100644
--- a/themes/default/layouts/_default/home.xslt.rss.xsl
+++ b/themes/default/layouts/_default/home.xslt.rss.xsl
@@ -69,31 +69,29 @@
           <main>
             <xsl:for-each select="/rss/channel/item">
               <micro-card>
-                <micro-summary>
-                  <micro-thumbnail>
-                    <figure>
-                      <a>
-                        <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
-                        <span>
-                          <object>
-                            <xsl:attribute name="title"><xsl:value-of select="atom:author/atom:name" /></xsl:attribute>
-                            <xsl:attribute name="data"><xsl:value-of select="atom:author/atom:uri" /></xsl:attribute>
-                            <xsl:value-of select="substring(atom:author/atom:name, 1, 1)" />
-                          </object>
-                        </span>
-                      </a>
-                    </figure>
-                  </micro-thumbnail>
-                  <article>
-                    <h2>
-                      <a>
-                        <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
-                        <xsl:value-of select="title" />
-                      </a>
-                    </h2>
-                    <small>Published: <xsl:value-of select="pubDate" /></small>
-                  </article>
-                </micro-summary>
+                <micro-thumbnail>
+                  <figure>
+                    <a>
+                      <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
+                      <span>
+                        <object>
+                          <xsl:attribute name="title"><xsl:value-of select="atom:author/atom:name" /></xsl:attribute>
+                          <xsl:attribute name="data"><xsl:value-of select="atom:author/atom:uri" /></xsl:attribute>
+                          <xsl:value-of select="substring(atom:author/atom:name, 1, 1)" />
+                        </object>
+                      </span>
+                    </a>
+                  </figure>
+                </micro-thumbnail>
+                <article>
+                  <h2>
+                    <a>
+                      <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
+                      <xsl:value-of select="title" />
+                    </a>
+                  </h2>
+                  <small>Published: <xsl:value-of select="pubDate" /></small>
+                </article>
               </micro-card>
             </xsl:for-each>
           </main>
diff --git a/themes/default/layouts/_default/section.following.html b/themes/default/layouts/_default/section.following.html
index f002d43..9e937c6 100644
--- a/themes/default/layouts/_default/section.following.html
+++ b/themes/default/layouts/_default/section.following.html
@@ -26,49 +26,47 @@
 
       <micro-author>
         <micro-card>
-          <micro-summary>
-            <micro-thumbnail>
-              <figure>
-                <a
-                  title="{{ $distinct.FeedName }}"
-                  href="{{ $href }}">
-                  <picture>
-                    <img
-                      width="64"
-                      height="64"
-                      alt="{{ $distinct.FeedName }}"
-                      src="{{ $.Site.BaseURL }}{{ $favicon }}"
-                    />
-                  </picture>
-                </a>
-              </figure>
-            </micro-thumbnail>
-            <micro-header>
-              <h2>
-                <b>{{ $distinct.FeedName }}</b>
-              </h2>
-              <h3>
-                <a
-                  data-hover
-                  title="{{ $distinct.FeedName }}"
-                  href="{{ $href }}">
-                  @{{ $distinct.FeedSourceDomain }}
-                </a>
-              </h3>
-              <time
-                data-type="default"
-                title="{{ $distinct.FeedDateTitle }}"
-                datetime="{{ $distinct.FeedDateTime }}">
-                {{ $distinct.FeedDate -}}
-              </time>
-            </micro-header>
-            <a
-              title="Follow {{ $distinct.FeedName }}"
-              href="{{ $href }}">
-              {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/rss.svg")) }}
-              <header>Follow</header>
-            </a>
-          </micro-summary>
+          <micro-thumbnail>
+            <figure>
+              <a
+                title="{{ $distinct.FeedName }}"
+                href="{{ $href }}">
+                <picture>
+                  <img
+                    width="64"
+                    height="64"
+                    alt="{{ $distinct.FeedName }}"
+                    src="{{ $.Site.BaseURL }}{{ $favicon }}"
+                  />
+                </picture>
+              </a>
+            </figure>
+          </micro-thumbnail>
+          <micro-header>
+            <h2>
+              <b>{{ $distinct.FeedName }}</b>
+            </h2>
+            <h3>
+              <a
+                data-hover
+                title="{{ $distinct.FeedName }}"
+                href="{{ $href }}">
+                @{{ $distinct.FeedSourceDomain }}
+              </a>
+            </h3>
+            <time
+              data-type="default"
+              title="{{ $distinct.FeedDateTitle }}"
+              datetime="{{ $distinct.FeedDateTime }}">
+              {{ $distinct.FeedDate -}}
+            </time>
+          </micro-header>
+          <a
+            title="Follow {{ $distinct.FeedName }}"
+            href="{{ $href }}">
+            {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/rss.svg")) }}
+            <header>Follow</header>
+          </a>
         </micro-card>
       </micro-author>
 
diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html
index c761aa8..7c9397c 100644
--- a/themes/default/layouts/_default/summary.html
+++ b/themes/default/layouts/_default/summary.html
@@ -7,18 +7,16 @@
   {{ if .Draft }}draft{{ end }}
   {{ if .ExpiryDate }}data-expires{{ end }}
 >
-  <micro-summary>
-    <micro-metadata>
-      <micro-thumbnail>
-        {{ partial "profile-picture.html" . }}
-      </micro-thumbnail>
-      {{ partial "card-meta-header.html" . }}
-    </micro-metadata>
-    <article aria-label="article">
-      {{- $content -}}
-      <micro-tags>
-        {{- partial "tags.html" (dict "Format" "page" "Context" .) -}}
-      </micro-tags>
-    </article>
-  </micro-summary>
+  <micro-metadata>
+    <micro-thumbnail>
+      {{ partial "profile-picture.html" . }}
+    </micro-thumbnail>
+    {{ partial "card-meta-header.html" . }}
+  </micro-metadata>
+  <article aria-label="article">
+    {{- $content -}}
+    <micro-tags>
+      {{- partial "tags.html" (dict "Format" "page" "Context" .) -}}
+    </micro-tags>
+  </article>
 </micro-card>
diff --git a/themes/default/layouts/partials/author-card.html b/themes/default/layouts/partials/author-card.html
index 6b4b91b..70ec252 100644
--- a/themes/default/layouts/partials/author-card.html
+++ b/themes/default/layouts/partials/author-card.html
@@ -38,46 +38,44 @@
 
 <micro-author>
   <micro-card>
-    <micro-summary>
-      <micro-thumbnail>
-        <figure>
-          <a title="{{ .Data.name }}" href="{{ "" | absURL }}/{{ .Data.user }}/">
-            <picture>
-              {{- with $sourceset -}}
-               <source srcset="{{ print ("" | absURL) $sourceset }}" type="image/webp" />
-              {{- end -}}
-              <img
-                width="{{ or $width "64" }}"
-                height="{{ or $height "64" }}"
-                src="{{ print ("" | absURL) $source }}"
-                alt="{{ $alternate }}"
-              />
-            </picture>
-          </a>
-        </figure>
-      </micro-thumbnail>
-      <micro-header>
-        <h2>
-          <b>{{ .Data.name }}</b>
-        </h2>
-        <h3>
-          <a data-hover="" title="{{ .Data.name }}" href="{{ "" | absURL }}/{{ .Data.user }}/">
-            {{ .Data.user }}@{{ $host }}
-          </a>
-        </h3>
-        <time
-          data-type="default"
-          title="{{ .Date | time.Format "Monday January 2 2006 at 15:04:05 MST" }}"
-          datetime="{{ .Date | time.Format "2006-01-02T15:04:05Z" }}"
-        >
-          {{ $date }}
-        </time>
-      </micro-header>
-      <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")) }}
-        <header>Follow</header>
-      </a>
-    </micro-summary>
+    <micro-thumbnail>
+      <figure>
+        <a title="{{ .Data.name }}" href="{{ "" | absURL }}/{{ .Data.user }}/">
+          <picture>
+            {{- with $sourceset -}}
+             <source srcset="{{ print ("" | absURL) $sourceset }}" type="image/webp" />
+            {{- end -}}
+            <img
+              width="{{ or $width "64" }}"
+              height="{{ or $height "64" }}"
+              src="{{ print ("" | absURL) $source }}"
+              alt="{{ $alternate }}"
+            />
+          </picture>
+        </a>
+      </figure>
+    </micro-thumbnail>
+    <micro-header>
+      <h2>
+        <b>{{ .Data.name }}</b>
+      </h2>
+      <h3>
+        <a data-hover="" title="{{ .Data.name }}" href="{{ "" | absURL }}/{{ .Data.user }}/">
+          {{ .Data.user }}@{{ $host }}
+        </a>
+      </h3>
+      <time
+        data-type="default"
+        title="{{ .Date | time.Format "Monday January 2 2006 at 15:04:05 MST" }}"
+        datetime="{{ .Date | time.Format "2006-01-02T15:04:05Z" }}"
+      >
+        {{ $date }}
+      </time>
+    </micro-header>
+    <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")) }}
+      <header>Follow</header>
+    </a>
   </micro-card>
 </micro-author>