From 6537758af667496827b5df8e7942730959b8d95e Mon Sep 17 00:00:00 2001
From: Keritial <keritial@gmail.com>
Date: Fri, 11 Apr 2025 01:00:27 +0800
Subject: [PATCH 1/6] fix: refactor navbar display logic

---
 src/layouts/BaseLayout.astro | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index dad6acd..0bba4f3 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -45,16 +45,15 @@ const { description, keywords ,selected} = Astro.props;
 </html>
 
 <script>
-  let lastScrollTop = 0;
-  window.addEventListener("scroll", () => {
-    const menu = document.getElementById("menu");
-    if (!menu || !(menu instanceof HTMLElement)) {
-      return;
-    }
-    const scrollTop = window.scrollY;
-    menu.style.top = scrollTop > lastScrollTop ? "-5.5rem" : "0.2rem";
-    lastScrollTop = scrollTop;
-  });
+  const menu = document.getElementById("menu");
+  if (menu instanceof HTMLElement) {
+    let lastScrollTop = 0;
+    addEventListener("scroll", () => {
+      const scrollTop = window.scrollY;
+      menu.style.top = scrollTop > lastScrollTop ? "-5.5rem" : "0.2rem";
+      lastScrollTop = scrollTop;
+    }, { passive: true });
+  }
 </script>
 
 <style>

From b82346236defdefae5add4c15d20e2785eeaea1e Mon Sep 17 00:00:00 2001
From: Keritial <keritial@gmail.com>
Date: Fri, 11 Apr 2025 01:02:52 +0800
Subject: [PATCH 2/6] fix: let footer line break when appropriate

---
 src/layouts/BaseLayout.astro | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index 0bba4f3..ee5efda 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -60,11 +60,13 @@ const { description, keywords ,selected} = Astro.props;
   * {
     box-sizing: border-box; /* 确保所有元素的宽高包含 padding 和 border */
   }
+
   html {
     background-color: rgb(250, 252, 254);
     /* scrollbar-gutter: stable; */ /* 防止滚动条导致页面宽度不一致 */
     overflow-y: scroll;  /*总是显示滚动条*/
   }
+
   html,
   body {
     margin: 0;
@@ -114,6 +116,7 @@ const { description, keywords ,selected} = Astro.props;
     flex-direction: row;
     justify-content: center;
     padding: 1rem;
+    flex-wrap: wrap;
   }
 
   footer > * {
@@ -123,6 +126,7 @@ const { description, keywords ,selected} = Astro.props;
   h1 {
     font-size: 2rem;
   }
+
   img {
     max-width: 36rem;
   }

From a595756ba3699f619433347c77b43c5da13ba3de Mon Sep 17 00:00:00 2001
From: Keritial <keritial@gmail.com>
Date: Fri, 11 Apr 2025 01:39:53 +0800
Subject: [PATCH 3/6] fix: let friends line break

---
 src/layouts/FriendsLayout.astro | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layouts/FriendsLayout.astro b/src/layouts/FriendsLayout.astro
index 92382f6..d1c1ec1 100644
--- a/src/layouts/FriendsLayout.astro
+++ b/src/layouts/FriendsLayout.astro
@@ -10,7 +10,9 @@ import BaseLayout from "./BaseLayout.astro";
 
 <style>
   #cards {
-    display: grid;
-    grid: auto-flow auto / repeat(2, auto);
+    /* display: grid;
+    grid: auto-flow auto / repeat(2, auto); */
+    display: flex;
+    flex-wrap: wrap;
   }
 </style>

From 595e226c3a4a68804d0a53593b687f1fb589fd46 Mon Sep 17 00:00:00 2001
From: Keritial <keritial@gmail.com>
Date: Fri, 11 Apr 2025 01:41:07 +0800
Subject: [PATCH 4/6] fix: refactor navbar highlighting logic maybe there's a
 better approach

---
 src/components/HeadMenu.astro | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/HeadMenu.astro b/src/components/HeadMenu.astro
