diff --git a/src/App.vue b/src/App.vue index a0ea526..ae6ee34 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,11 +2,13 @@ - - - + + + + + @@ -16,7 +18,7 @@ import ViewerLayout from '@/views/ViewerLayout.vue' import ManageLayout from '@/views/ManageLayout.vue' import { useRoute } from 'vue-router' -import { NConfigProvider, NMessageProvider, NNotificationProvider, zhCN, dateZhCN, useOsTheme, darkTheme } from 'naive-ui' +import { NConfigProvider, NMessageProvider, NNotificationProvider, zhCN, dateZhCN, useOsTheme, darkTheme, NElement } from 'naive-ui' import { computed } from 'vue' import { useStorage } from '@vueuse/core' import { ThemeType } from './api/api-models' @@ -32,19 +34,21 @@ const layout = computed(() => { } }) -const themeType = useStorage('Settings.Theme', ThemeType.Auto); +const themeType = useStorage('Settings.Theme', ThemeType.Auto) const theme = computed(() => { if (themeType.value == ThemeType.Auto) { - var osThemeRef = useOsTheme(); //获取当前系统主题 - return osThemeRef.value === "dark" ? darkTheme : null; + var osThemeRef = useOsTheme() //获取当前系统主题 + return osThemeRef.value === 'dark' ? darkTheme : null } else { - return themeType.value == ThemeType.Dark ? darkTheme : null; + return themeType.value == ThemeType.Dark ? darkTheme : null } -}); +}) const themeOverrides = { common: { //primaryColor: '#9ddddc', + fontFamily: + '"Noto Sans SC",-apple-system,blinkmacsystemfont,"Segoe UI",roboto,"Helvetica Neue",arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"!important', }, // ... } diff --git a/src/views/ManageLayout.vue b/src/views/ManageLayout.vue index 9653202..55f2185 100644 --- a/src/views/ManageLayout.vue +++ b/src/views/ManageLayout.vue @@ -1,26 +1,23 @@