style: update styles for improved visual consistency and layout

This commit is contained in:
kangfenmao 2024-11-20 16:37:52 +08:00
parent c3d007b52c
commit 6ba6108f43
11 changed files with 34 additions and 26 deletions

View File

@ -9,7 +9,7 @@
--color-white-soft: rgba(255, 255, 255, 0.8); --color-white-soft: rgba(255, 255, 255, 0.8);
--color-white-mute: rgba(255, 255, 255, 0.94); --color-white-mute: rgba(255, 255, 255, 0.94);
--color-black: #0f0f0f; --color-black: #121212;
--color-black-soft: #191919; --color-black-soft: #191919;
--color-black-mute: #242424; --color-black-mute: #242424;
@ -40,6 +40,7 @@
--color-code-background: #323232; --color-code-background: #323232;
--color-hover: rgba(40, 40, 40, 1); --color-hover: rgba(40, 40, 40, 1);
--color-active: rgba(55, 55, 55, 1); --color-active: rgba(55, 55, 55, 1);
--color-frame-border: #333;
--navbar-background-mac: rgba(30, 30, 30, 0.6); --navbar-background-mac: rgba(30, 30, 30, 0.6);
--navbar-background: rgba(30, 30, 30); --navbar-background: rgba(30, 30, 30);
@ -95,6 +96,7 @@ body[theme-mode='light'] {
--color-code-background: #e3e3e3; --color-code-background: #e3e3e3;
--color-hover: var(--color-white-mute); --color-hover: var(--color-white-mute);
--color-active: var(--color-white-soft); --color-active: var(--color-white-soft);
--color-frame-border: #ddd;
--navbar-background-mac: rgba(255, 255, 255, 0.6); --navbar-background-mac: rgba(255, 255, 255, 0.6);
--navbar-background: rgba(255, 255, 255); --navbar-background: rgba(255, 255, 255);

View File

@ -74,7 +74,8 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, ...props })
content: { content: {
padding: 0, padding: 0,
overflow: 'hidden', overflow: 'hidden',
background: 'var(--color-background)' background: 'var(--color-background)',
border: `1px solid var(--color-frame-border)`
}, },
header: { padding: '10px 15px', borderBottom: '0.5px solid var(--color-border)', margin: 0 } header: { padding: '10px 15px', borderBottom: '0.5px solid var(--color-border)', margin: 0 }
}} }}

View File

@ -35,7 +35,10 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
width="920px" width="920px"
transitionName="ant-move-down" transitionName="ant-move-down"
styles={{ styles={{
content: { padding: 0, border: '1px solid var(--color-border)' }, content: {
padding: 0,
border: `1px solid var(--color-frame-border)`
},
body: { height: '85vh' } body: { height: '85vh' }
}} }}
centered centered

View File

@ -22,11 +22,11 @@ const AntdProvider: FC<PropsWithChildren> = ({ children }) => {
components: { components: {
Segmented: { Segmented: {
trackBg: 'transparent', trackBg: 'transparent',
itemSelectedBg: isDarkTheme ? 'rgba(255, 255, 255, 0.05)' : 'rgba(0, 0, 0, 0.05)', itemSelectedBg: isDarkTheme ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)',
boxShadowTertiary: undefined, boxShadowTertiary: undefined,
borderRadiusLG: 12, borderRadiusLG: 6,
borderRadiusSM: 12, borderRadiusSM: 6,
borderRadiusXS: 12 borderRadiusXS: 6
}, },
Menu: { Menu: {
activeBarBorderWidth: 0, activeBarBorderWidth: 0,
@ -37,7 +37,8 @@ const AntdProvider: FC<PropsWithChildren> = ({ children }) => {
} }
}, },
token: { token: {
colorPrimary: '#00b96b' colorPrimary: '#00b96b',
borderRadius: 6
} }
}}> }}>
{children} {children}

View File

@ -253,7 +253,7 @@ const Tabs = styled(TabsAntd)`
} }
.ant-tabs-tab { .ant-tabs-tab {
margin: 0 !important; margin: 0 !important;
border-radius: 20px; border-radius: 7px;
margin-bottom: 5px !important; margin-bottom: 5px !important;
font-size: 13px; font-size: 13px;
justify-content: left; justify-content: left;

View File

@ -81,7 +81,7 @@ const Container = styled.div`
text-align: center; text-align: center;
gap: 10px; gap: 10px;
background-color: var(--color-background); background-color: var(--color-background);
border-radius: 15px; border-radius: 8px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
cursor: pointer; cursor: pointer;
@ -94,8 +94,8 @@ const Container = styled.div`
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
border-top-left-radius: 15px; border-top-left-radius: 8px;
border-top-right-radius: 15px; border-top-right-radius: 8px;
background: var(--color-background-soft); background: var(--color-background-soft);
transition: all 0.5s ease; transition: all 0.5s ease;
border-bottom: none; border-bottom: none;
@ -133,7 +133,7 @@ const CardInfo = styled.div`
align-items: center; align-items: center;
gap: 5px; gap: 5px;
transition: all 0.5s ease; transition: all 0.5s ease;
padding: 0 15px; padding: 0 8px;
width: 100%; width: 100%;
` `

