p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'ui' of git.backyard.segmentfault.com:opensource/answer into ui

This commit is contained in:
shuai 2022-09-30 14:44:29 +08:00
parent a399bad059 2cf314f0c5
commit ea6b0614eb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/src/pages/Search/components/SearchItem/index.tsx
View File

@ -10,7 +10,6 @@ interface Props {
}
const Index: FC<Props> = ({ data }) => {
const { t } = useTranslation('translation', { keyPrefix: 'question' });
console.log('t: ', t);
if (!data?.object_type) {
return null;
}

16
ui/src/pages/Users/Settings/index.tsx
View File

@ -59,13 +59,21 @@ const Index: React.FC = () => {
return (
<>
<PageTitle title={t('settings', { keyPrefix: 'page_title' })} />
<Container style={{ paddingTop: '1.5rem', paddingBottom: '6rem' }}>
<h3 className="mb-4">{t('page_title', { keyPrefix: 'settings' })}</h3>
<Container className="mt-4 mb-5 pb-5">
<Row className="justify-content-center">
<Col xxl={10} md={12}>
<h3 className="mb-4">
{t('page_title', { keyPrefix: 'settings' })}
</h3>
</Col>
</Row>
<Row>
<Col md={2} className="mb-3">
<Col xxl={1} />
<Col md={3} lg={2} className="mb-3">
<Nav />
</Col>
<Col md={5}>
<Col md={9} lg={6}>
<Outlet />
</Col>
</Row>