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

Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.

1 files changed, 3 insertions, 4 deletions

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 54372022a..aa885e241 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6697,14 +6697,13 @@ noscript {
 
     &__unread {
       position: absolute;
-      top: 15px;
-      right: 15px;
-      display: inline-block;
+      top: 19px;
+      right: 19px;
+      display: block;
       background: $highlight-text-color;
       border-radius: 50%;
       width: 0.625rem;
       height: 0.625rem;
-      margin: 0 .15em;
     }
   }