diff --git a/.gitmodules b/.gitmodules index b6f5f65..9591673 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "themes/tranquility"] path = themes/tranquility - url = git@github.com:hooozen/hexo-theme-tranquility.git + url = ssh://git@ssh.github.com:443/hooozen/hexo-theme-tranquility.git [submodule "themes/academic"] path = themes/academic - url = git@github.com:hooozen/hexo-theme-academic.git + url = ssh://git@ssh.github.com:443/hooozen/hexo-theme-academic.git diff --git a/_config.tranquility.yml b/_config.tranquility.yml index ccb5c49..404b75c 100644 --- a/_config.tranquility.yml +++ b/_config.tranquility.yml @@ -43,12 +43,29 @@ foot: title: - "海内存知己" - "天涯若比邻" + linksRows: 4 links: # 朋友 - name: "Theme Tranquility" url: https://github.com/hooozen/hexo-theme-tranquility - name: "浩然的主页" url: https://hozen.site + - name: "Theme Tranquility" + url: https://github.com/hooozen/hexo-theme-tranquility + - name: "浩然的主页" + url: https://hozen.site + - name: "Theme Tranquility" + url: https://github.com/hooozen/hexo-theme-tranquility + - name: "浩然的主页" + url: https://hozen.site + - name: "Theme Tranquility" + url: https://github.com/hooozen/hexo-theme-tranquility + - name: "浩然的主页" + url: https://hozen.site + - name: "Theme Tranquility" + url: https://github.com/hooozen/hexo-theme-tranquility + - name: "浩然的主页" + url: https://hozen.site social: - name: "hooozen" @@ -61,6 +78,11 @@ social: icon: "/images/logo-zh.svg" url: https://www.zhihu.com/people/hozen +contacts: + - name: "name@example.com" + icon: "/images/icon/icon-email.svg" + url: "mailto:name@example.com" + reward: # 赞赏 enable: true face: /assets/author-face.jpg # 头像图片 @@ -215,3 +237,6 @@ search: enable: true field: post content: true + +nav: + sticky: false diff --git a/package-lock.json b/package-lock.json index c2e6029..a74648d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "hexo": "^6.3.0", "hexo-filter-mathjax": "^0.9.0", + "hexo-filter-mermaid-diagrams": "^1.0.5", "hexo-fontawesome-icons": "^0.0.2", "hexo-generator-index": "^3.0.0", "hexo-generator-tag": "^2.0.0", @@ -23,40 +24,22 @@ "opentype.js": "^1.3.4" } }, - "../hexo-fontawesome-icons": { - "version": "0.0.1", - "extraneous": true, - "license": "MIT", - "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.4.2" - }, - "optionalDependencies": { - "@fortawesome/free-brands-svg-icons": "^6.4.2", - "@fortawesome/free-regular-svg-icons": "^6.4.2", - "@fortawesome/free-solid-svg-icons": "^6.4.2" - }, - "peerDependencies": { - "hexo": "6.x" - } - }, "node_modules/@adobe/css-tools": { "version": "4.2.0", "license": "MIT" }, "node_modules/@fortawesome/fontawesome-common-types": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", - "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==", "hasInstallScript": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/@fortawesome/fontawesome-svg-core": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", "hasInstallScript": true, + "license": "MIT", "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.2" }, @@ -66,9 +49,8 @@ }, "node_modules/@fortawesome/free-brands-svg-icons": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.2.tgz", - "integrity": "sha512-LKOwJX0I7+mR/cvvf6qIiqcERbdnY+24zgpUSouySml+5w8B4BJOx8EhDR/FTKAu06W12fmUIcv6lzPSwYKGGg==", "hasInstallScript": true, + "license": "(CC-BY-4.0 AND MIT)", "optional": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.2" @@ -79,9 +61,8 @@ }, "node_modules/@fortawesome/free-regular-svg-icons": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.2.tgz", - "integrity": "sha512-0+sIUWnkgTVVXVAPQmW4vxb9ZTHv0WstOa3rBx9iPxrrrDH6bNLsDYuwXF9b6fGm+iR7DKQvQshUH/FJm3ed9Q==", "hasInstallScript": true, + "license": "(CC-BY-4.0 AND MIT)", "optional": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.2" @@ -92,9 +73,8 @@ }, "node_modules/@fortawesome/free-solid-svg-icons": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", - "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==", "hasInstallScript": true, + "license": "(CC-BY-4.0 AND MIT)", "optional": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.2" @@ -828,6 +808,18 @@ "node": ">=0.10" } }, + "node_modules/deep-assign": { + "version": "2.0.0", + "resolved": "https://mirrors.tencent.com/npm/deep-assign/-/deep-assign-2.0.0.tgz", + "integrity": "sha512-2QhG3Kxulu4XIF3WL5C5x0sc/S17JLgm1SfvDfIRsR/5m7ZGmcejII7fZ2RyWhN0UWIJm0TNM/eKow6LAn3evQ==", + "license": "MIT", + "dependencies": { + "is-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/deepmerge": { "version": "4.3.1", "license": "MIT", @@ -1725,10 +1717,18 @@ "mathjax-full": "3.2.2" } }, + "node_modules/hexo-filter-mermaid-diagrams": { + "version": "1.0.5", + "resolved": "https://mirrors.tencent.com/npm/hexo-filter-mermaid-diagrams/-/hexo-filter-mermaid-diagrams-1.0.5.tgz", + "integrity": "sha512-/IkIMKn4V7PBAzMJGNDPSoBFlv1JGvIELXm5AWkR8N5N44kDTNJLtabb4h095UhZQIXOrF9zA1WYhi6wrWLW5Q==", + "license": "MIT", + "dependencies": { + "deep-assign": "^2.0.0" + } + }, "node_modules/hexo-fontawesome-icons": { "version": "0.0.2", - "resolved": "https://registry.npmjs.org/hexo-fontawesome-icons/-/hexo-fontawesome-icons-0.0.2.tgz", - "integrity": "sha512-1NtPH/tQ5kqMcmSk+eAP49ppdkSfQBVDILY6OJ2OnCRNQBJ7UitOkoJEyBarm25cAG9KWMrLJUrpnUqbCYeSAQ==", + "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2" }, @@ -2584,6 +2584,15 @@ "node": ">=0.12.0" } }, + "node_modules/is-obj": { + "version": "1.0.1", + "resolved": "https://mirrors.tencent.com/npm/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-plain-object": { "version": "5.0.0", "license": "MIT", diff --git "a/source/_posts/feat-markdown \347\273\230\345\233\276\346\265\213\350\257\225.md" "b/source/_posts/feat-markdown \347\273\230\345\233\276\346\265\213\350\257\225.md" index 02a1ed8..6e967a1 100644 --- "a/source/_posts/feat-markdown \347\273\230\345\233\276\346\265\213\350\257\225.md" +++ "b/source/_posts/feat-markdown \347\273\230\345\233\276\346\265\213\350\257\225.md" @@ -42,9 +42,11 @@ mermaid: 渲染为： ```mermaid + graph LR A --> B A --> D + ``` ## 其他 diff --git a/themes/tranquility b/themes/tranquility index 27aa58e..332d8e3 160000 --- a/themes/tranquility +++ b/themes/tranquility @@ -1 +1 @@ -Subproject commit 27aa58e6da19ce1bb83a5c166d9cca3cab34e2e8 +Subproject commit 332d8e39652ee2a8077c3c070bca79990f0a724b