hexo-theme-stellar 1.28.0 → 1.28.1

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.28.0'
+  version: '1.28.1'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   main_css: /css/main.css

package/layout/_plugins/fancybox.ejs

@@ -24,9 +24,9 @@
           autoStart: false,
         },
         caption: (fancybox, slide) => {
-          return slide.triggerEl.alt || null
+          return slide.triggerEl.alt || slide.triggerEl.dataset.caption || null
         }
       });
     })
   }
-</script>
+</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/tags/lib/image.js

@@ -2,7 +2,7 @@
  * image.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
  * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
  *
- * {% image src [alt] [width:400px] [bg:#eee] [download:true/false/url] %}
+ * {% image src [alt] [width:400px] [bg:#eee] [download:true/false/url] [fancybox:true/false/url] %}
  */
 
 'use strict'
@@ -18,6 +18,7 @@ module.exports = ctx => function(args) {
   }
   // fancybox
   var fancybox = false
+  var fancyboxHref = null
   if (ctx.theme.config.plugins.fancybox && ctx.theme.config.plugins.fancybox.enable) {
     // 主题配置
     if (ctx.theme.config.tag_plugins.image && ctx.theme.config.tag_plugins.image.fancybox) {
@@ -27,8 +28,11 @@ module.exports = ctx => function(args) {
     if (args.fancybox && args.fancybox.length > 0) {
       if (args.fancybox == 'false') {
         fancybox = false
-      } else {
+      } else if (args.fancybox === 'true') {
         fancybox = args.fancybox
+      } else {
+        fancybox = true
+        fancyboxHref = args.fancybox
       }
     }
   }
@@ -36,16 +40,24 @@ module.exports = ctx => function(args) {
   function img(src, alt, style) {
     let img = ''
     img += '<img src="' + src + '"'
+    let a = '<a data-fancybox'
     if (alt) {
       img += ' alt="' + alt + '"'
+      a += ` data-caption="${alt}"`
     }
-    if (fancybox) {
+    if (fancybox && !fancyboxHref) {
       img += ` data-fancybox="${fancybox}"`
     }
     if (style.length > 0) {
       img += ' style="' + style + '"'
     }
     img += '/>'
+
+    if (fancyboxHref) {
+      a += ` href="${fancyboxHref}">${img}</a>`
+      return a
+    }
+
     return img
   }
 
@@ -87,4 +99,4 @@ module.exports = ctx => function(args) {
 
   el += '</div>'
   return el
-}
+}

package/source/css/_common/highlight.styl

@@ -75,7 +75,6 @@ p>code:not([class]),li>code:not([class])
     padding-left: 0.25em
 
 .md-text .gist 
-  --fgColor-default: var(--text-p1)
   .gist-file 
     border: 1px solid var(--block-border)
     border-radius: $border-card
@@ -86,9 +85,12 @@ p>code:not([class]),li>code:not([class])
     display: inherit
     border: none
     border-radius: 0
-    background: none
+    background: var(--block)
     margin: 0
     padding: 1em 0
+  .blob-code-inner
+    color: var(--text-p1)
+    font-family: $ff-codeblock
   .gist-meta
     background: var(--block-border)
 

package/source/css/_plugins/fancybox.styl

@@ -1,2 +1,2 @@
-img[data-fancybox]
+img[data-fancybox], a[data-fancybox]
   cursor: zoom-in

package/source/css/main.styl

@@ -11,7 +11,7 @@
 // 通用组件
 @import '_common/*'
 // 布局
-@import '_layout/*'
+@import '_components/*'
 
 // 可选插件
 @import '_plugins/index'

package/source/js/plugins/copycode.js

@@ -7,7 +7,7 @@ window.codeElements.forEach((codeElement) => {
 
   // 添加点击事件监听
   codeCopyBtn.addEventListener('click', async () => {
-    const codeToCopy = codeElement.querySelector('code')?.textContent || '';
+    const codeToCopy = codeElement.querySelector('pre')?.innerText || '';
     if (navigator.clipboard) {
       try {
         await navigator.clipboard.writeText(codeToCopy);