hexo-theme-stellar 1.39.1 → 1.41.0

package/languages/en.yml

@@ -37,6 +37,13 @@ meta:
   license: License
   share: Share
   contributors: Page Contributors
+  word_count: '%s words'
+  reading_time: '%s min read'
+  ai_label:
+    manual: Written entirely by a human
+    reviewed: AI-reviewed
+    polished: AI-polished
+    generated: AI-generated
   date_suffix:
     just: Just
     min: minutes ago
@@ -68,6 +75,7 @@ symbol:
   colon: ": "
   brackets_l: "("
   brackets_r: ")"
+  page: "Page %s"
 
 tag_plugins:
   mbti:

package/languages/zh-CN.yml

@@ -37,6 +37,13 @@ meta:
   license: 许可协议
   share: 分享文章
   contributors: 本文贡献者
+  word_count: '%s 字'
+  reading_time: '预计阅读 %s 分钟'
+  ai_label:
+    manual: 本文完全由人类完成
+    reviewed: 已 AI 审核
+    polished: 已 AI 润色
+    generated: 由 AI 生成
   date_suffix:
     just: 刚刚
     min: 分钟前
@@ -68,6 +75,7 @@ symbol:
   colon: "："
   brackets_l: "（"
   brackets_r: "）"
+  page: "第 %s 页"
 
 tag_plugins:
   mbti:

package/languages/zh-TW.yml

@@ -37,6 +37,13 @@ meta:
   license: 授權條款
   share: 分享文章
   contributors: 本文貢獻者
+  word_count: '%s 字'
+  reading_time: '預計閱讀 %s 分鐘'
+  ai_label:
+    manual: 本文完全由人類完成
+    reviewed: 已 AI 審核
+    polished: 已 AI 潤飾
+    generated: 由 AI 生成
   date_suffix:
     just: 剛剛
     min: 分鐘前
@@ -68,6 +75,7 @@ symbol:
   colon: "："
   brackets_l: "（"
   brackets_r: "）"
+  page: "第 %s 頁"
 
 tag_plugins:
   mbti:

package/layout/_partial/comments/artalk/script.ejs

@@ -4,8 +4,13 @@
     function initArtalk() {
       const el = document.getElementById('artalk_container');
       if (!el) return;
+
+      // artalk 邮件通知链接携带 ?atk_comment=<id> / #atk-comment-<id> 定位目标，
+      // 命中时跳过视口懒加载立即初始化，让 Artalk 自身的 list-goto 逻辑完成定位。
+      const hasAtkTarget = /[?&]atk_comment=\d+/.test(window.location.search) || /#atk-comment-\d+/.test(window.location.hash);
       
       function load_artalk() {
+        utils.css('<%- url_for('/css/comments/artalk.css') %>?v=<%- stellar_info('version') %>');
         utils.css('<%- theme.comments.artalk.css %>');
         utils.js('<%- theme.comments.artalk.js %>', {defer: true}).then(function () {
           // 监听 Artalk 事件
@@ -13,6 +18,17 @@
           // Artalk.use((ctx) => {
           //   ctx.on('list-loaded', () => window.lazyLoadInstance?.update())
           // })
+          // 邮件通知链接以 ?atk_comment=<id> 定位，Artalk 在 list-loaded 时才重新读取 URL，
+          // 固定延时清理会与之竞态（#598）。先把评论 id 改写到 hash（Artalk 读取优先级高于 query），
+          // 同时立即移除 atk_comment 查询参数，避免其 hash 监听干扰目录定位；
+          // atk_notify_key 保留到 list-loaded 完成定位与已读回执后再清理。
+          const atkComment = window.location.search.match(/[?&]atk_comment=(\d+)/);
+          if (atkComment && !/#atk-comment-\d+/.test(window.location.hash)) {
+            const params = new URLSearchParams(window.location.search);
+            const notifyKey = params.get('atk_notify_key');
+            const query = notifyKey ? '?atk_notify_key=' + encodeURIComponent(notifyKey) : '';
+            window.history.replaceState(null, '', window.location.pathname + query + '#atk-comment-' + atkComment[1]);
+          }
           const path = el.getAttribute('comment_id') ?? decodeURI(window.location.pathname);
           const artalk = Artalk.init({
             el: '#artalk_container',
@@ -39,10 +55,19 @@
               },
             <% } %>
           });
+          // list-loaded 时 Artalk 已读取 atk_comment / atk_notify_key 并触发定位与已读回执，
+          // 此时再清理残留的 ?atk_* 参数，避免固定延时与异步加载竞态（#598）。
+          if (hasAtkTarget && window.location.search.indexOf('atk_') !== -1) {
+            artalk.on('list-loaded', function () {
+              window.setTimeout(function () {
+                window.history.replaceState(null, '', window.location.pathname + window.location.hash);
+              }, 0);
+            });
+          }
         });
       }
       
