From abb8586cebc39d0ef052b5b3c43a43b4b4ec70ae Mon Sep 17 00:00:00 2001 From: Amberley Romo Date: Tue, 6 Nov 2018 20:15:23 -0600 Subject: [PATCH 1/4] change banner text to promote webinar --- www/src/components/banner.js | 22 ++++++++++++---------- www/src/components/layout.js | 22 ++++++---------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/www/src/components/banner.js b/www/src/components/banner.js index b8b8dd8ca6371..17a9489d942ad 100644 --- a/www/src/components/banner.js +++ b/www/src/components/banner.js @@ -56,16 +56,18 @@ const Banner = ({ children, background }) => ( {children} ) : ( - These are the docs for v2. - {` `} - - View the v1 docs - - {` `} - instead - - - . + + Register now + + {` for 'Rise of the Content Mesh: Webcast with Contentful and Gatsby'.`} )} diff --git a/www/src/components/layout.js b/www/src/components/layout.js index beff9ecfb47b4..ad755faf2ed1b 100644 --- a/www/src/components/layout.js +++ b/www/src/components/layout.js @@ -150,28 +150,18 @@ class DefaultLayout extends React.Component { Skip to main content - These are the docs for v2. - {` `} - View the v1 docs - - {` `} - instead - + Register now - . + {` for 'Rise of the Content Mesh: Webcast with Contentful and Gatsby'.`}
Date: Tue, 6 Nov 2018 20:19:50 -0600 Subject: [PATCH 2/4] add link to v1 docs in migration guide --- docs/docs/migrating-from-v1-to-v2.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/docs/migrating-from-v1-to-v2.md b/docs/docs/migrating-from-v1-to-v2.md index 1fe177159a31e..546a34a6cc17c 100644 --- a/docs/docs/migrating-from-v1-to-v2.md +++ b/docs/docs/migrating-from-v1-to-v2.md @@ -2,6 +2,8 @@ title: Migrating from v1 to v2 --- +Looking for the v1 docs? [Find them here](https://v1.gatsbyjs.org/). + > This document is a work in progress. Have you upgraded your site and run into something that's not covered here? [Add your changes on GitHub](https://github.com/gatsbyjs/gatsby/edit/master/docs/docs/migrating-from-v1-to-v2.md)! ## Introduction From 36363cf5c4b176c337baf03ab62e924580251e01 Mon Sep 17 00:00:00 2001 From: Florian Kissling Date: Wed, 7 Nov 2018 12:36:54 +0100 Subject: [PATCH 3/4] Fix quotation marks --- www/src/components/banner.js | 2 +- www/src/components/layout.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/src/components/banner.js b/www/src/components/banner.js index 17a9489d942ad..25f2e48065d3d 100644 --- a/www/src/components/banner.js +++ b/www/src/components/banner.js @@ -67,7 +67,7 @@ const Banner = ({ children, background }) => ( > Register now - {` for 'Rise of the Content Mesh: Webcast with Contentful and Gatsby'.`} + {` for “Rise of the Content Mesh: Webcast with Contentful and Gatsby”.`} )} diff --git a/www/src/components/layout.js b/www/src/components/layout.js index ad755faf2ed1b..463c5dd90bc5c 100644 --- a/www/src/components/layout.js +++ b/www/src/components/layout.js @@ -161,7 +161,7 @@ class DefaultLayout extends React.Component { > Register now - {` for 'Rise of the Content Mesh: Webcast with Contentful and Gatsby'.`} + {` for “Rise of the Content Mesh: Webcast with Contentful and Gatsby”.`}
Date: Wed, 7 Nov 2018 12:55:09 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Rm=20=E2=80=9Efallback=E2=80=9C=20banner=20?= =?UTF-8?q?content,=20mark=20prop=20as=20required?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/src/components/banner.js | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/www/src/components/banner.js b/www/src/components/banner.js index 25f2e48065d3d..fb06c1029233f 100644 --- a/www/src/components/banner.js +++ b/www/src/components/banner.js @@ -51,31 +51,12 @@ const Link = styled(`a`)` const Banner = ({ children, background }) => ( - - {children ? ( - {children} - ) : ( - - - Register now - - {` for “Rise of the Content Mesh: Webcast with Contentful and Gatsby”.`} - - )} - + {children && {children}} ) Banner.propTypes = { - children: PropTypes.node, + children: PropTypes.node.isRequired, background: PropTypes.any, }