hexo-theme-particlex 2.2.1 → 2.2.3

package/README.md

@@ -150,7 +150,7 @@ highlightStyle: github # Highlight style
 
 -   页脚
 
-    考虑到博客部署在服务器并使用自己域名的情况，按国家规定需要在网站下边添加备案消息
+    考虑到博客部署在服务器并使用自己域名的情况，按规定需要在网站下边添加备案消息
 
     如没有需要显示备案消息的可以关闭
 

package/layout/archives.ejs

@@ -1,10 +1,14 @@
+<%
+    let posts = site.posts;
+    posts.data.sort((a, b) => b.date - a.date);
+%>
 <div id="archives">
     <% if (theme.search.enable) { %>
-    <div id="search-mask" style="z-index: <%= site.posts.length + 1 %>"></div>
-    <input id="search-bar" class="ipt" placeholder="搜索" style="z-index: <%= site.posts.length + 2 %>">
+    <div id="search-mask" style="z-index: <%= posts.length + 1 %>"></div>
+    <input id="search-bar" class="ipt" placeholder="搜索" style="z-index: <%= posts.length + 2 %>">
     <% } %>
-    <% site.posts.forEach((post, id) => { %>
-    <div class="timeline" style="z-index: <%= site.posts.length - id %>" data-title="<%- post.title.toLowerCase().replace(/\s+/gm, "") %>">
+    <% posts.forEach((post, id) => { %>
+    <div class="timeline" style="z-index: <%= posts.length - id %>" data-title="<%- post.title.toLowerCase().replace(/\s+/gm, "") %>">
         <div class="timeline-tail"></div>
         <div class="timeline-content">
             <div class="item-time"><%- date(post.date, "YYYY/M/D") %></div>

package/layout/card.ejs

@@ -1,7 +1,7 @@
 <div id="card-div">
     <div class="card-style" style="width: 300px">
         <div class="avatar">
-            <img src="<%- theme.avatar %>" alt="avatar">
+            <img src="<%- url_for(theme.avatar) %>" alt="avatar">
         </div>
         <div class="name">
             <%= config.author %>
@@ -13,7 +13,7 @@
         <div class="icon-links">
             <% Object.keys(theme.card.iconLinks).forEach(key => { %>
             <span class="icon-link">
-                <a href="<%- theme.card.iconLinks[key].link %>">
+                <a href="<%- url_for(theme.card.iconLinks[key].link) %>">
                     <i class="fa-<%- theme.card.iconLinks[key].theme %> fa-<%- theme.card.iconLinks[key].name %> fa-fw"></i>
                 </a>
             </span>
@@ -23,11 +23,11 @@
         <% if (Object.keys(theme.card.friendLinks).length) { %>
         <div class="friend-links">
             <% Object.keys(theme.card.friendLinks).forEach(key => { %>
-            <span class="friend-link">
-                <a href="<%- theme.card.friendLinks[key] %>">
+            <div class="friend-link">
+                <a href="<%- url_for(theme.card.friendLinks[key]) %>">
                     <%= key %>
                 </a>
-            </span>
+            </div>
             <% }); %>
         </div>
         <% } %>

package/layout/categories.ejs

@@ -19,11 +19,7 @@
         <% if (is_category(category.name)) { %>
         <%
             posts = category.posts;
-            posts.data.sort((a, b) => {
-                if (typeof a.top === "undefined") a.top = 0;
-                if (typeof b.top === "undefined") b.top = 0;
-                return a.top == b.top ? b.date - a.date : b.top - a.top
-            });
+            posts.data.sort((a, b) => b.date - a.date);
         %>
         <% } %>
         <% }); %>

package/layout/current.ejs

@@ -1,10 +1,8 @@
 <div class="page-current">
     <div class="prev">
         <% if (page.current != 1) { %>
-        <a href="<%- url_for(page.prev_link) %>">
-            <span class="page-num">
-                <i class="fa-solid fa-caret-left fa-fw"></i>
-            </span>
+        <a class="page-num" href="<%- url_for(page.prev_link) %>">
+            <i class="fa-solid fa-caret-left fa-fw"></i>
         </a>
         <% } %>
     </div>
@@ -12,27 +10,21 @@
         <% if (page.current != 1) { %>
         <span>
             <% if (page.current - 3 >= 1) { %>
-            <a href="<%- config.root %>"><span class="page-num">1</span></a>
+            <a class="page-num" href="<%- config.root %>">1</a>
             <span class="page-omit">...</span>
             <% } %>
             <% if (page.current - 2 >= 1) { %>
                 <% if (page.current - 2 == 1) { %>
-                <a href="<%- config.root %>">
-                    <span class="page-num">1</span>
-                </a>
+                <a class="page-num" href="<%- config.root %>">1</a>
                 <% } %>
                 <% if (page.current - 2 != 1) { %>
-                <a href="<%- url_for("page/" + (page.current - 2)) %>">
-                    <span class="page-num">
-                        <%= page.current - 2 %>
-                    </span>
+                <a class="page-num" href="<%- url_for("page/" + (page.current - 2)) %>">
+                    <%= page.current - 2 %>
                 </a>
                 <% } %>
             <% } %>
-            <a href="<%- url_for(page.prev_link) %>">
-                <span class="page-num">
-                    <%= page.prev %>
-                </span>
+            <a class="page-num" href="<%- url_for(page.prev_link) %>">
+                <%= page.prev %>
             </a>
         </span>
         <% } %>
@@ -41,24 +33,18 @@
         </span>
         <% if (page.current != page.total) { %>
         <span>
-            <a href="<%- url_for(page.next_link) %>">
-                <span class="page-num">
-                    <%= page.next %>
-                </span>
+            <a class="page-num" href="<%- url_for(page.next_link) %>">
+                <%= page.next %>
             </a>
             <% if (page.current + 2 <= page.total) { %>
-            <a href="<%- url_for("page/" + (page.current + 2)) %>">
-                <span class="page-num">
-                    <%= page.current + 2 %>
-                </span>
+            <a class="page-num" href="<%- url_for("page/" + (page.current + 2)) %>">
+                <%= page.current + 2 %>
             </a>
             <% } %>
             <% if (page.current + 3 <= page.total) { %>
             <span class="page-omit">...</span>
-            <a href="<%- url_for("page/" + page.total) %>">
-                <span class="page-num">
-                    <%= page.total %>
-                </span>
+            <a class="page-num" href="<%- url_for("page/" + page.total) %>">
+                <%= page.total %>
             </a>
             <% } %>
         </span>
@@ -66,10 +52,8 @@
     </div>
     <div class="next">
         <% if (page.current != page.total) { %>
-        <a href="<%- url_for(page.next_link) %> ">
-            <span class="page-num">
-                <i class="fa-solid fa-caret-right fa-fw"></i>
-            </span>
+        <a class="page-num" href="<%- url_for(page.next_link) %> ">
+            <i class="fa-solid fa-caret-right fa-fw"></i>
         </a>
         <% } %>
     </div>

package/layout/layout.ejs

@@ -20,11 +20,6 @@
     else if (is_archive() || is_year() || is_month())
         title = "Archives | ";
     title += config.title;
-    site.posts.data.sort((a, b) => {
-        if (typeof a.top === "undefined") a.top = 0;
-        if (typeof b.top === "undefined") b.top = 0;
-        return a.top == b.top ? b.date - a.date : b.top - a.top;
-    });
 %>
 <!DOCTYPE html>
 <html lang="<%- config.language %>">
@@ -35,7 +30,7 @@
         <meta name="author" content="<%- config.author %>">
         <meta name="description" content="<%- config.description %>">
         <meta name="keywords" content="<%- config.keywords %>">
-        <link rel="icon" href="<%- theme.avatar %>">
+        <link rel="icon" href="<%- url_for(theme.avatar) %>">
         <script src="https://cdn.staticfile.org/vue/3.2.45/vue.global.prod.min.js"></script>
         <script src="https://cdn.staticfile.org/highlight.js/11.7.0/highlight.min.js"></script>
         <link rel="stylesheet" href="https://cdn.staticfile.org/highlight.js/11.7.0/styles/<%- theme.highlightStyle %>.min.css">
@@ -58,15 +53,15 @@
         <%- partial("loading") %>
         <div id="layout">
             <transition name="into">
-                <div v-show="showpage" style="display: -not-none">
-                    <div id="menushow">
-                        <%- partial("menu") %>
-                    </div>
-                    <div id="main">
-                        <%- partial(type) %>
-                        <%- partial("footer") %>
-                    </div>
+            <div v-show="showpage" style="display: -not-none">
+                <div id="menushow">
+                    <%- partial("menu") %>
                 </div>
+                <div id="main">
+                    <%- partial(type) %>
+                    <%- partial("footer") %>
+                </div>
+            </div>
             </transition>
             <div id="showimg">
                 <img id="showimg-content" alt="showimg">

package/layout/loading.ejs

@@ -5,7 +5,7 @@
                 <h2>LOADING...</h2>
                 <p style="word-break: keep-all">加载过慢请开启缓存（浏览器默认开启）</p>
                 <div>
-                    <img alt="loading" src="<%- url_for("/loading.gif") %>" style="width: 60px">
+                    <img alt="loading" src="<%- url_for("/images/loading.gif") %>" style="height: 50px">
                 </div>
             </div>
         </div>

package/layout/posts.ejs

@@ -1,5 +1,13 @@
-<% let current = (page.current - 1) * config.index_generator.per_page; %>
-<% site.posts.slice(0 + current, config.index_generator.per_page + current).forEach(post => { %>
+<%
+    let posts = site.posts,
+        current = (page.current - 1) * config.index_generator.per_page;
+    posts.data.sort((a, b) => {
+        let topa = a.top ?? 0, topb = b.top ?? 0;
+        return topa == topb ? b.date - a.date : topb - topa;
+    });
+    posts = posts.slice(current, config.index_generator.per_page + current);
+%>
+<% posts.forEach(post => { %>
 <div class="post">
     <a href="<%- url_for(post.path) %>">
         <h2 class="post-title"><%= titlecase(post.title) %></h2>
@@ -21,6 +29,16 @@
             </span>
             <%- date(post.date, "YYYY/M/D") %>
         </span>
+        <% if (theme.crypto.enable && typeof post.password !== "undefined") { %>
+        <span class="special">
+            <i class="fa-solid fa-lock fa-fw"></i>
+        </span>
+        <% } %>
+        <% if (typeof post.top !== "undefined" && post.top > 0) { %>
+        <span class="special">
+            <i class="fa-solid fa-grip-vertical fa-fw"></i>
+        </span>
+        <% } %>
     </div>
     <div class="excerpt">
         <div class="content" v-pre>

package/layout/tags.ejs

@@ -19,11 +19,7 @@
         <% if (is_tag(tag.name)) { %>
         <%
             posts = tag.posts;
-            posts.data.sort((a, b) => {
-                if (typeof a.top === "undefined") a.top = 0;
-                if (typeof b.top === "undefined") b.top = 0;
-                return a.top == b.top ? b.date - a.date : b.top - a.top;
-            });
+            posts.data.sort((a, b) => b.date - a.date);
         %>
         <% } %>
         <% }); %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-particlex",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "A concise Hexo theme, based on Particle.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"