Skip to content

Commit

Permalink
style: match upcoming events to other styles
Browse files Browse the repository at this point in the history
  • Loading branch information
hetd54 committed Dec 4, 2024
1 parent 6de52b0 commit 4682283
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
18 changes: 7 additions & 11 deletions components/calendar/CalendarEvent.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react"
import { DataProps } from "@/components/EventSection"
import { ClockIcon } from "@heroicons/react/20/solid"
import { ArrowTopRightOnSquareIcon, ClockIcon } from "@heroicons/react/20/solid"

const CalendarEvent: React.FC<DataProps> = ({
date_time,
Expand All @@ -17,23 +17,19 @@ const CalendarEvent: React.FC<DataProps> = ({
", " +
date
return (
<div className="bg-gray-50 p-4">
<div className="text-neutral-900 text-sm">{normalDate}</div>
<div className="bg-gray-50 p-4 space-y-2">
<div className="text-neutral-900 font-semibold text-sm">{normalDate}</div>
<div>
<a
className="text-xl font-bold text-secondary-blue-500 no-underline leading-4"
className="text-2xl font-bold text-secondary-blue-500 no-underline hover:underline leading-6"
href={url}
target="_blank"
>
{" "}
{title}{" "}
<p>{title}</p>
</a>
</div>
<div className="flex items-center text-primary-500 text-xs">
<ClockIcon
className="mr-2 h-4 w-4 text-primary-500"
aria-hidden="true"
/>
<div className="flex items-center text-primary-500 text-sm">
<ClockIcon className="mr-2 h-4 w-4" aria-hidden="true" />
{date_time}
</div>
<div className="py-2">{description_long && <p>{descriptionLong}</p>}</div>
Expand Down
9 changes: 7 additions & 2 deletions components/calendar/CalendarMonth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const CalendarMonth: React.FC<CalendarProps> = ({
const formattedCalEvents = validDayEvents.map((event: DataProps) => {
return (
<li key={self.crypto.randomUUID()}>
<TooltipProvider className="group flex">
<TooltipProvider>
<Tooltip>
<TooltipTrigger className="rounded-md max-w-[100%] px-2 hover:bg-neutral-50">
<p className="flex-auto min-w-0 truncate font-medium text-secondary-blue-700">
Expand All @@ -115,6 +115,7 @@ const CalendarMonth: React.FC<CalendarProps> = ({
<p className="font-semibold pb-2">{event.date}</p>
<a
href={event.url}
target="_blank"
className="flex gap-1 text-secondary-blue-500"
>
<p className="font-semibold hover:underline">{event.title}</p>
Expand Down Expand Up @@ -148,7 +149,11 @@ const CalendarMonth: React.FC<CalendarProps> = ({
className="group flex p-4 pr-6 focus-within:bg-gray-50 hover:bg-gray-50"
>
<div className="flex-auto">
<a href={event.url} className="flex gap-1 text-secondary-blue-500">
<a
href={event.url}
target="_blank"
className="flex gap-1 text-secondary-blue-500"
>
<p className="font-semibold hover:underline">{event.title}</p>
<ArrowTopRightOnSquareIcon
className="mr-2 h-4 w-4"
Expand Down
2 changes: 1 addition & 1 deletion components/calendar/CalendarWeekly.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const CalendarWeekly: React.FC<CalendarProps> = ({
className="sticky top-0 z-30 flex-none bg-gray border-white shadow ring-1 ring-black ring-opacity-5 sm:pr-8"
>
<div className="-mr-px hidden grid-cols-7 divide-x divide-gray-100 border-r border-white text-sm leading-6 text-gray-500 sm:grid">
<div className="col-end-1 w-14" />
<div className="col-end-1 w-14 bg-white" />
{generateDatesForCurrentWeek(
activeDate,
selectedDate,
Expand Down

0 comments on commit 4682283

Please sign in to comment.