From 413b62b7c7cebdb7829cc554facb30e0b18e0e28 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Tue, 13 Oct 2020 10:40:43 -0400 Subject: [PATCH 01/18] Upgrade USWDS to 2.9.0 --- package-lock.json | 384 ++++++++++------------------- package.json | 2 +- src/scss/uswds-theme/_color.scss | 122 ++++----- src/scss/uswds-theme/_general.scss | 3 +- 4 files changed, 192 insertions(+), 319 deletions(-) diff --git a/package-lock.json b/package-lock.json index 517d2dc5..5d644b32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2114,6 +2114,16 @@ "@babel/types": "^7.3.0" } }, + "@types/glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "dev": true, + "requires": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, "@types/graceful-fs": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz", @@ -2153,6 +2163,12 @@ "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true + }, "@types/minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz", @@ -2320,6 +2336,24 @@ "es6-promisify": "^5.0.0" } }, + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "dependencies": { + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + } + } + }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -4580,6 +4614,12 @@ "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=", "dev": true }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, "cli-boxes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", @@ -5839,32 +5879,76 @@ "dev": true }, "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz", + "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==", "dev": true, "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" + "globby": "^10.0.1", + "graceful-fs": "^4.2.2", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.1", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "slash": "^3.0.0" }, "dependencies": { + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", "dev": true, "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" } } } @@ -6150,9 +6234,9 @@ "dev": true }, "elem-dataset": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/elem-dataset/-/elem-dataset-1.1.1.tgz", - "integrity": "sha1-GPB/p/xx69SbD59jgZywPIJ2V3o=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/elem-dataset/-/elem-dataset-2.0.0.tgz", + "integrity": "sha512-e7gieGopWw5dMdEgythH3lUS7nMizutPDTtkzfQW/q2gCvFnACyNnK3ytCncAXKxdBXQWcXeKaYTTODiMnp8mw==", "dev": true }, "element-closest": { @@ -9870,28 +9954,16 @@ "dev": true }, "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", "dev": true }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } - }, "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", + "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", + "dev": true }, "is-plain-obj": { "version": "1.1.0", @@ -12934,15 +13006,6 @@ "tmpl": "1.0.x" } }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, - "requires": { - "p-defer": "^1.0.0" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -13060,17 +13123,6 @@ "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==", "dev": true }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - } - }, "memoizee": { "version": "0.4.14", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", @@ -14059,12 +14111,6 @@ "os-tmpdir": "^1.0.0" } }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true - }, "p-each-series": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", @@ -14077,12 +14123,6 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, - "p-is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", - "dev": true - }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -14101,6 +14141,15 @@ "p-limit": "^1.1.0" } }, + "p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } + }, "p-timeout": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", @@ -19775,12 +19824,6 @@ "is-typedarray": "^1.0.0" } }, - "typescript": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", - "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", - "dev": true - }, "uglify-js": { "version": "3.4.9", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", @@ -20127,190 +20170,19 @@ "dev": true }, "uswds": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.0.3.tgz", - "integrity": "sha512-VxiMrtdlbZZ5VCaoZ81Jie4ijVloYcN7WQ/75lEdgReJ6l7zYDcmNLsZ7l+PYJMQPP555FSjHKiBDPT6A990MA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.9.0.tgz", + "integrity": "sha512-5IMVgMCUUlgWVFrB7Wf1qTvv5L3oDDlSsAgvJ02+/sV2uh4JzO9YPm3493RTaMuHTc+feRCuYyEIloXsEQY0Pg==", "dev": true, "requires": { - "@types/node": "^8.10.39", - "array-filter": "^1.0.0", "classlist-polyfill": "^1.0.3", - "del": "^2.2.0", + "del": "^5.1.0", "domready": "^1.0.8", - "elem-dataset": "^1.1.1", + "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", - "typescript": "^2.4.1", - "yargs": "^12.0.5" - }, - "dependencies": { - "@types/node": { - "version": "8.10.64", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.64.tgz", - "integrity": "sha512-/EwBIb+imu8Qi/A3NF9sJ9iuKo7yV+pryqjmeRqaU0C4wBAOhas5mdvoYeJ5PCKrh6thRSJHdoasFqh3BQGILA==", - "dev": true - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } + "resolve-id-refs": "^0.1.0" } }, "uswds-gulp": { diff --git a/package.json b/package.json index 2f11498c..f099d23e 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "serve": "^11.3.2", "stylelint": "^13.7.2", "stylelint-scss": "^3.18.0", - "uswds": "^2.0.3", + "uswds": "^2.9.0", "uswds-gulp": "github:uswds/uswds-gulp", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", diff --git a/src/scss/uswds-theme/_color.scss b/src/scss/uswds-theme/_color.scss index 331aa14e..341bbdad 100644 --- a/src/scss/uswds-theme/_color.scss +++ b/src/scss/uswds-theme/_color.scss @@ -81,45 +81,45 @@ Theme palette colors // Base colors $theme-color-base-family: 'grey'; -$theme-color-base-lightest: 'site-lightest-grey'; -$theme-color-base-lighter: 'site-lighter-grey'; -$theme-color-base-light: 'site-light-grey'; -$theme-color-base: 'site-grey'; -$theme-color-base-dark: 'site-dark-grey'; -$theme-color-base-darker: 'site-darker-grey'; -$theme-color-base-darkest: 'site-darkest-grey'; -$theme-color-base-ink: 'site-ink'; +$theme-color-base-lightest: map-get($site-palette, 'site-lightest-grey'); +$theme-color-base-lighter: map-get($site-palette, 'site-lighter-grey'); +$theme-color-base-light: map-get($site-palette, 'site-light-grey'); +$theme-color-base: map-get($site-palette, 'site-grey'); +$theme-color-base-dark: map-get($site-palette, 'site-dark-grey'); +$theme-color-base-darker: map-get($site-palette, 'site-darker-grey'); +$theme-color-base-darkest: map-get($site-palette, 'site-darkest-grey'); +$theme-color-base-ink: map-get($site-palette, 'site-ink'); // Primary colors -$theme-color-primary-lightest: 'site-lightest-blue'; -$theme-color-primary-lighter: 'site-lighter-blue'; -$theme-color-primary-light: 'site-light-blue'; -$theme-color-primary: 'site-blue'; -$theme-color-primary-vivid: false; -$theme-color-primary-dark: 'site-dark-blue'; -$theme-color-primary-darker: 'site-darker-blue'; -$theme-color-primary-darkest: 'site-darkest-blue'; +$theme-color-primary-lightest: map-get($site-palette, 'site-lightest-blue'); +$theme-color-primary-lighter: map-get($site-palette, 'site-lighter-blue'); +$theme-color-primary-light: map-get($site-palette, 'site-light-blue'); +$theme-color-primary: map-get($site-palette, 'site-blue'); +$theme-color-primary-vivid: map-get($site-palette, 'site-blue'); +$theme-color-primary-dark: map-get($site-palette, 'site-dark-blue'); +$theme-color-primary-darker: map-get($site-palette, 'site-darker-blue'); +$theme-color-primary-darkest: map-get($site-palette, 'site-darkest-blue'); // Secondary colors -$theme-color-secondary-lightest: 'site-lightest-red'; -$theme-color-secondary-lighter: 'site-lighter-red'; -$theme-color-secondary-light: 'site-light-red'; -$theme-color-secondary: 'site-red'; +$theme-color-secondary-lightest: map-get($site-palette, 'site-lightest-red'); +$theme-color-secondary-lighter: map-get($site-palette, 'site-lighter-red'); +$theme-color-secondary-light: map-get($site-palette, 'site-light-red'); +$theme-color-secondary: map-get($site-palette, 'site-red'); $theme-color-secondary-vivid: false; -$theme-color-secondary-dark: 'site-dark-red'; -$theme-color-secondary-darker: 'site-darker-red'; -$theme-color-secondary-darkest: 'site-darkest-red'; +$theme-color-secondary-dark: map-get($site-palette, 'site-dark-red'); +$theme-color-secondary-darker: map-get($site-palette, 'site-darker-red'); +$theme-color-secondary-darkest: map-get($site-palette, 'site-darkest-red'); // Grey colors $theme-color-grey: 'grey'; -$theme-color-grey-lightest: 'site-lightest-grey'; -$theme-color-grey-lighter: 'site-lighter-grey'; -$theme-color-grey-light: 'site-light-grey'; -$theme-color-grey: 'site-grey'; +$theme-color-grey-lightest: map-get($site-palette, 'site-lightest-grey'); +$theme-color-grey-lighter: map-get($site-palette, 'site-lighter-grey'); +$theme-color-grey-light: map-get($site-palette, 'site-light-grey'); +$theme-color-grey: map-get($site-palette, 'site-grey'); $theme-color-grey-vivid: false; -$theme-color-grey-dark: 'site-dark-grey'; -$theme-color-grey-darker: 'site-darker-grey'; -$theme-color-grey-darkest: 'site-darkest-grey'; +$theme-color-grey-dark: map-get($site-palette, 'site-dark-grey'); +$theme-color-grey-darker: map-get($site-palette, 'site-darker-grey'); +$theme-color-grey-darkest: map-get($site-palette, 'site-darkest-grey'); // Accent warm colors $theme-color-accent-warm-family: 'orange'; @@ -133,13 +133,13 @@ $theme-color-accent-warm-darkest: false; // Accent cool colors $theme-color-accent-cool-family: 'teal'; -$theme-color-accent-cool-lightest: 'site-lightest-teal'; -$theme-color-accent-cool-lighter: 'site-lighter-teal'; -$theme-color-accent-cool-light: 'site-light-teal'; -$theme-color-accent-cool: 'site-teal'; -$theme-color-accent-cool-dark: 'site-dark-teal'; -$theme-color-accent-cool-darker: 'site-darker-teal'; -$theme-color-accent-cool-darkest: 'site-darkest-teal'; +$theme-color-accent-cool-lightest: map-get($site-palette, 'site-lightest-teal'); +$theme-color-accent-cool-lighter: map-get($site-palette, 'site-lighter-teal'); +$theme-color-accent-cool-light: map-get($site-palette, 'site-light-teal'); +$theme-color-accent-cool: map-get($site-palette, 'site-teal'); +$theme-color-accent-cool-dark: map-get($site-palette, 'site-dark-teal'); +$theme-color-accent-cool-darker: map-get($site-palette, 'site-darker-teal'); +$theme-color-accent-cool-darkest: map-get($site-palette, 'site-darkest-teal'); /* ---------------------------------------- @@ -149,41 +149,41 @@ State palette colors // Error colors $theme-color-error-family: 'red'; -$theme-color-error-lighter: 'site-lightest-red'; -$theme-color-error-light: 'site-lighter-red'; -$theme-color-error: 'site-red'; -$theme-color-error-dark: 'site-darker-red'; -$theme-color-error-darker: 'site-darkest-red'; +$theme-color-error-lighter: map-get($site-palette, 'site-lightest-red'); +$theme-color-error-light: map-get($site-palette, 'site-lighter-red'); +$theme-color-error: map-get($site-palette, 'site-red'); +$theme-color-error-dark: map-get($site-palette, 'site-darker-red'); +$theme-color-error-darker: map-get($site-palette, 'site-darkest-red'); // Warning colors $theme-color-warning-family: 'yellow'; -$theme-color-warning-lighter: 'site-lightest-yellow'; -$theme-color-warning-light: 'site-lighter-yellow'; -$theme-color-warning: 'site-yellow'; -$theme-color-warning-dark: 'site-darker-yellow'; -$theme-color-warning-darker: 'site-darkest-yellow'; +$theme-color-warning-lighter: map-get($site-palette, 'site-lightest-yellow'); +$theme-color-warning-light: map-get($site-palette, 'site-lighter-yellow'); +$theme-color-warning: map-get($site-palette, 'site-yellow'); +$theme-color-warning-dark: map-get($site-palette, 'site-darker-yellow'); +$theme-color-warning-darker: map-get($site-palette, 'site-darkest-yellow'); // Success colors $theme-color-success-family: 'green'; -$theme-color-success-lighter: 'site-lightest-green'; -$theme-color-success-light: 'site-lighter-green'; -$theme-color-success: 'site-green'; -$theme-color-success-dark: 'site-darker-green'; -$theme-color-success-darker: 'site-darkest-green'; +$theme-color-success-lighter: map-get($site-palette, 'site-lightest-green'); +$theme-color-success-light: map-get($site-palette, 'site-lighter-green'); +$theme-color-success: map-get($site-palette, 'site-green'); +$theme-color-success-dark: map-get($site-palette, 'site-darker-green'); +$theme-color-success-darker: map-get($site-palette, 'site-darkest-green'); // Info colors $theme-color-info-family: 'teal'; -$theme-color-info-lighter: 'site-lightest-teal'; -$theme-color-info-light: 'site-lighter-teal'; -$theme-color-info: 'site-teal'; -$theme-color-info-dark: 'site-darker-teal'; -$theme-color-info-darker: 'site-darkest-teal'; +$theme-color-info-lighter: map-get($site-palette, 'site-lightest-teal'); +$theme-color-info-light: map-get($site-palette, 'site-lighter-teal'); +$theme-color-info: map-get($site-palette, 'site-teal'); +$theme-color-info-dark: map-get($site-palette, 'site-darker-teal'); +$theme-color-info-darker: map-get($site-palette, 'site-darkest-teal'); // Disabled colors $theme-color-disabled-family: 'grey'; -$theme-color-disabled-light: 'site-lightest-grey'; -$theme-color-disabled: 'site-disabled-grey'; -$theme-color-disabled-dark: 'site-darker-grey'; +$theme-color-disabled-light: 'gray-30'; // map-get($site-palette, 'site-lightest-grey'); +$theme-color-disabled: map-get($site-palette, 'site-disabled-grey'); +$theme-color-disabled-dark: map-get($site-palette, 'site-darker-grey'); /* ---------------------------------------- @@ -195,4 +195,4 @@ General colors $theme-link-color: 'primary'; $theme-link-visited-color: 'violet-70v'; $theme-link-hover-color: 'primary-darker'; -$theme-link-active-color: 'primary-darker'; \ No newline at end of file +$theme-link-active-color: 'primary-darker'; diff --git a/src/scss/uswds-theme/_general.scss b/src/scss/uswds-theme/_general.scss index cf7b63c6..8891a198 100644 --- a/src/scss/uswds-theme/_general.scss +++ b/src/scss/uswds-theme/_general.scss @@ -37,7 +37,8 @@ mixins use nonstanard or false tokens. ---------------------------------------- */ -$theme-show-compile-warnings: true; +$theme-show-compile-warnings: false; +$theme-show-notifications: false; /* ---------------------------------------- From 1b10c9b210444a8991a0c7bdf696a9a2792d3037 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Wed, 14 Oct 2020 17:34:04 -0400 Subject: [PATCH 02/18] Reconcile banner changes from USWDS upgrade --- src/scss/components/_banner.scss | 55 ++++++++++++-------------------- src/scss/uswds-theme/_color.scss | 3 ++ 2 files changed, 24 insertions(+), 34 deletions(-) diff --git a/src/scss/components/_banner.scss b/src/scss/components/_banner.scss index a07a970d..9a3d67ab 100644 --- a/src/scss/components/_banner.scss +++ b/src/scss/components/_banner.scss @@ -1,54 +1,41 @@ -.usa-banner { - background-color: color('primary-lighter'); -} - .usa-banner__header { + @include set-text-from-bg('primary-darker'); background-color: color('primary-darker'); - color: color('white'); padding: units(1) 0; @include at-media('tablet') { - background-color: color('primary-darker'); - color: color('white'); padding: units(1) 0; } } -.usa-banner__button { - color: color('white'); - background-color: transparent; - border: 0; - border-radius: 0; - - &:hover { - background-color: transparent; +.usa-banner__header--expanded { + @include at-media('tablet') { + background-color: color('primary-darker'); + padding: units(1) 0; } +} - @include at-media('tablet') { - @include add-icon('angle-arrow-down-white', 'after', 1, 1, 0.5, 'hover'); +.usa-accordion__button.usa-banner__button { + // Reset default accordion button border styling for banner button. + @include u-border(0); + @include u-radius(0); + color: currentColor; - &:hover { - color: inherit; - } + &:hover, + &:active { + background-color: color('transparent'); + color: currentColor; } +} +.usa-banner__button { + &, &[aria-expanded=true] { @include at-media('tablet') { - @include add-icon('angle-arrow-up-white', 'after', 1, 1, 0.5, 'hover'); - } - - @include at-media-max('tablet') { - @include add-icon('close-primary', 'after', $theme-icon-image-size, $size-touch-target, 0, 'no-hover'); - - &::after { - background-color: color('primary-lighter'); + &::after, + &:hover::after { + background-color: currentColor; } } } } - -.usa-banner__header-action { - color: color('white'); - - @include add-icon('angle-arrow-down-white', 'after', 1, 1, 0.5, 'hover'); -} diff --git a/src/scss/uswds-theme/_color.scss b/src/scss/uswds-theme/_color.scss index 341bbdad..17ff9099 100644 --- a/src/scss/uswds-theme/_color.scss +++ b/src/scss/uswds-theme/_color.scss @@ -191,6 +191,9 @@ General colors ---------------------------------------- */ +// Banner +$theme-banner-background-color: 'primary-lighter'; + // Links $theme-link-color: 'primary'; $theme-link-visited-color: 'violet-70v'; From 1599221893ad9f51a7bcf89c0a9f4b1745f2ab77 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Wed, 14 Oct 2020 17:45:55 -0400 Subject: [PATCH 03/18] Add overflow to highlighted code segments --- src/scss/components/_code.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scss/components/_code.scss b/src/scss/components/_code.scss index 6dd6c680..cfed9aa9 100644 --- a/src/scss/components/_code.scss +++ b/src/scss/components/_code.scss @@ -33,6 +33,7 @@ pre { } .highlight { + @include u-overflow-x('auto'); position: relative; max-width: 90ch; From 387e82a0fd3447dc569a7aff89b4d3ed05f55a0e Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Wed, 14 Oct 2020 18:05:05 -0400 Subject: [PATCH 04/18] Update deprecated header settings value See: https://designsystem.digital.gov/about/releases/#version-220 --- src/scss/uswds-theme/_components.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scss/uswds-theme/_components.scss b/src/scss/uswds-theme/_components.scss index eea618dc..d42395a7 100644 --- a/src/scss/uswds-theme/_components.scss +++ b/src/scss/uswds-theme/_components.scss @@ -43,11 +43,11 @@ $theme-input-max-width: 'mobile-lg'; // Header $theme-header-font-family: 'ui'; -$theme-megamenu-logo-text-width: 33%; +$theme-header-logo-text-width: 33%; // Navigation $theme-navigation-font-family: 'ui'; -$theme-navigation-width: 'desktop'; +$theme-navigation-min-width: 'desktop'; // Search $theme-search-font-family: 'ui'; From 5039b28101f08bcdbfca109cc51efd3baf3a0604 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 15 Oct 2020 08:11:15 -0400 Subject: [PATCH 05/18] Fix light disabled grey color --- src/scss/uswds-theme/_color.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/uswds-theme/_color.scss b/src/scss/uswds-theme/_color.scss index 17ff9099..d178d38a 100644 --- a/src/scss/uswds-theme/_color.scss +++ b/src/scss/uswds-theme/_color.scss @@ -181,7 +181,7 @@ $theme-color-info-darker: map-get($site-palette, 'site-darkest-teal'); // Disabled colors $theme-color-disabled-family: 'grey'; -$theme-color-disabled-light: 'gray-30'; // map-get($site-palette, 'site-lightest-grey'); +$theme-color-disabled-light: 'gray-5'; // map-get($site-palette, 'site-lightest-grey'); $theme-color-disabled: map-get($site-palette, 'site-disabled-grey'); $theme-color-disabled-dark: map-get($site-palette, 'site-darker-grey'); From d48e67648a4f16dfa5fc16d474b01413dffa2a51 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 15 Oct 2020 08:53:55 -0400 Subject: [PATCH 06/18] Apply overflow specific to pre element Avoid duplicate overflow, allow margins to collapse as before --- src/scss/components/_code.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scss/components/_code.scss b/src/scss/components/_code.scss index cfed9aa9..b3f76919 100644 --- a/src/scss/components/_code.scss +++ b/src/scss/components/_code.scss @@ -32,8 +32,11 @@ pre { } } -.highlight { +pre.highlight { @include u-overflow-x('auto'); +} + +.highlight { position: relative; max-width: 90ch; From 1ba1404082c5c00323bd0517bec30dd11ee90c20 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 15 Oct 2020 10:20:01 -0400 Subject: [PATCH 07/18] Improve markup accessibility per revisions in USWDS 2.5.0 See: https://designsystem.digital.gov/about/releases/#version-250 --- docs/_includes/banner.html | 4 ++-- docs/examples/basic-header-landing-slim-footer.html | 4 ++-- docs/examples/basic-header-sidenav-slim-footer.html | 2 +- docs/examples/extended-header-no-sidenav-medium-footer.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/_includes/banner.html b/docs/_includes/banner.html index e6f29c80..e7a5b34b 100644 --- a/docs/_includes/banner.html +++ b/docs/_includes/banner.html @@ -1,6 +1,6 @@ Skip to main content -
+
@@ -42,4 +42,4 @@
- + diff --git a/docs/examples/basic-header-landing-slim-footer.html b/docs/examples/basic-header-landing-slim-footer.html index f8526548..1f38f056 100644 --- a/docs/examples/basic-header-landing-slim-footer.html +++ b/docs/examples/basic-header-landing-slim-footer.html @@ -16,7 +16,7 @@ -