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

Commit 60c853b

Browse files
committed
refactor(media-query): video page done right
1 parent d33441d commit 60c853b

File tree

4 files changed

+48
-2
lines changed

4 files changed

+48
-2
lines changed

components/VideoInfoCard/styles/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ export const Wrapper = styled.div`
99
background: ${theme('preview.articleBg')};
1010
min-height: 120px;
1111
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
12+
${cs.media.mobile`
13+
padding: 10px 0;
14+
box-shadow: none;
15+
`};
1216
`
1317
export const BaseInfo = styled.div`
1418
${cs.flexColumnGrow()};
@@ -29,6 +33,9 @@ export const Footer = styled.div`
2933
`
3034
export const OriginAuthor = styled.div`
3135
font-size: 1rem;
36+
${cs.media.mobile`
37+
font-size: 0.9rem;
38+
`};
3239
`
3340
export const OriginAuthorLink = styled.a`
3441
color: ${theme('thread.articleDigest')};
@@ -44,6 +51,9 @@ export const OriginAuthorLink = styled.a`
4451
`
4552
export const PublishTime = styled.div`
4653
font-size: 1rem;
54+
${cs.media.mobile`
55+
font-size: 0.9rem;
56+
`};
4757
`
4858
export const OtherInfo = styled.div`
4959
${cs.flexColumn('justify-between')};

containers/VideoContent/index.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import VideoInfoCard from 'components/VideoInfoCard'
1717
import ArticleBodyHeader from 'containers/ArticleBodyHeader'
1818
import Comments from 'containers/Comments'
1919

20+
import ArticleAuthorCard from 'containers/ArticleAuthorCard'
21+
import ContentSourceCard from 'components/ContentSourceCard'
2022
import SideCards from './SideCards'
2123

2224
import {
@@ -25,6 +27,7 @@ import {
2527
ArticleWrapper,
2628
BodyHeaderWrapper,
2729
CommentsWrapper,
30+
MobileWrapper,
2831
} from './styles'
2932

3033
import * as logic from './logic'
@@ -71,6 +74,15 @@ class VideoContentContainer extends React.Component {
7174
<VideoInfoCard data={viewingData} />
7275
</Maybe>
7376
</ArticleWrapper>
77+
78+
<MobileWrapper>
79+
<ArticleAuthorCard
80+
user={viewingData.author}
81+
introTitle="发布者"
82+
/>
83+
<ContentSourceCard data={viewingData} />
84+
</MobileWrapper>
85+
7486
<CommentsWrapper>
7587
<Comments />
7688
</CommentsWrapper>

containers/VideoContent/styles/index.js

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@ export const Wrapper = styled.article`
66
${cs.flex()};
77
padding: 20px;
88
min-height: 300px;
9+
${cs.media.mobile`
10+
padding: 8px 0;
11+
`};
912
`
1013
export const MainWrapper = styled.div`
1114
width: 68%;
1215
margin-left: 2.5rem;
16+
${cs.media.mobile`
17+
width: 100%;
18+
margin-left: 0;
19+
`};
1320
`
14-
// padding: 35px 40px;
15-
1621
export const ArticleWrapper = styled.div`
1722
font-size: 1.1rem;
1823
margin-left: 2vw;
@@ -22,6 +27,9 @@ export const ArticleWrapper = styled.div`
2227
padding-top: 30px;
2328
min-height: 40vh;
2429
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
30+
${cs.media.mobile`
31+
padding: 30px 20px;
32+
`};
2533
`
2634
export const BodyHeaderWrapper = styled.div`
2735
margin-top: -18px;
@@ -32,4 +40,18 @@ export const BodyHeaderWrapper = styled.div`
3240
export const CommentsWrapper = styled.div`
3341
margin-top: 30px;
3442
margin: 25px;
43+
${cs.media.mobile`
44+
margin: 10px;
45+
`};
46+
`
47+
48+
export const MobileWrapper = styled.div`
49+
${cs.flex()};
50+
margin-top: 15px;
51+
width: 100%;
52+
display: none;
53+
54+
${cs.media.mobile`
55+
display: flex;
56+
`};
3557
`

containers/VideoContent/styles/side_cards.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import { cs } from 'utils'
66
export const Wrapper = styled.div`
77
${cs.flexColumn()};
88
width: 90%;
9+
${cs.media.mobile`display: none`};
910
`
11+
1012
export const ReportWrapper = styled.div`
1113
padding: 0 10px;
1214
`

0 commit comments

Comments
 (0)