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

Commit e4d897d

Browse files
committed
fix(video-page): content align center
1 parent 5b51b57 commit e4d897d

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

containers/VideoContent/index.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import SideCards from './SideCards'
2121

2222
import {
2323
Wrapper,
24+
InnerWrapper,
2425
MainWrapper,
26+
SidebarWrapper,
2527
ArticleWrapper,
2628
BodyHeaderWrapper,
2729
CommentsWrapper,
@@ -42,7 +44,7 @@ const VideoContentContainer = ({ videoContent }) => {
4244
return (
4345
<Wrapper>
4446
<Maybe test={viewingData.id}>
45-
<React.Fragment>
47+
<InnerWrapper>
4648
<MainWrapper>
4749
<ArticleWrapper>
4850
<BodyHeaderWrapper>
@@ -76,10 +78,12 @@ const VideoContentContainer = ({ videoContent }) => {
7678
<Comments />
7779
</CommentsWrapper>
7880
</MainWrapper>
79-
<Affix offsetTop={30}>
80-
<SideCards data={viewingData} />
81-
</Affix>
82-
</React.Fragment>
81+
<SidebarWrapper>
82+
<Affix offsetTop={30}>
83+
<SideCards data={viewingData} />
84+
</Affix>
85+
</SidebarWrapper>
86+
</InnerWrapper>
8387
</Maybe>
8488
</Wrapper>
8589
)

containers/VideoContent/styles/index.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,31 @@ import styled from 'styled-components'
33
import { theme, cs } from '@utils'
44

55
export const Wrapper = styled.article`
6-
${cs.flex()};
6+
${cs.flex('justify-center')};
77
padding: 20px;
88
min-height: 300px;
99
${cs.media.tablet`
1010
padding: 8px 0;
1111
`};
1212
`
13+
export const InnerWrapper = styled.div`
14+
${cs.flex()};
15+
width: 100%;
16+
max-width: ${cs.MAX_CONTENT_WIDTH};
17+
padding: 0 6vw;
18+
${cs.media.desktop`
19+
padding: 0 4vw;
20+
`};
21+
`
1322
export const MainWrapper = styled.div`
14-
width: 68%;
15-
margin-left: 2.5rem;
1623
${cs.media.tablet`
1724
width: 100%;
18-
margin-left: 0;
19-
`};
25+
`};
2026
`
27+
export const SidebarWrapper = styled.div``
28+
2129
export const ArticleWrapper = styled.div`
2230
font-size: 1.1rem;
23-
margin-left: 2vw;
2431
margin-right: 1.6vw;
2532
background: ${theme('preview.articleBg')};
2633
border-radius: 5px;

containers/VideosThread/index.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import TagsBar from '../TagsBar'
1919

2020
import {
2121
Wrapper,
22-
LeftPadding,
23-
RightPadding,
2422
LeftPart,
2523
RightPart,
2624
FilterWrapper,
@@ -59,7 +57,6 @@ const VideosThreadContainer = ({ videosThread }) => {
5957

6058
return (
6159
<Wrapper>
62-
<LeftPadding />
6360
<LeftPart>
6461
<Maybe test={showFilterBar}>
6562
<FilterWrapper>
@@ -101,7 +98,6 @@ const VideosThreadContainer = ({ videosThread }) => {
10198
</Affix>
10299
</React.Fragment>
103100
</RightPart>
104-
<RightPadding />
105101
</Wrapper>
106102
)
107103
}

containers/VideosThread/styles/index.js

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

55
export const Wrapper = styled.div`
66
${cs.flex()};
7-
max-width: 1400px;
7+
max-width: ${cs.MAX_CONTENT_WIDTH};
88
width: 100%;
99
`
10-
11-
export const LeftPadding = styled.div`
12-
width: 3vw;
13-
`
14-
export const RightPadding = styled.div`
15-
width: 4vw;
16-
`
1710
export const LeftPart = styled.div`
1811
flex-grow: 1;
1912
width: 100%;
2013
`
21-
2214
export const RightPart = styled.div`
23-
width: 20vw;
15+
min-width: 200px;
2416
margin-left: 30px;
17+
padding-top: 5px;
2518
${cs.media.tablet`display: none;`};
2619
`
2720

0 commit comments

Comments
 (0)