From 918dbfa55da73196e8c3d11d69e05ba441a1f969 Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Wed, 15 Jan 2025 15:33:25 -0500
Subject: [PATCH 1/8] USAGOV-2090-Font-size-consolidation: Initial round of
 font size changes

---
 config/sync/editor.editor.uswds.yml           |  2 +-
 config/sync/filter.format.uswds.yml           |  2 +-
 .../custom/usagov/sass/_benefits-block.scss   | 12 +--
 web/themes/custom/usagov/sass/_ceo.scss       |  1 -
 .../custom/usagov/sass/_fed-directory.scss    | 15 ++--
 web/themes/custom/usagov/sass/_footer.scss    | 14 +---
 web/themes/custom/usagov/sass/_header.scss    | 14 ++--
 web/themes/custom/usagov/sass/_homepage.scss  | 26 ++-----
 .../custom/usagov/sass/_mobile-menu.scss      |  4 +-
 .../sass/_uswds-theme-custom-styles.scss      | 75 +------------------
 .../custom/usagov/sass/_uswds-theme.scss      |  2 +
 web/themes/custom/usagov/sass/_wizard.scss    |  4 +-
 .../field--node--field-page-intro.html.twig   |  6 +-
 .../usagov/templates/haveaquestion.html.twig  |  2 +-
 .../taxonomy-term--wizard.html.twig           |  4 +-
 15 files changed, 47 insertions(+), 136 deletions(-)

diff --git a/config/sync/editor.editor.uswds.yml b/config/sync/editor.editor.uswds.yml
index 6acc0b90c4..84c6aee95d 100644
--- a/config/sync/editor.editor.uswds.yml
+++ b/config/sync/editor.editor.uswds.yml
@@ -66,7 +66,7 @@ settings:
           element: '<h2 class="font-serif-lg text-bold text-accent-cool-darker">'
         -
           label: Button
-          element: '<a class="usa-button usa-button--secondary usa-button--big">'
+          element: '<a class="usa-button usa-button--secondary usa-button--big font-sans-md">'
     ckeditor_media_resize_mediaResize:
       apply_image_styles: true
       image_styles:
diff --git a/config/sync/filter.format.uswds.yml b/config/sync/filter.format.uswds.yml
index 40f4c709e3..a43d8d8962 100644
--- a/config/sync/filter.format.uswds.yml
+++ b/config/sync/filter.format.uswds.yml
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p class="usa-intro text-align-left text-align-center text-align-right text-align-justify"> <h1 class="text-align-left text-align-center text-align-right text-align-justify"> <h2 class="font-serif-lg text-bold text-accent-cool-darker text-align-left text-align-center text-align-right text-align-justify"> <h3 class="text-align-left text-align-center text-align-right text-align-justify"> <h4 class="text-align-left text-align-center text-align-right text-align-justify"> <a class="usa-button usa-button--secondary usa-button--big" role href> <div data-* class="usa-table-container--scrollable usa-sr-only usa-table__announcement-region text-align-left text-align-center text-align-right text-align-justify" aria-live> <strong> <em> <u> <blockquote> <ul> <ol reversed start> <li> <table class> <tr> <td rowspan colspan data-label data-sort-value> <th rowspan colspan scope data-label data-sortable role> <thead> <tbody> <tfoot> <caption> <drupal-media data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <drupal-paragraph data-embed-button data-entity-label data-paragraph-id data-paragraph-revision-id>'
+      allowed_html: '<br> <p class="usa-intro text-align-left text-align-center text-align-right text-align-justify"> <h1 class="text-align-left text-align-center text-align-right text-align-justify"> <h2 class="font-serif-lg text-bold text-accent-cool-darker text-align-left text-align-center text-align-right text-align-justify"> <h3 class="text-align-left text-align-center text-align-right text-align-justify"> <h4 class="text-align-left text-align-center text-align-right text-align-justify"> <a class="usa-button usa-button--secondary usa-button--big font-sans-md" role href> <div class="usa-table-container--scrollable usa-sr-only usa-table__announcement-region text-align-left text-align-center text-align-right text-align-justify" aria-live> <strong> <em> <u> <blockquote> <ul> <ol reversed start> <li> <table class> <tr> <td rowspan colspan data-label data-sort-value> <th rowspan colspan scope data-label data-sortable role> <thead> <tbody> <tfoot> <caption> <drupal-media data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <drupal-paragraph data-embed-button data-entity-label data-paragraph-id data-paragraph-revision-id>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_table_attributes:
diff --git a/web/themes/custom/usagov/sass/_benefits-block.scss b/web/themes/custom/usagov/sass/_benefits-block.scss
index db8a09c917..e3542b4ebc 100644
--- a/web/themes/custom/usagov/sass/_benefits-block.scss
+++ b/web/themes/custom/usagov/sass/_benefits-block.scss
@@ -43,22 +43,17 @@
   padding: initial;
 
   > h2 {
+    @include u-font('serif', '2xl');
     @include u-text('blue-80v');
-    @include u-font-family('serif');
-    @include u-margin(0);
+    @include u-margin-top(0);
     @include u-margin-bottom(2);
-
-    font-size: 2.2rem;
     line-height: 117.4%;
     letter-spacing: -0.39px;
   }
 
   .benefits-block__content, p {
     @include u-text('blue-80v');
-    @include u-font-family('sans');
     @include u-margin(0);
-
-    font-size: 1.25rem;
   }
 }
 
