Merge pull request #334 from xzhuz/halo

🐛 Fix: 修复复制代码时每行多换行符#324

module/plugins.ftl

@@ -17,13 +17,10 @@
 
 <#-- 代码高亮-->
 <script src="${theme_base!}/source/highlight.js/highlight.min.js"></script>
-
 <#--其他语言包-->
-<#if settings.more_lang_code!false>
-  <script src="${theme_base!}/source/highlight.js/highlight.lang.js"></script>
-</#if>
+<script src="${theme_base!}/source/highlight.js/highlight.lang.js"></script>
 <#--代码行数-->
-<script src="${theme_base!}/source/highlight.js/linesNumber.js"></script>
+<script src="${theme_base!}/source/highlight.js/highlight-line-numbers.js"></script>
 
 <#--标签云-->
 <script src="${theme_base!}/source/js/plugins/jqcloud-1.0.4.min.js"></script>

module/widget/sponsor.ftl

@@ -4,22 +4,30 @@
             <#if settings.QR_code_zfb??>
                 <a href="javascript:;" id="alipay" class="text-xl"
                    style="text-decoration: none !important; box-shadow: none !important;">
-                  <i class="iconfont icon-yooxi hover:text-red-500 text-xl dark:text-gray-300 border-r border-gray-600 dark:border-gray-700 pr-3"></i></a>
+                    <i class="iconfont icon-yooxi hover:text-red-500 text-xl dark:text-gray-300"></i>
+                </a>
+            </#if>
+            <#if settings.QR_code_zfb?? && settings.QR_code_wx??>
+                <i class="border-r border-gray-600 dark:border-gray-700 pl-1.5 mr-1.5"></i>
             </#if>
             <#if settings.QR_code_wx??>
-                <a href="javascript:;" id="wechat" class="pl-3" 
+                <a href="javascript:;" id="wechat" 
                    style="text-decoration: none !important; box-shadow: none !important;">
                   <i class="iconfont icon-wechat hover:text-red-500 text-xl dark:text-gray-300"></i></a>
             </#if>
         </div>
         <#if settings.QR_code_zfb??>
             <div class="qrcode qrcode-alipay hidden p-4 w-56 h-56 z-50 my-4 mx-auto">
-                <img class="fade-down max-h-200 dark:filter-60" src="${settings.QR_code_zfb}">
+                <span style="display: block;" data-fancybox="gallery" href="${settings.QR_code_zfb}">
+                  <img class="fade-down max-h-200 dark:filter-60" src="${settings.QR_code_zfb}">
+                </span>
             </div>
         </#if>
         <#if settings.QR_code_wx??>
             <div class="qrcode qrcode-wechat hidden p-4 w-56 h-56 z-50 my-4 mx-auto">
-                <img class="fade-down max-h-200 dark:filter-60" src="${settings.QR_code_wx}">
+                <span style="display: block;" data-fancybox="gallery" href="${settings.QR_code_wx}">
+                  <img class="fade-down max-h-200 dark:filter-60" src="${settings.QR_code_wx}">
+                </span>
             </div>
         </#if>
     </section>

post.ftl

@@ -31,11 +31,13 @@
         </div>
       </div>
     </header>
+    <#--  文章主内容  -->
     <div class="article-content fade-up">
       <div class="mx-auto bg-white dark:bg-gray-800 rounded-md px-10 py-10 md-content mt-8 max-w-4xl tracking-wider md:leading-relaxed sm:leading-normal heti text-gray-800 dark:text-gray-300"
            id="lightGallery">
         ${post.content!}
         <hr class="bg-gray-100 dark:bg-gray-700 ">
+        <#--  标签  -->
         <div class="flex flex-row justify-between flex-wrap">
           <div class="tag-list leading-9">
             <#if post.tags?? && post.tags?size gt 0>
@@ -53,6 +55,7 @@
               </#list>
             </#if>
           </div>
+          <#--  分享  -->
           <#if settings.allow_share!true>
             <div class="share-items">
               <a class="share-link share-item" href="javascript:;" data-clipboard-text="${post.fullPath!}"