hexo-theme-nblog 1.2.1 → 1.2.2

package/_config.yml

@@ -63,8 +63,6 @@ footer_links:
   - name: 版权协议
     path: /posts/copyright/
 
-posts_per_page: 10
-
 twikoo:
   enable: false
   envId: https://xxx

package/layout/_partial/footer.ejs

@@ -26,10 +26,10 @@
               <%= theme.author || config.author %>
             </span>. All rights reserved.
         </p>
-        <div class="footer__busuanzi">
-          <span id="busuanzi_container_site_pv">本站总访问量 <span id="busuanzi_value_site_pv"></span> 次</span>
-          <span class="footer__busuanzi-divider">|</span>
-          <span id="busuanzi_container_site_uv">访客数 <span id="busuanzi_value_site_uv"></span> 人次</span>
+        <div class="footer__vercount">
+          <span id="vercount_container_site_pv">本站总访问量 <span id="vercount_value_site_pv"></span> 次</span>
+          <span class="footer__vercount-divider">|</span>
+          <span id="vercount_container_site_uv">访客数 <span id="vercount_value_site_uv"></span> 人次</span>
         </div>
       </div>
       <div class="footer__right">
@@ -46,4 +46,4 @@
     </div>
   </div>
 </footer>
-<script async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
+<script async src="https://cn.vercount.one/js"></script>

package/layout/_partial/post-license.ejs

@@ -1,8 +1,6 @@
 <% var license=page.license || theme.default_license || 'CC BY-NC-SA 4.0' ; var author=page.author || theme.author ||
   config.author || '作者' ; var isOriginal=page.original !==false; var sourceUrl=page.source_url || '' ; var
-  licenseInfo={ 'CC BY-NC-SA 4.0' : { name: 'CC BY-NC-SA 4.0' ,
-  url: 'https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh' , desc: '署名-非商业性使用-相同方式共享 4.0 国际' } }; var
-  currentLicense=licenseInfo[license] || licenseInfo['CC BY-NC-SA 4.0']; %>
+  currentLicense=license || 'CC BY-NC-SA 4.0' ; %>
   <div class="post-license animate-fade-in-up animate-delay-2">
     <div class="post-license__header">
       <span class="copyright-symbol">©</span>
