From 13f911b9b5bde77d02ae6aa4a3edf3cc3b2ffd64 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 3 May 2021 13:54:44 -0400 Subject: [PATCH 01/15] Use consistent separator styles for colored horizontal rule --- app/assets/stylesheets/components/_modal.scss | 2 +- .../stylesheets/components/_troubleshooting-options.scss | 2 +- app/assets/stylesheets/utilities/_border.scss | 5 ----- app/views/account_reset/confirm_request/show.html.erb | 4 ++-- app/views/forgot_password/show.html.erb | 4 ++-- app/views/partials/personal_key/_key.html.erb | 2 +- app/views/reactivate_account/_modal.html.erb | 2 +- app/views/session_timeout/_warning.html.erb | 2 +- app/views/shared/_failure.html.erb | 2 +- app/views/sign_up/emails/show.html.erb | 4 ++-- app/views/users/backup_code_setup/confirm_delete.html.erb | 2 +- app/views/users/backup_code_setup/edit.html.erb | 2 +- app/views/users/delete/show.html.erb | 2 +- app/views/users/emails/verify.html.erb | 4 ++-- app/views/users/piv_cac_setup/confirm_delete.html.erb | 2 +- app/views/users/totp_setup/confirm_delete.html.erb | 2 +- app/views/users/webauthn_setup/delete.html.erb | 2 +- 17 files changed, 20 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/components/_modal.scss b/app/assets/stylesheets/components/_modal.scss index b3bc075ee89..8f45232c422 100644 --- a/app/assets/stylesheets/components/_modal.scss +++ b/app/assets/stylesheets/components/_modal.scss @@ -75,7 +75,7 @@ } hr { - width: 7.5rem; + width: 5rem; } } diff --git a/app/assets/stylesheets/components/_troubleshooting-options.scss b/app/assets/stylesheets/components/_troubleshooting-options.scss index 7c684e596dc..c05311ac06e 100644 --- a/app/assets/stylesheets/components/_troubleshooting-options.scss +++ b/app/assets/stylesheets/components/_troubleshooting-options.scss @@ -11,7 +11,7 @@ content: ''; display: block; height: 4px; - width: 5.5rem; + width: 5rem; } } diff --git a/app/assets/stylesheets/utilities/_border.scss b/app/assets/stylesheets/utilities/_border.scss index 12256d68ed6..a73be33f73d 100644 --- a/app/assets/stylesheets/utilities/_border.scss +++ b/app/assets/stylesheets/utilities/_border.scss @@ -1,8 +1,3 @@ -.bw1 { border-width: 1px; } -.bw2 { border-width: 2px; } -.bw3 { border-width: 3px; } -.bw4 { border-width: 4px; } - .border-dashed { border-style: dashed; } .rounded-md { border-radius: $border-radius-md; } diff --git a/app/views/account_reset/confirm_request/show.html.erb b/app/views/account_reset/confirm_request/show.html.erb index ad68fdd12c1..bf793d6b830 100644 --- a/app/views/account_reset/confirm_request/show.html.erb +++ b/app/views/account_reset/confirm_request/show.html.erb @@ -10,8 +10,8 @@ <%= t('account_reset.confirm_request.instructions_end') %>

-
-
+
+
<% if sms_phone %> diff --git a/app/views/forgot_password/show.html.erb b/app/views/forgot_password/show.html.erb index f824e64555f..82bc806a557 100644 --- a/app/views/forgot_password/show.html.erb +++ b/app/views/forgot_password/show.html.erb @@ -17,8 +17,8 @@ <%= t('notices.forgot_password.first_paragraph_end') %>

-
-
+
+
<%= validated_form_for @view_model.password_reset_email_form, diff --git a/app/views/partials/personal_key/_key.html.erb b/app/views/partials/personal_key/_key.html.erb index 30af37563d2..43a9aeb6924 100644 --- a/app/views/partials/personal_key/_key.html.erb +++ b/app/views/partials/personal_key/_key.html.erb @@ -2,7 +2,7 @@

<%= t('users.personal_key.header') %>

-
+
<%- code.split('-').each do |word| -%>
<%= t('instructions.account.reactivate.modal.heading') %> -
+
<%= t('instructions.account.reactivate.modal.copy') %>
diff --git a/app/views/session_timeout/_warning.html.erb b/app/views/session_timeout/_warning.html.erb index 3206380dba2..97a14345c5e 100644 --- a/app/views/session_timeout/_warning.html.erb +++ b/app/views/session_timeout/_warning.html.erb @@ -4,7 +4,7 @@

<%= t('headings.session_timeout_warning') %>

-
+

<%= modal.message %> diff --git a/app/views/shared/_failure.html.erb b/app/views/shared/_failure.html.erb index 444fcf63847..d566438ca04 100644 --- a/app/views/shared/_failure.html.erb +++ b/app/views/shared/_failure.html.erb @@ -12,7 +12,7 @@ <% if presenter.message.present? %>

-
+

diff --git a/app/views/sign_up/emails/show.html.erb b/app/views/sign_up/emails/show.html.erb index d75362fbd54..80e462d9271 100644 --- a/app/views/sign_up/emails/show.html.erb +++ b/app/views/sign_up/emails/show.html.erb @@ -18,8 +18,8 @@ <%= t('notices.signed_up_but_unconfirmed.first_paragraph_end') %>

-
-
+
+
<%= validated_form_for @resend_email_confirmation_form, diff --git a/app/views/users/backup_code_setup/confirm_delete.html.erb b/app/views/users/backup_code_setup/confirm_delete.html.erb index 60b4d05e254..ce2713b65d5 100644 --- a/app/views/users/backup_code_setup/confirm_delete.html.erb +++ b/app/views/users/backup_code_setup/confirm_delete.html.erb @@ -7,7 +7,7 @@

