Skip to content

Commit 010d2a5

Browse files
luliqwertyluliqwerty
committed
udpate reimu
1 parent 176262f commit 010d2a5

File tree

10 files changed

+82
-43
lines changed

10 files changed

+82
-43
lines changed

‎themes/reimu/README.en.md‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,12 +585,17 @@ If you want to continue using fontawesome icons, set `icon_font` to `false`. Thi
585585
```yml
586586
fontawesome:
587587
high_priority:
588-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/regular.min.css
589-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/solid.min.css
588+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/regular.min.css
589+
integrity: sha384-k5640LgghgAohDLPwSqVWa96yQwWouT6wsAL+J1g0CFJVITNKYkIh1XpPLYKQe7Y
590+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/solid.min.css
591+
integrity: sha384-8yO/A/BtltnG0hDxdwmmkza8UAleyDoAD1FhXiH6rsOQQsCho1P6WZP9TpBBH3YP
590592
low_priority:
591-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/brands.min.css
592-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/v5-font-face.min.css
593-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/v4-font-face.min.css
593+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/brands.min.css
594+
integrity: sha384-/BRyRRN0wxxRgh/DAXU621go9pdoMHl6LFPiX5Pp8PZYZlKBQCDXj9X9DHx6LOud
595+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/v5-font-face.min.css
596+
integrity: sha384-/mBKnLlGtog8q2qQrgugURRDV+iHWHAPvM5KulYXT1C2ErKOKkBI0vbff8ZPq7rL
597+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/v4-font-face.min.css
598+
integrity: sha384-d2Yn1/9Iw78r3oqwk5B+EcpRcmepXR5LyhmRF2a+WoSe9mpRGvVk0ZviFwDGDOTO
594599
```
595600

596601
</details>
@@ -1081,6 +1086,8 @@ v1.0.0 underwent significant refactoring and exposed many configurations for cha
10811086

10821087
The `menu` configuration structure changed in v1.0.0, allowing users to customize icons. When icon is empty, it defaults to the Taichi icon. You can fill in a hexadecimal number to customize the icon, supporting both FontAwesome and icon font.
10831088

1089+
v1.8.4 icon supports image path, such as `/avatar/avatar.webp`.
1090+
10841091
```yaml
10851092
menu:
10861093
- name: home
@@ -1146,6 +1153,8 @@ v1.0.0 added `anchor_icon` configuration for customizing anchor icons, defaults
11461153
anchor_icon: # if the icon is empty, the default # icon is used
11471154
```
11481155

1156+
v1.8.5 `anchor_icon` supports passing `false` to hide anchor icon.
1157+
11491158
##### Cursor Icon (v1.3.0+)
11501159

11511160
v1.3.0 added `reimu_cursor.cursor` configuration for customizing cursor icons. You can fill in a path relative to `css/style.css` to customize cursor icons.

‎themes/reimu/README.md‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,17 @@ icon_font: 4552607_0khxww3tj3q9
586586
```yml
587587
fontawesome:
588588
high_priority:
589-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/regular.min.css
590-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/solid.min.css
589+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/regular.min.css
590+
integrity: sha384-k5640LgghgAohDLPwSqVWa96yQwWouT6wsAL+J1g0CFJVITNKYkIh1XpPLYKQe7Y
591+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/solid.min.css
592+
integrity: sha384-8yO/A/BtltnG0hDxdwmmkza8UAleyDoAD1FhXiH6rsOQQsCho1P6WZP9TpBBH3YP
591593
low_priority:
592-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/brands.min.css
593-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/v5-font-face.min.css
594-
- webcache|@fortawesome/fontawesome-free@6.5.1/css/v4-font-face.min.css
594+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/brands.min.css
595+
integrity: sha384-/BRyRRN0wxxRgh/DAXU621go9pdoMHl6LFPiX5Pp8PZYZlKBQCDXj9X9DHx6LOud
596+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/v5-font-face.min.css
597+
integrity: sha384-/mBKnLlGtog8q2qQrgugURRDV+iHWHAPvM5KulYXT1C2ErKOKkBI0vbff8ZPq7rL
598+
- src: webcache|@fortawesome/fontawesome-free@6.5.1/css/v4-font-face.min.css
599+
integrity: sha384-d2Yn1/9Iw78r3oqwk5B+EcpRcmepXR5LyhmRF2a+WoSe9mpRGvVk0ZviFwDGDOTO
595600
```
596601

