Merge remote-tracking branch 'upstream/master'

layouts/_default/list.html

@@ -1,9 +1,39 @@
 {{ define "main"}}
   <h1 class='title'>{{ .Title }}</h1>
   {{ partial "header.html" . }}
-  <!-- content -->
-  <div id="contentBody">
-    {{ .Content }}
+  <!-- search box -->
+  <div id="searchBox">
+    <input type="text" id="searchBoxInput" placeholder="Search..." />
+    <img id="searchBoxIcon" src="{{ .Site.BaseURL }}/img/search.png" />
+  </div>
+  <!-- search results -->
+  <div id="searchResults"></div>
+  <!-- tags -->
+  <div id="tags">
+    <ul>
+      {{ range .Site.Taxonomies.tags.ByCount }}
+        <li><a href="{{ .Page.Permalink }}">{{ .Page.Title }} ({{ .Count }})</a></li>
+      {{ end }}
+    </ul>
+  </div>
+  <!-- contents -->
+  <div id="contentsList">
+    {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "January, 2006"}}
+    {{ range $index, $value := .Pages.GroupByDate $listPageDateFormat }}
+    {{ if (ne $index 0) }}
+    <hr class="separator">
+    {{ end }}
+    <p class="date">{{ .Key }}</p>
+    {{ range .Pages }}
+      <p><a href="{{ .Permalink }}">{{ .Title }}</a></p>
+    {{ end }}
+    {{ end }}
   </div>
   {{ partial "footer.html" . }}
+  {{ $jquery := resources.Get "js/jquery-3.3.1.min.js" }}
+  {{ $mark := resources.Get "js/jquery.mark.es6.min.js" }}
+  {{ $lunr := resources.Get "js/lunr.js" }}
+  {{ $search := resources.Get "js/search.js" }}
+  {{ $js := slice $jquery $mark $lunr $search | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint }}
+  <script src="{{ $js.Permalink }}"></script>
 {{ end }}

layouts/_default/single.html

@@ -1,6 +1,22 @@
 {{ define "main"}}
   <h1 class='title'>{{ .Title }}</h1>
   {{ partial "header.html" . }}
+  {{ if not .Date.IsZero }}
+  <!-- date -->
+  {{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}}
+  <p class="date">{{ .Date.Format $singlePageDateFormat }}</p>
+  <!-- tags -->
+  <div id="tags">
+    <ul>
+      {{ range .Param "tags" }}
+        {{ $name := . }}
+        {{ with $.Site.GetPage (printf "/tags/%s" ($name | urlize)) }}
+          <li><a href="{{ .Permalink }}">{{ $name }}</a></li>
+        {{ end }}
+      {{ end }}
+    </ul>
+  </div>
+  {{ end }}
   <!-- content -->
   <div id="contentBody">
     {{ .Content }}

layouts/partials/head.html

@@ -22,8 +22,14 @@
   {{ $markdown := resources.Get "css/markdown.css" }}
   {{ $fontawesome := resources.Get "css/fontawesome.css" }}
   {{ $syntaxHighlight := resources.Get "css/syntax-highlight.css" }}
-  {{ $css := slice $style $markdown $fontawesome $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }}
-  <link rel="stylesheet" href="{{ $css.Permalink }}">
+  {{ $css := slice $style $markdown $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }}
+  <link rel="stylesheet" href="{{ $css.Permalink }}" integrity="{{ $css.Data.Integrity }}">
+  {{ $styleDark := resources.Get "css/style-dark.css" }}
+  {{ $markdownDark := resources.Get "css/markdown-dark.css" }}
+  {{ $cssDark := slice $styleDark $markdownDark | resources.Concat "style-dark.css" | resources.Minify | resources.Fingerprint }}
+  <link rel="stylesheet" href="{{ $cssDark.Permalink }}" media="(prefers-color-scheme: dark)" integrity="{{ $cssDark.Data.Integrity }}">
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
+
   <!-- custom css -->
   {{ range .Site.Params.custom_css }}
   <link rel="stylesheet" href="{{ . }}">