@@ -71,7 +66,7 @@ a.usa-button.benefits-link {
   @include u-padding(3);
   @include u-bg('blue-80v');
   @include u-display(flex);
-  @include u-font-family('sans');
+  @include u-font('sans', 'lg');
 
   grid-area: button;
   text-decoration: none;
@@ -79,7 +74,6 @@ a.usa-button.benefits-link {
   margin: auto;
   justify-content: center;
   align-items: center;
-  font-size: 22px;
   font-weight: 600;
   width: 100%;
   border: solid 2px transparent;
diff --git a/web/themes/custom/usagov/sass/_ceo.scss b/web/themes/custom/usagov/sass/_ceo.scss
index 39df784a1a..1760b28e04 100644
--- a/web/themes/custom/usagov/sass/_ceo.scss
+++ b/web/themes/custom/usagov/sass/_ceo.scss
@@ -19,7 +19,6 @@
 
 .ceo-button {
   margin-inline: 0 !important;
-  width: fit-content;
 }
 
 // Hides the City or County accordion header when there are no results.
diff --git a/web/themes/custom/usagov/sass/_fed-directory.scss b/web/themes/custom/usagov/sass/_fed-directory.scss
index 0e5e54beb4..0c972e566b 100644
--- a/web/themes/custom/usagov/sass/_fed-directory.scss
+++ b/web/themes/custom/usagov/sass/_fed-directory.scss
@@ -34,12 +34,12 @@
     width: 44px;
     height: 44px;
     text-decoration: none;
-    @include u-text('gray-90');
     box-sizing: border-box;
     @include u-bg('cyan-10');
     border: 2px solid $secondary-border;
     border-radius: 0.01rem;
-    font-size: 1.5rem;
+    @include u-font-size('sans', 'lg');
+    @include u-text('gray-90');
     @include u-text('semibold');
     transition: box-shadow 200ms, background-color 200ms;
   }
@@ -138,11 +138,10 @@ div.field--name-field-offices-near-you> ul {
 }
 
 .fed-directory-search-input {
+  @include u-font-size('sans', 'xs');
+  @include u-text('gray-90');
   @include u-bg('white');
   outline: none;
-  font-size: 0.98rem;
-  @include u-text('gray-90');
-  @include u-text('medium');
   border-style: none;
   line-height: 1.5;
 }
@@ -159,7 +158,7 @@ div.field--name-field-offices-near-you> ul {
   height: 2rem;
   min-width: 3rem;
   padding: 0 0.75rem;
-  font-size: 1.1rem;
+  // font-size: 1.1rem;
 
   img {
     width: 1.5rem;
@@ -186,9 +185,7 @@ div.field--name-field-offices-near-you> ul {
 
 // Letter Heading
 .usagov-directory-letter-heading {
-  @include u-font-family('sans');
-  font-size: 2.375rem;
-
+  @include u-font('sans', '2xl');
   text-align: center;
   line-height: 57px;
   outline: solid 0.15rem color('gray-90');
diff --git a/web/themes/custom/usagov/sass/_footer.scss b/web/themes/custom/usagov/sass/_footer.scss
index e382d2818d..5dedf71165 100644
--- a/web/themes/custom/usagov/sass/_footer.scss
+++ b/web/themes/custom/usagov/sass/_footer.scss
@@ -3,11 +3,6 @@
 
 /* ---- All Footers ---- */
 
-.usa-footer--big .usa-footer__primary-content--collapsible .usa-footer__primary-link {
-  @include u-font-family('sans');
-  font-size: 1.2rem;
-}
-
 .usa-footer--big {
   padding-top: 2rem;
 }
@@ -27,7 +22,7 @@
 }
 
 .usa-sign-up__heading {
-  @include u-font-family('sans');
+  @include u-font('sans','lg');
 }
 
 .usa-footer__primary-content--collapsible.hidden {
@@ -40,18 +35,17 @@
   font-feature-settings: "kern" 1;
   font-kerning: normal;
   box-sizing: inherit;
+  @include u-font('sans', 'md');
+  @include u-text('bold');
   @include u-text('gray-90');
   text-decoration: none;
   padding: 0;
-  @include u-text('bold');
   line-height: 1.2;
   margin: 0;
   margin-bottom: 0;
   align-items: center;
   display: flex;
   justify-content: flex-start;
-  @include u-font-family('sans');
-  font-size: 1.2rem;
 }
 
 .usa-gov-footer__primary-link--button {
@@ -124,7 +118,7 @@
   border: 1px solid color('gray-90');
   line-height: 1.5;
   margin-inline: 0 !important;
-  font-size: 1.1rem;
+  @include u-font-size('sans', 'md');
 }
 
 .footer-button:hover {
diff --git a/web/themes/custom/usagov/sass/_header.scss b/web/themes/custom/usagov/sass/_header.scss
index fa9dfbc219..d1bc727b10 100644
--- a/web/themes/custom/usagov/sass/_header.scss
+++ b/web/themes/custom/usagov/sass/_header.scss
@@ -104,7 +104,7 @@
   text-decoration: none;
   padding: 10px 20px;
   line-height: .9;
-  font-size: .93rem;
+  @include u-font-size('sans', '2xs');
   margin: 0;
   border: 2px solid transparent;
 
@@ -171,7 +171,8 @@
     @include u-flex("row", "align-end");
 
     bottom: 6rem;
-    width: 32rem;
+    // width: 32rem;
+    width: calc(27ch + 3rem + 1rem + 16rem);
   }
 }
 
@@ -181,7 +182,8 @@
     @include u-flex("row", "align-end");
 
     bottom: 6rem;
-    width: 33rem;
+    // width: 33rem;
+    width: calc(27ch + 3rem + 1rem + 17rem);
   }
 }
 
@@ -201,7 +203,7 @@
 // This is to make the header link stretch out
 .usa-header--extended .usa-nav__secondary-links {
   @include at-media($theme-header-min-width) {
-    width: 15rem;
+    width: 16rem;
     margin-bottom: 0;
   }
 }
@@ -231,7 +233,7 @@
 
 .usa-header--extended .usa-nav__secondary-links a {
   @include at-media($theme-header-min-width) {
-    font-size: 1.13rem;
+    @include u-font-size('sans', 'md');
     padding-left: 0.5rem;
     padding-top: 0.2rem;
   }
@@ -239,7 +241,7 @@
 
 .usa-header--extended .usa-nav__secondary-links a:lang(es) {
   @include at-media($theme-header-min-width) {
-    font-size: 1.13rem;
+    @include u-font-size('sans', 'md');
     padding-left: 0.2rem;
     padding-top: 0.2rem;
   }
diff --git a/web/themes/custom/usagov/sass/_homepage.scss b/web/themes/custom/usagov/sass/_homepage.scss
index d278e0bd3b..1b297ed568 100644
--- a/web/themes/custom/usagov/sass/_homepage.scss
+++ b/web/themes/custom/usagov/sass/_homepage.scss
@@ -52,9 +52,9 @@
   }
 
   h1 {
-    @include u-font-family('serif');
-    font-size: 2.2em;
-    margin: 0;
+    @include u-font('serif', '2xl');
+    @include u-margin-top(0);
+    @include u-margin-bottom(2);
   }
 
   h3 {
@@ -62,8 +62,7 @@
   }
 
   p {
-    @include u-font-family('sans');
-    font-size: 1.25em;
+    @include u-font('sans', 'md');
     margin: 0;
     line-height: 1.5;
   }
@@ -115,11 +114,6 @@
   box-shadow: 0 6px 6px $blue-shadow;
   padding: 30px 28px 35px 30px;
 
-  p {
-    font-size: 1.125em;
-    margin-top: 20px;
-  }
-
   @include at-media("tablet") {
     width: clamp(50%, 450px, 100%);
   }
@@ -160,7 +154,7 @@
   }
 
   h2 {
-    font-size: 1.875em;
+    @include u-font-size('sans', 'xl');
   }
 }
 
