diff --git a/packages/website/src/components/Layout/Layout.js b/packages/website/src/components/Layout/Layout.js index 251bb14f..17b89a53 100644 --- a/packages/website/src/components/Layout/Layout.js +++ b/packages/website/src/components/Layout/Layout.js @@ -14,13 +14,15 @@ import FooterNavigation from "../FooterNavigation"; import { useWindowScroll } from "react-use"; import { readableColor } from "polished"; +const minHeight = 192; // this is p-48 that is added to account for the size of the fixed navigation const FixedHeader = () => { const { y } = useWindowScroll(); const ref = React.useRef(null); const [mode, setMode] = React.useState(); React.useLayoutEffect(() => { - const element = document.elementFromPoint(0, ref.current.offsetHeight); + const offset = Math.max(minHeight, ref.current.offsetHeight); + const element = document.elementFromPoint(0, offset); const backgroundColor = window.getComputedStyle(element, null).getPropertyValue("background-color"); const color = readableColor(backgroundColor); // returns either #fff or #000 const calculated = { "#fff": "dark", "#000": "light" }[color]; diff --git a/packages/website/src/components/Layout/Section.js b/packages/website/src/components/Layout/Section.js index 469a1c8b..7b7052f2 100644 --- a/packages/website/src/components/Layout/Section.js +++ b/packages/website/src/components/Layout/Section.js @@ -1,14 +1,31 @@ import * as React from "react"; import classnames from "classnames"; -export const Section = ({ children, className, width = "content", ...props }) => ( -
+export const Section = ({ + children, + className, + width = "content", + marginBottom = true, + marginTop = true, + ...props +}) => ( +
{children}
-
+ ); export const SectionTitle = ({ children, className, ...props }) => ( diff --git a/packages/website/src/components/Navigation/Navigation.js b/packages/website/src/components/Navigation/Navigation.js index 6f14f09e..78faedeb 100644 --- a/packages/website/src/components/Navigation/Navigation.js +++ b/packages/website/src/components/Navigation/Navigation.js @@ -81,8 +81,8 @@ const Navigation = ({ mode }) => {
- {mode === "dark" && } - {mode === "light" && } + {mode === "dark" && } + {mode === "light" && }