Skip to content

Commit

Permalink
corrcting layout, line-height, and coloring issues
Browse files Browse the repository at this point in the history
  • Loading branch information
snmln committed Dec 20, 2024
1 parent c149d5b commit 23850fd
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 51 deletions.
101 changes: 50 additions & 51 deletions app/scripts/components/common/page-footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,58 +85,57 @@ export default function PageFooter({
[mainNavItems]
);
return (
<>
<USWDSFooter
size='slim'
returnToTop={returnToTop && returnToTopButton()}
className={hideFooter && 'display-none'}
primary={
<div
id='footer_primary_container'
className=' grid-row bg-base-lightest usa-footer__primary-container'
>
<div className='mobile-lg:grid-col-8'>
<USWDSFooterNav
aria-label='Footer navigation'
size='slim'
links={primaryItems}
/>
</div>
<div className='tablet:grid-col-4'>
<USWDSAddress
size='slim'
className='flex-justify-end'
items={secondaryItems}
/>
</div>
<USWDSFooter
size='slim'
returnToTop={returnToTop && returnToTopButton()}
className={hideFooter && 'display-none'}
primary={
<div
id='footer_primary_container'
className=' grid-row usa-footer__primary-container'
>
<div className='mobile-lg:grid-col-8'>
<USWDSFooterNav
aria-label='Footer navigation'
size='slim'
links={primaryItems}
/>
</div>
<div className='tablet:grid-col-4'>
<USWDSAddress
size='slim'
className='flex-justify-end'
items={secondaryItems}
/>
</div>
}
secondary={
<div id='footer_secondary_container' className='grid-row'>
<div id='logo-container'>
<a id='logo-container-link' href='#'>
{logoSvg as JSX.Element}
<span className='footer-text'>
{secondarySection.division}{secondarySection.version}
</span>
</a>
</div>
<div className='grid-col-4 footer-text grid-gap-6 flex-justify-end'>
<span>{secondarySection.title}: </span>
<a
key={secondarySection.type}
href={`mailto:${secondarySection.to}`}
>
<Icon.Mail
className='margin-right-1 width-205 height-auto position-relative'
id='mail_icon'
/>
{secondarySection.name}
</a>
</div>
</div>
}
secondary={
<div id='footer_secondary_container' className='grid-row'>
<div id='logo-container'>
<a id='logo-container-link' href='#'>
{logoSvg as JSX.Element}
<span className='footer-text'>
{secondarySection.division}{secondarySection.version}
</span>
</a>
</div>
}
/>
</>
<div className='grid-col-4 footer-text grid-gap-6 flex-justify-end'>
<span>{secondarySection.title}: </span>
<a
key={secondarySection.type}
href={`mailto:${secondarySection.to}`}
className='text-primary-light'
>
<Icon.Mail
className='margin-right-1 width-205 height-auto position-relative'
id='mail_icon'
/>
{secondarySection.name}
</a>
</div>
</div>
}
/>
);
}
3 changes: 3 additions & 0 deletions app/scripts/components/common/page-footer/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ address {
font-size: themeVars.$veda-uswds-fontsize-sm;
text-underline-offset: themeVars.$veda-uswds-spacing-5;
}
.usa-footer__contact-info {
line-height: unset;
}

0 comments on commit 23850fd

Please sign in to comment.