6 files changed, 32 insertions, 65 deletions
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index d289909e..10cd1c0d 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,28 +1,8 @@
 <head>
   <meta charset="utf-8" />
-  {{ hugo.Generator }}
-
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="author" content="{{ .Site.Author.name }}" />
-  <meta property="og:url" content="{{ .Permalink }}" />
-  <link rel="canonical" href="{{ .Permalink }}" />
-
+  {{ hugo.Generator }}
   {{ partial "head/siteinfo" . }}
   {{ partial "head/css" . }}
-
-  <!-- Umami Tracking -->
-  <script>
-    if (window.location.hostname !== 'localhost') {
-      // track traffic
-      const script = document.createElement('script');
-      script.defer = true;
-      script.src = 'https://umami.guhub.cn/script.js';
-      script.dataset.websiteId = 'a84e25a7-ac03-4a1f-94b0-bd1f6ae44869';
-      document.head.appendChild(script);
-    }
-  </script>
-
-  <!-- Extra head -->
-  {{ .Site.Params.extraHead | safeHTML }}
+  {{ partial "head/umami" . }}
 </head>
diff --git a/layouts/partials/head/css.html b/layouts/partials/head/css.html
index def65db6..6777e5ad 100644
--- a/layouts/partials/head/css.html
+++ b/layouts/partials/head/css.html
@@ -1,18 +1,7 @@
 <!-- Google Fonts -->
-<link rel="preconnect" href="https://fonts.googleapis.com" />
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-<link
-    href="https://fonts.googleapis.com/css2?family=Noto+Serif:ital,wght@0,100..900;1,100..900&display=swap"
-    rel="stylesheet"
-/>
-<link
-    href="https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@200..900&display=swap"
-    rel="stylesheet"
-/>
-<link
-    href="https://fonts.googleapis.com/css2?family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap"
-    rel="stylesheet"
-/>
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@200..900&family=Noto+Serif:ital,wght@0,100..900;1,100..900&family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap" rel="stylesheet">
 
 <!-- Extra -->
 {{ range .Site.Params.extraCSSFiles -}}
diff --git a/layouts/partials/head/siteinfo.html b/layouts/partials/head/siteinfo.html
index c5c355e8..64c14506 100644
--- a/layouts/partials/head/siteinfo.html
+++ b/layouts/partials/head/siteinfo.html
@@ -1,39 +1,26 @@
-<!-- Basic site information -->
-{{- if .IsHome -}}
-<title>{{ .Site.Title }}</title>
-<meta property="og:title" content="{{ .Site.Title }}" />
-<meta property="og:type" content="website" />
-<meta property="og:description" content="{{ .Site.Params.description }}" />
-<meta name="description" content="{{ .Site.Params.description }}" />
-{{- else -}}
-<title>{{ .Title }}</title>
-<meta property="og:title" content="{{ .Title }}" />
-<meta property="og:type" content="article" />
-<meta property="og:description" content="{{ default .Summary .Description | plainify }}" />
-<meta name="description" content="{{ default .Summary .Description | plainify }}" />
-{{- end }}
-<meta property="og:locale" content="{{ .Site.LanguageCode }}" />
-{{- if .Params.album -}}
-<meta property="og:image" content="{{ .Params.album }}" />
-{{- else -}}
-<meta property="og:image" content="{{ .Site.Params.favicon }}" />
-{{ end }}
+<!-- Link preview meta tags -->
+{{- $isHome := .IsHome -}}
+{{- $title := cond $isHome .Site.Title .Title -}}
+{{- $description := cond $isHome .Site.Params.description (default .Summary .Description | plainify) -}}
+{{- $ogType := cond $isHome "website" "article" -}}
+{{- $image := cond (isset .Params "banner") .Params.banner .Site.Params.favicon -}}
 
-<!-- Favicon -->
-{{- if .Site.Params.favicon -}}
-<link rel="apple-touch-icon" href="{{ .Site.Params.favicon }}" />
-<link rel="icon" href="{{ .Site.Params.favicon }}" />
-<link rel="shortcut" href="{{ .Site.Params.favicon }}" />
-{{- end -}}
+<title>{{ $title }}</title>
+<link rel="canonical" href="{{ .Permalink }}" />
+<meta name="author" content="{{ .Site.Author.name }}" />
+<meta property="og:url" content="{{ .Permalink }}" />
+<meta property="og:title" content="{{ $title }}" />
+<meta property="og:type" content="{{ $ogType }}" />
+<meta property="og:description" content="{{ $description }}" />
+<meta name="description" content="{{ $description }}" />
+<meta property="og:locale" content="{{ .Site.LanguageCode }}" />
+<meta property="og:image" content="{{ $image }}" />
 
 <!-- RSS -->
 <link rel="alternate" type="application/atom+xml" href="{{.Site.BaseURL}}index.xml" title="{{ .Site.Title }}">
 <link href="{{ .Site.Params.staticPrefix }}{{ "index.xml" | relURL }}" rel="alternate" type="application/rss+xml"
     title="{{ .Site.Title }}">
 
-<!-- Twtter Card -->
-{{ if .Site.Params.TwitterCards }}{{ template "_internal/twitter_cards.html" . }}{{ end }}
-
 <!-- JSON-LD -->
 <script type="application/ld+json">
     {
diff --git a/layouts/partials/head/umami.html b/layouts/partials/head/umami.html
new file mode 100644
index 00000000..f9724ec3
--- /dev/null
+++ b/layouts/partials/head/umami.html
@@ -0,0 +1,11 @@
+<!-- Umami Tracking -->
+<script>
+  if (window.location.hostname !== 'localhost') {
+    // track traffic
+    const script = document.createElement('script');
+    script.defer = true;
+    script.src = 'https://umami.guhub.cn/script.js';
+    script.dataset.websiteId = 'a84e25a7-ac03-4a1f-94b0-bd1f6ae44869';
+    document.head.appendChild(script);
+  }
+</script>
diff --git a/static/favicon.png b/static/apple-touch-icon.png
index 04dd1341..04dd1341 100644
--- a/static/favicon.png
+++ b/static/apple-touch-icon.png
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 00000000..1b116908
--- /dev/null
+++ b/static/favicon.ico