From af9456193c6241345172128b8b947a613681b04f Mon Sep 17 00:00:00 2001 From: tdro Date: Fri, 8 Mar 2024 14:01:03 -0500 Subject: themes/default/layouts/partials: Merge meta --- assets/css/default-simple.css | 10 +- assets/css/default.css | 111 +++++++++++---------- themes/default/layouts/_default/home.xslt.rss.xsl | 4 +- .../layouts/_default/section.following.html | 8 +- themes/default/layouts/_default/summary.html | 8 +- themes/default/layouts/partials/author-card.html | 8 +- .../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 +- .../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 +- .../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 +- .../default/layouts/partials/meta-wordcount.html | 4 +- 22 files changed, 106 insertions(+), 107 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; 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 @@
- +
@@ -83,7 +83,7 @@
- +

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 @@ - +
- - +
+

{{ $distinct.FeedName }}

@@ -60,7 +60,7 @@ datetime="{{ $distinct.FeedDateTime }}"> {{ $distinct.FeedDate -}} - +
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 }} > - - - {{ partial "profile-picture.html" . }} - +
+ {{ partial "profile-picture.html" . }} {{ partial "card-meta-header.html" . }} - +
{{- $content -}} 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 @@ - +
@@ -54,8 +54,8 @@
- - +
+

{{ .Data.name }}

@@ -71,7 +71,7 @@ > {{ $date }} - +

{{ .Data.description | markdownify | plainify | htmlUnescape | truncate 60 "..." }}

{{ 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 @@ -
+ {{- partial "meta-anchored.html" . -}} @@ -22,4 +22,4 @@ {{- partial "meta-expirydate.html" . -}} -
+ 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 -}} - + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/calendar.svg")) -}} - + 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 -}} - + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/code.svg")) -}} 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 -}} - + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/square-letter-m.svg")) -}} Markdown - + {{- 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" .) -}} - + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/link.svg")) -}} Permalink {{- /* This comment removes trailing newlines and white spaces. */ -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- /* 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" -}} - + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/notes.svg")) -}} Plaintext - + 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 -}} - + {{- $author := .Section -}} {{- partial "meta-via.html" . -}} @@ -20,5 +20,5 @@ Marked {{- end -}} - + {{- 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 @@ - {{- 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" }} (edited) {{- end -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- /* 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 -}} - + {{- /* This comment removes trailing newlines and white spaces. */ -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} @@ -11,5 +11,5 @@ {{- /* This comment removes trailing newlines and white spaces. */ -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- 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 -}} - {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/trash-2.svg")) -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- 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 -}} - + {{- /* This comment removes trailing newlines and white spaces. */ -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- /* 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 -}} - + {{ $name }} {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- /* 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 -}} - + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/eye.svg")) }} {{ $seconds }}s read {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- /* 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 -}} - + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/eye-off.svg")) -}} unlisted {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- 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 -}} - + {{- /* This comment removes trailing newlines and white spaces. */ -}} {{- 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. */ -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- /* 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) -}} - {{- /* This comment removes trailing newlines and white spaces. */ -}} - + {{- /* This comment removes trailing newlines and white spaces. */ -}} -- cgit v1.2.3