From 2f9680f1702f0833076c4349bf6e5a6f09ed81da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 17:27:55 +0000 Subject: [PATCH 1/4] Bump @18f/identity-design-system from 8.0.1 to 8.1.1 Bumps [@18f/identity-design-system](https://github.com/18F/identity-design-system) from 8.0.1 to 8.1.1. - [Release notes](https://github.com/18F/identity-design-system/releases) - [Changelog](https://github.com/18F/identity-design-system/blob/main/CHANGELOG.md) - [Commits](https://github.com/18F/identity-design-system/compare/v8.0.1...v8.1.1) --- updated-dependencies: - dependency-name: "@18f/identity-design-system" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../packages/clipboard-button/package.json | 2 +- package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/javascript/packages/clipboard-button/package.json b/app/javascript/packages/clipboard-button/package.json index 52fa0f36bf9..453574ef620 100644 --- a/app/javascript/packages/clipboard-button/package.json +++ b/app/javascript/packages/clipboard-button/package.json @@ -3,6 +3,6 @@ "version": "1.0.0", "private": true, "dependencies": { - "@18f/identity-design-system": "^8.0.1" + "@18f/identity-design-system": "^8.1.1" } } diff --git a/package.json b/package.json index d00534af1de..73a742172a8 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,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": "^8.0.1", + "@18f/identity-design-system": "^8.1.1", "@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 e7faaeffc66..517d6a84b4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,12 +2,12 @@ # yarn lockfile v1 -"@18f/identity-design-system@^8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-8.0.1.tgz#72176fe0e8f0418c87caca42f57d9bb370346a55" - integrity sha512-SnVw2Cp2HYaR9bMCQ7RtCjze4j4BOEp83GXB44uMBkOmtk0JViM7BlerHR9XtJ9FH4ke2MnvVx4ScuBbSRhsIQ== +"@18f/identity-design-system@^8.1.1": + version "8.1.1" + resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-8.1.1.tgz#20d0785b533f03dc55229f7e64dcdb48dfa66c08" + integrity sha512-1painG6XKJuAPwBT63V+LWObxwqVYZPbbY7rAyTbn49DiY0MV2qgJqF0OC9HPsZk1LV+Ra3qRq6rNGU69hu+fA== dependencies: - "@uswds/uswds" "^3.6.1" + "@uswds/uswds" "^3.7.1" "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" @@ -1827,7 +1827,7 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== -"@uswds/uswds@^3.6.1": +"@uswds/uswds@^3.7.1": version "3.7.1" resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.7.1.tgz#455dee2d7a9c7b316192bb2e21ecd0df6fad3085" integrity sha512-32u2S50bf5dwIujebqL+f1Jgx2rmRrpxcaccSZzdo3Qv9HaDUdcmeavlrxHqN30edHc7p8kRPjvjevOmOJKB7w== From 012fc930275fb4d145440a01481814aa6392d399 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 29 Jan 2024 12:39:07 -0500 Subject: [PATCH 2/4] Remove patched upstream --- app/assets/stylesheets/components/_alert.scss | 5 ---- app/assets/stylesheets/components/_btn.scss | 29 ------------------- 2 files changed, 34 deletions(-) diff --git a/app/assets/stylesheets/components/_alert.scss b/app/assets/stylesheets/components/_alert.scss index 7ee4d8f7837..1a145ebb8ba 100644 --- a/app/assets/stylesheets/components/_alert.scss +++ b/app/assets/stylesheets/components/_alert.scss @@ -19,8 +19,3 @@ .usa-alert__text > p:last-child { margin-bottom: 0; } - -// Upstream fix: https://github.com/uswds/uswds/pull/5187 -.usa-alert .usa-alert__body::before { - height: units(2); -} diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss index c0e0873d926..e4e09fd6748 100644 --- a/app/assets/stylesheets/components/_btn.scss +++ b/app/assets/stylesheets/components/_btn.scss @@ -30,32 +30,3 @@ @include set-text-and-bg('primary-darker', $context: 'Button'); } } - -// Upstream: https://github.com/18F/identity-design-system/pull/383 -.usa-button--danger.usa-button--outline { - &:not(:disabled, [aria-disabled='true']) { - background-color: color('white'); - box-shadow: inset 0 0 0 $theme-button-stroke-width color('secondary'); - color: color('secondary'); - - &:hover, - &.usa-button--hover { - background-color: color('secondary-lightest'); - box-shadow: inset 0 0 0 $theme-button-stroke-width color('secondary-dark'); - color: color('secondary-dark'); - } - } - - &:active, - &.usa-button--active { - &, - &:focus, - &.usa-button--focus, - &:hover, - &.usa-button--hover { - background-color: color('secondary-lighter'); - box-shadow: inset 0 0 0 $theme-button-stroke-width color('secondary-darker'); - color: color('secondary-darker'); - } - } -} From 044343a7a4964ef7ff6cd4c29911956957379ba7 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 29 Jan 2024 15:21:36 -0500 Subject: [PATCH 3/4] Update to identity-design-system@8.1.2 Fix CommonJS import incompatibility https://github.com/18F/identity-design-system/releases/tag/v8.1.2 --- app/javascript/packages/clipboard-button/package.json | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/javascript/packages/clipboard-button/package.json b/app/javascript/packages/clipboard-button/package.json index 453574ef620..8b468540391 100644 --- a/app/javascript/packages/clipboard-button/package.json +++ b/app/javascript/packages/clipboard-button/package.json @@ -3,6 +3,6 @@ "version": "1.0.0", "private": true, "dependencies": { - "@18f/identity-design-system": "^8.1.1" + "@18f/identity-design-system": "^8.1.2" } } diff --git a/package.json b/package.json index 73a742172a8..1ccfc748444 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,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": "^8.1.1", + "@18f/identity-design-system": "^8.1.2", "@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 517d6a84b4b..8812a371bce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@18f/identity-design-system@^8.1.1": - version "8.1.1" - resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-8.1.1.tgz#20d0785b533f03dc55229f7e64dcdb48dfa66c08" - integrity sha512-1painG6XKJuAPwBT63V+LWObxwqVYZPbbY7rAyTbn49DiY0MV2qgJqF0OC9HPsZk1LV+Ra3qRq6rNGU69hu+fA== +"@18f/identity-design-system@^8.1.2": + version "8.1.2" + resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-8.1.2.tgz#d9f36e50c615afb4ff81befe02309a618647bd33" + integrity sha512-EvhnRvqOWmvjAdV2EedvSeoiN55RFA4RqAIsPTScw1N6QstbXEzJmDA242k3X81nf6Kd1yRFKxrKxNdl1CbmDQ== dependencies: "@uswds/uswds" "^3.7.1" From b37ce96c03bfe42c67fc88544d27b3fc319b83ec Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 29 Jan 2024 16:32:02 -0500 Subject: [PATCH 4/4] Delete us_flag.svg Included in USWDS as of 3.7.0 https://github.com/uswds/uswds/releases/tag/v3.7.0 --- app/assets/images/us_flag.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/assets/images/us_flag.svg diff --git a/app/assets/images/us_flag.svg b/app/assets/images/us_flag.svg deleted file mode 100644 index 275d57b9735..00000000000 --- a/app/assets/images/us_flag.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file