Merge pull request #197 from localgovdrupal/1.x

PR ahead of 1.2.10
localgovdrupal · May 9, 2022 · 78d0cf4 · 78d0cf4
2 parents 9cc9c04 + f70f020
commit 78d0cf4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/css/base/base.css b/css/base/base.css
@@ -49,46 +49,58 @@ a:focus {
 }
 
 h1,
+.h1,
 h2,
+.h2,
 h3,
+.h3,
 h4,
+.h4,
 h5,
+.h5,
 h6,
+.h6,
 .heading {
   margin-bottom: var(--vertical-rhythm-spacing);
   font-family: var(--font-secondary);
 }
 
 h1,
 .h1 {
+  font-family: var(--font-heading-1);
   font-size: var(--font-size-h1);
 }
 
 h2,
 .h2 {
+  font-family: var(--font-heading-2);
   font-size: var(--font-size-h2);
 }
 
 h3,
 .h3 {
+  font-family: var(--font-heading-3);
   font-size: var(--font-size-h3);
 }
 
 h4,
 .h4 {
+  font-family: var(--font-heading-4);
   font-size: var(--font-size-h4);
   font-weight: bold;
 }
 
 h5,
 .h5 {
+  font-family: var(--font-heading-5);
   font-size: var(--font-size-h5);
   font-variant: small-caps;
 }
 
 h6,
 .h6 {
   text-decoration: underline;
+  font-family: var(--font-heading-6);
   font-size: var(--font-size-h6);
   font-variant: small-caps;
 }

diff --git a/css/base/variables.css b/css/base/variables.css
@@ -71,6 +71,12 @@ body {
   */
   --font-primary: roboto, oxygen, ubuntu, cantarell, "Open Sans", "Helvetica Neue", sans-serif;
   --font-secondary: georgia, "Times New Roman", times, serif;
+  --font-heading-1: var(--font-secondary);
+  --font-heading-2: var(--font-secondary);
+  --font-heading-3: var(--font-secondary);
+  --font-heading-4: var(--font-secondary);
+  --font-heading-5: var(--font-secondary);
+  --font-heading-6: var(--font-secondary);
   /*
     Font sizes based on vertical rhythm of:
     - Font size: 16px;