mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-09 03:26:38 +08:00
fix conflicts
This commit is contained in:
parent
203f027394
commit
f8af99736e
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -52,7 +52,7 @@ const cn = {
|
||||
Close: "关闭",
|
||||
},
|
||||
Lang: {
|
||||
Name: "Language",
|
||||
Name: "语言",
|
||||
Options: {
|
||||
cn: "简体中文",
|
||||
en: "English",
|
||||
|
Loading…
Reference in New Issue
Block a user