fix conflicts

This commit is contained in:
Jason Wang 2023-04-04 21:53:01 +08:00
parent 203f027394
commit f8af99736e
3 changed files with 4 additions and 4 deletions

View File

@ -59,7 +59,7 @@ function useSwitchTheme() {
'meta[name="theme-color"]:not([media])',
);
if (config.theme === "auto") {
if (config.theme === "Auto") {
metaDescriptionDark?.setAttribute("content", "#151515");
metaDescriptionLight?.setAttribute("content", "#fafafa");
} else {

View File

@ -199,7 +199,7 @@ export function Settings(props: { closeSettings: () => void }) {
</Popover>
</SettingItem>
<SettingItem
{/* <SettingItem
title={Locale.Settings.Update.Version(currentId)}
subTitle={
checkingUpdate
@ -222,7 +222,7 @@ export function Settings(props: { closeSettings: () => void }) {
onClick={() => checkUpdate(true)}
/>
)}
</SettingItem>
</SettingItem> */}
<SettingItem title={Locale.Settings.SendKey}>
<select

View File

@ -52,7 +52,7 @@ const cn = {
Close: "关闭",
},
Lang: {
Name: "Language",
Name: "语言",
Options: {
cn: "简体中文",
en: "English",