hexo-theme-stellar 1.24.1 → 1.26.0

package/layout/_partial/sidebar/index.ejs

@@ -1,34 +1,48 @@
 <%
-var proj;
-if (page.layout === 'wiki' && page.wiki) {
-  proj = theme.wiki.tree[page.wiki];
-}
-// 默认组件
-if (page.sidebar == undefined) {
-  if (page.layout == 'post' && page.content) {
-    page.sidebar = theme.sidebar.widgets.post;
-  } else if (page.layout == 'wiki' && page.wiki) {
-    let proj = theme.wiki.tree[page.wiki];
-    if (proj?.sidebar) {
-      page.sidebar = proj.sidebar;
-    } else {
-      page.sidebar = theme.sidebar.widgets.wiki;
-    }
-  } else if (is_home()) {
-    page.sidebar = theme.sidebar.widgets.home;
+
+const wiki = theme.wiki.tree[page.wiki]
+const topic = theme.topic.tree[page.topic]
+
+if (page.sidebar == null) {
+  const { site_tree } = theme
+  var sidebar
+  if (is_home()) {
+    sidebar = site_tree.home.sidebar
   } else if (is_category() || is_tag() || is_archive() || ['categories', 'tags', 'archives'].includes(page.layout)) {
-    page.sidebar = theme.sidebar.widgets.blog_index;
-  } else if (['wiki_index'].includes(page.layout)) {
-    page.sidebar = theme.sidebar.widgets.wiki_index;
-  } else if (['404', undefined].includes(page.layout)) {
-    page.sidebar = theme.sidebar.widgets.others;
-  } else if (page.layout == 'page') {
-    page.sidebar = theme.sidebar.widgets.page;
+    sidebar = site_tree.index_blog.sidebar
+  } else if (page.layout === 'index_topic') {
+    // 专栏列表页等同于博客列表页
+    sidebar = site_tree.index_blog.sidebar
+  } else if (page.topic?.length > 0) {
+    // 专栏文章内页等同于普通文章内页
+    sidebar = site_tree.post.sidebar
+  } else if (page.layout === 'index_wiki') {
+    sidebar = site_tree.index_wiki.sidebar
+  } else if (page.wiki?.length > 0) {
+    sidebar = site_tree.wiki.sidebar
+  } else if (page.layout === '404') {
+    sidebar = site_tree.error_page.sidebar
+  } else if (page.layout === 'page') {
+    sidebar = site_tree.page.sidebar
+  } else if (page.layout === 'post') {
+    sidebar = site_tree.post.sidebar
+  } else if (page.layout == null) {
+    sidebar = site_tree.page.sidebar
   } else {
-    page.sidebar = [];
+    sidebar = []
+  }
+
+  if (topic?.sidebar) {
+    sidebar = topic.sidebar
   }
+  if (wiki?.sidebar) {
+    sidebar = wiki.sidebar
+  }
+
+  page.sidebar = sidebar
 }
 
+
 // parse array string
 if (typeof page.sidebar == 'string') {
   page.sidebar = page.sidebar.replace(/ /g, '').split(',');
@@ -52,31 +66,6 @@ function layoutTitle(main, url, sub) {
 function layoutWidgets() {
   var el = '';
   el += '<div class="widgets">';
-  if (page.layout == 'wiki' && proj && page.menu_id == 'wiki') {
-    el += '<widget class="widget-wrapper logo-wrap wiki"><div class="widget-body">';
-    // all products
-    el += '<a style="filter: grayscale(100%)" class="wiki-home cap" href="' + url_for(config.wiki_dir) + '">';
-    el += '<svg aria-hidden="true" viewBox="0 0 16 16" width="1.2em" height="1.2em" fill="currentColor"><path fill-rule="evenodd" d="M7.78 12.53a.75.75 0 01-1.06 0L2.47 8.28a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L4.81 7h7.44a.75.75 0 010 1.5H4.81l2.97 2.97a.75.75 0 010 1.06z"></path></svg>';
-    el += __('btn.all_wiki');
-    el += '</a>';
-    // this product
-    if (proj == undefined) {
-      // 如果没有项目名，则使用menu中显示的名字
-      if (page.menu_id && theme.sidebar.menu[page.menu_id] && md_link(theme.sidebar.menu[page.menu_id])) {
-        proj = {
-          path: md_link(theme.sidebar.menu[page.menu_id]),
-          wiki: __(md_text(theme.sidebar.menu[page.menu_id]))
-        };
-      }
-    }
-    if (proj != undefined) {
-      let main = proj.name || proj.title || page.wiki || page.title;
-      let url = proj.homepage.path;
-      let sub = proj.subtitle;
-      el += layoutTitle(main, url, sub);
-    }
-    el += '</div></widget>';
-  }
   if (page.sidebar) {
     page.sidebar.forEach((w, i) => {
       let name = ''
@@ -86,8 +75,8 @@ function layoutWidgets() {
       } else if (typeof w == 'object' && w.override) {
         name = w.override
       }
-      if (name in theme.data.widgets) {
-        Object.assign(widget, theme.data.widgets[name])
+      if (name in theme.widgets) {
+        Object.assign(widget, theme.widgets[name])
       }
       if (typeof w == 'object' && (w.override || w.layout)) {
         Object.assign(widget, w)
@@ -101,42 +90,62 @@ function layoutWidgets() {
   return el;
 }
 function layoutFooterDiv() {
-  if (page.layout !== 'wiki' && theme.footer.social) {
-    var el = '<footer class="footer dis-select">';
-    el += '<div class="social-wrap">';
-    for (let id of Object.keys(theme.footer.social)) {
-      let item = theme.footer.social[id];
-      if (item.icon && (item.url || item.onclick)) {
-        el += '<a class="social"';
-        if (item.title) {
-          el += ' title="' + item.title + '"';
-        }
-        if (item.url) {
-          el += ' href="' + url_for(item.url) + '"';
-          if (item.url.includes('://')) {
-            el += ' target="_blank" rel="external nofollow noopener noreferrer"';
-          } else {
-            el += ' rel="noopener noreferrer"';
-          }
-        } else if (item.onclick) {
-          item.onclick = item.onclick.replace(/"|\'/g, '&quot;');
-          el += ' onclick="' + item.onclick + '"';
+  const { social } = theme.footer
+  if (social == null) {
+    return ''
+  }
+  var el = '<footer class="footer dis-select">';
+  el += '<div class="social-wrap">';
+  for (let id of Object.keys(social)) {
+    let item = social[id];
+    if (item.icon && (item.url || item.onclick)) {
+      el += '<a class="social"';
+      if (item.title) {
+        el += ' title="' + item.title + '"';
+      }
+      if (item.url) {
+        el += ' href="' + url_for(item.url) + '"';
+        if (item.url.includes('://')) {
+          el += ' target="_blank" rel="external nofollow noopener noreferrer"';
+        } else {
+          el += ' rel="noopener noreferrer"';
         }
-        el += '>';
-        el += item.icon;
-        el += '</a>';
+      } else if (item.onclick) {
+        item.onclick = item.onclick.replace(/"|\'/g, '&quot;');
+        el += ' onclick="' + item.onclick + '"';
       }
+      el += '>';
+      el += item.icon;
+      el += '</a>';
     }
-    el += '</div>';
-    el += '</footer>';
-    return el;
-  } else {
-    return '';
   }
+  el += '</div>';
+  el += '</footer>';
+  return el;
+}
+
+function layoutLogo() {
+  return partial('logo', {where: 'sidebar'})
+}
+
+function layoutNavArea() {
+  var search = {}
+  if (page.search) {
+    search = page.search
+  } else if (wiki?.search) {
+    search = wiki.search
+  } else if (topic?.search) {
+    search = topic.search
+  }
+  var el = ''
+  el += `<div class="nav-area">`
+  el += partial('search', {item: search})
+  el += partial('menu', {where: 'sidebar'})
+  el += `</div>`
+  return el
 }
 %>
-<% if (page.header == undefined || page.header == 'left' || page.header == 'auto') { %>
-  <%- partial('header', {where: 'sidebar'}) %>
-<% } %>
+<%- layoutLogo() %>
+<%- layoutNavArea() %>
 <%- layoutWidgets() %>
 <%- layoutFooterDiv() %>

package/layout/_partial/sidebar/logo.ejs

@@ -0,0 +1,87 @@
+<%
+var logo = theme.logo
+if (page.logo) {
+  logo = Object.assign({}, logo, page.logo)
+} else if (theme.wiki.tree[page.wiki]) {
+  const proj = theme.wiki.tree[page.wiki]
+  var l = proj.logo
+  if (l) {
+    logo = l
+  } else if (proj.name || proj.icon) {
+    logo = {
+      icon: proj.icon || theme.default.project,
+      title: `[${proj.name || proj.title}](${url_for(proj.homepage?.path || '')})`,
+      subtitle: proj.subtitle
+    }
+  }
+} else if (theme.topic.tree[page.topic]) {
+  const topic = theme.topic.tree[page.topic]
+  var l = topic.logo
+  if (l) {
+    logo = l
+  } else if (topic.name || topic.icon) {
+    logo = {
+      icon: topic.icon || theme.default.topic,
+      title: `[${topic.name || topic.title}](${url_for(topic.homepage?.path || '')})`,
+      subtitle: topic.subtitle
+    }
+  }
+}
+
+// logo.icon, logo.title, logo.subtitle, logo.url
+function layoutTitle(main, url, sub) {
+  var el = ''
+  el += `<a class="title" href="${url_for(url || "/")}">`
+  el += `<div class="main" ff="title">${main}</div>`
+  if (sub) {
+    const arr = sub.split('|')
+    if (arr.length > 1) {
+      el += `<div class="sub normal cap">${arr.shift().trim()}</div>`
+      el += `<div class="sub hover cap" style="opacity:0">${arr.join('|')}</div>`
+    } else {
+      el += `<div class="sub cap">${sub}</div>`
+    }
+  }
+  el += `</a>`
+  return el
+}
+
+function layoutDiv() {
+  if (where == 'main') {
+    if (page.header == false) {
+      return ''
+    }
+    // 内容页如果未设置 header 则不显示
+    if (page.header == null) {
+      if (!page.nav_tabs) { // 如果有 nav_tabs 就代表是列表页
+        if (page.layout === 'post' || page.layout === 'page' || page.wiki) {
+          return ''
+        }
+      }
+    }
+  }
+  var el = ''
+  el += `<header class="header${where == 'main' ? ' mobile-only' : ''}">`
+  el += `<div class="logo-wrap">`
+  if (logo.icon) {
+    el += `<div class="icon"><img no-lazy class="icon" src="${md_text(logo.icon)}"></div>`
+  } else if (md_text(logo.avatar)) {
+    el += `<a class="avatar" href="${url_for(md_link(logo.avatar) || '/')}">`
+    if (theme.style.animated_avatar.animate) {
+      el += `<div class="bg" style="opacity:0;background-image:url(${theme.style.animated_avatar.background});"></div>`
+    }
+    el += `<img no-lazy class="avatar" src="${md_text(logo.avatar)}">`
+    el += `</a>`
+  }
+  const main = md_text(logo.title)
+  if (main) {
+    let url = md_link(logo.title)
+    el += layoutTitle(main, url, logo.subtitle)
+  }
+  el += `</div>`
+  el += '</header>'
+  return el
+}
+%>
+
+<%- layoutDiv() %>

package/layout/_partial/sidebar/menu.ejs

@@ -1,26 +1,31 @@
 <%
 function layoutDiv() {
-  var el = '';
-  el += '<nav class="menu dis-select';
-  if (where == 'main') {
-    el += ' mobile-hidden';
-  }
-  el += '">';
-  for (let id of Object.keys(theme.sidebar.menu)) {
-    let item = theme.sidebar.menu[id];
-    if (item == undefined || item.length == 0) {
-      continue;
+  var el = ''
+  el += `<nav class="menu dis-select${where == 'main' ? ' mobile-hidden' : ''}">`
+  for (let item of theme.menubar.items) {
+    if (item == undefined || item.id == null || item.url == null) {
+      continue
+    }
+    el += `<a class="nav-item${item.id == page.menu_id ? ' active' : ''}" title="${item.title}" href="${url_for(item.url)}"`
+    if (item.theme?.length > 0) {
+      el += ` style="color:${item.theme}"`
     }
-    el += '<a class="nav-item';
-    if (id == page.menu_id) {
-      el += ' active';
+    el += `>`
+    if (item.icon?.length > 0) {
+      if (item.icon.startsWith('<')) {
+        el += item.icon
+      } else if (theme.icons[item.icon]) {
+        el += theme.icons[item.icon]
+      } else {
+        el += `<img no-lazy src="${item.icon}">`
+      }
+    } else {
+      el += `<span>${__(item.title)}</span>`
     }
-    el += '" href="' + url_for(md_link(item)) + '">';
-    el += __(md_text(item));
-    el += '</a>';
+    el += `</a>`
   }
-  el += '</nav>';
-  return el;
+  el += `</nav>`
+  return el
 }
 %>
 

package/layout/_partial/sidebar/search.ejs

@@ -0,0 +1,42 @@
+<%
+if (item.filter == null) {
+  item.filter = 'auto'
+}
+function layoutDiv() {
+  var el = ''
+  el += `<div class="search-wrapper" id="search-wrapper">`
+  el += `<form class="search-form">`
+  var filter = ''
+  if (item.filter == 'auto') {
+    if (page.wiki) {
+      let matches = page.path.match(/(.*?)\/(.*?)\//i)
+      if (matches?.length > 0) {
+        filter = matches[0]
+      }
+    }
+  } else {
+    if (item.filter?.length > 0) {
+      filter = item.filter
+    }
+  }
+  el += `<a class="search-button" onclick="document.getElementById(&quot;search-input&quot;).focus();">`
+  el += icon('default:search')
+  el += `</a>`
+  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 += `</form>`
+  el += `<div id="search-result"></div>`
+  el += `<div class="search-no-result">${__('search.no_results')}</div>`
+  el += `</div>`
+  return el
+}
+%>
+<%- layoutDiv() %>

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 += '';
   });