diff --git a/app/assets/images/tooltip.svg b/app/assets/images/tooltip.svg deleted file mode 100644 index 775ce7c851e..00000000000 --- a/app/assets/images/tooltip.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Tooltip LG - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/app/assets/stylesheets/_vendor.scss b/app/assets/stylesheets/_vendor.scss index cb6bf089ed8..666178abc14 100644 --- a/app/assets/stylesheets/_vendor.scss +++ b/app/assets/stylesheets/_vendor.scss @@ -1,5 +1,3 @@ -@import 'hint.css/hint'; - @import 'basscss-sass/defaults'; @import 'basscss-sass/base-reset'; @import 'basscss-sass/base-forms'; diff --git a/app/assets/stylesheets/components/_tooltip.scss b/app/assets/stylesheets/components/_tooltip.scss deleted file mode 100644 index 774cb4f0a7d..00000000000 --- a/app/assets/stylesheets/components/_tooltip.scss +++ /dev/null @@ -1,50 +0,0 @@ -[class*="hint--"] { - cursor: help; - font-style: normal; - font-weight: normal; - letter-spacing: normal; - text-transform: none; - - &::after { - font-size: $h6; - line-height: 1.3; - min-width: 125px; - white-space: normal; - width: 100%; - } - - &:focus::before, - &:focus::after { - opacity: 1; - transition-delay: 100ms; - visibility: visible; - } -} - -.hint--top { - &:focus::before { - transform: translateY(-8px); - } - - &:focus::after { - transform: translateX(-50%) translateY(-8px); - } -} - -.hint--no-animate { - &::before, - &::after { - visibility: hidden; - } - - &:focus::before, - &:focus::after, - &:hover::before, - &:hover::after { - visibility: visible; - } -} - -.img-tooltip { - vertical-align: middle; -} diff --git a/app/assets/stylesheets/components/all.scss b/app/assets/stylesheets/components/all.scss index 8103fddd199..5ea31614800 100644 --- a/app/assets/stylesheets/components/all.scss +++ b/app/assets/stylesheets/components/all.scss @@ -22,7 +22,6 @@ @import 'profile-section'; @import 'personal-key'; @import 'position'; -@import 'tooltip'; @import 'util'; @import 'verification-badge'; @import 'spinner-button'; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c778f111655..a1b44ed5d62 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -15,16 +15,6 @@ def step_class(step, active) end end - def tooltip(text) - content_tag( - :span, \ - image_tag(asset_url('tooltip.svg'), width: 16, class: 'px1 img-tooltip'), \ - class: 'hint--top hint--no-animate', \ - 'aria-label': text, \ - 'tabindex': '0', - ) - end - def sp_session session.fetch(:sp, {}) end diff --git a/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb b/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb index 391fb956c69..1d8c1159a0b 100644 --- a/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb +++ b/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb @@ -7,8 +7,7 @@ def header def help_text t("instructions.mfa.#{two_factor_authentication_method}.confirm_code_html", email: content_tag(:strong, user_email), - app: content_tag(:strong, APP_NAME), - tooltip: view.tooltip(t('tooltips.authentication_app'))) + app: content_tag(:strong, APP_NAME)) end def fallback_question diff --git a/config/locales/instructions/en.yml b/config/locales/instructions/en.yml index f7a79c644c4..829e93b9fec 100644 --- a/config/locales/instructions/en.yml +++ b/config/locales/instructions/en.yml @@ -21,7 +21,7 @@ en: authenticator: confirm_code_html: Enter the code from your authenticator app. If you have several accounts set up in your app, enter the code corresponding to %{email} - at %{app}.%{tooltip} + at %{app}. manual_entry: Or enter this code manually into your authentication app piv_cac: account_not_found: diff --git a/config/locales/instructions/es.yml b/config/locales/instructions/es.yml index 6aae992632d..5dc027ecf1a 100644 --- a/config/locales/instructions/es.yml +++ b/config/locales/instructions/es.yml @@ -22,7 +22,7 @@ es: authenticator: confirm_code_html: Ingrese el código de su app de autenticación. Si tiene varias cuentas configuradas en su app, ingrese el código correspondiente - a %{email} en %{app}.%{tooltip} + a %{email} en %{app}. manual_entry: O ingrese este código manualmente en su aplicación de autenticación piv_cac: account_not_found: diff --git a/config/locales/instructions/fr.yml b/config/locales/instructions/fr.yml index bbd0dc5d696..461d4e5cdd5 100644 --- a/config/locales/instructions/fr.yml +++ b/config/locales/instructions/fr.yml @@ -24,7 +24,7 @@ fr: authenticator: confirm_code_html: Entrez le code à partir de votre application d'authentification. Si vous avez plusieurs comptes configurés dans votre application, entrez - le code correspondant à %{email} à %{app}.%{tooltip} + le code correspondant à %{email} à %{app}. manual_entry: Ou entrez ce code manuellement dans votre application d'authentification piv_cac: account_not_found: diff --git a/config/locales/tooltips/en.yml b/config/locales/tooltips/en.yml deleted file mode 100644 index 2dfb8a4287a..00000000000 --- a/config/locales/tooltips/en.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -en: - tooltips: - authentication_app: An authentication application is a mobile security app that - generates security codes even if you don't have an Internet connection or cellular - service. diff --git a/config/locales/tooltips/es.yml b/config/locales/tooltips/es.yml deleted file mode 100644 index ce8ec2a0735..00000000000 --- a/config/locales/tooltips/es.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -es: - tooltips: - authentication_app: Una app de autenticación es una app de seguridad móvil que - genera códigos de seguridad, incluso si no tiene una conexión de internet o - un servicio celular. diff --git a/config/locales/tooltips/fr.yml b/config/locales/tooltips/fr.yml deleted file mode 100644 index 07bd1bffab4..00000000000 --- a/config/locales/tooltips/fr.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fr: - tooltips: - authentication_app: Une application d'authentification est une application de - sécurité mobile qui génère des codes de sécurité même si vous n'avez pas de - connexion internet ou de service cellulaire. diff --git a/package.json b/package.json index cb75504cd94..006b8cddf2c 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "clipboard": "^1.6.1", "domready": "^1.0.8", "focus-trap": "^6.1.3", - "hint.css": "^2.3.2", "identity-style-guide": "^3.0.0", "intl-tel-input": "^16.0.7", "libphonenumber-js": "^1.7.26", diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 640c1d56ee8..605b8174060 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -9,18 +9,6 @@ end end - describe '#tooltip' do - it 'creates a span containing aria label with text and image' do - tooltip_text = 'foobar' - - html = helper.tooltip(tooltip_text) - - expect(html).to have_css('.hint--top') - expect(html).to have_selector('img') - expect(html).to have_xpath("//span[@aria-label='#{tooltip_text}']") - end - end - describe '#session_with_trust?' do context 'no user present and page is not one with trust' do before do diff --git a/spec/views/two_factor_authentication/totp_verification/show.html.erb_spec.rb b/spec/views/two_factor_authentication/totp_verification/show.html.erb_spec.rb index 42ac7648c20..1e2c21df269 100644 --- a/spec/views/two_factor_authentication/totp_verification/show.html.erb_spec.rb +++ b/spec/views/two_factor_authentication/totp_verification/show.html.erb_spec.rb @@ -52,11 +52,6 @@ ) end - it 'displays a helpful tooltip to the user' do - tooltip = t('tooltips.authentication_app') - expect(rendered).to have_xpath("//span[@aria-label=\"#{tooltip}\"]") - end - context 'user is reauthenticating' do before do allow(@presenter).to receive(:reauthn).and_return(true) diff --git a/yarn.lock b/yarn.lock index 13ef13b5e5a..36c13bb8739 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4680,11 +4680,6 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -hint.css@^2.3.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/hint.css/-/hint.css-2.6.0.tgz#cd6bbe25e2bc16a6454765d9559ad7bd035b3cf5" - integrity sha512-SnCLQOoPQt4fuHbOOvEL3UZwL0SPFtKMN4YIxAvBTe4oFUtBAT4R2Kk1uk3x5hgN+0xzOb6LFEQf5StbYfNm8w== - hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"