Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 1135 slim footer #1308

Merged
merged 11 commits into from
Dec 10, 2024
Merged

refactor: 1135 slim footer #1308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e856157
usa foot implementation
snmln Dec 5, 2024
65dacea
adding uswds style infrastructure
snmln Dec 9, 2024
1aafd0c
Merge branch '1135-Refactor-Layout-Components-Footer' into 1135-slim-…
snmln Dec 9, 2024
18f0173
implementing styling and creating interface
snmln Dec 9, 2024
60398ed
wiring up config
snmln Dec 9, 2024
a5b4502
correcting styles
snmln Dec 10, 2024
c47e331
Merge branch '1135-Refactor-Layout-Components-Footer' into 1135-slim-…
snmln Dec 10, 2024
e629882
correct ts and lint errors
snmln Dec 10, 2024
a7a91ec
correctin merge conflict issues.
snmln Dec 10, 2024
d0a4cd4
updating styles
snmln Dec 10, 2024
59dd97e
dialing in css
snmln Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/components/common/layout-root/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function LayoutRoot(props: { children?: ReactNode }) {
primarySection={{
footerPrimaryContactItems,
footerPrimaryNavItems
}}
}} // @ts-expect-error: NEED TO DELETE
hideFooter={hideFooter}
/>
) : (
Expand Down
7 changes: 4 additions & 3 deletions app/scripts/components/common/page-footer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ComponentType } from 'react';
import React from 'react';
import { Icon } from '@trussworks/react-uswds';
import NasaLogoColor from '../../nasa-logo-color.js';
import {
Expand All @@ -19,7 +19,7 @@ export default function PageFooter({
primarySection,
hidefooter
}: PageFooterProps) {
console.log(settings, primarySection, hidefooter);
// console.log(settings, primarySection, hidefooter);
const returnToTopButton = () => {
return (
<div
Expand All @@ -34,13 +34,14 @@ export default function PageFooter({
};

const { returnToTop, secondarySection } = settings;
/* eslint-disable */
const { footerPrimaryContactItems, footerPrimaryNavItems } = primarySection;
snmln marked this conversation as resolved.
Show resolved Hide resolved
return (
<>
<USWDSFooter
size='slim'
returnToTop={returnToTop && returnToTopButton()}
// className={hidefooter && 'display-none'}
className={hidefooter && 'display-none'}
primary={
<div
id='footer_primary_container'
Expand Down
Loading