Merge remote-tracking branch 'parent/main' into upstream-20240821

app/views/statuses/_attachment_list.html.haml

@@ -1,6 +1,6 @@
 .attachment-list
   .attachment-list__icon
-    = fa_icon 'link'
+    = material_symbol 'link'
   %ul.attachment-list__list
     - attachments.each do |media|
       %li

app/views/statuses/_detailed_status.html.haml

@@ -14,7 +14,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)
 
@@ -68,20 +68,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
        
     ·
     - 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
          
       ·
     %span.detailed-status__link
-      = fa_icon('star')
+      = material_symbol('star')
       %span.detailed-status__favorites>= friendly_number_to_human status.favourites_count
        
 

app/views/statuses/_simple_status.html.haml

@@ -27,7 +27,7 @@
            
           %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<
@@ -63,16 +63,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'