diff --git a/src/enums/ThemeEnum.ts b/src/enums/ThemeEnum.ts index 6d2ad192..5ceae645 100644 --- a/src/enums/ThemeEnum.ts +++ b/src/enums/ThemeEnum.ts @@ -18,15 +18,15 @@ export const enum ThemeEnum { } /** - * 浅色主题下的侧边栏配色方案枚举 + * 侧边栏配色方案枚举 */ -export const enum SidebarLightThemeEnum { +export const enum SidebarColorEnum { /** - * 深蓝色 + * 经典蓝 */ - DARKBLUE = "light-darkBlue", + CLASSIC_BLUE = "classic-blue", /** - * 白色 + * 极简白 */ - WHITE = "light-white", + MINIMAL_WHITE = "minimal-white", } diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts index 446e4c75..ef6eae4e 100644 --- a/src/lang/package/en.ts +++ b/src/lang/package/en.ts @@ -59,7 +59,7 @@ export default { sidebarLogo: "Sidebar Logo", sidebarColorScheme: "Sidebar Color Scheme", watermark: "Watermark", - white: "white", - darkBlue: "darkBlue", + classicBlue: "Classic Blue", + minimalWhite: "Minimal White", }, }; diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts index 4ad0f150..d3169adf 100644 --- a/src/lang/package/zh-cn.ts +++ b/src/lang/package/zh-cn.ts @@ -57,9 +57,9 @@ export default { themeColor: "主题颜色", tagsView: "开启 Tags-View", sidebarLogo: "侧边栏 Logo", - sidebarColorScheme: "侧边栏配色方案", + sidebarColorScheme: "侧边栏配色", watermark: "开启水印", - white: "白色", - darkBlue: "深蓝色", + classicBlue: "经典蓝", + minimalWhite: "极简白", }, }; diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue index cf0c4846..f153364e 100644 --- a/src/layout/components/NavBar/components/NavbarRight.vue +++ b/src/layout/components/NavBar/components/NavbarRight.vue @@ -48,7 +48,7 @@ import { DeviceEnum } from "@/enums/DeviceEnum"; import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store"; import Notification from "./Notification.vue"; -import { SidebarLightThemeEnum, ThemeEnum } from "@/enums/ThemeEnum"; +import { SidebarColorEnum, ThemeEnum } from "@/enums/ThemeEnum"; const appStore = useAppStore(); const settingStore = useSettingsStore(); @@ -68,11 +68,16 @@ function handleProfileClick() { // 根据主题和侧边栏配色方案选择 navbar 右侧的样式类 const navbarRightClass = computed(() => { - const isDarkTheme = settingStore.theme === ThemeEnum.DARK; - const isDarkBlueSidebar = settingStore.sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE; + // 如果暗黑主题 + if (settingStore.theme === ThemeEnum.DARK) { + return "navbar__right--white"; + } - // 如果是暗黑主题,或者是浅色主题中的深蓝色侧边栏配色 - return isDarkTheme || isDarkBlueSidebar ? "navbar__right--darkBlue" : "navbar__right--white"; + // 如果侧边栏是经典蓝 + + if (settingStore.sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE) { + return "navbar__right--white"; + } }); /** @@ -135,14 +140,9 @@ function logout() { } } -.layout-top .navbar__right--darkBlue > *, -.layout-mix .navbar__right--darkBlue > * { - color: #fff; -} - .layout-top .navbar__right--white > *, .layout-mix .navbar__right--white > * { - color: #000; + color: #fff; } .dark .navbar__right > *:hover { diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 341d5181..eb1d8d96 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -30,8 +30,10 @@
{{ $t("settings.sidebarColorScheme") }} - {{ $t("settings.white") }} - {{ $t("settings.darkBlue") }} + + {{ $t("settings.minimalWhite") }} + + {{ $t("settings.classicBlue") }}
@@ -44,7 +46,7 @@