Skip to content

Commit 952c995

Browse files
committed
some visual and copy on calendar
1 parent 0b5838a commit 952c995

4 files changed

Lines changed: 24 additions & 10 deletions

File tree

lib/components/event-schedule-new/action-bar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { FilterSummary } from "./filter";
55
import Export from "./export";
66

77
const venueEvents = [
8-
{ color: "bg-[rgba(255,133,166,1)]", label: "Cowork" },
8+
{ color: "bg-[rgba(255,133,166,1)]", label: "EWF & Cowork" },
99
{ color: "bg-[rgba(116,172,223,1)]", label: "Core" },
1010
{ color: "bg-[rgba(246,180,14,1)]", label: "Partner" },
1111
];

lib/components/event-schedule-new/calendar.components.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ const DifficultyTag = ({
1616
size?: "sm" | "md";
1717
}) => {
1818
const difficultyColorMap = {
19-
beginner: "text-[rgba(20,108,88,1)] border-[rgba(20,108,88,1)]",
19+
beginner: "text-[#146C58] border-[#146C58]",
2020
intermediate: "text-[rgba(180,83,9,1)] border-[rgba(180,83,9,1)]",
2121
expert: "text-[rgba(153,27,27,1)] border-[rgba(153,27,27,1)]",
22-
"all welcome": "text-[rgba(20,108,88,1)] border-[rgba(20,108,88,1)]",
23-
other: "text-[rgba(20,108,88,1)] border-[rgba(20,108,88,1)]",
22+
"all welcome": "text-[#146C58] border-[#146C58]",
23+
other: "text-[#146C58] border-[#146C58]",
2424
};
2525

2626
const difficultyTextMap = {
@@ -38,7 +38,7 @@ const DifficultyTag = ({
3838

3939
return (
4040
<div
41-
className={`${difficultyColorMap[difficulty]} border border-solid px-2 py-0.5 uppercase ${sizeMap[size]} shrink-0`}
41+
className={`${difficultyColorMap[difficulty]} bg-white border border-solid px-2 py-0.5 uppercase ${sizeMap[size]} shrink-0`}
4242
>
4343
{difficultyTextMap[difficulty]}
4444
</div>
@@ -98,7 +98,7 @@ const TypeTag = ({
9898

9999
return (
100100
<div
101-
className={`${typeColorMap[category]} px-2 py-0.5 rounded-full uppercase ${sizeMap[size]}`}
101+
className={`${typeColorMap[category]} px-2 py-0.5 bg-white rounded-full uppercase ${sizeMap[size]}`}
102102
>
103103
{typeTextMap[category]}
104104
</div>

lib/components/event-schedule-new/event/event.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ const Event: React.FC<EventProps> = ({
402402
</div>
403403

404404
{isETHDay && (
405-
<div className="flex items-center justify-center grow">
405+
<div className="flex items-center justify-center mt-2">
406406
<Image
407407
src={ethDayImage}
408408
alt="ETH Day"

lib/components/event-schedule-new/layout.tsx

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,30 @@ const Layout = (props: CalendarLayoutProps) => {
4242
<div className="text-base font-secondary">
4343
Events held within La Rural (
4444
<Link href="https://tickets.devconnect.org">
45-
ticket required
45+
world's fair ticket required
4646
</Link>
4747
)
4848
</div>
4949
</div>
5050
)}
5151
</div>
5252
<div className="text-sm rounded-md bg-[#74ACDF33] px-4 py-2 text-[#36364C] self-center">
53-
This calendar is a work in progress and will change before
54-
Devconnect week. <b>Check back regularly for updates.</b>
53+
{props.isCommunityCalendar ? (
54+
<>
55+
This calendar is a work in progress and will change before
56+
Devconnect week. <b>Check back regularly for updates.</b>
57+
<br />
58+
</>
59+
) : (
60+
<>
61+
<b>
62+
All events inside La Rural require a world's fair ticket.
63+
You may also need to buy tickets for the specific events
64+
held within the world's fair.
65+
</b>
66+
</>
67+
)}
68+
5569
{/* <RichText content={data.pages.calendar_disclaimer} /> */}
5670
</div>
5771
</div>

0 commit comments

Comments
 (0)