diff --git a/package.json b/package.json index 792b61c2..51cac2bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-theme-hao", - "version": "1.0.4", + "version": "1.0.5", "dependencies": { } } diff --git a/settings.yaml b/settings.yaml index 51423e99..675ccfe3 100644 --- a/settings.yaml +++ b/settings.yaml @@ -124,7 +124,7 @@ spec: - $formkit: group if: "$get(todayRecommend).value" name: todayRecommendContent - label: 公众号 + label: 今日推荐 value: todayRecommendUrl: todayRecommendTitle: diff --git a/templates/links.html b/templates/links.html index e3b27d96..1a439dd8 100644 --- a/templates/links.html +++ b/templates/links.html @@ -1,46 +1,6 @@ - - - -
diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html index 4ce2615d..a1f3b8a8 100644 --- a/templates/modules/layouts/layout.html +++ b/templates/modules/layouts/layout.html @@ -98,7 +98,7 @@ coverColor(); } - if ([[${theme.config.other.loadingBox} and not ${#strings.isEmpty(theme.config.other.loadingBoxImg)}]]) { + if ([[${theme.config.other.loadingBox}]]) { // 移除加载动画 removeLoading(); } diff --git a/templates/modules/loading-box.html b/templates/modules/loading-box.html index 27c8332e..9a1b5cbc 100644 --- a/templates/modules/loading-box.html +++ b/templates/modules/loading-box.html @@ -5,6 +5,47 @@
+ + + +
diff --git a/templates/modules/widgets/top-group.html b/templates/modules/widgets/top-group.html index ad736176..ff636b96 100644 --- a/templates/modules/widgets/top-group.html +++ b/templates/modules/widgets/top-group.html @@ -44,11 +44,10 @@
-
+ th:if="${theme.config.top.todayRecommend}" + th:attr="onclick='javascript:window.open(\''+ ${theme.config.top.todayRecommendContent.todayRecommendUrl} +'\')'">
今日推荐
diff --git a/templates/page.html b/templates/page.html index bcbbe01e..ef52ffd4 100644 --- a/templates/page.html +++ b/templates/page.html @@ -12,6 +12,23 @@
+ + +
+ +
+
+
评论
+ +
+ 你无需删除空行,直接评论以获取最佳展示效果 +
+
+ +
+
diff --git a/theme.yaml b/theme.yaml index 7c259178..0ee37e80 100644 --- a/theme.yaml +++ b/theme.yaml @@ -13,5 +13,5 @@ spec: repo: 'https://github.com/liuzhihang/halo-theme-hao' settingName: "theme-hao-setting" configMapName: "theme-hao-configMap" - version: 1.0.4 + version: 1.0.5 require: 2.0.0