Skip to content

Sync with reactjs.org @ c9b99007 #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/erbium
12.16.1
2 changes: 1 addition & 1 deletion content/docs/components-and-props.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ function Comment(props) {

[CodePen에서 시험해보기](codepen://components-and-props/extracting-components-continued)

처음에는 컴포넌트를 추출하는 작업이 지루해 보일 수 있습니다. 하지만 재사용 가능한 컴포넌트를 만들어 놓는 것은 더 큰 앱에서 작업할 때 두각을 나타냅니다. UI 일부가 여러 번 사용되거나 (`Button`, `Panel`, `Avatar`), UI 일부가 자체적으로 복잡한 (`App`, `FeedStory`, `Comment`) 경우에는 재사용 가능한 컴포넌트로 만드는 것이 좋습니다.
처음에는 컴포넌트를 추출하는 작업이 지루해 보일 수 있습니다. 하지만 재사용 가능한 컴포넌트를 만들어 놓는 것은 더 큰 앱에서 작업할 때 두각을 나타냅니다. UI 일부가 여러 번 사용되거나 (`Button`, `Panel`, `Avatar`), UI 일부가 자체적으로 복잡한 (`App`, `FeedStory`, `Comment`) 경우에는 별도의 컴포넌트로 만드는 좋습니다.

## props는 읽기 전용입니다. {#props-are-read-only}

Expand Down
1 change: 0 additions & 1 deletion src/components/Container/Container.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const Container = ({children}: {children: Node}) => (
paddingRight: 20,
marginLeft: 'auto',
marginRight: 'auto',

[media.greaterThan('medium')]: {
width: '90%',
},
Expand Down
28 changes: 28 additions & 0 deletions src/components/LayoutHeader/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,34 @@ const Header = ({location}: {location: Location}) => (
display: 'none',
},
}}>
<Container>
<div
css={{
height: 60,
fontSize: 20,
padding: 20,
textAlign: 'center',
[media.between('small', 'large')]: {
fontSize: 22,
height: 60,
},
[media.lessThan('small')]: {
height: 80,
},
[media.greaterThan('medium')]: {
fontSize: 25,
},
}}>
Black Lives Matter.{' '}
<a
style={{color: colors.brand}}
target="_blank"
rel="noopener"
href="https://support.eji.org/give/153413/#!/donation/checkout">
Support&nbsp;the&nbsp;Equal&nbsp;Justice&nbsp;Initiative.
</a>
</div>
</Container>
<Container>
<div
css={{
Expand Down
6 changes: 3 additions & 3 deletions src/components/MarkdownHeader/MarkdownHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ const MarkdownHeader = ({title}: {title: string}) => (
css={{
color: colors.dark,
marginBottom: 0,
marginTop: 40,
marginTop: 100, // BLM
...fonts.header,

[media.size('medium')]: {
marginTop: 60,
marginTop: 100, // BLM
},

[media.greaterThan('large')]: {
marginTop: 80,
marginTop: 100, // BLM
},
}}>
{title}
Expand Down
5 changes: 4 additions & 1 deletion src/components/MarkdownPage/MarkdownPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ const MarkdownPage = ({
<MarkdownHeader title={titlePrefix} />

{(date || hasAuthors) && (
<div css={{marginTop: 15}}>
<div
css={{
marginTop: 15,
}}>
{date}{' '}
{hasAuthors && (
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class StickyResponsiveSidebar extends Component<Props, State> {
render() {
const {open} = this.state;
const smallScreenSidebarStyles = {
top: 0,
top: 60,
left: 0,
bottom: 0,
right: 0,
Expand Down Expand Up @@ -117,18 +117,18 @@ class StickyResponsiveSidebar extends Component<Props, State> {
transition: 'transform 0.5s ease',
}}
css={{
marginTop: 60,
marginTop: 80,

[media.size('xsmall')]: {
marginTop: 40,
marginTop: 60,
},

[media.between('small', 'medium')]: {
marginTop: 0,
marginTop: 70,
},

[media.between('medium', 'large')]: {
marginTop: 50,
marginTop: 70,
},

[media.greaterThan('small')]: {
Expand Down
1 change: 0 additions & 1 deletion src/css/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ html {
body {
overflow-x: hidden;
position: relative;
filter: grayscale(100%);
}

* {
Expand Down
6 changes: 5 additions & 1 deletion src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ class Home extends Component {
title="React &ndash; 사용자 인터페이스를 만들기 위한 JavaScript 라이브러리"
canonicalUrl={createCanonicalUrl('/')}
/>
<div css={{width: '100%'}}>
<div
css={{
width: '100%',
marginTop: 60, // BLM
}}>
<header
css={{
backgroundColor: colors.dark,
Expand Down