merge upstream

layouts/_default/list.html

@@ -6,12 +6,29 @@
   {{ $Pages = where site.RegularPages "Type" "in" .Site.Params.mainSections }}
 {{ end }}
 
+{{ if .Site.Params.excerpts }}
+
+{{- range $Pages }}
+<article>
+  <header>
+    <h1>{{ .Title }}</h1>
+    {{ if .Date }}<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "January 02, 2006" }}</time>{{ end }}
+  </header>
+  {{ .Summary }}
+  {{- if .Truncated }}
+    <div class="more"><a href="{{ .RelPermalink }}">read more</a></div>
+  {{- end }}
+</article>
+{{- end }}
+
+{{ else }}
+
 <article>
   <header><h1>{{ .Title | default "Posts" | humanize }}</h1></header>
-  <ul>
+  <ul class="archive">
     {{- range $Pages }}
-    <li style="font-size: 1.1em;">
-      {{ if .Date }}<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}" style="display: inline-block; min-width: 10ch; margin: 0 .2em;">{{ .Date.Format "2006-01-02" }}</time>{{ end }}
+    <li>
+      {{ if .Date }}<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "2006-01-02" }}</time>{{ end }}
       <a href="{{ .Permalink }}">{{ .Title }}</a>
     </li>
     {{- end }}
@@ -20,3 +37,5 @@
 </article>
 
 {{ end }}
+
+{{ end }}