diff --git a/src/components/Layout/Footer.tsx b/src/components/Layout/Footer.tsx index 4c62cd27..677899ee 100644 --- a/src/components/Layout/Footer.tsx +++ b/src/components/Layout/Footer.tsx @@ -5,405 +5,355 @@ import * as React from 'react'; import NextLink from 'next/link'; import cn from 'classnames'; -import ButtonLink from 'components/ButtonLink'; import {ExternalLink} from 'components/ExternalLink'; import {IconFacebookCircle} from 'components/Icon/IconFacebookCircle'; import {IconTwitter} from 'components/Icon/IconTwitter'; import {IconGitHub} from 'components/Icon/IconGitHub'; -import {IconNavArrow} from 'components/Icon/IconNavArrow'; -interface FooterProps { - hideSurvey?: boolean; - hideBorder?: boolean; -} - -export function Footer({hideSurvey = false, hideBorder = false}: FooterProps) { +export function Footer() { const socialLinkClasses = 'hover:text-primary dark:text-primary-dark'; return ( - <> -
- {!hideSurvey && ( -
-
-
-

- How do you like these docs? -

-
- - Take our survey! - - -
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
- )} - {!hideBorder && ( -
- )} -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+ -
- ©{new Date().getFullYear()} -
-
-
- - Learn React - - Quick Start - Installation - - Describing the UI - - - Adding Interactivity - - - Managing State - - - Escape Hatches - -
-
- - API Reference - - React APIs - - React DOM APIs - -
-
- - Community - - - Code of Conduct - - Meet the Team - - Docs Contributors - - - Acknowledgements - -
-
- More - Blog - - React Native - - - Privacy - - - Terms - -
- - - - - - - - - -
-
+
+ ©{new Date().getFullYear()} +
+
+
+ + Learn React + + Quick Start + Installation + + Describing the UI + + + Adding Interactivity + + Managing State + Escape Hatches +
+
+ + API Reference + + React APIs + React DOM APIs +
+
+ + Community + + + Code of Conduct + + Meet the Team + + Docs Contributors + + + Acknowledgements + +
+
+ More + Blog + React Native + + Privacy + + + Terms + +
+ + + + + + + + +
-
+
- + ); } diff --git a/src/components/Layout/Page.tsx b/src/components/Layout/Page.tsx index 8779f149..548d27ba 100644 --- a/src/components/Layout/Page.tsx +++ b/src/components/Layout/Page.tsx @@ -11,6 +11,8 @@ import {Toc} from './Toc'; import SocialBanner from '../SocialBanner'; import {DocsPageFooter} from 'components/DocsFooter'; import {Seo} from 'components/Seo'; +import ButtonLink from 'components/ButtonLink'; +import {IconNavArrow} from 'components/Icon/IconNavArrow'; import PageHeading from 'components/PageHeading'; import {getRouteMeta} from './getRouteMeta'; import {TocContext} from '../MDX/TocContext'; @@ -67,11 +69,11 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) { )}> {children}
- + />}
); @@ -80,10 +82,12 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) { let hasColumns = true; let showSidebar = true; let showToc = true; + let showSurvey = true; if (isHomePage || isBlogIndex) { hasColumns = false; showSidebar = false; showToc = false; + showSurvey = false; } else if (section === 'blog') { showToc = false; hasColumns = false; @@ -125,10 +129,50 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
{content}
-