tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace more font-awesome icons in views/settings (#30963)

Browse Source
This commit is contained in:
Matt Jankowski 2024-08-07 18:52:35 -04:00 committed by GitHub
parent abc4ed48f2
commit e4092cc73a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/featured_tags/index.html.haml
View File

@ -24,7 +24,7 @@
.directory__tag .directory__tag
%div %div
%h4 %h4
= fa_icon 'hashtag' = material_symbol 'tag'
= featured_tag.display_name = featured_tag.display_name
%small %small
- if featured_tag.last_status_at.nil? - if featured_tag.last_status_at.nil?

2
app/views/settings/login_activities/_login_activity.html.haml
View File

@ -2,7 +2,7 @@
.log-entry__header .log-entry__header
.log-entry__avatar .log-entry__avatar
.indicator-icon{ class: login_activity.success? ? 'success' : 'failure' } .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__content
.log-entry__title .log-entry__title
= login_activity_title(login_activity) = login_activity_title(login_activity)

4
app/views/settings/profiles/show.html.haml
View File

@ -43,7 +43,7 @@
= image_tag @account.avatar.url, class: 'fields-group__thumbnail', id: 'account_avatar-preview' = image_tag @account.avatar.url, class: 'fields-group__thumbnail', id: 'account_avatar-preview'
- if @account.avatar.present? - if @account.avatar.present?
= link_to settings_profile_picture_path('avatar'), data: { method: :delete }, class: 'link-button link-button--destructive' do = 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') = t('generic.delete')
.fields-row .fields-row
@ -59,7 +59,7 @@
= image_tag @account.header.url, class: 'fields-group__thumbnail', id: 'account_header-preview' = image_tag @account.header.url, class: 'fields-group__thumbnail', id: 'account_header-preview'
- if @account.header.present? - if @account.header.present?
= link_to settings_profile_picture_path('header'), data: { method: :delete }, class: 'link-button link-button--destructive' do = 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') = t('generic.delete')
%h4= t('edit_profile.other') %h4= t('edit_profile.other')

8
app/views/settings/shared/_profile_navigation.html.haml
View File

@ -1,7 +1,7 @@
.content__heading__tabs .content__heading__tabs
= render_navigation renderer: :links do |primary| = render_navigation renderer: :links do |primary|
:ruby :ruby
primary.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_path primary.item :profile, safe_join([material_symbol('person'), t('settings.edit_profile')]), settings_profile_path
primary.item :privacy, safe_join([fa_icon('lock fw'), t('privacy.title')]), settings_privacy_path primary.item :privacy, safe_join([material_symbol('lock'), t('privacy.title')]), settings_privacy_path
primary.item :verification, safe_join([fa_icon('check fw'), t('verification.verification')]), settings_verification_path primary.item :verification, safe_join([material_symbol('check'), 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 :featured_tags, safe_join([material_symbol('tag'), t('settings.featured_tags')]), settings_featured_tags_path

2
app/views/settings/two_factor_authentication_methods/index.html.haml
View File

@ -6,7 +6,7 @@
%p.hint %p.hint
%span.positive-hint %span.positive-hint
= fa_icon 'check' = material_symbol 'check'
   
= t 'two_factor_authentication.enabled' = t 'two_factor_authentication.enabled'

2
app/views/settings/verifications/show.html.haml
View File

@ -26,5 +26,5 @@
- @verified_links.each do |field| - @verified_links.each do |field|
%li %li
%span.verified-badge %span.verified-badge
= fa_icon 'check', class: 'verified-badge__mark' = material_symbol 'check', class: 'verified-badge__mark'
%span= field.value %span= field.value