From be93596075b881f1f057c3135c8ef885bc547b85 Mon Sep 17 00:00:00 2001 From: alexjanousekGSA Date: Wed, 30 Jul 2025 15:46:53 -0400 Subject: [PATCH] More cleanup and changes for stable pr --- app/assets/javascripts/listEntry.js | 17 +++++------------ .../uswds/_uswds-theme-custom-styles.scss | 10 ++++++++-- app/templates/components/select-input.html | 4 ++-- app/templates/views/api/keys/create.html | 4 +--- .../views/manage-users/permissions.html | 2 +- ...t_API_Keys_Create_0_document_0_desktop.png | Bin 124263 -> 124330 bytes ...ckstop_test_About_0_document_0_desktop.png | Bin 333241 -> 333161 bytes ...mail_Not_Received_0_document_0_desktop.png | Bin 161996 -> 161981 bytes ...e_to_Organization_0_document_0_desktop.png | Bin 115585 -> 115544 bytes ...Notifygov_Sign_In_0_document_0_desktop.png | Bin 161996 -> 161981 bytes ..._test_Performance_0_document_0_desktop.png | Bin 124118 -> 130466 bytes ...min_Live_Services_0_document_0_desktop.png | Bin 126632 -> 126436 bytes ...Text_Not_Received_0_document_0_desktop.png | Bin 161996 -> 161986 bytes ...stop_test_Uploads_0_document_0_desktop.png | Bin 116719 -> 117238 bytes 14 files changed, 17 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/listEntry.js b/app/assets/javascripts/listEntry.js index 15c7405fe..321b944c0 100644 --- a/app/assets/javascripts/listEntry.js +++ b/app/assets/javascripts/listEntry.js @@ -27,7 +27,7 @@ }; ListEntry.optionalAttributes = ['aria-describedby']; ListEntry.prototype.entryTemplate = Hogan.compile( - '
' + + '
' + '' + @@ -39,14 +39,14 @@ ' {{{sharedAttributes}}}' + '/>' + '{{#button}}' + - '' + '{{/button}}' + '
' ); ListEntry.prototype.addButtonTemplate = Hogan.compile( - '' + '' ); ListEntry.prototype.getSharedAttributes = function () { var $inputs = this.$wrapper.find('input'), @@ -101,15 +101,8 @@ if ($firstInput.length) { var classList = $firstInput.attr('class'); if (classList) { - // Remove any GOV.UK or USA numbered classes, keep others - this.additionalClasses = classList - .split(' ') - .filter(function(cls) { - return cls && - !cls.match(/^(govuk-input|usa-input)/) && - cls !== 'usa-input--numbered'; - }) - .join(' '); + // Preserve any additional classes from the original input + this.additionalClasses = classList; } else { this.additionalClasses = ''; } diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index f8c40f2ad..029aaa22f 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -1093,7 +1093,13 @@ nav.nav { margin-top: 0; } -// Global styling for radio button legends -fieldset legend.usa-legend { +// Radio button and checkbox legends +.usa-radio legend.usa-legend, +.usa-checkbox legend.usa-legend, +.api-key-radios legend.usa-legend, +.login-auth-radios legend.usa-legend, +.auth-type-radios legend.usa-legend, +.notification-type-radios legend.usa-legend, +.organizations-radios legend.usa-legend { font-weight: 700; } diff --git a/app/templates/components/select-input.html b/app/templates/components/select-input.html index 0c7fd59ea..0af11021c 100644 --- a/app/templates/components/select-input.html +++ b/app/templates/components/select-input.html @@ -12,12 +12,12 @@ {% macro select_list(options, child_map, disable=[], option_hints={}, input="radio", indent_level=0) %} {% for option in options %} {% if child_map[option.data] %} -
+
{{ select_input(option, disable, option_hints, as_list_item=False, input=input) }}
{{ select_list(child_map[option.data], child_map, disable, option_hints, input=input, indent_level=indent_level + 1) }} {% else %} -
+
{{ select_input(option, disable, option_hints, as_list_item=False, input=input) }}
{% endif %} diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html index f7cd002d2..260264bef 100644 --- a/app/templates/views/api/keys/create.html +++ b/app/templates/views/api/keys/create.html @@ -20,8 +20,7 @@ {% call form_wrapper() %} {{ form.key_name }} -
-
+
{% if current_service.trial_mode %} {{ radios( form.key_type, @@ -31,7 +30,6 @@ {% else %} {{ radios(form.key_type) }} {% endif %} -
{{ page_footer('Continue') }} {% endcall %} diff --git a/app/templates/views/manage-users/permissions.html b/app/templates/views/manage-users/permissions.html index e2bbb4851..c01bb9c34 100644 --- a/app/templates/views/manage-users/permissions.html +++ b/app/templates/views/manage-users/permissions.html @@ -11,7 +11,7 @@ {% endif %} {% if service_has_email_auth %} -