From a7a63eff28ba19a29733b4af835ce00299cb243c Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sun, 17 Mar 2019 20:32:32 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=8F=AF=E9=85=8D=E7=BD=AE=20favicon?=
 =?UTF-8?q?=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 9IPHP/macro-head.ftl      | 2 +-
 Andrea/macro-head.ftl     | 2 +-
 Bruce/macro-head.ftl      | 2 +-
 Community/macro-head.ftl  | 2 +-
 Finding/macro-head.ftl    | 2 +-
 Jane/macro-head.ftl       | 6 +++---
 Medium/macro-head.ftl     | 2 +-
 NeoEase/macro-head.ftl    | 2 +-
 Pinghsu/macro-head.ftl    | 2 +-
 classic/macro-head.ftl    | 2 +-
 ease/macro-head.ftl       | 2 +-
 favourite/macro-head.ftl  | 2 +-
 i-nove/macro-head.ftl     | 2 +-
 metro-hot/macro-head.ftl  | 2 +-
 mobile/macro-head.ftl     | 2 +-
 next/macro-head.ftl       | 2 +-
 nijigen/macro-head.ftl    | 2 +-
 owmx-3.0/macro-head.ftl   | 2 +-
 timeline/macro-head.ftl   | 2 +-
 tree-house/macro-head.ftl | 2 +-
 yilia/macro-head.ftl      | 2 +-
 21 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/9IPHP/macro-head.ftl b/9IPHP/macro-head.ftl
index a39d5b9..fc539e3 100644
--- a/9IPHP/macro-head.ftl
+++ b/9IPHP/macro-head.ftl
@@ -30,7 +30,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/Andrea/macro-head.ftl b/Andrea/macro-head.ftl
index 410c898..e89833d 100644
--- a/Andrea/macro-head.ftl
+++ b/Andrea/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/Bruce/macro-head.ftl b/Bruce/macro-head.ftl
index df21a08..6aa012c 100644
--- a/Bruce/macro-head.ftl
+++ b/Bruce/macro-head.ftl
@@ -31,7 +31,7 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/bootstrap${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/Community/macro-head.ftl b/Community/macro-head.ftl
index 410c898..e89833d 100644
--- a/Community/macro-head.ftl
+++ b/Community/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/Finding/macro-head.ftl b/Finding/macro-head.ftl
index fdb623e..c95e798 100644
--- a/Finding/macro-head.ftl
+++ b/Finding/macro-head.ftl
@@ -30,7 +30,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/Jane/macro-head.ftl b/Jane/macro-head.ftl
index b14ded9..2023581 100644
--- a/Jane/macro-head.ftl
+++ b/Jane/macro-head.ftl
@@ -30,9 +30,9 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
-<link rel="apple-touch-icon" href="${servePath}/favicon.png">
-<link rel="shortcut icon" type="image/x-icon" href="${servePath}/favicon.png">
+<link rel="icon" type="image/png" href="${faviconURL}" />
+<link rel="apple-touch-icon" href="${faviconURL}">
+<link rel="shortcut icon" type="image/x-icon" href="${faviconURL}">
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/Medium/macro-head.ftl b/Medium/macro-head.ftl
index a39d5b9..fc539e3 100644
--- a/Medium/macro-head.ftl
+++ b/Medium/macro-head.ftl
@@ -30,7 +30,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/NeoEase/macro-head.ftl b/NeoEase/macro-head.ftl
index 410c898..e89833d 100644
--- a/NeoEase/macro-head.ftl
+++ b/NeoEase/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/Pinghsu/macro-head.ftl b/Pinghsu/macro-head.ftl
index a39d5b9..fc539e3 100644
--- a/Pinghsu/macro-head.ftl
+++ b/Pinghsu/macro-head.ftl
@@ -30,7 +30,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/classic/macro-head.ftl b/classic/macro-head.ftl
index 410c898..e89833d 100644
--- a/classic/macro-head.ftl
+++ b/classic/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/ease/macro-head.ftl b/ease/macro-head.ftl
index 8d60e64..7643d33 100644
--- a/ease/macro-head.ftl
+++ b/ease/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/favourite/macro-head.ftl b/favourite/macro-head.ftl
index 410c898..e89833d 100644
--- a/favourite/macro-head.ftl
+++ b/favourite/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/i-nove/macro-head.ftl b/i-nove/macro-head.ftl
index 410c898..e89833d 100644
--- a/i-nove/macro-head.ftl
+++ b/i-nove/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/metro-hot/macro-head.ftl b/metro-hot/macro-head.ftl
index c84f424..641e2da 100644
--- a/metro-hot/macro-head.ftl
+++ b/metro-hot/macro-head.ftl
@@ -32,7 +32,7 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}-responsive${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/mobile/macro-head.ftl b/mobile/macro-head.ftl
index a7912a8..c5a4d5c 100644
--- a/mobile/macro-head.ftl
+++ b/mobile/macro-head.ftl
@@ -65,7 +65,7 @@ overflow: hidden;
 
 </style>
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/js/l10n${miniPostfix}.js?${staticResourceVersion}'></script>
 <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
 <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/themes/core/core.js?${staticResourceVersion}'></script>
diff --git a/next/macro-head.ftl b/next/macro-head.ftl
index a39d5b9..fc539e3 100644
--- a/next/macro-head.ftl
+++ b/next/macro-head.ftl
@@ -30,7 +30,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/nijigen/macro-head.ftl b/nijigen/macro-head.ftl
index a39d5b9..fc539e3 100644
--- a/nijigen/macro-head.ftl
+++ b/nijigen/macro-head.ftl
@@ -30,7 +30,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/owmx-3.0/macro-head.ftl b/owmx-3.0/macro-head.ftl
index 0b439e0..af5f8a4 100644
--- a/owmx-3.0/macro-head.ftl
+++ b/owmx-3.0/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 <script type="text/javascript">
diff --git a/timeline/macro-head.ftl b/timeline/macro-head.ftl
index 410c898..e89833d 100644
--- a/timeline/macro-head.ftl
+++ b/timeline/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/tree-house/macro-head.ftl b/tree-house/macro-head.ftl
index 410c898..e89833d 100644
--- a/tree-house/macro-head.ftl
+++ b/tree-house/macro-head.ftl
@@ -29,7 +29,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}
diff --git a/yilia/macro-head.ftl b/yilia/macro-head.ftl
index fdb623e..c95e798 100644
--- a/yilia/macro-head.ftl
+++ b/yilia/macro-head.ftl
@@ -30,7 +30,7 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${faviconURL}" />
 <link rel="manifest" href="${servePath}/manifest.json">
 <link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
 ${htmlHead}