Merge pull request #3253 from uswds/dw-typeface-overrides

Prevent subcomponent type styles from overriding the primary component
uswds · Dec 11, 2019 · 71ec670 · 71ec670
2 parents 772e089 + f615968
commit 71ec670
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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 {

diff --git 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") {

diff --git 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