From 89ce7219bd451695e75e1b7c6d6d90c5d4c1a2fc Mon Sep 17 00:00:00 2001
From: rohow <rohow@foxmail.com>
Date: Mon, 2 Dec 2024 10:55:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(theme):=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BA=A4=E4=BA=92=E4=B8=8E=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 theme-terminal/src/styles/header.scss        | 12 ++++++++++++
 theme-terminal/src/styles/main.scss          | 17 -----------------
 theme-terminal/src/styles/post.scss          |  5 +++++
 theme-terminal/templates/modules/header.html |  6 +++---
 theme-terminal/templates/moments.html        |  4 ++--
 theme-terminal/templates/post.html           |  2 +-
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/theme-terminal/src/styles/header.scss b/theme-terminal/src/styles/header.scss
index d5403f2..84a58eb 100644
--- a/theme-terminal/src/styles/header.scss
+++ b/theme-terminal/src/styles/header.scss
@@ -49,6 +49,7 @@
       z-index: 99;
       top: 35px;
       left: 0;
+      display: none;
       margin: 0;
       padding: 10px;
       list-style: none;
@@ -66,6 +67,17 @@
           margin-right: 0;
         }
       }
+      
+      &.open {
+        display: block;
+      }
     }
   }
+
+  .button {
+    background-color: transparent;
+    color: var(--foreground);
+    margin: 0 0 0 .5rem;
+    padding: 0;
+  }
 }
diff --git a/theme-terminal/src/styles/main.scss b/theme-terminal/src/styles/main.scss
index d1bdc70..4c53473 100644
--- a/theme-terminal/src/styles/main.scss
+++ b/theme-terminal/src/styles/main.scss
@@ -258,21 +258,4 @@ hr {
   border: none;
   background: var(--foreground);
   height: 1px;
-}
-
-.hidden {
-  display: none;
-}
-
-#theme-toggle {
-  background-color: transparent;
-  color: var(--foreground);
-  margin: 0 0 0 .5rem;
-  padding: 0;
-}
-#search-button {
-  background-color: transparent;
-  color: var(--foreground);
-  margin: 0 0 0 .5rem;
-  padding: 0;
 }
\ No newline at end of file
diff --git a/theme-terminal/src/styles/post.scss b/theme-terminal/src/styles/post.scss
index 24d97a9..87b84ae 100644
--- a/theme-terminal/src/styles/post.scss
+++ b/theme-terminal/src/styles/post.scss
@@ -165,4 +165,9 @@
   .post-tag {
     text-decoration: underline;
   }
+}
+
+.comment-wrap {
+  position: relative;
+  z-index: 2;
 }
\ No newline at end of file
diff --git a/theme-terminal/templates/modules/header.html b/theme-terminal/templates/modules/header.html
index e633611..c425e79 100644
--- a/theme-terminal/templates/modules/header.html
+++ b/theme-terminal/templates/modules/header.html
@@ -7,8 +7,8 @@
       </a>
       <div class="dividing"></div>
       <button
-        id="search-button"
         type="button"
+        class="button"
         th:if="${pluginFinder.available('PluginSearchWidget')}"
         onclick="SearchWidget.open()"
       >
@@ -24,7 +24,7 @@
           <svg xmlns="http://www.w3.org/2000/svg" width="1.5rem" height="1.5rem" viewBox="0 0 24 24"><path fill="currentColor" d="M6 2h8v2H6zM4 6V4h2v2zm0 8H2V6h2zm2 2H4v-2h2zm8 0v2H6v-2zm2-2h-2v2h2v2h2v2h2v2h2v-2h-2v-2h-2v-2h-2zm0-8h2v8h-2zm0 0V4h-2v2z"/></svg>
         </th:block>
       </button>
-      <button type="button" x-data="themeMode()" @click="handleToggleThemeMode()">
+      <button type="button" class="button" x-data="themeMode()" @click="handleToggleThemeMode()">
         <th:block th:unless="${theme.config.basic.pixel_style}">
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -56,7 +56,7 @@
           <ul 
             th:if="${not #lists.isEmpty(menuItem.children)}"
             class="menu__sub-inner" 
-            :class="{'hidden': !isOpen}"
+            :class="{'open': isOpen}"
           >
             <li th:each="childMenuItem : ${menuItem.children}">
               <a 
diff --git a/theme-terminal/templates/moments.html b/theme-terminal/templates/moments.html
index f29bffe..4aa315d 100644
--- a/theme-terminal/templates/moments.html
+++ b/theme-terminal/templates/moments.html
@@ -4,8 +4,8 @@
   th:replace="~{modules/layout :: html(header = null, content = ~{::content}, footer = null)}"
 >
   <th:block th:fragment="content">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/glightbox/dist/css/glightbox.min.css" />
-    <script src="https://cdn.jsdelivr.net/gh/mcstudios/glightbox/dist/js/glightbox.min.js"></script>
+    <link rel="stylesheet" href="https://gcore.jsdelivr.net/npm/glightbox/dist/css/glightbox.min.css" />
+    <script src="https://gcore.jsdelivr.net/gh/mcstudios/glightbox/dist/js/glightbox.min.js"></script>
     <div class="content">
       <div class="moments" x-data="upvote('moment','moment.halo.run','moments')">
         <div
diff --git a/theme-terminal/templates/post.html b/theme-terminal/templates/post.html
index 0091b91..cc1f373 100644
--- a/theme-terminal/templates/post.html
+++ b/theme-terminal/templates/post.html
@@ -23,7 +23,7 @@
         <div th:utext="${post.content.content}">Post Content</div>
       </div>
     </div>
-    <div th:if="${haloCommentEnabled}">
+    <div class="comment-wrap" th:if="${haloCommentEnabled}">
       <h2>评论</h2>
       <halo:comment
         group="content.halo.run"