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

app/javascript/styles/mastodon-light/diff.scss

@@ -524,3 +524,7 @@ a.sparkline {
     opacity: 0.25;
   }
 }
+
+kbd {
+  background-color: color.change($ui-highlight-color, $alpha: 0.1);
+}

app/javascript/styles/mastodon/admin.scss

@@ -488,6 +488,14 @@ body,
   }
 }
 
+kbd {
+  font-family: Courier, monospace;
+  background-color: color.change($ui-secondary-color, $alpha: 0.1);
+  padding: 4px;
+  padding-bottom: 2px;
+  border-radius: 5px;
+}
+
 .filters {
   display: flex;
   flex-wrap: wrap;
@@ -1971,60 +1979,77 @@ a.sparkline {
   box-sizing: border-box;
   min-height: 100%;
 
+  &.status--has-quote {
+    .quote-inline {
+      display: none;
+    }
+  }
+
+  .status__quote & {
+    // Remove the border from the .status__card within .status__quote
+    border: none;
+
+    .display-name__account {
+      line-height: inherit;
+    }
+
+    .status__avatar,
+    .status__avatar .account__avatar {
+      width: 32px;
+      height: 32px;
+    }
+  }
+
   .status__prepend {
     padding: 0 0 15px;
     gap: 4px;
     align-items: center;
   }
 
-  .status__content {
-    padding-top: 0;
+  > details {
+    summary {
+      display: block;
+      box-sizing: border-box;
+      background: var(--nested-card-background);
+      color: var(--nested-card-text);
+      border: var(--nested-card-border);
+      border-radius: 8px;
+      padding: 8px 13px;
+      position: relative;
+      font-size: 15px;
+      line-height: 22px;
+      cursor: pointer;
 
-    > details {
-      summary {
+      &::after {
+        content: attr(data-show, 'Show more');
+        margin-top: 8px;
         display: block;
-        box-sizing: border-box;
-        background: var(--nested-card-background);
-        color: var(--nested-card-text);
-        border: var(--nested-card-border);
-        border-radius: 8px;
-        padding: 8px 13px;
-        position: relative;
         font-size: 15px;
-        line-height: 22px;
+        line-height: 20px;
+        color: $highlight-text-color;
         cursor: pointer;
-
-        &::after {
-          content: attr(data-show, 'Show more');
-          margin-top: 8px;
-          display: block;
-          font-size: 15px;
-          line-height: 20px;
-          color: $highlight-text-color;
-          cursor: pointer;
-          border: 0;
-          background: transparent;
-          padding: 0;
-          text-decoration: none;
-          font-weight: 500;
-        }
-
-        &:hover,
-        &:focus-visible {
-          &::after {
-            text-decoration: underline !important;
-          }
-        }
+        border: 0;
+        background: transparent;
+        padding: 0;
+        text-decoration: none;
+        font-weight: 500;
       }
 
-      &[open] summary {
-        margin-bottom: 16px;
-
+      &:hover,
+      &:focus-visible {
         &::after {
-          content: attr(data-hide, 'Hide post');
+          text-decoration: underline !important;
         }
       }
     }
+
+    &[open] summary {
+      margin-bottom: 16px;
+
+      &::after {
+        content: attr(data-hide, 'Hide post');
+      }
+    }
   }
 
   .preview-card {
@@ -2081,6 +2106,14 @@ a.sparkline {
       }
     }
   }
+
+  .detailed-status__meta {
+    .detailed-status__application,
+    .detailed-status__datetime,
+    .detailed-status__link {
+      color: inherit;
+    }
+  }
 }
 
 .admin {

app/javascript/styles/mastodon/emoji_picker.scss

@@ -152,6 +152,9 @@
     z-index: 1;
     position: relative;
     text-align: center;
+    display: inline-flex !important;
+    align-items: center;
+    justify-content: center;
   }
 
   &:hover::before {

app/javascript/styles/mastodon/forms.scss

@@ -755,6 +755,12 @@ code {
     display: none;
   }
 
+  &.hidden-on-touch-devices {
+    @media screen and (pointer: coarse) {
+      display: none;
+    }
+  }
+
   a {
     display: inline-block;
     color: $darker-text-color;

app/javascript/styles/mastodon/tables.scss

@@ -356,7 +356,7 @@ a.table-action-link {
 
   // Reset the status card to not have borders, background or padding when
   // inline in the table of statuses
-  .status__card {
+  .batch-table__row__content > .status__card {
     border: none;
     background: none;
     padding: 0;