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

RSVP Finishing touches #293

Merged
merged 1 commit into from
Feb 9, 2025
Merged

RSVP Finishing touches #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions app/profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ const Profile: React.FC = () => {
windowSizeHook?.width < 768
? "10px"
: "40px",
padding: 0
padding: 0,
background:
"linear-gradient(0deg, #98c8d3 0%, #5ea6b7 41%, #0a3147 100%)"
}
}}
isOpen={modalOpen}
Expand Down Expand Up @@ -246,7 +248,7 @@ const Profile: React.FC = () => {
<OlympianButton
text={getButtonText()}
onClick={() => setModalOpen(true)}
medium
small
/>
)}
</div>
Expand All @@ -261,7 +263,7 @@ const QR: React.FC<{ qrUrl: string | null }> = ({ qrUrl }) => {
return (
<>
<h2>Your QR Code</h2>
{qrUrl && <QRCodeSVG value={qrUrl} />}
{qrUrl && <QRCodeSVG value={qrUrl} className={styles.qr} />}
</>
);
};
Expand Down
13 changes: 6 additions & 7 deletions app/profile/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,20 @@
width: 100%;
min-height: 100%;
padding: 2rem;
background: linear-gradient(0deg, #98c8d3 0%, #5ea6b7 41%, #0a3147 100%);
}

.modalContent p {
color: black;
}

// .modalContent svg {
// width: 100%;
// max-width: 400px;
// height: auto;
// }
.qr {
width: 100%;
max-width: 600px;
height: auto;
}

.modalContent h2 {
color: black;
color: white;
margin-bottom: 10px;
font-size: 30px;
}
Expand Down
6 changes: 2 additions & 4 deletions components/CloseButton/CloseButton.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
justify-content: center;
align-items: center;
padding: 5px;
margin-left: -5px; // To align the button with the other content
}

.button:hover {
margin-left: 15px; // To align the button with the other content
margin-top: 15px;
cursor: pointer;
}
2 changes: 1 addition & 1 deletion components/CloseButton/CloseButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const CloseButton = ({ handleClose }: { handleClose: () => void }) => {
height="24px"
>
<path
fill="#000000"
fill="#ffffff"
d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12z"
></path>
</svg>
Expand Down
39 changes: 39 additions & 0 deletions components/OlympianButton/OlympianButton.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,42 @@
}
}
}

.olympianButtonWrapper.small .olympianButton {
width: 14vw;
height: 4vw;
font-size: 1.5vw;
border-radius: 2vw;

&::after {
width: 14vw;
height: 4vw;
border-radius: 2vw;
}

@media screen and (max-width: 960px) {
width: 30vw;
height: 10vw;
font-size: 3vw;

&::after {
width: 30vw;
height: 10vw;
}
}

@media screen and (max-width: 468px) {
width: 45vw;
height: 15vw;
font-size: 4vw;
border-radius: 20px;
border-width: 1vw;

&::after {
width: 45vw;
height: 15vw;
border-radius: 20px;
left: -1vw;
}
}
}
7 changes: 5 additions & 2 deletions components/OlympianButton/OlympianButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface OlympianButtonProps {
blue?: boolean;
gold?: boolean;
medium?: boolean;
small?: boolean;
}

const OlympianButton: React.FC<OlympianButtonProps> = ({
Expand All @@ -19,7 +20,8 @@ const OlympianButton: React.FC<OlympianButtonProps> = ({
bottomPadding,
blue,
gold,
medium
medium,
small
}) => {
return (
<div
Expand All @@ -28,7 +30,8 @@ const OlympianButton: React.FC<OlympianButtonProps> = ({
bottomPadding && styles.bottomPadding,
blue && styles.blue,
gold && styles.gold,
medium && styles.medium
medium && styles.medium,
small && styles.small
)}
>
{link ? (
Expand Down