Update tags and categories to both use the same layouts

assets/css/bobastyle.css

@@ -135,72 +135,50 @@
 
 
 
-/* Category list format */
+/* Taxonomy list format */
-.category-list ul {
+.taxonomy-list a,
-  display: flex;
+.taxonomy-list .taxonomy-metadata {
-  flex-direction: column;
+  white-space: nowrap;
-  list-style: none;
-  gap: 10px;
-  padding: 0;
 }
 
-.category-list li {
+.taxonomy-list p {
+  margin: 0;
+}
+
+.taxonomy-list ul {
+  list-style: none;
+  padding: 0;
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
-  gap: 20px;
+  gap: 10px;
+}
+
+.taxonomy-list li {
   background-color: var(--background-1);
   padding: 8px 12px;
   border-radius: 8px;
+  display: flex;
+  flex-direction: row;
+  gap: 20px;
 }
 
-.category-list-left {
+.taxonomy-list-left {
   display: flex;
   flex-direction: column;
 }
 
 @media (max-width: 480px) {
-  .category-list li {
+  .taxonomy-list li {
     flex-direction: column;
-    gap: 0;
+    gap: 4px;
   }
 
-  .category-list-left {
+  .taxonomy-list-left {
     flex-direction: row;
     justify-content: space-between;
   }
 }
 
-.category-list p {
-  margin: 0;
-}
-
-.category-list a,
-.category-list .category-metadata {
-  white-space: nowrap;
-}
-
-
-
-/* Tags list format */
-.tag-list ul {
-  display: flex;
-  list-style: none;
-  gap: 10px;
-  flex-flow: row wrap;
-  padding: 0;
-}
-
-.tag-list a {
-  background-color: var(--background-1);
-  padding: 8px 12px;
-  border-radius: 12px;
-}
-
-.tag-list a:hover {
-  text-decoration: none;
-  background-color: var(--background-2);
-}
-
 
 
 /* Series list format */

i18n/en.yaml

@@ -94,8 +94,8 @@ aria_post_metadata:
 aria_author_metadata:
   other: "author metadata"
 
-aria_category_metadata:
+aria_taxonomy_metadata:
-  other: "category metadata"
+  other: "taxonomy metadata"
 
 aria_post_meta_date:
   other: "date"
@@ -109,7 +109,7 @@ aria_author_post_count:
 aria_author_word_count:
   other: "word count"
 
-aria_category_post_count:
+aria_taxonomy_post_count:
   other: "post count"
 
 aria_series_metadata:

i18n/es.yaml

@@ -94,8 +94,8 @@ newer_post:
 # aria_author_metadata:
 #   other: "author metadata"
 
-# aria_category_metadata:
+# aria_taxonomy_metadata:
-#   other: "category metadata"
+#   other: "taxonomy metadata"
 
 # aria_post_meta_date:
 #   other: "date"
@@ -109,7 +109,7 @@ newer_post:
 # aria_author_word_count:
 #   other: "word count"
 
-# aria_category_post_count:
+# aria_taxonomy_post_count:
 #   other: "post count"
 
 # aria_series_metadata:

layouts/categories/list.html

@@ -1,30 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ partial "icon.html" "folder" }}
-        {{ .Title | markdownify }}
-    </h1>
-
-    <div class="category-list">
-        {{ with .Data.Terms.Alphabetical }}
-            <ul>
-                {{ range . }}
-                    {{ with .Page }}
-                        <li>
-                            <div class="category-list-left">
-                                <a href="{{ .Permalink }}">
-                                    <p>{{ .Title | markdownify }}</p>
-                                </a>
-                                {{ partial "post-metadata/category.html" . }}
-                            </div>
-                            {{ partial "description-or-summary.html" . }}
-                        </li>
-                    {{ end }}
-                {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
-        {{ end }}
-    </div>
-{{ end }}

layouts/categories/term.html

@@ -1,17 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ partial "icon.html" "folder" }}
-        {{ .Title | markdownify }}
-        {{ partial "rss-link.html" . }}
-    </h1>
-
-    {{ partial "post-metadata/category.html" . }}
-
-    {{ with .Content }}
-        {{ . }}
-    {{ end }}
-
-    {{ partial "page-list.html" .Paginator.Pages }}
-
-    {{ partial "pagination.html" . }}
-{{ end }}

layouts/partials/post-metadata/category.html

@@ -1,6 +0,0 @@
-<div class="category-metadata" aria-label="{{ i18n "aria_category_metadata" }}">
-    <span class="category-meta-item" aria-label="{{ i18n "aria_category_post_count" }}">
-        {{ partial "icon.html" "newspaper" }}
-        {{ i18n "post_count" (len .Data.Pages) }}
-    </span>
-</div>

layouts/partials/post-metadata/taxonomy.html

@@ -0,0 +1,6 @@
+<div class="taxonomy-metadata" aria-label="{{ i18n "aria_taxonomy_metadata" }}">
+    <span class="taxonomy-meta-item" aria-label="{{ i18n "aria_taxonomy_post_count" }}">
+        {{ partial "icon.html" "newspaper" }}
+        {{ i18n "post_count" (len .Data.Pages) }}
+    </span>
+</div>

layouts/tags/list.html

@@ -1,22 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ partial "icon.html" "tag" }}
-        {{ .Title | markdownify }}
-    </h1>
-
-    <div class="tag-list">
-        {{ with .Data.Terms.Alphabetical }}
-            <ul>
-                {{ range . }}
-                    <a href="{{ .Page.Permalink }}">
-                        <li>{{ .Page.Title | markdownify }}</li>
-                    </a>
-                {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
-        {{ end }}
-    </div>
-{{ end }}

layouts/tags/term.html

@@ -1,15 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ partial "icon.html" "tag" }}
-        {{ .Title | markdownify }}
-        {{ partial "rss-link.html" . }}
-    </h1>
-
-    {{ with .Content }}
-        {{ . }}
-    {{ end }}
-
-    {{ partial "page-list.html" .Paginator.Pages }}
-
-    {{ partial "pagination.html" . }}
-{{ end }}

