Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/reactjs/reactjs.org into …
Browse files Browse the repository at this point in the history
…sync-2a1b0894
  • Loading branch information
reactjs-translation-bot committed Apr 5, 2019
2 parents 0ff7909 + 2a1b089 commit 6e66844
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
6 changes: 6 additions & 0 deletions content/community/conferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,19 @@ June 21, 2019 Chicago, Illinois USA

[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)

### Chain React 2019
July 11-12, 2019. Portland, OR, USA.

[Website](https://infinite.red/ChainReactConf)

### React Rally 2019
August 22-23, 2019. Salt Lake City, USA.

[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)

### ComponentsConf 2019 {#componentsconf-2019}
September 6, 2019 in Melbourne, Australia

[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)

### React Native EU 2019 {#react-native-eu-2019}
Expand Down
4 changes: 4 additions & 0 deletions src/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,10 @@ const sharedStyles = {
marginTop: 0,
},
},

'& .gatsby-highlight': {
marginLeft: 0,
},
},

'& .gatsby-highlight + blockquote': {
Expand Down

0 comments on commit 6e66844

Please sign in to comment.