597602
</details>
@@ -1085,6 +1090,8 @@ v1.0.0 经过大量重构，向用户暴露了许多配置用于改变原有的
10851090

10861091
v1.0.0 的 `menu` 配置的结构发生了变化，允许用户自定义 icon。icon 为空时默认使用太极图标，你可以填写一个十六进制的数字来自定义 icon，同时支持 fontawesome 和 icon font。
10871092

1093+
v1.8.4 icon 支持图片路径，如 `/avatar/avatar.webp`。
1094+
10881095
```yaml
10891096
menu:
10901097
- name: home
@@ -1150,6 +1157,8 @@ v1.0.0 增加了 `anchor_icon` 配置用于自定义锚点图标，默认使用
11501157
anchor_icon: # 不填默认使用 # 图标
11511158
```
11521159

1160+
v1.8.5 `anchor_icon` 支持传递 `false` 以隐藏锚点图标。
1161+
11531162
##### 鼠标图标（v1.3.0+）
11541163

11551164
v1.3.0 增加了 `reimu_cursor.cursor` 配置用于自定义鼠标图标，你可以填写一个相对于 `css/style.css` 的路径来自定义鼠标图标。

‎themes/reimu/_config.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ i18n:
159159
# CSS
160160
########################################
161161

162-
anchor_icon: # default use '#' icon, you can use a hexadecimal representation of fontawesome or icon_font, like 'f0c1'
162+
anchor_icon: # default use '#' icon, you can use a hexadecimal representation of fontawesome or icon_font, like 'f0c1', or you can use false to hide anchor icon
163163

164164
reimu_cursor:
165165
enable: true
@@ -721,8 +721,8 @@ vendor:
721721
src: webcache|@waline/client@2.15.8/dist/waline.mjs
722722
integrity: sha384-9sbqJjrfGjbkI6/PI4nU/MvBfEmkkPC4YK9I4zBeMIf1CVCZdCMH/KinBEAZII/5
723723
twikoo:
724-
src: webcache|twikoo@1.6.16/dist/twikoo.all.min.js
725-
integrity: sha384-lDHsr5aZmkMS0eKnsUu6e9RWP+dRmn7sgjRAKGOAoXfMyzbUK6Qi86zZK7R+KvRV
724+
src: webcache|twikoo@1.6.44/dist/twikoo.all.min.js
725+
integrity: sha384-kwWLC0HjeZZnVPqCJ1AncI8tsk+kQqF9TbAmCclcc9Z0hGkfgHRzeQZxmdmZhE0K
726726
gitalk:
727727
src: webcache|gitalk@1.8.0/dist/gitalk.min.js
728728
integrity: sha384-kspnZUWBoSWwoJHa0hBCXYbHGbhvU/lcEH5O8eVbSDhbPwsiVUTp/aGX/z/5EuMA
@@ -739,8 +739,8 @@ vendor:
739739
src: webcache|pace-js@1.2.4/pace.min.js
740740
integrity: sha384-k6YtvFUEIuEFBdrLKJ3YAUbBki333tj1CSUisai5Cswsg9wcLNaPzsTHDswp4Az8
741741
mermaid:
742-
src: webcache|mermaid@9.4.3/dist/mermaid.min.js
743-
integrity: sha384-aG3Gai4tbCHF0iXo48HwLoOZyut7mBl50oMC9GD1m75xyHfJDv6w8hD/kZRD47aJ
742+
src: webcache|mermaid@11.6.0/dist/mermaid.min.js
743+
integrity: sha384-zkWMJO4sgpPUzyuOgDx8HB/K55glbAwajEpk1Go2NWRuPkPA/wIhoEJTuSkmOYrV
744744
firework:
745745
src: webcache|mouse-firework@0.1.1/dist/index.umd.js
746746
integrity: sha384-8LyaidD9GPxQQgLJO/WRw/O2h3BoNq/ApI/ecpvM6RsrCz2qP2ppBXUKihP4V/2d
@@ -760,11 +760,11 @@ vendor:
760760
src: webcache|quicklink@2.3.0/dist/quicklink.umd.js
761761
integrity: sha384-aD7FsuQkS1ohgFKY41fJfeA+Wd/QRNnrOd9Bs58K3FzKdJJv8yPnYU8Tnp5z1agS
762762
katex:
763-
src: webcache|katex@0.16.11/dist/katex.min.js
764-
integrity: sha384-7zkQWkzuo3B5mTepMUcHkMB5jZaolc2xDwL6VFqjFALcbeS9Ggm/Yr2r3Dy4lfFg
763+
src: webcache|katex@0.16.22/dist/katex.min.js
764+
integrity: sha384-cMkvdD8LoxVzGF/RPUKAcvmm49FQ0oxwDF3BGKtDXcEc+T1b2N+teh/OJfpU0jr6
765765
katex_auto_render:
766-
src: webcache|katex@0.16.11/dist/contrib/auto-render.min.js
767-
integrity: sha384-43gviWU0YVjaDtb/GhzOouOXtZMP/7XUzwPTstBeZFe/+rCMvRwr4yROQP43s0Xk
766+
src: webcache|katex@0.16.22/dist/contrib/auto-render.min.js
767+
integrity: sha384-hCXGrW6PitJEwbkoStFjeJxv+fSOOQKOPbJxSfM6G5sWZjAyWhXiTIIAmQqnlLlh
768768
mathjax:
769769
src: webcache|mathjax@3.2.2/es5/tex-mml-chtml.js
770770
integrity: sha384-Wuix6BuhrWbjDBs24bXrjf4ZQ5aFeFWBuKkFekO2t8xFU0iNaLQfp2K6/1Nxveei
@@ -794,8 +794,8 @@ vendor:
794794
src: webcache|photoswipe@5.4.4/dist/photoswipe.css
795795
integrity: sha384-IfxC36XL/toUyJ939C73PcgMuRzAZuIzZxE38drsmO5p6jD7ei+Zx/1oA/0l8ysE
796796
katex:
797-
src: webcache|katex@0.16.11/dist/katex.min.css
798-
integrity: sha384-nB0miv6/jRmo5UMMR1wu3Gz6NLsoTkbqJghGIsx//Rlm+ZU03BU6SQNC66uf4l5+
797+
src: webcache|katex@0.16.22/dist/katex.min.css
798+
integrity: sha384-5TcZemv2l/9On385z///+d7MSYlvIEw9FuZTIdZ14vJLqWphw7e7ZPuOiCHJcFCP
799799
waline:
800800
src: webcache|@waline/client@2.15.8/dist/waline.css
801801
integrity: sha384-vltfZtesCdl6NYVcFVcjEaIi5RpNvZe9t7fXvq8twVtcoy+Ub9QgnxUYJmwOhYCK

