From fa987d700e2c747b9c538622da734b087cc108c3 Mon Sep 17 00:00:00 2001 From: Xzonn Date: Fri, 26 Jan 2024 19:55:35 +0800 Subject: [PATCH] Update pages --- Gemfile | 4 ++-- Gemfile.lock | 52 ++++++++++++++++++++++++------------------- _layouts/default.html | 17 +++++--------- assets/css/_site.scss | 2 -- assets/css/style.scss | 4 ++-- package-lock.json | 18 +++++++-------- 6 files changed, 47 insertions(+), 50 deletions(-) diff --git a/Gemfile b/Gemfile index 76e751f..680b0fb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "jekyll", "~> 3.0", group: :jekyll_plugins +gem "jekyll", "~> 4.0", group: :jekyll_plugins gem "webrick", "~> 1.8" -gem "kramdown", "~> 2.3" +gem "kramdown", "~> 2.4" gem "kramdown-parser-gfm", "~> 1.1" group :jekyll_plugins do gem "jekyll-relative-links" diff --git a/Gemfile.lock b/Gemfile.lock index 4e39628..e00ada7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,40 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.4) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.5) + ffi (1.16.3) forwardable-extended (2.6.0) + google-protobuf (3.25.2-x86_64-linux) http_parser.rb (0.8.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (3.9.3) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (>= 0.7, < 2) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (>= 1.17, < 3) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-relative-links (0.7.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-watch (2.2.1) listen (~> 3.0) kramdown (2.4.0) @@ -41,33 +45,35 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.1) + public_suffix (5.0.4) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.30.0) + rexml (3.2.6) + rouge (4.2.0) safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sass-embedded (1.69.5) + google-protobuf (~> 3.23) + rake (>= 13.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.5.0) webrick (1.8.1) PLATFORMS x86_64-linux DEPENDENCIES - jekyll (~> 3.0) + jekyll (~> 4.0) jekyll-relative-links jekyll-sass-converter - kramdown (~> 2.3) + kramdown (~> 2.4) kramdown-parser-gfm (~> 1.1) webrick (~> 1.8) BUNDLED WITH - 2.4.13 + 2.5.4 diff --git a/_layouts/default.html b/_layouts/default.html index 280065f..5818b25 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -5,7 +5,7 @@ - + @@ -58,17 +58,10 @@

" %}{{ _splited_part[0] }}{{ _splited_part[1] | replace: DOUBLE_LINE_BREAK, LINE_BREAK | replace: LINE_BREAK, LINE_BREAK_INDENT }}{% endif %}{% endfor %} - {% if page.links %} - {% endif %}{% unless jekyll.environment == "development" or page.no_comment %} -
- + {% unless jekyll.environment == "development" or page.no_comment %} +
+
如果需要在留言中发布图片,请前往GitHub上的Discussions。您也可以通过bilibili的私信功能与我联系。
+
{% endunless %}
diff --git a/assets/css/_site.scss b/assets/css/_site.scss index 8d51b3d..623b387 100644 --- a/assets/css/_site.scss +++ b/assets/css/_site.scss @@ -1,5 +1,3 @@ -@use "custon_styles"; - /* header */ .para-header { background-color: var(--primary-lightest); diff --git a/assets/css/style.scss b/assets/css/style.scss index f1663a6..f825dc0 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -38,6 +38,6 @@ @import "../../node_modules/bootstrap/scss/utilities/api"; // 8. Add additional custom code here +@import "../../node_modules/bootstrap-icons/font/bootstrap-icons.scss"; @import "custom_styles"; -@import "site"; -@import "../../node_modules/bootstrap-icons/font/bootstrap-icons.scss"; \ No newline at end of file +@import "site"; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f29ee48..483a189 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,18 +23,18 @@ } }, "node_modules/@types/jquery": { - "version": "3.5.19", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.19.tgz", - "integrity": "sha512-KFbmk+dXfphHGuVCmlopgcNRCegN/21mkeoD4BzuJhVH0SJW3Uo2mLuAwb6oqTNV79EsRp6J7yC1BbKymjpx/g==", + "version": "3.5.29", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz", + "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==", "dev": true, "dependencies": { "@types/sizzle": "*" } }, "node_modules/@types/sizzle": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", - "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", + "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", "dev": true }, "node_modules/bootstrap": { @@ -56,9 +56,9 @@ } }, "node_modules/bootstrap-icons": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.1.tgz", - "integrity": "sha512-F0DDp7nKUX+x/QtpfRZ+XHFya60ng9nfdpdS59vDDfs4Uhuxp7zym/QavMsu/xx51txkoM9eVmpE7D08N35blw==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz", + "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==", "funding": [ { "type": "github",