hexo-theme-linen 1.0.21 → 1.0.23

package/languages/en.yml

@@ -20,6 +20,7 @@ common:
   prevPost: "Prev"
   nextPost: "Next"
   copyright: "This site and its content are licensed under a Creative Commons Attribution-NonCommercial 4.0 International License."
+  copyrightTitle: "Copyright License"
   gallery: "Gallery"
   relatedPosts: "Related Posts"
   series: "Series"
@@ -37,3 +38,5 @@ common:
   thanks: "Thanks to"
   sponsored: "sponsored"
   seriesPostCountShort: "articles"
+  navigation: "Navigation"
+  subscribe: "Subscribe"

package/languages/zh-CN.yml

@@ -20,6 +20,7 @@ common:
   prevPost: "上一篇"
   nextPost: "下一篇"
   copyright: "本网站及其所有内容都遵循创意共享署名-非商业性使用 4.0 国际许可协议。"
+  copyrightTitle: "版权协议"
   gallery: "图库"
   relatedPosts: "相关文章"
   series: "系列"
@@ -31,9 +32,11 @@ common:
   total: "共"
   age_notice: "这是一个创建于 <span class='days-value'></span> 天前的主题，其中的信息可能已经有所发展或是发生改变。"
   minsRead: "分钟阅读"
-  switchTo: "切换到"
+  switchTo: "查看"
   renderedContent: "渲染后的内容"
   rawMarkdownContent: "原始 Markdown 内容"
   thanks: "感谢"
   sponsored: "赞赏了"
   seriesPostCountShort: "篇"
+  navigation: "导航"
+  subscribe: "订阅"

package/layout/footer.ejs

@@ -0,0 +1,62 @@
+<footer id="footer">
+  <div class="footerInner">
+    <div class="footerTop">
+      <div class="footerBrand">
+        <img src="<%=url_for('/linen-theme/img/logo_black.svg')%>" class="footerLogo" alt="logo" />
+        <% if (theme?.info?.site_desc) { %>
+        <p class="footerDesc"><%= theme.info.site_desc %></p>
+        <% } %>
+      </div>
+      <div class="footerLinks">
+        <div class="footerLinkCol">
+          <h4><%= __('common.navigation') %></h4>
+          <% if (theme?.navItems) { %>
+            <% theme.navItems.forEach(item => { %>
+              <a href="<%=url_for(item.path)%>"><%=item.name%></a>
+            <% }); %>
+          <% } %>
+        </div>
+        <div class="footerLinkCol">
+          <h4><%= __('common.subscribe') %></h4>
+          <% 
+          const rssPath = config?.feed?.path || theme?.feed?.path;
+          if (rssPath) { 
+          %>
+          <a href="<%=url_for(rssPath)%>" target="_blank" class="footerRssLink">
+            <svg class="rssSvg" viewBox="0 0 24 24" width="14" height="14">
+              <path fill="currentColor" d="M6.18,15.64A2.18,2.18,0,0,1,8.36,17.82a2.18,2.18,0,0,1-2.18,2.18A2.18,2.18,0,0,1,4,17.82,2.18,2.18,0,0,1,6.18,15.64M4,4.44A15.56,15.56,0,0,1,19.56,20h-2.8A12.76,12.76,0,0,0,4,7.24V4.44m0,5.6A9.96,9.96,0,0,1,13.96,20h-2.8A7.16,7.16,0,0,0,4,12.84V10.04Z" />
+            </svg>
+            <span>RSS</span>
+          </a>
+          <% } %>
+        </div>
+        <div class="footerLinkCol footerMetaCol">
+          <h4><a href="<%=url_for('/explorers-guide')%>"><%= __('common.aboutThisSite') %></a></h4>
+          <span class="footerMetaText copyright">
+            <span class="copyright-popover-container">
+              <span class="copyright-trigger" tabindex="0" aria-haspopup="true">©</span>
+              <span class="copyright-popover-content">
+                <span class="copyright-popover-arrow"></span>
+                <span class="copyright-popover-header">
+                  <svg class="copyright-popover-icon" viewBox="0 0 24 24" width="14" height="14">
+                    <path fill="currentColor" d="M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm-1-13h2V7h-2v2z"/>
+                  </svg>
+                  <span class="copyright-popover-title"><%=__('common.copyrightTitle')%></span>
+                </span>
+                <span class="copyright-popover-text"><%=__('common.copyright')%></span>
+              </span>
+            </span>&nbsp;<%=date(Date.now(), 'YYYY')+' '+config.author%>
+          </span>
+          <span class="footerMetaText">
+            Powered by <a href="https://hexo.io/" target="_blank">Hexo</a> & <a href="https://github.com/LynanBreeze/hexo-theme-linen" target="_blank">Linen</a>
+          </span>
+          <% if (theme?.info?.registration) { %>
+          <span class="footerMetaText registration">
+            <a href="http://beian.miit.gov.cn/" target="_blank"><%=theme.info.registration%></a>
+          </span>
+          <% } %>
+        </div>
+      </div>
+    </div>
+  </div>
+</footer>

package/layout/layout.ejs

@@ -5,6 +5,7 @@ const version = theme.version;
 <% 
   var tocs = is_post() ? extractTocFromHtml(page.content) : null;
   var series = is_post() ? site.posts.filter(item=>item.series && item.series === page?.series).sort('date', -1) : []
+  var seriesInfo = is_post() && page?.series ? getSeriesInfo(page.series) : {}
 %>
 
 <!DOCTYPE html>
@@ -12,7 +13,7 @@ const version = theme.version;
 
 <head>
   <meta charset="UTF-8" />
