From e4092cc73a5647b5c880cb312928cc9c4cea94fd Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 7 Aug 2024 18:52:35 -0400 Subject: [PATCH] Replace more `font-awesome` icons in `views/settings` (#30963) --- app/views/settings/featured_tags/index.html.haml | 2 +- .../settings/login_activities/_login_activity.html.haml | 2 +- app/views/settings/profiles/show.html.haml | 4 ++-- app/views/settings/shared/_profile_navigation.html.haml | 8 ++++---- .../two_factor_authentication_methods/index.html.haml | 2 +- app/views/settings/verifications/show.html.haml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml index c8c9ec4069..4b6c019e69 100644 --- a/app/views/settings/featured_tags/index.html.haml +++ b/app/views/settings/featured_tags/index.html.haml @@ -24,7 +24,7 @@ .directory__tag %div %h4 - = fa_icon 'hashtag' + = material_symbol 'tag' = featured_tag.display_name %small - if featured_tag.last_status_at.nil? diff --git a/app/views/settings/login_activities/_login_activity.html.haml b/app/views/settings/login_activities/_login_activity.html.haml index 36314926a3..d003058aea 100644 --- a/app/views/settings/login_activities/_login_activity.html.haml +++ b/app/views/settings/login_activities/_login_activity.html.haml @@ -2,7 +2,7 @@ .log-entry__header .log-entry__avatar .indicator-icon{ class: login_activity.success? ? 'success' : 'failure' } - = fa_icon login_activity.success? ? 'check' : 'times' + = material_symbol login_activity.success? ? 'check' : 'close' .log-entry__content .log-entry__title = login_activity_title(login_activity) diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index b7b0a0da92..9790df7d05 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -43,7 +43,7 @@ = image_tag @account.avatar.url, class: 'fields-group__thumbnail', id: 'account_avatar-preview' - if @account.avatar.present? = link_to settings_profile_picture_path('avatar'), data: { method: :delete }, class: 'link-button link-button--destructive' do - = fa_icon 'trash fw' + = material_symbol 'delete' = t('generic.delete') .fields-row @@ -59,7 +59,7 @@ = image_tag @account.header.url, class: 'fields-group__thumbnail', id: 'account_header-preview' - if @account.header.present? = link_to settings_profile_picture_path('header'), data: { method: :delete }, class: 'link-button link-button--destructive' do - = fa_icon 'trash fw' + = material_symbol 'delete' = t('generic.delete') %h4= t('edit_profile.other') diff --git a/app/views/settings/shared/_profile_navigation.html.haml b/app/views/settings/shared/_profile_navigation.html.haml index 3a657c5bde..d490bd7566 100644 --- a/app/views/settings/shared/_profile_navigation.html.haml +++ b/app/views/settings/shared/_profile_navigation.html.haml @@ -1,7 +1,7 @@ .content__heading__tabs = render_navigation renderer: :links do |primary| :ruby - primary.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_path - primary.item :privacy, safe_join([fa_icon('lock fw'), t('privacy.title')]), settings_privacy_path - primary.item :verification, safe_join([fa_icon('check fw'), t('verification.verification')]), settings_verification_path - primary.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_path + primary.item :profile, safe_join([material_symbol('person'), t('settings.edit_profile')]), settings_profile_path + primary.item :privacy, safe_join([material_symbol('lock'), t('privacy.title')]), settings_privacy_path + primary.item :verification, safe_join([material_symbol('check'), t('verification.verification')]), settings_verification_path + primary.item :featured_tags, safe_join([material_symbol('tag'), t('settings.featured_tags')]), settings_featured_tags_path diff --git a/app/views/settings/two_factor_authentication_methods/index.html.haml b/app/views/settings/two_factor_authentication_methods/index.html.haml index 51141fab4f..2e4ff4091c 100644 --- a/app/views/settings/two_factor_authentication_methods/index.html.haml +++ b/app/views/settings/two_factor_authentication_methods/index.html.haml @@ -6,7 +6,7 @@ %p.hint %span.positive-hint - = fa_icon 'check' + = material_symbol 'check'   = t 'two_factor_authentication.enabled' diff --git a/app/views/settings/verifications/show.html.haml b/app/views/settings/verifications/show.html.haml index 94283d2050..4fb2918018 100644 --- a/app/views/settings/verifications/show.html.haml +++ b/app/views/settings/verifications/show.html.haml @@ -26,5 +26,5 @@ - @verified_links.each do |field| %li %span.verified-badge - = fa_icon 'check', class: 'verified-badge__mark' + = material_symbol 'check', class: 'verified-badge__mark' %span= field.value