diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index a0c06d1ce..89c4c9f8e 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -791,6 +791,7 @@ div.dja__model-description{ textarea { width: 100%; resize: none; + cursor: pointer; &::-webkit-scrollbar { background-color: transparent; @@ -805,18 +806,6 @@ div.dja__model-description{ border: 3px solid transparent; } - &::-webkit-scrollbar-thumb:hover { - cursor: pointer; - } - - - &::-webkit-scrollbar-button { - display: none; - } - - ::-webkit-scrollbar-corner { - display: none; - } } diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 5d2c16fa5..d393e0380 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -577,12 +577,9 @@ class DomainRequest(TimeStampedModel): # Return the content of the rendered views context = {"domain_request": self} - # autoescape off adds a newline to the beginning of the email. - # This is fine when the email is rendered, but we don't need this for display. - email_body_text = template.render(context=context).lstrip().lstrip("\n") return { "subject_text": subject_template.render(context=context), - "email_body_text": email_body_text + "email_body_text": template.render(context=context) } 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 f7086570a..714b26d71 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -109,10 +109,10 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% if original_object.action_needed_reason_email %} {% endif %} diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py index 62afa1acb..c8eeabf0a 100644 --- a/src/registrar/templatetags/custom_filters.py +++ b/src/registrar/templatetags/custom_filters.py @@ -145,3 +145,12 @@ def format_phone(value): phone_number = PhoneNumber.from_string(value) return phone_number.as_national return value + +@register.filter +def strip_beginning_newline_and_spaces(value): + """Removes any newline characters (and spaces) + on the first line of a given string""" + if value and isinstance(value, str): + return value.lstrip("\n").lstrip(" ") + else: + return value \ No newline at end of file