Merge branch 'master' into master

JasonRaveling · web-flow · commit 38bc7ccf1cf2 · 2025-05-08T10:54:25.000-05:00
diff --git a/_config.yml b/_config.yml
@@ -216,7 +216,7 @@ exclude:
   - README.md
   - LICENSE
   - purgecss.js
-  - rollup.config.js
+  - "*.config.js"
   - "package*.json"
 
 jekyll-archives:
diff --git a/_data/share.yml b/_data/share.yml
@@ -18,7 +18,7 @@ platforms:
   #
   # - type: Linkedin
   #   icon: "fab fa-linkedin"
-  #   link: "https://www.linkedin.com/sharing/share-offsite/?url=URL"
+  #   link: "https://www.linkedin.com/feed/?shareActive=true&shareUrl=URL"
   #
   # - type: Weibo
   #   icon: "fab fa-weibo"
diff --git a/_includes/js-selector.html b/_includes/js-selector.html
@@ -66,7 +66,7 @@
 
 {% if page.math %}
   <!-- MathJax -->
-  <script async src="{{ '/assets/js/data/mathjax.js' | relative_url }}"></script>
+  <script src="{{ '/assets/js/data/mathjax.js' | relative_url }}"></script>
   <script async src="https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?features=es6"></script>
   <script id="MathJax-script" async src="{{ site.data.origin[type].mathjax.js | relative_url }}"></script>
 {% endif %}
diff --git a/_javascript/theme.js b/_javascript/theme.js
diff --git a/_sass/abstracts/_placeholders.scss b/_sass/abstracts/_placeholders.scss
@@ -31,7 +31,10 @@
 }
 
 %tag-hover {
+  @extend %link-color;
+
   background: var(--tag-hover);
+  border-color: var(--tag-hover);
   transition: background 0.35s ease-in-out;
 }
 
diff --git a/_sass/pages/_post.scss b/_sass/pages/_post.scss
@@ -143,9 +143,7 @@ header {
 
   .post-tag {
     &:hover {
-      @extend %link-hover;
       @extend %tag-hover;
-      @extend %no-bottom-border;
     }
   }
 }
diff --git a/assets/404.html b/assets/404.html
@@ -2,13 +2,8 @@
 layout: page
 title: "404: Page not found"
 permalink: /404.html
-
-redirect_from:
-  - /norobots/
-  - /assets/
-  - /posts/
 ---
 
 {% include lang.html %}
 
-<p class="lead">{{ site.data.locales[lang].not_found.statement }}</p>
+<p class="lead">{{ site.data.locales[lang].not_found.statement }}</p>
diff --git a/assets/css/jekyll-theme-chirpy.scss b/assets/css/jekyll-theme-chirpy.scss
@@ -1,6 +1,7 @@
 ---
 ---
 
+/* prettier-ignore */
 @use 'main
 {%- if jekyll.environment == 'production' -%}
   .bundle
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,5 @@
+export default [
+  {
+    files: ['_javascript/**/*.js']
+  }
+];
diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "jekyll", "~> 4.3"
   spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
-  spec.add_runtime_dependency "jekyll-redirect-from", "~> 0.16"
   spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.8"
   spec.add_runtime_dependency "jekyll-archives", "~> 2.2"
   spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4"
diff --git a/rollup.config.js b/rollup.config.js
@@ -80,7 +80,7 @@ export default [
   build('page'),
   build('post'),
   build('misc'),
-  build('theme', { src: `${SRC_DEFAULT}/modules`, outputName: 'Theme' }),
+  build('theme', { outputName: 'Theme' }),
   build('app', { src: SRC_PWA, jekyll: true }),
   build('sw', { src: SRC_PWA, jekyll: true })
 ];

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ platforms:`
`18`	`18`	`#`
`19`	`19`	`# - type: Linkedin`
`20`	`20`	`# icon: "fab fa-linkedin"`
`21`		`- # link: "https://www.linkedin.com/sharing/share-offsite/?url=URL"`
	`21`	`+ # link: "https://www.linkedin.com/feed/?shareActive=true&shareUrl=URL"`
`22`	`22`	`#`
`23`	`23`	`# - type: Weibo`
`24`	`24`	`# icon: "fab fa-weibo"`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,10 @@`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`%tag-hover {`
	`34`	`+ @extend %link-color;`
	`35`	`+`
`34`	`36`	`background: var(--tag-hover);`
	`37`	`+ border-color: var(--tag-hover);`
`35`	`38`	`transition: background 0.35s ease-in-out;`
`36`	`39`	`}`
`37`	`40`
Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,7 @@ header {`
`143`	`143`
`144`	`144`	`.post-tag {`
`145`	`145`	`&:hover {`
`146`		`- @extend %link-hover;`
`147`	`146`	`@extend %tag-hover;`
`148`		`- @extend %no-bottom-border;`
`149`	`147`	`}`
`150`	`148`	`}`
`151`	`149`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +export default [
 +  {
 +    files: ['_javascript/**/*.js']
 +  }
 +];