wip: 临时提交

src/layouts/components/NavBar/components/NavbarActions.vue

@@ -107,16 +107,6 @@ const navbarActionsClass = computed(() => {
         return "navbar-actions--dark-text";
       }
     }
-
-    // 左侧布局下，如果侧边栏是经典蓝色，顶部导航栏使用白色文字
-    if (layout === "left" && sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
-      return "navbar-actions--white-text";
-    }
-
-    // 左侧布局下的其他情况（包括极简白），使用默认深色文字
-    if (layout === "left") {
-      return "navbar-actions--dark-text";
-    }
   }
 
   return "navbar-actions--dark-text";

src/layouts/views/LeftLayout.vue

@@ -29,10 +29,10 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import Sidebar from "../components/Sidebar/index.vue";
-import NavBar from "../components/Navbar/index.vue";
+import NavBar from "../components/NavBar/index.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
-import Menu from "../components/Menu/index.vue";
+import Menu from "../components/NavMenu/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();

src/layouts/views/MixLayout.vue

@@ -64,11 +64,11 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
-import MixTopMenu from "../components/Menu/components/MixTopMenu.vue";
-import NavbarActions from "../components/Navbar/components/NavbarActions.vue";
+import MixTopMenu from "../components/NavMenu/components/MixTopMenu.vue";
+import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
-import MenuItem from "../components/Menu/components/MenuItem.vue";
+import MenuItem from "../components/NavMenu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 

src/layouts/views/TopLayout.vue

@@ -27,8 +27,8 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
-import Menu from "../components/Menu/index.vue";
-import NavbarActions from "../components/Navbar/components/NavbarActions.vue";
+import Menu from "../components/NavMenu/index.vue";
+import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";