Merge branch 'dev'

jerryc127 · Jul 10, 2021 · 42bc175 · 42bc175
2 parents 7b520c6 + bbb9beb
commit 42bc175
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/layout/includes/third-party/math/mathjax.pug b/layout/includes/third-party/math/mathjax.pug
@@ -21,7 +21,17 @@ script.
               math.end = {node: text, delim: '', n: 0}
               doc.math.push(math)
             }
-          }, '']
+          }, ''],
+          insertScript: [200, () => {
+            document.querySelectorAll('mjx-container:not\([display]\)').forEach(node => {
+              const target = node.parentNode
+              if (target.nodeName.toLowerCase() === 'li') {
+                target.parentNode.classList.add('has-jax')
+              } else {
+                target.classList.add('has-jax')
+              }
+            });
+          }, '', false]
         }
       }
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "hexo-renderer-stylus": "^2.0.1",
-    "hexo-renderer-pug": "^1.0.0"
+    "hexo-renderer-pug": "^2.0.0"
   },
   "homepage": "https://butterfly.js.org/",
   "author": "Jerry <[email protected]>",

diff --git a/source/css/_layout/third-party.styl b/source/css/_layout/third-party.styl
@@ -90,14 +90,11 @@ if hexo-config('waline.bg')
       display: none
 
 // mathjax
-mjx-container
+mjx-container[display],
+.has-jax
   overflow-x: auto
   overflow-y: hidden
 
-  &:not([display])
-    display: inline-grid
-    max-width: 100%
-
 .aplayer
   color: $font-black
 

diff --git a/source/js/main.js b/source/js/main.js
@@ -294,7 +294,7 @@ document.addEventListener('DOMContentLoaded', function () {
   }
 
   const addMediumZoom = () => {
-    const zoom = mediumZoom(document.querySelectorAll('#article-container :not(a)>img'))
+    const zoom = mediumZoom(document.querySelectorAll('#article-container :not(a):not(.flink-item-icon) > img'))
     zoom.on('open', e => {
       const photoBg = document.documentElement.getAttribute('data-theme') === 'dark' ? '#121212' : '#fff'
       zoom.update({
@@ -305,7 +305,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
   const jqLoadAndRun = () => {
     const $fancyboxEle = GLOBAL_CONFIG.lightbox === 'fancybox'
-      ? document.querySelectorAll('#article-container :not(a):not(.gallery-group) > img, #article-container > img')
+      ? document.querySelectorAll('#article-container :not(a):not(.gallery-group):not(.flink-item-icon) > img, #article-container > img')
       : []
     const fbLengthNoZero = $fancyboxEle.length > 0
     const $jgEle = document.querySelectorAll('#article-container .justified-gallery')