github
/
halo-theme-hao
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #421 from chengzhongxue/main 

静态资源cdn添加 cbd,图标库修改
This commit is contained in:
困困鱼 2023-08-15 01:13:28 +08:00 committed by GitHub
parent ad61b9f322 359cebbb95
commit 416078529b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings.yaml
View File

@ -2611,6 +2611,8 @@ spec:
value: local value: local
- label: onmicrosoft - label: onmicrosoft
value: onmicrosoft value: onmicrosoft
- label: cbd
value: cbd
- label: 自定义 - label: 自定义
value: custom value: custom
- $formkit: url - $formkit: url

2
templates/modules/head.html
View File

@ -181,7 +181,7 @@
th:src="${assets_link + '/libs/gpt/post-ai.js'}"></script> th:src="${assets_link + '/libs/gpt/post-ai.js'}"></script>
<!-- icon图标 --> <!-- 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"> <script id="site-config" th:inline="javascript">

1
templates/modules/layouts/layout.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:fragment="layout(content, htmlType)" xmlns:th="http://www.thymeleaf.org" <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' : 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.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 : ''}"> theme_version = ${ theme.config.other.staticResource.use == 'local' ? '?v='+ theme.spec.version : ''}">