diff --git a/components/builds/BuildCard.tsx b/components/builds/BuildCard.tsx index d64b5bd15..94b3cc810 100644 --- a/components/builds/BuildCard.tsx +++ b/components/builds/BuildCard.tsx @@ -55,6 +55,7 @@ const BuildCard: React.FC = ({ rounded="lg" overflow="hidden" boxShadow="md" + bg={secondaryBgColor} p="20px" {...props} > diff --git a/components/layout/HeaderBanner.tsx b/components/layout/HeaderBanner.tsx index dd0e52961..d510a9ac2 100644 --- a/components/layout/HeaderBanner.tsx +++ b/components/layout/HeaderBanner.tsx @@ -1,6 +1,6 @@ -import Image from "next/image"; import { Box, Flex } from "@chakra-ui/layout"; import { useMyTheme } from "hooks/common"; +import Image from "next/image"; const HeaderBanner = ({ icon, @@ -12,40 +12,38 @@ const HeaderBanner = ({ subtitle: string; }) => { const { secondaryBgColor, gray } = useMyTheme(); - const isTASL = icon === "tasl_main"; return ( - + {`${icon} - - {title} - - - {subtitle} - + + + {title} + + + {subtitle} + + ); }; diff --git a/components/layout/IconNavBar.tsx b/components/layout/IconNavBar.tsx index f17887c7b..f9a8bbc42 100644 --- a/components/layout/IconNavBar.tsx +++ b/components/layout/IconNavBar.tsx @@ -119,7 +119,6 @@ const IconNavBar = () => { justifyContent="center" flexWrap="wrap" boxShadow="lg" - rounded="md" > {navIcons.map(({ displayName, code, menuItems }) => { if (!menuItems.length) { diff --git a/components/layout/index.tsx b/components/layout/index.tsx index 4b262d9f0..51a7b02b8 100644 --- a/components/layout/index.tsx +++ b/components/layout/index.tsx @@ -1,7 +1,7 @@ import { Flex, useToast } from "@chakra-ui/react"; import { t } from "@lingui/macro"; import MyContainer from "components/common/MyContainer"; -import { useMyTheme } from "hooks/common"; +import { useRouter } from "next/router"; import { useState } from "react"; import { SWRConfig } from "swr"; import Banner from "./Banner"; @@ -27,15 +27,13 @@ const Layout = ({ header: React.ReactNode; children: React.ReactNode; }) => { - const { secondaryBgColor } = useMyTheme(); + const router = useRouter(); const [errors, setErrors] = useState(new Set()); const toast = useToast(); - const isWide = - window && - WIDE.some((widePage) => - window.location.pathname.startsWith("/" + widePage) - ); + const isWide = WIDE.some((widePage) => + router.pathname.startsWith("/" + widePage) + ); return ( - - - - - {header} - + + + + {header} - + {children}