From be7c580d9c0efd38324fba1d14d22fe179636e19 Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Wed, 28 Oct 2020 23:19:12 +0100 Subject: [PATCH] stuff --- Library/_res/BDFDB.data.json | 1 + .../BadgesEverywhere.plugin.js | 2 +- Themes/BlurpleRecolor/BlurpleRecolor.css | 54 +++-------------- Themes/DiscordRecolor/DiscordRecolor.css | 60 +++++++++---------- 4 files changed, 40 insertions(+), 77 deletions(-) diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json index a0d06a0948..b41f91cff0 100644 --- a/Library/_res/BDFDB.data.json +++ b/Library/_res/BDFDB.data.json @@ -2375,6 +2375,7 @@ "unreadbartext": ["UnreadBar", "text"], "unreadbarunread": ["UnreadBar", "unread"], "uploadmodal": ["UploadModal", "uploadModal"], + "userbadges": ["UserBadges", "container"], "userbadgescolored": ["UserBadges", "colored"], "userinfo": ["UserInfo", "userInfo"], "userinfoavatar": ["UserInfo", "avatar"], diff --git a/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js b/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js index 25ef40c897..d40b75fa7d 100644 --- a/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js +++ b/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js @@ -422,7 +422,7 @@ module.exports = (_ => { return BDFDB.ReactUtils.createElement("div", { className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN._badgeseverywherebadges, BDFDB.disCN[`_badgeseverywherebadges${type}`], miniTypes.includes(type) && BDFDB.disCN._badgeseverywheremini), children: BDFDB.ReactUtils.createElement("div", { - className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN._badgeseverywherebadgesinner, !uncolored && BDFDB.disCN.userbadgescolored), + className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN._badgeseverywherebadgesinner, BDFDB.disCN.userbadges, !uncolored && BDFDB.disCN.userbadgescolored), children: renderedBadges }) }); diff --git a/Themes/BlurpleRecolor/BlurpleRecolor.css b/Themes/BlurpleRecolor/BlurpleRecolor.css index 561bee7b82..817c07637e 100644 --- a/Themes/BlurpleRecolor/BlurpleRecolor.css +++ b/Themes/BlurpleRecolor/BlurpleRecolor.css @@ -52,11 +52,10 @@ 6. LOGINSCREEN 7. DOWNLOADAPPMODAL 8. GUILDBOOSTMODAL - 9. NEWUSERMODAL - 10. STREAMSETTINGSMODAL - 11. DISPATCHERRORMODAL - 12. CHANGELOGMODAL - 13. SCREENSHAREMODAL + 9. STREAMSETTINGSMODAL + 10. DISPATCHERRORMODAL + 11. CHANGELOGMODAL + 12. SCREENSHAREMODAL 12. POPOUTS 1. CONTEXTMENU 2. USERPOPOUT @@ -1353,44 +1352,7 @@ filter: brightness(150%); } -/* ---- 11.9. NEWUSERMODAL ---- */ - -.form-236Xmo header { - color: rgb(var(--vaccentcolor)); -} -.form-236Xmo .controlGroup-2GQ-D1 label a, -.form-236Xmo .controlGroup-2GQ-D1 label a:hover { - color: rgb(var(--vaccentcolor)); -} -.form-236Xmo .controlGroup-2GQ-D1 label a:hover { - filter: brightness(120%); -} -.form-236Xmo .controlGroup-2GQ-D1 input[type=email]:focus, -.form-236Xmo .controlGroup-2GQ-D1 input[type=number]:focus, -.form-236Xmo .controlGroup-2GQ-D1 input[type=password]:focus, -.form-236Xmo .controlGroup-2GQ-D1 input[type=text]:focus, -.form-236Xmo .controlGroup-2GQ-D1 textarea:focus { - border-color: rgb(var(--vaccentcolor)); -} -.form-236Xmo .btnPrimary-346kfV { - background-color: rgb(var(--vaccentcolor)); -} -.form-236Xmo .btnPrimary-346kfV:hover { - background: var(--vaccentcolor-hover); -} -.modalNewUser-3IRw8L h5 { - color: rgb(var(--vaccentcolor)); -} -.modalNewUser-3IRw8L .stepsWrap-3bDM3D .steps-370EKx li.on-1OjN9V, -.modalNewUser-3IRw8L .stepsWrap-3bDM3D .steps-370EKx li.on-1OjN9V + .divider-3Ozccb, -.modalNewUser-3IRw8L .stepsWrap-3bDM3D .steps-370EKx li.on-1OjN9V::before { - background-color: rgb(var(--vaccentcolor)); -} -.modalNewUser-3IRw8L .stepsWrap-3bDM3D .steps-370EKx li.active-yTwIO8 { - background-color: rgb(var(--vaccentcolor)); -} - -/* ---- 11.10. STREAMSETTINGSMODAL ---- */ +/* ---- 11.9. STREAMSETTINGSMODAL ---- */ .selectorButtonSelected-336oUc, /* modal selectorselectedbutton */ .selectorButtonSelected-1j4DmC { @@ -1409,13 +1371,13 @@ box-shadow: inset 0 0 0 2px rgb(var(--vaccentcolor)); } -/* ---- 11.11. DISPATCHERRORMODAL ---- */ +/* ---- 11.10. DISPATCHERRORMODAL ---- */ .theme-light .closeLink-2MRAUp { /* modal closelink */ color: rgb(var(--vaccentcolor)); } -/* ---- 11.12. CHANGELOGMODAL ---- */ +/* ---- 11.11. CHANGELOGMODAL ---- */ .content-s2SEQO a { /* modal link */ color: var(--text-link); @@ -1431,7 +1393,7 @@ background: rgb(255, 255, 255) linear-gradient(90deg, rgb(var(--vaccentcolor)), rgba(var(--vaccentcolor), 0.5)); } -/* ---- 11.13. SCREENSHAREMODAL ---- */ +/* ---- 11.12. SCREENSHAREMODAL ---- */ .tile-2w4k5N:hover .sourceThumbnail-27dolk { box-shadow: inset 0 0 0 2px rgb(var(--vaccentcolor)); diff --git a/Themes/DiscordRecolor/DiscordRecolor.css b/Themes/DiscordRecolor/DiscordRecolor.css index d5914b1873..148b54d07c 100644 --- a/Themes/DiscordRecolor/DiscordRecolor.css +++ b/Themes/DiscordRecolor/DiscordRecolor.css @@ -4132,49 +4132,49 @@ html .ace_scrollbar.ace_scrollbar-h::-webkit-scrollbar-track { background-color: var(--background-secondary-alt); } -body .ace_closeButton { +html .ace_closeButton { display: none; } -body #ace_settingsmenu { +html #ace_settingsmenu { background: var(--background-primary); box-shadow: -5px 4px 5px rgba(var(--backgroundtertiary), 0.55); color: var(--header-primary); padding-top: 10px; padding-bottom: 10px; } -body #ace_settingsmenu::-webkit-scrollbar { +html #ace_settingsmenu::-webkit-scrollbar { width: 16px; } -body #ace_settingsmenu::-webkit-scrollbar-thumb { +html #ace_settingsmenu::-webkit-scrollbar-thumb { background-color: var(--background-secondary-alt); min-height: 40px; } -body #ace_settingsmenu::-webkit-scrollbar-thumb, -body #ace_settingsmenu::-webkit-scrollbar-track { +html #ace_settingsmenu::-webkit-scrollbar-thumb, +html #ace_settingsmenu::-webkit-scrollbar-track { border: 4px solid transparent; background-clip: padding-box; border-radius: 8px; } -body #ace_settingsmenu::-webkit-scrollbar-track { +html #ace_settingsmenu::-webkit-scrollbar-track { background-color: var(--background-secondary); } -body #ace_settingsmenu .ace_optionsMenuEntry { +html #ace_settingsmenu .ace_optionsMenuEntry { height: 40px; display: flex; align-items: center; justify-content: flex-start; margin-bottom: 10px; } -body #ace_settingsmenu .ace_optionsMenuEntry:hover { +html #ace_settingsmenu .ace_optionsMenuEntry:hover { background: transparent; } -body #ace_settingsmenu .ace_optionsMenuEntry + div:not([class]) { +html #ace_settingsmenu .ace_optionsMenuEntry + div:not([class]) { float: right; color: var(--text-muted); padding-right: 0 !important; padding-bottom: 0 !important; } -body #ace_settingsmenu .ace_optionsMenuEntry label { +html #ace_settingsmenu .ace_optionsMenuEntry label { flex: 1 0 auto; color: var(--header-primary); margin-right: 16px; @@ -4183,7 +4183,7 @@ body #ace_settingsmenu .ace_optionsMenuEntry label { line-height: 24px; cursor: pointer; } -body #ace_settingsmenu .ace_optionsMenuEntry button { +html #ace_settingsmenu .ace_optionsMenuEntry button { justify-content: center; align-items: center; text-align: center; @@ -4196,22 +4196,22 @@ body #ace_settingsmenu .ace_optionsMenuEntry button { margin: 0 8px; padding: 2px 8px; } -body #ace_settingsmenu .ace_optionsMenuEntry button:hover { +html #ace_settingsmenu .ace_optionsMenuEntry button:hover { background-color: rgba(0, 0, 0, 0.2); box-shadow: none; border: none; color: var(--interactive-hover); } -body #ace_settingsmenu .ace_optionsMenuEntry button[ace_selected_button=true] { +html #ace_settingsmenu .ace_optionsMenuEntry button[ace_selected_button=true] { background-color: rgb(var(--vaccentcolor)); box-shadow: none; border: none; color: var(--header-primary); cursor: default; } -body #ace_settingsmenu .ace_optionsMenuEntry input[type="text"], -body #ace_settingsmenu .ace_optionsMenuEntry input[type="number"], -body #ace_settingsmenu .ace_optionsMenuEntry select { +html #ace_settingsmenu .ace_optionsMenuEntry input[type="text"], +html #ace_settingsmenu .ace_optionsMenuEntry input[type="number"], +html #ace_settingsmenu .ace_optionsMenuEntry select { flex: 0 1 auto; float: unset; width: 200px; @@ -4225,31 +4225,31 @@ body #ace_settingsmenu .ace_optionsMenuEntry select { font-size: 16px; transition: background-color .15s ease,border .15s ease; } -body #ace_settingsmenu .ace_optionsMenuEntry input[type="number"] { +html #ace_settingsmenu .ace_optionsMenuEntry input[type="number"] { padding-right: 2px; } -body #ace_settingsmenu .ace_optionsMenuEntry input[type="text"]:hover, -body #ace_settingsmenu .ace_optionsMenuEntry input[type="number"]:hover, -body #ace_settingsmenu .ace_optionsMenuEntry select:hover { +html #ace_settingsmenu .ace_optionsMenuEntry input[type="text"]:hover, +html #ace_settingsmenu .ace_optionsMenuEntry input[type="number"]:hover, +html #ace_settingsmenu .ace_optionsMenuEntry select:hover { border-color: var(--deprecated-text-input-border-hover); } -body #ace_settingsmenu .ace_optionsMenuEntry input[type="text"]:focus, -body #ace_settingsmenu .ace_optionsMenuEntry input[type="number"]:focus, -body #ace_settingsmenu .ace_optionsMenuEntry select:focus { +html #ace_settingsmenu .ace_optionsMenuEntry input[type="text"]:focus, +html #ace_settingsmenu .ace_optionsMenuEntry input[type="number"]:focus, +html #ace_settingsmenu .ace_optionsMenuEntry select:focus { border-color: rgb(var(--vaccentcolor)); } -body #ace_settingsmenu .ace_optionsMenuEntry select option { +html #ace_settingsmenu .ace_optionsMenuEntry select option { background-color: var(--background-primary); color: var(--header-primary); } -body #ace_settingsmenu input[type="checkbox"] { +html #ace_settingsmenu input[type="checkbox"] { position: relative; flex: 0 0 auto; width: 42px; height: 24px; -webkit-appearance: none; } -body #ace_settingsmenu input[type="checkbox"]::before { +html #ace_settingsmenu input[type="checkbox"]::before { content: ""; display: block; position: relative; @@ -4259,10 +4259,10 @@ body #ace_settingsmenu input[type="checkbox"]::before { border-radius: 14px; transition: background .15s ease-in-out,box-shadow .15s ease-in-out,border .15s ease-in-out; } -body #ace_settingsmenu input[type="checkbox"]:checked::before { +html #ace_settingsmenu input[type="checkbox"]:checked::before { background: rgb(var(--vaccentcolor)); } -body #ace_settingsmenu input[type="checkbox"]::after { +html #ace_settingsmenu input[type="checkbox"]::after { content: ""; display: block; position: absolute; @@ -4276,7 +4276,7 @@ body #ace_settingsmenu input[type="checkbox"]::after { border-radius: 10px; transition: all .15s ease; } -body #ace_settingsmenu input[type="checkbox"]:checked::after { +html #ace_settingsmenu input[type="checkbox"]:checked::after { transform: translateX(20px); }