@@ -33,8 +31,8 @@
         <% } %>
           <div class="post-license__notice">
             <% if (isOriginal) { %>
-              本文为作者原创文章，遵循 <a href="<%= currentLicense.url %>" target="_blank" rel="noopener">
-                <%= currentLicense.name %>
+              本文为作者原创文章，遵循 <a target="_blank" rel="noopener">
+                <%= currentLicense %>
               </a> 许可协议，转载请注明出处。
               <% } else { %>
                 本文仅供学习交流使用，版权归原作者所有，侵权请联系删除

package/layout/layout.ejs

@@ -60,7 +60,7 @@
               <link rel="stylesheet" href="<%= url_for('/css/markdown.css') %>">
               <link rel="stylesheet" href="<%= url_for('/css/highlight.css') %>">
               <link rel="stylesheet" href="<%= url_for('/css/admonition.css') %>">
-              <% if (theme.twikoo && theme.twikoo.enable) { %>
+              <% if (theme.twikoo && theme.twikoo.enable && page.comments !==false) { %>
                 <link rel="stylesheet" href="<%= url_for('/css/twikoo.css') %>">
                 <% } %>
                   <% } %>
@@ -106,10 +106,10 @@
     <script defer src="<%= url_for('/js/lazyload.js') %>"></script>
     <% } %>
       <% if (theme.medium_zoom && theme.medium_zoom.enable) { %>
-        <script defer src="<%= url_for('/js/lib/medium-zoom.min.js') %>"></script>
+        <script defer src="<%= url_for('/lib/js/medium-zoom.min.js') %>"></script>
         <% } %>
           <% if (theme.pjax && theme.pjax.enable) { %>
-            <script defer src="<%= url_for('/js/lib/pjax.min.js') %>"></script>
+            <script defer src="<%= url_for('/lib/js/pjax.min.js') %>"></script>
             <script>
               document.addEventListener('DOMContentLoaded', function () {
                 if (typeof Pjax !== 'undefined') {
@@ -133,7 +133,7 @@
                     if (typeof initPage === 'function') {
                       initPage();
                     }
-                    if (typeof twikoo !== 'undefined' && twikoo.init) {
+                    if (typeof twikoo !== 'undefined' && twikoo.init && document.querySelector('#twikoo-comment')) {
                       twikoo.init({
                         envId: '<%= theme.twikoo.envId %>',
                         el: '#twikoo-comment'
@@ -144,8 +144,8 @@
               });
             </script>
             <% } %>
-              <% if (is_post() && theme.twikoo && theme.twikoo.enable) { %>
-                <script defer src="<%= url_for('/js/lib/twikoo.all.min.js') %>"></script>
+              <% if (is_post() && theme.twikoo && theme.twikoo.enable && page.comments !==false) { %>
+                <script defer src="<%= url_for('/lib/js/twikoo.all.min.js') %>"></script>
                 <script>
                   document.addEventListener('DOMContentLoaded', function () {
                     if (typeof twikoo !== 'undefined' && twikoo.init) {

package/layout/post.ejs

@@ -20,8 +20,7 @@
         <header class="post-header animate-fade-in-up">
           <% if (page.cover) { %>
             <div class="post-header__cover">
-              <img data-src="<%= page.cover %>" alt="<%= page.title %>" <%=theme.medium_zoom && theme.medium_zoom.enable
-                ? ' data-zoomable' : '' %>>
+              <img data-src="<%= page.cover %>" alt="<%= page.title %>">
             </div>
             <% } %>
               <h1 class="post-header__title">
@@ -128,7 +127,7 @@
               </nav>
       </div>
 
-      <% if (theme.twikoo && theme.twikoo.enable) { %>
+      <% if (theme.twikoo && theme.twikoo.enable && page.comments !== false) { %>
         <section class="post-comments animate-fade-in-up animate-delay-4">
           <div id="twikoo-comment"></div>
         </section>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-nblog",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A lightweight and minimalist blog theme",
   "main": "index.js",
   "scripts": {

package/source/css/admonition.css

@@ -8,7 +8,6 @@
   box-shadow: var(--shadow-sm);
   overflow: hidden;
   border: 1px solid var(--border-color);
-  border-left: 4px solid var(--admonition-color, var(--primary-color));
   transition: all var(--transition-normal);
 }
 
@@ -25,7 +24,7 @@
   font-weight: 600;
   font-size: 0.95rem;
   color: var(--admonition-color, var(--primary-color));
-  margin: 0;
+  margin: 0 !important;
   transition: background var(--transition-fast);
 }
 
@@ -39,7 +38,7 @@
 }
 
 .admonition-content {
-  padding: 12px 16px;
+  padding: 16px 12px;
   color: var(--text-primary);
 }
 
@@ -66,6 +65,7 @@
 }
 
 .admonition.anote .admonition-title {
+  margin-bottom: 0em;
   color: var(--primary-dark);
 }
 

package/source/css/highlight.css

@@ -1,10 +1,10 @@
 .highlight {
-  background: #282c34;
+  background: var(--surface-color);
   border-radius: 10px;
   margin: 1em 0;
   overflow-x: auto;
   position: relative;
-  font-family: Consolas, Menlo, 'Fira Code', monospace;
+  font-family: 'Fira Code', Consolas, Menlo, monospace;
 }
 
 .highlight .gutter {

package/source/css/lazyload.css

@@ -1,7 +1,6 @@
 .lazyload-wrapper {
   position: relative;
   overflow: hidden;
-  background: var(--surface-color);
   border-radius: var(--border-radius);
 }
 
@@ -150,11 +149,6 @@ img[data-src].lazyload-loaded {
   border-radius: 50%;
 }
 
-.markdown-body .lazyload-wrapper,
-.post-body .lazyload-wrapper {
-  margin: 16px 0;
-}
-
 .markdown-body .lazyload-image,
 .post-body .lazyload-image {
   display: block;

package/source/css/main.css

@@ -130,7 +130,7 @@ button {
 }
 
 .material-card:hover {
-  transform: translateY(-2px);
+  transform: translateY(-1px);
   box-shadow: var(--shadow-lg);
 }
 
@@ -505,6 +505,7 @@ button {
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
+  white-space: nowrap;
 }
 
 .footer__left {
@@ -532,7 +533,7 @@ button {
 
 .footer__copyright,
 .footer__themeInfo {
-  font-size: 14px;
+  font-size: 12px;
   color: var(--text-secondary);
   display: flex;
   flex-direction: row;
@@ -560,7 +561,7 @@ button {
 
 .footer__links a {
   padding: 0;
-  font-size: 13px;
+  font-size: 11px;
   text-decoration: none;
   transition: color var(--transition-fast);
 }
@@ -583,12 +584,12 @@ button {
 .footer__rss,
 .footer__sitemap {
   color: var(--primary-color);
-  font-size: 14px;
+  font-size: 12px;
   text-decoration: none;
 }
 
 .footer__powered {
-  font-size: 13px;
+  font-size: 11px;
   color: var(--text-secondary);
   display: flex;
   align-items: center;
@@ -599,17 +600,17 @@ button {
   text-decoration: none;
 }
 
-.footer__busuanzi {
-  font-size: 14px;
+.footer__vercount {
+  font-size: 12px;
   color: var(--text-secondary);
 }
 
-.footer__busuanzi #busuanzi_value_site_pv,
-.footer__busuanzi #busuanzi_value_site_uv {
+.footer__vercount #vercount_value_site_pv,
+.footer__vercount #vercount_value_site_uv {
   color: var(--primary-dark);
 }
 
-.footer__busuanzi-divider {
+.footer__vercount-divider {
   margin: 0 8px;
 }
 
@@ -760,15 +761,10 @@ button {
 .notification-banner__content {
   position: relative;
   min-height: 44px;
-  cursor: grab;
   user-select: none;
   transition: height 0.3s ease;
 }
 
-.notification-banner__content:active {
-  cursor: grabbing;
-}
-
 .notification-banner__item {
   position: absolute;
   top: 0;
@@ -1027,6 +1023,21 @@ button {
   border-color: var(--primary-color);
 }
 
+.pagination .space {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 40px;
+  height: 40px;
+  padding: 0 12px;
+  border-radius: var(--border-radius-sm);
+  font-size: 14px;
+  color: var(--text-secondary);
+  background: var(--surface-color);
+  border: 1px solid var(--border-color);
+  transition: all var(--transition-fast);
+}
+
 .page-header {
   text-align: center;
   padding: 40px 0;
@@ -1159,7 +1170,7 @@ button {
 }
 
 .post-footer__tag {
-  font-size: 14px;
+  font-size: 12px;
   color: var(--primary-color);
   padding: 4px 12px;
   background: var(--border-color);
@@ -2238,22 +2249,8 @@ html:hover {
   position: relative;
   z-index: 1;
   white-space: nowrap;
-  transition: color var(--transition-fast);
 }
 
 .post-license__notice a::before {
-  content: '';
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 0;
-  background: var(--btn-plain-bg-hover);
-  transition: height var(--transition-fast);
-  transform-origin: bottom;
-  z-index: -1;
-}
-
-.post-license__notice a:hover::before {
-  height: 100%;
+  height: 0%;
 }

package/source/css/markdown.css

@@ -10,7 +10,7 @@
 .post-body h4,
 .post-body h5,
 .post-body h6 {
-  margin-top: 1.5em;
+  margin-top: 1em;
   margin-bottom: 0.5em;
   font-weight: 600;
   line-height: 1.4;
@@ -26,6 +26,7 @@
   color: var(--primary-color);
   font-weight: normal;
   opacity: 1;
+  bottom: -0.5em;
   transition: opacity var(--transition-fast);
   border-bottom: none;
   position: relative;
@@ -111,14 +112,13 @@
   position: relative;
   z-index: 1;
   transition: color var(--transition-fast);
-  bottom: -0.55em;
+  bottom: -0.65em;
   right: 0.1em;
   word-break: break-word;
 }
 
 .post-body a::before {
   position: absolute;
-  bottom: 0;
   left: 0;
   width: 100%;
   height: 0;
@@ -145,20 +145,11 @@
 .post-body ul,
 .post-body ol {
   margin-bottom: 1em;
-  padding-left: 1em;
 }
 
 .post-body li {
   margin-bottom: 0.5em;
-}
-
-.post-body li::marker {
-  color: var(--primary-color);
-}
-
-.post-body li>strong,
-.post-body li>a {
-  display: inline-flex;
+  display: flex;
   align-items: center;
 }
 
@@ -176,109 +167,38 @@
 }
 
 .post-body code {
-  font-family: Consolas, Menlo, 'Fira Code', monospace;
   font-size: 0.9em;
   padding: 0.2em 0.4em;
   margin: 0em 0.4em;
-  background: var(--border-color);
-  border-radius: 10px;
+  background: var(--primary-light);
+  border-radius: 5px;
   color: var(--primary-color);
 }
 
-.post-body pre {
-  margin: 1em 0;
-  padding: 0;
-  background: #282c34;
-  border-radius: 10px;
-  overflow: hidden;
-  font-family: Consolas, Menlo, 'Fira Code', monospace;
-}
-
-.post-body pre code {
-  padding: 0;
-  background: transparent;
-  font-size: 0.9em;
-  line-height: 1.6;
-  color: inherit;
-  font-family: Consolas, Menlo, 'Fira Code', monospace;
-}
-
-.post-body .highlight {
-  margin: 1em 0;
-  border-radius: 10px;
-  overflow-x: auto;
-  background: #282c34;
-  padding: 1em;
-  position: relative;
-  font-family: Consolas, Menlo, 'Fira Code', monospace;
-}
-
-.post-body .highlight pre {
-  margin: 0;
-  padding: 0;
-  background: transparent;
-  font-family: Consolas, Menlo, 'Fira Code', monospace;
-  white-space: pre;
-}
-
 .post-body .highlight code {
   padding: 0;
   background: transparent;
   color: inherit;
-  font-family: Consolas, Menlo, 'Fira Code', monospace;
   white-space: pre;
 }
 
-.post-body .highlight table {
-  margin: 0;
-  border: none;
-}
-
-.post-body .highlight table tr {
-  background: transparent;
-}
-
-.post-body .highlight table td {
-  padding: 0;
-  border: none;
-}
-
-.post-body .highlight .gutter {
-  width: 20px;
-  padding-right: 5px;
-  border-right: 1px solid #3e4451;
-  text-align: right;
-  user-select: none;
-}
-
-.post-body .highlight .gutter pre {
-  padding: 0 0.5em 0 0.5em;
-}
-
-.post-body .highlight .gutter .line {
-  color: #5c6370;
-}
-
-.post-body .highlight .code pre {
-  padding: 0 0 0 0.5em;
-}
-
-.post-body .highlight .line {
-  height: 1.6em;
-  line-height: 1.6;
+.post-body pre,
+code {
+  font-family: Consolas, Menlo, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'PingFang SC', 'Microsoft YaHei', sans-serif;
 }
 
 .post-body .highlight-wrap {
   position: relative;
   margin: 1em 0;
   border-radius: 10px;
-  background: #282c34;
+  background-color: var(--border-color);
   overflow-x: auto;
+  font-family: Consolas, Menlo, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'PingFang SC', 'Microsoft YaHei', sans-serif;
 }
 
 .post-body .highlight-wrap .highlight {
-  margin: 5px;
-  padding: 5px;
+  margin: 0px;
+  padding: 0px;
   overflow-x: auto;
   overflow-y: hidden;
 }
@@ -314,20 +234,11 @@
   border-color: #98c379;
 }
 
-.post-body .highlight .code,
-.post-body .highlight .gutter {
-  user-select: none;
-}
-
-.post-body .highlight .code pre {
-  user-select: text;
-}
-
 .post-body img {
-  max-width: 100%;
+  width: 100%;
   height: auto;
   border-radius: var(--border-radius-sm);
-  margin: 1em 0;
+  margin: 0;
 }
 
 .post-body .medium-zoom-image {
@@ -364,7 +275,6 @@
 
 .post-body table {
   width: 100%;
-  margin: 1em 0;
   border-collapse: collapse;
   border-radius: var(--border-radius-sm);
   overflow: hidden;
@@ -374,7 +284,6 @@
 .post-body td {
   padding: 12px 16px;
   text-align: left;
-  border: 1px solid var(--border-color);
 }
 
 .post-body th {
@@ -455,10 +364,6 @@
     font-size: 15px;
   }
 
-  .post-body pre {
-    font-size: 0.85em;
-  }
-
   .post-body table {
     display: block;
     overflow-x: auto;

package/source/js/lazyload.js

@@ -115,6 +115,19 @@
             img.removeAttribute('data-src');
             img.removeAttribute('data-srcset');
 
+            if (img.hasAttribute('data-zoomable') && typeof mediumZoom !== 'undefined') {
+                img.classList.add('medium-zoom-image');
+                var globalZoom = window.mediumZoomInstance;
+                if (!globalZoom) {
+                    window.mediumZoomInstance = mediumZoom('.medium-zoom-image', {
+                        margin: 24,
+                        background: getComputedStyle(document.documentElement).getPropertyValue('--bg-color') || '#fff'
+                    });
+                } else {
+                    globalZoom.attach(img);
+                }
+            }
+
             img.dispatchEvent(new CustomEvent('lazyload:loaded', {
                 bubbles: true,
                 detail: { img: img }

package/source/js/main.js

@@ -249,7 +249,7 @@
         }
 
         const script = document.createElement('script');
-        script.src = '/js/lib/highlight.min.js';
+        script.src = '/lib/js/highlight.min.js';
         script.onload = callback;
         document.head.appendChild(script);
     }
@@ -257,24 +257,31 @@
     function applyHighlight(element, language) {
         if (!window.hljs) return;
 
-        const codeElement = element.querySelector('code') || element.querySelector('.code pre') || element.querySelector('pre');
+        const codeElement = element.querySelector('.code code') || element.querySelector('code');
         if (!codeElement) return;
 
-        let codeText = codeElement.textContent || codeElement.innerText;
+        let codeText;
+        const tempEl = codeElement.cloneNode(true);
+        tempEl.querySelectorAll('br').forEach(br => br.replaceWith('\n'));
+        codeText = tempEl.textContent || tempEl.innerText;
 
-        element.innerHTML = '';
+        const gutter = element.querySelector('.gutter');
+        const lines = codeText.split('\n');
+        if (lines.length > 0 && lines[lines.length - 1] === '') {
+            lines.pop();
+        }
+        const lineCount = lines.length;
+
+        if (gutter) {
+            gutter.innerHTML = '<pre>' + Array.from({ length: lineCount }, (_, i) => `<span class="line">${i + 1}</span><br>`).join('') + '</pre>';
+        }
 
-        const pre = document.createElement('pre');
-        const code = document.createElement('code');
-        code.className = language ? `hljs language-${language}` : 'hljs';
-        code.textContent = codeText;
-        pre.appendChild(code);
-        element.appendChild(pre);
+        codeElement.textContent = codeText;
 
         if (language && hljs.getLanguage(language)) {
-            hljs.highlightElement(code);
+            hljs.highlightElement(codeElement);
         } else {
-            hljs.highlightElement(code);
+            hljs.highlightElement(codeElement);
         }
     }
 
@@ -366,7 +373,7 @@
         document.head.appendChild(link);
 
         const script = document.createElement('script');
-        script.src = '/js/lib/tocbot.min.js';
+        script.src = '/lib/js/tocbot.min.js';
         script.onload = callback;
         document.head.appendChild(script);
     }
@@ -538,6 +545,8 @@
         setTimeout(updateTocPosition, 500);
     }
 
+    let zoomInstance = null;
+
     function initMediumZoom() {
         if (typeof mediumZoom === 'undefined') return;
 
@@ -550,19 +559,23 @@
         images.forEach(img => {
             if (img.closest('a')) return;
             if (img.classList.contains('medium-zoom-image')) return;
+            if (img.hasAttribute('data-src')) return;
             img.classList.add('medium-zoom-image');
         });
 
         document.querySelectorAll('[data-zoomable]').forEach(function (img) {
-            if (!img.classList.contains('medium-zoom-image')) {
+            if (!img.classList.contains('medium-zoom-image') && !img.hasAttribute('data-src')) {
                 img.classList.add('medium-zoom-image');
             }
         });
 
-        mediumZoom('.medium-zoom-image', {
-            margin: 24,
-            background: getComputedStyle(document.documentElement).getPropertyValue('--bg-color') || '#fff'
-        });
+        if (!zoomInstance) {
+            zoomInstance = mediumZoom('.medium-zoom-image', {
+                margin: 24,
+                background: getComputedStyle(document.documentElement).getPropertyValue('--bg-color') || '#fff'
+            });
+            window.mediumZoomInstance = zoomInstance;
+        }
     }
 
     function initPage() {