layouts/taxonomy/list.html

@@ -1,16 +1,31 @@
 {{ define "main" }}
     <h1>
-        {{ partial "icon.html" "filter" }}
+        {{ if eq .Data.Singular "tag" }}
+            {{ partial "icon.html" "tag" }}
+        {{ else if eq .Data.Singular "category" }}
+            {{ partial "icon.html" "folder" }}
+        {{ else }}
+            {{ partial "icon.html" "filter" }}
+        {{ end }}
+
         {{ .Title | markdownify }}
     </h1>
 
-    <div class="taxonomy">
+    <div class="taxonomy-list">
         {{ with .Data.Terms.Alphabetical }}
             <ul>
                 {{ range . }}
-                    <li>
+                    {{ with .Page }}
-                        <a href="{{ .Page.Permalink }}">{{ .Page.Title | markdownify }}</a>
+                        <li>
-                    </li>
+                            <div class="taxonomy-list-left">
+                                <a href="{{ .Permalink }}">
+                                    <p>{{ .Title | markdownify }}</p>
+                                </a>
+                                {{ partial "post-metadata/taxonomy.html" . }}
+                            </div>
+                            {{ partial "description-or-summary.html" . }}
+                        </li>
+                    {{ end }}
                 {{ end }}
             </ul>
         {{ else }}

layouts/taxonomy/term.html

@@ -1,10 +1,19 @@
 {{ define "main" }}
     <h1>
-        {{ partial "icon.html" "filter" }}
+        {{ if eq .Data.Singular "tag" }}
+            {{ partial "icon.html" "tag" }}
+        {{ else if eq .Data.Singular "category" }}
+            {{ partial "icon.html" "folder" }}
+        {{ else }}
+            {{ partial "icon.html" "filter" }}
+        {{ end }}
+
         {{ .Title | markdownify }}
         {{ partial "rss-link.html" . }}
     </h1>
 
+    {{ partial "post-metadata/taxonomy.html" . }}
+
     {{ with .Content }}
         {{ . }}
     {{ end }}