diff --git a/.erb-lint.yml b/.erb-lint.yml index bc8381cc21a..2ca05a71329 100644 --- a/.erb-lint.yml +++ b/.erb-lint.yml @@ -28,8 +28,8 @@ linters: - 'order-([0-3]|last)' - 'not-rounded' - 'rounded-(top|right|bottom|left)' - - '(md|lg)-hide' - - '(xs|md|lg)-show' + - '((sm|md|lg)-)?hide' + - '(sm|md|lg)-show' - 'btn-(small|big|narrow|transparent)' - 'border-(black|gray|white|aqua|orange|fuchsia|purple|maroon|darken-[1-4]|lighten-[1-4])' suggestion: 'Use USWDS classes instead of BassCSS.' diff --git a/app/assets/stylesheets/_vendor.scss b/app/assets/stylesheets/_vendor.scss index 699816a810e..3c1271bb1e7 100644 --- a/app/assets/stylesheets/_vendor.scss +++ b/app/assets/stylesheets/_vendor.scss @@ -14,7 +14,6 @@ @import 'basscss-sass/utility-layout'; @import 'basscss-sass/white-space'; @import 'basscss-sass/positions'; -@import 'basscss-sass/responsive-states'; @import 'basscss-sass/grid'; @import 'basscss-sass/flex-object'; @import 'basscss-sass/borders'; diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss index 50d8ec6e011..054a7132a79 100644 --- a/app/assets/stylesheets/components/_btn.scss +++ b/app/assets/stylesheets/components/_btn.scss @@ -83,7 +83,6 @@ border-style: solid; border-width: $border-width; box-sizing: border-box; - display: inline-block; padding: $space-1 $space-2; &.is-focused { diff --git a/app/javascript/packs/pw-strength.js b/app/javascript/packs/pw-strength.js index 61e53b406a0..2d6c4ac3e76 100644 --- a/app/javascript/packs/pw-strength.js +++ b/app/javascript/packs/pw-strength.js @@ -128,7 +128,7 @@ function analyzePw() { disableSubmit(submit); - // the pw strength module is hidden by default ("hide" CSS class) + // the pw strength module is hidden by default ("display-none" CSS class) // (so that javascript disabled browsers won't see it) // thus, first step is unhiding it pwCntnr.className = ''; diff --git a/app/javascript/packs/saml-post.js b/app/javascript/packs/saml-post.js index a1a6ff38538..6c807265d08 100644 --- a/app/javascript/packs/saml-post.js +++ b/app/javascript/packs/saml-post.js @@ -1,4 +1,4 @@ document.addEventListener('DOMContentLoaded', function () { - document.body.className += ' hide'; + document.body.className += ' usa-sr-only'; document.getElementById('saml-post-binding').submit(); }); diff --git a/app/javascript/packs/webauthn-unhide-signin.js b/app/javascript/packs/webauthn-unhide-signin.js index 09fb8d726a1..843c1f70b8e 100644 --- a/app/javascript/packs/webauthn-unhide-signin.js +++ b/app/javascript/packs/webauthn-unhide-signin.js @@ -4,14 +4,14 @@ function unhideWebauthn() { if (WebAuthn.isWebAuthnEnabled()) { const elem = document.getElementById('select_webauthn'); if (elem) { - elem.classList.remove('hide'); + elem.classList.remove('display-none'); } } else { const checkboxes = document.querySelectorAll( 'input[name="two_factor_options_form[selection]"]', ); for (let i = 0, len = checkboxes.length; i < len; i += 1) { - if (!checkboxes[i].classList.contains('hide')) { + if (!checkboxes[i].classList.contains('display-none')) { checkboxes[i].checked = true; break; } diff --git a/app/javascript/packs/webauthn-unhide-signup.js b/app/javascript/packs/webauthn-unhide-signup.js index af6f41db952..ec1abc7f0d8 100644 --- a/app/javascript/packs/webauthn-unhide-signup.js +++ b/app/javascript/packs/webauthn-unhide-signup.js @@ -5,7 +5,7 @@ function unhideWebauthn() { const elem = document.querySelector('label[for=two_factor_options_form_selection_webauthn]'); if (elem) { elem.hidden = false; - elem.classList.remove('hide'); + elem.classList.remove('display-none'); } } } diff --git a/app/presenters/two_factor_authentication/webauthn_selection_presenter.rb b/app/presenters/two_factor_authentication/webauthn_selection_presenter.rb index 04d1346b7d8..9ad09a8c4c8 100644 --- a/app/presenters/two_factor_authentication/webauthn_selection_presenter.rb +++ b/app/presenters/two_factor_authentication/webauthn_selection_presenter.rb @@ -5,7 +5,7 @@ def method end def html_class - 'hide' + 'display-none' end # :reek:UtilityFunction diff --git a/app/views/account_reset/request/show.html.erb b/app/views/account_reset/request/show.html.erb index aa61e8fe8b7..e71891cd353 100644 --- a/app/views/account_reset/request/show.html.erb +++ b/app/views/account_reset/request/show.html.erb @@ -23,7 +23,7 @@ t('users.personal_key.print'), '#', data: { print: true }, - class: 'ml2 btn-border ico ico-print text-decoration-none', + class: 'ml2 btn-border display-inline-block ico ico-print text-decoration-none', ) %>
diff --git a/app/views/accounts/_header.html.erb b/app/views/accounts/_header.html.erb index 17fc4974fd8..418808fe904 100644 --- a/app/views/accounts/_header.html.erb +++ b/app/views/accounts/_header.html.erb @@ -1,19 +1,19 @@

- + <%= t('account.welcome') %>, <%= view_model.header_personalization %> - +

<%= render 'accounts/badges' %>
-
+
<%= t('headings.account.login_info') %>
diff --git a/app/views/accounts/actions/_delete_account.html.erb b/app/views/accounts/actions/_delete_account.html.erb index fc39cc6de35..4eeaeb11fad 100644 --- a/app/views/accounts/actions/_delete_account.html.erb +++ b/app/views/accounts/actions/_delete_account.html.erb @@ -1,5 +1,5 @@ <%= link_to account_delete_path do %> - + <%= t('account.items.delete_your_account') %> <%= t('account.links.delete_account') %> diff --git a/app/views/accounts/actions/_edit_action_button.html.erb b/app/views/accounts/actions/_edit_action_button.html.erb index c00b02fab36..84162003bb3 100644 --- a/app/views/accounts/actions/_edit_action_button.html.erb +++ b/app/views/accounts/actions/_edit_action_button.html.erb @@ -1,5 +1,5 @@ <%= link_to path do %> - + <%= name %> <%= t('forms.buttons.edit') %> diff --git a/app/views/accounts/actions/_enable_piv_cac.html.erb b/app/views/accounts/actions/_enable_piv_cac.html.erb index c7abd2caf22..de72cc2582d 100644 --- a/app/views/accounts/actions/_enable_piv_cac.html.erb +++ b/app/views/accounts/actions/_enable_piv_cac.html.erb @@ -1,5 +1,5 @@ <%= link_to setup_piv_cac_url, class: 'btn btn-account-action rounded-lg bg-light-blue add-piv' do %> - + <%= t('account.index.piv_cac_card') %> <%= prefix_with_plus(t('forms.buttons.enable')) %> diff --git a/app/views/accounts/actions/_manage_action_button.html.erb b/app/views/accounts/actions/_manage_action_button.html.erb index e44ed8cf7bd..924099cea2c 100644 --- a/app/views/accounts/actions/_manage_action_button.html.erb +++ b/app/views/accounts/actions/_manage_action_button.html.erb @@ -1,5 +1,5 @@ <%= link_to path do %> - + <%= name %> <%= t('forms.buttons.manage') %> diff --git a/app/views/accounts/actions/_manage_personal_key.html.erb b/app/views/accounts/actions/_manage_personal_key.html.erb index 72835c01b69..c26acde72f6 100644 --- a/app/views/accounts/actions/_manage_personal_key.html.erb +++ b/app/views/accounts/actions/_manage_personal_key.html.erb @@ -4,7 +4,7 @@ class: 'btn btn-link ml1', form_class: 'inline-block', ) do %> - + <%= t('account.items.personal_key') %> <%= t('account.links.regenerate_personal_key') %> diff --git a/app/views/devise/shared/_password_strength.html.erb b/app/views/devise/shared/_password_strength.html.erb index 5ab53260b4e..2f8ee0624b2 100644 --- a/app/views/devise/shared/_password_strength.html.erb +++ b/app/views/devise/shared/_password_strength.html.erb @@ -1,4 +1,4 @@ -
+