xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-09 11:36:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/home.tsx
View File

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

4
app/components/settings.tsx
View File

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

2
app/locales/cn.ts
View File

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