diff --git a/client/src/components/J40Aside.tsx b/client/src/components/J40Aside.tsx index b73b9930..4441b7eb 100644 --- a/client/src/components/J40Aside.tsx +++ b/client/src/components/J40Aside.tsx @@ -12,22 +12,22 @@ const J40Aside = () => { aria-labelledby="right-sidebar" className={'j40-aside desktop:grid-col-3 usa-prose usa-section'} id="right-sidebar"> -

Get Involved

-

Get Involved

+

{'chat - Send Feedback

+ Send Feedback

Have ideas about how to acknowledge the on-the-ground experiences of your community?

Email: justice40open@usds.gov

 

-

+

{'github - Join the open source community

+ Join the open source community

Justice40’s code is open source, which means it is available for the public to view and contribute. Anyone can view and diff --git a/client/src/components/J40Header.tsx b/client/src/components/J40Header.tsx index 1fbd0f36..e16ba857 100644 --- a/client/src/components/J40Header.tsx +++ b/client/src/components/J40Header.tsx @@ -57,7 +57,7 @@ const J40Header = () => { return ( <> - + {title} @@ -67,7 +67,8 @@ const J40Header = () => { className={'j40-sitealert'}> Welcome to Justice40's Temporary Home While Justice40 gets up and running, we are using GitHub Pages as a temporary website - host. To learn more about GitHub Pages, click here. + host. To learn more about GitHub Pages, click + here.

{ ]; return ( -

About Justice40

+

About Justice40

In an effort to address historical environmental injustices, President Biden created the Justice40 Initiative on January @@ -71,7 +71,7 @@ const IndexPage = ({location}: IndexPageProps) => { Abroad.

-

Areas of Focus

+

Areas of Focus

    @@ -97,7 +97,7 @@ const IndexPage = ({location}: IndexPageProps) => {
-

A Transparent, Community-First Approach

+

A Transparent, Community-First Approach

Successful initiatives are guided by direct input from the @@ -136,6 +136,7 @@ const IndexPage = ({location}: IndexPageProps) => { being built and the processes for stakeholder and public engagement.

+ ); }; diff --git a/client/src/pages/timeline.tsx b/client/src/pages/timeline.tsx index d7d751b1..d16ae642 100644 --- a/client/src/pages/timeline.tsx +++ b/client/src/pages/timeline.tsx @@ -10,8 +10,8 @@ interface TimelinePageProps { const TimelinePage = ({location}: TimelinePageProps) => { return ( -

Timeline

-

Throughout the Process

+

Timeline

+

Throughout the Process

@@ -30,34 +30,27 @@ const TimelinePage = ({location}: TimelinePageProps) => {
-

Milestones

+

Milestones

  1. -

    Milestone 1

    + aria-label={'milestone 1 done'}> +

    Milestone 1

    - Publish data principles on this site by June 2021.

    + Publish data principles on this site by June 2021.

  2. -

    Milestone 2

    -

    Make the first version of a screening tool available - by - July 2021.

    + aria-label={'milestone 2 next'}> +

    Milestone 2

    +

    Make the first version of a screening tool + available by July 2021.

  3. -

    Milestone 3

    + aria-label={'milestone 3'}> +

    Milestone 3

    Create a public scorecard to ensure accountability of investments by February 2022.

  4. diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss index 66f0ee9f..c5cd17c6 100644 --- a/client/src/styles/global.scss +++ b/client/src/styles/global.scss @@ -66,7 +66,7 @@ $j40-max-width: 80ex; } } -.j40-header, .j40-primary-nav, .j40-header > li > a{ +.j40-header, .j40-primary-nav, .j40-header > li > a { background-color: #112f4e; /* todo: move color to theme */ color: white !important; z-index: 5; @@ -112,19 +112,14 @@ $j40-max-width: 80ex; padding-right: 1em; padding-left: 1em; - h1 { + h2 { font-weight: 100; font-size: 2em; } - h2 { - font-weight: 100; - font-size: 1.4em; - } - h3 { font-weight: 100; - font-size: 1.3em; + font-size: 1.4em; } .j40-aside-icon { @@ -148,11 +143,18 @@ $j40-max-width: 80ex; } // spacing top & bottom around main content -@include at-media("mobile-lg") { - .j40-main-content { +.j40-main-content { + @include at-media("mobile-lg") { margin-bottom: 2rem; margin-top: 2.5rem; } + + h1 { + font-size: 2.13rem; + } + h2 { + font-size: 1.46rem; + } } // This should really be part of uswds and use $theme-step-indicator-segment-color-complete @@ -174,6 +176,7 @@ $j40-max-width: 80ex; h1, h2, h3, h4 { font-family: Source Sans Pro Web, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; } + p, div { max-width: $j40-max-width; } @@ -183,8 +186,10 @@ $j40-max-width: 80ex; p { margin: 0; } + padding-top: 0; padding-bottom: 0; + .usa-alert:before { margin-top: 12px !important; }