View File

@ -187,7 +187,7 @@ const Assistants: FC<Props> = ({
suffix={<CommandKey>+K</CommandKey>} suffix={<CommandKey>+K</CommandKey>}
value={search} value={search}
onChange={(e) => setSearch(e.target.value)} onChange={(e) => setSearch(e.target.value)}
style={{ borderRadius: 16, borderWidth: 0.5 }} style={{ borderWidth: 0.5 }}
onKeyDown={onSearch} onKeyDown={onSearch}
ref={searchRef} ref={searchRef}
onFocus={() => dispatch(setSearching(true))} onFocus={() => dispatch(setSearching(true))}
@ -248,10 +248,10 @@ const AssistantItem = styled.div`
justify-content: space-between; justify-content: space-between;
padding: 7px 12px; padding: 7px 12px;
position: relative; position: relative;
border-radius: 17px;
margin: 0 10px; margin: 0 10px;
padding-right: 35px; padding-right: 35px;
font-family: Ubuntu; font-family: Ubuntu;
border-radius: 6px;
cursor: pointer; cursor: pointer;
.iconfont { .iconfont {
opacity: 0; opacity: 0;
@ -318,8 +318,8 @@ const TopicCount = styled.div`
` `
const SearchContainer = styled.div` const SearchContainer = styled.div`
margin: 0 10px; margin: 12px 10px;
margin-bottom: 10px; margin-top: 2px;
` `
const CommandKey = styled.div` const CommandKey = styled.div`

View File

@ -38,8 +38,6 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
const generating = useAppSelector((state) => state.runtime.generating) const generating = useAppSelector((state) => state.runtime.generating)
const { showTopicTime, topicPosition } = useSettings() const { showTopicTime, topicPosition } = useSettings()
const borderRadius = showTopicTime ? 12 : 17
const onDeleteTopic = useCallback( const onDeleteTopic = useCallback(
(topic: Topic) => { (topic: Topic) => {
if (generating) { if (generating) {
@ -192,10 +190,7 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
const isActive = topic.id === activeTopic?.id const isActive = topic.id === activeTopic?.id
return ( return (
<Dropdown menu={{ items: getTopicMenuItems(topic) }} trigger={['contextMenu']} key={topic.id}> <Dropdown menu={{ items: getTopicMenuItems(topic) }} trigger={['contextMenu']} key={topic.id}>
<TopicListItem <TopicListItem className={isActive ? 'active' : ''} onClick={() => onSwitchTopic(topic)}>
className={isActive ? 'active' : ''}
style={{ borderRadius }}
onClick={() => onSwitchTopic(topic)}>
<TopicName className="name">{topic.name.replace('`', '')}</TopicName> <TopicName className="name">{topic.name.replace('`', '')}</TopicName>
{showTopicTime && <TopicTime>{dayjs(topic.createdAt).format('MM/DD HH:mm')}</TopicTime>} {showTopicTime && <TopicTime>{dayjs(topic.createdAt).format('MM/DD HH:mm')}</TopicTime>}
{isActive && ( {isActive && (
@ -230,7 +225,7 @@ const Container = styled(Scrollbar)`
const TopicListItem = styled.div` const TopicListItem = styled.div`
padding: 7px 12px; padding: 7px 12px;
margin: 0 10px; margin: 0 10px;
border-radius: 17px; border-radius: 6px;
font-family: Ubuntu; font-family: Ubuntu;
font-size: 13px; font-size: 13px;
display: flex; display: flex;

View File

@ -24,7 +24,7 @@ const persistedReducer = persistReducer(
{ {
key: 'cherry-studio', key: 'cherry-studio',
storage, storage,
version: 42, version: 43,
blacklist: ['runtime'], blacklist: ['runtime'],
migrate migrate
}, },

View File

@ -693,6 +693,12 @@ const migrateConfig = {
'42': (state: RootState) => { '42': (state: RootState) => {
state.settings.proxyMode = state.settings.proxyUrl ? 'custom' : 'none' state.settings.proxyMode = state.settings.proxyUrl ? 'custom' : 'none'
return state return state
},
'43': (state: RootState) => {
if (state.settings.proxyMode === 'none') {
state.settings.proxyMode = 'system'
}
return state
} }
} }

View File

@ -41,7 +41,7 @@ const initialState: SettingsState = {
showTopics: true, showTopics: true,
sendMessageShortcut: 'Enter', sendMessageShortcut: 'Enter',
language: navigator.language as LanguageVarious, language: navigator.language as LanguageVarious,
proxyMode: 'none', proxyMode: 'system',
proxyUrl: undefined, proxyUrl: undefined,
userName: '', userName: '',
showMessageDivider: false, showMessageDivider: false,