merge

2026-02-12 11:22:26 -05:00
parent 8c3ae79399 510ad35b2b
commit 0c50023468
47 changed files with 2311 additions and 0 deletions
--- a/categories/index.html
+++ b/categories/index.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -124,3 +125,21 @@
    </footer>
 </body>
 </html>
+=======
+---
+layout: default
+title: d@n tech Categories
+---
+
+<h2>Post Categories</h2>
+{% for category in site.categories %}
+    <h3 class="category-header"><b>{{category | first}}</b></h3>
+        {% for post in category[1] limit:3 %}
+        <span class="post-item">{{ post.date | date: '%Y-%m-%d' }} >> <a href="{{ post.url }}">{{ post.title }}</a></span>
+        {% endfor %}
+<div class="category-all-nav">
+    <h4>See all posts in {{category | first}} ({{category[1] | size}}) <a href="/category/{{category | first | downcase }}/">&gt;&gt;</a></h4>
+</div>
+{% endfor %}
+
+>>>>>>> 510ad35b2b74a95bd47077bc579d64b4505fa281