Merge commit 'dce5b411423b26f3b76842da9f7e8580a51953c2'

# Conflicts:
#	layouts/partials/footer.html

layouts/partials/comments.html

@@ -0,0 +1,21 @@
+<div id="gitalk-container" style="
+    margin: 20px auto;
+    max-width: 800px;
+    padding: 20px;
+    width: 100%;
+    text-align: left;
+"></div>
+<script src="https://cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js"></script>
+<script>
+    const gitalk = new Gitalk({
+        clientID: '94eae56b89dcc480bf4d',
+        clientSecret: '1e4218c0293a998a9483ab09ba9ace46cabc76b3',
+        repo: 'Colinx-Blog',      // The repository of store comments,
+        owner: 'Colin-XKL',
+        admin: ['Colin-XKL'],
+        id: decodeURI(location.pathname),  // Ensure uniqueness and length less than 50
+        distractionFreeMode: false  // Facebook-like distraction free mode
+    });
+    gitalk.render('gitalk-container');
+</script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.css">

layouts/partials/extended_head.html

@@ -1,2 +1,7 @@
-<script async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
-<style type="text/css">body {font-weight: unset !important;}</style>
+<script async src="https://busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
+<style type="text/css">body {font-weight: unset !important;font-family: -apple-system,BlinkMacSystemFont,Helvetica Neue,PingFang SC,Microsoft YaHei,Source Han Sans SC,Noto Sans CJK SC,WenQuanYi Micro Hei,sans-serif!important;}</style>
+
+<meta http-equiv="x-dns-prefetch-control" content="on">
+<link rel="dns-prefetch" href="//api.github.com" />
+<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22>
+    <text y=%22.9em%22 font-size=%2290%22>👋</text></svg>">

layouts/partials/footer.html

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <div id="gitalk-container" style="
     margin: 20px auto;
     max-width: 800px;
@@ -71,6 +72,28 @@
     }
 </style>
 
+=======
+
+<!-- 超链接样式 -->
+<style>
+    .post-tags a,
+    .post-content a {
+        text-decoration: none;
+        border-bottom: 1px dashed #d71a1b;
+        -webkit-transition: all .2s;
+        transition: all .2s;
+    }
+
+    .post-tags a:hover,
+    .post-content a:hover,
+    nav a:hover {
+        text-decoration: none;
+        border-bottom: 1px solid #d71a1b;
+        -webkit-transition: all .2s ease-out;
+        transition: all .2s ease-out;
+    }
+</style>
+>>>>>>> dce5b411423b26f3b76842da9f7e8580a51953c2
 <footer class="footer">
     <span id="busuanzi_container_site_pv" style='display:none'>
         嗨，第<span id="busuanzi_value_site_pv"></span>位小伙伴 : )
@@ -93,7 +116,6 @@
 
 <script src="{{ "assets/main.js" | absURL }}"></script>
 <script async src="{{ "assets/prism.js" | absURL }}"></script>
-<script src="https://cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js"></script>
 
 <script>
     meta = document.querySelectorAll('.post:not(.on-list) .post-meta')[0];
@@ -101,19 +123,7 @@
     if (meta) meta.innerHTML = meta.innerHTML + visitors
 </script>
 
-<script>
-    const gitalk = new Gitalk({
-        clientID: '94eae56b89dcc480bf4d',
-        clientSecret: '1e4218c0293a998a9483ab09ba9ace46cabc76b3',
-        repo: 'Colinx-Blog',      // The repository of store comments,
-        owner: 'Colin-XKL',
-        admin: ['Colin-XKL'],
-        id: decodeURI(location.pathname),  // Ensure uniqueness and length less than 50
-        distractionFreeMode: false  // Facebook-like distraction free mode
-    });
-    gitalk.render('gitalk-container');
-</script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.css">
+
 <!-- Sentry -->
 <script src="https://browser.sentry-cdn.com/6.15.0/bundle.tracing.min.js"
     integrity="sha384-1k7XKRQgqjUbNyG2sI+qsY8HTHMOeLdycMx6hoGuNSANZ3WrMa3LXkr+M4t+SIpF"