Merge pull request #219 from xzhuz/dev-1.3.2

release 1.3.2

Author: xzhuz

archives.ftl

@@ -25,20 +25,20 @@
       <@postTag method="archiveMonth">
         <#assign year="">
         <#list archives as archive>
-          <section class="arch-year pt-0.5 pb-0.5 px-0 relative border-transparent">
+          <section class="archive-year pt-0.5 pb-0.5 px-0 relative border-transparent">
             <#if archive.year?c != year>
               <h1 class="m-0 leading-9 text-gray-800 dark:text-gray-300 bg-gray-50 dark:bg-gray-900 relative">${archive.year?c}</h1>
               <#assign year="${archive.year?c}">
             </#if>
             <div class="relative pl-12">
-              <header class="absolute mh-hd py-0 pl-2.5 pr-2.5 rounded left-6 text-white uppercase font-semibold leading-loose mt-6 af-bg-fff bg-gray-400 dark:bg-gray-700 dark:text-gray-100"> 
+              <header class="absolute archive-hd py-0 pl-2.5 pr-2.5 rounded left-6 text-white uppercase font-semibold leading-loose mt-6 af-bg-fff bg-gray-400 dark:bg-gray-700 dark:text-gray-100"> 
                 ${archive.month!} 月
               </header>
               <span class="">
                             <#list archive.posts?sort_by("createTime")?reverse as post>
                               <a class="archive-info transition-colors relative block ml-6 px-0 pt-2 pb-2 leading-8" href="${post.fullPath!}">
                                     <span class="archive-date float-left pr-2 whitespace-nowrap tracking-wide text-sm opacity-60 dark:text-gray-300" style="line-height: inherit !important;">${post.createTime?string('MM-dd')}</span>
-                                    <span class="archive-title table-cell text-lg dark:text-gray-300" style="line-height: inherit !important;">${post.title!}</span>
+                                    <span class="archive-title bg-box-shadow table-cell text-lg dark:text-gray-300" style="line-height: inherit !important; position: relative">${post.title!}</span>
                                 </a>
                             </#list>
                         </span>

dist/style.css

@@ -61,7 +61,7 @@
 
                 <div class="flex space-x-5 pt-3 text-gray-500 border-t border-gray-300 dark:border-gray-700">
                   <div class="flex space-x-2">
-                    <svg viewBox="0 0 24 24" fill="currentColor" onclick="likes(this);" data-path="${blog_url!}/api/content/journals/${journal.id}/likes" class="w-6 h-6" style="">
+                    <svg viewBox="0 0 24 24" fill="currentColor" onclick="likes(this);" data-path="${blog_url!}/api/content/journals/${journal.id}/likes" class="w-6 h-6 hover:text-red-300" style="cursor: pointer;">
                       <g>
                         <path d="M12 21.638h-.014C9.403 21.59 1.95 14.856 1.95 8.478c0-3.064 2.525-5.754 5.403-5.754 2.29 0 3.83 1.58 4.646 2.73.814-1.148 2.354-2.73 4.645-2.73 2.88 0 5.404 2.69 5.404 5.755 0 6.376-7.454 13.11-10.037 13.157H12zM7.354 4.225c-2.08 0-3.903 1.988-3.903 4.255 0 5.74 7.034 11.596 8.55 11.658 1.518-.062 8.55-5.917 8.55-11.658 0-2.267-1.823-4.255-3.903-4.255-2.528 0-3.94 2.936-3.952 2.965-.23.562-1.156.562-1.387 0-.014-.03-1.425-2.965-3.954-2.965z">
                         </path>

journals.ftl

@@ -96,9 +96,7 @@
   </div>
 </footer>
 
-<#if settings.right_corner_circle!true>
-  <#include "menu.ftl"/>
-</#if>
+<#include "menu.ftl"/>
 
 <#-- 搜索 -->
 <form method="get" action="/search">

module/footer.ftl

@@ -24,10 +24,7 @@
 
 <script src="${theme_base!}/source/js/plugins/simply-nav.js"></script>
 
-<#if settings.right_corner_circle!true>
-<#--右下角按钮-->
-  <script src="${theme_base!}/source/js/plugins/moon.js"></script>
-</#if>
+<script src="${theme_base!}/source/js/plugins/moon.js"></script>
 
 
 <#if settings.visit_statistics!false>

module/plugins.ftl

@@ -14,11 +14,11 @@
                  alt="${post.title!}"
             />
           <#else>
