From 4a24a905a3126b238e54abe57d20a137a00b852b Mon Sep 17 00:00:00 2001 From: Tim Hostetler <6970899+thostetler@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:50:05 -0400 Subject: [PATCH] Fixup footer logos --- src/components/Footer/Footer.tsx | 29 ++-- src/components/images/CFALogo.tsx | 2 +- src/components/images/NASAPartnerLogo.tsx | 189 ++++++++++++++++++++++ src/components/images/NasaLogo.tsx | 58 ------- src/components/images/SmithsonianLogo.tsx | 87 +++++++--- src/components/images/index.ts | 2 +- 6 files changed, 275 insertions(+), 92 deletions(-) create mode 100644 src/components/images/NASAPartnerLogo.tsx delete mode 100644 src/components/images/NasaLogo.tsx diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx index f8a329630..1b1413138 100644 --- a/src/components/Footer/Footer.tsx +++ b/src/components/Footer/Footer.tsx @@ -1,5 +1,5 @@ import { Box, Flex, HStack, Text, VisuallyHidden } from '@chakra-ui/react'; -import { CFALogo, NasaLogo, SimpleLink, SmithsonianLogo } from '@/components'; +import { CFALogo, NASAPartnerLogo, SimpleLink, SmithsonianLogo } from '@/components'; import { FC } from 'react'; import { EXTERNAL_URLS } from '@/config'; @@ -21,10 +21,6 @@ export const Footer: FC = () => { © The{' '} SAO - - / - - NASA {' '} Astrophysics Data System @@ -37,22 +33,27 @@ export const Footer: FC = () => { {' '} Cooperative Agreement 80NSSC21M0056. - - - - NASA - - - + Smithsonian Institution - + Center for Astrophysics - + + + + + NASA + + + + *The material contained in this document is based upon work supported by a National Aeronautics and Space + Administration (NASA) grant or cooperative agreement. Any opinions, findings, conclusions or recommendations + expressed in this material are those of the author and do not necessarily reflect the views of NASA. + diff --git a/src/components/images/CFALogo.tsx b/src/components/images/CFALogo.tsx index 6e4368357..e6a4828bd 100644 --- a/src/components/images/CFALogo.tsx +++ b/src/components/images/CFALogo.tsx @@ -1,7 +1,7 @@ import { forwardRef, Ref, SVGProps } from 'react'; const logo = (props: SVGProps, ref: Ref) => ( - + diff --git a/src/components/images/NASAPartnerLogo.tsx b/src/components/images/NASAPartnerLogo.tsx new file mode 100644 index 000000000..64826e54e --- /dev/null +++ b/src/components/images/NASAPartnerLogo.tsx @@ -0,0 +1,189 @@ +import { forwardRef, Ref, SVGProps } from 'react'; + +const SvgComponent = (props: SVGProps, ref: Ref) => ( + + + + + + + + + + + + + + + + + + + + +); + +const ForwardRef = forwardRef(SvgComponent); +export { ForwardRef as NASAPartnerLogo }; diff --git a/src/components/images/NasaLogo.tsx b/src/components/images/NasaLogo.tsx deleted file mode 100644 index 538e884ac..000000000 --- a/src/components/images/NasaLogo.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import { forwardRef, Ref, SVGProps } from 'react'; - -const logo = (props: SVGProps, ref: Ref) => ( - - - - - - - - - - - - - - - - -); - -export const NasaLogo = forwardRef(logo); diff --git a/src/components/images/SmithsonianLogo.tsx b/src/components/images/SmithsonianLogo.tsx index e423df32e..018e56c44 100644 --- a/src/components/images/SmithsonianLogo.tsx +++ b/src/components/images/SmithsonianLogo.tsx @@ -1,22 +1,73 @@ +import * as React from 'react'; import { forwardRef, Ref, SVGProps } from 'react'; -const logo = (props: SVGProps, ref: Ref) => ( - - - - - - +const SvgComponent = (props: SVGProps, ref: Ref) => ( + + + + + + ); - -export const SmithsonianLogo = forwardRef(logo); +const ForwardRef = forwardRef(SvgComponent); +export { ForwardRef as SmithsonianLogo }; diff --git a/src/components/images/index.ts b/src/components/images/index.ts index ee45ccd76..26753cf2e 100644 --- a/src/components/images/index.ts +++ b/src/components/images/index.ts @@ -1,6 +1,6 @@ export * from './ScixAndTextLogo-H'; export * from './CFALogo'; -export * from './NasaLogo'; +export * from './NASAPartnerLogo'; export * from './OrcidInactiveLogo'; export * from './OrcidLogo'; export * from './SmithsonianLogo';