From 9388947f9988732d3953fbb23d661fbe652d803e Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 31 Oct 2024 08:02:51 -0400 Subject: [PATCH] Update Login.gov Design System from v9.3.0 to v9.4.0 changelog: Internal, Dependencies, Update Login.gov Design System from v9.3.0 to v9.4.0 --- app/assets/stylesheets/components/_btn.scss | 8 ----- app/assets/stylesheets/email.css.scss | 3 +- .../packages/clipboard-button/package.json | 2 +- app/javascript/packages/tooltip/package.json | 2 +- package.json | 2 +- yarn.lock | 34 ++++++++----------- 6 files changed, 18 insertions(+), 33 deletions(-) diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss index e4e09fd6748..452ac960179 100644 --- a/app/assets/stylesheets/components/_btn.scss +++ b/app/assets/stylesheets/components/_btn.scss @@ -7,14 +7,6 @@ margin-right: 0; } -// Upstream: https://github.com/uswds/uswds/pull/5631 -.usa-button--unstyled { - // Temporary: To be backported to design system. Unstyled buttons should inherit the appearance - // of a link. - display: inline; - width: auto; -} - .usa-button:disabled.usa-button--active, [aria-disabled='true'].usa-button--active { &:not( diff --git a/app/assets/stylesheets/email.css.scss b/app/assets/stylesheets/email.css.scss index 9c8f9cad514..45aaa081097 100644 --- a/app/assets/stylesheets/email.css.scss +++ b/app/assets/stylesheets/email.css.scss @@ -124,8 +124,7 @@ h6 { padding: units(1.5) 0; &:first-child { - padding-left: $alert-icon-optical-padding; - padding-right: units(1); + @include u-padding-x(2); } } diff --git a/app/javascript/packages/clipboard-button/package.json b/app/javascript/packages/clipboard-button/package.json index bd1df2ce1e0..4886af2f2df 100644 --- a/app/javascript/packages/clipboard-button/package.json +++ b/app/javascript/packages/clipboard-button/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@18f/identity-design-system": "^9.3.0" + "@18f/identity-design-system": "^9.4.0" }, "sideEffects": [ "./clipboard-button-element.ts" diff --git a/app/javascript/packages/tooltip/package.json b/app/javascript/packages/tooltip/package.json index bc0959c9b56..0d05010a2cd 100644 --- a/app/javascript/packages/tooltip/package.json +++ b/app/javascript/packages/tooltip/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@18f/identity-design-system": "^9.3.0" + "@18f/identity-design-system": "^9.4.0" }, "sideEffects": [ "./tooltip-element.ts" diff --git a/package.json b/package.json index 677d28c5c72..d712d452ada 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "build:css": "build-sass app/assets/stylesheets/*.css.scss app/components/*.scss --load-path=app/assets/stylesheets --out-dir=app/assets/builds" }, "dependencies": { - "@18f/identity-design-system": "^9.3.0", + "@18f/identity-design-system": "^9.4.0", "@babel/core": "^7.20.7", "@babel/preset-env": "^7.15.6", "@babel/preset-react": "^7.14.5", diff --git a/yarn.lock b/yarn.lock index 8b99b3cb96d..b78594d84ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,13 +2,13 @@ # yarn lockfile v1 -"@18f/identity-design-system@^9.3.0": - version "9.3.0" - resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-9.3.0.tgz#990089ea93c5ac773cf87ac61d175d739ec89ae7" - integrity sha512-vOhBNu20rtSUUIx0bpyLjUTcOzyzLpq9/Oyot+vWPYxyatTg2m+7dpQK8xSNVDtnNtpVEwOhf1GnOGF+v7n+nA== +"@18f/identity-design-system@^9.4.0": + version "9.4.0" + resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-9.4.0.tgz#7d8f8f7fd5090f4245cfac10a29a9581248ea2b0" + integrity sha512-Bg9jo5peAbXVJk+L6sTfB0qWDOGlfTgev2RF4whjfHycBq/+m++gZBkFYlXqQ0EEivCM51I6XQnBd3NVYXEZXA== dependencies: - "@types/uswds__uswds" "^3.8.0" - "@uswds/uswds" "^3.8.1" + "@types/uswds__uswds" "^3.9.0" + "@uswds/uswds" "^3.9.0" "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" @@ -1693,10 +1693,10 @@ dependencies: "@types/react-test-renderer" "*" -"@types/uswds__uswds@^3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@types/uswds__uswds/-/uswds__uswds-3.8.0.tgz#f5e7e05b7f5a450a0dddf303fde765814b626d7b" - integrity sha512-bpM1KLaY7pNpLj7xlouMa+OSXeTCCNN56VJle+gacbyMG1XJXRfQIIihLVKnX7M+P70WZYMM8zXvVTrZzS5wog== +"@types/uswds__uswds@^3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@types/uswds__uswds/-/uswds__uswds-3.9.0.tgz#12a9fcabec442eeda43b7941e6e4d44fd3f94a3d" + integrity sha512-Rg5W3CRq8aEvMIMR0AFsNSsnCJr318ZBXRQ5y5BxbfU+0Fs+5ieWsCmh0YHYPmXJgowU3YFV+zinplSIp8akMg== "@types/wrap-ansi@^3.0.0": version "3.0.0" @@ -1860,12 +1860,11 @@ "@typescript-eslint/types" "6.7.5" eslint-visitor-keys "^3.4.1" -"@uswds/uswds@^3.8.1": - version "3.8.1" - resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.8.1.tgz#3d834559498ae1bb7d3a618f3f85a5f4e9818497" - integrity sha512-bKG/B9mJF1v0yoqth48wQDzST5Xyu3OxxpePIPDyhKWS84oDrCehnu3Z88JhSjdIAJMl8dtjtH8YvdO9kZUpAg== +"@uswds/uswds@^3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.9.0.tgz#e98b52995a001ff091a9c61baeb487064c98bc6a" + integrity sha512-8THm36j7iLjrDiI1D0C6b3hHsmM/Sy5Iiz+IjE+i/gYzVUMG9XVthxAZYonhU97Q1b079n6nYwlUmDSYowJecQ== dependencies: - classlist-polyfill "1.2.0" object-assign "4.1.1" receptor "1.0.0" resolve-id-refs "0.1.0" @@ -2542,11 +2541,6 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -classlist-polyfill@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz#935bc2dfd9458a876b279617514638bcaa964a2e" - integrity sha512-GzIjNdcEtH4ieA2S8NmrSxv7DfEV5fmixQeyTmqmRmRJPGpRBaSnA2a0VrCjyT8iW8JjEdMbKzDotAJf+ajgaQ== - cleave.js@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/cleave.js/-/cleave.js-1.6.0.tgz#0e4e011943bdd70c67c9dcf4ff800ce710529171"