themes/default/layouts/partials: Merge meta

2 files changed, 61 insertions, 60 deletions

diff --git a/assets/css/default-simple.css b/assets/css/default-simple.css
index 8485e28..6dbc040 100644
--- a/assets/css/default-simple.css
+++ b/assets/css/default-simple.css
@@ -10,7 +10,7 @@ column-base[position="right"]:hover {
   transition: 0.1s;
 }
 
-micro-card[id] micro-metadata,
+micro-card[id] > header,
 micro-card[id] article math-ml figcaption {
   display: block;
 }
@@ -35,9 +35,9 @@ micro-card[id] > article > :nth-last-child(2) {
 
 [data-kind="page"] micro-card[id]:first-child > a,
 micro-card[id] micro-tags,
-micro-card[id] > article footer:not(blockquote footer),
-micro-card[id] micro-metadata header,
-micro-card[id] > article figcaption {
+micro-card[id] > header meta-data,
+micro-card[id] > article figcaption,
+micro-card[id] > article footer:not(blockquote footer) {
   display: none;
 }
 
@@ -67,7 +67,7 @@ micro-card[id] article iframe,
 micro-card[id] article article,
 micro-card[id] article details,
 micro-card[id] article figcaption,
-micro-card[id] micro-thumbnail picture {
+micro-card[id] header picture {
   pointer-events: all;
   position: relative;
   z-index: 2;
diff --git a/assets/css/default.css b/assets/css/default.css
index cf106eb..1e3c6cf 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -626,9 +626,9 @@ a:hover {
 
 a:hover,
 menu:hover span,
-micro-metadata-view a:hover span,
-micro-metadata-draft a:hover span,
-micro-metadata-handle a:hover span {
+meta-view a:hover span,
+meta-draft a:hover span,
+meta-handle a:hover span {
   text-decoration-thickness: 0.15rem !important;
   text-decoration-color: inherit !important;
 }
@@ -1071,7 +1071,8 @@ micro-author micro-card {
   border: none;
 }
 
-micro-author micro-card > * {
+micro-author micro-card > *,
+micro-author micro-card > article {
   margin: 0 0.5rem;
 }
 
@@ -1082,38 +1083,38 @@ micro-author micro-card p:not(:last-child) {
   max-width: 20rem;
 }
 
-micro-author micro-header {
+micro-author article {
   flex: 1;
   min-width: 3rem;
 }
 
-micro-author micro-header h2 {
+micro-author article h2 {
   line-height: 1.25;
 }
 
-micro-author micro-header h3 {
+micro-author article h3 {
   font-weight: 400;
 }
 
-micro-author micro-thumbnail figure {
+micro-author micro-card header figure {
   margin: 0;
 }
 
-micro-thumbnail figure {
+micro-card header figure:first-child {
   margin: 0 0.75rem 0 0;
 }
 
-micro-thumbnail figure > a,
-micro-thumbnail figure > a:hover {
+micro-card header figure > a,
+micro-card header figure > a:hover {
   color: #000;
   display: block;
   text-decoration: none;
 }
 
 tag-card figure img,
-micro-thumbnail figure img,
-micro-thumbnail figure span,
-micro-thumbnail figure object {
+micro-card header figure img,
+micro-card header figure span,
+micro-card header figure object {
   border-radius: 100%;
   min-width: 3.5rem;
   min-height: 3.5rem;
@@ -1174,7 +1175,7 @@ micro-card article figure > a[data-orientation="landscape"] img {
   width: 100%;
 }
 
-micro-metadata {
+micro-card header {
   color: #444;
   color: var(--fade);
   display: flex;
@@ -1182,68 +1183,68 @@ micro-metadata {
   margin-bottom: 0.25rem;
 }
 
-micro-metadata h2 {
+micro-card header h2 {
   display: inline;
 }
 
-micro-metadata header {
+micro-card header meta-data {
   word-break: break-all;
   word-break: break-word;
 }
 
-micro-metadata header a {
+micro-card header meta-data a {
   color: inherit;
 }
 
-micro-metadata header > *:not(:last-child) {
+micro-card header meta-data > *:not(:last-child) {
   margin-right: 0.5rem;
 }
 
-micro-metadata header > *:hover {
+micro-card header meta-data > *:hover {
   color: #111;
   color: var(--foreground);
 }
 
-micro-metadata-expiry,
-micro-metadata-draft em,
-micro-metadata-wordcount word-limit em {
+meta-expiry,
+meta-draft em,
+meta-wordcount word-limit em {
   color: #8f0000;
   color: var(--danger);
   font-style: normal;
 }
 
-micro-metadata-draft em {
+meta-draft em {
   font-variant: all-small-caps;
 }
 
 profile-box footer svg,
-micro-metadata header svg {
+micro-card header meta-data svg {
   height: 1rem;
   width: 1rem;
   stroke-width: 0.105rem;
 }
 
-micro-metadata-unlisted {
+meta-unlisted {
   font-variant: all-small-caps;
 }
 
 s label,
 abbr[title],
-micro-metadata-expiry,
-micro-metadata-readtime,
-micro-metadata-datetime,
-micro-metadata-unlisted,
-micro-metadata-wordcount {
+meta-expiry,
+meta-readtime,
+meta-datetime,
+meta-unlisted,
+meta-wordcount {
   cursor: help;
 }
 
-micro-metadata-anchored {
+meta-anchored {
   display: flex;
   margin-bottom: 0.25rem;
   width: 100%;
 }
 
-micro-metadata-anchored > * {
+meta-anchored > * {
   margin-right: 0.5rem;
   display: flex;
   flex-wrap: wrap;
@@ -1251,15 +1252,15 @@ micro-metadata-anchored > * {
   text-decoration: none;
 }
 
-micro-metadata-anchored svg {
+meta-anchored svg {
   margin-right: 0.25rem;
 }
 
-micro-metadata-anchored a[data-anchored="pinned"] svg {
+meta-anchored a[data-anchored="pinned"] svg {
   fill: #9ed1fa;
 }
 
-micro-metadata-anchored a[data-anchored="marked"] svg {
+meta-anchored a[data-anchored="marked"] svg {
   fill: #cd5c5c;
 }
 
@@ -1296,24 +1297,24 @@ micro-card[id] article h3 a {
   color: inherit;
 }
 
-micro-metadata-view a,
-micro-metadata-name a,
-micro-metadata-draft a,
-micro-metadata-handle a,
+meta-view a,
+meta-name a,
+meta-draft a,
+meta-handle a,
 micro-card[id] article h1 a,
 micro-card[id] article h2 a,
 micro-card[id] article h3 a,
-micro-metadata a:focus > span,
-micro-metadata context-menu a,
-micro-metadata context-menu a span {
+micro-card header a:focus > span,
+micro-card menu context-menu a,
+micro-card menu context-menu a span {
   text-decoration: none;
 }
 
 menu span,
-micro-metadata-view a span,
-micro-metadata-name a:hover,
-micro-metadata-draft a span,
-micro-metadata-handle a span,
+meta-view a span,
+meta-name a:hover,
+meta-draft a span,
+meta-handle a span,
 micro-card[id] article h1 a:hover,
 micro-card[id] article h2 a:hover,
 micro-card[id] article h3 a:hover {
@@ -1559,7 +1560,7 @@ column-base[position="middle"] > nav:first-child section small {
   margin: 0;
 }
 
-micro-author micro-header > *,
+micro-author article > *,
 column-base[position="middle"] > nav:first-child section h2,
 column-base[position="middle"] > nav:first-child section small {
   overflow: hidden;
@@ -1758,7 +1759,7 @@ web-ring,
 }
 
 web-ring time,
-micro-author micro-header time {
+micro-author article time {
   display: block;
   color: #444;
   color: var(--fade);
@@ -2379,7 +2380,7 @@ nav[hidden] {
   margin-left: 0;
 }
 
-[data-xml] micro-thumbnail {
+[data-xml] micro-card header figure {
   display: block;
 }
 
@@ -2425,10 +2426,10 @@ nav[hidden] {
   micro-author micro-card > :not(:last-child) {
     margin-bottom: 0.5rem;
   }
-  micro-author micro-header {
+  micro-author article {
     flex: none;
   }
-  micro-author micro-header > * {
+  micro-author article > * {
     white-space: normal;
   }
   time-line ul {
@@ -2475,7 +2476,7 @@ nav[hidden] {
     max-width: 600px;
     margin: 0 auto;
   }
-  micro-metadata {
+  micro-card header {
     line-height: inherit;
   }
   profile-box section {
@@ -2487,8 +2488,8 @@ nav[hidden] {
     border-bottom: 1px solid #eee;
     border-bottom: 1px solid var(--border-lighter);
   }
-  micro-author micro-card micro-header,
-  micro-author micro-card micro-thumbnail,
+  micro-author micro-card article,
+  micro-author micro-card header figure,
   micro-author micro-card p:not(:last-child) {
     flex: auto;
     margin: 0 0 0.75rem 0;