@@ -33,7 +39,8 @@
   {{- template "_internal/opengraph.html" . -}}
   {{- template "_internal/google_news.html" . -}}
   {{- template "_internal/schema.html" . -}}
-  {{- template "_internal/twitter_cards.html" . -}}
+  <!-- {{- template "_internal/twitter_cards.html" . -}} -->
+  {{- partial "twitter_cards.html" . -}}
 
   <!-- Polyfill for old browsers -->
   {{ `<!--[if lte IE 9]>
@@ -45,4 +52,8 @@
   <script src="https://cdn.jsdelivr.net/npm/respond.js@1.4.2/dest/respond.min.js"></script>
   <![endif]-->` | safeHTML }}
 
+  <!-- Analytics -->
+  {{- if and (not .Site.IsServer) .Site.GoogleAnalytics -}}
+  {{ template "_internal/google_analytics_async.html" . }}
+  {{- end -}}
 </head>

layouts/partials/header.html

@@ -1,8 +1,8 @@
 <header>
   <!-- avator -->
   <div class="avatar">
-    <img class="avatarMask" src="{{ .Site.BaseURL }}/img/{{ .Site.Params.avatar }}">
-    <a href="{{ .Site.BaseURL }}"><img src="{{ .Site.BaseURL }}/img/avatar-border.svg"></a>
+    <img class="avatarMask" src="{{ .Site.BaseURL }}/img/{{ .Site.Params.avatar }}" alt="{{ .Site.Params.avatarDescription }}">
+    <a href="{{ .Site.BaseURL }}"><img class="avatar-border" src="{{ .Site.BaseURL }}/img/avatar-border.svg" alt=""></a>
   </div>
   <!-- author -->
   <h2><a class="author" href="{{ .Site.BaseURL }}">{{ .Site.Params.Author }}</a></h2>

layouts/partials/mathjax_support.html

@@ -0,0 +1,16 @@
+<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
+<script id="MathJax-script" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-MML-AM_CHTML">
+MathJax.Hub.Config({
+  tex2jax: {
+    inlineMath: [['$','$'], ['\\(','\\)']],
+    displayMath: [['$$','$$'], ['\[','\]']],
+    processEscapes: true,
+    processEnvironments: true,
+    skipTags: ['script', 'noscript', 'style', 'textarea', 'pre','code'],
+    TeX: {
+      equationNumbers: { autoNumber: "AMS" },
+      extensions: ["AMSmath.js", "AMSsymbols.js"]
+    }
+  }
+})
+</script>

layouts/partials/twitter_cards.html

@@ -0,0 +1,31 @@
+<!-- https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates/twitter_cards.html -->
+{{- with $.Params.images -}}
+<meta name="twitter:card" content="summary_large_image"/>
+<meta name="twitter:image" content="{{ index . 0 | absURL }}"/>
+{{ else -}}
+{{- $images := $.Resources.ByType "image" -}}
+{{- $featured := $images.GetMatch "*feature*" -}}
+{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
+{{- with $featured -}}
+<meta name="twitter:card" content="summary_large_image"/>
+<meta name="twitter:image" content="{{ $featured.Permalink }}"/>
+{{- else -}}
+{{- with $.Site.Params.images -}}
+<meta name="twitter:card" content="summary_large_image"/>
+<meta name="twitter:image" content="{{ index . 0 | absURL }}"/>
+{{ else -}}
+<meta name="twitter:card" content="summary"/>
+<meta name="twitter:image" content="{{ .Site.BaseURL }}/img/{{ .Site.Params.avatar }}"/>
+{{- end -}}
+{{- end -}}
+{{- end }}
+<meta name="twitter:title" content="{{ .Title }}"/>
+<meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}"/>
+{{ with .Site.Social.twitter -}}
+<meta name="twitter:site" content="@{{ . }}"/>
+{{ end -}}
+{{ range .Site.Authors }}
+{{ with .twitter -}}
+<meta name="twitter:creator" content="@{{ . }}"/>
+{{ end -}}
+{{ end -}}