From 7502f9c6ed98ca70d97f0b9d3a1121f73776900c Mon Sep 17 00:00:00 2001 From: Melissa Samworth Date: Mon, 28 Oct 2024 21:49:19 -0400 Subject: [PATCH 1/2] site-wide footer --- app/components/Footer/footer.css | 6 +++--- app/components/Footer/index.tsx | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/components/Footer/footer.css b/app/components/Footer/footer.css index 235c53b7..e662d8a0 100644 --- a/app/components/Footer/footer.css +++ b/app/components/Footer/footer.css @@ -3,16 +3,16 @@ } .footer-contents { - display: flex; + /* display: flex; gap: var(--spacing-32); flex-direction: row; flex-wrap: nowrap; justify-content: space-between; align-items: baseline; - margin: var(--spacing-104) var(--spacing-80) var(--spacing-80) var(--spacing-80); + margin: var(--spacing-104) var(--spacing-80) var(--spacing-80) var(--spacing-80); */ } -@media (max-width: 780px) { +@media (max-width: 1136px) { .footer-contents { flex-direction: column; gap: 32px; diff --git a/app/components/Footer/index.tsx b/app/components/Footer/index.tsx index b33c1db9..31122139 100644 --- a/app/components/Footer/index.tsx +++ b/app/components/Footer/index.tsx @@ -1,10 +1,9 @@ import {FunctionComponent} from 'react' import './footer.css' - const year = new Date().getFullYear() -const Link = ({to, title}: {to: string; title: string}) => ( -
+const Link = ({to, title, className}: {to: string; title: string; className?: string}) => ( +
{title} @@ -13,9 +12,10 @@ const Link = ({to, title}: {to: string; title: string}) => ( export const FooterBar: FunctionComponent = () => { return ( -
+

-
+
+

AISafety.info @@ -28,25 +28,26 @@ export const FooterBar: FunctionComponent = () => {

Get involved

- - - + + +

Partner projects

- - + +

+
) } From 696e1c05ce49c465237385511911e6a55210c993 Mon Sep 17 00:00:00 2001 From: Melissa Samworth Date: Mon, 28 Oct 2024 21:50:58 -0400 Subject: [PATCH 2/2] lint --- app/components/Footer/index.tsx | 74 +++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/app/components/Footer/index.tsx b/app/components/Footer/index.tsx index 31122139..76ff008d 100644 --- a/app/components/Footer/index.tsx +++ b/app/components/Footer/index.tsx @@ -15,38 +15,58 @@ export const FooterBar: FunctionComponent = () => {

-
-
-

- AISafety.info -

-
- We’re a global team of specialists and volunteers from various backgrounds who want to - ensure that the effects of future AI are beneficial rather than catastrophic. +
+
+

+ AISafety.info +

+
+ We’re a global team of specialists and volunteers from various backgrounds who want to + ensure that the effects of future AI are beneficial rather than catastrophic. +
-
-
-

Get involved

- - - - +
+

Get involved

+ + + + +
+
+

Partner projects

+ + +
-
-

Partner projects

- - +
+
+
-
-
- -
-
) }