From 574bc4a6f013a616b2dcf73d239943924dff6bf1 Mon Sep 17 00:00:00 2001 From: tdro Date: Wed, 21 Feb 2024 19:30:29 -0500 Subject: themes/default/layouts/partials/meta: Merge anchored elements --- assets/css/default.css | 17 ++++++++------- themes/default/layouts/partials/meta-anchored.html | 25 +++++++++++++--------- themes/default/layouts/partials/meta-via.html | 11 +++++----- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/assets/css/default.css b/assets/css/default.css index 9dee26b..41034ed 100644 --- a/assets/css/default.css +++ b/assets/css/default.css @@ -1247,12 +1247,21 @@ micro-metadata-anchored > * { display: flex; flex-wrap: wrap; align-items: center; + text-decoration: none; } micro-metadata-anchored svg { margin-right: 0.25rem; } +micro-metadata-anchored a[data-anchored="pinned"] svg { + fill: #9ed1fa; +} + +micro-metadata-anchored a[data-anchored="marked"] svg { + fill: #cd5c5c; +} + micro-metadata-menu { display: inline-block; position: relative; @@ -1307,14 +1316,6 @@ micro-card[id] article h3 a:hover { text-decoration: underline; } -anchored-pinned svg { - fill: #9ed1fa; -} - -anchored-marked svg { - fill: #cd5c5c; -} - profile-box picture[data-type="banner"] img { background-color: transparent; border-radius: 0.125rem; diff --git a/themes/default/layouts/partials/meta-anchored.html b/themes/default/layouts/partials/meta-anchored.html index 431fa64..d19bcde 100644 --- a/themes/default/layouts/partials/meta-anchored.html +++ b/themes/default/layouts/partials/meta-anchored.html @@ -1,19 +1,24 @@ -{{ if or .Weight .Params.Liked .Params.feed }} +{{- if or .Weight .Params.Liked .Params.feed -}} + {{- $author := .Section -}} {{- partial "meta-via.html" . -}} - {{ if .Weight }} - + {{- if .Weight -}} + {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/pinned.svg")) }} Pinned - - {{ end }} + + {{- end -}} - {{ if .Params.Marked }} - + {{- if .Params.Marked -}} + {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/bookmark.svg")) }} Marked - - {{ end }} + + {{- end -}} -{{ end }} +{{- end -}} diff --git a/themes/default/layouts/partials/meta-via.html b/themes/default/layouts/partials/meta-via.html index 3f5476c..c34ca73 100644 --- a/themes/default/layouts/partials/meta-via.html +++ b/themes/default/layouts/partials/meta-via.html @@ -1,14 +1,13 @@ {{- $author := .Section -}} {{- if .Params.feed -}} - - {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/rss.svg")) -}} + {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/rss.svg")) -}} via @{{ $author }} - {{- end -}} -- cgit v1.2.3