Skip to content

Commit affd2a6

Browse files
committed
Update responsive styles
1 parent b68100a commit affd2a6

File tree

4 files changed

+60
-25
lines changed

4 files changed

+60
-25
lines changed

frontend/src/components/layouts/Event/Event.module.scss

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
}
9797

9898
@include mixins.respond-below(md) {
99-
display: none;
99+
display: none;
100100

101101
}
102102
}
@@ -506,10 +506,30 @@
506506
transform: translateY(-1px);
507507
}
508508

509-
@include mixins.respond-below(sm) {
510-
span {
509+
.eventPageButtonText {
510+
// Default: hide both
511+
.mobile,
512+
.desktop {
511513
display: none;
512514
}
515+
516+
// Show mobile text from sm and up
517+
@include mixins.respond-above(sm) {
518+
.mobile {
519+
display: block;
520+
}
521+
}
522+
523+
// Switch to desktop text at md and up
524+
@include mixins.respond-above(md) {
525+
.mobile {
526+
display: none;
527+
}
528+
529+
.desktop {
530+
display: block;
531+
}
532+
}
513533
}
514534
}
515535

frontend/src/components/layouts/Event/index.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Badge, Breadcrumbs, Burger, Button, UnstyledButton, VisuallyHidden} from '@mantine/core';
1+
import {ActionIcon, Badge, Breadcrumbs, Burger, Button, UnstyledButton, VisuallyHidden} from '@mantine/core';
22
import {NavLink, Outlet, useLocation, useParams} from "react-router";
33
import {
44
IconChartPie,
@@ -202,13 +202,16 @@ const EventLayout = () => {
202202
variant={'transparent'}
203203
leftSection={<IconExternalLink size={17}/>}
204204
className={classes.eventPageButton}
205+
title={t`Preview Event page`}
205206
>
206-
<ShowForDesktop>
207-
{t`Preview Event page`}
208-
</ShowForDesktop>
209-
<ShowForMobile>
210-
{t`Event page`}
211-
</ShowForMobile>
207+
<div className={classes.eventPageButtonText}>
208+
<span className={classes.desktop}>
209+
{t`Preview Event page`}
210+
</span>
211+
<span className={classes.mobile}>
212+
{t`Event Page`}
213+
</span>
214+
</div>
212215

213216
</Button>
214217
<div className={classes.menu}>

frontend/src/components/layouts/EventHomepage/index.tsx

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Header } from "./Header";
1+
import {Header} from "./Header";
22
import "./styles.scss";
3-
import { EventInformation } from "./EventInformation";
3+
import {EventInformation} from "./EventInformation";
44
import classes from "./EventHomepage.module.scss";
55
import SelectProducts from "../../routes/product-widget/SelectProducts";
66
import "../../../styles/widget/default.scss";
77
import React from "react";
8-
import { EventDocumentHead } from "../../common/EventDocumentHead";
9-
import { eventCoverImageUrl } from "../../../utilites/urlHelper.ts";
10-
import { Event } from "../../../types.ts";
11-
import { EventNotAvailable } from "./EventNotAvailable";
8+
import {EventDocumentHead} from "../../common/EventDocumentHead";
9+
import {eventCoverImageUrl} from "../../../utilites/urlHelper.ts";
10+
import {Event} from "../../../types.ts";
11+
import {EventNotAvailable} from "./EventNotAvailable";
1212

1313
interface EventHomepageProps {
1414
colors?: {
@@ -26,8 +26,8 @@ interface EventHomepageProps {
2626
promoCode?: string;
2727
}
2828

29-
const EventHomepage = ({ colors, continueButtonText, backgroundType, ...loaderData }: EventHomepageProps) => {
30-
const { event, promoCodeValid, promoCode } = loaderData;
29+
const EventHomepage = ({colors, continueButtonText, backgroundType, ...loaderData}: EventHomepageProps) => {
30+
const {event, promoCodeValid, promoCode} = loaderData;
3131

3232
const styleOverrides = {
3333
"--homepage-body-background-color":
@@ -45,7 +45,7 @@ const EventHomepage = ({ colors, continueButtonText, backgroundType, ...loaderDa
4545
} as React.CSSProperties;
4646

4747
if (!event) {
48-
return <EventNotAvailable />;
48+
return <EventNotAvailable/>;
4949
}
5050

5151
const coverImage = eventCoverImageUrl(event);
@@ -56,23 +56,35 @@ const EventHomepage = ({ colors, continueButtonText, backgroundType, ...loaderDa
5656
{(coverImage && backgroundType === 'MIRROR_COVER_IMAGE') && (
5757
<div
5858
className={classes.background}
59-
style={{ backgroundImage: `url(${coverImage})` }}
59+
style={{backgroundImage: `url(${coverImage})`}}
6060
/>
6161
)}
6262
{(!coverImage || backgroundType === 'COLOR') &&
6363
<div className={classes.background}
64-
style={{ backgroundColor: 'var(--homepage-body-background-color)' }}
64+
style={{backgroundColor: 'var(--homepage-body-background-color)'}}
6565
/>
6666
}
6767
<div
6868
id={"event-homepage"}
6969
className={classes.styleContainer}
7070
>
71-
<div className={classes.container} style={{maxWidth: '1000px', margin: '30px auto'}}>
72-
<Header event={event} />
71+
<style>
72+
{`
73+
.initialContainerStyle {
74+
max-width: 1000px;
75+
margin: 30px auto;
76+
77+
@media (max-width: 767px) {
78+
margin: 0;
79+
}
80+
}
81+
`}
82+
</style>
83+
<div className={`initialContainerStyle ${classes.container}`}>
84+
<Header event={event}/>
7385
<div className={classes.innerContainer}>
7486
<div className={classes.eventInfo}>
75-
<EventInformation event={event} />
87+
<EventInformation event={event}/>
7688
</div>
7789

7890
<div className={classes.productContainer}>

frontend/src/components/routes/event/GettingStarted/GettingStarted.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
z-index: 0;
2626
}
2727

28-
@include mixins.respond-below(sm) {
28+
@include mixins.respond-below(lg) {
2929
&::before {
3030
display: none;
3131
}

0 commit comments

Comments
 (0)