Revert "Merge upstream changes up to df72a2dbbec8173515568c02427076ebff5c2297"

app/javascript/styles/mastodon/admin.scss

@@ -163,7 +163,7 @@ $content-width: 840px;
     flex: 1 1 auto;
   }
 
-  @media screen and (max-width: ($content-width + $sidebar-width)) {
+  @media screen and (max-width: $content-width + $sidebar-width) {
     .sidebar-wrapper--empty {
       display: none;
     }
@@ -1081,17 +1081,6 @@ a.name-tag,
       }
     }
 
-    &__action-bar {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      gap: 8px;
-
-      &:not(.no-wrap) {
-        flex-wrap: wrap;
-      }
-    }
-
     &__meta {
       padding: 0 15px;
       color: $dark-text-color;
@@ -1108,8 +1097,10 @@ a.name-tag,
       }
     }
 
-    &__actions {
-      margin-inline-start: auto;
+    &__action-bar {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
 
     &__permissions {

app/javascript/styles/mastodon/components.scss

@@ -1597,16 +1597,6 @@
       }
     }
   }
-
-  .no-reduce-motion &--highlighted-entry::before {
-    content: '';
-    position: absolute;
-    inset: 0;
-    background: rgb(from $ui-highlight-color r g b / 20%);
-    opacity: 0;
-    animation: fade 0.7s reverse both 0.3s;
-    pointer-events: none;
-  }
 }
 
 .status__relative-time {
@@ -2970,6 +2960,7 @@ a.account__display-name {
   flex: 1 1 auto;
   flex-direction: row;
   justify-content: flex-start;
+  overflow-x: auto;
   position: relative;
 
   &.unscrollable {
@@ -3145,29 +3136,6 @@ a.account__display-name {
   }
 }
 
-.column__alert {
-  position: sticky;
-  bottom: 1rem;
-  z-index: 10;
-  box-sizing: border-box;
-  display: grid;
-  width: 100%;
-  max-width: 360px;
-  padding-inline: 10px;
-  margin-top: 1rem;
-  margin-inline: auto;
-
-  @media (max-width: #{$mobile-menu-breakpoint - 1}) {
-    bottom: 4rem;
-  }
-
-  & > * {
-    // Make all nested alerts occupy the same space
-    // rather than stack
-    grid-area: 1 / 1;
-  }
-}
-
 .ui {
   --mobile-bottom-nav-height: 55px;
   --last-content-item-border-width: 2px;
@@ -3208,6 +3176,7 @@ a.account__display-name {
 .column,
 .drawer {
   flex: 1 1 100%;
+  overflow: hidden;
 }
 
 @media screen and (width > $mobile-breakpoint) {
@@ -10419,21 +10388,6 @@ noscript {
   }
 }
 
-.notification-bar__loading-indicator {
-  --spinner-size: 22px;
-
-  position: relative;
-  height: var(--spinner-size);
-  width: var(--spinner-size);
-  margin-inline-start: 2px;
-
-  svg {
-    color: $white;
-    height: var(--spinner-size);
-    width: var(--spinner-size);
-  }
-}
-
 .hashtag-header {
   border-bottom: 1px solid var(--background-border-color);
   padding: 15px;