whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

style: border radius use var

Browse Source
This commit is contained in:
kangfenmao 2025-01-04 22:21:40 +08:00
parent ee5ed8c565
commit d241c38c61
16 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/assets/styles/index.scss
View File

@ -60,6 +60,8 @@
--chat-background-user: #28b561;
--chat-background-assistant: #2c2c2c;
--chat-text-user: var(--color-black);
--list-item-border-radius: 16px;
}
body[theme-mode='light'] {

5
src/renderer/src/components/ListItem/index.tsx
View File

@ -10,9 +10,8 @@ interface ListItemProps {
}
const ListItem = ({ active, icon, title, subtitle, onClick }: ListItemProps) => {
const borderRadius = subtitle ? '10px' : '16px'
return (
<ListItemContainer className={active ? 'active' : ''} onClick={onClick} style={{ borderRadius }}>
<ListItemContainer className={active ? 'active' : ''} onClick={onClick}>
<ListItemContent>
{icon && <IconWrapper>{icon}</IconWrapper>}
<TextContainer>
@ -26,7 +25,7 @@ const ListItem = ({ active, icon, title, subtitle, onClick }: ListItemProps) =>
const ListItemContainer = styled.div`
padding: 7px 12px;
border-radius: 16px;
border-radius: var(--list-item-border-radius);
font-size: 13px;
display: flex;
flex-direction: column;

2
src/renderer/src/i18n/locales/en-us.json
View File

@ -253,7 +253,7 @@
"reset.double.confirm.title": "DATA LOST !!!",
"restore.success": "Restored successfully",
"save.success.title": "Saved successfully",
"switch.disabled": "Switching is disabled while the assistant is generating",
"switch.disabled": "Please wait for the current reply to complete",
"topic.added": "New topic added",
"upgrade.success.button": "Restart",
"upgrade.success.content": "Please restart the application to complete the upgrade",

2
src/renderer/src/i18n/locales/ja-jp.json
View File

@ -252,7 +252,7 @@
"reset.double.confirm.title": "データが失われます！！！",
"restore.success": "復元に成功しました",
"save.success.title": "保存に成功しました",
"switch.disabled": "アシスタントが生成中は切り替えが無効です",
"switch.disabled": "現在の応答が完了するまで切り替えを無効にします",
"topic.added": "新しいトピックが追加されました",
"upgrade.success.button": "再起動",
"upgrade.success.content": "アップグレードを完了するためにアプリケーションを再起動してください",

2
src/renderer/src/i18n/locales/ru-ru.json
View File

@ -253,7 +253,7 @@
"reset.double.confirm.title": "ДАННЫЕ БУДУТ УТЕРЯНЫ !!!",
"restore.success": "Успешно восстановлено",
"save.success.title": "Успешно сохранено",
"switch.disabled": "Переключение отключено, пока ассистент генерирует",
"switch.disabled": "Пожалуйста, дождитесь завершения текущего ответа",
"topic.added": "Новый топик добавлен",
"upgrade.success.button": "Перезапустить",
"upgrade.success.content": "Пожалуйста, перезапустите приложение для завершения обновления",

4
src/renderer/src/i18n/locales/zh-cn.json
View File

@ -82,7 +82,7 @@
"input.upload": "上传图片或文档",
"input.web_search": "开启网络搜索",
"input.knowledge_base": "知识库",
"message.new.branch": "新分支",
"message.new.branch": "分支",
"message.new.branch.created": "新分支已创建",
"message.regenerate.model": "切换模型",
"message.new.context": "清除上下文",
@ -254,7 +254,7 @@
"reset.double.confirm.title": "数据丢失！！！",
"restore.success": "恢复成功",
"save.success.title": "保存成功",
"switch.disabled": "模型回复完成后才能切换",
"switch.disabled": "请等待当前回复完成后操作",
"topic.added": "话题添加成功",
"upgrade.success.button": "重启",
"upgrade.success.content": "重启用以完成升级",

4
src/renderer/src/i18n/locales/zh-tw.json
View File

@ -82,7 +82,7 @@
"input.upload": "上傳圖片或文檔",
"input.web_search": "開啟網路搜索",
"input.knowledge_base": "知識庫",
"message.new.branch": "新分支",
"message.new.branch": "分支",
"message.new.branch.created": "新分支已建立",
"message.regenerate.model": "切換模型",
"message.new.context": "新上下文",
@ -253,7 +253,7 @@
"reset.double.confirm.title": "資料將會丟失！！！",
"restore.success": "恢復成功",
"save.success.title": "保存成功",
"switch.disabled": "助手生成回覆時無法切換",
"switch.disabled": "請等待當前回覆完成",
"topic.added": "新話題已添加",
"upgrade.success.button": "重新啟動",
"upgrade.success.content": "請重新啟動應用以完成升級",

2
src/renderer/src/pages/agents/AgentsPage.tsx
View File

@ -283,7 +283,7 @@ const Tabs = styled(TabsAntd)<{ $language: string }>`
}
.ant-tabs-tab {
margin: 0 !important;
border-radius: 16px;
border-radius: var(--list-item-border-radius);
margin-bottom: 5px !important;
font-size: 13px;
justify-content: left;

2
src/renderer/src/pages/files/FilesPage.tsx
View File

@ -324,7 +324,7 @@ const SideNav = styled.div`
line-height: 36px;
margin: 4px 0;
width: 100%;
border-radius: 16px;
border-radius: var(--list-item-border-radius);
border: 0.5px solid transparent;
&:hover {

2
src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
View File

@ -181,7 +181,7 @@ const AssistantItem = styled.div`
margin: 0 10px;
padding-right: 35px;
font-family: Ubuntu;
border-radius: 16px;
border-radius: var(--list-item-border-radius);
border: 0.5px solid transparent;
cursor: pointer;
.iconfont {

11
src/renderer/src/pages/home/Tabs/TopicsTab.tsx
View File

@ -38,7 +38,7 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
const { t } = useTranslation()
const { showTopicTime, topicPosition } = useSettings()
const borderRadius = showTopicTime ? 12 : 17
const borderRadius = showTopicTime ? 12 : 'var(--list-item-border-radius)'
const onDeleteTopic = useCallback(
async (topic: Topic) => {
@ -185,8 +185,8 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
<Dropdown menu={{ items: getTopicMenuItems(topic) }} trigger={['contextMenu']} key={topic.id}>
<TopicListItem
className={isActive ? 'active' : ''}
style={{ borderRadius }}
onClick={() => onSwitchTopic(topic)}>
onClick={() => onSwitchTopic(topic)}
style={{ borderRadius }}>
<TopicName className="name">{topic.name.replace('`', '')}</TopicName>
{showTopicTime && (
<TopicTime className="time">{dayjs(topic.createdAt).format('MM/DD HH:mm')}</TopicTime>
@ -223,8 +223,9 @@ const Container = styled(Scrollbar)`
const TopicListItem = styled.div`
padding: 7px 12px;
margin: 0 10px;
border-radius: 16px;
margin-left: 10px;
margin-right: 4px;
border-radius: var(--list-item-border-radius);
font-family: Ubuntu;
font-size: 13px;
display: flex;

2
src/renderer/src/pages/knowledge/KnowledgePage.tsx
View File

@ -208,7 +208,7 @@ const AddKnowledgeItem = styled.div`
padding: 7px 12px;
position: relative;
font-family: Ubuntu;
border-radius: 16px;
border-radius: var(--list-item-border-radius);
border: 0.5px solid transparent;
cursor: pointer;
&:hover {

2
src/renderer/src/pages/settings/ProviderSettings/index.tsx
View File

@ -182,7 +182,7 @@ const ProviderListItem = styled.div`
padding: 5px 8px;
width: 100%;
cursor: grab;
border-radius: 16px;
border-radius: var(--list-item-border-radius);
font-size: 14px;
transition: all 0.2s ease-in-out;
border: 0.5px solid transparent;

2
src/renderer/src/pages/settings/SettingsPage.tsx
View File

@ -132,7 +132,7 @@ const MenuItem = styled.li`
padding: 6px 10px;
width: 100%;
cursor: pointer;
border-radius: 16px;
border-radius: var(--list-item-border-radius);
font-weight: 500;
transition: all 0.2s ease-in-out;
border: 0.5px solid transparent;

1
src/renderer/src/services/AssistantService.ts
View File

@ -105,6 +105,7 @@ export const getAssistantSettings = (assistant: Assistant): AssistantSettings =>
maxTokens: getAssistantMaxTokens(),
streamOutput: assistant?.settings?.streamOutput ?? true,
hideMessages: assistant?.settings?.hideMessages ?? false,
defaultModel: assistant?.defaultModel ?? undefined,
autoResetModel: assistant?.settings?.autoResetModel ?? false,
customParameters: assistant?.settings?.customParameters ?? []
}

1
src/renderer/src/types/index.ts
View File

@ -35,6 +35,7 @@ export type AssistantSettings = {
enableMaxTokens: boolean
streamOutput: boolean
hideMessages: boolean
defaultModel?: Model
autoResetModel: boolean
customParameters?: AssistantSettingCustomParameters[]
}