From 9d679a594c9ff19c267f885417f8222f137eedb3 Mon Sep 17 00:00:00 2001 From: Nisar Hassan Naqvi Date: Wed, 18 Nov 2020 12:47:57 +0000 Subject: [PATCH] wip. --- src/components/MinimalFooter.tsx | 41 +++++++++++ src/components/Nav.tsx | 121 ++++++++++++++++--------------- src/layouts/index.tsx | 9 ++- src/pages/deletion.tsx | 10 +++ src/styles/variables.ts | 3 +- 5 files changed, 122 insertions(+), 62 deletions(-) create mode 100644 src/components/MinimalFooter.tsx create mode 100644 src/pages/deletion.tsx diff --git a/src/components/MinimalFooter.tsx b/src/components/MinimalFooter.tsx new file mode 100644 index 000000000..ac79751fd --- /dev/null +++ b/src/components/MinimalFooter.tsx @@ -0,0 +1,41 @@ +import React from 'react' + +import styled from '@emotion/styled' +import { Link } from 'gatsby' +import { colors } from '../styles/variables' + +const StyledMinimalFooter = styled.footer` + padding: 5rem 0 6rem; + text-align: center; + color: ${colors.lightGrey}; + background: ${colors.offWhite}; + + p { + margin-bottom: 2rem; + } + + a { + padding: 0 1rem; + color: inherit; + font-weight: 400; + + &:not(:last-child) { + border-right: 1px solid; + } + } +` + +const MinimalFooter = () => ( + +
+

Copyright TypeFox All Right Reserved

+
+ Imprint + Terms of Service + Privacy Policy +
+
+
+) + +export default MinimalFooter diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx index 00393ad1b..5c22e4475 100644 --- a/src/components/Nav.tsx +++ b/src/components/Nav.tsx @@ -208,7 +208,7 @@ const StyledNav = styled.nav` } ` -const Nav = () => { +const Nav = ({ isAFlowPage }: { isAFlowPage?: boolean }) => { const [isNavRendered, setIsNavRendered] = useState(false) const unLock = () => { @@ -242,66 +242,71 @@ const Nav = () => {
Gitpod Logo -
- Log In -
- -
-
+ + close menu icon + + + + hamburger menu icon + + + +
+ : null + } + { + isAFlowPage ? Reinstall Extension : null + } - - - + { + !isAFlowPage ? : null + }
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 420bd3c6e..ea3c24ba1 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -12,6 +12,7 @@ import LayoutRoot from '../components/LayoutRoot' import LayoutMain from '../components/LayoutMain' import Nav from '../components/Nav' import Footer from '../components/Footer' +import MinimalFooter from '../components/MinimalFooter' // import AnnoucementBanner from '../components/AnnouncementBanner' type StaticQueryProps = { @@ -24,7 +25,7 @@ type StaticQueryProps = { } } -class IndexLayout extends React.Component<{ title?: string; canonical?: string; description?: string }, {}> { +class IndexLayout extends React.Component<{ title?: string; canonical?: string; description?: string, isAFlowPage?: boolean }, {}> { handleFirstTab = (e: any) => { if (e.key === 'Tab') { // the "I am a keyboard user" key @@ -90,7 +91,7 @@ class IndexLayout extends React.Component<{ title?: string; canonical?: string; {/* */} -