From 942981c79d42aec1d61de214ad289b3b3c427183 Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Fri, 28 May 2021 16:14:39 +0200 Subject: [PATCH] stuff --- Library/0BDFDB.plugin.js | 2 +- Library/_res/BDFDB.data.json | 13 ++++-- Library/_res/BDFDB.raw.css | 12 +---- Plugins/_res/DiscordPreview.html | 80 ++++++++++++++++++-------------- 4 files changed, 57 insertions(+), 50 deletions(-) diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js index f4abbc9d78..4b2eab4bc5 100644 --- a/Library/0BDFDB.plugin.js +++ b/Library/0BDFDB.plugin.js @@ -7535,7 +7535,7 @@ module.exports = (_ => { }) : child) }), this.props.errorMessage ? BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.TextElement, { - className: BDFDB.disCN.carderror, + className: BDFDB.disCN.margintop8, size: InternalComponents.LibraryComponents.TextElement.Sizes.SIZE_12, color: InternalComponents.LibraryComponents.TextElement.Colors.STATUS_RED, children: this.props.errorMessage diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json index 008df99286..def22f92cf 100644 --- a/Library/_res/BDFDB.data.json +++ b/Library/_res/BDFDB.data.json @@ -1124,7 +1124,6 @@ "CallDetails": {"props": ["container", "hotspot"]}, "CallIncoming": {"props": ["wrapper", "mainChannelInfo"]}, "Card": {"props": ["card", "cardBrand"]}, - "CardStatus": {"props": ["reset", "error", "card"]}, "Category": {"props": ["wrapper", "children", "addButtonIcon"]}, "CategoryArrow": {"props": ["arrow", "open"]}, "ChangeLog": {"props": ["added", "fixed", "improved", "progress"]}, @@ -1302,6 +1301,7 @@ "UserBadges": {"props": ["profileBadgeStaff", "profileBadgePremium"]}, "UserInfo": {"props": ["userInfo", "discordTag"]}, "UserPopout": {"props": ["headerNormal", "profileBadges"]}, + "UserPopoutBanner": {"props": ["profileBanner", "profileBannerPremium"]}, "UserPopoutWrapper": {"props": ["userPopout", "rolesList"]}, "UserProfile": {"props": ["topSectionNormal", "tabBarContainer"]}, "UserSettingsAppearancePreview": {"props": ["preview", "firstMessage"]}, @@ -1598,6 +1598,8 @@ "avatarnoicon": ["AvatarIcon", "noIcon"], "avatarpointer": ["Avatar", "pointer"], "avatarpointerevents": ["Avatar", "pointerEvents"], + "avatarstack": ["Avatar", "avatarStack"], + "avatarsvg": ["Avatar", "svg"], "avatarwrapper": ["Avatar", "wrapper"], "backdrop": ["Backdrop", "backdrop"], "backdropwithlayer": ["Backdrop", "withLayer"], @@ -1684,12 +1686,10 @@ "cardbrandoutline": ["Card", "cardBrandOutline"], "carddanger": ["Card", "cardDanger"], "carddangeroutline": ["Card", "cardDangerOutline"], - "carderror": ["CardStatus", "error"], "cardprimary": ["Card", "cardPrimary"], "cardprimaryeditable": ["Card", "cardPrimaryEditable"], "cardprimaryoutline": ["Card", "cardPrimaryOutline"], "cardprimaryoutlineeditable": ["Card", "cardPrimaryOutlineEditable"], - "cardreset": ["CardStatus", "reset"], "cardsuccess": ["Card", "cardSuccess"], "cardsuccessoutline": ["Card", "cardSuccessOutline"], "cardwarning": ["Card", "cardWarning"], @@ -2984,6 +2984,7 @@ "uploadmodal": ["UploadModal", "uploadModal"], "userbadges": ["UserBadges", "container"], "userbadgescolored": ["UserBadges", "colored"], + "userbadgespopout": ["UserPopout", "profileBadges"], "userinfo": ["UserInfo", "userInfo"], "userinfoavatar": ["UserInfo", "avatar"], "userinfodate": ["BDFDB", "userInfoDate"], @@ -3004,6 +3005,9 @@ "userpopoutavatarwrappernonuserbot": ["UserPopout", "avatarWrapperNonUserBot"], "userpopoutavatarwrapper": ["UserPopout", "avatarWrapper"], "userpopoutavatarwrappernormal": ["UserPopout", "avatarWrapperNormal"], + "userpopoutbanner": ["UserPopoutBanner", "banner"], + "userpopoutbannernormal": ["UserPopoutBanner", "profileBanner"], + "userpopoutbannerpremium": ["UserPopoutBanner", "profileBannerPremium"], "userpopoutbody": ["UserPopoutWrapper", "body"], "userpopoutbodyinnerwrapper": ["UserPopoutWrapper", "bodyInnerWrapper"], "userpopoutbodytitle": ["UserPopoutWrapper", "bodyTitle"], @@ -3015,7 +3019,8 @@ "userpopoutfooter": ["UserPopoutWrapper", "footer"], "userpopoutheaderbottag": ["UserPopout", "headerBotTag"], "userpopoutheaderbottagwithnickname": ["UserPopout", "headerBotTagWithNickname"], - "userpopoutheadertagdiscriminatornonickname": ["UserPopout", "headerTagDiscriminatorNoNickname"], + "userpopoutheaderdiscriminatorbase": ["UserPopout", "discrimBase"], + "userpopoutheaderdiscriminatornonickname": ["UserPopout", "headerTagDiscriminatorNoNickname"], "userpopoutheadernickname": ["UserPopout", "nickname"], "userpopoutheadernormal": ["UserPopout", "headerNormal"], "userpopoutheadertag": ["UserPopout", "headerTag"], diff --git a/Library/_res/BDFDB.raw.css b/Library/_res/BDFDB.raw.css index 56d5053e1c..97bd542827 100644 --- a/Library/_res/BDFDB.raw.css +++ b/Library/_res/BDFDB.raw.css @@ -466,8 +466,9 @@ img:not([src]), img[src=""], img[src="null"] { margin-top: 4px !important; } [REPLACE_CLASS_userinfodate] { - user-select: text; + color: var(--header-secondary); margin-top: 8px; + user-select: text; } [REPLACE_CLASS_userinfodate] + [REPLACE_CLASS_userinfodate] { margin-top: 0; @@ -475,15 +476,6 @@ img:not([src]), img[src=""], img[src="null"] { [REPLACE_CLASS_userinfodate] + *:not([REPLACE_CLASS_userinfodate]) { margin-top: 6px; } -[REPLACE_CLASS_userpopout] [REPLACE_CLASS_userinfodate] { - color: var(--header-secondary); -} -[REPLACE_CLASS_userprofile] [REPLACE_CLASS_userinfodate] { - color: var(--header-secondary); -} -[REPLACE_CLASS_userpopout] [REPLACE_CLASS_userpopoutheader]:not([class*='headerNormal']) [REPLACE_CLASS_userinfodate] { - color: hsla(0,0%,100%,.6); -} [REPLACE_CLASS_userprofile] [class*='topSection']:not([class*='topSectionNormal']) [REPLACE_CLASS_userinfodate] { color: hsla(0,0%,100%,.6); } diff --git a/Plugins/_res/DiscordPreview.html b/Plugins/_res/DiscordPreview.html index bdc8f398f2..d97a302cfa 100644 --- a/Plugins/_res/DiscordPreview.html +++ b/Plugins/_res/DiscordPreview.html @@ -1280,9 +1280,11 @@