From 97ee0faa9c8f447b94f56a3d33e6e7eaee7278c0 Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Fri, 6 Dec 2019 14:24:14 -0800 Subject: [PATCH 1/4] Update package-lock.json --- package-lock.json | 57 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index d97c418e95..5327e233f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7552,7 +7552,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -7573,12 +7574,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7593,17 +7596,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7720,7 +7726,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7732,6 +7739,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7746,6 +7754,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7753,12 +7762,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7777,6 +7788,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7857,7 +7869,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7869,6 +7882,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7954,7 +7968,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -7990,6 +8005,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8009,6 +8025,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -8052,12 +8069,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -13975,13 +13994,15 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true + "dev": true, + "optional": true }, "braces": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, + "optional": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -14000,6 +14021,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -14199,6 +14221,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, + "optional": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -14211,6 +14234,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -14292,6 +14316,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -14301,6 +14326,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -14311,13 +14337,15 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "dev": true, + "optional": true }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true + "dev": true, + "optional": true }, "lcid": { "version": "1.0.0", @@ -14398,6 +14426,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, + "optional": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" From 7315ed795a28f667768d8f95dd6a8b031fa20275 Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Fri, 6 Dec 2019 14:24:48 -0800 Subject: [PATCH 2/4] Assure banner accordion gets banner type styles --- src/stylesheets/components/_banner.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/stylesheets/components/_banner.scss b/src/stylesheets/components/_banner.scss index 83a3ddfe65..61982ca479 100644 --- a/src/stylesheets/components/_banner.scss +++ b/src/stylesheets/components/_banner.scss @@ -7,6 +7,10 @@ font-size: font-size($theme-banner-font-family, "3xs"); padding-bottom: units(0); } + + .usa-accordion { + @include typeset($theme-banner-font-family); + } } .usa-banner__content { From 5c972f38df742b86602b7a4d39779e449e1a1fb8 Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Fri, 6 Dec 2019 14:25:28 -0800 Subject: [PATCH 3/4] Assure navigation accordion gets navigation font family --- src/stylesheets/components/_navigation.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/stylesheets/components/_navigation.scss b/src/stylesheets/components/_navigation.scss index 3878219fb8..1492f6ced3 100755 --- a/src/stylesheets/components/_navigation.scss +++ b/src/stylesheets/components/_navigation.scss @@ -55,6 +55,10 @@ $nav-link-arrow-icon-size: 1; margin-left: units(2); } } + + .usa-accordion { + @include typeset($theme-navigation-font-family, null, 1); + } } // Primary navigation From f6159685b2946b5f94125335403de7ec9d5bab21 Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Fri, 6 Dec 2019 14:26:43 -0800 Subject: [PATCH 4/4] Assure all footer styles get footer font face --- src/stylesheets/components/_footer.scss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/stylesheets/components/_footer.scss b/src/stylesheets/components/_footer.scss index 543b241939..0a9a656eb7 100644 --- a/src/stylesheets/components/_footer.scss +++ b/src/stylesheets/components/_footer.scss @@ -151,9 +151,8 @@ } .usa-footer__logo-heading { - @include h3; + @include typeset($theme-footer-font-family, $theme-h3-font-size, 1); @include u-margin-y(1); - line-height: line-height("heading", 1); } .usa-footer__contact-links { @@ -166,7 +165,11 @@ } .usa-footer__contact-heading { - @include h3; + @include typeset( + $theme-footer-font-family, + $theme-h3-font-size, + $theme-heading-line-height + ); margin-top: 0; @include at-media("mobile-lg") {