‎themes/reimu/layout/_partial/article.ejs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,6 @@
5151
<span class="post-comments-count twikoo-comment-count" data-path="<%- url_for_lang(post.path, {relative: false}) %>" itemprop="commentCount"></span>
5252
<%= __('comment') %>
5353
</a>
54-
<script>
55-
twikoo.getCommentsCount({
56-
envId: '<%= theme.twikoo.envId %>',
57-
region: '<%= theme.twikoo.region %>',
58-
urls: [
59-
'<%- url_for_lang(post.path, {relative: false}) %>'
60-
],
61-
includeReply: false
62-
}).then((res) => {
63-
_$('.twikoo-comment-count').innerText = res[0].count;
64-
}).catch((err) => {
65-
console.error(err);
66-
});
67-
</script>
6854
<% } %>
6955
<% if (post.comments !== false && theme.valine.enable && theme.valine.appId && theme.valine.appKey && theme.valine.visitor) { %>
7056
<span data-aos="<%= theme.animation.options.article.reading %>" id="<%- url_for_lang(post.path, {relative: false}).endsWith("index.html") ?

‎themes/reimu/layout/_partial/header.ejs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@
1111
<% for (let item of theme.menu) { %>
1212
<span class="main-nav-link-wrap">
1313
<div class="main-nav-icon icon <%= (item.icon === 'e62b' && theme.icon_font) || (item.icon === 'f6ad' && !theme.icon_font) || !item.icon ? 'rotate' : '' %>">
14-
<%- item.icon ? `&#x${item.icon};` : (theme.icon_font ? '&#xe62b;' : '&#xf6ad;') %>
14+
<% if (item.icon) { %>
15+
<% if (item.icon.includes('/') && item.icon.includes('.')) { %>
16+
<img src="<%- url_for(item.icon, {relative: false}) %>" alt="<%= item.name %> icon" style="height: 1em;">
17+
<% } else { %>
18+
<%- `&#x${item.icon};` %>
19+
<% } %>
20+
<% } else { %>
21+
<%- theme.icon_font ? '&#xe62b;' : '&#xf6ad;' %>
22+
<% } %>
1523
</div>
1624
<a class="main-nav-link" href="<%- url_for_lang(item.url) %>"><%= __(item.name) %></a>
1725
</span>

‎themes/reimu/layout/_partial/post/comment.ejs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,23 @@
106106
if (window.twikoo) {
107107
twikoo.init({
108108
envId: '<%= theme.twikoo.envId %>',
109-
el: '.tcomment',
109+
el: '.twikoo-comment',
110110
region: '<%= theme.twikoo.region %>',
111111
lang: document.documentElement.lang || 'en',
112-
})
112+
});
113+
114+
twikoo.getCommentsCount({
115+
envId: '<%= theme.twikoo.envId %>',
116+
region: '<%= theme.twikoo.region %>',
117+
urls: [
118+
'<%- url_for_lang(post.path, {relative: false}) %>'
119+
],
120+
includeReply: false
121+
}).then((res) => {
122+
_$('.twikoo-comment-count').innerText = res[0].count;
123+
}).catch((err) => {
124+
console.error(err);
125+
});
113126
}
114127
}
115128
document.head.appendChild(script);

