Merge branch 'dev'

src/equicordplugins/friendTags/index.tsx

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import "styles.css?managed";
+
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { DataStore } from "@api/index";
 import { definePluginSettings } from "@api/Settings";
-import { ExpandableHeader } from "@components/ExpandableHeader";
 import { Devs } from "@utils/constants";
 import { useForceUpdater } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
@@ -108,7 +109,9 @@ function TagConfigCard(props) {
             <TextInput value={tagName} onChange={setTagName}></TextInput>
             <Text variant={"heading-md/normal"}>Users (Seperated by comma)</Text>
             <TextInput value={userIds} onChange={setUserIDs}></TextInput>
-            <ExpandableHeader headerText="User List (Click A User To Remove)" defaultState={true}>
+            <div className={"vc-friend-tags-user-header-container"}>
+                <Text variant="eyebrow">User List (Click A User To Remove)</Text>
+                <div className={"vc-friend-tags-user-header-btns"}>
                     {
                         userIds.split(", ").map(user => {
                             const userData: any = UserStore.getUser(user);
@@ -121,7 +124,8 @@ function TagConfigCard(props) {
                             );
                         })
                     }
-            </ExpandableHeader>
+                </div>
+            </div>
             <Button onClick={async () => {
                 SavedData = SavedData.filter(data => (data.tagName !== tagName));
                 await SetData();

src/equicordplugins/friendTags/styles.css

@@ -0,0 +1,11 @@
+.vc-permviewer-user-header-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 8px;
+}
+
+.vc-permviewer-user-header-btns {
+    display: flex;
+    gap: 8px;
+}

src/equicordplugins/iRememberYou/index.tsx

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import "styles.css?managed";
+
 import { DataStore } from "@api/index";
 import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
-import { ExpandableHeader } from "@components/ExpandableHeader";
 import { Heart } from "@components/Heart";
 import { EquicordDevs } from "@utils/constants";
 import { openUserProfile } from "@utils/discord";
@@ -211,12 +212,14 @@ class DataUI {
 
 
         return <aside key={key} >
-            <ExpandableHeader defaultState={true} headerText={key.toUpperCase()}>
+            <div className={"vc-i-remember-you-user-header-container"}>
+                <Text>{key.toUpperCase()}</Text>
+                <div className={"vc-i-remember-you-user-header-btns"}>
                     <Flex style={{ gap: "calc(0.5em + 0.5vw) 0.2em", flexDirection: "column" }}>
                         {usersElements}
                     </Flex>
-            </ExpandableHeader>
-
+                </div>
+            </div>
         </aside>;
     }
 

src/equicordplugins/iRememberYou/styles.css

@@ -0,0 +1,11 @@
+.vc-i-remember-you-user-header-container {
+    display: contents;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 8px;
+}
+
+.vc-i-remember-you-user-header-btns {
+    display: none;
+    gap: 8px;
+}