Merge branch 'main' into glitch-soc/merge-upstream

2022-05-08 21:00:49 +02:00
parent d7eae4229c f17e73da09
commit 22080786df
138 changed files with 4394 additions and 1134 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -132,7 +132,7 @@ module ApplicationHelper
    elsif status.private_visibility? || status.limited_visibility?
      fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
    elsif status.direct_visibility?
-      fa_icon('envelope', title: I18n.t('statuses.visibilities.direct'))
+      fa_icon('at', title: I18n.t('statuses.visibilities.direct'))
    end
  end

--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -101,7 +101,7 @@ module StatusesHelper
    when 'private'
      fa_icon 'lock fw'
    when 'direct'
-      fa_icon 'envelope fw'
+      fa_icon 'at fw'
    end
  end