Minimal refactor to make maps wider (#149)

Not particularly pretty, but it works.
This commit is contained in:
TomNUSDS 2021-06-17 07:31:18 -07:00 committed by GitHub
commit e7ccd35aa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 146 additions and 139 deletions

View file

@ -11,6 +11,11 @@ interface ILayoutProps {
} }
const Layout = ({children, location}: ILayoutProps) => { const Layout = ({children, location}: ILayoutProps) => {
const isWidthFullPage = location.pathname.endsWith('/cejst');
const conditionalAside = isWidthFullPage ? <></> : <J40Aside/>;
const gridCssClass = isWidthFullPage ? ' desktop:grid-col-12' :
'desktop:grid-col-9';
return ( return (
<URLFlagProvider location={location}> <URLFlagProvider location={location}>
<J40Header/> <J40Header/>
@ -18,12 +23,10 @@ const Layout = ({children, location}: ILayoutProps) => {
className={'j40-grid-container'}> className={'j40-grid-container'}>
<Grid row> <Grid row>
<main id={'main-content'} <main id={'main-content'}
className={'usa-layout-docs desktop:grid-col-9 j40-main-content'}> className={'usa-layout-docs j40-main-content ' + gridCssClass}>
<section className={'usa-prose'}>
{children} {children}
</section>
</main> </main>
<J40Aside/> {conditionalAside}
</Grid> </Grid>
</GridContainer> </GridContainer>
<J40Footer/> <J40Footer/>

View file

@ -1,4 +1,5 @@
.mapContainer { .mapContainer {
height: 676px; height: 676px;
margin-bottom: 29px; margin-bottom: 29px;
max-width: revert;
} }

View file

@ -36,6 +36,7 @@ const IndexPage = ({location}: IndexPageProps) => {
]; ];
return (<Layout location={location}> return (<Layout location={location}>
<section className={'usa-prose'}>
<h1>About Justice40</h1> <h1>About Justice40</h1>
<p> <p>
In an effort to address historical environmental injustices, In an effort to address historical environmental injustices,
@ -137,7 +138,7 @@ const IndexPage = ({location}: IndexPageProps) => {
being built and the processes for stakeholder and public being built and the processes for stakeholder and public
engagement. engagement.
</p> </p>
</section>
</Layout> </Layout>
); );
}; };

View file

@ -10,6 +10,7 @@ interface TimelinePageProps {
const TimelinePage = ({location}: TimelinePageProps) => { const TimelinePage = ({location}: TimelinePageProps) => {
return (<Layout location={location}> return (<Layout location={location}>
<section className={'usa-prose'}>
<h1>Timeline</h1> <h1>Timeline</h1>
<h2>Throughout the Process</h2> <h2>Throughout the Process</h2>
<div className="grid-col"> <div className="grid-col">
@ -55,6 +56,7 @@ const TimelinePage = ({location}: TimelinePageProps) => {
investments by February 2022.</p> investments by February 2022.</p>
</li> </li>
</ol> </ol>
</section>
</Layout> </Layout>
); );
}; };