From 151ca979f031aef5011817a68c00f724245ec2da Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Fri, 25 Oct 2019 13:39:15 +0700
Subject: [PATCH 1/4] feat(v2): display footer in docs page

---
 CHANGELOG-2.x.md                                     |  1 +
 .../src/theme/Layout/index.js                        | 12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index a90659abeaf8..1b2792557ebe 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -7,6 +7,7 @@
 - Default PostCSS loader now only polyfills stage 3+ features (previously it was stage 2) like Create React App. Stage 2 CSS is considered relatively unstable and subject to change while Stage 3 features will likely become a standard. 
 - Fix search bar focus bug. When you put the focus on search input, previously the focus will remain although we have clicked to other area outside of the search input.
 - New themeConfig option `sidebarCollapsible`. It is on by default. If explicitly set to `false`, all doc items in sidebar is expanded. Otherwise, it will still be a collapsible sidebar.
+- Footer is now also displayed in docs page for consistency.
 
 ## 2.0.0-alpha.30
 
diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.js b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
index 5c8e6abc3078..d7867dbd4184 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
@@ -23,15 +23,7 @@ function Layout(props) {
     themeConfig: {image: defaultImage},
     url: siteUrl,
   } = siteConfig;
-  const {
-    children,
-    title,
-    noFooter,
-    description,
-    image,
-    keywords,
-    permalink,
-  } = props;
+  const {children, title, description, image, keywords, permalink} = props;
   const metaTitle = title || `${defaultTitle} · ${tagline}`;
   const metaImage = image || defaultImage;
   const metaImageUrl = siteUrl + useBaseUrl(metaImage);
@@ -62,7 +54,7 @@ function Layout(props) {
       </Head>
       <Navbar />
       <main className="main">{children}</main>
-      {!noFooter && <Footer />}
+      <Footer />
     </React.Fragment>
   );
 }

From cba8a3461bee59159a743dd59a51d4470696d900 Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Fri, 25 Oct 2019 13:41:45 +0700
Subject: [PATCH 2/4] nits

---
 CHANGELOG-2.x.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 1b2792557ebe..fd17256c2061 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -2,12 +2,12 @@
 
 ## Unreleased
 
-- Footer is now sticky/ pinned to the bottom of the viewport in desktop browsers.
+- Footer is now sticky/ pinned to the bottom of the viewport in desktop browsers. 
+- Footer is now also displayed in docs page for consistency.
 - Remove empty doc sidebar container if sidebar for a particular doc page does not exist. Otherwise, it will cause an additional empty space.
 - Default PostCSS loader now only polyfills stage 3+ features (previously it was stage 2) like Create React App. Stage 2 CSS is considered relatively unstable and subject to change while Stage 3 features will likely become a standard. 
 - Fix search bar focus bug. When you put the focus on search input, previously the focus will remain although we have clicked to other area outside of the search input.
 - New themeConfig option `sidebarCollapsible`. It is on by default. If explicitly set to `false`, all doc items in sidebar is expanded. Otherwise, it will still be a collapsible sidebar.
-- Footer is now also displayed in docs page for consistency.
 
 ## 2.0.0-alpha.30
 

From 5df9209804ff2cdf8878cf5c615d20b357a5d2fe Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Fri, 25 Oct 2019 14:03:51 +0700
Subject: [PATCH 3/4] address review

---
 packages/docusaurus-theme-classic/src/theme/DocPage/index.js | 2 +-
 packages/docusaurus-theme-classic/src/theme/Layout/index.js  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/index.js b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
index 85f9b0dc3e1c..635ec18cc254 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
@@ -24,7 +24,7 @@ function DocPage(props) {
   const {sidebarCollapsible = true} = themeConfig;
 
   return (
-    <Layout noFooter>
+    <Layout>
       <div className={styles.docPage}>
         {sidebar && (
           <div className={styles.docSidebarContainer}>
diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.js b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
index d7867dbd4184..108d18341c18 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
@@ -20,6 +20,7 @@ function Layout(props) {
     favicon,
     tagline,
     title: defaultTitle,
+    noFooter,
     themeConfig: {image: defaultImage},
     url: siteUrl,
   } = siteConfig;
@@ -54,7 +55,7 @@ function Layout(props) {
       </Head>
       <Navbar />
       <main className="main">{children}</main>
-      <Footer />
+      {!noFooter && <Footer />}
     </React.Fragment>
   );
 }

From ba55e17815fcc47d0d6f7ff7b7113a356bf921c6 Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Fri, 25 Oct 2019 14:07:11 +0700
Subject: [PATCH 4/4] nits

---
 .../src/theme/Layout/index.js                         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.js b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
index 108d18341c18..5c8e6abc3078 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
@@ -20,11 +20,18 @@ function Layout(props) {
     favicon,
     tagline,
     title: defaultTitle,
-    noFooter,
     themeConfig: {image: defaultImage},
     url: siteUrl,
   } = siteConfig;
-  const {children, title, description, image, keywords, permalink} = props;
+  const {
+    children,
+    title,
+    noFooter,
+    description,
+    image,
+    keywords,
+    permalink,
+  } = props;
   const metaTitle = title || `${defaultTitle} · ${tagline}`;
   const metaImage = image || defaultImage;
   const metaImageUrl = siteUrl + useBaseUrl(metaImage);