From 29ad145f50c954ef9c900e0f187116dd71420cb5 Mon Sep 17 00:00:00 2001
From: Mirco Wittrien <23700969+mwittrien@users.noreply.github.com>
Date: Sun, 10 Jul 2022 00:08:03 +0200
Subject: [PATCH] stuff
---
Plugins/ServerFolders/ServerFolders.plugin.js | 9 ++--
Themes/BasicBackground/BasicBackground.css | 31 ++++++++++++
Themes/DiscordRecolor/DiscordRecolor.css | 7 +++
Themes/_res/SettingsIcons.css | 47 ++++++++++---------
.../svgs/settingsicons/activityprivacy.svg | 1 +
Themes/_res/svgs/settingsicons/voicetext.svg | 1 -
6 files changed, 69 insertions(+), 27 deletions(-)
create mode 100644 Themes/_res/svgs/settingsicons/activityprivacy.svg
delete mode 100644 Themes/_res/svgs/settingsicons/voicetext.svg
diff --git a/Plugins/ServerFolders/ServerFolders.plugin.js b/Plugins/ServerFolders/ServerFolders.plugin.js
index 8bffaa77be..c32c7623a8 100644
--- a/Plugins/ServerFolders/ServerFolders.plugin.js
+++ b/Plugins/ServerFolders/ServerFolders.plugin.js
@@ -2,7 +2,7 @@
* @name ServerFolders
* @author DevilBro
* @authorId 278543574059057154
- * @version 6.9.9
+ * @version 7.0.0
* @description Changes Discord's Folders, Servers open in a new Container, also adds extra Features to more easily organize, customize and manage your Folders
* @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien
@@ -17,7 +17,7 @@ module.exports = (_ => {
"info": {
"name": "ServerFolders",
"author": "DevilBro",
- "version": "6.9.9",
+ "version": "7.0.0",
"description": "Changes Discord's Folders, Servers open in a new Container, also adds extra Features to more easily organize, customize and manage your Folders"
}
};
@@ -653,8 +653,9 @@ module.exports = (_ => {
processGuilds (e) {
if (this.settings.general.extraColumn) {
- if (folderGuildContent && (e.instance.props.isAppFullscreen != folderGuildContent.props.isAppFullscreen || e.instance.props.themeOverride != folderGuildContent.props.themeOverride)) {
- folderGuildContent.props.isAppFullscreen = e.instance.props.isAppFullscreen;
+ let fullscreen = BDFDB.LibraryModules.VoiceChannelUtils.isFullscreenInContext();
+ if (folderGuildContent && (fullscreen != folderGuildContent.props.isAppFullscreen || e.instance.props.themeOverride != folderGuildContent.props.themeOverride)) {
+ folderGuildContent.props.isAppFullscreen = fullscreen;
folderGuildContent.props.themeOverride = e.instance.props.themeOverride;
BDFDB.ReactUtils.forceUpdate(folderGuildContent);
}
diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css
index 82da5a43a1..e774429302 100644
--- a/Themes/BasicBackground/BasicBackground.css
+++ b/Themes/BasicBackground/BasicBackground.css
@@ -159,6 +159,7 @@ html {
18. NOTIFICATIONSMODAL
19. DISCOVERYENTRYMODAL
20. NITROFEATUREMODAL
+ 21. DIRECTORYMODAL
14. POPOUTS
1. CONTEXTMENU
2. USERPOPOUT
@@ -4271,6 +4272,36 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr
background: rgba(var(--transparencycolor),.4);
}
+/* ---- 13.21. DIRECTORYMODAL ---- */
+
+#app-mount .directoryModal-YJsOMv { /* modal container */
+ background-color: transparent;
+ box-shadow: 0 0 0 1px rgba(var(--transparencycolor), .3), 0 2px 10px 0 rgba(var(--transparencycolor), .3);
+ position: relative;
+ overflow: hidden;
+}
+.directoryModal-YJsOMv::before,
+.directoryModal-YJsOMv::after {
+ content: "";
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ left: 0;
+ width: unset;
+ height: unset;
+ pointer-events: none;
+ z-index: -1;
+}
+.directoryModal-YJsOMv::before {
+ background: var(--popout) var(--popoutposition)/var(--popoutsize);
+ background-attachment: fixed;
+}
+.directoryModal-YJsOMv::after {
+ background-color: rgba(var(--transparencycolor), calc(var(--transparencyalpha) + 0.2));
+ backdrop-filter: blur(var(--popoutblur));
+}
+
/* ~~~~ 14. POPOUTS ~~~~ */
diff --git a/Themes/DiscordRecolor/DiscordRecolor.css b/Themes/DiscordRecolor/DiscordRecolor.css
index 77d885acad..9ad1505ffd 100644
--- a/Themes/DiscordRecolor/DiscordRecolor.css
+++ b/Themes/DiscordRecolor/DiscordRecolor.css
@@ -259,6 +259,7 @@ html {
22. DISPATCHERROR
23. HYPESQUADQUIZ
24. NITROFEATUREMODAL
+ 25. DIRECTORYMODAL
11. POPOUTS
1. USERPOPOUT
2. EMOJIPICKER
@@ -3307,6 +3308,12 @@ img[src='/assets/58957d928db6fb9d4658eb882f33d7bc.svg'] {
background: var(--background-floating);
}
+/* ---- 10.25. DIRECTORYMODAL ---- */
+
+#app-mount .directoryModal-YJsOMv {
+ background: var(--background-primary);
+}
+
/* ~~~~ 11. POPOUTS ~~~~ */
diff --git a/Themes/_res/SettingsIcons.css b/Themes/_res/SettingsIcons.css
index 89c23f1160..83fbede326 100644
--- a/Themes/_res/SettingsIcons.css
+++ b/Themes/_res/SettingsIcons.css
@@ -51,9 +51,7 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="connections-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/connections.svg) center/contain no-repeat;
}
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="friend-requests-tab" i]::before {
- -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/friendrequests.svg) center/contain no-repeat;
-}
+
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="subscriptions-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/subscriptions.svg) center/contain no-repeat;
}
@@ -73,6 +71,7 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="billing-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/billing.svg) center/contain no-repeat;
}
+
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="appearance-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/appearance.svg) center/contain no-repeat;
}
@@ -115,6 +114,7 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="overlay-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/overlay.svg) center/contain no-repeat;
}
+
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="changelog-tab" i]::before,
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="change-log-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/changelog.svg) center/contain no-repeat;
@@ -137,6 +137,7 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="payment-flow-modals-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/paymentmodals.svg) center/contain no-repeat;
}
+
#bd-settings-sidebar .ui-tab-bar-item:nth-child(3)::before,
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG.bd-settings-tab::before,
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="pc-general-tab" i]::before,
@@ -176,9 +177,11 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="bdcompat-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/betterdiscord.svg) center/contain no-repeat;
}
+
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="logout-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/logout.svg) center/contain no-repeat;
}
+
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="overview-tab" i]::before,
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="accountinfo-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/overview.svg) center/contain no-repeat;
@@ -190,16 +193,6 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="stickers-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/stickers.svg) center/contain no-repeat;
}
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="guild_automod-tab" i]::before {
- -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/automod.svg) center/contain no-repeat;
-}
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="guild_automod_message_filter-tab" i]::before {
- -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/automodmessage.svg) center/contain no-repeat;
-}
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="audit_log-tab" i]::before,
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="audit_log_v2-tab" i]::before {
- -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/audit.svg) center/contain no-repeat;
-}
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="integrations-tab" i]::before,
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="status-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/integrations.svg) center/contain no-repeat;
@@ -210,24 +203,37 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="guild_templates-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/template.svg) center/contain no-repeat;
}
+.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="friend-requests-tab" i]::before,
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="vanity_url-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/vanityurl.svg) center/contain no-repeat;
}
+
+.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="member_verification-tab" i]::before {
+ -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/rules.svg) center/contain no-repeat;
+}
+.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="guild_automod-tab" i]::before {
+ -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/automod.svg) center/contain no-repeat;
+}
+.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="guild_automod_message_filter-tab" i]::before {
+ -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/automodmessage.svg) center/contain no-repeat;
+}
+.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="audit_log-tab" i]::before,
+.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="audit_log_v2-tab" i]::before {
+ -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/audit.svg) center/contain no-repeat;
+}
+.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="bans-tab" i]::before {
+ -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/bans.svg) center/contain no-repeat;
+}
+
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="community-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/community.svg) center/contain no-repeat;
}
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="text_in_voice-tab" i]::before {
- -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/voicetext.svg) center/contain no-repeat;
-}
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="analytics-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/analytics.svg) center/contain no-repeat;
}
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="partner-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/partner.svg) center/contain no-repeat;
}
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="member_verification-tab" i]::before {
- -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/rules.svg) center/contain no-repeat;
-}
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="discovery-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/discovery.svg) center/contain no-repeat;
}
@@ -243,9 +249,6 @@ body #app-mount .layer-86YKbF ~ .layer-86YKbF .sidebar-nqHbhN {
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="instant_invites-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/invites.svg) center/contain no-repeat;
}
-.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="bans-tab" i]::before {
- -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/bans.svg) center/contain no-repeat;
-}
.sidebar-nqHbhN .side-2ur1Qk .item-3XjbnG[aria-controls="delete-tab" i]::before {
-webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/settingsicons/delete.svg) center/contain no-repeat;
}
diff --git a/Themes/_res/svgs/settingsicons/activityprivacy.svg b/Themes/_res/svgs/settingsicons/activityprivacy.svg
new file mode 100644
index 0000000000..a687d8ac86
--- /dev/null
+++ b/Themes/_res/svgs/settingsicons/activityprivacy.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Themes/_res/svgs/settingsicons/voicetext.svg b/Themes/_res/svgs/settingsicons/voicetext.svg
deleted file mode 100644
index c0bd822aab..0000000000
--- a/Themes/_res/svgs/settingsicons/voicetext.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file