Skip to content
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

fix/532-home-page-on-2560-and-1920-resolutions #625

Merged
merged 2 commits into from
Apr 5, 2024
Merged

fix/532-home-page-on-2560-and-1920-resolutions #625

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
e3ae5e3
fix resolutions
Sworzen1 Apr 4, 2024
0d54491
replace ternary operator with if statement
Sworzen1 Apr 5, 2024
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
37 changes: 21 additions & 16 deletions govtool/frontend/src/components/organisms/Hero.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCallback } from "react";
import { useMemo } from "react";
import { useNavigate } from "react-router-dom";
import { Trans } from "react-i18next";
import { Box, Link } from "@mui/material";
Expand All @@ -17,11 +17,24 @@ export const Hero = () => {
const { t } = useTranslation();
const IMAGE_SIZE = screenWidth < 640 ? 300 : screenWidth < 860 ? 400 : 600;

const onClickVotingPower = useCallback(
() =>
openInNewTab("https://docs.sanchogov.tools/faqs/what-is-voting-power"),
[],
);
const paddingHorizontal = useMemo(() => {
if (screenWidth < 640) return 3;
if (screenWidth < 1512) return 9.375;
if (screenWidth < 1728) return 14;
if (screenWidth < 1920) return 27.375;
if (screenWidth < 2560) return 39.375;
return 49.25;
}, [screenWidth]);

const imageRightMargin = useMemo(() => {
if (screenWidth <= 860) return -(IMAGE_SIZE / 4);
if (screenWidth <= 1440) return -(IMAGE_SIZE / 15);
if (screenWidth <= 1728) return screenWidth / 20;
return screenWidth / 11;
}, [screenWidth]);

const onClickVotingPower = () =>
openInNewTab("https://docs.sanchogov.tools/faqs/what-is-voting-power");

return (
<Box
Expand All @@ -32,7 +45,7 @@ export const Hero = () => {
flexDirection="row"
overflow="visible"
position="relative"
px={screenWidth < 640 ? 3 : screenWidth < 1512 ? 10 : 14}
px={paddingHorizontal}
>
<Box alignItems="center" flex={1} height="min-content">
<Typography
Expand Down Expand Up @@ -81,15 +94,7 @@ export const Hero = () => {
<Box
flex={1}
position="absolute"
right={
screenWidth >= 1728
? IMAGE_SIZE / 8
: screenWidth >= 1512
? -(IMAGE_SIZE / 12)
: screenWidth >= 860
? -(IMAGE_SIZE / 8)
: -(IMAGE_SIZE / 4)
}
right={imageRightMargin}
top={-80}
zIndex={-1}
>
Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/src/components/organisms/HomeCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const HomeCards = () => {
? "repeat(1, minmax(300px, 866px))"
: "repeat(2, minmax(300px, 866px))"
}
justifyItems="center"
justifyContent="center"
mb={screenWidth < 640 ? 10 : 17}
mt={screenWidth < 640 ? 10 : 14.5}
px={
Expand Down
Loading