Merge pull request #418 from chengzhongxue/main

图库-图片左上角标签加控制按钮, 去掉twikoo评论表情点击预览图片, 添加订阅卡片样式, 前往控制台控制开关

settings.yaml

@@ -57,9 +57,9 @@ spec:
               key: travelling
               label: 开往按钮
               options:
-                - label: 打开
+                - label: 显示
                   value: true
-                - label: 关闭
+                - label: 隐藏
                   value: false
             - $formkit: url
               if: $get(travelling).value
@@ -72,19 +72,33 @@ spec:
               label: 随机文章
               help: 右上角随机文章按钮
               options:
-                - label: 打开
+                - label: 显示
                   value: true
-                - label: 关闭
+                - label: 隐藏
                   value: false
             - $formkit: radio
               name: darkMode
               label: 切换模式
               help: 右上角切换主题模式按钮
               options:
-                - label: 打开
+                - label: 显示
                   value: true
-                - label: 关闭
+                - label: 隐藏
                   value: false
+            - $formkit: group
+              name: console
+              label: 中控台
+              value:
+                consoleLink: false
+              children:
+                - $formkit: radio
+                  name: consoleLink
+                  label: 前往控制台
+                  options:
+                    - label: 显示
+                      value: true
+                    - label: 隐藏
+                      value: false
 
     - group: top
       label: 顶部
@@ -1534,6 +1548,16 @@ spec:
           name: detail
           label: 描述
           value: 每一张照片都是一次美好的记忆。
+        - $formkit: radio
+          name: tagEnable
+          label: 图片标签
+          value: false
+          help: 图片左上角标签
+          options:
+            - label: 显示
+              value: true
+            - label: 隐藏
+              value: false
 
     - group: todo
       label: 待办清单

templates/assets/js/main.js

@@ -173,7 +173,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     const jqLoadAndRun = () => {
         const $fancyboxEle = GLOBAL_CONFIG.lightbox === 'fancybox'
-            ? document.querySelectorAll('#article-container :not(a):not(.gallery-group):not(.site-card-avatar):not(.flink-item-info) > img, #article-container > img,.bber-container-img > img')
+            ? document.querySelectorAll('#article-container :not(a):not(.gallery-group):not(.site-card-avatar):not(.flink-item-info):not(.rss-plan-info-group) > img, #article-container > img,.bber-container-img > img')
             : []
         const fbLengthNoZero = $fancyboxEle.length > 0
         const $jgEle = document.querySelectorAll('#article-container .gallery')

templates/assets/zhheo/zhheoblog.css

@@ -3082,11 +3082,11 @@ ul {
     overflow-wrap: break-word;
 }
 
-#article-container a {
+#article-container a:not(.rss-plan-item) {
     color: rgb(48, 122, 246);
 }
 
-#article-container a:hover {
+#article-container a:not(.rss-plan-item):hover {
     text-decoration: underline;
 }
 
@@ -11416,7 +11416,7 @@ details[open]:not(.tk-admin-config-group):not(.card-friend-class-name) > summary
 }
 
 /* 文章中的超链接 */
-#article-container a {
+#article-container a:not(.rss-plan-item) {
     text-decoration: none;
     border-bottom: 2px solid var(--heo-lighttext);
     color: var(--heo-fontcolor);
@@ -11425,7 +11425,7 @@ details[open]:not(.tk-admin-config-group):not(.card-friend-class-name) > summary
     border-radius: 4px 4px 0 0;
 }
 
-#article-container a:not(.fancybox):hover {
+#article-container a:not(.fancybox):not(.rss-plan-item):hover {
     text-decoration: none;
     border-bottom: 2px solid var(--heo-none);
     color: var(--heo-white);
@@ -17205,6 +17205,115 @@ span.hexo-douban-pagenum {
     }
 }
 
