From 7340e345ef48d210113e3b274ea9d7b3420a8e25 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <17683872107czx> Date: Tue, 11 Jul 2023 17:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/about.html | 2 +- templates/categories.html | 3 +- templates/fcircle.html | 3 +- templates/links.html | 3 +- templates/modules/head.html | 4 +- templates/modules/layouts/layout.html | 3 +- templates/modules/right-menu.html | 3 +- .../widgets/about-widgets/authorCareers.html | 86 +++++++++---------- .../about-widgets/personalities-photo.html | 32 +++---- templates/modules/widgets/aside/profile.html | 2 +- templates/modules/widgets/aside/wechat.html | 4 +- templates/modules/widgets/banner-group.html | 56 ++++++------ templates/music.html | 3 +- 13 files changed, 100 insertions(+), 104 deletions(-) diff --git a/templates/about.html b/templates/about.html index c42113a2..662e537e 100644 --- a/templates/about.html +++ b/templates/about.html @@ -25,7 +25,7 @@
+ th:src="@{${#strings.isEmpty(site.logo) ? assets_link + '/images/hao-logo.jpg' : site.logo}}">
+ xmlns:th="http://www.thymeleaf.org"> diff --git a/templates/fcircle.html b/templates/fcircle.html index 7c118f6b..f32b46b2 100644 --- a/templates/fcircle.html +++ b/templates/fcircle.html @@ -1,7 +1,6 @@ + xmlns:th="http://www.thymeleaf.org"> diff --git a/templates/links.html b/templates/links.html index d24f93f1..9dfd9329 100644 --- a/templates/links.html +++ b/templates/links.html @@ -1,7 +1,6 @@ + xmlns:th="http://www.thymeleaf.org">
diff --git a/templates/modules/head.html b/templates/modules/head.html index e573ce3b..759ab5ab 100644 --- a/templates/modules/head.html +++ b/templates/modules/head.html @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ + th:href="@{${#strings.isEmpty(site.favicon) ? assets_link + '/images/hao-logo.jpg' : site.favicon}}"/> diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html index 79eed9af..d03e6541 100644 --- a/templates/modules/layouts/layout.html +++ b/templates/modules/layouts/layout.html @@ -1,6 +1,7 @@ + th:with="assets_link=${theme.config.other.staticResource.use == 'elemecdn' ? 'https://npm.elemecdn.com/hao-theme-static@' + theme.spec.version +'/templates/assets' : + theme.config.other.staticResource.use == 'custom' ? theme.config.other.staticResource.cdn_link : #theme.assets('/')}"> diff --git a/templates/modules/right-menu.html b/templates/modules/right-menu.html index c3ccd3da..bb23d234 100644 --- a/templates/modules/right-menu.html +++ b/templates/modules/right-menu.html @@ -1,6 +1,5 @@ - +
diff --git a/templates/modules/widgets/about-widgets/authorCareers.html b/templates/modules/widgets/about-widgets/authorCareers.html index 75d4d71e..f1e89c09 100644 --- a/templates/modules/widgets/about-widgets/authorCareers.html +++ b/templates/modules/widgets/about-widgets/authorCareers.html @@ -16,133 +16,133 @@ th:if="${#strings.equals(theme.config.top.bannersBackground, 'default')}">
-
-
-
-
-
-
-
-
-
- +
- +
- +
- +
-
-
-
-
-
-
-
-
-
-
- +
- +
- +
- +
-
@@ -181,7 +181,7 @@
-
AfterEffect
@@ -189,28 +189,28 @@
- +
Sketch
- +
Docker
- +
Photoshop
-
FinalCutPro
@@ -218,28 +218,28 @@
- +
Python
- +
Swift
- +
Principle
-
illustrator
@@ -247,35 +247,35 @@
- +
CSS3
- +
JS
- +
HTML
- +
Git
- +
Apifox
@@ -312,7 +312,7 @@
生涯 + th:src="@{${#strings.isEmpty(theme.config.about.authorCareers.authorCareersBackground) ? assets_link + '/images/hao-logo.jpg' : theme.config.about.authorCareers.authorCareersBackground}}">
diff --git a/templates/modules/widgets/about-widgets/personalities-photo.html b/templates/modules/widgets/about-widgets/personalities-photo.html index 7fa2160e..c9d4300f 100644 --- a/templates/modules/widgets/about-widgets/personalities-photo.html +++ b/templates/modules/widgets/about-widgets/personalities-photo.html @@ -10,7 +10,7 @@ 调停者
INFP
-
+
在 16personalities @@ -22,7 +22,7 @@ 建筑师
INTJ
-
+
在 16personalities @@ -34,7 +34,7 @@ 逻辑学家
INTP
-
+
在 16personalities @@ -46,7 +46,7 @@ 指挥官
ENTJ
-
+
在 16personalities @@ -58,7 +58,7 @@ 辩论家
ENTP
-
+
在 16personalities @@ -70,7 +70,7 @@ 主人公
ENFJ
-
+
在 16personalities @@ -82,7 +82,7 @@ 竞选者
ENFP
-
+
在 16personalities @@ -94,7 +94,7 @@ 总经理
ESTJ
-
+
在 16personalities @@ -106,7 +106,7 @@ 企业家
ESTP
-
+
在 16personalities @@ -118,7 +118,7 @@ 执政官
ESFJ
-
+
在 16personalities @@ -130,7 +130,7 @@ 表演者
ESFP
-
+
在 16personalities @@ -142,7 +142,7 @@ 提倡者
INFJ
-
+
在 16personalities @@ -154,7 +154,7 @@ 物流师
ISTJ
-
+
在 16personalities @@ -166,7 +166,7 @@ 鉴赏家
ISTP
-
+
在 16personalities @@ -178,7 +178,7 @@ 守卫者
ISFJ
-
+
在 16personalities @@ -190,7 +190,7 @@ 探险家
ISFP
-
+
在 16personalities diff --git a/templates/modules/widgets/aside/profile.html b/templates/modules/widgets/aside/profile.html index 4b747eb6..c2919fa1 100644 --- a/templates/modules/widgets/aside/profile.html +++ b/templates/modules/widgets/aside/profile.html @@ -9,7 +9,7 @@
你好啊！我是
+ th:src="@{${#strings.isEmpty(site.logo) ? assets_link + '/images/hao-logo.jpg' : site.logo}}">
+ th:style="'background: url('+ @{${#strings.isEmpty(faceImg) ? assets_link + '/images/wechat/wechat1.png' : faceImg }} +') center center / 100% no-repeat;'">
+ th:style="'background: url('+ @{${#strings.isEmpty(backImg) ? assets_link + '/images/wechat/wechat2.png' : backImg }} +') center center / 100% no-repeat;'">
diff --git a/templates/modules/widgets/banner-group.html b/templates/modules/widgets/banner-group.html index 038d6381..99a41e01 100644 --- a/templates/modules/widgets/banner-group.html +++ b/templates/modules/widgets/banner-group.html @@ -19,114 +19,114 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/templates/music.html b/templates/music.html index 4f1a3823..48a58612 100644 --- a/templates/music.html +++ b/templates/music.html @@ -1,7 +1,6 @@ + xmlns:th="http://www.thymeleaf.org">