‎themes/reimu/layout/_partial/sidebar/common-sidebar.ejs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@
3838
<div class="sidebar-menu-link-wrap">
3939
<a class="sidebar-menu-link-dummy" href="<%- url_for_lang(item.url, { relative: false }) %>" aria-label="<%= __(item.name) %>"></a>
4040
<div class="sidebar-menu-icon icon <%= (item.icon === 'e62b' && theme.icon_font) || (item.icon === 'f6ad' && !theme.icon_font) || !item.icon ? 'rotate' : '' %>">
41-
<%- item.icon ? `&#x${item.icon};` : (theme.icon_font ? '&#xe62b;' : '&#xf6ad;') %>
41+
<% if (item.icon) { %>
42+
<% if (item.icon.includes('/') && item.icon.includes('.')) { %>
43+
<img src="<%- url_for(item.icon, {relative: false}) %>" alt="<%= item.name %> icon" style="width: 1em;">
44+
<% } else { %>
45+
<%- `&#x${item.icon};` %>
46+
<% } %>
47+
<% } else { %>
48+
<%- theme.icon_font ? '&#xe62b;' : '&#xf6ad;' %>
49+
<% } %>
4250
</div>
4351
<div class="sidebar-menu-link"><%= __(item.name) %></div>
4452
</div>

‎themes/reimu/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hexo-theme-reimu",
3-
"version": "1.8.3",
3+
"version": "1.8.5",
44
"description": "A Hakurei Reimu style Hexo theme",
55
"repository": {
66
"type": "git",

‎themes/reimu/scripts/helper/config.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ hexo.extend.helper.register("themeConfig", function () {
2727
addConfig("swPath", url_for.call(hexo, "/sw.js"));
2828
}
2929
addConfig("outdate", config.outdate?.enable ? config.outdate : null);
30-
addConfig("anchor_icon", config.anchor_icon);
30+
if (config.anchor_icon || config.anchor_icon === false) {
31+
_global.push(
32+
`window.REIMU_CONFIG.anchor_icon = ${
33+
typeof config.anchor_icon === "string" ? `'${config.anchor_icon}'` : JSON.stringify(config.anchor_icon)
34+
};`
35+
);
36+
}
3137
addConfig("code_block", config.code_block);
3238
addConfig("base", siteConfig.url);
3339
if (config.i18n?.enable) {

‎themes/reimu/source/js/pjax_script.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ _$$(
3434
// iconfont
3535
element.innerHTML = window.REIMU_CONFIG.anchor_icon
3636
? `&#x${window.REIMU_CONFIG.anchor_icon};`
37-
: "&#xe635;";
37+
: window.REIMU_CONFIG.anchor_icon === false ? "" : "&#xe635;";
3838
} else {
3939
// fontawesome
4040
element.innerHTML = window.REIMU_CONFIG.anchor_icon
4141
? `&#x${window.REIMU_CONFIG.anchor_icon};`
42-
: "&#xf292;";
42+
: window.REIMU_CONFIG.anchor_icon === false ? "" : "&#xf292;";
4343
}
4444
});
4545

0 commit comments

Comments
 (0)