chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 11 Wiki Activity

Migrate fontawesome->material in more views (#31360)

Browse source
This commit is contained in:
Matt Jankowski 2024-08-20 07:52:45 -04:00 • committed by GitHub
commit fa2e7b1708
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 71 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/application/_card.html.haml
View file

@ -15,4 +15,4 @@
%strong.emojify.p-name= display_name(account, custom_emojify: true)
%span
= acct(account)
= fa_icon('lock', { data: ({ hidden: true } unless account.locked?) })
= material_symbol('lock', { data: ({ hidden: true } unless account.locked?) })

2
app/views/auth/registrations/_account_warning.html.haml
View file

@ -2,7 +2,7 @@
.strike-entry__header
.strike-entry__avatar
.indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
= fa_icon 'warning'
= material_symbol 'warning'
.strike-entry__content
.strike-entry__title
= t 'disputes.strikes.title',

2
app/views/auth/registrations/_session.html.haml
View file

@ -1,7 +1,7 @@
%tr
%td
%span{ title: session.user_agent }<
= fa_icon "#{session_device_icon(session)} fw", 'aria-label': session_device_icon(session)
= material_symbol session_device_icon(session), 'aria-label': session_device_icon(session)
&nbsp;
= t 'sessions.description',
browser: t("sessions.browsers.#{session.browser}", default: session.browser.to_s),

4
app/views/disputes/strikes/show.html.haml
View file

@ -9,13 +9,13 @@
- if @strike.overruled?
%p.hint
%span.positive-hint
= fa_icon 'check'
= material_symbol 'check'
&nbsp;
= t 'disputes.strikes.appeal_approved'
- elsif @appeal.persisted? && @appeal.rejected?
%p.hint
%span.negative-hint
= fa_icon 'times'
= material_symbol 'close'
&nbsp;
= t 'disputes.strikes.appeal_rejected'

4
app/views/filters/_filter.html.haml
View file

@ -14,7 +14,7 @@
- unless filter.keywords.empty?
%li.permissions-list__item
.permissions-list__item__icon
= fa_icon('paragraph')
= material_symbol('format_paragraph')
.permissions-list__item__text
.permissions-list__item__text__title
= t('filters.index.keywords', count: filter.keywords.size)
@ -25,7 +25,7 @@
- unless filter.statuses.empty?
%li.permissions-list__item
.permissions-list__item__icon
= fa_icon('comment')
= material_symbol('chat')
.permissions-list__item__text
.permissions-list__item__text__title
= t('filters.index.statuses', count: filter.statuses.size)

2
app/views/filters/_filter_fields.html.haml
View file

@ -58,4 +58,4 @@
%tr
%td{ colspan: 3 }
= link_to_add_association f, :keywords, class: 'table-action-link', partial: 'keyword_fields', 'data-association-insertion-node': '.keywords-table tbody', 'data-association-insertion-method': 'append' do
= safe_join([fa_icon('plus'), t('filters.edit.add_keyword')])
= safe_join([material_symbol('add'), t('filters.edit.add_keyword')])

2
app/views/filters/_keyword_fields.html.haml
View file

@ -5,4 +5,4 @@
%td
= f.hidden_field :id if f.object&.persisted? # Required so Rails doesn't put the field outside of the <tr/>
= link_to_remove_association(f, class: 'table-action-link') do
= safe_join([fa_icon('times'), t('filters.index.delete')])
= safe_join([material_symbol('close'), t('filters.index.delete')])

2
app/views/invites/_invite.html.haml
View file

@ -7,7 +7,7 @@
- if invite.valid_for_use?
%td
= fa_icon 'user fw'
= material_symbol 'person'
= invite.uses
= " / #{invite.max_uses}" unless invite.max_uses.nil?
%td

2
app/views/kaminari/_next_page.html.haml
View file

@ -8,4 +8,4 @@
remote: data-remote
%span.next
= link_to_unless current_page.last?, safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), url, rel: 'next', remote: remote
= link_to_unless current_page.last?, safe_join([t('pagination.next'), material_symbol('chevron_right')], ' '), url, rel: 'next', remote: remote

2
app/views/kaminari/_prev_page.html.haml
View file

@ -7,4 +7,4 @@
per_page: number of items to fetch per page
remote: data-remote
%span.prev
= link_to_unless current_page.first?, safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '), url, rel: 'prev', remote: remote
= link_to_unless current_page.first?, safe_join([material_symbol('chevron_left'), t('pagination.prev')], ' '), url, rel: 'prev', remote: remote

