hexo-theme-gnix 5.0.3 → 5.0.5

package/layout/common/navbar.jsx

@@ -1,4 +1,8 @@
-const { Component, Fragment, cacheComponent } = require("../../include/util/common");
+const {
+  Component,
+  Fragment,
+  cacheComponent,
+} = require("../../include/util/common");
 
 function isSameLink(a, b) {
   function santize(url) {
@@ -20,11 +24,11 @@ const renderLinkIcon = (link) => {
   // start with '<' means svg icon
   if (link.icon === "travellings") {
     return (
-      <svg viewBox="0 0 448 512" role="img" aria-label="Travellings Icon">
-        <path
-          fill="var(--text)"
-          d="M96 0C43 0 0 43 0 96v256c0 48 35.2 87.7 81.1 94.9l-46 46c-7 7-2 19.1 7.9 19.1h39.7c8.5 0 16.6-3.4 22.6-9.4L160 448h128l54.6 54.6c6 6 14.1 9.4 22.6 9.4h39.7c10 0 15-12.1 7.9-19.1l-46-46c46-7.1 81.1-46.9 81.1-94.9V96c0-53-43-96-96-96zM64 128c0-17.7 14.3-32 32-32h80c17.7 0 32 14.3 32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32zm208-32h80c17.7 0 32 14.3 32 32v96c0 17.7-14.3 32-32 32h-80c-17.7 0-32-14.3-32-32v-96c0-17.7 14.3-32 32-32M64 352a32 32 0 1 1 64 0a32 32 0 1 1-64 0m288-32a32 32 0 1 1 0 64a32 32 0 1 1 0-64"
-        ></path>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+        <title>train_4_line</title>
+        <g id="train_4_line" fill="currentColor">
+          <path d="M14.72 2a5 5 0 0 1 4.855 3.802l.049.217 1.4 7c.496 2.482-.929 4.83-3.14 5.663l-.21.073L19.6 20.2a1 1 0 0 1-1.095 1.669L18.4 21.8 14.667 19H9.333L5.6 21.8a1 1 0 0 1-1.296-1.518L4.4 20.2l1.926-1.445c-2.26-.735-3.768-3.031-3.39-5.503l.04-.233 1.4-7a5 5 0 0 1 4.68-4.014L9.28 2h5.442Zm0 2H9.28a3 3 0 0 0-2.943 2.412l-1.4 7A3 3 0 0 0 7.88 17h8.242a3 3 0 0 0 2.942-3.588l-1.4-7A3 3 0 0 0 14.72 4m-6.47 9.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5m7.5 0a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5M14.61 6a1.5 1.5 0 0 1 1.416 1.005l.039.131.75 3a1.5 1.5 0 0 1-1.324 1.858L15.36 12H8.64a1.5 1.5 0 0 1-1.481-1.735l.026-.129.75-3a1.5 1.5 0 0 1 1.319-1.13L9.39 6zm-.39 2H9.78l-.5 2h5.44z"></path>
+        </g>
       </svg>
     );
   }
@@ -38,8 +42,13 @@ class Navbar extends Component {
     return (
       <nav class="navbar navbar-main" onclick="handleNavbarClick(event);">
         <div class="navbar-container">
-          <a href={siteUrl} style={"font-family: homemade-apple; color: var(--text); display: flex; align-items: center; padding: 0 1em;"}>
-              GnixAij
+          <a
+            href={siteUrl}
+            style={
+              "font-family: homemade-apple; color: var(--text); display: flex; align-items: center; padding: 0 1em;"
+            }
+          >
+            GnixAij
           </a>
           <div class="navbar-menu">
             {Object.keys(menu).length ? (
@@ -58,30 +67,14 @@ class Navbar extends Component {
             <div class="navbar-end">
               <button
                 type="button"
-                class="navbar-item theme-selector-trigger"
+                class="navbar-item"
                 title="Choose Theme"
                 onclick="window.openThemeModal?.()"
               >
-                <svg viewBox="0 0 14 14" role="img" aria-label="Theme Selector">
-                  <g fill="none">
-                    <path
-                      fill="var(--red)"
-                      d="M14 12.5v-3A1.5 1.5 0 0 0 12.5 8H3a3 3 0 1 0 0 6h9.5a1.5 1.5 0 0 0 1.5-1.5"
-                    ></path>
-                    <path
-                      fill="var(--blue)"
-                      d="M12.339 3.783L10.218 1.66a1.5 1.5 0 0 0-2.122 0L.88 8.88a3 3 0 0 0 4.24 4.24l7.218-7.217a1.5 1.5 0 0 0 0-2.121"
-                    ></path>
-                    <path
-                      fill="var(--green)"
-                      d="M4.5 0h-3A1.5 1.5 0 0 0 0 1.5V11a3 3 0 0 0 6 0V1.5A1.5 1.5 0 0 0 4.5 0"
-                    ></path>
-                    <path
-                      fill="var(--base)"
-                      fill-rule="evenodd"
-                      d="M1.395 3.375a.625.625 0 1 0 0 1.25h3.21a.625.625 0 1 0 0-1.25zm0 4.5a.625.625 0 1 0 0 1.25h3.21a.625.625 0 1 0 0-1.25z"
-                      clip-rule="evenodd"
-                    ></path>
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+                  <title>brightness_fill</title>
+                  <g id="brightness_fill" fill="currentColor">
+                    <path d="M12 18.5a1.5 1.5 0 0 1 1.493 1.356L13.5 20v1a1.5 1.5 0 0 1-2.993.144L10.5 21v-1a1.5 1.5 0 0 1 1.5-1.5m4.596-1.904a1.5 1.5 0 0 1 2.008-.103l.114.103.707.707a1.5 1.5 0 0 1-2.008 2.225l-.114-.103-.707-.707a1.5 1.5 0 0 1 0-2.122m-11.314 0a1.5 1.5 0 0 1 2.225 2.008l-.103.114-.707.707a1.5 1.5 0 0 1-2.225-2.008l.103-.114zM12 6a6 6 0 1 1 0 12 6 6 0 0 1 0-12m0 3a3 3 0 0 0-.176 5.995L12 15zm-8 1.5a1.5 1.5 0 0 1 .144 2.993L4 13.5H3a1.5 1.5 0 0 1-.144-2.993L3 10.5zm17 0a1.5 1.5 0 0 1 .144 2.993L21 13.5h-1a1.5 1.5 0 0 1-.144-2.993L20 10.5zM4.575 4.575a1.5 1.5 0 0 1 2.008-.103l.114.103.707.707a1.5 1.5 0 0 1-2.008 2.225l-.114-.103-.707-.707a1.5 1.5 0 0 1 0-2.122m12.728 0a1.5 1.5 0 0 1 2.225 2.008l-.103.114-.707.707a1.5 1.5 0 0 1-2.225-2.008l.103-.114zM12 1.5a1.5 1.5 0 0 1 1.493 1.356L13.5 3v1a1.5 1.5 0 0 1-2.993.144L10.5 4V3A1.5 1.5 0 0 1 12 1.5"></path>
                   </g>
                 </svg>
               </button>
@@ -109,16 +102,10 @@ class Navbar extends Component {
                   class="navbar-item search"
                   title={searchTitle}
                 >
-                  <svg viewBox="0 0 14 14" role="img" aria-label="Search Icon">
-                    <g fill="none" fill-rule="evenodd" clip-rule="evenodd">
-                      <path
-                        fill="var(--text)"
-                        d="M.5.125a.5.5 0 0 0-.5.5v10a.5.5 0 0 0 .5.5h4.756A4.5 4.5 0 0 1 5 9.625c0-1.271.527-2.42 1.375-3.238v-4.96A2 2 0 0 0 4.5.126zm7.125 1.303v4.105a4.5 4.5 0 0 1 6.347 3.584H14V.625a.5.5 0 0 0-.5-.5h-4a2 2 0 0 0-1.875 1.303"
-                      />
-                      <path
-                        fill="var(--blue)"
-                        d="M7.75 9.625a1.75 1.75 0 1 1 3.5 0a1.75 1.75 0 0 1-3.5 0m1.75-3.25a3.25 3.25 0 1 0 1.706 6.017l1.263 1.263a.75.75 0 0 0 1.06-1.06l-1.262-1.264A3.25 3.25 0 0 0 9.5 6.375"
-                      />
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+                    <title>search_line</title>
+                    <g id="search_line" fill="currentColor">
+                      <path d="M10.5 2a8.5 8.5 0 1 0 5.262 15.176l3.652 3.652a1 1 0 0 0 1.414-1.414l-3.652-3.652A8.5 8.5 0 0 0 10.5 2M4 10.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0"></path>
                     </g>
                   </svg>
                 </button>

package/layout/common/toc.jsx

@@ -29,7 +29,6 @@ class FloatingToc extends Component {
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
-            aria-label="Table of Contents"
           >
             <title>Table of Contents</title>
             <line x1="8" y1="6" x2="21" y2="6"></line>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-gnix",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "author": "Efterklang <gaojiaxing0220@gmail.com>",
   "license": "MIT",
   "description": "Second generation of Hexo theme Icarus, now with Catppuccin flavor and night mode support.",

package/source/css/default.css

@@ -425,7 +425,7 @@ body {
   top: env(safe-area-inset-top);
   left: 0;
   right: 0;
-  transition: transform 0.3s ease-in-out;
+  /* transition: transform 0.3s ease-in-out; */
   z-index: 100;
   font-family: var(--font-sans-serif);
   border-bottom: 0.5px solid var(--surface0);
@@ -437,12 +437,11 @@ body {
   width: auto;
   display: flex;
   min-height: 4rem;
-}
-
-.navbar button {
-  background: 0 0;
-  border: none;
-  cursor: pointer;
+  button {
+    background: none;
+    border: none;
+    cursor: pointer;
+  }
 }
 
 .navbar-main.navbar--hidden {
@@ -458,8 +457,18 @@ body {
   position: relative;
   flex-grow: 0;
   flex-shrink: 0;
+}
+
+.navbar-end {
   svg {
-    width: 15px;
+    width: 1.2em;
+  }
+  .navbar-item {
+    &:hover {
+      scale: 1.1;
+      transition: all 0.2s ease;
+      color: var(--lavender);
+    }
   }
 }
 
@@ -573,16 +582,6 @@ body {
   opacity: 1;
 }
 
-.theme-selector-trigger {
-  cursor: pointer;
-  transition: all 0.2s ease;
-
-  &:hover {
-    color: var(--blue);
-    transform: scale(1.1);
-  }
-}
-
 /* #endregion Theme Selector */
 
 /* #region Pagination */
@@ -1315,7 +1314,6 @@ section {
   opacity: 1;
   visibility: visible;
   backdrop-filter: blur(5px);
-  -webkit-backdrop-filter: blur(5px);
 }
 
 input.searchbox-input {
@@ -1359,10 +1357,19 @@ input.searchbox-input {
 .searchbox-body {
   flex-grow: 1;
   width: 100%;
-  overflow-y: auto;
   border-top: 1px solid var(--base);
 }
 
+.searchbox-result-section--posts {
+  max-height: 450px;
+  overflow-y: auto;
+}
+
+.searchbox-result-section--tags {
+  max-height: 250px;
+  overflow-y: auto;
+}
+
 .searchbox-result-item,
 .searchbox-result-section header {
   padding: 0.75em 1em;

package/source/css/twikoo.css

@@ -126,6 +126,33 @@
   flex-shrink: 1;
 }
 
+.el-textarea__inner {
+  display: block;
+  resize: vertical;
+  padding: 5px 15px;
+  line-height: 1.5;
+  box-sizing: border-box;
+  width: 100%;
+  font-size: inherit;
+  color: #606266;
+  background-color: var(--base);
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  &::placeholder {
+    color: var(--subtext0);
+  }
+
+  &:hover {
+    border-color: var(--subtext0);
+  }
+
+  &:focus {
+    outline: 0;
+    border-color: var(--blue);
+  }
+}
+
 .tk-input-image {
   display: none;
 }
@@ -187,6 +214,14 @@
   align-items: center;
 }
 
+.tk-action-icon {
+  display: inline-block;
+  height: 1em;
+  width: 1em;
+  line-height: 0;
+  color: var(--blue);
+}
+
 .tk-action-link .tk-action-icon-solid {
   display: none;
 }
@@ -208,14 +243,6 @@
   line-height: 1.5rem;
 }
 
-.tk-action-icon {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  line-height: 0;
-  color: var(--blue);
-}
-
 .tk-main {
   flex: 1;
   width: 0;
@@ -506,13 +533,11 @@
   padding: 0;
   height: 28px;
   text-align: center;
-  -moz-appearance: textfield;
   appearance: textfield;
 }
 
 .tk-pagination .el-input .el-input__inner::-webkit-inner-spin-button,
 .tk-pagination .el-input .el-input__inner::-webkit-outer-spin-button {
-  -webkit-appearance: none;
   appearance: none;
   margin: 0;
 }
@@ -594,17 +619,17 @@
   padding-right: 0.5em;
 }
 
-.tk-admin-config-groups .tk-admin-config-group,
-.tk-admin-config-groups .tk-admin-config-group-title {
-  background: transparent;
-}
-
 .tk-admin-config-group-title {
   margin-top: 1em;
   font-size: 1.25rem;
   font-weight: bold;
 }
 
+.tk-admin-config-groups .tk-admin-config-group,
+.tk-admin-config-groups .tk-admin-config-group-title {
+  background: transparent;
+}
+
 .tk-admin-config-item {
   display: grid;
   align-items: center;
@@ -827,16 +852,13 @@
   color: currentColor;
   background-color: transparent;
   border-color: hsl(from var(--surface1) h s l / 0.31);
-}
 
-.twikoo .el-input__inner:hover,
-.twikoo .el-textarea__inner:hover {
-  border-color: hsl(from var(--surface1) h s l / 0.5);
-}
-
-.twikoo .el-input__inner:focus,
-.twikoo .el-textarea__inner:focus {
-  border-color: var(--blue);
+  &:hover {
+    border-color: hsl(from var(--surface1) h s l / 0.5);
+  }
+  &:focus {
+    border-color: var(--blue);
+  }
 }
 
 .twikoo .el-button:not(.el-button--primary):not(.el-button--text) {
@@ -889,16 +911,9 @@
  */
 
 .OwO {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
 }
 
-.OwO.OwO-open .OwO-body {
-  display: block;
-}
-
 .OwO .OwO-logo {
   width: 1.125em;
   display: flex;
@@ -918,6 +933,10 @@
   z-index: 1000;
 }
 
+.OwO.OwO-open .OwO-body {
+  display: block;
+}
+
 .night .OwO .OwO-body,
 .darkmode .OwO .OwO-body,
 .DarkMode .OwO .OwO-body,
@@ -928,9 +947,6 @@
 }
 
 .OwO .OwO-body .OwO-items {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   display: none;
   padding: 10px;
@@ -948,7 +964,6 @@
   font-size: 12px;
   line-height: 14px;
   cursor: pointer;
-  -webkit-transition: 0.3s;
   transition: 0.3s;
   text-align: center;
 }
@@ -1035,7 +1050,6 @@
 
 .OwO .OwO-body .OwO-bar .OwO-packages .OwO-package-active {
   background-color: rgba(144, 147, 153, 0.13);
-  -webkit-transition: 0.3s;
   transition: 0.3s;
 }
 
@@ -1045,20 +1059,16 @@
   white-space: nowrap;
   cursor: pointer;
   background: var(--base);
-  border: 1px solid #dcdfe6;
-  color: #606266;
-  -webkit-appearance: none;
+  border: 1px solid var(--surface0);
+  color: var(--subtext1);
+
   text-align: center;
-  -webkit-box-sizing: border-box;
   box-sizing: border-box;
   outline: 0;
   margin: 0;
-  -webkit-transition: 0.1s;
   transition: 0.1s;
   font-weight: 500;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
+  user-select: none;
   padding: 12px 20px;
   font-size: 14px;
   border-radius: 4px;
@@ -1624,8 +1634,6 @@
 .el-input__inner,
 .el-textarea__inner {
   background-image: none;
-  -webkit-box-sizing: border-box;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
 
 .el-textarea {
@@ -1636,46 +1644,6 @@
   font-size: 14px;
 }
 
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: 5px 15px;
-  line-height: 1.5;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: #606266;
-  background-color: var(--base);
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
-
-.el-textarea__inner::-webkit-input-placeholder {
-  color: var(--subtext0);
-}
-
-.el-textarea__inner:-ms-input-placeholder {
-  color: var(--subtext0);
-}
-
-.el-textarea__inner::-ms-input-placeholder {
-  color: var(--subtext0);
-}
-
-.el-textarea__inner::placeholder {
-  color: var(--subtext0);
-}
-
-.el-textarea__inner:hover {
-  border-color: var(--subtext0);
-}
-
-.el-textarea__inner:focus {
-  outline: 0;
-  border-color: var(--blue);
-}
-
 .el-textarea .el-input__count {
   color: #909399;
   background: var(--base);
@@ -1755,7 +1723,6 @@
   color: var(--subtext0);
   font-size: 14px;
   cursor: pointer;
-  -webkit-transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
   transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
 
@@ -1766,7 +1733,6 @@
 .el-input .el-input__count {
   height: 100%;
   display: inline-flex;
-  -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
   color: #909399;
@@ -1789,7 +1755,6 @@
 }
 
 .el-input__inner {
-  -webkit-appearance: none;
   background-color: var(--base);
   border-radius: 4px;
   border: 1px solid #dcdfe6;
@@ -1818,18 +1783,6 @@
   display: none;
 }
 
-.el-input__inner::-webkit-input-placeholder {
-  color: var(--subtext0);
-}
-
-.el-input__inner:-ms-input-placeholder {
-  color: var(--subtext0);
-}
-
-.el-input__inner::-ms-input-placeholder {
-  color: var(--subtext0);
-}
-
 .el-input__inner::placeholder {
   color: var(--subtext0);
 }
@@ -1858,7 +1811,6 @@
   height: 100%;
   width: 25px;
   text-align: center;
-  -webkit-transition: all 0.3s;
   transition: all 0.3s;
   line-height: 40px;
 }
@@ -1882,9 +1834,6 @@
   cursor: not-allowed;
 }
 
-.el-input.is-disabled .el-input__inner::-webkit-input-placeholder,
-.el-input.is-disabled .el-input__inner:-ms-input-placeholder,
-.el-input.is-disabled .el-input__inner::-ms-input-placeholder,
 .el-input.is-disabled .el-input__inner::placeholder {
   color: var(--subtext1);
 }
@@ -2079,12 +2028,10 @@
 .el-loading-spinner .circular {
   height: 42px;
   width: 42px;
-  -webkit-animation: loading-rotate 2s linear infinite;
   animation: loading-rotate 2s linear infinite;
 }
 
 .el-loading-spinner .path {
-  -webkit-animation: loading-dash 1.5s ease-in-out infinite;
   animation: loading-dash 1.5s ease-in-out infinite;
   stroke-dasharray: 90, 150;
   stroke-dashoffset: 0;
@@ -2104,7 +2051,6 @@
 
 @keyframes loading-rotate {
   100% {
-    -webkit-transform: rotate(360deg);
     transform: rotate(360deg);
   }
 }

package/source/js/insight.js

@@ -143,6 +143,7 @@ function loadInsight(config, translation) {
       .join("");
 
     const sectionEl = section(sectionTitle);
+    sectionEl.classList.add(`searchbox-result-section--${type.toLowerCase()}`);
     sectionEl.insertAdjacentHTML("beforeend", itemsHTML);
     return sectionEl;
   }
@@ -210,11 +211,8 @@ function loadInsight(config, translation) {
           results.push({ item, weight: w });
         }
       }
-      // 排序并取 Top 5
-      return results
-        .sort((a, b) => b.weight - a.weight)
-        .map((r) => r.item)
-        .slice(0, 5);
+      // 排序返回全部结果（由 CSS 控制显示高度和滚动）
+      return results.sort((a, b) => b.weight - a.weight).map((r) => r.item);
     };
 
     return {
@@ -242,15 +240,20 @@ function loadInsight(config, translation) {
 
   function scrollTo(item) {
     if (!item) return;
-    const wrapperHeight = container.clientHeight;
-    const itemTop = item.offsetTop;
+    // 找到item所在的可滚动section
+    const section = item.closest(".searchbox-result-section");
+    if (!section) return;
+
+    const sectionHeight = section.clientHeight;
+    const itemTop = item.offsetTop - section.offsetTop;
     const itemHeight = item.clientHeight;
-    const scrollTop = container.scrollTop;
-    if (itemTop + itemHeight > scrollTop + wrapperHeight) {
-      container.scrollTop = itemTop + itemHeight - wrapperHeight;
+    const scrollTop = section.scrollTop;
+
+    if (itemTop + itemHeight > scrollTop + sectionHeight) {
+      section.scrollTop = itemTop + itemHeight - sectionHeight;
     }
     if (itemTop < scrollTop) {
-      container.scrollTop = itemTop;
+      section.scrollTop = itemTop;
     }
   }