hexo-theme-stellar 1.25.0 → 1.26.0

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

@@ -0,0 +1,21 @@
+<%
+function layoutDiv() {
+  var el = ''
+  const isActive = url_for(item.url) == url_for(page.path)
+  el += `<a class="link${isActive ? ' active' : ''}" title="${item.title}" href="${item.url}">`
+  el += `<div class="flex">`
+  if (item.icon) {
+    el += icon(item.icon)
+  }
+  if (columns <= 2) {
+    el += `<span>${item.title}</span>`
+  }
+  el += `</div>`
+  if (columns == 1 && isActive) {
+    el += icon('default:bookmark.active')
+  }
+  el += `</a>`
+  return el
+}
+%>
+<%- layoutDiv() %>

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

@@ -0,0 +1,27 @@
+<%
+function layoutDiv(linklist) {
+  var links = linklist.items || []
+  if (links.length == 0) {
+    return ''
+  }
+  var el = ''
+  var style = ''
+  var columns = linklist.columns || links.length
+  if (links.length == 1) {
+    style += `style="grid-template-columns:repeat(1,1fr);"`
+  } else {
+    style += `style="grid-template-columns:repeat(${columns},1fr);"`
+  }
+  var align = 'center'
+  if (columns == 1 && links.length > 1) {
+    align = 'left'
+  }
+  el += `<div class="linklist ${align}" ${style}>`
+  for (let link of links) {
+    el += partial('link', {item: link, columns: columns})
+  }
+  el += `</div>`
+  return el
+}
+%>
+<%- layoutDiv(item) %>

package/layout/_partial/widgets/ghissues.ejs

