Merge remote-tracking branch 'upstream/dev' into dev

src/equicordplugins/musicControls/spotify/spotifyStyles.css

@@ -159,26 +159,26 @@
     margin-bottom: 5px;
 }
 
-#vc-spotify-progress-bar > [class^="slider"] {
+#vc-spotify-progress-bar > [class*="slider"] {
     flex-grow: 1;
     width: 100%;
     padding: 0 !important;
 }
 
-#vc-spotify-progress-bar > [class^="slider"] [class^="bar"] {
+#vc-spotify-progress-bar > [class*="slider"] [class*="bar"] {
     height: 3px !important;
     top: calc(12px - 4px / 2 + var(--bar-offset));
 }
 
-#vc-spotify-progress-bar > [class^="slider"] [class^="barFill"] {
+#vc-spotify-progress-bar > [class*="slider"] [class*="barFill"] {
     background-color: var(--interactive-icon-active);
 }
 
-#vc-spotify-progress-bar > [class^="slider"]:hover [class^="barFill"] {
+#vc-spotify-progress-bar > [class*="slider"]:hover [class*="barFill"] {
     background-color: var(--vc-spotify-green);
 }
 
-#vc-spotify-progress-bar > [class^="slider"] [class^="grabber"] {
+#vc-spotify-progress-bar > [class*="slider"] [class*="grabber"] {
     /* these importants are necessary, it applies a width and height through inline styles */
     height: 16px !important;
     width: 16px !important;
@@ -191,7 +191,7 @@
     transition: opacity 0.1s;
 }
 
-#vc-spotify-progress-bar:hover > [class^="slider"] [class^="grabber"] {
+#vc-spotify-progress-bar:hover > [class*="slider"] [class*="grabber"] {
     opacity: 1;
 }
 

src/plugins/_api/badges/fixDiscordBadgePadding.css

@@ -1,5 +1,5 @@
 /* the profile popout badge container(s) */
-[class*="profile_"] [class*="tags_"] [class*="container_"] {
+[class*="profile"] [class*="tags"] [class*="container"] {
     /* Discord has gap set to 2px instead of 1px, which causes the 12th badge to wrap to a new line. */
     gap: 1px;
 }

src/plugins/clientTheme/clientTheme.css

@@ -15,7 +15,7 @@
     justify-content: flex-start;
 }
 
-.vc-clientTheme-container [class^="swatch"] {
+.vc-clientTheme-container [class*="swatch"] {
     border: thin solid var(--input-border-default) !important;
 }
 

src/plugins/gameActivityToggle/style.css

@@ -1,3 +1,3 @@
-[class^="panels"] [class^="avatarWrapper_"] {
+[class*="panels"] [class*="avatarWrapper"] {
     min-width: 0;
 }

src/plugins/messageLogger/messageLogger.css

@@ -1,4 +1,4 @@
-.messagelogger-deleted [class^="buttons"] {
+.messagelogger-deleted [class*="buttons"] {
     display: none;
 }
 
@@ -11,7 +11,7 @@
     filter: grayscale(1) !important;
     transition: 150ms filter ease-in-out;
 
-    &[class*="hiddenMosaicItem_"] {
+    &[class*="hiddenMosaicItem"] {
         filter: grayscale(1) blur(var(--custom-message-attachment-spoiler-blur-radius, 44px)) !important;
     }
 

src/plugins/pinDms/styles.css

@@ -21,7 +21,7 @@
     gap: 1.5rem;
 }
 
-.vc-pindms-modal-content [class^="defaultContainer"] {
+.vc-pindms-modal-content [class*="defaultContainer"] {
     display: none;
 }
 

src/plugins/reviewDB/style.css

@@ -1,8 +1,3 @@
-:root {
-    --vc-rdb-avatar-size: 40px;
-    --vc-rdb-spacing-size: 8px;
-}
-
 .vc-rdb-badge {
     vertical-align: middle;
     margin-left: 4px;
@@ -44,7 +39,7 @@
     background: var(--input-background-default);
 }
 
-.vc-rdb-modal-footer [class|="pageControlContainer"] {
+.vc-rdb-modal-footer [class*="pageControlContainer"] {
     margin-top: 0;
 }
 
@@ -57,8 +52,8 @@
 }
 
 .vc-rdb-review-container {
-    padding-top: var(--vc-rdb-spacing-size) !important;
-    padding-bottom: var(--vc-rdb-spacing-size) !important;
+    padding-top: 8px !important;
+    padding-bottom: 8px !important;
     padding-right: 32px !important;
 }
 

src/plugins/serverInfo/styles.css

@@ -71,7 +71,7 @@
     color: var(--text-default);
 }
 
-.vc-gp-server-info-pair [class^="timestamp"] {
+.vc-gp-server-info-pair [class*="timestamp"] {
     margin-left: 0;
 }
 
@@ -160,10 +160,10 @@
     font-weight: 600;
 }
 
-.vc-gp-scroller [class^="listRow"] {
+.vc-gp-scroller [class*="listRow"] {
     margin: 1px 0;
 }
 
-.vc-gp-scroller [class^="listRow"]:hover {
+.vc-gp-scroller [class*="listRow"]:hover {
     background-color: var(--background-mod-subtle);
-}
+}

src/plugins/showHiddenChannels/style.css

@@ -94,7 +94,7 @@
     color: var(--text-default);
 }
 
-.vc-shc-allowed-users-and-roles-container>[class^="members"] {
+.vc-shc-allowed-users-and-roles-container > [class*="members"] {
     margin-left: 12px;
     flex-wrap: wrap;
     justify-content: center;
@@ -104,4 +104,4 @@
     cursor: not-allowed;
     margin-left: 6px;
     z-index: 0;
-}
+}

src/plugins/typingTweaks/style.css

@@ -1,10 +1,9 @@
 .vc-typing-user {
     cursor: pointer;
 
-    [class^="wrapper"] {
+    [class*="wrapper"] {
         display: inline-block;
         margin-right: 0.25em;
         vertical-align: -4px;
     }
-}
-
+}