themes/default/layouts/partials/meta: Merge anchored elements

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 -}}
   <micro-metadata-anchored>
+    {{- $author := .Section -}}
     {{- partial "meta-via.html" . -}}
 
-    {{ if .Weight }}
-      <anchored-pinned>
+    {{- if .Weight -}}
+      <a data-anchored="pinned">
        {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/pinned.svg")) }}
        <span>Pinned</span>
-      </anchored-pinned>
-    {{ end }}
+      </a>
+    {{- end -}}
 
-    {{ if .Params.Marked }}
-      <anchored-marked>
+    {{- if .Params.Marked -}}
+      <a
+        href="{{ "" | absURL }}/{{ $author }}/marks/#marks"
+        data-anchored="marked"
+        data-hover=""
+      >
        {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/bookmark.svg")) }}
        <span>Marked</span>
-      </anchored-marked>
-    {{ end }}
+      </a>
+    {{- end -}}
   </micro-metadata-anchored>
-{{ 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 -}}
-<anchored-via>
-  {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/rss.svg")) -}}
   <a
-    data-hover
-    title="{{ $author }}@{{ or (urls.Parse .Site.BaseURL).Host "localhost" }}"
-    href="{{ .Site.BaseURL }}/{{ $author }}/feeds/#feeds"
+    data-hover=""
+    data-anchored="via"
+    href="{{ "" | absURL }}/{{ $author }}/feeds/#feeds"
+    title="{{ $author }}@{{ or (urls.Parse ("" | absURL)).Host "localhost" }}"
   >
+    {{- safeHTML (readFile (print (partial "function-paths.html").static "/icons/tabler/rss.svg")) -}}
     via @{{ $author }}
   </a>
-</anchored-via>
 {{- end -}}