erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Replace more font-awesome icons in app/helpers (#30962)

Browse source
This commit is contained in:
Matt Jankowski 2024-08-07 18:53:15 -04:00 committed by GitHub
parent e4092cc73a
commit 52a626f39b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/helpers/application_helper.rb
View file

@ -116,7 +116,7 @@ module ApplicationHelper
def material_symbol(icon, attributes = {})
inline_svg_tag(
"400-24px/#{icon}.svg",
class: %w(icon).concat(attributes[:class].to_s.split),
class: ['icon', "material-#{icon}"].concat(attributes[:class].to_s.split),
role: :img
)
end
@ -127,23 +127,23 @@ module ApplicationHelper
def visibility_icon(status)
if status.public_visibility?
fa_icon('globe', title: I18n.t('statuses.visibilities.public'))
material_symbol('globe', title: I18n.t('statuses.visibilities.public'))
elsif status.unlisted_visibility?
fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
material_symbol('lock_open', title: I18n.t('statuses.visibilities.unlisted'))
elsif status.private_visibility? || status.limited_visibility?
fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
material_symbol('lock', title: I18n.t('statuses.visibilities.private'))
elsif status.direct_visibility?
fa_icon('at', title: I18n.t('statuses.visibilities.direct'))
material_symbol('alternate_email', title: I18n.t('statuses.visibilities.direct'))
end
end
def interrelationships_icon(relationships, account_id)
if relationships.following[account_id] && relationships.followed_by[account_id]
fa_icon('exchange', title: I18n.t('relationships.mutual'), class: 'fa-fw active passive')
material_symbol('sync_alt', title: I18n.t('relationships.mutual'), class: 'active passive')
elsif relationships.following[account_id]
fa_icon(locale_direction == 'ltr' ? 'arrow-right' : 'arrow-left', title: I18n.t('relationships.following'), class: 'fa-fw active')
material_symbol(locale_direction == 'ltr' ? 'arrow_right_alt' : 'arrow_left_alt', title: I18n.t('relationships.following'), class: 'active')
elsif relationships.followed_by[account_id]
fa_icon(locale_direction == 'ltr' ? 'arrow-left' : 'arrow-right', title: I18n.t('relationships.followers'), class: 'fa-fw passive')
material_symbol(locale_direction == 'ltr' ? 'arrow_left_alt' : 'arrow_right_alt', title: I18n.t('relationships.followers'), class: 'passive')
end
end

8
app/helpers/statuses_helper.rb
View file

@ -60,13 +60,13 @@ module StatusesHelper
def fa_visibility_icon(status)
case status.visibility
when 'public'
fa_icon 'globe fw'
material_symbol 'globe'
when 'unlisted'
fa_icon 'unlock fw'
material_symbol 'lock_open'
when 'private'
fa_icon 'lock fw'
material_symbol 'lock'
when 'direct'
fa_icon 'at fw'
material_symbol 'alternate_email'
end
end

1
app/javascript/material-icons/400-24px/arrow_left_alt.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M400-240 160-480l240-240 56 58-142 142h486v80H314l142 142-56 58Z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 189 B

1
app/javascript/material-icons/400-24px/sync_alt.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M280-120 80-320l200-200 57 56-104 104h607v80H233l104 104-57 56Zm400-320-57-56 104-104H120v-80h607L623-784l57-56 200 200-200 200Z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 253 B

4
spec/helpers/application_helper_spec.rb
View file

@ -223,7 +223,7 @@ describe ApplicationHelper do
it 'returns an unlock icon for a unlisted visible status' do
result = helper.visibility_icon Status.new(visibility: 'unlisted')
expect(result).to match(/unlock/)
expect(result).to match(/lock_open/)
end
it 'returns a lock icon for a private visible status' do
@ -233,7 +233,7 @@ describe ApplicationHelper do
it 'returns an at icon for a direct visible status' do
result = helper.visibility_icon Status.new(visibility: 'direct')
expect(result).to match(/at/)
expect(result).to match(/alternate_email/)
end
end

8
spec/helpers/statuses_helper_spec.rb
View file

@ -36,7 +36,7 @@ describe StatusesHelper do
it 'returns the correct fa icon' do
result = helper.fa_visibility_icon(status)
expect(result).to match('fa-globe')
expect(result).to match('material-globe')
end
end
@ -46,7 +46,7 @@ describe StatusesHelper do
it 'returns the correct fa icon' do
result = helper.fa_visibility_icon(status)
expect(result).to match('fa-unlock')
expect(result).to match('material-lock_open')
end
end
@ -56,7 +56,7 @@ describe StatusesHelper do
it 'returns the correct fa icon' do
result = helper.fa_visibility_icon(status)
expect(result).to match('fa-lock')
expect(result).to match('material-lock')
end
end
@ -66,7 +66,7 @@ describe StatusesHelper do
it 'returns the correct fa icon' do
result = helper.fa_visibility_icon(status)
expect(result).to match('fa-at')
expect(result).to match('material-alternate_email')
end
end
end