+
+/* 订阅卡片 */
+.rss-plan-list {
+    display: flex;
+    width: 100%;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin: 0 -4px;
+    position: relative
+}
+
+.rss-plan-item.rss-plan-wechat {
+    background: #27c125;
+    overflow: hidden
+}
+
+.rss-plan-item.rss-plan-mail {
+    background: var(--heo-blue)
+}
+
+.rss-plan-item.rss-plan-rss {
+    background: var(--heo-orange)
+}
+
+.rss-plan-item {
+    border-radius: 12px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    min-width: 240px;
+    height: 240px;
+    margin: 4px auto;
+    overflow: hidden;
+    text-decoration: none;
+    width: calc(100% / 3 - 8px);
+    filter: brightness(1);
+    transition: .3s
+}
+
+.rss-plan-item:hover {
+    filter: brightness(1.1)
+}
+
+@media screen and (max-width: 1024px) {
+    .rss-plan-item {
+        width:calc(100% / 2 - 4px)
+    }
+
+    .rss-plan-item:first-child {
+        width: 100%
+    }
+}
+
+@media screen and (max-width: 768px) {
+    .rss-plan-item {
+        width:100%
+    }
+}
+
+.rss-plan-item:visited {
+    color: var(--heo-white)
+}
+
+.rss-plan-description {
+    font-size: 16px;
+    color: var(--heo-white);
+    margin: 26px 0 0 30px;
+    line-height: 20px
+}
+
+img.rss-plan-icon {
+    position: absolute;
+    bottom: -50px;
+    right: -20px;
+    height: 140px;
+    user-select: none;
+    -webkit-user-drag: none;
+    transition: all 1.2s cubic-bezier(.39,.575,.565,1);
+    transform-origin: bottom right;
+    filter: blur(8px);
+    opacity: .6
+}
+
+.rss-plan-item:hover img.rss-plan-icon {
+    bottom: -40px;
+    right: -10px;
+    filter: blur(0);
+    opacity: 1
+}
+
+.rss-plan-info-group {
+    position: relative;
+    margin: 0 0 26px 30px;
+    color: var(--heo-white)
+}
+
+.rss-plan-title {
+    font-size: 36px;
+    font-weight: 700;
+    width: fit-content;
+    line-height: 1
+}
+
+.rss-plan-info {
+    width: fit-content;
+    opacity: .6
+}
+
+
 /*   文章目录样式 */
 a.toc-link {
     color: currentColor;

templates/modules/comment/twikoo.html

@@ -17,7 +17,7 @@
                 envId: "[(${theme.config.comments.twikoos.envId})]",
                 region: '',
                 onCommentLoaded: function () {
-                    btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.vemoji)'))
+                    btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
                     $("input").focus(function () {
                         heo_intype = true;
                     });

templates/modules/widgets/console.html

@@ -131,7 +131,7 @@
         <i class="haofont hao-icon-music"></i>
       </a>
     </div>
-    <div class="console-btn-item" id="consoleLink2Console" title="前往控制台">
+    <div th:if="${theme.config.nav.right.console.consoleLink}" class="console-btn-item" id="consoleLink2Console" title="前往控制台">
       <a class="console-link" data-pjax-state="" href="/console">
         <i class="iconfont icon-a-theconsole-fill"></i>
       </a>

templates/modules/widgets/top-group.html

@@ -30,7 +30,7 @@
     <!-- 自定义的文章右上角的推荐文章 -->
     <div class="recent-post-item"
          th:each="cuscomPost : ${theme.config.top.BannerRight.recommendPostCustom}"
-         th:if="${#strings.equals(theme.config.top.BannerRight.recommendPost, 'custom')}">
+         th:if="${#strings.equals(theme.config.top.BannerRight.recommendPost, 'custom') && not #strings.isEmpty(cuscomPost.post) }">
         <th:block th:with="post = ${postFinder.getByName(cuscomPost.post)}">
             <div class="post_cover">
                 <a th:href="@{${post.status.permalink}}" th:title="${post.spec.title}">
@@ -71,4 +71,4 @@
         </div>
     </div>
 </div>
-</html>
+</html>

templates/photos.html

@@ -29,7 +29,7 @@
                                 <div class="gallery">
                                     <div class="fj-gallery-item"
                                          th:each="photo : ${photoFinder.listBy(param.photo_group_name)}">
-                                        <div class="tag-address">[[${photo.spec.displayName}]]</div>
+                                        <div th:if="${theme.config.photos.tagEnable}" class="tag-address">[[${photo.spec.displayName}]]</div>
                                         <img th:src="${photo.spec.url}" th:alt="${photo.spec.description}"
                                              th:title="${photo.spec.description}">
 
@@ -52,7 +52,7 @@
                                 <div class="gallery">
                                     <div class="fj-gallery-item"
                                          th:each="photo : ${photoFinder.listBy(param.photo_group_name)}">
-                                        <div class="tag-address">[[${photo.spec.displayName}]]</div>
+                                        <div th:if="${theme.config.photos.tagEnable}" class="tag-address">[[${photo.spec.displayName}]]</div>
                                         <img th:src="${photo.spec.url}" th:alt="${photo.spec.description}"
                                              th:title="${photo.spec.description}">