Merge changes from upstream

layouts/_default/index.html

@@ -0,0 +1,65 @@
+{{ define "main" }}
+{{ with .Content }}
+  <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) }}
+
+  {{ range $paginator.Pages }}
+  <div class="post on-list">
+    <h1 class="post-title">
+      <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h1>
+    <div class="post-meta">
+      <span class="post-date">
+        {{ .Date.Format "2006-01-02" }}
+      </span>
+      {{ with .Params.Author }}<span class="post-author">::
+        {{ . }}</span>{{ end }}
+    </div>
+
+    {{ if .Params.tags }}
+    <span class="post-tags">
+      {{ range .Params.tags }}
+      #<a href="{{ (urlize (printf "tags/%s/" . )) | absLangURL }}">
+        {{- . -}}
+      </a>&nbsp;
+      {{ end }}
+    </span>
+    {{ end }}
+
+    {{ with .Params.Cover }}
+    <img src="{{ . | absURL }}" class="post-cover" />
+    {{ end }}
+
+    <div class="post-content">
+      {{ if .Params.showFullContent }}
+      {{ .Content | markdownify }}
+      {{ else if .Description }}
+      {{ .Description | markdownify }}
+      {{ else }}
+      {{ if .Truncated }}
+      {{ .Summary | markdownify }}
+      {{ end }}
+      {{ end }}
+    </div>
+
+    {{ if not .Params.showFullContent }}
+    <div>
+      <a class="read-more button"
+        href="{{.RelPermalink}}">{{ $.Site.Params.ReadMore }} →</a>
+    </div>
+    {{ end }}
+  </div>
+  {{ end }}
+  {{ partial "pagination.html" . }}
+</div>
+{{ end }}

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 }}

layouts/_default/terms.html

@@ -0,0 +1,17 @@
+{{ define "main" }}
+  <div class="terms">
+    <h1>{{ .Title }}</h1>
+    <ul>
+      {{ $type := .Type }}
+      {{ range $key, $value := .Data.Terms.Alphabetical }}
+      {{ $name := .Name }}
+      {{ $count := .Count }}
+      {{ with $.Site.GetPage (printf "/%s/%s" $type $name) }}
+        <li>
+          <a class="terms-title" href="{{ .Permalink }}">{{ .Name }} ({{ $count }})</a>
+        </li>
+      {{ end }}
+      {{ end }}
+    </ul>
+  </div>
+{{ end }}

layouts/shortcodes/code.html

@@ -0,0 +1,15 @@
+{{ $id := delimit (shuffle (seq 1 9)) "" }}
+
+{{ if .Get "language" }}
+  <div class="collapsable-code">
+    <input id="{{ .Get "id" | default $id }}" type="checkbox" {{ if ( eq ( .Get "isCollapsed" ) "true" ) -}} checked {{- end }} />
+    <label for="{{ .Get "id" | default $id }}">
+      <span class="collapsable-code__language">{{ .Get "language" }}</span>
+      {{ if .Get "title" }}<span class="collapsable-code__title">{{ .Get "title" | markdownify }}</span>{{ end }}
+      <span class="collapsable-code__toggle" data-label-expand="{{ .Get "expand" | default "△" }}" data-label-collapse="{{ .Get "collapse" | default "▽" }}"></span>
+    </label>
+    <pre {{ if .Get "language" }}class="language-{{ .Get "language" }}" {{ end }}><code>{{ .Inner }}</code></pre>
+  </div>
+{{ else }}
+  {{ errorf "If you want to use the \"collapsable code\" shortcode, you need to pass a mandatory \"language\" param. The issue occured in %q (%q)" .Page.File .Page.Permalink }}
+{{ end }}