Skip to content

xelqo/upcomingEvents#59

Merged
LawMot merged 7 commits into
devfrom
xelqo/UpcomingEvents
Jun 4, 2026
Merged

xelqo/upcomingEvents#59
LawMot merged 7 commits into
devfrom
xelqo/UpcomingEvents

Conversation

@xelqo

@xelqo xelqo commented Jun 1, 2026

Copy link
Copy Markdown
Collaborator
Screenshot 2026-05-31 at 10 06 42 PM fixes #53

@xelqo xelqo self-assigned this Jun 1, 2026
@LawMot LawMot self-requested a review June 2, 2026 06:51

@LawMot LawMot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix merge conflict

if need any help feel free to check out the merge conflict slides in the resource channel or ask in help channel!

@LawMot

LawMot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

the card looks great on mobile! However, it looks like the design for larger screens of the component has been changed, could you add the previous design back? The card you did for the Event Card issue is what we're looking for. Refer to the figma for reference.

dont change the mobile design, it's spot on!!

@xelqo

xelqo commented Jun 4, 2026

Copy link
Copy Markdown
Collaborator Author
Screenshot 2026-06-03 at 8 20 52 PM fixes # 53

@LawMot LawMot merged commit 34e1df8 into dev Jun 4, 2026
5 checks passed
@LawMot LawMot deleted the xelqo/UpcomingEvents branch June 4, 2026 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upcoming Events + Responsive

2 participants