-
+

diff --git a/app/views/users/backup_code_setup/edit.html.erb b/app/views/users/backup_code_setup/edit.html.erb index 7dd95b26904..d2ddc474676 100644 --- a/app/views/users/backup_code_setup/edit.html.erb +++ b/app/views/users/backup_code_setup/edit.html.erb @@ -7,7 +7,7 @@

-
+

diff --git a/app/views/users/delete/show.html.erb b/app/views/users/delete/show.html.erb index cca0e9abfa9..e3cf4125425 100644 --- a/app/views/users/delete/show.html.erb +++ b/app/views/users/delete/show.html.erb @@ -4,7 +4,7 @@

<%= t('users.delete.heading') %>

-
+
<%= t('users.delete.subheading') %>
diff --git a/app/views/users/emails/verify.html.erb b/app/views/users/emails/verify.html.erb index ff03c71c274..e81ab71a9ef 100644 --- a/app/views/users/emails/verify.html.erb +++ b/app/views/users/emails/verify.html.erb @@ -18,8 +18,8 @@ <%= t('notices.signed_up_and_confirmed.first_paragraph_end') %>

-
-
+
+
<%= t('notices.signed_up_and_confirmed.no_email_sent_explanation_start') %> diff --git a/app/views/users/piv_cac_setup/confirm_delete.html.erb b/app/views/users/piv_cac_setup/confirm_delete.html.erb index bd3f12b8767..1200535005c 100644 --- a/app/views/users/piv_cac_setup/confirm_delete.html.erb +++ b/app/views/users/piv_cac_setup/confirm_delete.html.erb @@ -7,7 +7,7 @@
-
+
<%= t('forms.piv_cac_delete.caution') %> diff --git a/app/views/users/totp_setup/confirm_delete.html.erb b/app/views/users/totp_setup/confirm_delete.html.erb index c40b715ef14..8ba54848727 100644 --- a/app/views/users/totp_setup/confirm_delete.html.erb +++ b/app/views/users/totp_setup/confirm_delete.html.erb @@ -7,7 +7,7 @@
-
+
<%= t('forms.totp_delete.caution') %> diff --git a/app/views/users/webauthn_setup/delete.html.erb b/app/views/users/webauthn_setup/delete.html.erb index 0fd45d9f58b..113cb4f3fc7 100644 --- a/app/views/users/webauthn_setup/delete.html.erb +++ b/app/views/users/webauthn_setup/delete.html.erb @@ -4,7 +4,7 @@

<%= t('forms.webauthn_delete.confirm') %>

-
+

<%= t('forms.webauthn_delete.caution') %>

From f8464d025e343aa11a4e22323974c44f96021b83 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 3 May 2021 13:55:55 -0400 Subject: [PATCH 02/15] Remove serif style from fieldset legend **Why**: Consistency with other labels --- app/assets/stylesheets/components/_form.scss | 2 -- app/views/service_provider_mfa/new.html.erb | 2 +- app/views/sign_up/registrations/new.html.erb | 2 +- .../test/piv_cac_authentication_test_subject/new.html.erb | 4 ++-- app/views/two_factor_authentication/options/index.html.erb | 2 +- .../users/edit_phone/_delivery_preference_selection.html.erb | 2 +- app/views/users/edit_phone/_make_default_number.html.erb | 2 +- app/views/users/email_language/show.html.erb | 2 +- .../users/shared/_otp_delivery_preference_selection.html.erb | 2 +- app/views/users/shared/_otp_make_default_number.html.erb | 2 +- .../users/two_factor_authentication_setup/index.html.erb | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/components/_form.scss b/app/assets/stylesheets/components/_form.scss index 602bac45809..298420262ec 100644 --- a/app/assets/stylesheets/components/_form.scss +++ b/app/assets/stylesheets/components/_form.scss @@ -9,8 +9,6 @@ $radio-checkbox-space: 1.5rem; } legend { - // short-circuits line-height to stop inheritance - font: $small-font-size $serif-font-family; font-weight: $heading-font-weight; } diff --git a/app/views/service_provider_mfa/new.html.erb b/app/views/service_provider_mfa/new.html.erb index 863af76fab1..87d476bda5f 100644 --- a/app/views/service_provider_mfa/new.html.erb +++ b/app/views/service_provider_mfa/new.html.erb @@ -14,7 +14,7 @@ url: two_factor_options_path do |f| %>
- <%= t('forms.two_factor_choice.legend') %>: + <%= t('forms.two_factor_choice.legend') %>: <% @presenter.options.each do |option| %> <%= label_tag "two_factor_options_form_selection_#{option.type}", class: "btn-border col-12 margin-bottom-2 #{option.html_class}", diff --git a/app/views/sign_up/registrations/new.html.erb b/app/views/sign_up/registrations/new.html.erb index 6281df32daf..bf9ce1b71e6 100644 --- a/app/views/sign_up/registrations/new.html.erb +++ b/app/views/sign_up/registrations/new.html.erb @@ -24,7 +24,7 @@
- + <%= t('forms.registration.labels.email_language') %> diff --git a/app/views/test/piv_cac_authentication_test_subject/new.html.erb b/app/views/test/piv_cac_authentication_test_subject/new.html.erb index ae64edb65e6..6a2bd2cc601 100644 --- a/app/views/test/piv_cac_authentication_test_subject/new.html.erb +++ b/app/views/test/piv_cac_authentication_test_subject/new.html.erb @@ -13,14 +13,14 @@ <%= hidden_field_tag(:redirect_uri, @referrer) %>
- + Certificate Subject <%= text_field_tag(:subject, '', class: 'block col-12 field monospace') %>
- + Error Conditions