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

Jump to bottom

chore: Update to USWDS 2.11.2 #1610

Merged
merged 5 commits into from
Oct 5, 2021
Merged

chore: Update to USWDS 2.11.2 #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cefff0d
2.11 update
Sep 29, 2021
9944911
Update thumbs down icon
Sep 29, 2021
660d3a6
Merge branch 'main' into sr-1304-uswds-2.11
Oct 4, 2021
7631e46
Merge branch 'main' into sr-1304-uswds-2.11
Oct 4, 2021
0a3c444
Merge branch 'main' into sr-1304-uswds-2.11
Oct 5, 2021
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"peerDependencies": {
"react": "^16.x || ^17.x",
"react-dom": "^16.x || ^17.x",
"uswds": "2.10.3"
"uswds": "2.11.2"
},
"devDependencies": {
"@babel/core": "^7.10.5",
Expand Down Expand Up @@ -129,7 +129,7 @@
"stylelint-scss": "^3.17.1",
"ts-jest": "^26.1.2",
"typescript": "^4.2.4",
"uswds": "2.10.3",
"uswds": "2.11.2",
"webpack": "^5.52.1",
"webpack-cli": "^4.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/Accordion/Accordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const AccordionItem = ({

return (
<>
<h2 className={headingClasses}>
<h4 className={headingClasses}>
<button
type="button"
className="usa-accordion__button"
Expand All @@ -44,7 +44,7 @@ export const AccordionItem = ({
onClick={handleToggle}>
{title}
</button>
</h2>
</h4>
<div
id={id}
data-testid={`accordionItem_${id}`}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Alert/Alert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const Alert = ({
return (
<div className={classes} data-testid="alert" {...props}>
<div className="usa-alert__body">
{heading && <h3 className="usa-alert__heading">{heading}</h3>}
{heading && <h4 className="usa-alert__heading">{heading}</h4>}
{children &&
(validation ? (
children
Expand Down
2 changes: 1 addition & 1 deletion src/components/Icon/Icons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ import StoreSvg from 'uswds/dist/img/usa-icons/store.svg?svgr'
import SupportSvg from 'uswds/dist/img/usa-icons/support.svg?svgr'
import SupportAgentSvg from 'uswds/dist/img/usa-icons/support_agent.svg?svgr'
import TextFieldsSvg from 'uswds/dist/img/usa-icons/text_fields.svg?svgr'
import ThumbDownAltSvg from 'uswds/dist/img/usa-icons/thumb_down_off_alt.svg?svgr'
import ThumbDownAltSvg from 'uswds/dist/img/usa-icons/thumb_down_alt.svg?svgr'
import ThumbUpAltSvg from 'uswds/dist/img/usa-icons/thumb_up_alt.svg?svgr'
import TimerSvg from 'uswds/dist/img/usa-icons/timer.svg?svgr'
import ToggleOffSvg from 'uswds/dist/img/usa-icons/toggle_off.svg?svgr'
Expand Down
2 changes: 1 addition & 1 deletion src/components/forms/Validation/Validation.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const Default = (): React.ReactElement => {
onSubmit={(): void => {
console.log('submit')
}}>
<Fieldset legend="Enter a code">
<Fieldset legend="Enter a code" legendStyle="large">
<Alert type="info" validation heading="Code Requirements">
<ValidationChecklist id="validate-code">
<ValidationItem id="uppercase" isValid={validations.uppercase}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/stepindicator/StepIndicator/StepIndicator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const StepIndicator = (
{children}
</ol>
<div className="usa-step-indicator__header">
<h2 className="usa-step-indicator__heading">
<h4 className="usa-step-indicator__heading">
<span className="usa-step-indicator__heading-counter">
<span className="usa-sr-only">Step</span>
<span className="usa-step-indicator__current-step">
Expand All @@ -67,7 +67,7 @@ export const StepIndicator = (
<span className="usa-step-indicator__heading-text">
{currentStepLabel}
</span>
</h2>
</h4>
</div>
</div>
)
Expand Down
11 changes: 5 additions & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10884,7 +10884,7 @@ lodash.clonedeep@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=

lodash.debounce@^4.0.7, lodash.debounce@^4.0.8:
lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
Expand Down Expand Up @@ -15756,16 +15756,15 @@ use@^3.1.0:
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==

uswds@2.10.3:
version "2.10.3"
resolved "https://registry.yarnpkg.com/uswds/-/uswds-2.10.3.tgz#16d34cee81897762d6d69d3ac83aa55129826fa6"
integrity sha512-krNRzx1jRzOJpuH/qtmQhd5zxnXTaDVqrPNYT99sJbxzWUqjb1zZHh3jFNo+xKDpNuiO0XMPwZwlaSp2YdZ3Ag==
uswds@2.11.2:
version "2.11.2"
resolved "https://registry.yarnpkg.com/uswds/-/uswds-2.11.2.tgz#bf5ff132f6324c0939d01b7eefebde340c22dcec"
integrity sha512-JISTXCjPIlrufbObIifjrMDn5jF9bbLu7UYhGWmEs9iqB6Z2KDCXHVoBUyzMmIrIjW/UWWYHZzPqOOHO6/IMCQ==
dependencies:
classlist-polyfill "^1.0.3"
del "^6.0.0"
domready "^1.0.8"
elem-dataset "^2.0.0"
lodash.debounce "^4.0.7"
object-assign "^4.1.1"
receptor "^1.0.0"
resolve-id-refs "^0.1.0"
Expand Down