itemRefs.current[item.name] = el}
className={`nier-nav-item relative h-[3rem] flex items-center cursor-pointer group transition-colors duration-300 hover:bg-[#d4d4d8] ${isActive ? 'active bg-[#d4d4d8]' : ''}`}
>
{/* Icon Container */}
-
- {renderIcon(item.name, isActive)}
+
+ {renderIcon(item, isActive)}
{/* Text Label (Reveal on Hover) */}
diff --git a/themes/endspace/components/menu.js b/themes/endspace/components/menu.js
new file mode 100644
index 00000000000..30cfd193d6d
--- /dev/null
+++ b/themes/endspace/components/menu.js
@@ -0,0 +1,79 @@
+import { siteConfig } from '@/lib/config'
+import CONFIG from '../config'
+
+const IconNames = {
+ Home: 'Home',
+ Category: 'Category',
+ Tag: 'Tag',
+ Tags: 'Tag',
+ Archive: 'Archive',
+ Search: 'Search',
+ Friends: 'Friends',
+ Portfolio: 'Portfolio'
+}
+
+const normalizeHref = link => {
+ const value = link?.href || link?.path || link?.url || link?.slug || ''
+ if (!value) return ''
+ if (value.startsWith('/') || value.startsWith('http') || value.startsWith('#')) {
+ return value
+ }
+ return `/${value}`
+}
+
+const normalizeMenuItem = (link, index) => {
+ if (!link || link.show === false) return null
+ const name = link.name || link.title || link.label || ''
+ const path = normalizeHref(link)
+ if (!name || !path) return null
+
+ return {
+ ...link,
+ id: link.id || `endspace-menu-${index}`,
+ name,
+ path,
+ href: path,
+ icon: IconNames[name] || IconNames[name?.trim?.()] || 'Default',
+ pageIcon: link.pageIcon || '',
+ customIcon: link.icon || null
+ }
+}
+
+const normalizeMenu = links =>
+ (Array.isArray(links) ? links : [])
+ .map(normalizeMenuItem)
+ .filter(Boolean)
+
+export const getEndspaceMenuItems = ({ customNav, customMenu } = {}) => {
+ const defaultLinks = [
+ { name: 'Home', path: '/' },
+ { name: 'Category', path: '/category', show: siteConfig('ENDSPACE_MENU_CATEGORY', null, CONFIG) },
+ { name: 'Tag', path: '/tag', show: siteConfig('ENDSPACE_MENU_TAG', null, CONFIG) },
+ { name: 'Archive', path: '/archive', show: siteConfig('ENDSPACE_MENU_ARCHIVE', null, CONFIG) },
+ { name: 'Portfolio', path: '/portfolio' },
+ { name: 'Friends', path: '/friends' },
+ { name: 'Search', path: '/search', show: siteConfig('ENDSPACE_MENU_SEARCH', null, CONFIG) }
+ ]
+
+ let links = defaultLinks
+ if (Array.isArray(customNav) && customNav.length > 0) {
+ links = links.concat(customNav)
+ }
+ if (siteConfig('CUSTOM_MENU') && Array.isArray(customMenu)) {
+ links = customMenu
+ }
+
+ return normalizeMenu(links)
+}
+
+export const getEndspaceActiveMenuName = (menuItems, asPath = '/') => {
+ const cleanPath = asPath.split(/[?#]/)[0] || '/'
+ const activeItem = menuItems
+ .filter(item => item.path && !item.path.startsWith('http') && !item.path.startsWith('#'))
+ .find(item => {
+ if (item.path === '/') return cleanPath === '/'
+ return cleanPath === item.path || cleanPath.startsWith(`${item.path}/`)
+ })
+
+ return activeItem?.name || menuItems[0]?.name || ''
+}
diff --git a/themes/endspace/components/searchHighlight.js b/themes/endspace/components/searchHighlight.js
new file mode 100644
index 00000000000..9eba40e7c49
--- /dev/null
+++ b/themes/endspace/components/searchHighlight.js
@@ -0,0 +1,31 @@
+import { loadExternalResource } from '@/lib/utils'
+
+const escapeRegExp = value =>
+ value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+
+/**
+ * Endspace search highlight must be idempotent because users can resubmit the
+ * same keyword on the same result DOM.
+ */
+export default async function replaceEndspaceSearchResult({ doms, search, target }) {
+ if (!doms || !target) return
+
+ try {
+ await loadExternalResource('https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/mark.min.js', 'js')
+ const Mark = window.Mark
+ const instance = new Mark(doms)
+ const re = search ? new RegExp(escapeRegExp(search), 'gim') : null
+
+ instance.unmark({
+ element: target.element,
+ className: target.className,
+ done: () => {
+ if (re) {
+ instance.markRegExp(re, target)
+ }
+ }
+ })
+ } catch (error) {
+ console.error('endspace search highlight failed', error)
+ }
+}
diff --git a/themes/endspace/config.js b/themes/endspace/config.js
index 475fbc01cb0..b3c952a6caa 100644
--- a/themes/endspace/config.js
+++ b/themes/endspace/config.js
@@ -59,10 +59,10 @@ const CONFIG = {
// ============================================
// 菜单配置 (Menu)
// ============================================
- ENDSPACE_MENU_CATEGORY: true, // 显示分类菜单
- ENDSPACE_MENU_TAG: true, // 显示标签菜单
+ ENDSPACE_MENU_CATEGORY: false, // 显示分类菜单（默认合并到 Archive）
+ ENDSPACE_MENU_TAG: false, // 显示标签菜单（默认合并到 Archive）
ENDSPACE_MENU_ARCHIVE: true, // 显示归档菜单
- ENDSPACE_MENU_SEARCH: true, // 显示搜索菜单
+ ENDSPACE_MENU_SEARCH: false, // 显示搜索菜单（默认合并到 Archive）
// ============================================
// 文章列表 (Post List)
@@ -79,7 +79,7 @@ const CONFIG = {
// ============================================
// 浮动控件 (Floating controls)
// ============================================
- /** 右下角胶囊是否显示浅色/深色切换（与全局 dark 类联动） */
- ENDSPACE_WIDGET_DARK_MODE: true
+ /** 右下角胶囊是否显示浅色/深色切换（夜间模式已禁用） */
+ ENDSPACE_WIDGET_DARK_MODE: false
}
export default CONFIG
diff --git a/themes/endspace/index.js b/themes/endspace/index.js
index 6fc97ac1c92..ca766ba744e 100644
--- a/themes/endspace/index.js
+++ b/themes/endspace/index.js
@@ -1,7 +1,6 @@
'use client'
import Comment from '@/components/Comment'
-import replaceSearchResult from '@/components/Mark'
import NotionPage from '@/components/NotionPage'
import ShareBar from '@/components/ShareBar'
import SmartLink from '@/components/SmartLink'
@@ -27,6 +26,7 @@ import MobileNav from './components/MobileNav'
import ArticleAdjacent from './components/ArticleAdjacent'
import FloatingControls from './components/FloatingControls'
import useViewportScale from './components/useViewportScale'
+import replaceEndspaceSearchResult from './components/searchHighlight'
import CONFIG from './config'
import { Style } from './style'
import { IconLoader2 } from '@tabler/icons-react'
@@ -317,24 +317,23 @@ const Layout404 = (props) => {
*/
const LayoutSearch = (props) => {
const { keyword, posts = [] } = props
- const router = useRouter()
useEffect(() => {
if (isBrowser) {
// Highlight search results
const container = document.getElementById('posts-wrapper')
- if (keyword && container) {
- replaceSearchResult({
+ if (container) {
+ replaceEndspaceSearchResult({
doms: container,
search: keyword,
target: {
element: 'span',
- className: 'text-yellow-400 bg-yellow-400/20 px-1'
+ className: 'endspace-search-highlight'
}
})
}
}
- }, [router])
+ }, [keyword, posts])
return (
<>
@@ -359,17 +358,89 @@ const LayoutSearch = (props) => {
* @returns Articles grouped by date
*/
const LayoutArchive = (props) => {
- const { archivePosts } = props
+ const { archivePosts = {}, categoryOptions = [], tagOptions = [], postCount } = props
+ const archiveTitles = Object.keys(archivePosts)
+ const archivePostCount = archiveTitles.reduce(
+ (count, archiveTitle) => count + (archivePosts[archiveTitle]?.length || 0),
+ 0
+ )
+ const totalPostCount = postCount || archivePostCount
return (
<>
-
- {Object.keys(archivePosts).map((archiveTitle) => (
-
+
+
+
+
+ CATEGORIES
+
+ // {categoryOptions.length}_CATEGORY_NODES
+
+
+
+
+
+
+
+ TAGS
+
+ // {tagOptions.length}_TAG_MARKERS
+
+
+
+
+
+
+
+ {archiveTitles.map((archiveTitle) => (
+
+ ))}
+
+
)
diff --git a/themes/endspace/style.js b/themes/endspace/style.js
index eb89a594d8e..0b500085fb1 100644
--- a/themes/endspace/style.js
+++ b/themes/endspace/style.js
@@ -44,37 +44,6 @@ export const Style = () => {
0 0 0 1px var(--endspace-accent-yellow);
}
- /* Dark Mode Variables */
- .dark {
- --endspace-bg-base: #09090b;
- --endspace-bg-primary: #18181b;
- --endspace-bg-secondary: #27272a;
- --endspace-bg-tertiary: #3f3f46;
-
- --endspace-text-primary: #fafafa;
- --endspace-text-secondary: #a1a1aa;
- --endspace-text-muted: #71717a;
-
- --endspace-accent-yellow: #FBFB45;
- --endspace-accent-yellow-dim: rgba(251, 251, 69, 0.15);
- --endspace-accent-cyan: #FBFB45; /* Dark Mode: Yellow 600 */
- --endspace-accent-cyan-dim: rgba(251, 251, 69, 0.1);
-
- --endspace-border-base: #27272a;
- --endspace-border-active: #FBFB45;
- --endspace-grid-color: rgba(255,255,255,0.02);
-
- --endspace-shadow-base:
- 0 1px 2px rgba(0, 0, 0, 0.2),
- 0 2px 4px rgba(0, 0, 0, 0.15),
- 0 4px 8px rgba(0, 0, 0, 0.1);
- --endspace-shadow-hover:
- 0 4px 8px rgba(0, 0, 0, 0.3),
- 0 8px 16px rgba(0, 0, 0, 0.25),
- 0 16px 32px rgba(0, 0, 0, 0.2),
- 0 0 0 1px var(--endspace-accent-yellow);
- }
-
/* ============================================
Viewport Scaling (Responsive Font Size)
============================================ */
@@ -136,6 +105,54 @@ export const Style = () => {
letter-spacing: 1px;
}
+ .endspace-search-highlight {
+ color: #a16207;
+ background: linear-gradient(90deg, rgba(251, 251, 69, 0.2), rgba(251, 191, 36, 0.35));
+ padding: 0 0.25rem;
+ box-decoration-break: clone;
+ -webkit-box-decoration-break: clone;
+ }
+
+ .archive-section {
+ position: relative;
+ }
+
+ .endspace-section-title {
+ color: #E8E8EA !important;
+ width: 100%;
+ gap: 1rem;
+ margin-bottom: 1.5rem;
+ padding-bottom: 0.75rem;
+ border-bottom: 1px solid var(--endspace-border-base) !important;
+ justify-content: flex-start;
+ }
+
+ #theme-endspace .endspace-section-title,
+ #theme-endspace .endspace-section-title * {
+ color: #E8E8EA !important;
+ }
+
+ .endspace-section-meta {
+ color: var(--endspace-text-secondary);
+ font-size: 0.9rem;
+ font-weight: 500;
+ letter-spacing: 0.04em;
+ padding-top: 1.35rem;
+ white-space: nowrap;
+ }
+
+ @media (max-width: 767px) {
+ .endspace-section-title {
+ align-items: flex-start;
+ flex-direction: column;
+ gap: 0.25rem;
+ }
+
+ .endspace-section-meta {
+ padding-top: 0;
+ }
+ }
+
/* ============================================
"Float" Container Styles (Glassmorphism -> Solid Block)
============================================ */
@@ -150,11 +167,6 @@ export const Style = () => {
z-index: 10;
}
- .dark .endspace-frame {
- background: #18181b; /* Solid dark background */
- border-color: #3f3f46;
- }
-
/* Corner Markers (Minimalist L-shape) */
.endspace-frame::before {
content: '';
@@ -211,10 +223,6 @@ export const Style = () => {
z-index: 20;
}
- .dark .endspace-card {
- background: #18181b;
- }
-
/* ============================================
Notion Content Overrides (Light Mode)
============================================ */
@@ -224,6 +232,63 @@ export const Style = () => {
line-height: 1.75;
}
+ #theme-endspace #article-wrapper,
+ #theme-endspace #notion-article,
+ #theme-endspace #notion-article .notion,
+ #theme-endspace #notion-article .notion-text,
+ #theme-endspace #notion-article .notion-blank,
+ #theme-endspace #notion-article .notion-h,
+ #theme-endspace #notion-article .notion-header,
+ #theme-endspace #notion-article .notion-sub_header,
+ #theme-endspace #notion-article .notion-sub_sub_header,
+ #theme-endspace #notion-article .notion-page,
+ #theme-endspace #notion-article .notion-list,
+ #theme-endspace #notion-article .notion-list-disc,
+ #theme-endspace #notion-article .notion-list-numbered,
+ #theme-endspace #notion-article .notion-toggle,
+ #theme-endspace #notion-article .notion-quote,
+ #theme-endspace #notion-article .notion-callout,
+ #theme-endspace #notion-article .notion-bookmark,
+ #theme-endspace #notion-article .notion-bookmark-title,
+ #theme-endspace #notion-article .notion-collection,
+ #theme-endspace #notion-article .notion-collection-row,
+ #theme-endspace #notion-article .notion-property,
+ #theme-endspace #notion-article .notion-property-text,
+ #theme-endspace #notion-article .notion-property-title,
+ #theme-endspace #notion-article .notion-simple-table,
+ #theme-endspace #notion-article .notion-table,
+ #theme-endspace #notion-article .notion-code,
+ #theme-endspace #notion-article .notion-equation {
+ color: var(--endspace-text-primary) !important;
+ }
+
+ #theme-endspace #notion-article p,
+ #theme-endspace #notion-article li,
+ #theme-endspace #notion-article span,
+ #theme-endspace #notion-article figcaption,
+ #theme-endspace #notion-article .notion-text,
+ #theme-endspace #notion-article .notion-list,
+ #theme-endspace #notion-article .notion-list-disc,
+ #theme-endspace #notion-article .notion-list-numbered,
+ #theme-endspace #notion-article .notion-toggle,
+ #theme-endspace #notion-article .notion-bookmark-description,
+ #theme-endspace #notion-article .notion-bookmark-link,
+ #theme-endspace #notion-article .notion-collection-row-body,
+ #theme-endspace #notion-article .notion-simple-table-cell {
+ color: var(--endspace-text-secondary) !important;
+ }
+
+ #theme-endspace #notion-article h1,
+ #theme-endspace #notion-article h2,
+ #theme-endspace #notion-article h3,
+ #theme-endspace #notion-article h4,
+ #theme-endspace #notion-article h5,
+ #theme-endspace #notion-article h6,
+ #theme-endspace #notion-article strong,
+ #theme-endspace #notion-article .notion-bookmark-title {
+ color: var(--endspace-text-primary) !important;
+ }
+
/* Headers - NieR: Automata Style Dynamic Shadow */
/* Requirement: Misaligned when not hovered, Merged when hovered */
#notion-article h1, #notion-article h2, #notion-article h3 {
@@ -257,17 +322,6 @@ export const Style = () => {
transform: translateX(2px); /* Slight physical shift on 'lock-on' */
}
- .dark #notion-article h1, .dark #notion-article h2, .dark #notion-article h3 {
- /* Dark mode: Stronger, glow-like ghosts */
- text-shadow:
- -4px -2px 0 rgba(98, 240, 245, 0.5),
- 4px 2px 0 rgba(255, 50, 50, 0.4);
- }
-
- .dark #notion-article h1:hover, .dark #notion-article h2:hover, .dark #notion-article h3:hover {
- text-shadow: none;
- }
-
#notion-article h1::before,
#notion-article h2::before,
#notion-article h3::before {
@@ -694,13 +748,6 @@ export const Style = () => {
6px 6px 10px rgba(0, 0, 0, 0.15);
}
- .dark .nier-title {
- text-shadow:
- 2px 2px 0 rgba(98, 240, 245, 0.45),
- 4px 4px 0 rgba(98, 240, 245, 0.25),
- 6px 6px 15px rgba(0, 0, 0, 0.6);
- }
-
/* ============================================
3D Button Effects
============================================ */
@@ -742,11 +789,6 @@ export const Style = () => {
8px 0 16px rgba(0, 0, 0, 0.03);
}
- .dark .endspace-sidebar-3d {
- box-shadow:
- 4px 0 8px rgba(0, 0, 0, 0.3),
- 8px 0 16px rgba(0, 0, 0, 0.2);
- }
/* ============================================
NieR: Automata Style Navigation Transition
============================================ */
@@ -781,6 +823,28 @@ export const Style = () => {
.nier-nav-item:hover, .nier-nav-item.active {
color: var(--endspace-text-primary) !important;
}
+
+ .endspace-notion-menu-icon {
+ display: inline-block;
+ width: 1.25rem;
+ height: 1.25rem;
+ background-color: currentColor;
+ mask-position: center;
+ mask-repeat: no-repeat;
+ mask-size: contain;
+ -webkit-mask-position: center;
+ -webkit-mask-repeat: no-repeat;
+ -webkit-mask-size: contain;
+ }
+
+ .endspace-notion-menu-emoji {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 1.5rem;
+ font-size: 1.15rem;
+ line-height: 1;
+ }
/* Hover State: Slide to full width */
.nier-nav-item:hover::before {
@@ -798,18 +862,24 @@ export const Style = () => {
transition: color 0.3s ease;
z-index: 2;
}
+
+ #theme-endspace .endspace-menu-icon-wrap,
+ #theme-endspace .endspace-menu-icon-wrap i,
+ #theme-endspace .endspace-menu-icon-wrap svg {
+ color: #000 !important;
+ fill: currentColor;
+ stroke: currentColor;
+ }
+
+ #theme-endspace .endspace-menu-icon-wrap .endspace-notion-menu-icon {
+ color: #000 !important;
+ background-color: #000 !important;
+ }
/* Removed specific active override to keep consistent grey background */
/* Also update the base hover/active shared rule to use this darker grey */
- .dark .nier-nav-item::before {
- background: #f4f4f5; /* Light bg in dark mode */
- }
- .dark .nier-nav-item:hover, .dark .nier-nav-item.active {
- color: #fafafa !important; /* Dark text in dark mode */
- }
-
/* ============================================
Endfield Category Button Styles
============================================ */
@@ -873,6 +943,20 @@ export const Style = () => {
.ef-btn:hover .ef-btn-text {
color: #ffffff !important;
}
+
+ .archive-filter-btn:hover {
+ background-color: #FBFB46 !important;
+ border-color: #FBFB46;
+ box-shadow: var(--endspace-shadow-hover);
+ }
+
+ .archive-filter-btn:hover .ef-btn-indicator {
+ background-color: #000;
+ }
+
+ .archive-filter-btn:hover .ef-btn-text {
+ color: #000 !important;
+ }
`}
)
}
diff --git a/themes/hexo/config.js b/themes/hexo/config.js
index 2eaf59a443a..e4fe5e14734 100644
--- a/themes/hexo/config.js
+++ b/themes/hexo/config.js
@@ -8,11 +8,11 @@ const CONFIG = {
'欢迎来到我的博客🎉'
], // 首页大图标语文字
- HEXO_HOME_NAV_BUTTONS: true, // 首页是否显示分类大图标按钮
+ HEXO_HOME_NAV_BUTTONS: false, // 首页是否显示分类大图标按钮
// 已知未修复bug, 在移动端开启true后会加载不出图片； 暂时建议设置为false。
HEXO_HOME_NAV_BACKGROUND_IMG_FIXED: false, // 首页背景图滚动时是否固定，true 则滚动时图片不懂动； false则随鼠标滚动 ;
// 是否显示开始阅读按钮
- HEXO_SHOW_START_READING: true,
+ HEXO_SHOW_START_READING: false,
// 菜单配置
HEXO_MENU_INDEX: true, // 显示首页
@@ -35,7 +35,7 @@ const CONFIG = {
HEXO_ARTICLE_NOT_BY_AI: false, // 显示非AI写作
HEXO_ARTICLE_RECOMMEND: true, // 文章关联推荐
- HEXO_WIDGET_LATEST_POSTS: true, // 显示最新文章卡
+ HEXO_WIDGET_LATEST_POSTS: false, // 显示最新文章卡
HEXO_WIDGET_ANALYTICS: false, // 显示统计卡
HEXO_WIDGET_TO_TOP: true,
HEXO_WIDGET_TO_COMMENT: true, // 跳到评论区
diff --git a/themes/nav/components/LogoBar.js b/themes/nav/components/LogoBar.js
index 1d891f827ad..26985198041 100755
--- a/themes/nav/components/LogoBar.js
+++ b/themes/nav/components/LogoBar.js
@@ -14,7 +14,7 @@ export default function LogoBar(props) {
{/* eslint-disable-next-line @next/next/no-img-element */}
- 
{siteConfig('NAV_SHOW_TITLE_TEXT', null, CONFIG) && siteConfig('TITLE')}