fix: chaos after merge

layouts/partials/extended_footer.html

@@ -1,5 +1,5 @@
 <!-- link style -->
-<style>
+<!-- <style>
     .post-content a {
         transition: background-size 0.1s ease;
         background: linear-gradient(to bottom, transparent 62%, #fff56644 0) center center/0% 75% no-repeat;
@@ -15,7 +15,7 @@
     .post-content a:active {
         background-size: 80% 100%;
     }
-</style>
+</style> -->
 
 
 <style>

layouts/partials/footer.html

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <div id="gitalk-container" style="
     margin: 20px auto;
     max-width: 800px;
@@ -70,9 +69,15 @@
         white-space: nowrap;
         font-size: 1rem;
     }
-</style>
 
-=======
+    .is-active-link::before {
+        background-color: #d71a1b;
+    }
+
+    .logo__cursor {
+        background: #d71a1b;
+    }
+</style>
 
 <!-- 超链接样式 -->
 <style>
@@ -92,8 +97,8 @@
         -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>位小伙伴 : )