Merge pull request #421 from chengzhongxue/main

静态资源cdn添加 cbd,图标库修改
2023-08-15 01:13:28 +08:00 · 2023-08-15 01:13:28 +08:00 · 416078529b
parent ad61b9f322 359cebbb95
commit 416078529b
3 changed files with 4 additions and 1 deletions
--- a/settings.yaml
+++ b/settings.yaml
@ -2611,6 +2611,8 @@ spec:
                  value: local
                - label: onmicrosoft
                  value: onmicrosoft
+                - label: cbd
+                  value: cbd
                - label: 自定义
                  value: custom
            - $formkit: url
--- a/templates/modules/head.html
+++ b/templates/modules/head.html
@ -181,7 +181,7 @@
            th:src="${assets_link + '/libs/gpt/post-ai.js'}"></script>

    <!-- icon图标 -->
-    <link rel="stylesheet" th:href="'https://npm.onmicrosoft.cn/hao-theme-static@'+${theme.spec.version}+'/icon/iconfont.css'">
+    <link rel="stylesheet" th:href="'https://cdn.cbd.int/hao-theme-static@1.3.2/icon/iconfont.css'">

    <!-- 声明一些公共信息 -->
    <script id="site-config" th:inline="javascript">
--- a/templates/modules/layouts/layout.html
+++ b/templates/modules/layouts/layout.html
@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" th:fragment="layout(content, htmlType)" xmlns:th="http://www.thymeleaf.org"
      th:with="assets_link=${theme.config.other.staticResource.use == 'onmicrosoft' ? 'https://npm.onmicrosoft.cn/hao-theme-static@' + theme.spec.version +'/templates/assets' :
+      theme.config.other.staticResource.use == 'cbd' ? 'https://cdn.cbd.int/hao-theme-static@' + theme.spec.version +'/templates/assets' :
      theme.config.other.staticResource.use == 'custom' ? theme.config.other.staticResource.cdn_link : #theme.assets('/')},
      theme_version = ${ theme.config.other.staticResource.use == 'local' ? '?v='+ theme.spec.version : ''}">