Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream

Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.

app/javascript/styles/mastodon/accounts.scss

@@ -130,21 +130,11 @@
   .older {
     float: left;
     padding-inline-start: 0;
-
-    .fa {
-      display: inline-block;
-      margin-inline-end: 5px;
-    }
   }
 
   .newer {
     float: right;
     padding-inline-end: 0;
-
-    .fa {
-      display: inline-block;
-      margin-inline-start: 5px;
-    }
   }
 
   .disabled {

app/javascript/styles/mastodon/admin.scss

@@ -122,10 +122,6 @@ $content-width: 840px;
         overflow: hidden;
         text-overflow: ellipsis;
 
-        i.fa {
-          margin-inline-end: 5px;
-        }
-
         &:hover {
           color: $primary-text-color;
           transition: all 100ms linear;
@@ -306,10 +302,6 @@ $content-width: 840px;
       box-shadow: none;
     }
 
-    .directory__tag .table-action-link .fa {
-      color: inherit;
-    }
-
     .directory__tag h4 {
       font-size: 18px;
       font-weight: 700;

app/javascript/styles/mastodon/components.scss

@@ -2891,10 +2891,6 @@ $ui-header-logo-wordmark-width: 99px;
     padding-inline-end: 30px;
   }
 
-  .search__icon .fa {
-    top: 15px;
-  }
-
   .scrollable {
     overflow: visible;
 
@@ -4217,11 +4213,12 @@ a.status-card {
 
 .timeline-hint {
   text-align: center;
-  color: $darker-text-color;
-  padding: 15px;
+  color: $dark-text-color;
+  padding: 16px;
   box-sizing: border-box;
   width: 100%;
-  cursor: default;
+  font-size: 14px;
+  line-height: 21px;
 
   strong {
     font-weight: 500;
@@ -4238,10 +4235,10 @@ a.status-card {
       color: lighten($highlight-text-color, 4%);
     }
   }
-}
 
-.timeline-hint--with-descendants {
-  border-top: 1px solid var(--background-border-color);
+  &--with-descendants {
+    border-top: 1px solid var(--background-border-color);
+  }
 }
 
 .regeneration-indicator {
@@ -6246,7 +6243,7 @@ a.status-card {
 }
 
 .boost-modal__container {
-  overflow-x: scroll;
+  overflow-y: auto;
   padding: 10px;
 
   .status {

app/javascript/styles/mastodon/dashboard.scss

@@ -113,10 +113,6 @@
       flex: 1 1 auto;
     }
 
-    .fa {
-      flex: 0 0 auto;
-    }
-
     strong {
       font-weight: 700;
     }

app/javascript/styles/mastodon/forms.scss

@@ -930,10 +930,6 @@ code {
           font-weight: 700;
         }
       }
-
-      .fa {
-        font-weight: 400;
-      }
     }
   }
 }

app/javascript/styles/mastodon/rtl.scss

@@ -41,14 +41,6 @@ body.rtl {
       no-repeat left 8px center / auto 16px;
   }
 
-  .fa-chevron-left::before {
-    content: '\F054';
-  }
-
-  .fa-chevron-right::before {
-    content: '\F053';
-  }
-
   .dismissable-banner,
   .warning-banner {
     &__action {

app/javascript/styles/mastodon/tables.scss

@@ -142,11 +142,6 @@ a.table-action-link {
     color: $highlight-text-color;
   }
 
-  i.fa {
-    font-weight: 400;
-    margin-inline-end: 5px;
-  }
-
   &:first-child {
     padding-inline-start: 0;
   }

app/javascript/styles/mastodon/widgets.scss

@@ -169,11 +169,6 @@
 
   &__message {
     margin-bottom: 15px;
-
-    .fa {
-      margin-inline-end: 5px;
-      color: $darker-text-color;
-    }
   }
 
   &__card {
@@ -366,9 +361,7 @@
     padding-inline-end: 16px;
   }
 
-  .fa {
-    font-size: 16px;
-
+  .icon {
     &.active {
       color: $highlight-text-color;
     }