From c085512c701f11dfc8ef85fa1683084338f0867a Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 20 May 2024 11:56:24 -0600
Subject: [PATCH] Remove fancy styling for fieldset

---
 .../assets/sass/_theme/_fieldsets.scss        |  7 -------
 src/registrar/assets/sass/_theme/_forms.scss  |  4 ++--
 .../templates/finish_profile_setup.html       | 20 ++++++++++++-------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_fieldsets.scss b/src/registrar/assets/sass/_theme/_fieldsets.scss
index 7ad0a2a82..c60080cb9 100644
--- a/src/registrar/assets/sass/_theme/_fieldsets.scss
+++ b/src/registrar/assets/sass/_theme/_fieldsets.scss
@@ -8,10 +8,3 @@ fieldset {
 fieldset:not(:first-child) {
     margin-top: units(2);
 }
-
-fieldset.registrar-fieldset__contact {
-    // This fieldset is for SR purposes only
-    border: 0;
-    margin: 0;
-    padding: 0;
-}
diff --git a/src/registrar/assets/sass/_theme/_forms.scss b/src/registrar/assets/sass/_theme/_forms.scss
index b198bbc18..7a5859012 100644
--- a/src/registrar/assets/sass/_theme/_forms.scss
+++ b/src/registrar/assets/sass/_theme/_forms.scss
@@ -43,11 +43,11 @@
   }
 
 }
-
+/*
 .usa-form-readonly:first-of-type  {
   border-top: None;
   margin-top: 0px !important;
-}
+}*/
 
 .usa-form-readonly > .usa-form-group:first-of-type {
   margin-top: unset;
diff --git a/src/registrar/templates/finish_profile_setup.html b/src/registrar/templates/finish_profile_setup.html
index a8e16724e..b00faa924 100644
--- a/src/registrar/templates/finish_profile_setup.html
+++ b/src/registrar/templates/finish_profile_setup.html
@@ -67,13 +67,19 @@
                             {% input_with_errors form.full_name %}
                         {% endwith %}
                         
-                        <fieldset id="profile-name-fieldset" class="registrar-fieldset__contact display-none">
-                            {% input_with_errors form.first_name %}
-
-                            {% input_with_errors form.middle_name %}
-
-                            {% input_with_errors form.last_name %}
-                        </fieldset>
+                        <div id="profile-name-fieldset" class="display-none" role="group">
+                            {% with group_classes="usa-form-readonly padding-top-2" %}
+                                {% input_with_errors form.first_name %}
+                            {% endwith %}
+                            
+                            {% with group_classes="usa-form-readonly padding-top-2" %}
+                                {% input_with_errors form.middle_name %}
+                            {% endwith %}
+                            
+                            {% with group_classes="usa-form-readonly padding-top-2" %}
+                                {% input_with_errors form.last_name %}
+                            {% endwith %}
+                        </div>
 
                         {# This field doesn't have the readonly button but it has common design elements from it #}
                         {% with show_readonly=True add_class="display-none" group_classes="usa-form-readonly padding-top-2 bold-usa-label" sublabel_text=email_sublabel_text %}