Merge changes from upstream

layouts/_default/list.html

@@ -1,25 +1,11 @@
 {{ define "main" }}
 {{ with .Content }}
-  <div class="index-content">
-    {{ . }}
-  </div>
+<div class="index-content">
+  {{ . }}
+</div>
 {{ end }}
 <div class="posts">
-  {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
-  {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
-
-  {{ $PageContext := . }}
-  {{ if .IsHome }}
-    {{ $PageContext = .Site }}
-  {{ end }}
-  {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }}
-
-  {{ if len .Content }}
-  <h1>{{.Title}}</h1>
-  {{ .Content }}
-  {{ end }}
-
-  {{ range $paginator.Pages }}
+  {{ range .Pages }}
   <div class="post on-list">
     <h1 class="post-title">
       <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h1>
@@ -59,12 +45,11 @@
 
     {{ if not .Params.showFullContent }}
     <div>
-      <a class="read-more button"
-        href="{{.RelPermalink}}">{{ $.Site.Params.ReadMore }} →</a>
+      <a class="read-more button" href="{{.RelPermalink}}">{{ $.Site.Params.ReadMore }} →</a>
     </div>
     {{ end }}
   </div>
   {{ end }}
   {{ partial "pagination.html" . }}
 </div>
-{{ end }}
+{{ end }}