diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js index 1e195ff20b..f6603d1199 100644 --- a/Library/0BDFDB.plugin.js +++ b/Library/0BDFDB.plugin.js @@ -479,7 +479,7 @@ module.exports = (_ => { BDFDB.BDUtils.getSettings = function (key) { if (!window.BdApi) return {}; if (typeof key == "string") return BdApi.isSettingEnabled(...key.split(".")); - else return !isBeta && typeof BdApi.getBDData == "function" ? BDFDB.ObjectUtils.get(BdApi.getBDData("settings"), `${BDFDB.DiscordUtils.getBuilt()}.settings`) : (BDFDB.ArrayUtils.is(BdApi.settings) ? BdApi.settings.map(n => n.settings.map(m => m.settings.map(l => ({id: [n.id, m.id, l.id].join("."), value: l.value})))).flat(10).reduce((newObj, setting) => (newObj[setting.id] = setting.value, newObj), {}) : {}); + else return !isBeta && typeof BdApi.getBDData == "function" ? BDFDB.ObjectUtils.get(BdApi.getBDData("settings"), `${BDFDB.DiscordUtils.getBuild()}.settings`) : (BDFDB.ArrayUtils.is(BdApi.settings) ? BdApi.settings.map(n => n.settings.map(m => m.settings.map(l => ({id: [n.id, m.id, l.id].join("."), value: l.value})))).flat(10).reduce((newObj, setting) => (newObj[setting.id] = setting.value, newObj), {}) : {}); }; BDFDB.BDUtils.getSettingsProperty = function (property, key) { if (!window.BdApi || !isBeta) return key ? "" : {}; @@ -4127,29 +4127,29 @@ module.exports = (_ => { else { let folder; try { - let built = BDFDB.DiscordUtils.getBuilt(); - built = "discord" + (built == "stable" ? "" : built); - folder = LibraryRequires.path.resolve(BDFDB.DiscordUtils.getFolder.base, built, BDFDB.DiscordUtils.getVersion()); + let build = BDFDB.DiscordUtils.getBuild(); + build = "discord" + (build == "stable" ? "" : build); + folder = LibraryRequires.path.resolve(BDFDB.DiscordUtils.getFolder.base, build, BDFDB.DiscordUtils.getVersion()); } catch (err) {folder = BDFDB.DiscordUtils.getFolder.base;} return BDFDB.DiscordUtils.getFolder.folder = folder; } }; - BDFDB.DiscordUtils.getBuilt = function () { - if (BDFDB.DiscordUtils.getBuilt.built) return BDFDB.DiscordUtils.getBuilt.built; + BDFDB.DiscordUtils.getBuild = function () { + if (BDFDB.DiscordUtils.getBuild.build) return BDFDB.DiscordUtils.getBuild.build; else { - let built; - try {built = window.DiscordNative.app.getReleaseChannel();} + let build; + try {build = window.DiscordNative.app.getReleaseChannel();} catch (err) { let version = BDFDB.DiscordUtils.getVersion(); if (version) { version = version.split("."); - if (version.length == 3 && !isNaN(version = parseInt(version[2]))) built = version > 300 ? "stable" : version > 200 ? "canary" : "ptb"; - else built = "stable"; + if (version.length == 3 && !isNaN(version = parseInt(version[2]))) build = version > 300 ? "stable" : version > 200 ? "canary" : "ptb"; + else build = "stable"; } - else built = "stable"; + else build = "stable"; } - return BDFDB.DiscordUtils.getBuilt.built = built; + return BDFDB.DiscordUtils.getBuild.build = build; } }; BDFDB.DiscordUtils.getVersion = function () { diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css index 9a3ca8a51a..9c13e0d080 100644 --- a/Themes/BasicBackground/BasicBackground.css +++ b/Themes/BasicBackground/BasicBackground.css @@ -143,7 +143,8 @@ 9. TOOLTIPS 10. TOASTS 16. BDSUPPORT - 17. PLUGINSUPPORT + 17. POWERCORDSUPPORT + 18. PLUGINSUPPORT 1. DATEVIEWER 2. SERVERFOLDERS 3. MEMBERCOUNT @@ -155,8 +156,8 @@ 9. PLUGIN/THEMEREPO 10. CHANNELHISTORY 11. CHANNELTABS - 18. UPDATENOTICE - 19. WATERMARK + 19. UPDATENOTICE + 20. WATERMARK */ @@ -1018,7 +1019,7 @@ body::before { .mouse-mode .message-2qnXI6.cozy-3raOZG:hover .header-23xsNx::after, .mouse-mode.full-motion .message-2qnXI6.cozy-3raOZG:hover .header-23xsNx::after, .mouse-mode .wrapper-1F5TKx.cozy-12kSNU:hover .header-1oLBbW::after, -.mouse-mode.full-motion .wrapper-1F5TKx.cozy-12kSNU:hover .header-1oLBbW::after +.mouse-mode.full-motion .wrapper-1F5TKx.cozy-12kSNU:hover .header-1oLBbW::after, .selected-2P5D_Z.message-2qnXI6.cozy-3raOZG .iconContainer-3GkGRf::after, .mouse-mode .message-2qnXI6.cozy-3raOZG:hover .iconContainer-3GkGRf::after, .mouse-mode.full-motion .message-2qnXI6.cozy-3raOZG:hover .iconContainer-3GkGRf::after { @@ -4952,7 +4953,7 @@ body::before { .messagesPopoutWrap-1MQ1bW, /* popout wrapper */ .container-enaOkj { /* popout wrapper (inbox) */ - background-color: transparent + background-color: transparent; box-shadow: 0 2px 10px 0 rgba(var(--vtransparencycolor), 0.3); border: none; overflow: hidden; @@ -5317,7 +5318,7 @@ body::before { /* ---- 14.6. COLORPICKER ---- */ #app-mount .colorPickerCustom-2CWBn2 { /* popout wrapper */ - background-color: transparent + background-color: transparent; box-shadow: 0 0 0 1px rgba(var(--vtransparencycolor), 0.3), 0 2px 10px 0 rgba(var(--vtransparencycolor), 0.3); border: none; border-radius: 3px; @@ -6986,20 +6987,18 @@ img[src="/assets/e8b66317ab0dc9ba3bf8d41a4f3ec914.png"] { /* videosettings opus background: rgba(var(--vtransparencycolor), 0.5); } -/* ---- 15.10. TOASTS ---- */ -html .toast, +/* ~~~~ 16. BDSUPPORT ~~~~ */ + html .bd-toast { background-color: rgb(var(--vaccentcolor)); box-shadow: 0 0 0 1px rgba(var(--vtransparencycolor), 0.3), 0 2px 10px 0 rgba(var(--vtransparencycolor), 0.3); color: rgb(var(--fontwhite1)); text-shadow: 1px 1px var(--vtextshadow); } -html .toast.icon, html .bd-toast.icon { background-image: none !important; } -html .toast.icon::before, html .bd-toast.icon::before { content: ""; position: absolute; @@ -7010,62 +7009,21 @@ html .bd-toast.icon::before { background: rgb(var(--fontwhite1)) !important; -webkit-mask: url('data:image/svg+xml; utf8, ') center/cover no-repeat; } -html .toast.toast-brand.icon::after, -html .bd-toast.toast-brand.icon::after { - content: ""; - position: absolute; - top: 0; - right: 0; - left: 0; - bottom: 0; - background: var(--vtextshadow); -} -html .toast.toast-brand.icon::before, -html .bd-toast.toast-brand.icon::before, -html .toast.toast-brand.icon::after, -html .bd-toast.toast-brand.icon::after { - -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; -} -html .toast.toast-danger.icon::before, -html .toast.toast-error.icon::before, html .bd-toast.toast-danger.icon::before, html .bd-toast.toast-error.icon::before { -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; } -html .toast.toast-facebook.icon::before, -html .bd-toast.toast-facebook.icon::before { - -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; -} -html .toast.toast-info.icon::before, html .bd-toast.toast-info.icon::before { -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; } -html .toast.toast-premium.icon::before, -html .bd-toast.toast-premium.icon::before { - -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/63px 16px no-repeat; -} -html .toast.toast-spotify.icon::before, -html .bd-toast.toast-spotify.icon::before { - -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; -} -html .toast.toast-streamermode.icon::before, -html .bd-toast.toast-streamermode.icon::before { - -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; -} -html .toast.toast-success.icon::before, html .bd-toast.toast-success.icon::before { -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; } -html .toast.toast-warning.icon::before, -html .toast.toast-warn.icon::before, html .bd-toast.toast-warning.icon::before, html .bd-toast.toast-warn.icon::before { -webkit-mask: url('data:image/svg+xml; utf8, ') 6px 50%/20px 20px no-repeat; } - -/* ~~~~ 16. BDSUPPORT ~~~~ */ - #app-mount .fav { background: var(--header-primary); width: 16px; @@ -7409,10 +7367,58 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight } +/* ~~~~ 17. POWERCORDSUPPORT ~~~~ */ -/* ~~~~ 17. PLUGINSUPPORT ~~~~ */ +html .powercord-toast { + background-color: transparent; + border: none; + box-shadow: 0 0 0 1px rgba(var(--vtransparencycolor), 0.3), 0 2px 10px 0 rgba(var(--vtransparencycolor), 0.3); + overflow: hidden; +} +html .powercord-toast::before { + content: ""; + position: absolute; + top: 0; + bottom: 0; + right: 0; + left: 0; + background: var(--vpopout) var(--vpopoutposition)/var(--vpopoutsize); + background-attachment: fixed; + filter: blur(var(--vpopoutblur)); + width: unset; + height: unset; + pointer-events: none; + z-index: -1; +} +html .powercord-toast::after { + content: ""; + position: absolute; + top: 0; + bottom: 0; + right: 0; + left: 0; + background-color: rgba(var(--vtransparencycolor), calc(var(--vtransparencyalpha) + 0.25)); + width: unset; + height: unset; + border-radius: 5px; + pointer-events: none; + z-index: -1; +} +html .powercord-toast .header { + background-color: rgba(var(--vtransparencycolor), 0.2); + box-shadow: 0 2px 3px 0 rgba(var(--vtransparencycolor), 0.2); + color: rgb(var(--fontwhite1)); +} +html .powercord-toast .contents .inner { + background-color: rgba(var(--vtransparencycolor), 0.2); + border: none; + color: rgb(var(--fontwhite2)); +} -/* ---- 17.1. DATEVIEWER ---- */ + +/* ~~~~ 18. PLUGINSUPPORT ~~~~ */ + +/* ---- 18.1. DATEVIEWER ---- */ #app-mount #dv-mount { background: transparent; @@ -7426,13 +7432,13 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight opacity: 1; } -/* ---- 17.2. SERVERFOLDERS ---- */ +/* ---- 18.2. SERVERFOLDERS ---- */ .base-PmTxvP[style*="background-color: rgb(114, 137, 218)"] { text-shadow: 1px 1px var(--vtextshadow); } -/* ---- 17.3. MEMBERCOUNT ---- */ +/* ---- 18.3. MEMBERCOUNT ---- */ #app-mount #MemberCount { background-color: transparent; @@ -7462,14 +7468,14 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight filter: blur(var(--vbackgroundblur)); } -/* ---- 17.4. CHARCOUNTER ---- */ +/* ---- 18.4. CHARCOUNTER ---- */ #app-mount #charcounter { color: rgb(var(--fontwhite3)); opacity: 1; } -/* ---- 17.5. LINENUMBERS ---- */ +/* ---- 18.5. LINENUMBERS ---- */ .hljs ol li { border-left-color: rgba(var(--fontwhite1), 0.2); @@ -7478,7 +7484,7 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight color: rgb(var(--fontwhite4)); } -/* ---- 17.6. PERMISSIONVIEWER ---- */ +/* ---- 18.6. PERMISSIONVIEWER ---- */ #permissions-modal-wrapper #permissions-modal { /* modal container */ background-color: transparent; @@ -7548,7 +7554,7 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight color: rgb(var(--fontwhite3)); } -/* ---- 17.7. DIRECTDOWNLOAD ---- */ +/* ---- 18.7. DIRECTDOWNLOAD ---- */ #files_directDownload .file { background-color: rgba(var(--vtransparencycolor), 0.4); @@ -7569,7 +7575,7 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight background-color: rgb(var(--vaccentcolor)); } -/* ---- 17.8. BETTERFORMATINGREDUX ---- */ +/* ---- 18.8. BETTERFORMATINGREDUX ---- */ .innerDisabled-2mc-iF ~ .bf-toolbar { display: none; @@ -7627,7 +7633,7 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight color: rgb(var(--fontwhite1)); } -/* ---- 17.9 PLUGIN/THEMEREPO ---- */ +/* ---- 18.9 PLUGIN/THEMEREPO ---- */ #app-mount .pluginEntry svg[fill="currentColor"], #app-mount .pluginEntry .gifFavoriteButton-1gYkEU:not(.selected-2QpwIN), @@ -7643,14 +7649,14 @@ html .monaco-editor .reference-zone-widget .ref-tree .referenceMatch .highlight color: rgb(var(--fontwhite1)) !important; } -/* ---- 17.10 CHANNELHISTORY ---- */ +/* ---- 18.10 CHANNELHISTORY ---- */ .channelHistoryButtons { top: 4px; left: 310px; } -/* ---- 17.11 CHANNELTABS ---- */ +/* ---- 18.11 CHANNELTABS ---- */ html .channelTabs-tabContainer, html .channelTabs-favContainer { @@ -7762,7 +7768,7 @@ html .channelTabs-newTab:hover { } -/* ~~~~ 18. UPDATENOTICE ~~~~ */ +/* ~~~~ 19. UPDATENOTICE ~~~~ */ html:only-child > head + body > div#app-mount.appMount-3lHmkl > div.app-1q1i1E > div.app-2rEoOp::before { content: "Your version of BasicBackground by DevilBro is outdated. Please download the newest version from: https://github.com/mwittrien/BetterDiscordAddons/blob/master/Themes/BasicBackground" !important; @@ -7798,7 +7804,7 @@ html:only-child > head + body > div#app-mount.appMount-3lHmkl > div.app-1q1i1E > } -/* ~~~~ 19. WATERMARK ~~~~ */ +/* ~~~~ 20. WATERMARK ~~~~ */ html:only-child > head + body > div#app-mount.appMount-3lHmkl > div.typeWindows-1za-n7.titleBar-AC4pGV.horizontalReverse-3tRjY7.flex-1O1GKY.directionRowReverse-m8IjIq.justifyStart-2NDFzi.alignStretch-DpGPf3 > div.wordmark-2iDDfm { color: white !important; diff --git a/Themes/DiscordRecolor/DiscordRecolor.css b/Themes/DiscordRecolor/DiscordRecolor.css index a4a7d1c02f..6309600c3a 100644 --- a/Themes/DiscordRecolor/DiscordRecolor.css +++ b/Themes/DiscordRecolor/DiscordRecolor.css @@ -4478,26 +4478,29 @@ html .monaco-menu .monaco-action-bar.vertical .submenu-indicator.codicon::before /* ~~~~ 13. POWERCORDSUPPORT ~~~~ */ -.powercord-toast .header { - background-color: var(--background-floating); - box-shadow: var(--elevation-medium); +html .powercord-toast-container { + --toast-background: var(--background-secondary); + --toast-header: var(--background-tertiary); + --toast-contents: var(--background-primary); + --toast-box-shadow: var(--elevation-stroke),var(--elevation-high); + --toast-border: transparent; } -.powercord-pc-icon { +html .powercord-pc-icon { margin-right: 4px; } -.powercord-pc-icon svg { +html .powercord-pc-icon svg { padding-right: 0; - width: 28px; + width: 28px; } -.powercord-pc-icon::before { +html .powercord-pc-icon::before { background: var(--interactive-normal); -webkit-mask: url('data:image/png; base64, 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') left/18px 18px no-repeat; } -.powercord-pc-icon:hover::before { +html .powercord-pc-icon:hover::before { background: var(--interactive-hover); } -.powercord-pc-icon:active::before { +html .powercord-pc-icon:active::before { background: var(--interactive-active); }