index 466b04a..32b08d4 100644
--- a/src/components/HeadMenu.astro
+++ b/src/components/HeadMenu.astro
@@ -13,10 +13,8 @@
 
 <script is:inline>
   const updateSelected = () => {
-    let rawPathname = window.location.pathname;
-    const regex = /^\/([^\/]+)(?:\/|$)/;
-    let pathname = rawPathname.match(regex)?.[1]; //获取第一个捕获组
-    pathname = !pathname ? "index" : pathname;
+    let pathname = location.pathname.split("/")[1];
+    pathname ||= "index";
     const e = document.getElementById(pathname);
     if (!e) {
       return;

From ef3c4a777c83eb9f4f9cb85cc8d3d5d899f73d60 Mon Sep 17 00:00:00 2001
From: Keritial <keritial@gmail.com>
Date: Fri, 11 Apr 2025 01:42:56 +0800
Subject: [PATCH 5/6] fix: let navbar scrollable

---
 src/components/HeadMenu.astro |  4 ++++
 src/layouts/BaseLayout.astro  | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/HeadMenu.astro b/src/components/HeadMenu.astro
index 32b08d4..ebf7ac4 100644
--- a/src/components/HeadMenu.astro
+++ b/src/components/HeadMenu.astro
@@ -35,6 +35,9 @@
     justify-content: space-around;
     height: 3.5rem;
     width: 38rem;
+    max-width: 100dvw;
+    overflow-x: auto;
+    overflow-y: hidden;
     background-color: rgba(255, 255, 255, 0.1);
     backdrop-filter: blur(4px);
     border: 1px solid rgba(0, 0, 0, 0.2); /* 添加黑色的边框，宽度为 2px */
@@ -51,6 +54,7 @@
     transition:
       background-color 0.2s ease-in-out,
       color 0.2s ease-in-out;
+    flex-shrink: 0;
   }
 
   .menu > a:hover {
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index ee5efda..69e8a5e 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -77,13 +77,14 @@ const { description, keywords ,selected} = Astro.props;
 
   #menu {
     top: 0.2rem;
-    position: fixed;
+    position: sticky;
     transition: top 0.2s ease-in-out;
-    padding: 2rem
+    margin: 2rem;
   }
 
   #container {
-    height: 100%;
+    height: fit-content;
+    min-height: 100%;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
@@ -102,7 +103,6 @@ const { description, keywords ,selected} = Astro.props;
 
   main {
     flex-grow: 1; /* 使 main 占据剩余空间 */
-    margin-top: 8rem;
   }
 
   footer {
@@ -110,7 +110,7 @@ const { description, keywords ,selected} = Astro.props;
     border-top: 1px solid rgb(227, 232, 247); 顶部边框线
     height: auto; /* 让 footer 根据内容自适应高度 */
     width: 100%;
-    background-color: rgb(247, 247, 249);;
+    background-color: rgb(247, 247, 249);
     color: #808080;
     display: flex;
     flex-direction: row;
@@ -130,4 +130,8 @@ const { description, keywords ,selected} = Astro.props;
   img {
     max-width: 36rem;
   }
+  
+  section {
+    padding: 8%;
+  }
 </style>

From 81462f9c207d3fce71803e183ee135ebb9cca483 Mon Sep 17 00:00:00 2001
From: Keritial <keritial@gmail.com>
Date: Fri, 11 Apr 2025 01:44:20 +0800
Subject: [PATCH 6/6] build: introduce normalize.css

---
 src/layouts/BaseLayout.astro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index 69e8a5e..8c282fe 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -16,6 +16,7 @@ const { description, keywords ,selected} = Astro.props;
     <meta name="description" content={description} />
     <meta name="keywords" content={keywords} />
     <meta name="author" content="LingLambda" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" integrity="sha512-NhSC1YmyruXifcj/KFRWoC561YpHpc5Jtzgvbuzx5VozKpWvQ+4nXhPdFgmx8xqexRcpAglTj9sIBWINXa8x5w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <title>Ling的小窝</title>
   </head>
   <body>