Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 83feb7a

Browse files
authored
Merge pull request #531 from GSA/jrc_uswds-bump-2.10.1
USWDS bump to 2.10.1
2 parents 3140208 + c31e78d commit 83feb7a

File tree

1,782 files changed

+16646
-7270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,782 files changed

+16646
-7270
lines changed

.pa11yci

+1-5
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@
1616
},
1717
"urls": [
1818
"http://localhost:8080/",
19-
"http://localhost:8080/browse-projects",
20-
"http://localhost:8080/projects/treasury_bureau_fiscal_service_bfs_1_data_act_broker_backend",
21-
"http://localhost:8080/search?page=1&query=javascript&size=10&sort=best_match",
19+
"http://localhost:8080/agencies",
2220
"http://localhost:8080/federal-agencies/compliance/dashboard",
2321
"http://localhost:8080/federal-agencies/compliance/procurement",
2422
"http://localhost:8080/federal-agencies/compliance/inventory-code",
25-
"http://localhost:8080/open-tasks",
2623
"http://localhost:8080/about-page",
27-
"http://localhost:8080/roadmap",
2824
"http://localhost:8080/privacy-policy"
2925
]
3026
}

.snyk

+2,823-304
Large diffs are not rendered by default.

assets/data/filters/repos.json

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
{ "name": "Department of Transportation", "value": "DOT" },
1616
{ "name": "Department of Veterans Affairs", "value": "VA" },
1717
{ "name": "Environmental Protection Agency", "value": "EPA" },
18+
{ "name": "Federal Election Commission", "value": "FEC" },
1819
{ "name": "General Services Administration", "value": "GSA" },
1920
{ "name": "National Aeronautics and Space Administration", "value": "NASA" },
2021
{ "name": "National Science Foundation", "value": "NSF" },

config/site/agency_list.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@
706706
"overall": "red"
707707
},
708708
"complianceDashboard": false,
709-
"agencyDashboard": false,
709+
"agencyDashboard": true,
710710
"orgs": ["fecgov"]
711711
}
712712
]

package-lock.json

+37-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"snyk": "^1.362.0",
142142
"style-loader": "^0.23.1",
143143
"url-search-params-polyfill": "^5.1.0",
144-
"uswds": "^2.8.0",
144+
"uswds": "^2.10.1",
145145
"webpack": "^4.42.1",
146146
"webpack-bundle-analyzer": "^3.8.0",
147147
"webpack-cli": "^3.3.2",

src/components/about/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class About extends Component {
3838
return (
3939
<main id="main-content">
4040
<SiteBanner title="ABOUT" />
41-
<Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'About' }]} />
42-
<div className="grid-container">
41+
{/* <Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'Agencies' }]} /> */}
42+
<div className="grid-container grid-row tablet-lg:margin-top-4 margin-top-2">
4343
<div className="tablet-lg:display-none display-block padding-bottom-4">
4444
<NavSelect pages={pagesForSelect} />
4545
</div>

src/components/agencies/agencies.component.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ class Agencies extends React.Component {
8181
return (
8282
<main className="search-results-content" id="main-content">
8383
<SiteBanner title="Agencies" />
84-
<Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'Agencies' }]} />
85-
<div className="grid-container">
84+
{/* <Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'Agencies' }]} /> */}
85+
<div className="grid-container grid-row tablet-lg:margin-top-4 margin-top-2">
8686
<div className="grid-row grid-gap" />
8787
</div>
8888
<div className="grid-container">

src/components/agency-compliance/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class AgencyCompliance extends Component {
4343
render() {
4444
return (
4545
<main id="main-content">
46-
<SiteBanner title="FEDERAL AGENCIES" />
47-
<Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'Federal Agencies' }]} />
48-
<div className="grid-container">
46+
<SiteBanner title="GUIDANCE" />
47+
{/* <Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'Guidance' }]} /> */}
48+
<div className="grid-container grid-row tablet-lg:margin-top-4 margin-top-2">
4949
<div className="tablet-lg:display-none display-block padding-bottom-4">
5050
<NavSelect pages={pagesForSelect} />
5151
</div>

src/components/home-news/__snapshots__/home-news.component.test.js.snap

-15
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ exports[`components - HomeNews should render correctly 1`] = `
4242
>
4343
d1
4444
</p>
45-
<time
46-
className="font-body-3xs"
47-
>
48-
dt1
49-
</time>
5045
</div>
5146
<picture
5247
className="order-first padding-right-2"
@@ -85,11 +80,6 @@ exports[`components - HomeNews should render correctly 1`] = `
8580
>
8681
d2
8782
</p>
88-
<time
89-
className="font-body-3xs"
90-
>
91-
dt2
92-
</time>
9383
</div>
9484
<picture
9585
className="order-first padding-right-2"
@@ -128,11 +118,6 @@ exports[`components - HomeNews should render correctly 1`] = `
128118
>
129119
d3
130120
</p>
131-
<time
132-
className="font-body-3xs"
133-
>
134-
dt3
135-
</time>
136121
</div>
137122
<picture
138123
className="order-first padding-right-2"

src/components/home-news/home-news.component.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ export default class HomeNews extends Component {
2020
{news.title}
2121
</a>
2222
</h3>
23-
<p className="margin-bottom-0 font-body-2xs margin-top-105">{news.description}</p>
23+
<p className="margin-bottom-0 font-body-2xs margin-top-105">
24+
{news.description}
25+
</p>
26+
{/*
2427
<time className="font-body-3xs">{news.date}</time>
28+
*/}
2529
</div>
2630
<picture className="order-first padding-right-2">
2731
<source srcSet={news.image} media="min-width: 800px" />

src/components/privacy-policy/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class PrivacyPolicy extends Component {
5353
return (
5454
<main id="main-content">
5555
<SiteBanner title="PRIVACY POLICY" />
56-
<Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'Privacy Policy' }]} />
57-
<div className="grid-container">
56+
{/* <Breadcrumbs crumbs={[{ text: 'Home', to: '/' }, { text: 'Agencies' }]} /> */}
57+
<div className="grid-container grid-row tablet-lg:margin-top-4 margin-top-2">
5858
<div className="tablet-lg:display-none display-block padding-bottom-4">
5959
<NavSelect
6060
pages={sections.map(section => ({

0 commit comments

Comments
 (0)