From b9f0d81c48ebf5ec9472e95826b0c17f096f1deb Mon Sep 17 00:00:00 2001 From: Jared He <66887902+jaredjhe@users.noreply.github.com> Date: Mon, 30 Aug 2021 17:57:18 -0500 Subject: [PATCH 1/4] Fix inconsistencies --- pages/events/[year]/[term]/index.module.css | 11 +++++++++-- pages/events/[year]/[term]/index.tsx | 8 ++++---- pages/events/[year]/index.module.css | 4 ++-- pages/events/[year]/index.tsx | 4 ++-- pages/news/[year]/[term].module.css | 5 +++++ 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/pages/events/[year]/[term]/index.module.css b/pages/events/[year]/[term]/index.module.css index ce7de862..1f8ee706 100644 --- a/pages/events/[year]/[term]/index.module.css +++ b/pages/events/[year]/[term]/index.module.css @@ -3,8 +3,8 @@ margin-bottom: calc(60rem / 16); } -.main > h2 { - padding-bottom: 1rem; +.main > h1 { + padding-bottom: calc(16rem / 16); border-bottom: 1px solid var(--primary-heading); } @@ -29,3 +29,10 @@ .main > .miniEventCards { margin-top: 0; } + +@media only screen and (max-width: calc(425rem / 16)) { + .header { + display: flex; + flex-direction: column; + } +} diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx index 9e6593ae..f0de1e6f 100644 --- a/pages/events/[year]/[term]/index.tsx +++ b/pages/events/[year]/[term]/index.tsx @@ -66,7 +66,7 @@ export default function Term(props: Props) { {hasFutureEvents && ( <> -

Upcoming Events

+

Upcoming Events

{props.futureEvents.map(({ content, metadata }) => ( Past Events} {hasPastEvents && !props.isCurrentTerm && ( -

+

Events Archive: {` ${capitalize(props.term)} ${props.year}`} -

+ )} {!hasFutureEvents && !hasPastEvents && ( <> -

Events

+

Events

There are no upcoming or past events for the{" "} {`${capitalize(props.term)} ${props.year}`} term. Please check back later! diff --git a/pages/events/[year]/index.module.css b/pages/events/[year]/index.module.css index ccb2efe0..9cf2f72b 100644 --- a/pages/events/[year]/index.module.css +++ b/pages/events/[year]/index.module.css @@ -2,8 +2,8 @@ margin-top: calc(60rem / 16); } -.main > h2 { - padding-bottom: calc(1rem / 16); +.main > h1 { + padding-bottom: calc(16rem / 16); border-bottom: 1px solid var(--primary-heading); } diff --git a/pages/events/[year]/index.tsx b/pages/events/[year]/index.tsx index a5cef72a..6abff18d 100644 --- a/pages/events/[year]/index.tsx +++ b/pages/events/[year]/index.tsx @@ -16,9 +16,9 @@ interface Props { export default function Year(props: Props) { return (
-

+

Events Archive:{` ${props.year}`} -

+
    {props.terms.map((term) => (
  • diff --git a/pages/news/[year]/[term].module.css b/pages/news/[year]/[term].module.css index ba5488c7..f7ae7d74 100644 --- a/pages/news/[year]/[term].module.css +++ b/pages/news/[year]/[term].module.css @@ -2,6 +2,11 @@ padding-bottom: calc(30rem / 16); } +.page > h1 { + padding-bottom: calc(16rem / 16); + border-bottom: 1px solid var(--primary-heading); +} + .term { color: var(--primary-accent); } -- 2.39.2 From aba9a1bb4cbdb6ddf799bc7eb7a4cadf230bebf4 Mon Sep 17 00:00:00 2001 From: Jared He <66887902+jaredjhe@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:11:36 -0500 Subject: [PATCH 2/4] Separate the issues --- pages/events/[year]/[term]/index.module.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pages/events/[year]/[term]/index.module.css b/pages/events/[year]/[term]/index.module.css index 1f8ee706..458e0e3d 100644 --- a/pages/events/[year]/[term]/index.module.css +++ b/pages/events/[year]/[term]/index.module.css @@ -29,10 +29,3 @@ .main > .miniEventCards { margin-top: 0; } - -@media only screen and (max-width: calc(425rem / 16)) { - .header { - display: flex; - flex-direction: column; - } -} -- 2.39.2 From e491a4076d47c182e3bd3a555364b865fc07e9a7 Mon Sep 17 00:00:00 2001 From: Jared He <66887902+jaredjhe@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:16:17 -0500 Subject: [PATCH 3/4] Pesky pixels --- pages/events/[year]/[term]/index.module.css | 2 +- pages/events/[year]/index.module.css | 2 +- pages/news/[year]/[term].module.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/events/[year]/[term]/index.module.css b/pages/events/[year]/[term]/index.module.css index 458e0e3d..58a6b2f0 100644 --- a/pages/events/[year]/[term]/index.module.css +++ b/pages/events/[year]/[term]/index.module.css @@ -5,7 +5,7 @@ .main > h1 { padding-bottom: calc(16rem / 16); - border-bottom: 1px solid var(--primary-heading); + border-bottom: calc(1rem / 16) solid var(--primary-heading); } .header a { diff --git a/pages/events/[year]/index.module.css b/pages/events/[year]/index.module.css index 9cf2f72b..fb05efdb 100644 --- a/pages/events/[year]/index.module.css +++ b/pages/events/[year]/index.module.css @@ -4,7 +4,7 @@ .main > h1 { padding-bottom: calc(16rem / 16); - border-bottom: 1px solid var(--primary-heading); + border-bottom: calc(1rem / 16) solid var(--primary-heading); } .blue { diff --git a/pages/news/[year]/[term].module.css b/pages/news/[year]/[term].module.css index f7ae7d74..49b70d79 100644 --- a/pages/news/[year]/[term].module.css +++ b/pages/news/[year]/[term].module.css @@ -4,7 +4,7 @@ .page > h1 { padding-bottom: calc(16rem / 16); - border-bottom: 1px solid var(--primary-heading); + border-bottom: calc(1rem / 16) solid var(--primary-heading); } .term { -- 2.39.2 From 87b5390a500840f493fbe766e95813afad20a15a Mon Sep 17 00:00:00 2001 From: Jared He <66887902+jaredjhe@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:02:17 -0500 Subject: [PATCH 4/4] Add sections --- pages/events/[year]/[term]/index.module.css | 2 +- pages/events/[year]/[term]/index.tsx | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pages/events/[year]/[term]/index.module.css b/pages/events/[year]/[term]/index.module.css index 58a6b2f0..adbd529f 100644 --- a/pages/events/[year]/[term]/index.module.css +++ b/pages/events/[year]/[term]/index.module.css @@ -3,7 +3,7 @@ margin-bottom: calc(60rem / 16); } -.main > h1 { +.main > h1, .main > section > h1 { padding-bottom: calc(16rem / 16); border-bottom: calc(1rem / 16) solid var(--primary-heading); } diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx index f0de1e6f..6f21565b 100644 --- a/pages/events/[year]/[term]/index.tsx +++ b/pages/events/[year]/[term]/index.tsx @@ -65,7 +65,7 @@ export default function Term(props: Props) { Archive
{hasFutureEvents && ( - <> +

Upcoming Events

{props.futureEvents.map(({ content, metadata }) => ( @@ -79,9 +79,23 @@ export default function Term(props: Props) { ))}
- +
+ )} + {hasPastEvents && props.isCurrentTerm && ( +
+

Past Events

+
+ {props.pastEvents.map(({ content, metadata }) => ( + } + key={metadata.name + metadata.date.toString()} + /> + ))} +
+
)} - {hasPastEvents && props.isCurrentTerm &&

Past Events

} {hasPastEvents && !props.isCurrentTerm && (

Events Archive: -- 2.39.2