2
app/views/oauth/authorizations/new.html.haml
View file

@ -13,7 +13,7 @@
- grouped_scopes(@pre_auth.scopes).each do |scope|
%li.permissions-list__item
.permissions-list__item__icon
= fa_icon('check')
= material_symbol('check')
.permissions-list__item__text
.permissions-list__item__text__title
= t(scope.key, scope: [:doorkeeper, :grouped_scopes, :title])

2
app/views/oauth/authorized_applications/index.html.haml
View file

@ -36,7 +36,7 @@
- grouped_scopes(application.scopes).each do |scope|
%li.permissions-list__item
.permissions-list__item__icon
= fa_icon('check')
= material_symbol('check')
.permissions-list__item__text
.permissions-list__item__text__title
= t(scope.key, scope: [:doorkeeper, :grouped_scopes, :title])

8
app/views/relationships/show.html.haml
View file

@ -42,13 +42,13 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
= f.button safe_join([fa_icon('user-plus'), t('relationships.follow_selected_followers')]), name: :follow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_follow_selected_followers') } if followed_by_relationship? && !mutual_relationship?
= f.button safe_join([material_symbol('person_add'), t('relationships.follow_selected_followers')]), name: :follow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_follow_selected_followers') } if followed_by_relationship? && !mutual_relationship?
= f.button safe_join([fa_icon('user-times'), t('relationships.remove_selected_follows')]), name: :unfollow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_follows') } unless followed_by_relationship?
= f.button safe_join([material_symbol('person_remove'), t('relationships.remove_selected_follows')]), name: :unfollow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_follows') } unless followed_by_relationship?
= f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_followers')]), name: :remove_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_followers') } unless following_relationship?
= f.button safe_join([material_symbol('delete'), t('relationships.remove_selected_followers')]), name: :remove_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_followers') } unless following_relationship?
= f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_domains')]), name: :remove_domains_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } if followed_by_relationship?
= f.button safe_join([material_symbol('delete'), t('relationships.remove_selected_domains')]), name: :remove_domains_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } if followed_by_relationship?
.batch-table__body
- if @accounts.empty?
= nothing_here 'nothing-here--under-tabs'

10
app/views/statuses/_detailed_status.html.haml
View file

@ -11,7 +11,7 @@
%strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: prefers_autoplay?)
%span.display-name__account
= acct(status.account)
= fa_icon('lock') if status.account.locked?
= material_symbol('lock') if status.account.locked?
= account_action_button(status.account)
@ -58,20 +58,20 @@
·
%span.detailed-status__link
- if status.in_reply_to_id.nil?
= fa_icon('reply')
= material_symbol('reply')
- else
= fa_icon('reply-all')
= material_symbol('reply_all')
%span.detailed-status__reblogs>= friendly_number_to_human status.replies_count
&nbsp;
·
- if status.public_visibility? || status.unlisted_visibility?
%span.detailed-status__link
= fa_icon('retweet')
= material_symbol('repeat')
%span.detailed-status__reblogs>= friendly_number_to_human status.reblogs_count
&nbsp;
·
%span.detailed-status__link
= fa_icon('star')
= material_symbol('star')
%span.detailed-status__favorites>= friendly_number_to_human status.favourites_count
&nbsp;

14
app/views/statuses/_simple_status.html.haml
View file

@ -26,7 +26,7 @@
&nbsp;
%span.display-name__account
= acct(status.account)
= fa_icon('lock') if status.account.locked?
= material_symbol('lock') if status.account.locked?
.status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
- if status.spoiler_text?
%p<
@ -55,16 +55,16 @@
.status__action-bar
%span.status__action-bar-button.icon-button.icon-button--with-counter
- if status.in_reply_to_id.nil?
= fa_icon 'reply fw'
= material_symbol 'reply'
- else
= fa_icon 'reply-all fw'
= material_symbol 'reply_all'
%span.icon-button__counter= obscured_counter status.replies_count
%span.status__action-bar-button.icon-button
- if status.distributable?
= fa_icon 'retweet fw'
= material_symbol 'repeat'
- elsif status.private_visibility? || status.limited_visibility?
= fa_icon 'lock fw'
= material_symbol 'lock'
- else
= fa_icon 'at fw'
= material_symbol 'alternate_email'
%span.status__action-bar-button.icon-button
= fa_icon 'star fw'
= material_symbol 'star'