From 45f9631efe65331e09456438f8a9e61d75ff0a46 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:39:49 -0600
Subject: [PATCH] Fix scaling issue

---
 src/registrar/assets/sass/_theme/_admin.scss             | 9 +++++++++
 src/registrar/templates/admin/fieldset.html              | 4 ++++
 .../django/admin/includes/detail_table_fieldset.html     | 9 +++++++++
 3 files changed, 22 insertions(+)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 6666b85da..d7d116046 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -841,3 +841,12 @@ div.dja__model-description{
 .padding-top-0 {
     padding-top: 0 !important;
 }
+
+
+.flex-container {
+    @media screen and (min-width: 700px) and (max-width: 1150px) {
+        &.flex-container--mobile-inline {
+            display: inline !important;
+        }
+    }
+}
diff --git a/src/registrar/templates/admin/fieldset.html b/src/registrar/templates/admin/fieldset.html
index 89537b098..40cd98ca8 100644
--- a/src/registrar/templates/admin/fieldset.html
+++ b/src/registrar/templates/admin/fieldset.html
@@ -32,7 +32,9 @@ https://github.com/django/django/blob/main/django/contrib/admin/templates/admin/
             {% for field in line %}
                 <div>
                     {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
+                        {% block flex_container_start %}
                         <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
+                        {% endblock flex_container_start %}
                             {% if field.is_checkbox %}
                                 {# .gov override #}
                                 {% block field_checkbox %}
@@ -52,7 +54,9 @@ https://github.com/django/django/blob/main/django/contrib/admin/templates/admin/
                                     {% endblock field_other%}
                                 {% endif %}
                             {% endif %}
+                        {% block flex_container_end %}
                         </div>
+                        {% endblock flex_container_end %}
 
                     {% if field.field.help_text %}
                         {# .gov override #}
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index c2a0c6c56..a46d49bc2 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -6,6 +6,15 @@
 This is using a custom implementation fieldset.html (see admin/fieldset.html)
 {% endcomment %}
 
+{% block flex_container_start %}
+    {% if field.field.name == "status_history" %}
+    <div class="flex-container flex-container--mobile-inline {% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
+    {% else %}
+    {% comment %} Default flex container element {% endcomment %}
+    <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
+    {% endif %}
+{% endblock flex_container_start %}
+
 {% block field_readonly %}
     {% with all_contacts=original_object.other_contacts.all %}
     {% if field.field.name == "status_history" %}