diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss index cd1aee3e0..11a331fe5 100644 --- a/app/assets/stylesheets/buttons.scss +++ b/app/assets/stylesheets/buttons.scss @@ -316,3 +316,7 @@ .link { color: $blue-france-500; } + +.account-btn::before { + content: none !important; +} diff --git a/app/views/layouts/_account_dropdown.haml b/app/views/layouts/_account_dropdown.haml index 9c99d69d9..129f5ffaf 100644 --- a/app/views/layouts/_account_dropdown.haml +++ b/app/views/layouts/_account_dropdown.haml @@ -1,6 +1,6 @@ -%nav.fr-nav{ role: "navigation", "aria-label"=> t('menu_aria_label', scope: [:layouts]) } +%nav.fr-translate.fr-nav{ role: "navigation", "aria-label"=> t('menu_aria_label', scope: [:layouts]) } .fr-nav__item - %button.fr-translate__btn.fr-btn{ "aria-controls" => "account", "aria-expanded" => "false", :title => t('my_account', scope: [:layouts]) } + %button.account-btn.fr-translate__btn.fr-btn{ "aria-controls" => "account", "aria-expanded" => "false", :title => t('my_account', scope: [:layouts]) } = image_tag "icons/account-circle.svg", alt: t('my_account', scope: [:layouts]), width: 20, height: 20, loading: 'lazy'   = " #{current_email}" diff --git a/spec/views/layouts/_header_spec.rb b/spec/views/layouts/_header_spec.rb index 74683e29c..db2d91dcc 100644 --- a/spec/views/layouts/_header_spec.rb +++ b/spec/views/layouts/_header_spec.rb @@ -20,6 +20,7 @@ describe 'layouts/_header.html.haml', type: :view do let(:profile) { nil } it { is_expected.to have_css(".fr-header__logo") } + it { is_expected.to_not have_css(".account-btn") } it 'displays the Help link' do expect(subject).to have_link('Aide', href: FAQ_URL) @@ -44,6 +45,7 @@ describe 'layouts/_header.html.haml', type: :view do it { is_expected.to have_css(".fr-header__logo") } it { is_expected.to have_link("Dossiers", href: dossiers_path) } + it { is_expected.to have_selector(:button, user.email, class: "account-btn") } it 'displays the Help button' do expect(subject).to have_link("Aide", href: FAQ_URL) @@ -57,6 +59,7 @@ describe 'layouts/_header.html.haml', type: :view do let(:current_instructeur) { instructeur } it { is_expected.to have_css(".fr-header__logo") } + it { is_expected.to have_selector(:button, user.email, class: "account-btn") } it 'displays the Help dropdown menu' do expect(subject).to have_css(".help-dropdown")