Skip to content

Commit 722e9ac

Browse files
authored
Organizer style updates (#954)
1 parent af4e722 commit 722e9ac

File tree

4 files changed

+35
-23
lines changed

4 files changed

+35
-23
lines changed

frontend/src/components/common/EventCard/EventCard.module.scss

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
overflow: hidden;
55
padding: 0;
66
transition: border-color 0.2s ease, box-shadow 0.2s ease;
7+
container-type: inline-size;
8+
min-width: 280px;
79

810
&:hover {
911
border-color: var(--mantine-color-gray-4);
@@ -42,7 +44,7 @@
4244
color: inherit;
4345
min-height: 140px;
4446

45-
@include mixins.respond-below(md) {
47+
@include mixins.respond-below(md, true) {
4648
flex-direction: column;
4749
min-height: auto;
4850
position: relative;
@@ -55,7 +57,7 @@
5557
min-width: 200px;
5658
overflow: hidden;
5759

58-
@include mixins.respond-below(md) {
60+
@include mixins.respond-below(md, true) {
5961
width: 100%;
6062
min-width: 100%;
6163
height: 140px;
@@ -180,7 +182,7 @@
180182
gap: 20px;
181183
min-width: 0;
182184

183-
@include mixins.respond-below(md) {
185+
@include mixins.respond-below(md, true) {
184186
flex-direction: column;
185187
align-items: stretch;
186188
padding: 14px;
@@ -203,7 +205,11 @@
203205
color: var(--mantine-color-text);
204206
line-height: 1.3;
205207
transition: color 0.15s ease;
206-
@include mixins.ellipsis;
208+
display: -webkit-box;
209+
-webkit-line-clamp: 2;
210+
line-clamp: 2;
211+
-webkit-box-orient: vertical;
212+
overflow: hidden;
207213
}
208214

209215
.meta {
@@ -284,12 +290,12 @@
284290
border-radius: var(--hi-radius-md);
285291
flex-shrink: 0;
286292

287-
@include mixins.respond-below(lg) {
293+
@include mixins.respond-below(lg, true) {
288294
gap: 18px;
289295
padding: 10px 14px;
290296
}
291297

292-
@include mixins.respond-below(md) {
298+
@include mixins.respond-below(md, true) {
293299
justify-content: space-around;
294300
padding: 12px;
295301
}
@@ -303,7 +309,7 @@
303309
cursor: default;
304310
min-width: 75px;
305311

306-
@include mixins.respond-below(lg) {
312+
@include mixins.respond-below(lg, true) {
307313
min-width: 65px;
308314
}
309315
}
@@ -314,7 +320,7 @@
314320
color: var(--mantine-color-text);
315321
line-height: 1;
316322

317-
@include mixins.respond-below(lg) {
323+
@include mixins.respond-below(lg, true) {
318324
font-size: 16px;
319325
}
320326
}
@@ -325,7 +331,7 @@
325331
color: var(--mantine-color-green-7);
326332
line-height: 1;
327333

328-
@include mixins.respond-below(lg) {
334+
@include mixins.respond-below(lg, true) {
329335
font-size: 16px;
330336
}
331337
}
@@ -341,7 +347,7 @@
341347
.menuButton {
342348
flex-shrink: 0;
343349

344-
@include mixins.respond-below(md) {
350+
@include mixins.respond-below(md, true) {
345351
position: absolute;
346352
top: 10px;
347353
right: 10px;
@@ -351,7 +357,7 @@
351357
.actionButton {
352358
color: var(--mantine-color-dimmed);
353359

354-
@include mixins.respond-below(md) {
360+
@include mixins.respond-below(md, true) {
355361
background: rgba(255, 255, 255, 0.9);
356362
backdrop-filter: blur(4px);
357363

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
IconBrandStripe,
44
IconCalendar,
55
IconCalendarPlus,
6-
IconChartBar,
6+
IconChartPie,
77
IconChevronRight,
88
IconCreditCard,
99
IconDashboard,
@@ -19,7 +19,7 @@ import {t} from "@lingui/macro";
1919
import {BreadcrumbItem, NavItem} from "../AppLayout/types.ts";
2020
import AppLayout from "../AppLayout";
2121
import {NavLink, useLocation, useParams} from "react-router";
22-
import {Button, Modal, Text, Stack} from "@mantine/core";
22+
import {Button, Modal, Stack, Text} from "@mantine/core";
2323
import {useGetOrganizer} from "../../../queries/useGetOrganizer.ts";
2424
import {useState} from "react";
2525
import {CreateEventModal} from "../../modals/CreateEventModal";
@@ -48,7 +48,10 @@ const OrganizerLayout = () => {
4848
const [createModalOpen, {open: openCreateModal, close: closeCreateModal}] = useDisclosure(false);
4949
const [switchOrganizerModalOpen, {open: openSwitchModal, close: closeSwitchModal}] = useDisclosure(false);
5050
const [shareModalOpen, {open: openShareModal, close: closeShareModal}] = useDisclosure(false);
51-
const [emailVerificationModalOpen, {open: openEmailVerificationModal, close: closeEmailVerificationModal}] = useDisclosure(false);
51+
const [emailVerificationModalOpen, {
52+
open: openEmailVerificationModal,
53+
close: closeEmailVerificationModal
54+
}] = useDisclosure(false);
5255
const {data: organizerResposne} = useGetOrganizers();
5356
const organizers = organizerResposne?.data;
5457
const {data: account} = useGetAccount();
@@ -73,7 +76,7 @@ const OrganizerLayout = () => {
7376
{
7477
link: 'reports',
7578
label: t`Reports`,
76-
icon: IconChartBar,
79+
icon: IconChartPie,
7780
isActive: (isActive) => isActive || location.pathname.includes('/report/')
7881
},
7982

@@ -146,7 +149,7 @@ const OrganizerLayout = () => {
146149
className={classes.createEventBreadcrumb}
147150
onClick={() => setShowCreateEventModal(true)}
148151
>
149-
<IconCalendarPlus size={16} /> {t`Create Event`}
152+
<IconCalendarPlus size={16}/> {t`Create Event`}
150153
</span>
151154
),
152155
}
@@ -195,7 +198,8 @@ const OrganizerLayout = () => {
195198
<TopBarButton
196199
onClick={handleStatusToggle}
197200
size="sm"
198-
leftSection={organizer?.status === 'DRAFT' ? <IconEyeOff size={16}/> : <IconEye size={16}/>}
201+
leftSection={organizer?.status === 'DRAFT' ? <IconEyeOff size={16}/> :
202+
<IconEye size={16}/>}
199203
rightSection={<IconChevronRight size={14}/>}
200204
>
201205
{organizer?.status === 'DRAFT'
@@ -276,10 +280,10 @@ const OrganizerLayout = () => {
276280
<Text size="sm" c="dimmed">
277281
{t`You must verify your email address before you can update the organizer status.`}
278282
</Text>
279-
283+
280284
{!emailConfirmationResent ? (
281-
<Button
282-
variant="light"
285+
<Button
286+
variant="light"
283287
onClick={() => {
284288
handleEmailConfirmationResend();
285289
}}

frontend/src/components/routes/event/EventDashboard/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ export const EventDashboard = () => {
287287

288288
<AreaChart
289289
h={300}
290+
pl={40}
291+
pr={40}
290292
data={eventStats?.daily_stats.map(stat => {
291293
return ({
292294
date: formatDateWithLocale(stat.date, 'chartDate', event.timezone),

frontend/src/components/routes/organizer/OrganizerDashboard/OrganizerDashboard.module.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
grid-template-columns: 1fr;
164164
gap: 3rem;
165165

166-
@include mixins.respond-above(md) {
167-
grid-template-columns: 1fr 2fr;
166+
@include mixins.respond-above(lg) {
167+
grid-template-columns: minmax(300px, 1fr) 2fr;
168168
gap: 1.5rem;
169169
align-items: stretch;
170170
}
@@ -186,7 +186,7 @@
186186
order: 2;
187187
}
188188

189-
@include mixins.respond-above(md) {
189+
@include mixins.respond-above(lg) {
190190
.eventsSection {
191191
order: 2;
192192
}

0 commit comments

Comments
 (0)