colin/Colinx-Blog
1
0
Fork 0
mirror of https://github.com/Colin-XKL/Colinx-Blog.git synced 2026-01-13 11:11:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: chaos after merge

Browse Source
This commit is contained in:
Colin
2022-05-01 15:45:25 +08:00
parent 8970113e4e
commit 85cb7854a5
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
layouts/partials/extended_footer.html
View File

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

13
layouts/partials/footer.html
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
<div id="gitalk-container" style=" <div id="gitalk-container" style="
margin: 20px auto; margin: 20px auto;
max-width: 800px; max-width: 800px;
@@ -70,9 +69,15 @@
white-space: nowrap; white-space: nowrap;
font-size: 1rem; font-size: 1rem;
} }
</style>
======= .is-active-link::before {
background-color: #d71a1b;
}
.logo__cursor {
background: #d71a1b;
}
</style>
<!-- 超链接样式 --> <!-- 超链接样式 -->
<style> <style>
@@ -92,8 +97,8 @@
-webkit-transition: all .2s ease-out; -webkit-transition: all .2s ease-out;
transition: all .2s ease-out; transition: all .2s ease-out;
} }
</style> </style>
>>>>>>> dce5b411423b26f3b76842da9f7e8580a51953c2
<footer class="footer"> <footer class="footer">
<span id="busuanzi_container_site_pv" style='display:none'> <span id="busuanzi_container_site_pv" style='display:none'>
嗨，第<span id="busuanzi_value_site_pv"></span>位小伙伴 : ) 嗨，第<span id="busuanzi_value_site_pv"></span>位小伙伴 : )