diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml index cdaf4572be..7104b99ac6 100644 --- a/app/views/admin/accounts/index.html.haml +++ b/app/views/admin/accounts/index.html.haml @@ -107,5 +107,5 @@ = render partial: 'account', collection: @accounts, locals: { f: f } %nav.pagination - = link_to_previous_page @accounts, safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '), rel: 'prev' - = link_to_next_page @accounts, safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), rel: 'next' + = link_to_previous_page @accounts, safe_join([material_symbol('chevron_left'), t('pagination.prev')], ' '), rel: 'prev' + = link_to_next_page @accounts, safe_join([t('pagination.next'), material_symbol('chevron_right')], ' '), rel: 'next' diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml index 3c207c97f7..bb6acfc08a 100644 --- a/app/views/admin/custom_emojis/_custom_emoji.html.haml +++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml @@ -7,7 +7,7 @@ .batch-table__row__content__text %samp :#{custom_emoji.shortcode}: - = link_to safe_join([fa_icon('pencil'), t('admin.custom_emojis.edit.label')]), edit_admin_custom_emoji_path(custom_emoji, local: params[:local], remote: params[:remote], shortcode: params[:shortcode], by_domain: params[:by_domain]), method: :get, class: 'table-action-link' + = link_to safe_join([material_symbol('edit'), t('admin.custom_emojis.edit.label')]), edit_admin_custom_emoji_path(custom_emoji, local: params[:local], remote: params[:remote], shortcode: params[:shortcode], by_domain: params[:by_domain]), method: :get, class: 'table-action-link' - if custom_emoji.local? %span.information-badge= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized') diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml index 9e732ab59a..2a2ca6aa9d 100644 --- a/app/views/admin/custom_emojis/index.html.haml +++ b/app/views/admin/custom_emojis/index.html.haml @@ -92,5 +92,5 @@ = render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f } %nav.pagination - = link_to_previous_page @custom_emojis, safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '), rel: 'prev' - = link_to_next_page @custom_emojis, safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), rel: 'next' + = link_to_previous_page @custom_emojis, safe_join([material_symbol('chevron_left'), t('pagination.prev')], ' '), rel: 'prev' + = link_to_next_page @custom_emojis, safe_join([t('pagination.next'), material_symbol('chevron_right')], ' '), rel: 'next' diff --git a/app/views/admin/friend_servers/_friend_domain.html.haml b/app/views/admin/friend_servers/_friend_domain.html.haml index 9a2e857aba..12be8a841c 100644 --- a/app/views/admin/friend_servers/_friend_domain.html.haml +++ b/app/views/admin/friend_servers/_friend_domain.html.haml @@ -2,30 +2,30 @@ %td - unless friend.available %span.negative-hint - = fa_icon('times') + = material_symbol('close')   = t 'admin.friend_servers.disabled' %samp= friend.domain %td - if friend.accepted? %span.positive-hint - = fa_icon('check') + = material_symbol('check')   = t 'admin.friend_servers.enabled' - elsif friend.i_am_pending? - = fa_icon('hourglass') + = material_symbol('hourglass')   = t 'admin.friend_servers.pending' - elsif friend.they_are_pending? %span.warning-hint - = fa_icon('hourglass') + = material_symbol('hourglass')   = t 'admin.friend_servers.pending_you' - else %span.negative-hint - = fa_icon('times') + = material_symbol('close')   = t 'admin.friend_servers.disabled' %td - = table_link_to 'pencil', t('admin.friend_servers.edit_friend'), edit_admin_friend_server_path(friend) - = table_link_to 'times', t('admin.friend_servers.delete'), admin_friend_server_path(friend), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } + = table_link_to 'edit', t('admin.friend_servers.edit_friend'), edit_admin_friend_server_path(friend) + = table_link_to 'close', t('admin.friend_servers.delete'), admin_friend_server_path(friend), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } diff --git a/app/views/admin/friend_servers/edit.html.haml b/app/views/admin/friend_servers/edit.html.haml index 9a2acb21a5..2f008ea39c 100644 --- a/app/views/admin/friend_servers/edit.html.haml +++ b/app/views/admin/friend_servers/edit.html.haml @@ -10,16 +10,16 @@ .fields-group - if @friend.accepted? %span.positive-hint - = fa_icon('check') + = material_symbol('check')   = t 'admin.friend_servers.enabled' - elsif @friend.pending? - = fa_icon('hourglass') + = material_symbol('hourglass')   = t 'admin.friend_servers.pending' - else %span.negative-hint - = fa_icon('times') + = material_symbol('close')   = t 'admin.friend_servers.disabled' .action-buttons diff --git a/app/views/admin/ng_rule_histories/show.html.haml b/app/views/admin/ng_rule_histories/show.html.haml index 9c074b2e05..3d9f395d87 100644 --- a/app/views/admin/ng_rule_histories/show.html.haml +++ b/app/views/admin/ng_rule_histories/show.html.haml @@ -4,10 +4,10 @@ .filters .back-link = link_to edit_admin_ng_rule_path(id: @ng_rule.id) do - = fa_icon 'chevron-left fw' + = material_symbol 'chevron_left fw' = t('admin.ng_rule_histories.back_to_ng_rule') = link_to admin_ng_rules_path do - = fa_icon 'chevron-left fw' + = material_symbol 'chevron_left fw' = t('admin.ng_rule_histories.back_to_ng_rules') %hr.spacer/ diff --git a/app/views/admin/ng_rules/_ng_rule.html.haml b/app/views/admin/ng_rules/_ng_rule.html.haml index 4313363535..9848e5bc63 100644 --- a/app/views/admin/ng_rules/_ng_rule.html.haml +++ b/app/views/admin/ng_rules/_ng_rule.html.haml @@ -20,6 +20,6 @@ = link_to t('admin.ng_rules.index.hit_count', count: ng_rule.hit_count), admin_ng_rule_history_path(ng_rule) %div - = table_link_to 'pencil', t('admin.ng_rules.index.edit.title'), edit_admin_ng_rule_path(ng_rule) - = table_link_to 'files-o', t('admin.ng_rules.copy'), duplicate_admin_ng_rule_path(ng_rule), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } - = table_link_to 'times', t('admin.ng_rules.index.delete'), admin_ng_rule_path(ng_rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } + = table_link_to 'edit', t('admin.ng_rules.index.edit.title'), edit_admin_ng_rule_path(ng_rule) + = table_link_to 'content_copy', t('admin.ng_rules.copy'), duplicate_admin_ng_rule_path(ng_rule), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } + = table_link_to 'close', t('admin.ng_rules.index.delete'), admin_ng_rule_path(ng_rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } diff --git a/app/views/admin/ng_words/keywords/_ng_word.html.haml b/app/views/admin/ng_words/keywords/_ng_word.html.haml index bf81193a97..a62359c8d8 100644 --- a/app/views/admin/ng_words/keywords/_ng_word.html.haml +++ b/app/views/admin/ng_words/keywords/_ng_word.html.haml @@ -7,4 +7,4 @@ .label_input__wrapper= f.check_box :strangers, { multiple: true, checked: ng_word.stranger }, temporary_id, nil %td = hidden_field_tag :'form_admin_settings[ng_words_test][temporary_ids][]', temporary_id, class: 'temporary_id' - = link_to safe_join([fa_icon('times'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button' + = link_to safe_join([material_symbol('close'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button' diff --git a/app/views/admin/ng_words/keywords/show.html.haml b/app/views/admin/ng_words/keywords/show.html.haml index d53676b7bf..68d933b70a 100644 --- a/app/views/admin/ng_words/keywords/show.html.haml +++ b/app/views/admin/ng_words/keywords/show.html.haml @@ -37,7 +37,7 @@ %tfoot %tr %td{ colspan: 4 } - = link_to safe_join([fa_icon('plus'), t('filters.edit.add_keyword')]), '#', class: 'table-action-link add-row-button' + = link_to safe_join([material_symbol('add'), t('filters.edit.add_keyword')]), '#', class: 'table-action-link add-row-button' .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/admin/ng_words/shared/_links.html.haml b/app/views/admin/ng_words/shared/_links.html.haml index aac891c381..c17cdbbee7 100644 --- a/app/views/admin/ng_words/shared/_links.html.haml +++ b/app/views/admin/ng_words/shared/_links.html.haml @@ -1,6 +1,6 @@ .content__heading__tabs = render_navigation renderer: :links do |primary| :ruby - primary.item :keywords, safe_join([fa_icon('pencil fw'), t('admin.ng_words.keywords')]), admin_ng_words_keywords_path - primary.item :white_list, safe_join([fa_icon('list fw'), t('admin.ng_words.white_list')]), admin_ng_words_white_list_path - primary.item :settings, safe_join([fa_icon('cog fw'), t('admin.ng_words.settings')]), admin_ng_words_settings_path + primary.item :keywords, safe_join([material_symbol('edit'), t('admin.ng_words.keywords')]), admin_ng_words_keywords_path + primary.item :white_list, safe_join([material_symbol('list'), t('admin.ng_words.white_list')]), admin_ng_words_white_list_path + primary.item :settings, safe_join([material_symbol('settings'), t('admin.ng_words.settings')]), admin_ng_words_settings_path diff --git a/app/views/admin/ng_words/white_list/_specified_domain.html.haml b/app/views/admin/ng_words/white_list/_specified_domain.html.haml index d9eb8dfae6..cc62a1161c 100644 --- a/app/views/admin/ng_words/white_list/_specified_domain.html.haml +++ b/app/views/admin/ng_words/white_list/_specified_domain.html.haml @@ -3,4 +3,4 @@ %td= f.input :domains, as: :string, input_html: { multiple: true, value: specified_domain.domain } %td = hidden_field_tag :'form_admin_settings[specified_domains][temporary_ids][]', temporary_id, class: 'temporary_id' - = link_to safe_join([fa_icon('times'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button' + = link_to safe_join([material_symbol('close'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button' diff --git a/app/views/admin/ng_words/white_list/show.html.haml b/app/views/admin/ng_words/white_list/show.html.haml index fc4f354e53..62ffd99ee4 100644 --- a/app/views/admin/ng_words/white_list/show.html.haml +++ b/app/views/admin/ng_words/white_list/show.html.haml @@ -35,7 +35,7 @@ %tfoot %tr %td{ colspan: 2 } - = link_to safe_join([fa_icon('plus'), t('admin.ng_words.edit.add_domain')]), '#', class: 'table-action-link add-row-button' + = link_to safe_join([material_symbol('add'), t('admin.ng_words.edit.add_domain')]), '#', class: 'table-action-link add-row-button' .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/admin/ngword_histories/index.html.haml b/app/views/admin/ngword_histories/index.html.haml index 517ccc3559..1ba55a605b 100644 --- a/app/views/admin/ngword_histories/index.html.haml +++ b/app/views/admin/ngword_histories/index.html.haml @@ -4,7 +4,7 @@ .filters .back-link = link_to admin_ng_words_keywords_path do - = fa_icon 'chevron-left fw' + = material_symbol 'chevron_left fw' = t('admin.ngword_histories.back_to_ng_words') %hr.spacer/ diff --git a/app/views/admin/sensitive_words/_sensitive_word.html.haml b/app/views/admin/sensitive_words/_sensitive_word.html.haml index de9c65714e..e7be05d763 100644 --- a/app/views/admin/sensitive_words/_sensitive_word.html.haml +++ b/app/views/admin/sensitive_words/_sensitive_word.html.haml @@ -9,4 +9,4 @@ .label_input__wrapper= f.check_box :spoilers, { multiple: true, checked: sensitive_word.spoiler }, temporary_id, nil %td = hidden_field_tag :'form_admin_settings[sensitive_words_test][temporary_ids][]', temporary_id, class: 'temporary_id' - = link_to safe_join([fa_icon('times'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button' + = link_to safe_join([material_symbol('close'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button' diff --git a/app/views/admin/sensitive_words/show.html.haml b/app/views/admin/sensitive_words/show.html.haml index 6f51419cc1..024225a033 100644 --- a/app/views/admin/sensitive_words/show.html.haml +++ b/app/views/admin/sensitive_words/show.html.haml @@ -33,7 +33,7 @@ %tfoot %tr %td{ colspan: 4 } - = link_to safe_join([fa_icon('plus'), t('filters.edit.add_keyword')]), '#', class: 'table-action-link add-row-button' + = link_to safe_join([material_symbol('add'), t('filters.edit.add_keyword')]), '#', class: 'table-action-link add-row-button' .fields-group = f.input :auto_warning_text, wrapper: :with_label, input_html: { placeholder: t('admin.sensitive_words.alert') }, label: t('admin.sensitive_words.auto_warning_text'), hint: t('admin.sensitive_words.auto_warning_text_hint') diff --git a/app/views/antennas/_antenna.html.haml b/app/views/antennas/_antenna.html.haml index ed3b8c3bde..2906648cec 100644 --- a/app/views/antennas/_antenna.html.haml +++ b/app/views/antennas/_antenna.html.haml @@ -21,7 +21,7 @@ - unless antenna.antenna_domains.empty? %li.permissions-list__item .permissions-list__item__icon - = fa_icon('sitemap') + = material_symbol('cloud') .permissions-list__item__text .permissions-list__item__text__title = t('antennas.index.domains', count: antenna.antenna_domains.size) @@ -32,7 +32,7 @@ - unless antenna.antenna_accounts.empty? %li.permissions-list__item .permissions-list__item__icon - = fa_icon('users') + = material_symbol('groups') .permissions-list__item__text .permissions-list__item__text__title = t('antennas.index.accounts', count: antenna.antenna_accounts.size) @@ -43,7 +43,7 @@ - if antenna.keywords.present? %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('antennas.index.keywords', count: antenna.keywords.size) @@ -54,7 +54,7 @@ - unless antenna.antenna_tags.empty? %li.permissions-list__item .permissions-list__item__icon - = fa_icon('hashtag') + = material_symbol('tag') .permissions-list__item__text .permissions-list__item__text__title = t('antennas.index.tags', count: antenna.antenna_tags.size) @@ -73,5 +73,5 @@ = t('antennas.errors.empty_contexts') %div - = table_link_to 'pencil', t('antennas.edit.title'), edit_antenna_path(antenna) - = table_link_to 'times', t('antennas.index.delete'), antenna_path(antenna), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } + = table_link_to 'edit', t('antennas.edit.title'), edit_antenna_path(antenna) + = table_link_to 'close', t('antennas.index.delete'), antenna_path(antenna), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }