From 04ce6eb512e3a52145dfeed8acc8a0b77616abce Mon Sep 17 00:00:00 2001
From: wangbudui <wangbudui@foxmail.com>
Date: Tue, 7 Jan 2020 14:05:49 +0800
Subject: [PATCH] list almost done

---
 themes/hugo-w2ng/assets/css/styles.css        |  2 +-
 themes/hugo-w2ng/layouts/_default/list.html   | 26 +++++++++++++---
 themes/hugo-w2ng/layouts/_default/single.html | 30 +++++--------------
 themes/hugo-w2ng/layouts/partials/meta.html   | 24 +++++++++++++++
 4 files changed, 54 insertions(+), 28 deletions(-)
 create mode 100644 themes/hugo-w2ng/layouts/partials/meta.html

diff --git a/themes/hugo-w2ng/assets/css/styles.css b/themes/hugo-w2ng/assets/css/styles.css
index 5d2826e..be87a1d 100644
--- a/themes/hugo-w2ng/assets/css/styles.css
+++ b/themes/hugo-w2ng/assets/css/styles.css
@@ -8,7 +8,7 @@
 @import "node_modules/tailwindcss/utilities";
 
 .markdown h1 {
-  @apply text-4xl my-12;
+  @apply text-3xl my-12;
 }
 .markdown h2 {
   @apply text-2xl my-8;
diff --git a/themes/hugo-w2ng/layouts/_default/list.html b/themes/hugo-w2ng/layouts/_default/list.html
index 3dfaa73..3b7cb0a 100644
--- a/themes/hugo-w2ng/layouts/_default/list.html
+++ b/themes/hugo-w2ng/layouts/_default/list.html
@@ -1,7 +1,25 @@
 {{ define "main" }}
-{{ range .Pages }}
-    <article class="">
-        <h1 class=""><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
+<section itemscope itemtype="http://schema.org/Collection" class="max-w-3xl mx-auto leading-relaxed my-6">
+    {{- $pctx := . -}}
+    {{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
+    {{- $pages := $pctx.RegularPages -}}
+
+    {{ range (where $pages "Section" "!=" "") }}
+    <article itemscope itemtype="http://schema.org/Article" class="flex flex-col mt-6 mb-12">
+        {{- partial "meta.html" . -}}
+        <h2 itemprop="name" class="text-2xl"><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+        <p itemprop="datePublished" content="{{ .Date.Format "2006-01-02" }}" class="">{{ .Date.Format "2006/01/02" }}
+        </p>
+        <div class="py-2">
+            {{ if .Description }}
+            {{ .Description | markdownify }}
+            {{ else }}
+            {{ if .Truncated }}
+            {{ .Summary | truncate 150 | markdownify }}...
+            {{ end }}
+            {{ end }}
+        </div>
     </article>
-{{ end }}
+    {{ end }}
+</section>
 {{ end }}
\ No newline at end of file
diff --git a/themes/hugo-w2ng/layouts/_default/single.html b/themes/hugo-w2ng/layouts/_default/single.html
index 7b39499..7ac27ea 100644
--- a/themes/hugo-w2ng/layouts/_default/single.html
+++ b/themes/hugo-w2ng/layouts/_default/single.html
@@ -1,10 +1,11 @@
 {{ define "main" }}
 <article itemscope itemtype="http://schema.org/Article" class="max-w-3xl mx-auto leading-relaxed">
     {{ if .IsPage }}
-    <section class="flex flex-col meta">
-        <h1 class="text-center text-4xl  my-8 md:my-12">{{ .Title }}</h1>
+    <header class="flex flex-col meta">
+        {{- partial "meta.html" . -}}
+        <h1 itemprop="name" class="text-center text-3xl my-4 md:my-6">{{ .Title }}</h1>
         {{ if not .Params.disableMeta }}
-        <h3 class="text-center text-2xl">
+        <h3 class="text-center text-xl">
             {{ with $.Site.Params.AuthorName }}
             <span itemprop="author" itemscope itemtype="http://schema.org/Person">
                 <span itemprop="name">{{ . }}</span>
@@ -15,31 +16,14 @@
                     content="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "2006-01-02" }}</span>
             {{ end }}
         </h3>
-        <h3 class="md:order-first text-xl text-right mt-4 md:mt-0">
-            {{ with .Params.categories }}
-            <span itemprop="articleSection" class="category">
-                {{ range . }}
-                <a href="{{ . | printf "categories/%s" | relURL }}" rel="category">{{ . }}</a>
-                {{ end }}
-            </span>
-            {{ end }}
-            {{ if .Params.categories }} / {{ end }}
-            {{ with .Params.tags }}
-            <span itemprop="keywords" class="tags text-base font-mono">
-                {{ range . }}
-                <a href="{{ . | printf "tags/%s" | relURL }}" class="m-1" rel="tag">#{{ . }}</a>
-                {{ end }}
-            </span>
-            {{ end }}
-        </h3>
         {{ end }}
-    </section>
+    </header>
     {{ end }}
     {{ if not .IsHome  }}
     <hr class="block my-10 mx-auto max-w-xs h-px border-t border-black">
     {{ end }}
-    <section itemprop="articleBody" class="content markdown">
+    <div itemprop="articleBody" class="content markdown">
         {{ .Content }}
-    </section>
+    </div>
 </article>
 {{ end }}
\ No newline at end of file
diff --git a/themes/hugo-w2ng/layouts/partials/meta.html b/themes/hugo-w2ng/layouts/partials/meta.html
new file mode 100644
index 0000000..b7cb3e1
--- /dev/null
+++ b/themes/hugo-w2ng/layouts/partials/meta.html
@@ -0,0 +1,24 @@
+<div class="flex flex-col md:flex-row justify-between">
+    {{ with .Params.categories }}
+    <ul class="flex justify-end" itemprop="articleSection">
+        {{ range . }}
+        <li class="pr-2"><a href="{{ . | printf "categories/%s" | relURL }}" rel="category">{{ . }}</a></li>
+        {{ end }}
+    </ul>
+    {{ end }}
+    {{ with .Params.tags }}
+    <ul class="flex justify-end">
+        {{ range . }}
+        <li itemprop="keywords" class="pl-2 md:pl-4">
+            <a href="{{ (urlize (printf "tags/%s/" . )) | absLangURL }}">
+                {{ if and (eq . "markdown")  (eq . "markdown") }}
+                <mark>#{{ . }}</mark>
+                {{ else }}
+                #{{ . }}
+                {{ end }}
+            </a>
+        </li>
+        {{ end }}
+    </ul>
+    {{ end }}
+</div>
\ No newline at end of file