From 54b21a32f491beb9ecd5e2626cdc32734d0a4346 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew.duthie@gsa.gov>
Date: Wed, 17 Nov 2021 09:19:23 -0500
Subject: [PATCH 1/2] Remove instances of "h1" BassCSS class

**Why**: Toward migration off BassCSS to design system.
---
 .erb-lint.yml                                             | 2 +-
 app/views/idv/doc_auth/upload.html.erb                    | 2 +-
 app/views/shared/_no_pii_banner.html.erb                  | 2 +-
 app/views/users/piv_cac_authentication_setup/new.html.erb | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.erb-lint.yml b/.erb-lint.yml
index 28149675943..d573671a772 100644
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -151,7 +151,7 @@ linters:
           - 'btn(-(small|big|narrow|wide|link|primary|secondary|danger|disabled|big|narrow|transparent|border))?'
           - '(border|bg)-(none|black|gray|silver|aqua|blue|navy|teal|green|olive|lime|orange|red|fuchsia|purple|maroon|darken-[1-4]|lighten-[1-4])'
           - 'bg-(cover|contain|center|top|right|bottom|left)'
-          - 'h([03]|00)'
+          - 'h([013]|00)'
           - 'h([01]|00)-responsive'
         suggestion: 'Use USWDS classes instead of BassCSS.'
       - deprecated:
diff --git a/app/views/idv/doc_auth/upload.html.erb b/app/views/idv/doc_auth/upload.html.erb
index 42ae3ef6bf3..05c1ab58e71 100644
--- a/app/views/idv/doc_auth/upload.html.erb
+++ b/app/views/idv/doc_auth/upload.html.erb
@@ -39,7 +39,7 @@
     <%= t('doc_auth.info.tag') %>
   </div>
   <div class='sm-col sm-col-9'>
-    <div class='bold h1 margin-y-105'>
+    <div class="text-bold font-sans-lg margin-y-105">
       <% if liveness_checking_enabled? %>
         <%= t('doc_auth.headings.upload_from_phone_liveness_enabled') %>
       <% else %>
diff --git a/app/views/shared/_no_pii_banner.html.erb b/app/views/shared/_no_pii_banner.html.erb
index ad1945b009d..eec62313a79 100644
--- a/app/views/shared/_no_pii_banner.html.erb
+++ b/app/views/shared/_no_pii_banner.html.erb
@@ -1,3 +1,3 @@
-<div class='h1 padding-y-4 bg-secondary-darker text-white fs-12p line-height-1 center'>
+<div class="font-sans-lg padding-y-4 bg-secondary-darker text-white line-height-1 text-center">
   <%= t('idv.messages.sessions.no_pii') %>
 </div>
diff --git a/app/views/users/piv_cac_authentication_setup/new.html.erb b/app/views/users/piv_cac_authentication_setup/new.html.erb
index b966903c243..70f6c3983c3 100644
--- a/app/views/users/piv_cac_authentication_setup/new.html.erb
+++ b/app/views/users/piv_cac_authentication_setup/new.html.erb
@@ -9,7 +9,7 @@
     <div class='inline-block margin-right-2 margin-top-1 text-top circle-number bg-primary text-white'>
       1
     </div>
-    <label class="h1 margin-right-1 inline-block margin-bottom-1 bold" for="nickname">
+    <label class="font-sans-lg margin-right-1 display-inline-block margin-bottom-1 text-bold" for="nickname">
       <%= t('instructions.mfa.piv_cac.step_1') %>
     </label>
     <div class='margin-left-6 margin-bottom-1'>
@@ -25,7 +25,7 @@
       2
     </div>
     <div class='margin-right-1 inline-block margin-bottom-2'>
-      <div class='h1 inline-block bold'>
+      <div class="font-sans-lg display-inline-block text-bold">
         <%= t('instructions.mfa.piv_cac.step_2') %>
       </div>
     </div>
@@ -36,7 +36,7 @@
       3
     </div>
     <div class='margin-right-1 inline-block'>
-      <div class='h1 inline-block bold'>
+      <div class="font-sans-lg display-inline-block text-bold">
         <%= t('instructions.mfa.piv_cac.step_3') %>
       </div>
     </div>

From c02921b3725fda8e0cd94acf818a59dd9ebc5d16 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew.duthie@gsa.gov>
Date: Wed, 17 Nov 2021 16:03:30 -0500
Subject: [PATCH 2/2] Render device-choice subheading as h2.font-family-sans

---
 app/views/idv/doc_auth/upload.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/idv/doc_auth/upload.html.erb b/app/views/idv/doc_auth/upload.html.erb
index 05c1ab58e71..2a08c5c169e 100644
--- a/app/views/idv/doc_auth/upload.html.erb
+++ b/app/views/idv/doc_auth/upload.html.erb
@@ -39,13 +39,13 @@
     <%= t('doc_auth.info.tag') %>
   </div>
   <div class='sm-col sm-col-9'>
-    <div class="text-bold font-sans-lg margin-y-105">
+    <h2 class="font-family-sans margin-y-105">
       <% if liveness_checking_enabled? %>
         <%= t('doc_auth.headings.upload_from_phone_liveness_enabled') %>
       <% else %>
         <%= t('doc_auth.headings.upload_from_phone') %>
       <% end %>
-    </div>
+    </h2>
     <%= t('doc_auth.info.upload_from_phone') %>
     <br/>
     <%= validated_form_for(