Merge pull request #155 from nineya/dev/3.2

Dev/3.2 发布3.2.0版本
nineya · Dec 6, 2023 · 031a395 · 031a395
2 parents ce768c1 + e0d2768
commit 031a395
Show file tree

Hide file tree

Showing 192 changed files with 288 additions and 48 deletions.
diff --git a/mail_template/mail_notice.ftl b/mail_template/mail_notice.ftl
@@ -7,7 +7,7 @@
     <#local content=content?replace('`([^`]*)`', '<code style="padding:3px 6px;word-break:break-word;background:#e8f3ff;margin:03px;border-radius:4px;color:#409eff;">$1</code>', 'ri')>
     <#local content=content?replace('\\n+', '\n', 'ri')>
     <#list emojis?keys as key>
-        <#local content=content?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/[email protected].5/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
+        <#local content=content?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/[email protected].6/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
     </#list>
     <#return content>
 </#function>

diff --git a/mail_template/mail_reply.ftl b/mail_template/mail_reply.ftl
@@ -7,7 +7,7 @@
     <#local content=content?replace('`([^`]*)`', '<code style="padding:3px 6px;word-break:break-word;background:#e8f3ff;margin:03px;border-radius:4px;color:#409eff;">$1</code>', 'ri')>
     <#local content=content?replace('\\n+', '\n', 'ri')>
     <#list emojis?keys as key>
-        <#local content=content?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/[email protected].5/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
+        <#local content=content?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/[email protected].6/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
     </#list>
     <#return content>
 </#function>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-dream",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "梦之城，童话梦境，动漫类型博客主题。",
   "main": "index.js",
   "author": "nineya",

diff --git a/settings.yaml b/settings.yaml
@@ -166,6 +166,8 @@ basic_style:
           label: 默认
         - value: 'clean'
           label: 清爽
+        - value: 'celebration'
+          label: 庆典
     default_theme:
       name: default_theme
       label: 默认主题模式
@@ -199,6 +201,8 @@ basic_style:
           label: 默认字体
         - value: 'WenCang.woff2'
           label: 问藏书房体
+        - value: 'AlimamaDaoLiTi.woff2'
+          label: 阿里巴巴刀隶体
         - value: 'custom'
           label: 自定义
     custom_font:
@@ -533,6 +537,18 @@ post:
           label: 默认开启
         - value: false
           label: 默认关闭
+    enable_post_donate:
+      name: enable_post_donate
+      label:  开启文章打赏
+      type: radio
+      data-type: bool
+      default: true
+      description: '如果文章或页面元数据配置了 <b><u>enable_donate</u></b> 项，则当前配置将被覆盖。'
+      options:
+        - value: true
+          label:  默认开启
+        - value: false
+          label:  默认关闭
     donate_alipay:
       name: donate_alipay
       label: 支付宝捐赠二维码
@@ -1345,8 +1361,34 @@ enhance:
       options:
         - value: none
           label: 关闭
+        - value: OwO
+          label: OwO
+        - value: UwU
+          label: UwU
         - value: breeze
           label: 清风（深色）
+        - value: mellow
+          label: 卡通圆润
+        - value: water_01
+          label: 彩虹水滴（一）
+        - value: water_02
+          label: 彩虹水滴（二）
+        - value: horse
+          label: 彩虹小马
+        - value: debris
+          label: 彩色碎片
+        - value: overwatch
+          label: 守望先锋
+        - value: rainbow_rain
+          label: 彩虹云雨
+        - value: marry
+          label: 小樱茉莉
+        - value: black_cat
+          label: 黑色小猫
+        - value: music_cat_01
+          label: 音乐小猫（一）
+        - value: music_cat_02
+          label: 音乐小猫（二）
     cursor_move:
       name: cursor_move
       label: 鼠标移动特效
@@ -1383,6 +1425,8 @@ enhance:
           label: 烟花特效
         - value: granule
           label: 粒子爆炸
+        - value: prosperous
+          label: 富强民主
     enable_sw:
       name: enable_sw
       label: "启用 Service Worker 优化"

