From c7dde3d237489c86afacc0df62e6b9b1055e023e Mon Sep 17 00:00:00 2001 From: Parker Bond Date: Wed, 3 Apr 2019 13:31:06 -0600 Subject: [PATCH 1/3] Add Chain React to conferences list (#1900) Chain React is a React Native focused conference put on yearly. This will be the 3rd year it has been held. --- content/community/conferences.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/content/community/conferences.md b/content/community/conferences.md index 833e44c40..0c94b6c2a 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -52,6 +52,11 @@ 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. @@ -59,6 +64,7 @@ August 22-23, 2019. Salt Lake City, USA. ### 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} From 2a1b08943c2c65bbf5a6a1e63777488833909f45 Mon Sep 17 00:00:00 2001 From: Camilo Giraldo Date: Wed, 3 Apr 2019 14:51:42 -0500 Subject: [PATCH 2/3] Fix 1640: Formatting for code blocks nested in blockquote (#1899) --- src/theme.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/theme.js b/src/theme.js index a4d445206..8d0c2735f 100644 --- a/src/theme.js +++ b/src/theme.js @@ -405,6 +405,10 @@ const sharedStyles = { marginTop: 0, }, }, + + '& .gatsby-highlight': { + marginLeft: 0, + }, }, '& .gatsby-highlight + blockquote': { From 8689c98ec304200c0ed0753a0e270f130f0fc694 Mon Sep 17 00:00:00 2001 From: Alessandro De Blasis Date: Sun, 7 Apr 2019 06:29:51 +0100 Subject: [PATCH 3/3] chore: resolving merge conflict Signed-off-by: Alessandro De Blasis --- content/community/conferences.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/content/community/conferences.md b/content/community/conferences.md index 0dfc4c5fe..0b889120d 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -52,16 +52,12 @@ June 21, 2019 Chicago, Illinois USA [Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop) -<<<<<<< HEAD -### React Rally 2019 {#react-rally-2019} -======= ### Chain React 2019 July 11-12, 2019. Portland, OR, USA. [Website](https://infinite.red/ChainReactConf) -### React Rally 2019 ->>>>>>> 2a1b08943c2c65bbf5a6a1e63777488833909f45 +### React Rally 2019 {#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/)