Skip to content

fix mui navbar default scrolling behavior #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ioanatatu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix mui navbar default scrolling behavior #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cad497
fix mui navbar default scrolling behavior
Nov 18, 2021
6e9aa3a
fix: add navbar height as top margin for components
Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion frontend/src/app/ui/homePage/HomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import { H2, H3, P } from "app/ui/ux/text";
import { IconInfo, IconCheck } from "app/ui/ux/icons";
import { Stack, HR } from "app/ui/ux/containers";
import { WorkmodeButtons } from "app/ui/homePage/WorkmodeButtons";
import { Card } from "app/ui/ux/Card"
import { Card } from "app/ui/ux/Card";
import { NAVIGATION_BAR_HEIGHT_PX } from "app/ui/siteLayout/NavigationBar";


const InlineIconButton = styled(IconButton)({
Expand Down Expand Up @@ -102,6 +103,7 @@ export const HomePage: React.FC = () => {
mx="auto"
p={["0.5rem", "1rem", "2.5rem"]}
spacing={["0.5rem", "1rem", "2.5rem"]}
marginTop={`${NAVIGATION_BAR_HEIGHT_PX}px`}
>
<RenderQuery
query={combineQueries({
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/ui/planningPage/PlanningPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const PlanningPage: React.FC = () => {
const [month, setMonth] = useState<string>(dayjs().format("MMMM YYYY"));

return (
<Page className="PlanningPage">
<Page className="PlanningPage" marginTop={`${NAVIGATION_BAR_HEIGHT_PX}px`}>
{/* Heading element */}
<HeaderWrapper>
<Header>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/ui/siteLayout/NavigationBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const AvatarContainer = styled("div")({
});

export const NavigationBar: React.FC<INavigationBar> = ({ user }) => (
<StyledAppBar position="static" className="NavigationBar">
<StyledAppBar position="fixed" className="NavigationBar">
<StyledToolbar>
<AppTitleLink to={RoutePaths.Home} aria-label="Home">
<IconLogoLight height="32" width="28" /> <AppTitle>futuLog</AppTitle>
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/app/ui/userPage/UserPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { userQueryKey, setDefaultOfficeQueryKey } from "app/utils/reactQueryUtil
import { useMutation } from "react-query";
import { SiteSelector } from "../siteSelector/SiteSector";
import { Button } from "../ux/buttons";
import { NAVIGATION_BAR_HEIGHT_PX } from "app/ui/siteLayout/NavigationBar";

export const UserPage: React.FC = () => {
const { apiClient, queryCache } = useServices();
Expand All @@ -34,7 +35,7 @@ export const UserPage: React.FC = () => {
};

return (
<PageMargins className="UserPage">
<PageMargins className="UserPage" marginTop={`${NAVIGATION_BAR_HEIGHT_PX}px`}>
<Stack spacing="2.5rem" maxWidth="25rem" mx="auto" textAlign="center">
<H2>Personal page</H2>
<Flex justifyContent="center">
Expand Down