@@ -186,12 +180,11 @@
 /* Jump */
 .jump {
   padding: 0;
+  @include u-font('sans', 'sm');
   text-align: center;
 
   a {
     @include u-text('white');
-    @include u-font-family('sans');
-    font-size: 1.038em;
     text-decoration: underline;
     display: inline-block;
     margin-bottom: 10px;
@@ -229,10 +222,8 @@
   border-bottom: 10px solid color('red-50');
 
   h2 {
+    @include u-font('serif', '2xl');
     @include u-text('red-50');
-    @include u-font-family('serif');
-    font-size: 2.44em;
-    //uswds font-weight mixin
     @include u-text('bold');
     margin: 65px 5vw 0;
     max-width: 1124px;
@@ -297,9 +288,8 @@
 
   h2,
   p {
+    @include u-font-size('sans', 'md');
     @include u-text('gray-90');
-    @include u-font-family('sans');
-    font-size: 1.038em;
   }
 
   h2 {
diff --git a/web/themes/custom/usagov/sass/_mobile-menu.scss b/web/themes/custom/usagov/sass/_mobile-menu.scss
index 6093661be3..087c37bd25 100644
--- a/web/themes/custom/usagov/sass/_mobile-menu.scss
+++ b/web/themes/custom/usagov/sass/_mobile-menu.scss
@@ -70,9 +70,9 @@ ul.navigation__items {
   align-items: center;
   background: transparent;
   border: 0;
+  @include u-font('sans', 'md');
   @include u-text('gray-90');
   font-weight: bold;
-  font-size: larger;
   text-decoration: none;
   margin: unset;
   width: auto;
@@ -109,7 +109,7 @@ ul.navigation__items {
   padding: 0;
   padding-top: 2rem;
   height: auto;
-  font-size: 1rem;
+  @include u-font-size('sans', 'xs');
   font-weight: normal;
   cursor: pointer;
 }
diff --git a/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss b/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
index 971137b756..0cab6a4115 100644
--- a/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
+++ b/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
@@ -97,7 +97,6 @@ Buttons with visited links would mysteriously get white text which is not access
 }
 
 .usa-button--secondary {
-  font-size: 1.1rem;
   border: 2px solid $secondary-border;
 }
 
@@ -169,15 +168,6 @@ a.usa-button.hero-button {
   }
 }
 
-.usa-button {
-  width: 100%;
-  line-height: 1.5;
-
-  @media (min-width: 30em) {
-    width: auto;
-  }
-}
-
 .usagov-button--outline-black {
   box-shadow: $theme-button-stroke-width color('black');
   @include u-text('black');
@@ -233,33 +223,10 @@ a {
   @include u-text('blue-warm-70v');
 }
 
-#block-usagov-content .font-serif-lg {
-  // This style is needed to set the font size of intro text
-  font-size: 1.5rem;
-}
-
 .usa-prose > p.usa-intro {
   max-width: none;
 }
 
-@media (max-width: 30em) {
-  .usa-alert,
-  .usa-prose,
-  .usa-table,
-  .usa-form,
-  .usa-radio__label,
-  .usa-footer,
-  .usa-nav .usa-accordion,
-  .usa-accordian__heading,
-  .text-primary-lighter,
-  .usa-hero,
-  .usa-identifier,
-  .usa-label,
-  .usa-description {
-    font-size: 1.1rem;
-  }
-}
-
 .desktop\:grid-col-8 .body-copy {
   // Add margin only on content pages
   margin-top: 2.5rem;
@@ -316,7 +283,7 @@ div #sm-share {
   display: flex;
   padding-bottom: 22px;
   background-color: transparent;
-  font-size: 1rem;
+  @include u-font-size('sans', 'xs');
 }
 
 #share-page {
@@ -536,8 +503,7 @@ div[class^="QSIUserDefinedHTML"] {
 
 #pagesurvey-qual-hdr {
   @include u-bg('cyan-10');
-
-  font-size: 130%;
+  @include u-font('serif', 'lg');
   display: block;
   @include u-text('gray-90');
 
@@ -566,12 +532,6 @@ div[class^="QSIUserDefinedHTML"] {
 
 // END Page Level Survey extra CSS
 
-.usa-prose p,
-.usa-prose li,
-.usa-prose a {
-  font-size: 1.1rem;
-}
-
 .usa-prose.body-copy {
   &>h1, &>h2, &>h3, &>h4 {
     clear: unset;
@@ -586,31 +546,8 @@ div[class^="QSIUserDefinedHTML"] {
   }
 }
 
-.usa-accordion__heading button,
-.usa-accordion__heading p,
-.usa-accordion__heading a {
-  font-size: 1.1rem;
-}
-
-#question-box > div > p,
-#question-box > div > div {
-  font-size: 1.1rem;
-}
-
-#prior,
-#next {
-  font-size: 1.1rem;
-}
-
-#wizard-border > fieldset > label,
-.wizard_result > p {
-  font-size: 1.1rem;
-}
-
-.last,
-#last-updated,
-#share-page {
-  font-size: 1rem;
+#last-updated {
+  @include u-font-size('sans', 'xs');
 }
 
 .visually-hidden {
@@ -784,10 +721,6 @@ select:not([disabled]):focus,
   }
 }
 
-.usagov-button {
-  font-size: 1.1rem;
-}
-
 .usa-pagination .usa-current {
   background-color: color('blue-warm-70v');
 
diff --git a/web/themes/custom/usagov/sass/_uswds-theme.scss b/web/themes/custom/usagov/sass/_uswds-theme.scss
index 76b5996849..2da1c824de 100644
--- a/web/themes/custom/usagov/sass/_uswds-theme.scss
+++ b/web/themes/custom/usagov/sass/_uswds-theme.scss
@@ -57,6 +57,8 @@ USWDS Variables
   $theme-color-error: "red-50",
   $theme-accordion-border-color: "gray-cool-10",
 
+  // Font-Sizes
+  $theme-body-font-size: "md",
   // Font-Weights
   $theme-font-weight-medium: 500,
   $theme-font-weight-semibold: 600,
diff --git a/web/themes/custom/usagov/sass/_wizard.scss b/web/themes/custom/usagov/sass/_wizard.scss
index 4ab6475695..57afd0ab68 100644
--- a/web/themes/custom/usagov/sass/_wizard.scss
+++ b/web/themes/custom/usagov/sass/_wizard.scss
@@ -39,7 +39,7 @@
     }
 
     h1, h2, h3, h4 {
-      font-family: Merriweather Web,Georgia,Cambria,Times New Roman,Times,serif;
+      @include u-font-family('serif');
     }
 
     .usagov-wizard--content-step-indicator {
@@ -48,7 +48,7 @@
     }
 
     h2 {
-      font-size: 2rem;
+      @include u-font-size('serif', 'xl');
       line-height: 120%;
     }
 
diff --git a/web/themes/custom/usagov/templates/field--node--field-page-intro.html.twig b/web/themes/custom/usagov/templates/field--node--field-page-intro.html.twig
index b981b2dc09..f268350c7a 100644
--- a/web/themes/custom/usagov/templates/field--node--field-page-intro.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-page-intro.html.twig
@@ -47,7 +47,7 @@ set title_classes = [
     <div{{ attributes }}>
     {% for item in items %}
         <div class="usa-prose">
-            <p class="usa-intro">
+            <p class="usa-intro font-serif-md">
                 {{ item.content }}
             </p>
         </div>
@@ -56,7 +56,7 @@ set title_classes = [
 {% else %}
     {% for item in items %}
     <div class="usa-prose">
-        <p class="usa-intro">
+        <p class="usa-intro font-serif-md">
             {{ item.content }}
         </p>
     </div>
@@ -70,7 +70,7 @@ set title_classes = [
     {% endif %}
     {% for item in items %}
     <div class="usa-prose">
-        <p class="usa-intro">
+        <p class="usa-intro font-serif-md">
             {{ item.content }}
         </p>
     </div>
diff --git a/web/themes/custom/usagov/templates/haveaquestion.html.twig b/web/themes/custom/usagov/templates/haveaquestion.html.twig
index ce9c77955a..fb17720f0e 100644
--- a/web/themes/custom/usagov/templates/haveaquestion.html.twig
+++ b/web/themes/custom/usagov/templates/haveaquestion.html.twig
@@ -13,7 +13,7 @@
 {% set sp_chat = '/es/chat' %}
 
 <div id="question-box">
-    <div class="border-left-1 padding-left-205 border-cyan-10 margin-top-8 margin-bottom-9 padding-bottom-2">
+    <div class="usa-prose border-left-1 padding-left-205 border-cyan-10 margin-top-8 margin-bottom-9 padding-bottom-2">
         <h2 class="font-family-heading margin-top-0">
             {{ lang == 'en' ? "Have a question?" : "¿Tiene una pregunta?" }}
         </h2>
diff --git a/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig b/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig
index e71b9f5a3c..2f66971daa 100644
--- a/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig
+++ b/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig
@@ -58,12 +58,12 @@
 
       {# Generate the url for the parent of this term to put in the 'previous' button. #}
       {% set previous_path = path('entity.taxonomy_term.canonical', {'taxonomy_term': parent_tid}) %}
-      <button id="prior" class="usa-button usa-button--secondary usa-button--big margin-right-2" onclick="window.location.href = '{{ previous_path ~ '#block-usagov-content' }}'">
+      <button id="prior" class="usa-button usa-button--secondary usa-button--big font-sans-md margin-right-2" onclick="window.location.href = '{{ previous_path ~ '#block-usagov-content' }}'">
         {{ previous_string }}</button>
 
       {# If there are items in the options list, this must not be the last term in the tree. Generate a Next button. #}
       {% if has_child %}
-        <button id="next" class="usa-button usa-button--outline usagov-button--outline-black usa-button--big"
+        <button id="next" class="usa-button usa-button--outline usagov-button--outline-black usa-button--big font-sans-md"
                 onclick="if(document.querySelector(`input[name='options']:checked`)) { window.location.href = document.querySelector(`input[name='options']:checked`).value+'#block-usagov-content'; }">
           {{ next_string }}</button>
       {% endif %}

From 9114b4fbe743e72aa8c39714fe9c4b6a8d0802f4 Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Fri, 24 Jan 2025 07:21:39 -0500
Subject: [PATCH 2/8] USAGOV-2090-Font-size-consolidation: Font size
 adjustments from first week of feedback

Decrease heading sizes by 1 token
Temporary button font size styling until content review
Benefits Search Page adjustments
Phone number size increase to 'md' on desktop
Directory Letter heading and pagination decrease to 'xl'
---
 .../custom/usagov/sass/_benefit-search.scss     |  6 ++----
 .../custom/usagov/sass/_benefits-block.scss     |  2 +-
 .../custom/usagov/sass/_fed-directory.scss      |  4 ++--
 web/themes/custom/usagov/sass/_header.scss      |  4 +---
 web/themes/custom/usagov/sass/_homepage.scss    |  4 ++--
 .../usagov/sass/_uswds-theme-custom-styles.scss | 17 ++++++++++++++---
 web/themes/custom/usagov/sass/_uswds-theme.scss |  3 +++
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/web/themes/custom/usagov/sass/_benefit-search.scss b/web/themes/custom/usagov/sass/_benefit-search.scss
index b653b309f1..52328f81ab 100644
--- a/web/themes/custom/usagov/sass/_benefit-search.scss
+++ b/web/themes/custom/usagov/sass/_benefit-search.scss
@@ -330,14 +330,12 @@ main[data-pagetype="Benefits Category Search"]{
 
       > h3 {
         @include u-margin(0);
-
-        font-size: 1.325rem;
+        @include u-font-size('sans', 'md');
       }
 
       > p {
         @include u-margin(0);
-
-        font-size: 1.0625rem;
+        @include u-font-size('sans', 'sm');
       }
 
       a::before {
diff --git a/web/themes/custom/usagov/sass/_benefits-block.scss b/web/themes/custom/usagov/sass/_benefits-block.scss
index e3542b4ebc..f3d5c10b43 100644
--- a/web/themes/custom/usagov/sass/_benefits-block.scss
+++ b/web/themes/custom/usagov/sass/_benefits-block.scss
@@ -43,7 +43,7 @@
   padding: initial;
 
   > h2 {
-    @include u-font('serif', '2xl');
+    @include u-font('serif', 'xl');
     @include u-text('blue-80v');
     @include u-margin-top(0);
     @include u-margin-bottom(2);
diff --git a/web/themes/custom/usagov/sass/_fed-directory.scss b/web/themes/custom/usagov/sass/_fed-directory.scss
index 0c972e566b..2709c82ad4 100644
--- a/web/themes/custom/usagov/sass/_fed-directory.scss
+++ b/web/themes/custom/usagov/sass/_fed-directory.scss
@@ -185,7 +185,7 @@ div.field--name-field-offices-near-you> ul {
 
 // Letter Heading
 .usagov-directory-letter-heading {
-  @include u-font('sans', '2xl');
+  @include u-font('sans', 'xl');
   text-align: center;
   line-height: 57px;
   outline: solid 0.15rem color('gray-90');
@@ -234,7 +234,7 @@ div div.field--name-field-offices-near-you>ul>li {
     text-decoration: none;
     text-align: center;
     line-height: 57px;
-    font-size: 2.375rem;
+    @include u-font-size('sans', 'xl');
     @include u-text('gray-90', !important);
     outline: solid 0.15rem color('cyan-50v');
     @include u-bg('cyan-10');
diff --git a/web/themes/custom/usagov/sass/_header.scss b/web/themes/custom/usagov/sass/_header.scss
index d1bc727b10..d46640315f 100644
--- a/web/themes/custom/usagov/sass/_header.scss
+++ b/web/themes/custom/usagov/sass/_header.scss
@@ -232,8 +232,8 @@
 }
 
 .usa-header--extended .usa-nav__secondary-links a {
+  @include u-font-size('sans', 'md');
   @include at-media($theme-header-min-width) {
-    @include u-font-size('sans', 'md');
     padding-left: 0.5rem;
     padding-top: 0.2rem;
   }
@@ -241,9 +241,7 @@
 
 .usa-header--extended .usa-nav__secondary-links a:lang(es) {
   @include at-media($theme-header-min-width) {
-    @include u-font-size('sans', 'md');
     padding-left: 0.2rem;
-    padding-top: 0.2rem;
   }
 }
 
diff --git a/web/themes/custom/usagov/sass/_homepage.scss b/web/themes/custom/usagov/sass/_homepage.scss
index 1b297ed568..5392d9f300 100644
--- a/web/themes/custom/usagov/sass/_homepage.scss
+++ b/web/themes/custom/usagov/sass/_homepage.scss
@@ -52,7 +52,7 @@
   }
 
   h1 {
-    @include u-font('serif', '2xl');
+    @include u-font('serif', 'xl');
     @include u-margin-top(0);
     @include u-margin-bottom(2);
   }
@@ -222,7 +222,7 @@
   border-bottom: 10px solid color('red-50');
 
   h2 {
-    @include u-font('serif', '2xl');
+    @include u-font('serif', 'xl');
     @include u-text('red-50');
     @include u-text('bold');
     margin: 65px 5vw 0;
diff --git a/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss b/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
index 0cab6a4115..282ee2d871 100644
--- a/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
+++ b/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
@@ -96,13 +96,24 @@ Buttons with visited links would mysteriously get white text which is not access
   color: initial;
 }
 
+/*
+We should remove our border style from the usa-button--secondary utility class.
+It prevents us from creating a borderless usa-button--secondary...
+Instead, we should add a usa-button--outline utility class to achieve the border
+But the outline utility class relys on box-shadow which we've already used for our custom focus styling...
+So this needs to be part of a larger discussion
+Also most of our buttons are "secondary" so maybe we should make that our primary style instead...
+*/
 .usa-button--secondary {
-  border: 2px solid $secondary-border;
+  border: 2px solid $secondary-border; //TODO: Remove custom styling from utility classes
 }
 
 .usa-button--secondary:hover {
   background-color: $secondary-background;
-  border: 2px solid $secondary-border;
+  border: 2px solid $secondary-border; //TODO: Remove custom styling from utility classes
+}
+.usa-button--secondary.usa-button--big {
+  @include u-font-size('sans', 'md'); //TODO: Remove custom styling from utility classes (this one is temporary until we review the process for changing utility classes on buttons in our content)
 }
 
 /*
@@ -853,7 +864,7 @@ input::-webkit-textfield-decoration-container {
 .benefits-finder-content {
   .usa-prose>p.usa-intro {
     @include u-margin(0);
-
+    @include u-font-size('serif', 'md');
     max-width: 100%;
   }
 }
diff --git a/web/themes/custom/usagov/sass/_uswds-theme.scss b/web/themes/custom/usagov/sass/_uswds-theme.scss
index 2da1c824de..94e4fd3261 100644
--- a/web/themes/custom/usagov/sass/_uswds-theme.scss
+++ b/web/themes/custom/usagov/sass/_uswds-theme.scss
@@ -59,6 +59,9 @@ USWDS Variables
 
   // Font-Sizes
   $theme-body-font-size: "md",
+  $theme-h1-font-size: "xl",
+  $theme-h2-font-size: "lg",
+  $theme-h3-font-size: "md",
   // Font-Weights
   $theme-font-weight-medium: 500,
   $theme-font-weight-semibold: 600,

From e208b5e0b39a7f390ba5790fc1281d2e83eeeb85 Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Tue, 28 Jan 2025 04:45:29 -0500
Subject: [PATCH 3/8] USAGOV-2090-Font-size-consolidation: Adjustments from
 week 2 feedback

- **Homepage** - "How do I", decrease style to 'lg, 23.36px'
- **Footer** - "USAGov Contact Center" and "Find us" need to match the "Sign up to receive" size
- **Footer**- The top column alignment for Federal agencies is still off, but we believe it will be resolved when the updates are pushed to production.
- **Benefit Finder LP** - decrease H2s (Benefit finder tool and Find benefits by category) to 'md'
---
 web/themes/custom/usagov/sass/_footer.scss          | 13 ++++++-------
 web/themes/custom/usagov/sass/_homepage.scss        |  2 +-
 .../usagov/templates/footer-secondary.html.twig     |  4 ++--
 .../templates/includes/benefits-search.html.twig    |  2 +-
 .../includes/primary-footer-layout.html.twig        |  5 -----
 .../views-view-list--benefit-search-form.html.twig  |  2 +-
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/web/themes/custom/usagov/sass/_footer.scss b/web/themes/custom/usagov/sass/_footer.scss
index 5dedf71165..422dfac390 100644
--- a/web/themes/custom/usagov/sass/_footer.scss
+++ b/web/themes/custom/usagov/sass/_footer.scss
@@ -43,9 +43,14 @@
   line-height: 1.2;
   margin: 0;
   margin-bottom: 0;
-  align-items: center;
+  align-items: baseline;
   display: flex;
   justify-content: flex-start;
+
+  @include at-media('desktop') {
+    // Match the height of ones that wrap
+    min-height: 2.75rem;
+  }
 }
 
 .usa-gov-footer__primary-link--button {
@@ -129,12 +134,6 @@
   @include u-border('gray-90');
 }
 
-.ftr-list {
-  @media (min-width: 64em) {
-    padding-top: 1.4rem;
-  }
-}
-
 /* ---- Secondary Footer ---- */
 .usa-footer__secondary-section {
   background-color: color("cyan-10");
diff --git a/web/themes/custom/usagov/sass/_homepage.scss b/web/themes/custom/usagov/sass/_homepage.scss
index 5392d9f300..219d9dcdb8 100644
--- a/web/themes/custom/usagov/sass/_homepage.scss
+++ b/web/themes/custom/usagov/sass/_homepage.scss
@@ -154,7 +154,7 @@
   }
 
   h2 {
-    @include u-font-size('sans', 'xl');
+    @include u-font-size('sans', 'lg');
   }
 }
 
diff --git a/web/themes/custom/usagov/templates/footer-secondary.html.twig b/web/themes/custom/usagov/templates/footer-secondary.html.twig
index 9ddbd44f60..b0fb085121 100644
--- a/web/themes/custom/usagov/templates/footer-secondary.html.twig
+++ b/web/themes/custom/usagov/templates/footer-secondary.html.twig
@@ -50,7 +50,7 @@
 			<div class="usa-footer__logo grid-row mobile-lg:grid-col-6">
 				<div id="footer-phone">
 					<div class="mobile-lg:grid-col-auto">
-						<h4 class="usa-footer__logo-heading">
+						<h4 class="usa-footer__logo-heading font-sans-lg">
 							{{- translations.contact_center -}}
 						</h4>
 					</div>
@@ -68,7 +68,7 @@
 			</div>
 			<div class="usa-footer__contact-links mobile-lg:grid-col-6">
 				<div class="footer-social-block">
-					<h4 class="usa-footer__contact-heading">
+					<h4 class="usa-footer__contact-heading font-sans-lg">
 						{{- translations.find_us -}}
 					</h4>
 					<div class="usa-footer__social-links en-links grid-row grid-gap-1">
diff --git a/web/themes/custom/usagov/templates/includes/benefits-search.html.twig b/web/themes/custom/usagov/templates/includes/benefits-search.html.twig
index e984ba7306..86bff06d29 100644
--- a/web/themes/custom/usagov/templates/includes/benefits-search.html.twig
+++ b/web/themes/custom/usagov/templates/includes/benefits-search.html.twig
@@ -11,7 +11,7 @@
 {% endif %}
 
 {% if node.field_benefits_life_events_title.value | render  %}
-  <h2 class="benefit-finder__title" id="{{ finder_id }}">{{ node.field_benefits_life_events_title.value | render }}</h2>
+  <h2 class="benefit-finder__title font-serif-md" id="{{ finder_id }}">{{ node.field_benefits_life_events_title.value | render }}</h2>
 {% endif %}
 {% if node.field_benefits_life_events_descr.value | render %}
   <p class="benefit-finder__desc">{{ node.field_benefits_life_events_descr.value | render}}</p>
diff --git a/web/themes/custom/usagov/templates/includes/primary-footer-layout.html.twig b/web/themes/custom/usagov/templates/includes/primary-footer-layout.html.twig
index 4f3666e85c..599f0ea7ce 100644
--- a/web/themes/custom/usagov/templates/includes/primary-footer-layout.html.twig
+++ b/web/themes/custom/usagov/templates/includes/primary-footer-layout.html.twig
@@ -38,17 +38,12 @@
 	{% if items %}
 		{% for item in items %}
 			{% set link_title = item.title %}
-			{% set link_description = item.original_link.description %}
 			{% if menu_level == 0 and item.below %}
 				<div class="mobile-lg:grid-col-6 desktop:grid-col-3">
 					<section class=" usa-footer__primary-content usa-footer__primary-content--collapsible ">
 						<h3 class="usa-gov-footer__primary-link">{{ link_title }}</h3>
 			{% else %}
-				{% if link_description == "add_space" %}
-					<li class="usa-footer__secondary-link ftr-list">
-				{% else %}
 					<li class="usa-footer__secondary-link">
-				{% endif %}
 						<a href="{{ item.url }}">{{ link_title}}</a>
 					</li>
 			{% endif %}
diff --git a/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig b/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig
index 35bd8a7490..8b9f211f99 100644
--- a/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig
+++ b/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig
@@ -43,7 +43,7 @@
 
     <fieldset>
       {% if node.field_benefits_search_title.value | render %}
-        <legend><h2 id="categories-label">{{ node.field_benefits_search_title.value }}</h2></legend>
+        <legend><h2 id="categories-label" class="font-serif-md">{{ node.field_benefits_search_title.value }}</h2></legend>
       {% endif %}
       {% if node.field_benefits_search_descr.value | render %}
         <p id="categories-description">{{ node.field_benefits_search_descr.value }}</p>

From d677eaef20b2869b7ab34056a51bde96ee0b727e Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Wed, 29 Jan 2025 01:19:35 -0500
Subject: [PATCH 4/8] USAGOV-2090-Font-size-consolidation: Benefits Search H2s
 size 'lg'

---
 .../custom/usagov/templates/includes/benefits-search.html.twig  | 2 +-
 .../templates/views-view-list--benefit-search-form.html.twig    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/themes/custom/usagov/templates/includes/benefits-search.html.twig b/web/themes/custom/usagov/templates/includes/benefits-search.html.twig
index 86bff06d29..102950bb30 100644
--- a/web/themes/custom/usagov/templates/includes/benefits-search.html.twig
+++ b/web/themes/custom/usagov/templates/includes/benefits-search.html.twig
@@ -11,7 +11,7 @@
 {% endif %}
 
 {% if node.field_benefits_life_events_title.value | render  %}
-  <h2 class="benefit-finder__title font-serif-md" id="{{ finder_id }}">{{ node.field_benefits_life_events_title.value | render }}</h2>
+  <h2 class="benefit-finder__title font-serif-lg" id="{{ finder_id }}">{{ node.field_benefits_life_events_title.value | render }}</h2>
 {% endif %}
 {% if node.field_benefits_life_events_descr.value | render %}
   <p class="benefit-finder__desc">{{ node.field_benefits_life_events_descr.value | render}}</p>
diff --git a/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig b/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig
index 8b9f211f99..4a965e377e 100644
--- a/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig
+++ b/web/themes/custom/usagov/templates/views-view-list--benefit-search-form.html.twig
@@ -43,7 +43,7 @@
 
     <fieldset>
       {% if node.field_benefits_search_title.value | render %}
-        <legend><h2 id="categories-label" class="font-serif-md">{{ node.field_benefits_search_title.value }}</h2></legend>
+        <legend><h2 id="categories-label" class="font-serif-lg">{{ node.field_benefits_search_title.value }}</h2></legend>
       {% endif %}
       {% if node.field_benefits_search_descr.value | render %}
         <p id="categories-description">{{ node.field_benefits_search_descr.value }}</p>

From e03dacd50383b677e178409f2f3c6a07836f9a33 Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Wed, 29 Jan 2025 04:14:31 -0500
Subject: [PATCH 5/8] USAGOV-2090-Font-size-consolidation: Establish process to
 update button classes

---
 config/sync/editor.editor.uswds.yml           |  2 +-
 config/sync/filter.format.uswds.yml           |  2 +-
 .../sass/_uswds-theme-custom-styles.scss      | 61 +++++++++++++++----
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/config/sync/editor.editor.uswds.yml b/config/sync/editor.editor.uswds.yml
index 84c6aee95d..fc4e976b3a 100644
--- a/config/sync/editor.editor.uswds.yml
+++ b/config/sync/editor.editor.uswds.yml
@@ -66,7 +66,7 @@ settings:
           element: '<h2 class="font-serif-lg text-bold text-accent-cool-darker">'
         -
           label: Button
-          element: '<a class="usa-button usa-button--secondary usa-button--big font-sans-md">'
+          element: '<a class="usa-button usagov-button">'
     ckeditor_media_resize_mediaResize:
       apply_image_styles: true
       image_styles:
diff --git a/config/sync/filter.format.uswds.yml b/config/sync/filter.format.uswds.yml
index a43d8d8962..f64ae21f36 100644
--- a/config/sync/filter.format.uswds.yml
+++ b/config/sync/filter.format.uswds.yml
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p class="usa-intro text-align-left text-align-center text-align-right text-align-justify"> <h1 class="text-align-left text-align-center text-align-right text-align-justify"> <h2 class="font-serif-lg text-bold text-accent-cool-darker text-align-left text-align-center text-align-right text-align-justify"> <h3 class="text-align-left text-align-center text-align-right text-align-justify"> <h4 class="text-align-left text-align-center text-align-right text-align-justify"> <a class="usa-button usa-button--secondary usa-button--big font-sans-md" role href> <div class="usa-table-container--scrollable usa-sr-only usa-table__announcement-region text-align-left text-align-center text-align-right text-align-justify" aria-live> <strong> <em> <u> <blockquote> <ul> <ol reversed start> <li> <table class> <tr> <td rowspan colspan data-label data-sort-value> <th rowspan colspan scope data-label data-sortable role> <thead> <tbody> <tfoot> <caption> <drupal-media data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <drupal-paragraph data-embed-button data-entity-label data-paragraph-id data-paragraph-revision-id>'
+      allowed_html: '<br> <p class="usa-intro text-align-left text-align-center text-align-right text-align-justify"> <h1 class="text-align-left text-align-center text-align-right text-align-justify"> <h2 class="font-serif-lg text-bold text-accent-cool-darker text-align-left text-align-center text-align-right text-align-justify"> <h3 class="text-align-left text-align-center text-align-right text-align-justify"> <h4 class="text-align-left text-align-center text-align-right text-align-justify"> <a class="usa-button usagov-button" role href> <div class="usa-table-container--scrollable usa-sr-only usa-table__announcement-region text-align-left text-align-center text-align-right text-align-justify" aria-live> <strong> <em> <u> <blockquote> <ul> <ol reversed start> <li> <table class> <tr> <td rowspan colspan data-label data-sort-value> <th rowspan colspan scope data-label data-sortable role> <thead> <tbody> <tfoot> <caption> <drupal-media data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <drupal-paragraph data-embed-button data-entity-label data-paragraph-id data-paragraph-revision-id>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_table_attributes:
diff --git a/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss b/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
index 282ee2d871..655791b4e8 100644
--- a/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
+++ b/web/themes/custom/usagov/sass/_uswds-theme-custom-styles.scss
@@ -96,25 +96,62 @@ Buttons with visited links would mysteriously get white text which is not access
   color: initial;
 }
 
-/*
-We should remove our border style from the usa-button--secondary utility class.
-It prevents us from creating a borderless usa-button--secondary...
-Instead, we should add a usa-button--outline utility class to achieve the border
-But the outline utility class relys on box-shadow which we've already used for our custom focus styling...
-So this needs to be part of a larger discussion
-Also most of our buttons are "secondary" so maybe we should make that our primary style instead...
-*/
+
+
+/****************************************************************************************
+  AFTER UPDATING CONTENT BUTTONS, REMOVE STYLES FOR .usa-button--secondary
+*****************************************************************************************
+
+The following usa-button--secondary styles override the default look of USWDS utility classes.
+This hinders our ability to use those classes to acheive their intended effect.
+It would be better to use a custom usagov-button class.
+Any buttons updated to use the custom class can be updated anytime without impacting utility classes.
+
+*****************************************************************************************
+
+We currently apply these classes to our buttons in our content:
+  class="usa-button usa-button--secondary usa-button--big"
+The new approach uses these classes:
+  class="usa-button usagov-button"
+
+*****************************************************************************************
+
+To update existing content buttons:
+  - edit the content page
+  - In CKEditor, select the button
+  - In the style dropdown, select the Button option twice to toggle the style off and back on
+  - Save the content page
+
+******************************************************************************************/
 .usa-button--secondary {
-  border: 2px solid $secondary-border; //TODO: Remove custom styling from utility classes
+  border: 2px solid $secondary-border;
 }
-
 .usa-button--secondary:hover {
   background-color: $secondary-background;
-  border: 2px solid $secondary-border; //TODO: Remove custom styling from utility classes
+  border: 2px solid $secondary-border;
 }
 .usa-button--secondary.usa-button--big {
-  @include u-font-size('sans', 'md'); //TODO: Remove custom styling from utility classes (this one is temporary until we review the process for changing utility classes on buttons in our content)
+  @include u-font-size('sans', 'md');
+}
+/****************************************************************************************
+  AFTER UPDATING CONTENT BUTTONS, KEEP STYLES FOR .usagov-button
+****************************************************************************************/
+.usagov-button{
+  border: 2px solid $secondary-border;
+  @include u-font-size('sans', 'md');
+  padding: units(2) units(3);
+  @include set-text-and-bg("secondary", $context: "Button");
+
+  &:hover {
+    background-color: $secondary-background;
+    border: 2px solid $secondary-border;
+  }
 }
+/****************************************************************************************
+  END OF CONTENT BUTTON UPDATE CODE
+****************************************************************************************/
+
+
 
 /*
 This style ensures that we can remove the padding-top from text in a card body. Used on navigation pages.

From 0ec9bda3556cac1d62a6416210ea2dc530f5ec20 Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Wed, 29 Jan 2025 04:45:12 -0500
Subject: [PATCH 6/8] USAGOV-2090-Font-size-consolidation: Update template
 button classes

---
 web/themes/custom/usagov/scripts/ceoResults.js                | 2 +-
 web/themes/custom/usagov/scripts/stateDirectory.js            | 2 +-
 .../usagov/templates/block--mobile-navigation.html.twig       | 2 +-
 ...ield-custom-twig-content-elected-officials-email.html.twig | 2 +-
 ...ode--field-custom-twig-content-elected-officials.html.twig | 2 +-
 ...-content-funcionarios-electos-correo-electronico.html.twig | 2 +-
 ...--field-custom-twig-content-funcionarios-electos.html.twig | 2 +-
 ...twig-content-reporte-problemas-en-este-sitio-web.html.twig | 2 +-
 ...field-custom-twig-content-site-issue-report-form.html.twig | 2 +-
 .../field--node--field-wizard-step--wizard-step.html.twig     | 4 ++--
 .../field--node--field-wizard-step--wizard.html.twig          | 2 +-
 .../templates/wizard_2024/taxonomy-term--wizard.html.twig     | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/themes/custom/usagov/scripts/ceoResults.js b/web/themes/custom/usagov/scripts/ceoResults.js
index ba854d9484..9b68d10bdc 100644
--- a/web/themes/custom/usagov/scripts/ceoResults.js
+++ b/web/themes/custom/usagov/scripts/ceoResults.js
@@ -353,7 +353,7 @@ function renderResults(response, rawResponse) {
                 let linkToContact = document.createElement("button");
                 let firstEmail = email[0];
 
-                linkToContact.setAttribute("class", "usa-button usa-button--secondary state-email");
+                linkToContact.setAttribute("class", "usa-button usagov-button state-email");
                 linkToContact.style.marginTop = "15px";
                 linkToContact.style.marginBottom = "8px";
                 linkToContact.innerHTML = content["contact-via-email"];
diff --git a/web/themes/custom/usagov/scripts/stateDirectory.js b/web/themes/custom/usagov/scripts/stateDirectory.js
index e8b383f7e2..825f9c70b0 100644
--- a/web/themes/custom/usagov/scripts/stateDirectory.js
+++ b/web/themes/custom/usagov/scripts/stateDirectory.js
@@ -39,7 +39,7 @@ jQuery(document).ready(function ($) {
   // add the submit button
   const sumBtn = docLang === "es" ? "Ir" : "Go";
   $("#submitAfter").append(
-    `<button class="usa-button sd-go-btn usa-button--secondary" type="submit">${sumBtn}</button>`
+    `<button class="usa-button sd-go-btn" type="submit">${sumBtn}</button>`
   );
   var goButton = $(".sd-go-btn");
 
diff --git a/web/themes/custom/usagov/templates/block--mobile-navigation.html.twig b/web/themes/custom/usagov/templates/block--mobile-navigation.html.twig
index 2b30279869..03ea0047ae 100644
--- a/web/themes/custom/usagov/templates/block--mobile-navigation.html.twig
+++ b/web/themes/custom/usagov/templates/block--mobile-navigation.html.twig
@@ -159,7 +159,7 @@
           hidden_input_id:"affiliate-mobile-menu",
           input_id:"search-field-small-mobile-menu",
           input_classes:"usa-input text usagov-search-autocomplete ui-autocomplete-input",
-          button_classes:"usa-button usagov-button",
+          button_classes:"usa-button",
           placeholder_string,
           value_string,
           label_string,
diff --git a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials-email.html.twig b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials-email.html.twig
index 6c393ff076..a6329c13d0 100644
--- a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials-email.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials-email.html.twig
@@ -46,7 +46,7 @@
                     name="input-action"
                     rows="5"
                 ></textarea>
-                <button class="usa-button usa-button--secondary usa-button--big">Create my email</button>
+                <button class="usa-button usagov-button">Create my email</button>
             </div>
         </div>
     </form>
diff --git a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials.html.twig b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials.html.twig
index 1f8a3dd544..666d8ce659 100644
--- a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-elected-officials.html.twig
@@ -167,7 +167,7 @@
           <p><a href="/privacy-security">Learn how USA.gov protects your privacy</a>.</p>
         <div class="ceo-button-container">
           <button
-            class="usa-button usa-button--secondary usa-button--big ceo-button"
+            class="usa-button usagov-button ceo-button"
             type="button"
             onclick="handleFormSubmission()"
           >
diff --git a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos-correo-electronico.html.twig b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos-correo-electronico.html.twig
index 4b4e0e0f7d..b11e0b3c17 100644
--- a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos-correo-electronico.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos-correo-electronico.html.twig
@@ -49,7 +49,7 @@
           name="input-action"
           rows="5"
         ></textarea>
-				<button class="usa-button usa-button--secondary usa-button--big">Crear mensaje de correo</button>
+				<button class="usa-button usagov-button">Crear mensaje de correo</button>
 			</div>
 		</div>
 	</form>
diff --git a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos.html.twig b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos.html.twig
index ba5b57cc05..9dd58e972f 100644
--- a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-funcionarios-electos.html.twig
@@ -130,7 +130,7 @@
             <a href="/es/privacidad-seguridad">Conozca cómo USAGov en Español protege su privacidad</a>.
           </p>
           <div class="ceo-button-container">
-            <button class="usa-button usa-button--secondary usa-button--big ceo-button" type="button"
+            <button class="usa-button usagov-button ceo-button" type="button"
             onclick="handleFormSubmission()">
               Encontrar a mis funcionarios electos
             </button>
diff --git a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-reporte-problemas-en-este-sitio-web.html.twig b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-reporte-problemas-en-este-sitio-web.html.twig
index 8c50fce5c9..fbada0ab76 100644
--- a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-reporte-problemas-en-este-sitio-web.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-reporte-problemas-en-este-sitio-web.html.twig
@@ -111,7 +111,7 @@
 						<input type="hidden" id="external" name="external" value="1"/>
 					</div>
 					<div class="ceo-button-container">
-						<button class="g-recaptcha usa-button usa-button--secondary usa-button--big issue-button" data-sitekey="6LfDMNYpAAAAANLxS-UeI2FK7BktwdzKdqRb37MH" data-callback='onSubmit' data-action='submit' onclick="return submitPressed();">Enviar</button>
+						<button class="g-recaptcha usa-button usagov-button issue-button" data-sitekey="6LfDMNYpAAAAANLxS-UeI2FK7BktwdzKdqRb37MH" data-callback='onSubmit' data-action='submit' onclick="return submitPressed();">Enviar</button>
 					</div>
 					<div>
 						<p>Este sitio web está protegido por reCAPTCHA y Google <br>
diff --git a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-site-issue-report-form.html.twig b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-site-issue-report-form.html.twig
index 7b56e5f960..829475a3c8 100644
--- a/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-site-issue-report-form.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-custom-twig-content-site-issue-report-form.html.twig
@@ -111,7 +111,7 @@
 						<input type="hidden" id="external" name="external" value="1"/>
 					</div>
 					<div class="ceo-button-container">
-						<button class="g-recaptcha usa-button usa-button--secondary usa-button--big issue-button" data-sitekey="6LfDMNYpAAAAANLxS-UeI2FK7BktwdzKdqRb37MH" data-callback='onSubmit' data-action='submit' onclick="return submitPressed();">Submit</button>
+						<button class="g-recaptcha usa-button usagov-button issue-button" data-sitekey="6LfDMNYpAAAAANLxS-UeI2FK7BktwdzKdqRb37MH" data-callback='onSubmit' data-action='submit' onclick="return submitPressed();">Submit</button>
 					</div>
 					<div>
 						<p>This site is protected by reCAPTCHA and the Google <br>
diff --git a/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard-step.html.twig b/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard-step.html.twig
index 881f8a8659..364e811e9a 100644
--- a/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard-step.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard-step.html.twig
@@ -48,14 +48,14 @@
 
  <div class="grid-row flex-justify maxw-mobile margin-x-auto margin-top-6  usa-reverse">
         <button id="prior" class="usa-button usa-button--outline usagov-button--outline-black usa-button--big" onclick="window.location.href = document.querySelector(`.previous-wizard-step a`).href+'#block-usagov-content'">{{translation.prior}}</button>
-        <button id="next" class="usa-button usa-button--secondary usa-button--big" onclick="window.location.href = document.querySelector(`input[name='options']:checked`).value">{{translation.next}}</button>
+        <button id="next" class="usa-button usagov-button" onclick="window.location.href = document.querySelector(`input[name='options']:checked`).value">{{translation.next}}</button>
     </div>
 {% else %}
 
 <ul class="add-list-reset">
 {% for item in items %}
     <li>
-        <a href="{{item.content["#url"]}}" class="usa-button usa-button--secondary usa-button--big">{{item.content["#title"]}}</a>
+        <a href="{{item.content["#url"]}}" class="usa-button usagov-button">{{item.content["#title"]}}</a>
     </li>
 {% endfor %}
 </ul>
diff --git a/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard.html.twig b/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard.html.twig
index 52368114a7..416ae9f1c4 100644
--- a/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard.html.twig
+++ b/web/themes/custom/usagov/templates/field--node--field-wizard-step--wizard.html.twig
@@ -16,7 +16,7 @@
     {% for item in items %}
         {% set url = item.content["#url"] %}
         <div class="grid-row flex-justify-center maxw-mobile margin-x-auto margin-top-6">
-            <a id="WizardStartButton" class="usa-button usa-button--secondary usa-button--big" href="{{url}}#block-usagov-content" role="button">
+            <a id="WizardStartButton" class="usa-button usagov-button" href="{{url}}#block-usagov-content" role="button">
                 {% if element["#language"] == "en" %}
                 Find the right place to report a scam
                 {% elseif element["#language"] == "es" %}
diff --git a/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig b/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig
index 2f66971daa..104fe69cce 100644
--- a/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig
+++ b/web/themes/custom/usagov/templates/wizard_2024/taxonomy-term--wizard.html.twig
@@ -58,7 +58,7 @@
 
       {# Generate the url for the parent of this term to put in the 'previous' button. #}
       {% set previous_path = path('entity.taxonomy_term.canonical', {'taxonomy_term': parent_tid}) %}
-      <button id="prior" class="usa-button usa-button--secondary usa-button--big font-sans-md margin-right-2" onclick="window.location.href = '{{ previous_path ~ '#block-usagov-content' }}'">
+      <button id="prior" class="usa-button usagov-button margin-right-2" onclick="window.location.href = '{{ previous_path ~ '#block-usagov-content' }}'">
         {{ previous_string }}</button>
 
       {# If there are items in the options list, this must not be the last term in the tree. Generate a Next button. #}

From c17a8722b39a36bd9bc503268f38eab65ec57fcb Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Wed, 29 Jan 2025 13:45:57 -0500
Subject: [PATCH 7/8] USAGOV-2090-Font-size-consolidation: Revert CKEditor
 button style configs

because we're not ready to edit all the button content and the config change seems to automatically strip classes...
---
 config/sync/editor.editor.uswds.yml | 2 +-
 config/sync/filter.format.uswds.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/sync/editor.editor.uswds.yml b/config/sync/editor.editor.uswds.yml
index fc4e976b3a..6acc0b90c4 100644
--- a/config/sync/editor.editor.uswds.yml
+++ b/config/sync/editor.editor.uswds.yml
@@ -66,7 +66,7 @@ settings:
           element: '<h2 class="font-serif-lg text-bold text-accent-cool-darker">'
         -
           label: Button
-          element: '<a class="usa-button usagov-button">'
+          element: '<a class="usa-button usa-button--secondary usa-button--big">'
     ckeditor_media_resize_mediaResize:
       apply_image_styles: true
       image_styles:
diff --git a/config/sync/filter.format.uswds.yml b/config/sync/filter.format.uswds.yml
index f64ae21f36..5da7a7edb6 100644
--- a/config/sync/filter.format.uswds.yml
+++ b/config/sync/filter.format.uswds.yml
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p class="usa-intro text-align-left text-align-center text-align-right text-align-justify"> <h1 class="text-align-left text-align-center text-align-right text-align-justify"> <h2 class="font-serif-lg text-bold text-accent-cool-darker text-align-left text-align-center text-align-right text-align-justify"> <h3 class="text-align-left text-align-center text-align-right text-align-justify"> <h4 class="text-align-left text-align-center text-align-right text-align-justify"> <a class="usa-button usagov-button" role href> <div class="usa-table-container--scrollable usa-sr-only usa-table__announcement-region text-align-left text-align-center text-align-right text-align-justify" aria-live> <strong> <em> <u> <blockquote> <ul> <ol reversed start> <li> <table class> <tr> <td rowspan colspan data-label data-sort-value> <th rowspan colspan scope data-label data-sortable role> <thead> <tbody> <tfoot> <caption> <drupal-media data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <drupal-paragraph data-embed-button data-entity-label data-paragraph-id data-paragraph-revision-id>'
+      allowed_html: '<br> <p class="usa-intro text-align-left text-align-center text-align-right text-align-justify"> <h1 class="text-align-left text-align-center text-align-right text-align-justify"> <h2 class="font-serif-lg text-bold text-accent-cool-darker text-align-left text-align-center text-align-right text-align-justify"> <h3 class="text-align-left text-align-center text-align-right text-align-justify"> <h4 class="text-align-left text-align-center text-align-right text-align-justify"> <a class="usa-button usa-button--secondary usa-button--big" role href> <div class="usa-table-container--scrollable usa-sr-only usa-table__announcement-region text-align-left text-align-center text-align-right text-align-justify" aria-live> <strong> <em> <u> <blockquote> <ul> <ol reversed start> <li> <table class> <tr> <td rowspan colspan data-label data-sort-value> <th rowspan colspan scope data-label data-sortable role> <thead> <tbody> <tfoot> <caption> <drupal-media data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <drupal-paragraph data-embed-button data-entity-label data-paragraph-id data-paragraph-revision-id>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_table_attributes:

From c5e71a420260053bfc70e87a453dfa7bd0ac43ee Mon Sep 17 00:00:00 2001
From: Chris Wachtman <cwachtman@gmail.com>
Date: Wed, 29 Jan 2025 13:48:21 -0500
Subject: [PATCH 8/8] USAGOV-2090-Font-size-consolidation: remove custom class
 from search button

---
 web/themes/custom/usagov/templates/top_nav.html.twig    | 2 +-
 web/themes/custom/usagov/templates/top_nav_es.html.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/themes/custom/usagov/templates/top_nav.html.twig b/web/themes/custom/usagov/templates/top_nav.html.twig
index 23b5cd4a96..a0c7f47fd1 100644
--- a/web/themes/custom/usagov/templates/top_nav.html.twig
+++ b/web/themes/custom/usagov/templates/top_nav.html.twig
@@ -45,7 +45,7 @@
 				input_id:"search-field-small",
 				input_classes:"usa-input text usagov-search-autocomplete ui-autocomplete-input",
 				placeholder_string:"Search all government",
-				button_classes:"usa-button usagov-button",
+				button_classes:"usa-button",
 				alt_string:"Search",
 			} %}
 			{% endembed %}
diff --git a/web/themes/custom/usagov/templates/top_nav_es.html.twig b/web/themes/custom/usagov/templates/top_nav_es.html.twig
index f6916b41ac..dc375cccfd 100644
--- a/web/themes/custom/usagov/templates/top_nav_es.html.twig
+++ b/web/themes/custom/usagov/templates/top_nav_es.html.twig
@@ -37,7 +37,7 @@
 				input_id:"search-field-small",
 				input_classes:"usa-input text usagov-search-autocomplete ui-autocomplete-input",
 				placeholder_string:"Busque en este sitio...",
-				button_classes:"usa-button usagov-button",
+				button_classes:"usa-button",
 				alt_string:"Buscar",
 			} %}
 			{% endembed %}