Skip to content

Commit ccc9468

Browse files
authored
Merge pull request #423 from reactjs/sync-c9b99007
Sync with reactjs.org @ c9b9900
2 parents b88227f + 9b1762c commit ccc9468

File tree

8 files changed

+46
-13
lines changed

8 files changed

+46
-13
lines changed

content/docs/components-and-props.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ function Comment(props) {
233233

234234
[](codepen://components-and-props/extracting-components-continued)
235235

236-
Extrair componentes pode parecer um trabalho pesado no começo, mas ter uma paleta de componentes reutilizáveis compensa em aplicativos maiores. Uma boa regra é que se uma parte da sua UI for usada várias vezes (`Button`, `Panel`, `Avatar`) ou for complexa o suficiente por si só (`App`, `FeedStory`, `Comment`) é uma boa candidata a se tornar um componente reutilizável.
236+
Extrair componentes pode parecer um trabalho pesado no começo, mas ter uma paleta de componentes reutilizáveis compensa em aplicativos maiores. Uma boa regra é que se uma parte da sua UI for usada várias vezes (`Button`, `Panel`, `Avatar`) ou for complexa o suficiente por si só (`App`, `FeedStory`, `Comment`) é uma boa candidata a ser extraída para um componente separado.
237237

238238
## Props são Somente Leitura {#props-are-read-only}
239239

src/components/Container/Container.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const Container = ({children}: {children: Node}) => (
2222
paddingRight: 20,
2323
marginLeft: 'auto',
2424
marginRight: 'auto',
25-
2625
[media.greaterThan('medium')]: {
2726
width: '90%',
2827
},

src/components/LayoutHeader/Header.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,34 @@ const Header = ({location}: {location: Location}) => (
3333
display: 'none',
3434
},
3535
}}>
36+
<Container>
37+
<div
38+
css={{
39+
height: 60,
40+
fontSize: 20,
41+
padding: 20,
42+
textAlign: 'center',
43+
[media.between('small', 'large')]: {
44+
fontSize: 22,
45+
height: 60,
46+
},
47+
[media.lessThan('small')]: {
48+
height: 80,
49+
},
50+
[media.greaterThan('medium')]: {
51+
fontSize: 25,
52+
},
53+
}}>
54+
Black Lives Matter.{' '}
55+
<a
56+
style={{color: colors.brand}}
57+
target="_blank"
58+
rel="noopener"
59+
href="https://support.eji.org/give/153413/#!/donation/checkout">
60+
Support&nbsp;the&nbsp;Equal&nbsp;Justice&nbsp;Initiative.
61+
</a>
62+
</div>
63+
</Container>
3664
<Container>
3765
<div
3866
css={{

src/components/MarkdownHeader/MarkdownHeader.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ const MarkdownHeader = ({title}: {title: string}) => (
1515
css={{
1616
color: colors.dark,
1717
marginBottom: 0,
18-
marginTop: 40,
18+
marginTop: 100, // BLM
1919
...fonts.header,
2020

2121
[media.size('medium')]: {
22-
marginTop: 60,
22+
marginTop: 100, // BLM
2323
},
2424

2525
[media.greaterThan('large')]: {
26-
marginTop: 80,
26+
marginTop: 100, // BLM
2727
},
2828
}}>
2929
{title}

src/components/MarkdownPage/MarkdownPage.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ const MarkdownPage = ({
8484
<MarkdownHeader title={titlePrefix} />
8585

8686
{(date || hasAuthors) && (
87-
<div css={{marginTop: 15}}>
87+
<div
88+
css={{
89+
marginTop: 15,
90+
}}>
8891
{date}{' '}
8992
{hasAuthors && (
9093
<span>

src/components/StickyResponsiveSidebar/StickyResponsiveSidebar.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class StickyResponsiveSidebar extends Component<Props, State> {
4343
render() {
4444
const {open} = this.state;
4545
const smallScreenSidebarStyles = {
46-
top: 0,
46+
top: 60,
4747
left: 0,
4848
bottom: 0,
4949
right: 0,
@@ -117,18 +117,18 @@ class StickyResponsiveSidebar extends Component<Props, State> {
117117
transition: 'transform 0.5s ease',
118118
}}
119119
css={{
120-
marginTop: 60,
120+
marginTop: 80,
121121

122122
[media.size('xsmall')]: {
123-
marginTop: 40,
123+
marginTop: 60,
124124
},
125125

126126
[media.between('small', 'medium')]: {
127-
marginTop: 0,
127+
marginTop: 70,
128128
},
129129

130130
[media.between('medium', 'large')]: {
131-
marginTop: 50,
131+
marginTop: 70,
132132
},
133133

134134
[media.greaterThan('small')]: {

src/css/reset.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ html {
1313
body {
1414
overflow-x: hidden;
1515
position: relative;
16-
filter: grayscale(100%);
1716
}
1817

1918
* {

src/pages/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ class Home extends Component {
5353
title="React &ndash; Uma biblioteca JavaScript para criar interfaces de usuário"
5454
canonicalUrl={createCanonicalUrl('/')}
5555
/>
56-
<div css={{width: '100%'}}>
56+
<div
57+
css={{
58+
width: '100%',
59+
marginTop: 60, // BLM
60+
}}>
5761
<header
5862
css={{
5963
backgroundColor: colors.dark,

0 commit comments

Comments
 (0)