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.

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

Sync develop with current main #1526

Merged
merged 1,468 commits into from
Apr 15, 2022
Merged

Sync develop with current main #1526

merged 1,468 commits into from
Apr 15, 2022

Conversation

thisisdano
Copy link
Member

No description provided.

thisisdano and others added 30 commits December 29, 2021 09:39
remove sass-lint use stylelint
USWDS - Colors: Add tools section in Overview.
Added "Before getting started" info to this page because it applies to all audiences.
Removed "elements like" after colon in first sentence of intro paragraph because it was redundant.
"Before getting started" content was pulled out to the documentation/overview page. New intro text has been added to provide the link to the tutorial site.
Addressed comma errors.
Removed unnecessary "the."
Revised for concision and consistency.
Addressed logic and grammatical errors
Revised for concision, clarity, and inclusivity
Improving copy clarity in intro paragraph
mejiaj and others added 26 commits March 25, 2022 15:56
USWDS-site - Header: update icon markup on header search
USWDS-Site - Add Touchpoints survey
Removing double / to fix broken link
Load components from the proper Fractal source
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.9 to 1.19.11.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](medialize/URI.js@v1.19.9...v1.19.11)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.13.3...v1.13.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
USWDS-Site - Form Component Markdown: Switched package name from usa-form-controls to form-controls
@thisisdano
Copy link
Member Author

Force merging here — we'll troubleshoot in subsequent PRs

@thisisdano thisisdano merged commit efc8062 into develop Apr 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants