From 84f3d1757efda4c8153d22c41ed41a3be4407f6b Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Thu, 13 May 2021 20:58:14 +0200 Subject: [PATCH] stuff --- Library/_res/BDFDB.raw.css | 2 +- .../ImageUtilities/ImageUtilities.plugin.js | 2 +- Plugins/_res/DiscordPreview.html | 4 +- Themes/BasicBackground/BasicBackground.css | 21 ++++-- Themes/BlurpleRecolor/BlurpleRecolor.css | 65 ++++++++++++++----- Themes/DiscordRecolor/DiscordRecolor.css | 11 +++- 6 files changed, 74 insertions(+), 31 deletions(-) diff --git a/Library/_res/BDFDB.raw.css b/Library/_res/BDFDB.raw.css index d0eb9059de..4b95452ac1 100644 --- a/Library/_res/BDFDB.raw.css +++ b/Library/_res/BDFDB.raw.css @@ -1,7 +1,7 @@ @import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/SupporterBadge.css); :root { - --bdfdb-blurple: var(--brand-experiment, var(--blurple, rgb(114, 137, 218))); + --bdfdb-blurple: var(--brand-experiment, var(--blurple, #5865f2)); } img:not([src]), img[src=""], img[src="null"] { diff --git a/Plugins/ImageUtilities/ImageUtilities.plugin.js b/Plugins/ImageUtilities/ImageUtilities.plugin.js index dfa0285799..51f060996b 100644 --- a/Plugins/ImageUtilities/ImageUtilities.plugin.js +++ b/Plugins/ImageUtilities/ImageUtilities.plugin.js @@ -260,7 +260,7 @@ module.exports = (_ => { font-weight: 600; } ${BDFDB.dotCN._imageutilitieslense} { - border: 2px solid rgb(114, 137, 218); + border: 2px solid var(--bdfdb-blurple); } ${BDFDB.dotCN._imageutilitiesoperations} { position: absolute; diff --git a/Plugins/_res/DiscordPreview.html b/Plugins/_res/DiscordPreview.html index 585374acee..b37e712126 100644 --- a/Plugins/_res/DiscordPreview.html +++ b/Plugins/_res/DiscordPreview.html @@ -275,7 +275,7 @@
- +
@@ -355,7 +355,7 @@
-
+
5
diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css index b321fb7014..19c5713846 100644 --- a/Themes/BasicBackground/BasicBackground.css +++ b/Themes/BasicBackground/BasicBackground.css @@ -202,7 +202,7 @@ body, /* body */ #app-mount .members-1998pB > div, /* members content */ #app-mount .content-MLh4nU, /* unavailable */ #app-mount .container-1D34oG, /* peoples */ -#app-mount .container-lRFx4q, +#app-mount .container-lRFx4q, /* peoples activity list */ #app-mount .applicationStore-1pNvnv, /* nitro */ #app-mount .pageWrapper-1PgVDX, /* guilddiscovery */ #app-mount .scrollerBase-289Jih, /* scroller */ @@ -212,6 +212,10 @@ body, /* body */ background: transparent; } +#app-mount .scroller-2ZPeAD { /* peoples activity scroller */ + border: none; +} + #app-mount .sidebarRegion-VFTUkN { /* settings sidebar */ background-color: rgba(var(--transparencycolor), .2); } @@ -1940,7 +1944,9 @@ body::before { /* ~~~~ 11. USERSETTINGS ~~~~ */ -.item-PXvHYJ[style*="background-color: rgb(114, 137, 218)"] { +.premiumTabItem-1QTfBr[aria-selected=true], +.item-PXvHYJ.selected-3s45Ha[aria-controls="Nitro Server Boost-tab"], +.serverBoostTabItem-2hFTIN[aria-selected=true] { text-shadow: 1px 1px var(--textshadow); } .side-8zPYf6 .themed-OHr7kt.item-PXvHYJ:hover:not(.disabled-1Hwwfb), /* sideitems */ @@ -3330,7 +3336,8 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr background-color: rgb(var(--accentcolor)) !important; border-color: rgb(var(--accentcolor)) !important; } -.uploadModal-2ifh8j .checkbox-1ix_J3.checked-3_4uQ9 path[fill="#7289da"] { +.uploadModal-2ifh8j .checkbox-1ix_J3.checked-3_4uQ9 path[fill="#5865f2", i], +.uploadModal-2ifh8j .checkbox-1ix_J3.checked-3_4uQ9 path[fill="#7289da", i] { fill: #fff !important; } .uploadModal-2ifh8j .inner-3nWsbo .file-34mY5K .icon-kyxXVr.image-2yrs5j { @@ -3595,7 +3602,8 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr #app-mount .modal-DRZfgq .checkbox-1ix_J3.checked-3_4uQ9 { /* modal ackcheckbox */ background-color: rgb(var(--accentcolor)); } -#app-mount .modal-DRZfgq .checkbox-1ix_J3 [stroke="#7289da"] { +#app-mount .modal-DRZfgq .checkbox-1ix_J3 [stroke="#5865f2" i], +#app-mount .modal-DRZfgq .checkbox-1ix_J3 [stroke="#7289da" i] { stroke: #fff !important; } #app-mount .ack-2yIUvY { /* modal acklabel */ @@ -5839,6 +5847,7 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr } #app-mount .checkbox-1ix_J3.checked-3_4uQ9.round-2jCFai svg, #app-mount .checkbox-1ix_J3.checked-3_4uQ9[style*="border-color: rgb(79, 84, 92)"] svg, +#app-mount .checkbox-1ix_J3.checked-3_4uQ9[style*="background-color: rgb(88, 101, 242)"] svg, #app-mount .checkbox-1ix_J3.checked-3_4uQ9[style*="background-color: rgb(114, 137, 218)"] svg { filter: drop-shadow(1px 1px var(--textshadow)); } @@ -5917,8 +5926,8 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr background: var(--header-primary); } #app-mount .container-CpszHS.recording-1H2dS7 .button-34kXw5 { - color: rgb(var(--dangercolor)); background-color: rgba(var(--dangercolor)),.1); + color: rgb(var(--dangercolor)); } .select-2TCrqx [class*="css-"][class*="-container"] { /* select container */ @@ -6440,7 +6449,7 @@ html .colorDefault-XdNdIp .bg-8df5St { /* ---- 18.3. SERVERFOLDERS ---- */ -.base-PmTxvP[style*="background-color: rgb(114, 137, 218)"] { +.base-PmTxvP[style*="var(--bdfdb-blurple)"] { text-shadow: 1px 1px var(--textshadow); } diff --git a/Themes/BlurpleRecolor/BlurpleRecolor.css b/Themes/BlurpleRecolor/BlurpleRecolor.css index 7f7191e42e..f9928a374d 100644 --- a/Themes/BlurpleRecolor/BlurpleRecolor.css +++ b/Themes/BlurpleRecolor/BlurpleRecolor.css @@ -144,36 +144,48 @@ html.oldBrand, html.newBrand { background-color: rgb(var(--accentcolor)); } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 1"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 1"] { background-color: rgba(var(--accentcolor), 1) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.9"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.9"] { background-color: rgba(var(--accentcolor), 0.9) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.8"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.8"] { background-color: rgba(var(--accentcolor), 0.8) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.7"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.7"] { background-color: rgba(var(--accentcolor), 0.7) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.6"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.6"] { background-color: rgba(var(--accentcolor), 0.6) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.5"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.5"] { background-color: rgba(var(--accentcolor), 0.5) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.4"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.4"] { background-color: rgba(var(--accentcolor), 0.4) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.3"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.3"] { background-color: rgba(var(--accentcolor), 0.3) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.2"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.2"] { background-color: rgba(var(--accentcolor), 0.2) !important; } +.folderIconWrapper-1_bOZe[style*="background-color: rgba(88, 101, 242, 0.1"], .folderIconWrapper-1_bOZe[style*="background-color: rgba(114, 137, 218, 0.1"] { background-color: rgba(var(--accentcolor), 0.1) !important; } +.folderIconWrapper-1_bOZe svg[style^="color: rgb(88, 101, 242)"], +.folderIconWrapper-1_bOZe svg[style*=" color: rgb(88, 101, 242)"], .folderIconWrapper-1_bOZe svg[style^="color: rgb(114, 137, 218)"], .folderIconWrapper-1_bOZe svg[style*=" color: rgb(114, 137, 218)"] { color: rgb(var(--accentcolor)) !important; @@ -244,41 +256,54 @@ html.oldBrand, html.newBrand { color: rgb(var(--accentcolor)); } +.backgroundFlash-24qWLN[style*="background-color: rgb(88, 101, 242)"], +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 1"], .backgroundFlash-24qWLN[style*="background-color: rgb(114, 137, 218)"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 1"] { background-color: rgba(var(--accentcolor), 1) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.9"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.9"] { background-color: rgba(var(--accentcolor), 0.9) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.8"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.8"] { background-color: rgba(var(--accentcolor), 0.8) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.7"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.7"] { background-color: rgba(var(--accentcolor), 0.7) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.6"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.6"] { background-color: rgba(var(--accentcolor), 0.6) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.5"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.5"] { background-color: rgba(var(--accentcolor), 0.5) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.4"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.4"] { background-color: rgba(var(--accentcolor), 0.4) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.3"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.3"] { background-color: rgba(var(--accentcolor), 0.3) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.2"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.2"] { background-color: rgba(var(--accentcolor), 0.2) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.1"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.1"] { background-color: rgba(var(--accentcolor), 0.1) !important; } +.backgroundFlash-24qWLN[style*="background-color: rgba(88, 101, 242, 0.0"], .backgroundFlash-24qWLN[style*="background-color: rgba(114, 137, 218, 0.0"] { - background-color: rgba(var(--accentcolor), 0.0) !important; + background-color: rgba(var(--accentcolor), 0) !important; } +.embedFull-2tM8--[style*="border-color: rgb(88, 101, 242)"], .embedFull-2tM8--[style*="border-color: rgb(114, 137, 218)"], .embedFull-2tM8--[style*="border-color: rgb(58, 113, 193)"] { border-color: rgb(var(--accentcolor)) !important; @@ -337,6 +362,7 @@ html.oldBrand, html.newBrand { background-color: rgba(var(--accentcolor), 0.3); } /* attachment upload bar */ +.progressBar-3u8FBM[style*="background-color: rgb(88, 101, 242)"], .progressBar-3u8FBM[style*="background-color: rgb(114, 137, 218)"] { background-color: rgb(var(--accentcolor)) !important; } @@ -663,33 +689,25 @@ html.oldBrand, html.newBrand { /* ~~~~ 8. USERSETTINGS ~~~~ */ -.premiumTabItem-1QTfBr[aria-selected=false], -.item-PXvHYJ[style^="color: rgb(114, 137, 218)"], -.item-PXvHYJ[style*=" color: rgb(114, 137, 218)"] { /* settingsitems item */ +.premiumTabItem-1QTfBr[aria-selected=false] { /* settingsitems item */ color: rgb(var(--accentcolor)) !important; } -.premiumTabItem-1QTfBr[aria-selected=false]:hover, -.item-PXvHYJ[style*="background-color: rgba(114, 137, 218, 0.1)"] { +.premiumTabItem-1QTfBr[aria-selected=false]:hover { background-color: rgb(var(--accentcolor), 0.1) !important; } -.premiumTabItem-1QTfBr[aria-selected=true], -.item-PXvHYJ[style*="background-color: rgb(114, 137, 218)"] { +.premiumTabItem-1QTfBr[aria-selected=true] { background-color: rgb(var(--accentcolor)) !important; } .item-PXvHYJ:not(.selected-3s45Ha)[aria-controls="Nitro Server Boost-tab"], -.serverBoostTabItem-2hFTIN[aria-selected=false], -.item-PXvHYJ[style^="color: rgb(114, 137, 218)"][aria-controls="GUILD_PREMIUM-tab"], -.item-PXvHYJ[style*=" color: rgb(114, 137, 218)"][aria-controls="GUILD_PREMIUM-tab"] { +.serverBoostTabItem-2hFTIN[aria-selected=false] { color: rgb(var(--accentcolor2)) !important; } .item-PXvHYJ:hover[aria-controls="Nitro Server Boost-tab"], -.serverBoostTabItem-2hFTIN[aria-selected=false]:hover,, -.item-PXvHYJ[style*="background-color: rgba(114, 137, 218, 0.1)"][aria-controls="GUILD_PREMIUM-tab"] { +.serverBoostTabItem-2hFTIN[aria-selected=false]:hover { background-color: rgb(var(--accentcolor2), 0.1) !important; } .item-PXvHYJ.selected-3s45Ha[aria-controls="Nitro Server Boost-tab"], -.serverBoostTabItem-2hFTIN[aria-selected=true], -.item-PXvHYJ[style*="background-color: rgb(114, 137, 218)"][aria-controls="GUILD_PREMIUM-tab"] { +.serverBoostTabItem-2hFTIN[aria-selected=true] { background-color: rgb(var(--accentcolor2)) !important; } .item-PXvHYJ .icon-Zc-uZZ, @@ -992,6 +1010,7 @@ html.oldBrand, html.newBrand { -webkit-mask: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/blurple/guildsettings_requirements_accent.svg) center/cover no-repeat; } +.featureIcon-3p1TC_ [fill="#5865f2" i], .featureIcon-3p1TC_ [fill="#7289da" i] { /* communitysettings intro featureicon */ fill: rgb(var(--accentcolor)); } @@ -1135,8 +1154,8 @@ html.oldBrand, html.newBrand { background: url(https://mwittrien.github.io/BetterDiscordAddons/Themes/_res/svgs/blurple/guildcreate_createown_bg.svg) center/contain no-repeat; } -.uploadIcon-2IFzZU [fill="#7289da" i], -.uploadIcon-2IFzZU [fill="#5865f2" i] { /* create guild upload icon */ +.uploadIcon-2IFzZU [fill="#5865f2" i], +.uploadIcon-2IFzZU [fill="#7289da" i] { /* create guild upload icon */ fill: rgb(var(--accentcolor)); } @@ -1937,13 +1956,16 @@ html.oldBrand, html.newBrand { border-color: rgb(var(--accentcolor)); } +.checkbox-1ix_J3.checked-3_4uQ9[style*="background-color: rgb(88, 101, 242)"], .checkbox-1ix_J3.checked-3_4uQ9[style*="background-color: rgb(114, 137, 218)"] { background-color: rgb(var(--accentcolor)) !important; } +.checkbox-1ix_J3.checked-3_4uQ9[style*="border-color: rgb(88, 101, 242)"], .checkbox-1ix_J3.checked-3_4uQ9[style*="border-color: rgb(114, 137, 218)"] { border-color: rgb(var(--accentcolor)) !important; } -.checkbox-1ix_J3.checked-3_4uQ9 path[fill="#7289da"] { +.checkbox-1ix_J3.checked-3_4uQ9 path[fill="#5865f2" i], +.checkbox-1ix_J3.checked-3_4uQ9 path[fill="#7289da" i] { border-color: rgb(var(--accentcolor)) !important; } @@ -1953,11 +1975,13 @@ html.oldBrand, html.newBrand { } /* switch checked */ .container-3auIfb[style*="background-color: rgb(67, 181, 129)"], .container-3auIfb[style*="background-color: rgb(59, 165, 92)"], +.container-3auIfb[style*="background-color: rgb(88, 101, 242)"], .container-3auIfb[style*="background-color: rgb(114, 137, 218)"] { background-color: rgba(var(--accentcolor), 0.8) !important; } .container-3auIfb[style*="background-color: rgb(67, 181, 129)"]:hover, .container-3auIfb[style*="background-color: rgb(59, 165, 92)"]:hover, +.container-3auIfb[style*="background-color: rgb(88, 101, 242)"]:hover, .container-3auIfb[style*="background-color: rgb(114, 137, 218)"]:hover { background: var(--accentcolor-hover) !important; } @@ -1969,6 +1993,7 @@ html.oldBrand, html.newBrand { } .container-3auIfb[style*="background-color: rgb(67, 181, 129)"] path[fill], .container-3auIfb[style*="background-color: rgb(59, 165, 92)"] path[fill], +.container-3auIfb[style*="background-color: rgb(88, 101, 242)"] path[fill], .container-3auIfb[style*="background-color: rgb(114, 137, 218)"] path[fill], .container-3auIfb:active path[fill] { fill: rgb(var(--accentcolor)) !important; @@ -2081,9 +2106,11 @@ html.oldBrand, html.newBrand { .colorBrand-2zeG8h .button-2DhvE9:hover { color: rgb(var(--accentcolor)); } +.notice-3bPHh-[style*="background-color: rgb(88, 101, 242)"], .notice-3bPHh-[style*="background-color: rgb(114, 137, 218)"] { background-color: rgb(var(--accentcolor)) !important; } +.notice-3bPHh-[style*="background-color: rgb(88, 101, 242)"] .button-2DhvE9:hover, .notice-3bPHh-[style*="background-color: rgb(114, 137, 218)"] .button-2DhvE9:hover { color: rgb(var(--accentcolor)) !important; } @@ -2133,9 +2160,11 @@ html.oldBrand, html.newBrand { .colorBrand-WfDfzD .bg-8df5St { background-color: rgb(var(--accentcolor)); } +.colorCustom-WKsPgT .bg-8df5St[style*="background-color: rgb(88, 101, 242)"], .colorCustom-WKsPgT .bg-8df5St[style*="background-color: rgb(114, 137, 218)"] { background-color: rgb(var(--accentcolor)) !important; } +.bar-95Sdw1.customBar-3RsUzs[style*="background-color: rgb(88, 101, 242)"], .bar-95Sdw1.customBar-3RsUzs[style*="background-color: rgb(114, 137, 218)"] { background-color: rgb(var(--accentcolor)) !important; } diff --git a/Themes/DiscordRecolor/DiscordRecolor.css b/Themes/DiscordRecolor/DiscordRecolor.css index 04247d14fc..1ec17d7b52 100644 --- a/Themes/DiscordRecolor/DiscordRecolor.css +++ b/Themes/DiscordRecolor/DiscordRecolor.css @@ -184,7 +184,7 @@ html { svg [style*="stroke: rgb(114, 118, 125)"], svg [style*="stroke: #72767d"], svg [style*="stroke: #72767D"], -svg [stroke="rgb(114, 137, 218)"], +svg [stroke="rgb(114, 118, 125)"], svg [stroke="#72767d"], svg [stroke="#72767D"] { stroke: var(--text-muted) !important; @@ -192,7 +192,7 @@ svg [stroke="#72767D"] { svg [style*="fill: rgb(114, 118, 125)"], svg [style*="fill: #72767d"], svg [style*="fill: #72767D"], -svg [fill="rgb(114, 137, 218)"], +svg [fill="rgb(114, 118, 125)"], svg [fill="#72767d"], svg [fill="#72767D"] { fill: var(--text-muted) !important; @@ -1327,6 +1327,10 @@ img[src='/assets/58957d928db6fb9d4658eb882f33d7bc.svg'] { background-color: var(--background-primary); } +#app-mount .scroller-2ZPeAD { + border: none; +} + #app-mount .sectionHeader-20RGqu { border-bottom: 1px solid rgba(0,0,0,.2); } @@ -2835,7 +2839,8 @@ img[src='/assets/58957d928db6fb9d4658eb882f33d7bc.svg'] { #app-mount .modal-DRZfgq .checked-3_4uQ9 { background-color: rgb(var(--accentcolor)); } -#app-mount .modal-DRZfgq .checkbox-1ix_J3 [stroke="#7289da"] { +#app-mount .modal-DRZfgq .checkbox-1ix_J3 [stroke="#5865f2" i], +#app-mount .modal-DRZfgq .checkbox-1ix_J3 [stroke="#7289da" i] { stroke: #fff !important; } #app-mount .ack-2yIUvY {