hexo-theme-nblog 1.2.0 → 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

@@ -51,11 +51,7 @@
           }
         </style>
         <link rel="icon" type="image/svg+xml" href="/favicon.svg">
-        <link rel="preconnect" href="https://fonts.googleapis.com">
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-        <link
-          href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&family=Noto+Sans+SC:wght@400;500;700&display=swap"
-          rel="stylesheet">
+        <link rel="preload" href="<%= url_for('/css/main.css') %>" as="style">
         <link rel="stylesheet" href="<%= url_for('/css/main.css') %>">
         <% if (theme.lazyload && theme.lazyload.enable) { %>
           <link rel="stylesheet" href="<%= url_for('/css/lazyload.css') %>">
@@ -64,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') %>">
                 <% } %>
                   <% } %>
@@ -105,78 +101,59 @@
       </main>
       <%- partial('_partial/footer') %>
   </div>
-  <script src="<%= url_for('/js/main.js') %>"></script>
+  <script defer src="<%= url_for('/js/main.js') %>"></script>
   <% if (theme.lazyload && theme.lazyload.enable) { %>
-    <script src="<%= url_for('/js/lazyload.js') %>"></script>
-    <script>
-      document.addEventListener('DOMContentLoaded', function () {
-        if (typeof initLazyload === 'function') {
-          initLazyload({
-            rootMargin: '100px 0px',
-            threshold: 0.01
-          });
-        }
-      });
-      document.addEventListener('pjax:complete', function () {
-        if (typeof refreshLazyload === 'function') {
-          refreshLazyload();
-        }
-      });
-    </script>
+    <script defer src="<%= url_for('/js/lazyload.js') %>"></script>
     <% } %>
       <% if (theme.medium_zoom && theme.medium_zoom.enable) { %>
-        <script src="https://cdn.jsdelivr.net/npm/medium-zoom@1.1.0/dist/medium-zoom.min.js"></script>
-        <script>
-          document.addEventListener('DOMContentLoaded', function () {
-            if (typeof initMediumZoom === 'function') {
-              initMediumZoom();
-            }
-          });
-          document.addEventListener('pjax:complete', function () {
-            if (typeof initMediumZoom === 'function') {
-              initMediumZoom();
-            }
-          });
-        </script>
+        <script defer src="<%= url_for('/lib/js/medium-zoom.min.js') %>"></script>
         <% } %>
           <% if (theme.pjax && theme.pjax.enable) { %>
-            <script src="https://cdn.jsdelivr.net/npm/pjax@0.2.8/pjax.min.js"></script>
+            <script defer src="<%= url_for('/lib/js/pjax.min.js') %>"></script>
             <script>
-              var pjax = new Pjax({
-                selectors: [
-                  'title',
-                  'meta[name="description"]',
-                  'meta[property="og:title"]',
-                  'meta[property="og:description"]',
-                  'meta[property="og:url"]',
-                  'meta[property="og:image"]',
-                  'meta[property="article:published_time"]',
-                  'meta[property="article:modified_time"]',
-                  '#pjax-container',
-                  '#header'
-                ],
-                cacheBust: false
-              });
+              document.addEventListener('DOMContentLoaded', function () {
+                if (typeof Pjax !== 'undefined') {
+                  var pjax = new Pjax({
+                    selectors: [
+                      'title',
+                      'meta[name="description"]',
+                      'meta[property="og:title"]',
+                      'meta[property="og:description"]',
+                      'meta[property="og:url"]',
+                      'meta[property="og:image"]',
+                      'meta[property="article:published_time"]',
+                      'meta[property="article:modified_time"]',
+                      '#pjax-container',
+                      '#header'
+                    ],
+                    cacheBust: false
+                  });
 
-              document.addEventListener('pjax:complete', function () {
-                if (typeof initPage === 'function') {
-                  initPage();
-                }
-                if (typeof twikoo !== 'undefined' && twikoo.init) {
-                  twikoo.init({
-                    envId: '<%= theme.twikoo.envId %>',
-                    el: '#twikoo-comment'
+                  document.addEventListener('pjax:complete', function () {
+                    if (typeof initPage === 'function') {
+                      initPage();
+                    }
+                    if (typeof twikoo !== 'undefined' && twikoo.init && document.querySelector('#twikoo-comment')) {
+                      twikoo.init({
+                        envId: '<%= theme.twikoo.envId %>',
+                        el: '#twikoo-comment'
+                      });
+                    }
                   });
                 }
               });
             </script>
             <% } %>
-              <% if (is_post() && theme.twikoo && theme.twikoo.enable) { %>
-                <script src="https://cdn.jsdelivr.net/npm/twikoo@1.6.39/dist/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>
-                  twikoo.init({
-                    envId: '<%= theme.twikoo.envId %>',
-                    el: '#twikoo-comment'
+                  document.addEventListener('DOMContentLoaded', function () {
+                    if (typeof twikoo !== 'undefined' && twikoo.init) {
+                      twikoo.init({
+                        envId: '<%= theme.twikoo.envId %>',
+                        el: '#twikoo-comment'
+                      });
+                    }
                   });
                 </script>
                 <% } %>

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.0",
+  "version": "1.2.2",
   "description": "A lightweight and minimalist blog theme",
   "main": "index.js",
   "scripts": {

package/scripts/helpers.js

@@ -32,7 +32,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
         }
       }
 
-      return '<img' + before + 'data-src="' + src + '"' + newAfter + '>';
+      return '<img' + before + 'src="data:image/svg+xml,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 1 1\'%3E%3C/svg%3E" data-src="' + src + '"' + newAfter + '>';
     });
   }
 

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);
 }
 
@@ -10,15 +9,18 @@
 }
 
 img[data-src] {
-  opacity: 0 !important;
-  visibility: hidden !important;
+  opacity: 0;
   min-height: 1px;
   min-width: 1px;
 }
 
 img[data-src].lazyload-image {
-  visibility: visible !important;
   opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+img[data-src].lazyload-loaded {
+  opacity: 1;
 }
 
 .lazyload-skeleton {
@@ -147,11 +149,6 @@ img[data-src].lazyload-image {
   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

@@ -22,7 +22,7 @@
   --transition-fast: 0.15s ease;
   --transition-normal: 0.3s ease;
   --transition-slow: 0.5s ease;
-  --font-family: 'Roboto', 'Noto Sans SC', sans-serif;
+  --font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'PingFang SC', 'Microsoft YaHei', sans-serif;
   --font-mono: 'Fira Code', 'Consolas', monospace;
   --header-height: 64px;
   --sidebar-width: 280px;
@@ -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%;
 }