Merge remote-tracking branch 'upstream/stable-4.4' into HEAD

Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.

app/javascript/styles/mastodon/admin.scss

@@ -1888,7 +1888,7 @@ a.sparkline {
   font-size: 15px;
   line-height: 22px;
 
-  li {
+  > li {
     counter-increment: step 1;
     padding-inline-start: 2.5rem;
     padding-bottom: 8px;

app/javascript/styles/mastodon/components.scss

@@ -2333,6 +2333,7 @@ a .account__avatar {
 .detailed-status__display-name,
 .detailed-status__datetime,
 .detailed-status__application,
+.detailed-status__link,
 .account__display-name {
   text-decoration: none;
 }
@@ -2365,7 +2366,8 @@ a.account__display-name {
 }
 
 .detailed-status__application,
-.detailed-status__datetime {
+.detailed-status__datetime,
+.detailed-status__link {
   color: inherit;
 }
 
@@ -2551,8 +2553,9 @@ a.account__display-name {
 }
 
 .status__relative-time,
-.detailed-status__datetime {
-  &:hover {
+.detailed-status__datetime,
+.detailed-status__link {
+  &:is(a):hover {
     text-decoration: underline;
   }
 }

app/javascript/styles/mastodon/polls.scss

@@ -101,7 +101,8 @@
       cursor: pointer;
     }
 
-    &.editable {
+    &.editable,
+    &.disabled {
       align-items: center;
       overflow: visible;
     }
@@ -159,7 +160,8 @@
     }
   }
 
-  &__option.editable &__input {
+  &__option.editable &__input,
+  &__option.disabled &__input {
     &:active,
     &:focus,
     &:hover {