Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes

app/javascript/mastodon/store/middlewares/sounds.ts

@@ -1,5 +1,8 @@
 import type { Middleware, AnyAction } from 'redux';
 
+import ready from 'mastodon/ready';
+import { assetHost } from 'mastodon/utils/config';
+
 import type { RootState } from '..';
 
 interface AudioSource {
@@ -35,18 +38,20 @@ export const soundsMiddleware = (): Middleware<
   Record<string, never>,
   RootState
 > => {
-  const soundCache: { [key: string]: HTMLAudioElement } = {
-    boop: createAudio([
+  const soundCache: { [key: string]: HTMLAudioElement } = {};
+
+  void ready(() => {
+    soundCache.boop = createAudio([
       {
-        src: '/sounds/boop.ogg',
+        src: `${assetHost}/sounds/boop.ogg`,
         type: 'audio/ogg',
       },
       {
-        src: '/sounds/boop.mp3',
+        src: `${assetHost}/sounds/boop.mp3`,
         type: 'audio/mpeg',
       },
-    ]),
-  };
+    ]);
+  });
 
   return () =>
     (next) =>

app/javascript/styles/mastodon/components.scss

@@ -9089,10 +9089,10 @@ noscript {
   width: auto;
   padding: 15px;
   margin: 0;
-  color: $primary-text-color;
+  color: $white;
   background: rgba($black, 0.85);
   backdrop-filter: blur(8px);
-  border: 1px solid rgba(lighten($ui-base-color, 4%), 0.85);
+  border: 1px solid rgba(lighten($classic-base-color, 4%), 0.85);
   border-radius: 8px;
   box-shadow: 0 10px 15px -3px rgba($base-shadow-color, 0.25),
     0 4px 6px -4px rgba($base-shadow-color, 0.25);
@@ -9120,7 +9120,7 @@ noscript {
   text-transform: uppercase;
   margin-inline-start: 10px;
   cursor: pointer;
-  color: $highlight-text-color;
+  color: $blurple-300;
   border-radius: 4px;
   padding: 0 4px;