From ce4a35dbd445ec81f3da572e16d847a42582015e Mon Sep 17 00:00:00 2001
From: sunlei <yemu2333@outlook.com>
Date: Wed, 1 Jul 2026 14:46:51 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20=E7=A7=BB=E9=99=A4=E5=8D=9A?=
 =?UTF-8?q?=E5=AE=A2=E5=A4=B4=E9=83=A8=E9=9A=90=E8=97=8F=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 855af671407cb522988834c24147ab602a4ed452.
---
 src/__tests__/App.spec.ts          |  5 +-
 src/components/blog/BlogHeader.tsx | 87 +++++++++++++++++++-----------
 src/styles/responsive.scss         |  1 +
 src/styles/toolbar.scss            | 28 +++++++++-
 4 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/src/__tests__/App.spec.ts b/src/__tests__/App.spec.ts
index ce11075..92ffe31 100644
--- a/src/__tests__/App.spec.ts
+++ b/src/__tests__/App.spec.ts
@@ -126,7 +126,7 @@ describe('App', () => {
     expect(wrapper.text()).toContain('KwiTsukasa的小站');
   });
 
-  it('renders Argon header without hidden navigation containers', async () => {
+  it('renders Argon header without the old collapse container', async () => {
     await router.push('/');
     await router.isReady();
 
@@ -137,8 +137,7 @@ describe('App', () => {
     });
 
     expect(wrapper.find('.kt-blog__header-collapse').exists()).toBe(false);
-    expect(wrapper.find('.kt-blog__header-navbar .kt-blog__header-nav').exists()).toBe(false);
-    expect(wrapper.find('.kt-blog__header-navbar .navbar-nav').exists()).toBe(false);
+    expect(wrapper.find('.kt-blog__header-nav').exists()).toBe(true);
   });
 
   it('loads local blog theme config by default', async () => {
diff --git a/src/components/blog/BlogHeader.tsx b/src/components/blog/BlogHeader.tsx
index 0518117..27f1dc8 100644
--- a/src/components/blog/BlogHeader.tsx
+++ b/src/components/blog/BlogHeader.tsx
@@ -88,38 +88,63 @@ export default defineComponent({
                 </RouterLink>
               </div>
 
-              <div
-                class={['kt-blog__header-search', navSearchOpen.value && 'kt-blog__header-search--open']}
-                onClick={() => {
-                  navSearchOpen.value = true;
-                  nextTick(() => focusInput(navSearchInputRef.value));
-                }}
-              >
-                <div class="kt-blog__input-group">
-                  <div class="kt-blog__input-addon-wrap">
-                    <span class="kt-blog__input-addon">
-                      <SearchOutlined />
-                    </span>
+              <ul class="kt-blog__header-nav kt-blog__header-nav--hover">
+                {siteConfig.value.headerMenu.map((item) => (
+                  <li key={item.label} class="kt-blog__header-nav-item">
+                    {item.external ? (
+                      <a
+                        class="kt-blog__header-nav-link"
+                        href={item.href}
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        {item.label}
+                      </a>
+                    ) : (
+                      <RouterLink class="kt-blog__header-nav-link" to={item.href}>
+                        {item.label}
+                      </RouterLink>
+                    )}
+                  </li>
+                ))}
+              </ul>
+
+              <ul class="kt-blog__header-nav kt-blog__header-nav--end">
+                <li class="kt-blog__header-search-item">
+                  <div
+                    class={['kt-blog__header-search', navSearchOpen.value && 'kt-blog__header-search--open']}
+                    onClick={() => {
+                      navSearchOpen.value = true;
+                      nextTick(() => focusInput(navSearchInputRef.value));
+                    }}
+                  >
+                    <div class="kt-blog__input-group">
+                      <div class="kt-blog__input-addon-wrap">
+                        <span class="kt-blog__input-addon">
+                          <SearchOutlined />
+                        </span>
+                      </div>
+                      <BlogInput
+                        ref={navSearchInputRef}
+                        class="kt-blog__header-search-input kt-blog__input"
+                        placeholder="搜索什么..."
+                        autocomplete="off"
+                        v-model:value={keyword.value}
+                        onClick={(event: MouseEvent) => event.stopPropagation()}
+                        onBlur={() => {
+                          navSearchOpen.value = false;
+                        }}
+                        onKeydown={(event: KeyboardEvent) => {
+                          if (event.key === 'Enter') {
+                            event.preventDefault();
+                            submitSearch();
+                          }
+                        }}
+                      />
+                    </div>
                   </div>
-                  <BlogInput
-                    ref={navSearchInputRef}
-                    class="kt-blog__header-search-input kt-blog__input"
-                    placeholder="搜索什么..."
-                    autocomplete="off"
-                    v-model:value={keyword.value}
-                    onClick={(event: MouseEvent) => event.stopPropagation()}
-                    onBlur={() => {
-                      navSearchOpen.value = false;
-                    }}
-                    onKeydown={(event: KeyboardEvent) => {
-                      if (event.key === 'Enter') {
-                        event.preventDefault();
-                        submitSearch();
-                      }
-                    }}
-                  />
-                </div>
-              </div>
+                </li>
+              </ul>
 
               <div class="kt-blog__header-menu-mask" />
               <BlogButton
diff --git a/src/styles/responsive.scss b/src/styles/responsive.scss
index 71b2eab..2b0557b 100644
--- a/src/styles/responsive.scss
+++ b/src/styles/responsive.scss
@@ -31,6 +31,7 @@
       padding: 0 16px;
     }
 
+    &__header-nav--hover,
     &__header-search {
       display: none;
     }
diff --git a/src/styles/toolbar.scss b/src/styles/toolbar.scss
index ad09b54..dfbb3d7 100644
--- a/src/styles/toolbar.scss
+++ b/src/styles/toolbar.scss
@@ -46,9 +46,34 @@
     font-weight: 700;
   }
 
+  &__header-nav--hover {
+    display: flex;
+    flex: 1;
+    align-items: center;
+  }
+
+  &__header-nav {
+    display: flex;
+    align-items: center;
+    gap: 18px;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  &__header-nav-link {
+    color: rgba(238, 238, 238, 0.78);
+    font-size: 14px;
+
+    &:hover,
+    &[aria-current='page'] {
+      color: var(--argon-title);
+    }
+  }
+
   &__header-search {
     width: 40px;
-    margin: 0 0 0 auto;
+    margin: 0;
     cursor: pointer;
     transition:
       width 0.42s cubic-bezier(0.4, 0, 0, 1),
@@ -197,6 +222,7 @@
   &__header-navbar--ontop,
   &:not(.kt-blog--no-banner) &__header-navbar {
     .kt-blog__header-title,
+    .kt-blog__header-nav-link,
     .kt-blog__header-search:not(.kt-blog__header-search--open) .kt-blog__input-addon,
     .kt-blog__header-search.kt-blog__header-search--open .kt-blog__input-addon {
       color: rgba(255, 255, 255, 0.92);