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

Commit 4a57083

Browse files
mydearxymmydearxym
committed
chore: Merge branch 'dev'
2 parents 666b629 + 9850aee commit 4a57083

File tree

31 files changed

+197
-193
lines changed

31 files changed

+197
-193
lines changed

‎components/BuyMeChuanChuan/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ const log = buildLog('c:Footer:index')
3737
const BuyMeChuanChuan = ({ show, accountInfo, onClose, onLogin, onPay }) => {
3838
const [activeChuan, setActiveChuan] = useState(1)
3939

40-
log('fromUser: ', accountInfo)
4140
return (
4241
<Modal width="700px" show={show} showCloseBtn onClose={onClose}>
4342
<Wrapper>

‎components/Navigator/styles/brief_view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const CardWrapper = styled.div`
1717
border: 1px solid;
1818
border-color: ${theme('header.cardBorder')};
1919
z-index: 1000;
20-
top: 4px;
20+
top: 14px;
2121
`
2222
export const CommunityWrapper = styled.div`
2323
${cs.flex('align-both')};

‎components/Navigator/styles/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import CommunityFaceLogo from '@components/CommunityFaceLogo'
77
export const Breadcrumbs = styled.div`
88
${cs.flex('align-center')};
99
max-width: 520px;
10-
margin-left: 3vw;
1110
height: 100%;
1211
${cs.media.mobile`
1312
margin-right: 0;

‎containers/ArticleBanner/index.js‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import TimeAgo from 'timeago-react'
1111

1212
import { connectStore, buildLog } from '@utils'
1313

14+
import FavoritesCats from '@containers/FavoritesCats'
1415
import DotDivider from '@components/DotDivider'
1516
import Maybe from '@components/Maybe'
1617
import { Space } from '@components/BaseStyled'
17-
import FavoritesCats from '../FavoritesCats'
1818

1919
import Title from './Title'
2020
import ReactionNumbers from './ReactionNumbers'
2121
import MiddleInfo from './MiddleInfo'
2222

23-
import { Wrapper, BannerContent, Brief, Desc } from './styles'
23+
import { Wrapper, InnerWrapper, BannerContent, Brief, Desc } from './styles'
2424
import { useInit } from './logic'
2525

2626
/* eslint-disable-next-line */
@@ -45,41 +45,43 @@ const ArticleBannerContainer = ({
4545
<Wrapper>
4646
<FavoritesCats />
4747
{!R.isNil(viewingData.id) && (
48-
<BannerContent>
49-
<Brief>
50-
<Title thread={activeThread} data={viewingData} />
51-
<MiddleInfo thread={activeThread} data={viewingData} />
52-
<Desc>
53-
发布于:
54-
<Space left="3px" right="3px" />
55-
<TimeAgo datetime={viewingData.insertedAt} locale="zh_CN" />
56-
<Maybe test={showWordCount}>
57-
<React.Fragment>
58-
<DotDivider />
59-
字数: {viewingData.length}
60-
</React.Fragment>
61-
</Maybe>
62-
<Maybe test={showLastSync}>
63-
<React.Fragment>
64-
<DotDivider />
65-
最后同步:
66-
<Space left="3px" right="3px" />
67-
{viewingData.lastSync ? (
68-
<TimeAgo datetime={viewingData.lastSync} locale="zh_CN" />
69-
) : (
70-
<span>--</span>
71-
)}
72-
</React.Fragment>
73-
</Maybe>
74-
</Desc>
75-
</Brief>
76-
<ReactionNumbers
77-
data={viewingData}
78-
starLoading={starLoading}
79-
favoriteLoading={favoriteLoading}
80-
showStar={showStar}
81-
/>
82-
</BannerContent>
48+
<InnerWrapper>
49+
<BannerContent>
50+
<Brief>
51+
<Title thread={activeThread} data={viewingData} />
52+
<MiddleInfo thread={activeThread} data={viewingData} />
53+
<Desc>
54+
发布于:
55+
<Space left="3px" right="3px" />
56+
<TimeAgo datetime={viewingData.insertedAt} locale="zh_CN" />
57+
<Maybe test={showWordCount}>
58+
<React.Fragment>
59+
<DotDivider />
60+
字数: {viewingData.length}
61+
</React.Fragment>
62+
</Maybe>
63+
<Maybe test={showLastSync}>
64+
<React.Fragment>
65+
<DotDivider />
66+
最后同步:
67+
<Space left="3px" right="3px" />
68+
{viewingData.lastSync ? (
69+
<TimeAgo datetime={viewingData.lastSync} locale="zh_CN" />
70+
) : (
71+
<span>--</span>
72+
)}
73+
</React.Fragment>
74+
</Maybe>
75+
</Desc>
76+
</Brief>
77+
<ReactionNumbers
78+
data={viewingData}
79+
starLoading={starLoading}
80+
favoriteLoading={favoriteLoading}
81+
showStar={showStar}
82+
/>
83+
</BannerContent>
84+
</InnerWrapper>
8385
)}
8486
</Wrapper>
8587
)

‎containers/ArticleBanner/styles/index.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { theme, cs } from '@utils'
44

55
export const Wrapper = styled.nav`
66
${cs.flexColumn('justify-center')};
7-
87
position: relative;
98
background: ${theme('banner.bg')};
109
border-bottom: ${theme('banner.spliter')};
@@ -16,14 +15,19 @@ export const Wrapper = styled.nav`
1615
min-height: 100px;
1716
`};
1817
`
18+
export const InnerWrapper = styled.div`
19+
${cs.flex('justify-center')};
20+
width: 100%;
21+
`
1922
export const BannerContent = styled.div`
2023
${cs.flex()};
21-
margin-left: 8%;
22-
margin-right: 8%;
24+
max-width: ${cs.MAX_CONTENT_WIDTH};
25+
width: 100%;
26+
padding: 0 6vw;
2327
2428
${cs.media.mobile`
25-
margin-left: 4%;
26-
margin-right: 3%;
29+
padding: 0;
30+
padding-right: 10px;
2731
`};
2832
`
2933
export const Brief = styled.div`

‎containers/CommunityBanner/styles/digest_view.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ export const Wrapper = styled(BaseBanner)`
1111
min-height: 125px;
1212
`
1313
export const InnerWrapper = styled.div`
14-
max-width: ${cs.MEDIA_MAX_WIDTH};
14+
${cs.flex('justify-center')};
1515
width: 100%;
16+
max-width: ${cs.MAX_CONTENT_WIDTH};
1617
`
1718
export const BaseBannerContent = styled.div`
1819
${cs.flex('align-center')};
20+
width: 100%;
21+
padding: 0 6vw;
1922
20-
margin-left: 8%;
21-
margin-right: 7%;
2223
margin-top: -2rem;
24+
2325
${cs.media.mobile`
2426
margin-left: 0;
2527
margin-right: 3%;

‎containers/CommunityBanner/styles/index.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { theme, cs } from '@utils'
44

55
export const BaseBanner = styled.nav`
66
${cs.flexColumn('justify-center')};
7-
align-items: center;
8-
97
position: relative;
8+
9+
align-items: center;
1010
min-height: 140px;
1111
background: ${theme('banner.bg')};
1212
border-bottom: 1px solid;
@@ -24,6 +24,7 @@ export const BaseTabber = styled.div`
2424
width: 80vw;
2525
overflow-x: auto;
2626
overflow-y: hidden;
27+
2728
${cs.media.tablet`
2829
left: 10px;
2930
width: 100%;

‎containers/CommunityContent/index.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import JobsThread from '@containers/JobsThread'
1717
import UsersThread from '@containers/UsersThread'
1818
import CheatsheetThread from '@containers/CheatsheetThread'
1919

20-
import { Wrapper } from './styles'
20+
import { Wrapper, InnerWrapper } from './styles'
2121
import { useInit } from './logic'
2222

2323
/* eslint-disable-next-line */
@@ -56,7 +56,9 @@ const CommunityContentContainer = ({ communityContent }) => {
5656

5757
return (
5858
<Wrapper testid="community-content">
59-
<ComunityContent curRoute={curRoute} />
59+
<InnerWrapper>
60+
<ComunityContent curRoute={curRoute} />
61+
</InnerWrapper>
6062
</Wrapper>
6163
)
6264
}

‎containers/CommunityContent/styles/index.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,21 @@ export const Wrapper = styled.div.attrs(props => ({
1616
border: 1px solid;
1717
border-color: ${theme('content.border')};
1818
border-radius: 6px;
19-
padding: 1em;
19+
padding: 1em 0;
20+
2021
${cs.media.tablet`
21-
width: 100%;
22-
margin: 0;
22+
width: 100%;
23+
margin: 0;
2324
margin-top: 10px;
2425
padding: .6em;
2526
padding-right: 0;
2627
`};
2728
`
28-
29-
export const holder = 1
29+
export const InnerWrapper = styled.div`
30+
width: 100%;
31+
max-width: ${cs.MAX_CONTENT_WIDTH};
32+
padding: 0 5vw;
33+
${cs.media.desktop`
34+
padding: 0 3vw;
35+
`};
36+
`

‎containers/Header/styles/header.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ export const Wrapper = styled.header.attrs(props => ({
1616
`
1717
export const InnerWrapper = styled.div`
1818
${cs.flex()};
19-
max-width: ${cs.MEDIA_MAX_WIDTH};
19+
max-width: ${cs.MAX_CONTENT_WIDTH};
20+
padding: 0 6vw;
2021
width: 100%;
2122
height: 33px;
2223
align-items: center;
23-
padding: 0 5vw;
2424
transition: all 0.2s;
2525
2626
${cs.media.mobile`padding-right: 0`};

0 commit comments

Comments
 (0)