Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pr/Evilrabbit520/273
Browse files Browse the repository at this point in the history
  • Loading branch information
jerryc127 committed Mar 4, 2025
2 parents 8438cbd + 4c950b8 commit 05e42f9
Show file tree
Hide file tree
Showing 55 changed files with 13,202 additions and 13,158 deletions.
84 changes: 42 additions & 42 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
{
"env": {
"browser": true,
"es6": true,
"jquery": true
},
"extends": [
"standard"

],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"GLOBAL_CONFIG": true,
"autoChangeMode": true,
"saveToLocal": true,
"activateDarkMode":true,
"activateLightMode":true,
"instantsearch":true,
"loadOtherComment": "readonly",
"Snackbar":true,
"snackbarShow":true,
"loadScript":true,
"mediumZoom":true,
"GLOBAL_CONFIG_SITE": true,
"utterancesTheme": true,
"hexo": true,
"chatBtnHide": true,
"chatBtnShow": true,
"LazyLoad": true,
"lazyLoadInstance": true,
"btf": "readonly",
"refreshFn": "readonly",
"getScript":"readonly",
"getParents":"readonly"
},
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
}
{
"env": {
"browser": true,
"es6": true,
"jquery": true
},
"extends": [
"standard"

],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"GLOBAL_CONFIG": true,
"autoChangeMode": true,
"saveToLocal": true,
"activateDarkMode":true,
"activateLightMode":true,
"instantsearch":true,
"loadOtherComment": "readonly",
"Snackbar":true,
"snackbarShow":true,
"loadScript":true,
"mediumZoom":true,
"GLOBAL_CONFIG_SITE": true,
"utterancesTheme": true,
"hexo": true,
"chatBtnHide": true,
"chatBtnShow": true,
"LazyLoad": true,
"lazyLoadInstance": true,
"btf": "readonly",
"refreshFn": "readonly",
"getScript":"readonly",
"getParents":"readonly"
},
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
}
}
28 changes: 14 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.DS_Store
Thumbs.db
db.json
package-lock.json
*.log
node_modules/
public/
public-en/
.deploy*/
.history/
source/_backup/
.vscode/
.deploy_git/
scripts/
.DS_Store
Thumbs.db
db.json
package-lock.json
*.log
node_modules/
public/
public-en/
.deploy*/
.history/
source/_backup/
.vscode/
.deploy_git/
scripts/
pnpm-lock.yaml
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
## butterfly.js.org

這是 hexo 主題 Butterfly 的文件/ Demo 倉庫

歡迎 PR 完善文件
### 提交網站到 `示例`

1. 確保你使用 Butterfly 主題 (魔改太多的可能不會合並)
2. 點擊這個[鏈接](https://github.com/jerryc127/butterfly.js.org/edit/main/source/_data/link.yml)
3. 按要求新增內容(請添加在**末尾**)
```yaml
- name: 博客名
link: 博客地址
avatar: 博客頭像
descr: 博客描述
```
## butterfly.js.org

這是 hexo 主題 Butterfly 的文件/ Demo 倉庫

歡迎 PR 完善文件
### 提交網站到 `示例`

1. 確保你使用 Butterfly 主題 (魔改太多的可能不會合並)
2. 點擊這個[鏈接](https://github.com/jerryc127/butterfly.js.org/edit/main/source/_data/link.yml)
3. 按要求新增內容(請添加在**末尾**)
```yaml
- name: 博客名
link: 博客地址
avatar: 博客頭像
descr: 博客描述
```
4. 點擊下面的 `Commit changes` ,合併到 butterfly.js.org 倉庫
Loading

0 comments on commit 05e42f9

Please sign in to comment.