-  <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+  <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1" />
   <title><%=getPageTitle()%></title>
   <link rel="icon" type="image/x-icon" href="<%=url_for(theme?.icon ?? '/linen-theme/favicon.svg')%>" />
   <meta name="referrer" content="no-referrer-when-downgrade" />
@@ -44,7 +45,8 @@ const version = theme.version;
   <% } %>
 </head>
 
-<body>
+<body class="<%- is_post() ? 'is-post' : '' %>">
+  <div id=" "></div>
   <div id="page-top"></div>
   <%-partial('partials/header', {
       hasTocs: page?.toc ?? !!tocs?.length
@@ -79,7 +81,18 @@ const version = theme.version;
       <div class="post-series">
         <a class="series-title" href="<%=url_for(`/series/${page.series}/`)%>"><%=page.series%></a>
         <div class="series-items">
-          <% take(series, 50).forEach((item, index) => { %>
+          <%
+          let currentSeriesYear = null;
+          take(series, 50).forEach((item, index) => {
+            const itemYear = item.date?.year ? item.date.year() : new Date(item.date).getFullYear();
+            const showYearDivider = seriesInfo?.yearDivider && itemYear && itemYear !== currentSeriesYear;
+            if (showYearDivider) {
+              currentSeriesYear = itemYear;
+            }
+          %>
+          <% if (showYearDivider) { %>
+          <div class="series-year-divider<%-itemYear === page?.date?.year() ? ' active': ''%>"><%=itemYear%></div>
+          <% } %>
           <a class="series-item-link<%-item.source === page.source ? ' active': ''%>" href="<%=url_for(item.path)%>"><%-`${item.title}`%><% if (item.subTitle) { %><span class="sub-title"><%=item.subTitle%></span><% } %></a>
           <% }); %>
           <% if(series.length > 50) { %>
@@ -90,15 +103,15 @@ const version = theme.version;
       <% } %>
     </div>
     <div id="content-outer" class="<%= is_post() ? 'post-outer' : page.seriesInfo?.cover ? 'series-outer': '' %>">
-      <div id="content-inner">
+      <main id="content-inner" class="content-inner">
         <%- body %>
-      </div>
+      </main>
     </div>
   </div>
 
-  <%-partial('partials/footer')%>
+  <%-partial('footer')%>
   <div id="mask"></div>
-  <a id="back-to-top" href="#page-top" title="back to top"></a>
+  <a id="back-to-top" href="# " title="back to top"></a>
   <noscript id="noscript-styles"></noscript>
   <% if(is_post()) { %>
   <script src="<%=url_for(`/linen-theme/js/toc.js?v=${version}`)%>" defer></script>
@@ -118,7 +131,7 @@ const version = theme.version;
   </script>
   <% } %>
   <% if (page.hdrSwitch) { %>
-  <script src="<%url_for(`/linen-theme/js/hdr.js?v=${version}`)%>"></script>
+  <script src="<%=url_for(`/linen-theme/js/hdr.js?v=${version}`)%>"></script>
   <% } %>
   <% if (theme?.appends?.length > 0) { %>
   <% theme.appends.forEach(appendItem => { %>
@@ -127,4 +140,4 @@ const version = theme.version;
   <% } %>
 </body>
 
-</html>
+</html>

package/layout/partials/header.ejs

@@ -3,7 +3,7 @@ const { hasTranslatation, targetLanguagePath, targetLanguage } = getTranslationP
 
 const logoConfig = theme?.logo || {};
 const { src: logoSrc, text: logoText, width: logoWidth, height: logoHeight } = logoConfig;
-const rssPath = theme?.feed === false ? '' : theme?.feed?.path ?? '/feed.xml';
+const rssPath = config?.feed?.path || theme?.feed?.path;
 %>
 
 <% if (is_post()) { %>

package/layout/partials/post-item.ejs

@@ -1,5 +1,10 @@
 <div class="post-item" href="<%=url_for(post.path)%>" onclick="onclickPostItem(this)">
   <div class="item-body">
+    <% if (post.thumbnail || post.cover) { %>
+    <div class="cover-img">
+      <img src="<%=url_for(post.thumbnail || post.cover)%>" alt="" loading="lazy" />
+    </div>
+    <% } %>
     <div class="title-excerpt">
       <div class="title-excerpt-text">
         <a class="title" href="<%=url_for(post.path)%>" onclick="event.stopPropagation()"><%=post.title%><% if (post.subTitle) { %><span class="sub-title"><%=post.subTitle%></span><% } %></a>
@@ -26,10 +31,5 @@
         <span class="read-time"><%-partial('partials/words', { post, count: false, readTime: true })%></span>
       </div>
     </div>
-    <% if (post.thumbnail || post.cover) { %>
-    <div class="cover-img">
-      <img src="<%=url_for(post.thumbnail || post.cover)%>" alt="" loading="lazy" />
-    </div>
-    <% } %>
   </div>
 </div>

package/layout/partials/related-posts.ejs

@@ -15,7 +15,7 @@ const relatedPosts = site.posts.filter(item=>item.source !== page.source).filter
 <div id="related-posts">
   <div class="related-posts-title"><%=__('common.relatedPosts')%></div>
   <% relatedPosts.each(post => { 
-      const coverImg = post.thumbnail || post.cover || '../img/related-post.jpg'
+      const coverImg = post.thumbnail || post.cover || url_for('/linen-theme/img/related-post.jpg')
       %>
   <a href="<%=url_for(post.path)%>">
     <div class="shared-link">