-            <span class="full-image placeholder-bg w-full h-56" role="img" aria-label=""></span>
+            <span class="full-image placeholder-bg w-full" role="img" aria-label=""></span>
           </#if>
         </figure>
         <div class="flex flex-col gap-2 px-4 py-6" style="flex: 1 1 auto; ">
-          <h2 class="flex items-center gap-2 text-xl leading-7 font-bold my-4 ">
+          <h2 class="flex items-center gap-2 text-xl leading-7 font-bold my-4 z-50">
             <a href="${post.fullPath!}" class="text-gray-800 dark:text-gray-600">${post.title!}</a>
           </h2>
           <div class="flex flex-wrap items-end gap-2 justify-end text-sm">

module/widget/post_cards.ftl

@@ -24,13 +24,13 @@
         <nav id="gallery-filter">
           <ul>
             <li>
-              <a href="javascript:void(0);" data-filter="*" class="active text-gray-800 dark:text-gray-300">全部</a>
+              <a href="javascript:void(0);" data-filter="*" class="active text-gray-800 dark:text-gray-300 bg-box-shadow">全部</a>
             </li>
               <@photoTag method="listTeams">
                   <#list teams as item>
                     <li>
                       <a href="javascript:void(0);"
-                         class="text-gray-800 dark:text-gray-300"
+                         class="text-gray-800 dark:text-gray-300 bg-box-shadow"
                          data-filter=".${((item.team)?length>0)?string((item.team),'默认')}">${((item.team)?length>0)?string((item.team),'默认')}</a>
                     </li>
                   </#list>

photos.ftl

@@ -56,7 +56,7 @@
     <div class="mx-auto md-content mt-8 text-center max-w-4xl tracking-wider md:leading-relaxed sm:leading-normal">
       <#include "module/widget/sponsor.ftl">
       <section class="donate inline-block text-center my-4 w-56" onclick="likes(this);" data-path="${blog_url!}/api/content/posts/${post.id}/likes">
-        <div  class="icon relative inline-block bg-red-600 hover:bg-red-500 rounded-full py-3 px-6 z-20 w-28 cursor-pointer">
+        <div class="icon relative inline-block bg-red-600 hover:bg-red-500 rounded-full py-3 px-6 z-20 w-28 cursor-pointer">
           <span class="iconfont icon-like-fill text-white" ></span>
           <span class="like-count inline-block text-white">${post.likes}</span>
         </div>

post.ftl

@@ -388,9 +388,9 @@ function likes(e) {
     success: function (data) {
       $(e).addClass('liked')
       $(e).removeAttr('onclick');
-      var count =  $(e).siblings('.like-count')
+      var count =  $(e).parent('div').find('.like-count')
       var likeCount = parseInt(count.html())
-      $(e).siblings('.like-count').html(likeCount + 1);
+      $(e).parent('div').find('.like-count').html(likeCount + 1);
     },
     error: function (msg) {
     }

source/js/main.js

@@ -1,18 +1,18 @@
-.arch-year {
+.archive-year {
   border-color: inherit;
 }
 
-.dark .arch-year {
+.dark .archive-year {
   --tw-text-opacity: 1;
   border-color: rgba(209,213,219,var(--tw-text-opacity));
   opacity: .6;
 }
 
-.arch-year:first-of-type {
+.archive-year:first-of-type {
   margin-top: -2.15rem;
 }
 
-.arch-year:before {
+.archive-year:before {
   position: absolute;
   top: 0;
   left: 1.5rem;
@@ -22,20 +22,19 @@
   content: "";
 }
 
-.bg-fff,
 .af-bg-fff:after {
   background: #fff;
 }
 
-.mh-hd:after {
+.archive-hd:after {
   position: absolute;
 }
 
-.mh-hd {
+.archive-hd {
   transform: translate3d(-50%, -50%, 0) scale3d(0.75, 0.75, 1);
 }
 
-.mh-hd:after {
+.archive-hd:after {
   top: 0;
   right: 0;
   bottom: 0;
@@ -47,19 +46,6 @@
   transition: opacity 0.4s;
 }
 
-.archive-info {
-
-  .archive-title {
-    transition: all 0.5s;
-  }
-  
-  &:hover .archive-title {
-    text-decoration: underline;
-    text-decoration-style: dashed;
-    text-underline-position: under;
-  }
-}
-
 .archive-info:before {
   position: absolute;
   top: 1.5rem;