diff --git a/source/css/celebration.min.css b/source/css/celebration.min.css
diff --git a/source/css/cursor.min.css b/source/css/cursor.min.css
diff --git a/source/css/cursor/breeze.min.css b/source/css/cursor/breeze.min.css
diff --git a/source/css/style.min.css b/source/css/style.min.css
diff --git a/source/cursor/OwO/arrow.cur b/source/cursor/OwO/arrow.cur
diff --git a/source/cursor/OwO/hand.cur b/source/cursor/OwO/hand.cur
diff --git a/source/cursor/UwU/arrow.cur b/source/cursor/UwU/arrow.cur
diff --git a/source/cursor/UwU/hand.cur b/source/cursor/UwU/hand.cur
diff --git a/source/cursor/black_cat/Alternative.cur b/source/cursor/black_cat/Alternative.cur
diff --git a/source/cursor/black_cat/Escritura a Mano.cur b/source/cursor/black_cat/Escritura a Mano.cur
diff --git a/source/cursor/black_cat/Move.cur b/source/cursor/black_cat/Move.cur
diff --git a/source/cursor/black_cat/No_Disponible.cur b/source/cursor/black_cat/No_Disponible.cur
diff --git a/source/cursor/black_cat/Ocupado.cur b/source/cursor/black_cat/Ocupado.cur
diff --git a/source/cursor/black_cat/ayuda.cur b/source/cursor/black_cat/ayuda.cur
diff --git a/source/cursor/black_cat/diagonal resize 1.cur b/source/cursor/black_cat/diagonal resize 1.cur
diff --git a/source/cursor/black_cat/diagonal resize 2.cur b/source/cursor/black_cat/diagonal resize 2.cur
diff --git a/source/cursor/black_cat/horizontal.cur b/source/cursor/black_cat/horizontal.cur
diff --git a/source/cursor/black_cat/normal.cur b/source/cursor/black_cat/normal.cur
diff --git a/source/cursor/black_cat/precision.cur b/source/cursor/black_cat/precision.cur
diff --git a/source/cursor/black_cat/texto.cur b/source/cursor/black_cat/texto.cur
diff --git a/source/cursor/black_cat/vertical.cur b/source/cursor/black_cat/vertical.cur
diff --git a/source/cursor/black_cat/work.cur b/source/cursor/black_cat/work.cur
diff --git a/source/cursor/debris/arrow.cur b/source/cursor/debris/arrow.cur
diff --git a/source/cursor/debris/hand.cur b/source/cursor/debris/hand.cur
diff --git a/source/cursor/horse/arrow.cur b/source/cursor/horse/arrow.cur
diff --git a/source/cursor/horse/hand.cur b/source/cursor/horse/hand.cur
diff --git a/source/cursor/marry/arrow.cur b/source/cursor/marry/arrow.cur
diff --git a/source/cursor/marry/beam.ani b/source/cursor/marry/beam.ani
diff --git a/source/cursor/marry/beam.cur b/source/cursor/marry/beam.cur
diff --git a/source/cursor/marry/busy.ani b/source/cursor/marry/busy.ani
diff --git a/source/cursor/marry/ew.ani b/source/cursor/marry/ew.ani
diff --git a/source/cursor/marry/move.cur b/source/cursor/marry/move.cur
diff --git a/source/cursor/marry/nesw.ani b/source/cursor/marry/nesw.ani
diff --git a/source/cursor/marry/ns.ani b/source/cursor/marry/ns.ani
diff --git a/source/cursor/marry/nwse.ani b/source/cursor/marry/nwse.ani
diff --git a/source/cursor/marry/working.ani b/source/cursor/marry/working.ani
diff --git a/source/cursor/mellow/arrow.cur b/source/cursor/mellow/arrow.cur
diff --git a/source/cursor/mellow/hand.cur b/source/cursor/mellow/hand.cur
diff --git a/source/cursor/music_cat_01/arrow.cur b/source/cursor/music_cat_01/arrow.cur
diff --git a/source/cursor/music_cat_01/hand.cur b/source/cursor/music_cat_01/hand.cur
diff --git a/source/cursor/music_cat_02/arrow.cur b/source/cursor/music_cat_02/arrow.cur
diff --git a/source/cursor/music_cat_02/hand.cur b/source/cursor/music_cat_02/hand.cur
diff --git a/source/cursor/overwatch/alternate.cur b/source/cursor/overwatch/alternate.cur
diff --git a/source/cursor/overwatch/busy.ani b/source/cursor/overwatch/busy.ani
diff --git a/source/cursor/overwatch/cross.cur b/source/cursor/overwatch/cross.cur
diff --git a/source/cursor/overwatch/dgn1.cur b/source/cursor/overwatch/dgn1.cur
diff --git a/source/cursor/overwatch/dgn2.cur b/source/cursor/overwatch/dgn2.cur
diff --git a/source/cursor/overwatch/handwriting.cur b/source/cursor/overwatch/handwriting.cur
diff --git a/source/cursor/overwatch/help.cur b/source/cursor/overwatch/help.cur
diff --git a/source/cursor/overwatch/horz.cur b/source/cursor/overwatch/horz.cur
diff --git a/source/cursor/overwatch/link.cur b/source/cursor/overwatch/link.cur
diff --git a/source/cursor/overwatch/move.cur b/source/cursor/overwatch/move.cur
diff --git a/source/cursor/overwatch/person.cur b/source/cursor/overwatch/person.cur
diff --git a/source/cursor/overwatch/pin.cur b/source/cursor/overwatch/pin.cur
diff --git a/source/cursor/overwatch/pointer.cur b/source/cursor/overwatch/pointer.cur
diff --git a/source/cursor/overwatch/text.cur b/source/cursor/overwatch/text.cur
diff --git a/source/cursor/overwatch/vert.cur b/source/cursor/overwatch/vert.cur
diff --git a/source/cursor/overwatch/work.ani b/source/cursor/overwatch/work.ani
diff --git a/source/cursor/rainbow_rain/Alternative2.cur b/source/cursor/rainbow_rain/Alternative2.cur
diff --git a/source/cursor/rainbow_rain/Escritura a Mano.cur b/source/cursor/rainbow_rain/Escritura a Mano.cur
diff --git a/source/cursor/rainbow_rain/Movee2.cur b/source/cursor/rainbow_rain/Movee2.cur
diff --git a/source/cursor/rainbow_rain/No Disponible.cur b/source/cursor/rainbow_rain/No Disponible.cur
diff --git a/source/cursor/rainbow_rain/Ocupado.cur b/source/cursor/rainbow_rain/Ocupado.cur
diff --git a/source/cursor/rainbow_rain/ayuda.cur b/source/cursor/rainbow_rain/ayuda.cur
diff --git a/source/cursor/rainbow_rain/diagonal resize 1.cur b/source/cursor/rainbow_rain/diagonal resize 1.cur
diff --git a/source/cursor/rainbow_rain/diagonal resize 2.cur b/source/cursor/rainbow_rain/diagonal resize 2.cur
diff --git a/source/cursor/rainbow_rain/horizontal.cur b/source/cursor/rainbow_rain/horizontal.cur
diff --git a/source/cursor/rainbow_rain/link.ani b/source/cursor/rainbow_rain/link.ani
diff --git a/source/cursor/rainbow_rain/link.cur b/source/cursor/rainbow_rain/link.cur
diff --git a/source/cursor/rainbow_rain/normal.cur b/source/cursor/rainbow_rain/normal.cur
diff --git a/source/cursor/rainbow_rain/precision.cur b/source/cursor/rainbow_rain/precision.cur
diff --git a/source/cursor/rainbow_rain/texto.cur b/source/cursor/rainbow_rain/texto.cur
diff --git a/source/cursor/rainbow_rain/trabajando en segundo plano.cur b/source/cursor/rainbow_rain/trabajando en segundo plano.cur
diff --git a/source/cursor/rainbow_rain/vertical1.cur b/source/cursor/rainbow_rain/vertical1.cur
diff --git a/source/cursor/water_01/arrow.cur b/source/cursor/water_01/arrow.cur
diff --git a/source/cursor/water_01/hand.cur b/source/cursor/water_01/hand.cur
diff --git a/source/cursor/water_02/arrow.cur b/source/cursor/water_02/arrow.cur
diff --git a/source/cursor/water_02/hand.cur b/source/cursor/water_02/hand.cur
diff --git a/source/font/AlimamaDaoLiTi.woff2 b/source/font/AlimamaDaoLiTi.woff2
diff --git a/source/js/cursor/click/prosperous.min.js b/source/js/cursor/click/prosperous.min.js