chore: fix rebase conflicts

Author: orangelckc

apps/client/components/Navbar.vue

@@ -113,7 +113,7 @@ const HEADER_OPTIONS = [
 ];
 
 const isDarkMode = computed(() => darkMode.value === Theme.DARK);
-const isStickyNavBar = computed(() => ["index", "User-Setting"].includes(route.name as string));
+const isStickyNavBar = computed(() => ["index", "setting"].includes(route.name as string));
 const isScrolled = computed(() => y.value >= SCROLL_THRESHOLD);
 
 function handleLogout() {

apps/client/components/main/Tool.vue

@@ -27,7 +27,7 @@
     <!-- 右侧 -->
     <div class="flex items-center gap-4">
       <div
-        class="tooltip-item mr-4"
+        class="tooltip-item"
         data-tip="重置当前课程进度"
         @click="handleDoAgain"
       >