-      util.viewportLazyload(el, load_artalk);
+      util.viewportLazyload(el, load_artalk, !hasAtkTarget);
     }
     
     // Initialize on page load

package/layout/_partial/comments/beaudar/script.ejs

@@ -6,6 +6,7 @@
       if (!el) return;
       
       function load_beaudar() {
+        utils.css('<%- url_for('/css/comments/beaudar.css') %>?v=<%- stellar_info('version') %>');
         try {
           el.innerHTML = '';
         } catch (error) {

package/layout/_partial/comments/twikoo/script.ejs

@@ -6,6 +6,7 @@
       if (!el) return;
       
       function load_twikoo() {
+        utils.css('<%- url_for('/css/comments/twikoo.css') %>?v=<%- stellar_info('version') %>');
         utils.js('<%- theme.comments.twikoo.js %>', {defer: true}).then(function () {
           const path = el.getAttribute('comment_id') ?? decodeURI(window.location.pathname);
           twikoo.init(Object.assign(<%- JSON.stringify(theme.comments.twikoo) %>, {

package/layout/_partial/comments/utterances/script.ejs

@@ -6,6 +6,7 @@
       if (!el) return;
       
       function load_utterances() {
+        utils.css('<%- url_for('/css/comments/utterances.css') %>?v=<%- stellar_info('version') %>');
         try {
           el.innerHTML = '';
         } catch (error) {

package/layout/_partial/comments/waline/script.ejs

@@ -7,6 +7,7 @@
     if (!el) return;
 
     function load_waline() {
+      utils.css('<%- url_for('/css/comments/waline.css') %>?v=<%- stellar_info('version') %>');
       utils.css('<%- theme.comments.waline.css %>');
       utils.css('<%- theme.comments.waline.meta_css %>');
 

package/layout/_partial/head.ejs

@@ -1,13 +1,28 @@
 <%
+function strip_wiki_title(title, wiki) {
+  if (!wiki) { return title; }
+  var t = String(title || '');
+  if (t.toLowerCase() === String(wiki).toLowerCase()) { return ''; }
+  // wiki 名中的空格/连字符在标题中可能写为另一种形态（如 cloud shell / cloud-shell）
+  var flex = String(wiki).replace(/[.*+?^${}()|[\]\\]/g, '\\$&').replace(/[\s-]+/g, '[\\s-]*');
+  var m = t.match(new RegExp('^' + flex + '[\\s-]*[：:\\-](.*)$', 'i'));
+  if (m && m[1]) {
+    return m[1].trim();
+  }
+  return t;
+}
+
 function generate_title() {
   if (page.wiki) {
     const proj = theme.wiki.tree[page.wiki]
     const wiki = proj?.name || page.wiki
     if (page.title) {
-      return wiki + __('symbol.colon') + page.title + ' - ' + config.title;
-    } else {
-      return wiki + ' - ' + config.title;
+      var stripped = strip_wiki_title(page.title, wiki)
+      if (stripped) {
+        return wiki + __('symbol.colon') + stripped + ' - ' + config.title;
+      }
     }
+    return wiki + ' - ' + config.title;
   } else {
     if (page.title) {
       return page.title + ' - ' + config.title;
@@ -17,20 +32,26 @@ function generate_title() {
       return __('btn.tag') + __('symbol.colon') + page.tag + ' - ' + config.title;
     }
   }
+  if (is_home() && page.current && page.current > 1) {
+    return config.title + ' - ' + __('symbol.page', page.current);
+  }
   return config.title;
 }
 function generate_description() {
   if (theme.open_graph && theme.open_graph.enable) {
     return '';
   }
+  if (page.description) {
+    return '<meta name="description" content="' + truncate(strip_html(page.description), {length: 150}) + '">';
+  }
   if (page.wiki) {
     const proj = theme.wiki.tree[page.wiki]
     if (proj?.description) {
       return '<meta name="description" content="' + proj.description + '">'
     }
   }
-  if (page.description || page.excerpt || page.content) {
-    return '<meta name="description" content="' + truncate(strip_html(page.description || page.excerpt || page.content), {length: 150}) + '">';
+  if (page.excerpt || page.content) {
+    return '<meta name="description" content="' + truncate(strip_html(page.excerpt || page.content), {length: 150}) + '">';
   }
   return '<meta name="description" content="' + config.description + '">';
 }
@@ -66,7 +87,13 @@ function og_args() {
   if (page.layout == 'post' && page.cover) {
     args.twitter_card = 'summary_large_image';
   }
-  args.image = config.avatar || (config.email ? gravatar(config.email) : null);
+  if (page.wiki && !page.description) {
+    const proj = theme.wiki.tree[page.wiki];
+    if (proj && proj.description) {
+      args.description = proj.description;
+    }
+  }
+  args.image = page.cover || page.banner || first_content_image(page.content) || config.avatar || (config.email ? gravatar(config.email) : null);
   return Object.assign(args, page.open_graph);
 }
 
@@ -83,9 +110,6 @@ function generate_og_title() {
 }
 
 function generate_og_site_name() {
-  if (page.layout === 'post' && page.title) {
-    return generate_og_title();
-  }
   return escape_meta_content(strip_html(config.title));
 }
 
@@ -198,4 +222,25 @@ function generate_canonical() {
 
   <%- json_ld() %>
   <%- custom_inject() %>
+
+  <!-- icons.yml 驱动的 CSS 装饰图标 -->
+  <%
+    const iconCssVars = (() => {
+      const map = {
+        '--icon-h3-left': 'default:arrow-left',
+        '--icon-h3-right': 'default:arrow-right',
+        '--icon-quote-left': 'quot:quote-left',
+        '--icon-quote-right': 'quot:quote-right'
+      };
+      let vars = [];
+      for (const [name, key] of Object.entries(map)) {
+        const raw = theme.icons && theme.icons[key];
+        if (raw) vars.push(`  ${name}: url("data:image/svg+xml,${encodeURIComponent(raw)}");`);
+      }
+      return vars.length > 0 ? `:root {\n${vars.join('\n')}\n}` : '';
+    })();
+  %>
+  <% if (iconCssVars) { %>
+  <style><%- iconCssVars %></style>
+  <% } %>
 </head>

package/layout/_partial/main/article/article_tags.ejs

@@ -0,0 +1,16 @@
+<%# 文章标签行（layout: post，位于 article-footer 之前） %>
+<%
+function layoutDiv() {
+  var el = '';
+  if (!page.tags || page.tags.length === 0) {
+    return el;
+  }
+  el += `<div class="article-tags${scrollreveal(' ')}">`
+  page.tags.forEach((tag, i) => {
+    el += `<a class="tag" href="${pretty_url(tag.path)}">${icon('default:hashtag')}${escape_html(tag.name)}</a>`
+  })
+  el += '</div>'
+  return el;
+}
+%>
+<%- layoutDiv(); %>

package/layout/_partial/main/navbar/article_banner.ejs

@@ -41,6 +41,23 @@ function layoutBreadcrumb() {
     } else {
       el += partial('breadcrumb/page')
     }
+  // 字数和预计阅读时长，置于面包屑行右侧（#302）
+  var readingHtml = ''
+  if (page.layout == 'post' && theme.article.reading_time) {
+    var _wc = word_count(page)
+    if (_wc > 0) {
+      readingHtml = `<span class="cap reading right">${__("meta.word_count", _wc)} · ${__("meta.reading_time", reading_time(page))}</span>`
+    }
+  }
+  el += readingHtml
+  // AI 成分标签：置于面包屑行最右（阅读时长右侧）；
+  // banner 含图片时不用配置色，继承默认文字色（--text-banner）
+  const bannerHasImage = banner.url && banner.url.length > 0
+  if (readingHtml.length > 0) {
+    el += ai_label(page.ai_label, 'cap', bannerHasImage)
+  } else {
+    el += ai_label(page.ai_label, 'cap right', bannerHasImage)
+  }
   // end 3.left.top
   el += `</div>`
   // 3.left.bottom

package/layout/_partial/main/navbar/dateinfo.ejs

@@ -42,4 +42,4 @@ function layoutDiv() {
   return el
 }
 %>
-<%- layoutDiv() %>
+<%- layoutDiv() %>

package/layout/_partial/main/notebook/note_card.ejs

@@ -19,7 +19,7 @@
   </div>
   <div class="meta cap">
     <% if (note.pin) { %>
-      <span class="pin"><%- icon('solar:pin-linear') %></span>
+      <span class="pin"><%- icon('default:pin') %></span>
     <% } %>
     <span class="cap" id="post-meta">
       <%- icon('default:calendar') %>

package/layout/_partial/main/notebook/paginator.ejs

@@ -1,8 +1,8 @@
 <% if ((page.total || 0) > 1) { %>
   <div class="paginator-wrap dis-select<%= scrollreveal(' ') %>">
     <%- paginator({
-      prev_text: icon('solar:double-alt-arrow-left-bold-duotone'),
-      next_text: icon('solar:double-alt-arrow-right-bold-duotone'),
+      prev_text: icon('default:arrow-left'),
+      next_text: icon('default:arrow-right'),
       force_prev_next: true,
       escape: false,
     }) %>

package/layout/_partial/main/pin_slider.ejs

@@ -137,8 +137,8 @@ if (pinItems.length > 0) {
   el += '</div>'
   if (dotsHtml.length > 0) {
     el += '<div class="pin-slider-dots">' + dotsHtml + '</div>'
-    el += '<button type="button" class="pin-slider-nav prev">' + icon('solar:double-alt-arrow-left-bold-duotone') + '</button>'
-    el += '<button type="button" class="pin-slider-nav next">' + icon('solar:double-alt-arrow-right-bold-duotone') + '</button>'
+    el += '<button type="button" class="pin-slider-nav prev">' + icon('default:arrow-left') + '</button>'
+    el += '<button type="button" class="pin-slider-nav next">' + icon('default:arrow-right') + '</button>'
   }
   el += '</div>'
 %>

package/layout/_partial/main/post_list/paginator.ejs

@@ -1,8 +1,8 @@
 <% if ((is_home() || is_category() || is_tag()) && page.total > 1) { %>
   <div class='paginator-wrap dis-select<%- scrollreveal(' ') %>'>
   <%- paginator({
-    prev_text: icon('solar:double-alt-arrow-left-bold-duotone'),
-    next_text: icon('solar:double-alt-arrow-right-bold-duotone'),
+    prev_text: icon('default:arrow-left'),
+    next_text: icon('default:arrow-right'),
     force_prev_next: true,
     escape: false
   }) %>

package/layout/_partial/main/post_list/post_card.ejs

@@ -93,6 +93,17 @@ function div_default() {
     }
   }
   // 置顶文章由轮播（默认）或首页列表靠前展示（flat 平铺）承担，卡片内不显示 pin 图标。
+  // 文章标签（最多 5 个，#580）
+  if (theme.article.card_tags && post.tags && post.tags.length > 0) {
+    el += '<span class="card-tags">';
+    post.tags.forEach((tag, i) => {
+      if (i >= 5) {
+        return;
+      }
+      el += `<span class="cap tag-chip">#${escape_html(tag.name)}</span>`;
+    });
+    el += '</span>';
+  }
   el += '</div>';
   el += '</article>';
   return el;

package/layout/_partial/menubtn.ejs

@@ -1,8 +1,8 @@
 <div class='float-panel'>
   <button type='button' style='display:none' class='laptop-only rightbar-toggle mobile' onclick='sidebar.rightbar()'>
-    <%- icon('default:rightbar') %>
+    <%- icon('default:rightbar', '', true) %>
   </button>
   <button type='button' style='display:none' class='mobile-only leftbar-toggle mobile' onclick='sidebar.leftbar()'>
-    <%- icon('default:leftbar') %>
+    <%- icon('default:leftbar', '', true) %>
   </button>
 </div>

package/layout/_partial/scripts/defines.ejs

@@ -156,7 +156,10 @@
     root : `<%- config.root %>`,
     tag_plugins: {
       chat: Object.assign(<%- JSON.stringify(theme.tag_plugins.chat) %>),
-    }
+    },
+    // 图标由构建期生成的 /js/stellar-icons.js 填充（defer，早于 DOMContentLoaded 就绪）
+    icons: {},
+    services: <%- JSON.stringify(theme.data_services || {}) %>,
   };
 
   // required plugins (only load if needs)
@@ -171,11 +174,32 @@
   const def = {
     avatar: `<%- theme.default.avatar %>`,
     cover: `<%- theme.default.cover %>`,
-    loading: `<%- theme.default.loading %>`,
+    loading: `<%- theme.default.loading || (theme.icons && theme.icons['default:loading-placeholder']) %>`,
     data_cache: <%- JSON.stringify(theme.data_cache || {}) %>,
   };
   const deps = {
     marked: `<%- url_for(theme.dependencies.marked) %>`,
     lazyload: `<%- url_for(theme.dependencies.lazyload.js) %>`
   }
+
+  // 主题切换提示文案（供 /js/theme.js 使用）
+  window.__STELLAR_I18N__ = {
+    light: `<%- __('message.theme_switched.light') %>`,
+    dark: `<%- __('message.theme_switched.dark') %>`,
+    auto: `<%- __('message.theme_switched.auto') %>`,
+  };
+
+  // 搜索跳转高亮：URL 带 ?kw= 时按需加载，定位正文中的匹配词
+  (function () {
+    try {
+      if (!window.location.search) return;
+      if (!new URLSearchParams(window.location.search).has('kw')) return;
+      document.addEventListener('DOMContentLoaded', function () {
+        // utils 为全局词法绑定（顶层 const），不能通过 window.utils 访问
+        if (typeof utils === 'object' && typeof utils.js === 'function') {
+          utils.js('<%- url_for('/js/search/highlight.js') %>', { defer: true }).catch(function () {});
+        }
+      });
+    } catch (e) {}
+  })();
 </script>

package/layout/_partial/scripts.ejs

@@ -14,22 +14,45 @@ function custom_inject() {
   return el;
 }
 
+// tagtree 脚本仅在与 tagtree 小部件渲染相同的条件下加载（见 _partial/sidebar/index_leftbar.ejs）
+function tagtreeWidgetOnPage() {
+  const leftbar = page && page.leftbar;
+  if (!Array.isArray(leftbar)) {
+    return false;
+  }
+  return leftbar.some(function (w) {
+    if (typeof w === 'string') {
+      return w === 'tagtree';
+    }
+    if (w && typeof w === 'object') {
+      return w.override === 'tagtree' || w.layout === 'tagtree';
+    }
+    return false;
+  });
+}
+
 %>
 <%- partial('scripts/defines') %>
-<%- partial('scripts/utils') %>
-<%- partial('scripts/sidebar') %>
-<%- partial('scripts/tagtree') %>
-<%- partial('scripts/lazyload') %>
 
-<!-- required -->
+<!-- core: utils 必须同步加载（页尾内联插件片段在解析期即调用 utils.initPlugin） -->
+<script src="<%- url_for('/js/utils.js') %>?v=<%- stellar_info('version') %>"></script>
+<script defer src="<%- url_for('/js/stellar-icons.js') %>?v=<%- stellar_info('version') %>"></script>
+<!-- 非首屏图标异步加载：占位符替换依赖构建期生成的 js/icons/{ns}.json -->
+<script defer src="<%- url_for('/js/icons.js') %>?v=<%- stellar_info('version') %>" data-version="<%- stellar_info('version') %>"></script>
 <script src="<%- url_for(`${theme.stellar.main_js}?v=${stellar_info('version')}`) %>" defer></script>
+<script defer src="<%- url_for('/js/theme.js') %>?v=<%- stellar_info('version') %>"></script>
+
+<% if (tagtreeWidgetOnPage()) { %>
+  <script>window.__STELLAR_TAGTREE__ = { expand_active: <%- JSON.stringify(!!(theme.widgets.tagtree && theme.widgets.tagtree.expand_active)) %> };</script>
+  <script defer src="<%- url_for('/js/tagtree.js') %>?v=<%- stellar_info('version') %>"></script>
+<% } %>
 
-<%- partial('scripts/theme') %>
+<%- partial('scripts/lazyload') %>
 
 <!-- optional -->
 <%- partial('comments/script') %>
 
-<%- partial('scripts/services') %>
+<script defer src="<%- url_for('/js/services.js') %>?v=<%- stellar_info('version') %>"></script>
 <%- partial('../_plugins/index') %>
 
 <!-- inject -->

package/layout/_partial/sidebar/logo.ejs

@@ -50,7 +50,7 @@ function layoutBack() {
   var el = ''
   el += `<div class="wiki-home-wrap">`
   el += `<a class="wiki-home cap" href="${pretty_url(theme.site_tree.index_wiki.base_dir)}">`
-  el += icon('default:goback')
+  el += icon('default:goback', '', true)
   el += `<span>${__('btn.all_wiki')}</span>`
   el += `</a>`
   el += `</div>`

package/layout/_partial/sidebar/menu.ejs

@@ -15,7 +15,7 @@ function layoutDiv() {
     el += ` style="${style}"`
     el += ` title="${item.title}" href="${pretty_url(item.url)}">`
     if (item.icon?.length > 0) {
-      el += icon(item.icon, 'no-lazy')
+      el += icon(item.icon, 'no-lazy', true)
     }
     el += `<span>${__(item.title)}</span>`
     if (active) {

package/layout/_partial/sidebar/search.ejs

@@ -32,7 +32,7 @@ function layoutDiv() {
     }
   }
   el += `<a class="search-button" onclick="document.getElementById(&quot;search-input&quot;).focus();">`
-  el += icon('default:search')
+  el += icon('default:search', '', true)
   el += `</a>`
   el += `<input type="text" class="search-input" id="search-input"`
   if (filter.length > 0) {

package/layout/_partial/widgets/author.ejs

@@ -26,7 +26,7 @@ function layoutDiv() {
 
     // homepage
     el += `<a class="follow" href="${url_for(author.path)}">`
-    el += icon('solar:documents-bold-duotone')
+    el += icon('default:documents')
     el += __('btn.all_posts')
     el += `</a>`
   el += `</div>`

package/layout/_partial/widgets/components/link.ejs

@@ -12,10 +12,10 @@ function layoutDiv() {
   }
   el += `</div>`
   if (columns == 1 && isActive) {
-    el += icon('default:bookmark.active')
+    el += '<span class="active-dot"></span>'
   }
   el += `</a>`
   return el
 }
 %>
-<%- layoutDiv() %>
+<%- layoutDiv() %>

package/layout/_partial/widgets/ghuser.ejs

@@ -30,7 +30,7 @@ function layoutDiv() {
   if (item.header) {
     el += `<div class="widget-header">`
       el += `<a class="gh-url" href="https://github.com/${item.username}">
-        <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from TDesign Icons by TDesign - https://github.com/Tencent/tdesign-icons/blob/main/LICENSE --><path fill="currentColor" d="M12 .999c-6.074 0-11 5.05-11 11.278c0 4.983 3.152 9.21 7.523 10.702c.55.104.727-.246.727-.543v-2.1c-3.06.683-3.697-1.33-3.697-1.33c-.5-1.304-1.222-1.65-1.222-1.65c-.998-.7.076-.686.076-.686c1.105.08 1.686 1.163 1.686 1.163c.98 1.724 2.573 1.226 3.201.937c.098-.728.383-1.226.698-1.508c-2.442-.286-5.01-1.253-5.01-5.574c0-1.232.429-2.237 1.132-3.027c-.114-.285-.49-1.432.107-2.985c0 0 .924-.303 3.026 1.156c.877-.25 1.818-.375 2.753-.38c.935.005 1.876.13 2.755.38c2.1-1.459 3.023-1.156 3.023-1.156c.598 1.554.222 2.701.108 2.985c.706.79 1.132 1.796 1.132 3.027c0 4.332-2.573 5.286-5.022 5.565c.394.35.754 1.036.754 2.088v3.095c0 .3.176.652.734.542C19.852 21.484 23 17.258 23 12.277C23 6.048 18.075.999 12 .999"/></svg>
+        ${icon('github:logo-alt')}
         <span>github/${item.username}</span>
         </a>`
     el += `</div>`

package/layout/_partial/widgets/markdown.ejs

@@ -13,7 +13,7 @@ function layoutDiv() {
     el += markdown(item.content);
   }
   if (item.src) {
-    el += `<div class="data-service ds-mdrender" src="${item.src}"></div>`
+    el += mdrender_html(item.src)
   }
   if (item.linklist) {
     el += partial('components/linklist', {item: item.linklist})

package/layout/_partial/widgets/related.ejs

@@ -18,7 +18,7 @@ function relatedPostsInTopic() {
     el += `<a class="item${isActive ? ' active' : ''}" href="${pretty_url(post.path)}">`
     el += `<span class="title">${post.title}</span>`
     if (isActive) {
-      el += icon('default:bookmark.active')
+      el += '<span class="active-dot"></span>'
     }
     el += `</a>`
   }

package/layout/_partial/widgets/toc.ejs

@@ -15,7 +15,7 @@ function layoutTocHeader(title) {
   var el = ''
   el += `<div class="widget-header dis-select">`
   el += `<span class="name">${title || __("meta.toc")}</span>`
-  el += `<a class="cap-action" onclick="sidebar.toggleTOC()" >${icon('default:rightbar')}</a>`
+  el += `<a class="cap-action" onclick="sidebar.toggleTOC()" >${icon('default:rightbar', '', true)}</a>`
   el += `</div>`
   return el
 }
@@ -38,9 +38,12 @@ function layoutToc(fallback) {
 function layoutDiv(fallback) {
   const tocBody = layoutTocBody()
   const hasToc = tocBody.trim().length > 0
+  // 远程 md 内容由客户端渲染，构建期正文无标题：
+  // 预留空 TOC 容器，渲染完成后由 mdrender.js 填充
+  const hasRemoteMd = has_remote_md(page)
   // 页面是否实际渲染评论区，由 _partial/comments/layout.ejs 标记
   const hasComments = page.cmt_rendered === true
-  if (!hasToc && !hasComments) {
+  if (!hasToc && !hasRemoteMd && !hasComments) {
     return ''
   }
   var el = ''
@@ -50,6 +53,10 @@ function layoutDiv(fallback) {
     el += `<div class="widget-body">`
     el += tocBody
     el += `</div>`
+  } else if (hasRemoteMd) {
+    el += layoutTocHeader()
+    el += `<div class="widget-body">`
+    el += `</div>`
   }
   el += `<div class="widget-footer">`
   el += `<a class="top" onclick="util.scrollTop()">`

package/layout/_partial/widgets/tree.ejs

@@ -27,7 +27,7 @@ function layoutDocTree(pages) {
       el += `<a class="link${isActive}" href="${href}">`
       el += `<span class="toc-text">${p.title}</span>`
       if (isActive.length > 0) {
-        el += icon('default:bookmark.active')
+        el += '<span class="active-dot"></span>'
       }
       el += `</a>`
     }

package/layout/_plugins/fancybox.ejs

@@ -7,8 +7,9 @@
   };
   // auto=按需：页面存在可弹窗图片才加载；global=全局：所有页面加载
   const isGlobal = ctx.fancybox.mode === 'global';
-  // 评论区图片（artalk/twikoo/waline）显示较小，自动支持放大
-  var selector = '[data-fancybox]:not(.error), .with-fancybox img:not([atk-emoticon]):not([class*="emo"])';
+  // 评论区图片（artalk/twikoo/waline）显示较小，自动支持放大；
+  // 仅绑定各评论服务的评论内容区，编辑器、表情面板等非内容区图片不弹窗
+  var selector = '[data-fancybox]:not(.error), .with-fancybox .atk-content img:not([atk-emoticon]):not([class*="emo"]), .with-fancybox .tk-content img:not([atk-emoticon]):not([class*="emo"]), .with-fancybox .wl-content img:not([atk-emoticon]):not([class*="emo"])';
   if (ctx.fancybox.selector) {
     selector += `, ${ctx.fancybox.selector}`
   }
@@ -31,6 +32,7 @@
     }
   }
   if (needFancybox) {
+    utils.css(`<%- url_for('/css/plugins/fancybox.css') %>?v=<%- stellar_info('version') %>`);
     utils.css(ctx.fancybox.css);
     utils.js(ctx.fancybox.js, { defer: true }).then(function () {
       if (isGlobal) {