Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 47ee765

Browse files
authored
chore: adjust layout for about & global page (#1294)
1 parent 4771cd4 commit 47ee765

File tree

6 files changed

+42
-31
lines changed

6 files changed

+42
-31
lines changed

src/containers/thread/AboutThread/index.tsx

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@ import BasicStates from './BasicStates'
1414
import type { TStore } from './store'
1515
import Sidebar from './Sidebar'
1616

17-
import { Wrapper, MainWrapper, Block, BottomBlock, Title, Desc } from './styles'
17+
import {
18+
Wrapper,
19+
MainWrapper,
20+
StateBlock,
21+
IntroBlock,
22+
MemberBlock,
23+
Title,
24+
Desc,
25+
} from './styles'
1826
import { useInit } from './logic' /* eslint-disable-next-line */
1927

2028
// const log = buildLog('C:AboutThread')
@@ -33,24 +41,24 @@ const AboutThreadContainer: FC<TProps> = ({
3341
return (
3442
<Wrapper testid={testid}>
3543
<MainWrapper>
36-
<Block>
44+
<IntroBlock>
3745
<Title>社区简介</Title>
3846
<Desc>
3947
我注意到里面他说了一句话,是这个老兄说一会我们的大使也有问题要问您,也就是说这个节目里印度的大使是在场的。
4048
也就是说这个主持人所表达的意思,印度大使全听见了,并且是默许认可的。可以说也就是大使想说的话,也就是说这也代表了印度官方的态度。
4149
只是由一个主持人代为说了出来。这其实很有启发,就是说将来我们的驻美大使是不是也可以采取这样的套路,
4250
找一个懂媒体懂政治的学者在前面替自己怼人,自己默默坐在后面为学者的话背书。
4351
</Desc>
44-
</Block>
52+
</IntroBlock>
4553

46-
<Block>
54+
<StateBlock>
4755
<Title>社区概况</Title>
4856
<BasicStates />
49-
</Block>
57+
</StateBlock>
5058

51-
<BottomBlock>
59+
<MemberBlock>
5260
<Members />
53-
</BottomBlock>
61+
</MemberBlock>
5462
</MainWrapper>
5563
<Sidebar />
5664
</Wrapper>

src/containers/thread/AboutThread/styles/index.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,30 @@ export const Wrapper = styled.div.attrs(({ testid }: TTestable) => ({
1111
`
1212
export const MainWrapper = styled.div`
1313
width: auto;
14-
min-height: 500px;
14+
min-height: 550px;
1515
flex-grow: 1;
1616
1717
background: transparent;
1818
border-radius: 6px;
19-
margin-top: 12px;
19+
margin-top: 14px;
2020
padding-left: 25px;
2121
`
2222
export const Block = styled.div`
2323
margin-bottom: 30px;
2424
padding-bottom: 30px;
2525
border-bottom: 1px solid;
2626
border-bottom-color: ${theme('border')};
27-
width: 600px;
27+
width: 660px;
2828
`
29-
export const BottomBlock = styled(Block)`
29+
export const IntroBlock = styled(Block)`
30+
padding-right: 20px;
31+
`
32+
export const StateBlock = styled(Block)`
33+
padding-right: 10px;
34+
`
35+
export const MemberBlock = styled(Block)`
3036
border-bottom: none;
3137
`
32-
3338
export const Title = styled.div`
3439
font-size: 14px;
3540
color: ${theme('thread.articleDigest')};
@@ -39,5 +44,5 @@ export const Title = styled.div`
3944
export const Desc = styled.div`
4045
font-size: 14px;
4146
color: ${theme('thread.articleDigest')};
42-
line-height: 1.6;
47+
line-height: 1.8;
4348
`

src/containers/thread/AboutThread/styles/members/admin_member.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import AdminStarSVG from '@/icons/AdminStar'
66

77
export const Wrapper = styled.div`
88
${css.flex('align-start')};
9+
margin-bottom: 15px;
910
`
1011
export const AvatarWrapper = styled.div`
1112
position: relative;
1213
`
1314
export const Avatar = styled(Img)`
14-
${css.circle(46)};
15+
${css.circle(40)};
1516
margin-right: 10px;
1617
margin-bottom: 20px;
1718
border: 2px solid;
@@ -31,13 +32,18 @@ export const BadgeWrapper = styled.div`
3132
`
3233
export const Info = styled.div``
3334
export const Name = styled.div`
35+
${css.cutRest('140px')};
3436
color: ${theme('thread.articleTitle')};
3537
font-size: 14px;
38+
margin-bottom: 2px;
39+
font-weight: 600;
3640
`
3741
export const Bio = styled.div`
3842
color: ${theme('thread.articleDigest')};
3943
font-size: 12px;
40-
${css.cutRest('100px')};
44+
${css.lineClamp(2)};
45+
opacity: 0.8;
46+
padding-right: 22px;
4147
`
4248
export const BadgeIcon = styled(AdminStarSVG)`
4349
${css.size(10)};

src/containers/thread/AboutThread/styles/members/index.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,9 @@ export const Wrapper = styled.div.attrs(({ testid }: TTestable) => ({
1111
${css.flexColumn()};
1212
width: 100%;
1313
`
14-
export const MainWrapper = styled.div`
15-
flex-grow: 1;
16-
width: 100%;
17-
min-height: 500px;
18-
19-
background: transparent;
20-
border-radius: 6px;
21-
margin-top: 12px;
22-
padding-left: 25px;
23-
padding-right: 80px;
24-
margin-right: 65px;
25-
`
2614
export const Block = styled.div`
2715
margin-bottom: 30px;
28-
width: 600px;
16+
width: 665px;
2917
`
3018
export const BottomBlock = styled(Block)`
3119
border-top: 1px solid;
@@ -57,7 +45,7 @@ export const Row = styled.div`
5745
`
5846
export const Admin = styled.div`
5947
${css.flex('align-start')};
60-
width: 33%;
48+
width: 33.3%;
6149
`
6250
export const NormalAvatar = styled(AdminAvatar)`
6351
${css.circle(30)};

src/containers/tool/Drawer/styles/add_on/article_navi.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ export const LeftArrow = styled(ArrowSVG)`
4848
fill: ${theme('thread.extraInfo')};
4949
`
5050
export const RightSwitchBlock = styled(SwitchBlock)`
51-
left: 54vw;
51+
left: 785px;
52+
53+
${css.media.laptopL`
54+
left: 55vw;
55+
`};
5256
`
5357
export const RightArrow = styled(LeftArrow)`
5458
transform: rotate(180deg);

utils/css/metric.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const mediaBreakPoints = {
1616
// CONTENT: 内容宽度
1717
export const WIDTH = {
1818
COMMUNITY: {
19-
PAGE: '1600px',
19+
PAGE: '1580px',
2020
CONTENT: '1080px',
2121
CONTENT_OFFSET: '34px',
2222
LAPTOP_M_PADDING: '0',

0 commit comments

Comments
 (0)