@@ -5,13 +5,11 @@ function layoutDiv() {
   var branch = 'main';
   if (page.repo) {
     repo = page.repo
-  } else if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.tree[page.wiki];
-    if (proj && proj.repo) {
-      repo = proj.repo;
-      if (proj.branch != undefined) {
-        branch = proj.branch;
-      }
+  } else if (theme.wiki.tree[page.wiki]?.repo) {
+    const proj = theme.wiki.tree[page.wiki]
+    repo = proj.repo
+    if (proj.branch != undefined) {
+      branch = proj.branch
     }
   }
   if (repo == undefined) {
@@ -21,9 +19,9 @@ function layoutDiv() {
   if (item.labels) {
     item.api += '&labels=' + item.labels;
   }
-  el += '<widget class="widget-wrapper timeline">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} timeline">`
     if (item.title) {
-      el += '<div class="widget-header cap theme dis-select">';
+      el += '<div class="widget-header dis-select">';
       el += '<span class="name">' + item.title + '</span>';
       el += '</div>';
     }

package/layout/_partial/widgets/ghrepo.ejs

@@ -5,40 +5,38 @@ function layoutDiv() {
   var branch = 'main';
   if (page.repo) {
     repo = page.repo
-  } else if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.tree[page.wiki];
-    if (proj && proj.repo) {
-      repo = proj.repo;
-      if (proj.branch != undefined) {
-        branch = proj.branch;
-      }
+  } else if (theme.wiki.tree[page.wiki]?.repo) {
+    const proj = theme.wiki.tree[page.wiki]
+    repo = proj.repo
+    if (proj.branch != undefined) {
+      branch = proj.branch
     }
   }
   if (repo == undefined) {
     return el;
   }
   // 布局
-  el += '<widget class="widget-wrapper ghrepo">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} ghrepo">`
   // body
   el += '<div class="widget-body">';
   el += '<div class="items stellar-ghinfo-api" api="' + theme.api_host.ghapi + '/repos/' + repo + '">';
   el += '<a class="repo" href="https://github.com/' + repo + '" target="_blank" rel="external nofollow noopener noreferrer">';
     el += '<div class="repo-name flex-row">';
-      el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="user-select:none;overflow:visible"><path fill-rule="evenodd" d="M2 2.5A2.5 2.5 0 014.5 0h8.75a.75.75 0 01.75.75v12.5a.75.75 0 01-.75.75h-2.5a.75.75 0 110-1.5h1.75v-2h-8a1 1 0 00-.714 1.7.75.75 0 01-1.072 1.05A2.495 2.495 0 012 11.5v-9zm10.5-1V9h-8c-.356 0-.694.074-1 .208V2.5a1 1 0 011-1h8zM5 12.25v3.25a.25.25 0 00.4.2l1.45-1.087a.25.25 0 01.3 0L8.6 15.7a.25.25 0 00.4-.2v-3.25a.25.25 0 00-.25-.25h-3.5a.25.25 0 00-.25.25z"></path></svg>';
+      el += icon('github:repo')
       el += repo;
     el += '</div>';
     el += '<div class="repo-desc"><span type="text" id="description">&nbsp;</span></div>';
     el += '<div class="grid">';
       el += '<div class="flex-row">';
-        el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="user-select:none;overflow:visible"><path fill-rule="evenodd" d="M8 .25a.75.75 0 01.673.418l1.882 3.815 4.21.612a.75.75 0 01.416 1.279l-3.046 2.97.719 4.192a.75.75 0 01-1.088.791L8 12.347l-3.766 1.98a.75.75 0 01-1.088-.79l.72-4.194L.818 6.374a.75.75 0 01.416-1.28l4.21-.611L7.327.668A.75.75 0 018 .25zm0 2.445L6.615 5.5a.75.75 0 01-.564.41l-3.097.45 2.24 2.184a.75.75 0 01.216.664l-.528 3.084 2.769-1.456a.75.75 0 01.698 0l2.77 1.456-.53-3.084a.75.75 0 01.216-.664l2.24-2.183-3.096-.45a.75.75 0 01-.564-.41L8 2.694v.001z"></path></svg>';
+        el += icon('github:star')
         el += '<span type="text" id="stargazers_count"></span>';
       el += '</div>';
       el += '<div class="flex-row">';
-        el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="user-select:none;overflow:visible"><path fill-rule="evenodd" d="M5 3.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm0 2.122a2.25 2.25 0 10-1.5 0v.878A2.25 2.25 0 005.75 8.5h1.5v2.128a2.251 2.251 0 101.5 0V8.5h1.5a2.25 2.25 0 002.25-2.25v-.878a2.25 2.25 0 10-1.5 0v.878a.75.75 0 01-.75.75h-4.5A.75.75 0 015 6.25v-.878zm3.75 7.378a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm3-8.75a.75.75 0 100-1.5.75.75 0 000 1.5z"></path></svg>';
+        el += icon('github:fork')
         el += '<span type="text" id="forks_count"></span>';
       el += '</div>';
       el += '<div class="flex-row stellar-ghinfo-api" index="0" api="' + theme.api_host.ghapi + '/repos/' + repo + '/tags">';
-        el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="user-select:none;overflow:visible"><path fill-rule="evenodd" d="M2.5 7.775V2.75a.25.25 0 01.25-.25h5.025a.25.25 0 01.177.073l6.25 6.25a.25.25 0 010 .354l-5.025 5.025a.25.25 0 01-.354 0l-6.25-6.25a.25.25 0 01-.073-.177zm-1.5 0V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 010 2.474l-5.026 5.026a1.75 1.75 0 01-2.474 0l-6.25-6.25A1.75 1.75 0 011 7.775zM6 5a1 1 0 100 2 1 1 0 000-2z"></path></svg>';
+        el += icon('github:tag')
         el += '<span type="text" id="latest-tag-name">0</span>';
       el += '</div>';
     el += '</div>';

package/layout/_partial/widgets/ghuser.ejs

@@ -22,7 +22,7 @@ function layoutDiv() {
     return el;
   }
 
-  el += '<widget class="widget-wrapper ghuser">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} ghuser">`
   // body
   el += '<div class="widget-body stellar-ghinfo-api" api="' + theme.api_host.ghapi + '/users/' + item.username + '">';
     if (item.avatar) {
@@ -42,13 +42,9 @@ function layoutDiv() {
     el += '</div>';
     // follow
     el += '<a class="follow" href="https://github.com/' + item.username + '">';
-    el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="display:inline-block;user-select:none;vertical-align:text-bottom;overflow:visible"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path></svg>';
+    el += icon('github:logo')
     el += 'Follow';
     el += '</a>';
-    // menu
-    if (item.menu) {
-      el += partial('../sidebar/menu', {where: 'sidebar'});
-    }
   el += '</div>';
   el += '</widget>';
   return el;

package/layout/_partial/widgets/linklist.ejs

@@ -0,0 +1,17 @@
+<%
+function layoutDiv() {
+  var el = '';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} linklist">`
+  if (item.title?.length > 0) {
+    el += '<div class="widget-header dis-select">';
+    el += '<span class="name">' + item.title + '</span>';
+    el += '</div>';
+  }
+  el += '<div class="widget-body fs14">';
+  el += partial('components/linklist', {item: item})
+  el += '</div>';
+  el += '</widget>';
+  return el;
+}
+%>
+<%- layoutDiv() %>

package/layout/_partial/widgets/markdown.ejs

@@ -2,9 +2,9 @@
 function layoutDiv() {
   if (!item.content?.length && !item.src?.length) return ''
   var el = '';
-  el += '<widget class="widget-wrapper markdown">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} markdown">`
   if (item.title?.length > 0) {
-    el += '<div class="widget-header cap theme dis-select">';
+    el += '<div class="widget-header dis-select">';
     el += '<span class="name">' + item.title + '</span>';
     el += '</div>';
   }
@@ -15,6 +15,9 @@ function layoutDiv() {
   if (item.src) {
     el += `<div class="stellar-marked-api md-marked" src="${item.src}"></div>`
   }
+  if (item.linklist) {
+    el += partial('components/linklist', {item: item.linklist})
+  }
   el += '</div>';
   el += '</widget>';
   return el;

package/layout/_partial/widgets/recent.ejs

@@ -1,12 +1,12 @@
 <%
 function layoutDiv() {
-  var el = '<widget class="widget-wrapper recent">';
+  var el = `<widget class="widget-wrapper${scrollreveal(' ')} post-list">`
   // header
-  el += '<div class="widget-header cap theme dis-select">';
+  el += '<div class="widget-header dis-select">';
   el += '<span class="name">' + __("meta.recent_update") + '</span>';
   if (item.rss) {
     el += '<a class="cap-action" id="rss" title="Subscribe" href="' + item.rss + '">';
-    el += '<svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8938"><path d="M800.966 947.251c0-404.522-320.872-732.448-716.69-732.448V62.785c477.972 0 865.44 395.987 865.44 884.466h-148.75z m-162.273 0h-148.74c0-228.98-181.628-414.598-405.678-414.598v-152.01c306.205 0 554.418 253.68 554.418 566.608z m-446.24-221.12c59.748 0 108.189 49.503 108.189 110.557 0 61.063-48.44 110.563-108.188 110.563-59.747 0-108.18-49.5-108.18-110.563 0-61.054 48.433-110.556 108.18-110.556z" p-id="8939"></path></svg>';
+    el += icon('default:rss')
     el += '</a>';
   }
   el += '</div>';
@@ -25,20 +25,24 @@ function layoutDiv() {
     arr = site.posts.filter( p => p.title && p.title.length > 0)
     arr = arr.sort("updated", -1)
   }
-  el += '<div class="widget-body related-posts fs14">';
+  el += '<div class="widget-body fs14">';
   arr.length = item.limit
   arr.forEach(post => {
     if (!post) { return }
-    el += '<a class="item title" href="' + url_for(post.link || post.path) + '">';
+    const isActive = post.path == page.path
+    el += `<a class="item title${post.path == page.path ? ' active' : ''}" href="${url_for(post.link || post.path)}">`
     el += '<span class="title">'
-    if (post.layout == 'wiki') {
-      let proj = theme.wiki.tree[post.wiki];
+    if (post.wiki) {
+      const proj = theme.wiki.tree[post.wiki];
       let name = proj?.name || post?.wiki;
       if (name) {
         el += '<strong>' + name + '</strong>' + '<span class="dot"></span>';
       }
     }
-    el += (post.title || post.seo_title || post.wiki) + '</span>';
+    el += (post.title || post.wiki) + '</span>';
+    if (isActive) {
+      el += icon('default:bookmark.active')
+    }
     el += '</a>';
     el += '';
   });

package/layout/_partial/widgets/related.ejs

@@ -8,14 +8,18 @@ function relatedPostsInTopic() {
     return ''
   }
   var el = ''
-  el += `<widget class="widget-wrapper recent">`
-  el += `<div class="widget-header cap theme dis-select">`
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} post-list">`
+  el += `<div class="widget-header dis-select">`
   el += `<span class="name">${__('btn.topic') + __('symbol.colon') + topic.name}</span>`
   el += `</div>`
-  el += `<div class="widget-body related-posts">`
+  el += `<div class="widget-body">`
   for (let post of topic.pages) {
-    el += `<a class="item${post.path == page.path ? ' active' : ''}" href="${url_for(post.path)}">`
+    const isActive = post.path == page.path
+    el += `<a class="item${isActive ? ' active' : ''}" href="${url_for(post.path)}">`
     el += `<span class="title">${post.title}</span>`
+    if (isActive) {
+      el += icon('default:bookmark.active')
+    }
     el += `</a>`
   }
   el += `</div>`
@@ -30,11 +34,11 @@ function relatedWiki() {
   const relatedItems = thisItemObject.relatedItems
   var el = ''
   for (let relatedItem of relatedItems) {
-    el += `<widget class="widget-wrapper related">`
-    el += `<div class="widget-header cap theme dis-select">`
+    el += `<widget class="widget-wrapper${scrollreveal(' ')} post-card">`
+    el += `<div class="widget-header dis-select">`
     el += `<span class="name">${__('meta.more') + __('symbol.colon') + relatedItem.name}</span>`
     el += `</div>`
-    el += `<div class="widget-body related-posts">`
+    el += `<div class="widget-body">`
     for (let id of relatedItem.items) {
       // 同一个分组中的其它项目
       let item = theme.wiki.tree[id]
@@ -51,9 +55,9 @@ function relatedWiki() {
   return el
 }
 function layoutDiv() {
-  if (page.layout == 'wiki') {
+  if (page.wiki?.length > 0) {
     return relatedWiki()
-  } else if (page.layout == 'topic') {
+  } else if (page.topic?.length > 0) {
     return relatedPostsInTopic()
   }
 }

package/layout/_partial/widgets/search.ejs

@@ -1,40 +0,0 @@
-<%
-function layoutDiv() {
-  var el = '<widget class="widget-wrapper search">'
-  el += '<div class="widget-body">'
-  el += '<div class="search-wrapper" id="search-wrapper">'
-  el += '<form class="search-form">'
-  var filter = ''
-  if (item.filter == 'auto') {
-    if (page.layout == 'wiki') {
-      let matches = page.path.match(/(.*?)\/(.*?)\//i)
-      if (matches?.length > 0) {
-        filter = matches[0]
-      }
-    }
-  } else {
-    if (item.filter?.length > 0) {
-      filter = item.filter
-    }
-  }
-  el += '<input type="text" class="search-input" id="search-input"'
-  if (filter.length > 0) {
-    if (!filter.startsWith('/')) {
-      filter = '/' + filter
-    }
-    el += ' data-filter="' + filter + '"'
-    el += ' placeholder="' + (item.placeholder || __('search.search_in', filter)) + '">'
-  } else {
-    el += ' placeholder="' + (item.placeholder || __('search.search')) + '">'
-  }
-  el += '<svg t="1705074644177" class="icon search-icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1560" width="200" height="200"><path d="M1008.839137 935.96571L792.364903 719.491476a56.783488 56.783488 0 0 0-80.152866 0 358.53545 358.53545 0 1 1 100.857314-335.166073 362.840335 362.840335 0 0 1-3.689902 170.145468 51.248635 51.248635 0 1 0 99.217358 26.444296 462.057693 462.057693 0 1 0-158.255785 242.303546l185.930047 185.725053a51.248635 51.248635 0 0 0 72.568068 0 51.248635 51.248635 0 0 0 0-72.978056z" p-id="1561"></path><path d="M616.479587 615.969233a50.428657 50.428657 0 0 0-61.498362-5.534852 174.655348 174.655348 0 0 1-177.525271 3.484907 49.403684 49.403684 0 0 0-58.833433 6.76482l-3.074918 2.869923a49.403684 49.403684 0 0 0 8.609771 78.10292 277.767601 277.767601 0 0 0 286.992355-5.739847 49.403684 49.403684 0 0 0 8.404776-76.667958z" p-id="1562"></path></svg>'
-  el += '</form>'
-  el += '<div id="search-result"></div>'
-  el += '<div class="search-no-result">' + __('search.no_results') + '</div>'
-  el += '</div>'
-  el += '</div>'
-  el += '</widget>'
-  return el
-}
-%>
-<%- layoutDiv() %>

package/layout/_partial/widgets/tagcloud.ejs

@@ -8,9 +8,9 @@ function layoutDiv() {
   delete opts['title'];
   delete opts['layout'];
   opts.class = 'tag ';
-  el += '<widget class="widget-wrapper tagcloud">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} tagcloud">`
     if (item.title) {
-      el += '<div class="widget-header cap theme dis-select">';
+      el += '<div class="widget-header dis-select">';
       el += '<span class="name">' + item.title + '</span>';
       el += '</div>';
     }

package/layout/_partial/widgets/timeline.ejs

@@ -4,9 +4,9 @@ function layoutDiv() {
   if (item.api == undefined) {
     return el;
   }
-  el += '<widget class="widget-wrapper timeline">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} timeline">`
     if (item.title) {
-      el += '<div class="widget-header cap theme dis-select">';
+      el += '<div class="widget-header dis-select">';
       el += '<span class="name">' + item.title + '</span>';
       el += '</div>';
     }

package/layout/_partial/widgets/toc.ejs

@@ -1,5 +1,5 @@
 <%
-let proj = theme.wiki.tree[page.wiki];
+const proj = theme.wiki.tree[page.wiki]
 var hasTOC = true
 function layoutTocBody() {
   if (toc(page.content).length > 0) {
@@ -16,7 +16,7 @@ function layoutTocBody() {
 
 function layoutTocHeader(title) {
   var el = ''
-  el += `<div class="widget-header cap dis-select">`
+  el += `<div class="widget-header dis-select">`
   el += `<span class="name">${title || __("meta.toc")}</span>`
   el += `</div>`
   return el
@@ -40,6 +40,9 @@ function layoutDocTree(pages) {
       }
       el += `<a class="doc-tree-link${isActive}" href="${href}">`
       el += `<span class="toc-text">${p.title}</span>`
+      if (isActive.length > 0) {
+        el += icon('default:bookmark.active')
+      }
       el += `</a>`
     }
     if (p.path === page.path) {
@@ -53,12 +56,8 @@ function layoutDocTree(pages) {
 
 function layoutDiv(fallback) {
   var type = ''
-  if (proj && proj.pages) {
-    if (proj.pages.length > 1) {
-      type = 'multi'
-    } else {
-      type = 'single'
-    }
+  if (proj?.pages) {
+    type = proj.pages.length > 1 ? 'multi' : 'single'
   } else {
     let toc_content = toc(page.content)
     if (toc_content && toc_content.length > 0) {
@@ -68,19 +67,8 @@ function layoutDiv(fallback) {
 
   var el = ''
   if (type.length > 0) {
-    el += `<widget class="widget-wrapper toc ${type}" id="data-toc" collapse="${item.collapse}">`
-    if (page.layout !== 'wiki') {
-      // post 布局
-      el += layoutTocHeader(page.toc_title)
-      el += `<div class="widget-body fs14">`
-      el += `<div class="doc-tree active">`
-      el += layoutTocBody()
-      el += `</div>`
-      el += `</div>`
-      if (hasTOC == false) {
-        return ''
-      }
-    } else if (proj) {
+    el += `<widget class="widget-wrapper${scrollreveal(' ')} toc ${type}" id="data-toc" collapse="${item.collapse}">`
+    if (proj) {
       // wiki 布局
       if (proj.sections && proj.sections.length > 0 && proj.pages.length > 1) { // 多 pages
         for (let sec of proj.sections) {
@@ -96,7 +84,7 @@ function layoutDiv(fallback) {
         }
       } else { // 单 page
         if (proj.pages.length == 1) {
-          el += layoutTocHeader(page.toc_title)
+          el += layoutTocHeader()
         }
         el += `<div class="widget-body fs14">`
         el += layoutDocTree(proj.pages)
@@ -105,10 +93,22 @@ function layoutDiv(fallback) {
           return ''
         }
       }
-    }
+    } else {
+      // post 布局
+      el += layoutTocHeader()
+      el += `<div class="widget-body fs14">`
+      el += `<div class="doc-tree active">`
+      el += layoutTocBody()
+      el += `</div>`
+      el += `</div>`
+      if (hasTOC == false) {
+        return ''
+      }
+    } 
     el += `</widget>`
   } else if (item.fallback) {
-    el += partial(item.fallback, {item: theme.data.widgets[item.fallback]})
+    const fallback = theme.widgets[item.fallback]
+    el += partial(fallback.layout, {item: fallback})
   }
   return el
 }

package/layout/archive.ejs

@@ -4,7 +4,7 @@ if (page.menu_id == undefined) {
   page.menu_id = 'post';
 }
 if (page.author) {
-  page.header = 'auto';
+  page.header = false;
 }
 function layoutArchiveList() {
   var el = ''
@@ -24,7 +24,7 @@ function layoutArchiveList() {
     }
   })
   for (let year of years) {
-    el += `<article class="${scrollreveal()}" id="archive">`
+    el += `<article class="${scrollreveal('')}" id="archive">`
   	el += `<div class='archive-header h4'>${year}</div>`
     site.posts.sort('date', -1).filter(function (post) {
       post.year = date(post.date, 'YYYY')

package/layout/categories.ejs

@@ -9,7 +9,7 @@ if (page.menu_id == undefined) {
   <% page.layout = 'categories'; %>
   <%- partial('_partial/main/navbar/nav_tabs_blog') %>
   <div class='post-list'>
-    <article class='<%- scrollreveal() %>' id='cats'>
+    <article class='<%- scrollreveal("") %>' id='cats'>
       <% site.categories.sort('path').each(function(category){ %>
         <div>
           <a class="<%= category.parent ? 'cat child' : 'cat'%>" href="<%= url_for(category.path) %>">

package/layout/index.ejs

@@ -12,7 +12,7 @@ function layout_post_card(layout, post, content) {
   if (layout == 'post' && post.cover != undefined && post.poster != undefined) {
     layout += ' photo';
   }
-  el += '<a class="post-card ' + layout + ' ' + scrollreveal() + '" href="' + url_for(post.link || post.path) + '">';
+  el += `<a class="post-card${scrollreveal(' ')} ${layout}" href="${url_for(post.link || post.path)}">`
   el += content;
   el += '</a>';
   return el;
@@ -21,25 +21,9 @@ function layout_post_card(layout, post, content) {
 function layout_post_list(partial) {
   var el = '';
   el += '<div class="post-list post">';
-  if (is_home()) {
-    // pinned posts
-    if (page.current == 1) {
-      var pinned = site.posts.filter(post => post.pin != undefined).sort((config.index_generator && config.index_generator.order_by) || '-date');
-      pinned.forEach((post, i) => {
-        el += layout_post_card('post', post, partial(post));
-      });
-    }
-    // unpinned posts
-    page.posts.each(function(post){
-      if (post.pin == undefined) {
-        el += layout_post_card('post', post, partial(post));
-      }
-    })
-  } else {
-    page.posts.each(function(post){
-      el += layout_post_card('post', post, partial(post));
-    })
-  }
+  page.posts.each(function(post){
+    el += layout_post_card('post', post, partial(post));
+  })
   el += '</div>';
   return el;
 }

package/layout/index_topic.ejs

@@ -8,7 +8,7 @@ function layout_topic_list(partial) {
       continue
     }
     el += `<div class="post-list wiki topic">`
-    el += `<a class="post-card wiki topic ${scrollreveal()}" href="${url_for(topic.homepage?.path || '/')}">`
+    el += `<a class="post-card wiki topic${scrollreveal(' ')}" href="${url_for(topic.homepage?.path || '/')}">`
     el += partial(topic)
     el += `</a>`
     el += `</div>`

package/layout/index_wiki.ejs

@@ -13,14 +13,14 @@ function layout_wiki_list(partial) {
     if (page.filter === false) {
       // wikiList
       el += `<div class="post-list wiki">`
-      el += `<a class="post-card wiki ${scrollreveal()}" href="${url_for(proj.homepage?.path || '/')}">`
+      el += `<a class="post-card wiki${scrollreveal(' ')}" href="${url_for(proj.homepage?.path || '/')}">`
       el += partial(proj)
       el += `</a>`
       el += `</div>`
     } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
       // filtered wikiList
       el += `<div class="post-list wiki filter">`
-      el += `<a class="post-card wiki ${scrollreveal()}" href="${url_for(proj.homepage?.path || '/')}">`
+      el += `<a class="post-card wiki${scrollreveal(' ')}" href="${url_for(proj.homepage?.path || '/')}">`
       el += partial(proj)
       el += `</a>`
       el += `</div>`

package/layout/layout.ejs

@@ -1,21 +1,53 @@
-<!DOCTYPE html>
-<html lang='<%- page.lang %>'>
-<%- partial('_partial/head') %>
-<body>
-  <%- partial('_partial/cover/index') %>
-  <div class='l_body' id='start'>
-    <aside class='l_left' layout='<%- page.layout %>'>
-    <%- partial('_partial/sidebar/index') %>
-    </aside>
-    <div class='l_main<%- page.content ? "" : " list" %>'>
-      <%- partial('_partial/main/header/index') %>
-      <%- body %>
-      <%- partial('_partial/main/footer') %>
-      <%- partial('_partial/menubtn') %>
-    </div>
-  </div>
-  <div class='scripts'>
-    <%- partial('_partial/scripts/index') %>
-  </div>
-</body>
-</html>
+<%
+// 页面类型：索引页面还是内容页面
+var page_type = 'index'
+if (['post', 'page', 'wiki', null].includes(page.layout)) {
+  if (!page.nav_tabs) {
+    page_type = 'content'
+  }
+}
+// 文章类型：技术类文章/文学类文章
+var article_type = theme.article.type
+if (page.type?.length > 0) {
+  article_type = page.type
+}
+// 是否缩进
+var indent = false
+if (page.indent != null) {
+  indent = page.indent
+} else if (theme.topic.tree[page.topic]?.indent != null) {
+  indent = theme.topic.tree[page.topic]?.indent
+} else if (theme.wiki.tree[page.wiki]?.indent != null) {
+  indent = theme.wiki.tree[page.wiki]?.indent
+} else if (theme.article.indent != null) {
+  indent = theme.article.indent
+} else {
+  indent = article_type === 'story'
+}
+
+var html = `<!DOCTYPE html>`
+html += `<html lang="${page.lang}">`
+  html += partial('_partial/head')
+  html += `<body>`
+    html += partial('_partial/cover/index')
+    html += `<div class="l_body ${page_type} ${article_type}" id="start" layout="${page.layout}" ${indent ? 'text-indent' : ''}>`
+      html += `<aside class="l_left">`
+        html += `<div class="sidebar-container${theme.style.sidebar?.blur ? ' sidebar-blur' : ''}">`
+          html += partial('_partial/sidebar/index')
+        html += `</div>`
+      html += `</aside>`
+      html += `<div class="l_main" id="main">`
+        html += partial('_partial/sidebar/logo', {where: 'main'})
+        html += body
+        html += partial('_partial/main/footer')
+        html += partial('_partial/menubtn')
+        html += `<div class="main-mask" onclick="sidebar.toggle()"></div>`
+      html += `</div>`
+    html += `</div>`
+    html += `<div class="scripts">`
+      html += partial('_partial/scripts/index')
+    html += `</div>`
+  html += `</body>`
+html += `</html>`
+%>
+<%- html %>