kopia lustrzana https://github.com/bugout-dev/moonstream
Fixing layout colors when logged in.
rodzic
01e916ed2f
commit
3776a90ba1
|
@ -27,7 +27,7 @@ const Welcome = () => {
|
|||
|
||||
return (
|
||||
<Scrollable>
|
||||
<Stack px="7%" pt={4} w="100%" spacing={4} ref={scrollRef}>
|
||||
<Stack px="7%" pt={4} w="100%" color="black" spacing={4} ref={scrollRef}>
|
||||
{/* <StepProgress
|
||||
numSteps={ui.onboardingSteps.length}
|
||||
currentStep={ui.onboardingStep}
|
||||
|
|
|
@ -36,6 +36,7 @@ const AccountIconButton = (props) => {
|
|||
zIndex="dropdown"
|
||||
width={["100vw", "100vw", "18rem", "20rem", "22rem", "24rem"]}
|
||||
borderRadius={0}
|
||||
color="black"
|
||||
>
|
||||
<MenuGroup>
|
||||
<RouterLink href="/account/security" passHref>
|
||||
|
|
|
@ -7,6 +7,7 @@ import {
|
|||
MenuGroup,
|
||||
MenuDivider,
|
||||
IconButton,
|
||||
Text,
|
||||
chakra,
|
||||
} from "@chakra-ui/react";
|
||||
import { PlusSquareIcon } from "@chakra-ui/icons";
|
||||
|
@ -44,7 +45,7 @@ const AddNewIconButton = (props) => {
|
|||
})
|
||||
}
|
||||
>
|
||||
New Dashboard...
|
||||
<Text color="black">New Dashboard...</Text>
|
||||
</MenuItem>
|
||||
<MenuItem
|
||||
onClick={() =>
|
||||
|
@ -54,7 +55,7 @@ const AddNewIconButton = (props) => {
|
|||
})
|
||||
}
|
||||
>
|
||||
New Subscription...
|
||||
<Text color="black">New Subscription...</Text>
|
||||
</MenuItem>
|
||||
|
||||
{ui.isInDashboard && <MenuItem>New report...</MenuItem>}
|
||||
|
|
|
@ -76,7 +76,7 @@ const AppNavbar = () => {
|
|||
icon={<QuestionOutlineIcon />}
|
||||
/>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent bgColor="white.100">
|
||||
<PopoverContent bgColor="white.100" color="black">
|
||||
<PopoverArrow />
|
||||
<PopoverCloseButton />
|
||||
<PopoverHeader>Support</PopoverHeader>
|
||||
|
@ -110,7 +110,7 @@ const AppNavbar = () => {
|
|||
<Flex px={2}>
|
||||
<Spacer />
|
||||
<Flex placeSelf="flex-end">
|
||||
<ButtonGroup variant="link" spacing={4} colorScheme="orange">
|
||||
<ButtonGroup variant="link" spacing={4}>
|
||||
{SITEMAP.map((item, idx) => {
|
||||
if (
|
||||
!item.children &&
|
||||
|
@ -121,10 +121,9 @@ const AppNavbar = () => {
|
|||
key={`${idx}-${item.title}-landing-all-links`}
|
||||
variant="link"
|
||||
href={item.path}
|
||||
color="white"
|
||||
isActive={!!(router.pathname === item.path)}
|
||||
>
|
||||
{item.title}
|
||||
<Text color="black">{item.title}</Text>
|
||||
</RouteButton>
|
||||
);
|
||||
} else if (!item.footerOnly) {
|
||||
|
@ -147,7 +146,7 @@ const AppNavbar = () => {
|
|||
passHref
|
||||
>
|
||||
<MenuItem key={`menu-${idx}`} as={"a"} m={0}>
|
||||
{child.title}
|
||||
<Text color="black">{child.title}</Text>
|
||||
</MenuItem>
|
||||
</RouterLink>
|
||||
))}
|
||||
|
@ -163,7 +162,6 @@ const AppNavbar = () => {
|
|||
key={`${idx}-${item.title}-navlink`}
|
||||
variant="link"
|
||||
href={item.path}
|
||||
color="white"
|
||||
isActive={!!(router.nextRouter.pathname === item.path)}
|
||||
>
|
||||
{item.title}
|
||||
|
|
|
@ -77,7 +77,7 @@ const LandingNavbar = () => {
|
|||
key={`${idx}-${item.title}-landing-all-links`}
|
||||
variant="link"
|
||||
href={item.path}
|
||||
color="white"
|
||||
color="black"
|
||||
isActive={!!(router.pathname === item.path)}
|
||||
>
|
||||
{item.title}
|
||||
|
|
|
@ -3,6 +3,7 @@ import { getLayout as getSiteLayout } from "./RootLayout";
|
|||
import React, { useContext, useEffect } from "react";
|
||||
import UIContext from "../core/providers/UIProvider/context";
|
||||
import AppNavbar from "../components/AppNavbar";
|
||||
import { BACKGROUND_COLOR } from "../core/constants";
|
||||
|
||||
const AppLayout = ({ children }) => {
|
||||
const ui = useContext(UIContext);
|
||||
|
@ -18,6 +19,7 @@ const AppLayout = ({ children }) => {
|
|||
return (
|
||||
<Flex
|
||||
id="JournalsWrapper"
|
||||
bgColor={BACKGROUND_COLOR}
|
||||
flexGrow={1}
|
||||
maxH="100%"
|
||||
w="100%"
|
||||
|
@ -45,7 +47,12 @@ const AppLayout = ({ children }) => {
|
|||
zIndex={1010}
|
||||
/>
|
||||
)}
|
||||
<Flex direction={"column"} bgColor="blue.900" id="Navbar">
|
||||
<Flex
|
||||
direction={"column"}
|
||||
bgColor={BACKGROUND_COLOR}
|
||||
borderBottom="1px solid white"
|
||||
id="Navbar"
|
||||
>
|
||||
<AppNavbar />
|
||||
</Flex>
|
||||
{ui.isAppReady && ui.isLoggedIn && children}
|
||||
|
|
Ładowanie…
Reference in New Issue