diff --git a/CHANGELOG.md b/CHANGELOG.md index cd27344dd34..37041e7d176 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ Unreleased ----------- ### Improvements/Changes -- Layout: Improve layout margins and typographical consistency across several content pages. (#5880, #5884, #5887, #5888, #5908) +- Layout: Improve layout margins and typographical consistency across several content pages. (#5880, #5884, #5887, #5888, #5906, #5908) - Typography: Updated monospace font to Roboto Mono for consistency across login.gov sites. (#5891) - Icons: Replaced custom button icons using U.S. Web Design system icons. (#5904) diff --git a/app/assets/stylesheets/utilities/_space-misc.scss b/app/assets/stylesheets/utilities/_space-misc.scss index 5760aca2aa0..c070ec8f160 100644 --- a/app/assets/stylesheets/utilities/_space-misc.scss +++ b/app/assets/stylesheets/utilities/_space-misc.scss @@ -31,6 +31,10 @@ padding-left: 24px; } +.minw-full { + min-width: 100%; +} + @media #{$breakpoint-sm} { .sm-mr-20p { margin-right: 20px; diff --git a/app/views/shared/_email_languages.html.erb b/app/views/shared/_email_languages.html.erb index 4f5f7b824cb..82aab4e3c5e 100644 --- a/app/views/shared/_email_languages.html.erb +++ b/app/views/shared/_email_languages.html.erb @@ -3,30 +3,33 @@ locals: * f: from validated_form_for * selection: the current language selection %> -
- +
+
+
    + <% I18n.available_locales.each do |locale| %> + <% item_id = "email-locale-#{locale}" %> +
  • + <%= f.input_field( + :email_language, + type: :radio, + value: locale, + checked: selection ? + selection.to_s == locale.to_s : + (I18n.locale.to_s == locale.to_s), + class: 'usa-radio__input usa-radio__input--bordered', + id: item_id, + ) %> + <%= f.label( + :email_language, + locale == I18n.locale ? + t('account.email_language.default', language: t("i18n.locale.#{locale}")) : + t("i18n.locale.#{locale}"), + for: item_id, + class: 'usa-radio__label width-full text-no-wrap', + ) %> +
  • + <% end %> +
+
+
diff --git a/app/views/sign_up/registrations/new.html.erb b/app/views/sign_up/registrations/new.html.erb index 5e0560f1d6b..d241d553ae4 100644 --- a/app/views/sign_up/registrations/new.html.erb +++ b/app/views/sign_up/registrations/new.html.erb @@ -23,7 +23,7 @@ <%= t('forms.registration.labels.email_language') %> -

+

<%= t( 'account.email_language.languages_list', app_name: APP_NAME, @@ -45,6 +45,7 @@ <%= t('sign_up.terms', app_name: APP_NAME) %> <%= new_window_link_to(t('titles.rules_of_use'), MarketingSite.rules_of_use_url) %> <% end, + label_html: { class: 'margin-y-0' }, required: true, ) %> @@ -53,7 +54,7 @@ :button, t('forms.buttons.submit.default'), type: :submit, - class: 'usa-button usa-button--big usa-button--wide margin-y-5', + class: 'display-block usa-button usa-button--big usa-button--wide margin-y-5', ) %> <% end %>