Merge remote-tracking branch 'origin/dev' into dev

settings.yaml

@@ -88,16 +88,6 @@ spec:
               value: false
             - label: 隐藏
               value: true
-        - $formkit: radio
-          name: social_media
-          label: 社交媒体
-          value: true
-          help: 是否在HTML下添加社交媒体的META参数，隐藏时可由相关插件添加。
-          options:
-            - label: 显示
-              value: true
-            - label: 隐藏
-              value: false
     - group: basic_style
       label: '基础样式'
       formSchema:

templates/common/head.html

@@ -10,19 +10,17 @@ th:with="description=${isPost ? post != null ? post.status.excerpt : singlePage
   <meta name="description" th:content="${description}">
   <meta name="author" th:content="${site.title}">
   <meta name="site" th:content="${site.url}">
-  <th:block th:if="${theme.config.basic_info.social_media}">
+  <meta property="og:type" content="website">
-    <meta property="og:type" content="website">
+  <meta property="og:title" th:content="${site.title}">
-    <meta property="og:title" th:content="${site.title}">
+  <meta property="og:url" th:content="${#strings.isEmpty(canonical) ? '' : #strings.startsWith(canonical,'http') ? canonical : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + canonical)}">
-    <meta property="og:url" th:content="${#strings.isEmpty(canonical) ? '' : #strings.startsWith(canonical,'http') ? canonical : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + canonical)}">
+  <meta property="og:site_name" th:content="${title}">
-    <meta property="og:site_name" th:content="${title}">
+  <meta property="og:description" th:content="${description}">
-    <meta property="og:description" th:content="${description}">
+  <meta property="og:locale" content="zh">
-    <meta property="og:locale" content="zh">
+  <meta property="og:image" th:content="${#strings.isEmpty(site.favicon) ? '' : #strings.startsWith(site.favicon,'http') ? site.favicon : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + site.favicon)}">
-    <meta property="og:image" th:content="${#strings.isEmpty(site.favicon) ? '' : #strings.startsWith(site.favicon,'http') ? site.favicon : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + site.favicon)}">
+  <meta name="twitter:card" content="summary">
-    <meta name="twitter:card" content="summary">
+  <meta name="twitter:title" th:content="${title}">
-    <meta name="twitter:title" th:content="${title}">
+  <meta name="twitter:description" th:content="${description}">
-    <meta name="twitter:description" th:content="${description}">
+  <meta name="twitter:image" th:content="${#strings.isEmpty(site.favicon) ? '' : #strings.startsWith(site.favicon,'http') ? site.favicon : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + site.favicon)}">
-    <meta name="twitter:image" th:content="${#strings.isEmpty(site.favicon) ? '' : #strings.startsWith(site.favicon,'http') ? site.favicon : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + site.favicon)}">
-  </th:block>
 
   <link rel="canonical" th:href="${#strings.isEmpty(canonical) ? '' : #strings.startsWith(canonical,'http') ? canonical : (#strings.endsWith(canonical,'/') ? #strings.substringBefore(site.url, '/') : site.url + canonical)}"/>
 

templates/widget/notice.html

@@ -2,7 +2,8 @@
      th:fragment="widget (sidebar)"
      th:class="'card widget notice ' + ${sidebar.hide} + ' is-hidden-all'">
     <div class="card-title">
-        <i th:class="${#strings.defaultString(sidebar.icon, 'ri-volume-up-line') + ' card-title-label'}"></i><span th:text="${#strings.defaultString(sidebar.title, '公告')}"></span>
+        <i th:class="${#strings.defaultString(sidebar.icon, 'ri-volume-up-line') + ' card-title-label'}"></i><span
+            th:text="${#strings.defaultString(sidebar.title, '公告')}"></span>
     </div>
     <th:block th:if="${#strings.isEmpty(sidebar.content)}">
         <div class="card-content">
@@ -10,6 +11,8 @@
         </div>
     </th:block>
     <th:block th:if="${!#strings.isEmpty(sidebar.content)}">
-        [(${sidebar.content})]
+        <div class="card-content">
+            [(${sidebar.content})]
+        </div>
     </th:block>
 </div>

theme.yaml

@@ -22,7 +22,7 @@ spec:
   # 主题logo地址
   logo: /themes/theme-dream2-plus/assets/img/logo.png
   # 主题地址
-  website: https://github.com/zsjy/halo-theme-dream2.0-plus
+  website: https://www.hcjike.com/docs/halo-theme-dream2.0
   # 主题github开源地址
   repo: https://github.com/zsjy/halo-theme-dream2.0-plus.git
   # 提交问题地址