diff --git a/app/containers/Settings/components/ModelSetting.tsx b/app/containers/Settings/components/ModelSetting.tsx
index ca4e3b3ee..f48ea1984 100644
--- a/app/containers/Settings/components/ModelSetting.tsx
+++ b/app/containers/Settings/components/ModelSetting.tsx
@@ -153,6 +153,16 @@ export default function ModelSetting(props: {
title={Locale.Settings.InputTemplate.Title}
subTitle={Locale.Settings.InputTemplate.SubTitle}
nextline={isMobileScreen}
+ validator={(v: string) => {
+ if (!v.includes("{{input}}")) {
+ return {
+ error: true,
+ message: Locale.Settings.InputTemplate.Error,
+ };
+ }
+
+ return { error: false };
+ }}
>
props.updateConfig((config) => (config.template = e))
}
- className="text-center"
>
>
diff --git a/app/containers/Settings/index.tsx b/app/containers/Settings/index.tsx
index 6429b5d8c..f6b9f38c2 100644
--- a/app/containers/Settings/index.tsx
+++ b/app/containers/Settings/index.tsx
@@ -71,15 +71,13 @@ export default MenuLayout(function SettingList(props) {
cursor-pointer
border
rounded-md
-
- bg-chat-menu-session-unselected border-chat-menu-session-unselected
+ border-transparent
${
selected === i.id && !isMobileScreen
? `!bg-chat-menu-session-selected !border-chat-menu-session-selected !font-medium`
- : `hover:bg-chat-menu-session-hovered hover:chat-menu-session-hovered`
+ : `hover:bg-chat-menu-session-unselected hover:border-chat-menu-session-unselected`
}
- hover:border-opacity-100 hover:font-semibold hover:bg-settings-menu-item-selected
flex justify-between items-center
max-md:bg-settings-menu-item-mobile
`}
diff --git a/app/fonts/Satoshi-Variable.ttf b/app/fonts/Satoshi-Variable.ttf
new file mode 100644
index 000000000..976e85cb5
Binary files /dev/null and b/app/fonts/Satoshi-Variable.ttf differ
diff --git a/app/fonts/Satoshi-Variable.woff b/app/fonts/Satoshi-Variable.woff
new file mode 100644
index 000000000..f8dcd1d60
Binary files /dev/null and b/app/fonts/Satoshi-Variable.woff differ
diff --git a/app/fonts/Satoshi-Variable.woff2 b/app/fonts/Satoshi-Variable.woff2
new file mode 100644
index 000000000..b00e833ed
Binary files /dev/null and b/app/fonts/Satoshi-Variable.woff2 differ
diff --git a/app/locales/cn.ts b/app/locales/cn.ts
index dec63e6ce..3b787b60c 100644
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -170,6 +170,7 @@ const cn = {
InputTemplate: {
Title: "用户输入预处理",
SubTitle: "用户最新的一条消息会填充到此模板",
+ Error: "模板中必须携带占位符{{input}}",
},
Update: {
diff --git a/app/locales/en.ts b/app/locales/en.ts
index 7fa9670f9..dc0db3faa 100644
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@@ -174,6 +174,7 @@ const en: LocaleType = {
InputTemplate: {
Title: "Input Template",
SubTitle: "Newest message will be filled to this template",
+ Error: "Placeholder {{input}} must be included in the template",
},
Update: {
diff --git a/app/styles/base-new.scss b/app/styles/base-new.scss
index e278bdf66..5f3f9bab0 100644
--- a/app/styles/base-new.scss
+++ b/app/styles/base-new.scss
@@ -64,6 +64,7 @@ body {
--danger-btn-bg: #fff6f6;
--default-btn-bg: #f7f7f8;
--hovered-btn-bg: rgba(0, 0, 0, 0.05);
+ --hovered-danger-btn-bg: #FFE7E7;
--card-bg: #fff;
--input-bg: #f7f7f8;
--list-item-divider-bg: #f0f0f3;
@@ -191,6 +192,7 @@ body {
--danger-btn-bg: #20131A;
--default-btn-bg: #1D1D1D;
--hovered-btn-bg: #303030;
+ --hovered-danger-btn-bg:#303030;
--card-bg: #111;
--input-bg: #1D1D1D;
--list-item-divider-bg: #303030;
@@ -216,7 +218,7 @@ body {
--chat-panel-message-mobile-bg: #303030;
--chat-message-actions-btn-hovered-bg: rgba(255, 255, 255, 0.05);
--chat-panel-bg: #1D1D1D;
- --chat-panel-message-clear-divider-bg: #e2e2e6; //////////
+ --chat-panel-message-clear-divider-bg: #a5a5b3;
--chat-menu-session-selected-bg: #182455;
--chat-menu-session-unselected-bg: #303030;
--chat-menu-session-hovered-bg: #404040;
diff --git a/app/styles/globals.css b/app/styles/globals.css
index baeb586f4..b86d34204 100644
--- a/app/styles/globals.css
+++ b/app/styles/globals.css
@@ -13,6 +13,9 @@
font-feature-settings:
"clig" off,
"liga" off;
- src: url(/fonts/Roboto.woff2) format("woff2");
+ src:
+ url("../fonts/Satoshi-Variable.woff2") format("woff2"),
+ url("../fonts/Satoshi-Variable.woff") format("woff"),
+ url("../fonts/Satoshi-Variable.ttf") format("truetype");
}
}
diff --git a/tailwind.config.js b/tailwind.config.js
index 63e7ad4f0..3102900a3 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -90,6 +90,7 @@ module.exports = {
'danger-btn': 'var(--danger-btn-bg)',
'default-btn': 'var(--default-btn-bg)',
'hovered-btn': 'var(--hovered-btn-bg)',
+ 'hovered-danger-btn': 'var(--hovered-danger-btn-bg)',
'card': 'var(--card-bg)',
'input': 'var(--input-bg)',
'list-item-divider': 'var(--list-item-divider-bg)',
@@ -186,6 +187,7 @@ module.exports = {
'chat-menu-session-unselected-mobile': 'var(--chat-menu-session-unselected-mobile-border)',
'chat-menu-session-hovered': 'var(--chat-menu-session-hovered-border)',
'modal-header-bottom': 'var(--modal-header-bottom-border)',
+ 'transparent': 'transparent',
'text-sidebar-tab-mobile-active': 'var(--sidebar-tab-mobile-active-text)',
'text-sidebar-tab-mobile-inactive': 'var(--sidebar-tab-mobile-inactive-text)',