From 63d7096d0db41f35719ed005373ea3561c3bd41f Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Wed, 18 Aug 2021 17:17:30 +0200 Subject: [PATCH] themes --- Library/_res/0BDFDB.data.json | 1 - Library/_res/0BDFDB.raw.css | 4 +- .../SpotifyControls/SpotifyControls.plugin.js | 12 ++--- Themes/BasicBackground/BasicBackground.css | 4 -- Themes/BlurpleRecolor/BlurpleRecolor.css | 33 ------------- Themes/DiscordRecolor/DiscordRecolor.css | 46 ------------------- 6 files changed, 8 insertions(+), 92 deletions(-) diff --git a/Library/_res/0BDFDB.data.json b/Library/_res/0BDFDB.data.json index 678442a51a..694a813db7 100644 --- a/Library/_res/0BDFDB.data.json +++ b/Library/_res/0BDFDB.data.json @@ -227,7 +227,6 @@ "Note": {"class": "usernotetextarea"}, "PeoplePageList": {"strings": ["FriendsSections", "emptyStateContainer"]}, "PopoutContainer": {"class": "popout"}, - "Popouts": {"class": "popouts"}, "PrivateChannelCall": {"class": "callcurrentcontainer"}, "PrivateChannelCallParticipants": {"class": "callcurrentcontainer"}, "PrivateChannelRecipientsInvitePopout": {"class": "searchpopoutdmaddpopout"}, diff --git a/Library/_res/0BDFDB.raw.css b/Library/_res/0BDFDB.raw.css index 80defc211d..c53b362fe0 100644 --- a/Library/_res/0BDFDB.raw.css +++ b/Library/_res/0BDFDB.raw.css @@ -10,8 +10,8 @@ img:not([src]), img[src=""], img[src="null"] { opacity: 0; } -[REPLACE_CLASS_appmount] > [REPLACE_CLASS_itemlayercontainer], -[REPLACE_CLASS_appmount] > [REPLACE_CLASS_popouts] { + +[REPLACE_CLASS_appmount] > [REPLACE_CLASS_itemlayercontainer] { position: fixed; z-index: 1001; } diff --git a/Plugins/SpotifyControls/SpotifyControls.plugin.js b/Plugins/SpotifyControls/SpotifyControls.plugin.js index b2c94b56e6..ed516bdecb 100644 --- a/Plugins/SpotifyControls/SpotifyControls.plugin.js +++ b/Plugins/SpotifyControls/SpotifyControls.plugin.js @@ -2,7 +2,7 @@ * @name SpotifyControls * @author DevilBro * @authorId 278543574059057154 - * @version 1.2.0 + * @version 1.2.1 * @description Adds a Control Panel while listening to Spotify on a connected Account * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -17,12 +17,12 @@ module.exports = (_ => { "info": { "name": "SpotifyControls", "author": "DevilBro", - "version": "1.2.0", + "version": "1.2.1", "description": "Adds a Control Panel while listening to Spotify on a connected Account" }, "changeLog": { - "improved": { - "CSS Variable": "Added CSS variable for the spotify green" + "fixed": { + "Show Activity": "Show Activity Button has correct state on start up" } } }; @@ -146,7 +146,8 @@ module.exports = (_ => { let playerSize = this.props.maximized ? "big" : "small"; let coverSrc = BDFDB.LibraryModules.AssetUtils.getAssetImage(lastSong.application_id, lastSong.assets.large_image); - showActivity = showActivity != undefined ? showActivity : (BDFDB.LibraryModules.ConnectionStore.getAccounts().find(n => n.type == "spotify") || {}).show_activity; + let connection = (BDFDB.LibraryModules.ConnectionStore.getAccounts().find(n => n.type == "spotify") || {}); + showActivity = showActivity != undefined ? showActivity : (connection.show_activity || connection.showActivity); currentVolume = this.props.draggingVolume ? currentVolume : socketDevice.device.volume_percent; return BDFDB.ReactUtils.createElement("div", { className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN._spotifycontrolscontainer, this.props.maximized && BDFDB.disCN._spotifycontrolscontainermaximized, this.props.timeline && BDFDB.disCN._spotifycontrolscontainerwithtimeline), @@ -384,7 +385,6 @@ module.exports = (_ => { position: BDFDB.LibraryComponents.PopoutContainer.Positions.TOP, align: BDFDB.LibraryComponents.PopoutContainer.Align.CENTER, arrow: true, - shadow: true, renderPopout: this.props.renderPopout }) : button; } diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css index 188ee4fee6..34b6e938ce 100644 --- a/Themes/BasicBackground/BasicBackground.css +++ b/Themes/BasicBackground/BasicBackground.css @@ -4144,10 +4144,6 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr z-index: 1010; } -#app-mount .popout-2iWAc-:not(.noShadow-3pu20z) { - box-shadow: 0 0 1px rgba(var(--transparencycolor), .2), 0 1px 4px rgba(var(--transparencycolor), .1); -} - #app-mount .loadingPopout-qYljDW, /* loading popout */ #app-mount .container-7uh5fX, /* browser popout */ #app-mount .themedPopout-1TrfdI { /* themed popout */ diff --git a/Themes/BlurpleRecolor/BlurpleRecolor.css b/Themes/BlurpleRecolor/BlurpleRecolor.css index 5e389ebe01..b34e6cc3ef 100644 --- a/Themes/BlurpleRecolor/BlurpleRecolor.css +++ b/Themes/BlurpleRecolor/BlurpleRecolor.css @@ -1756,39 +1756,6 @@ a.metadataName-14STf- { /* ~~~~ 11. POPOUTS ~~~~ */ -.popoutLeft-3aViER.arrowAlignmentTop-1yftWI::before { - border-left-color: #rgb(var(--accentcolor)); -} -.popoutRight-1veHKi.arrowAlignmentTop-1yftWI::before { - border-right-color: #rgb(var(--accentcolor)); -} -.popoutBottom-2GAFPg.arrowAlignmentMiddle-NBGtsX::before, -.popoutBottom-2GAFPg.arrowAlignmentTop-1yftWI::before, -.popoutBottomLeft-1pG8B4.arrowAlignmentMiddle-NBGtsX::before, -.popoutBottomLeft-1pG8B4.arrowAlignmentTop-1yftWI::before, -.popoutBottomRight-2Rno5S.arrowAlignmentMiddle-NBGtsX::before, -.popoutBottomRight-2Rno5S.arrowAlignmentTop-1yftWI::before, -.theme-light.popoutBottom-2GAFPg.arrowAlignmentMiddle-NBGtsX::before, -.theme-light.popoutBottom-2GAFPg.arrowAlignmentTop-1yftWI::before, -.theme-light.popoutBottomLeft-1pG8B4.arrowAlignmentMiddle-NBGtsX::before, -.theme-light.popoutBottomLeft-1pG8B4.arrowAlignmentTop-1yftWI::before, -.theme-light.popoutBottomRight-2Rno5S.arrowAlignmentMiddle-NBGtsX::before, -.theme-light.popoutBottomRight-2Rno5S.arrowAlignmentTop-1yftWI::before { - border-bottom-color: #rgb(var(--accentcolor)); -} -.popoutInvert-3TZnzz:not(.popoutBottom-2GAFPg).popoutTop-3WSJtH.arrowAlignmentMiddle-NBGtsX::before, -.popoutInvert-3TZnzz:not(.popoutBottom-2GAFPg).popoutTop-3WSJtH.arrowAlignmentTop-1yftWI::before, -.popoutInvert-3TZnzz:not(.popoutBottom-2GAFPg).popoutTopRight-1lc8Mq.arrowAlignmentMiddle-NBGtsX::before, -.popoutInvert-3TZnzz:not(.popoutBottom-2GAFPg).popoutTopRight-1lc8Mq.arrowAlignmentTop-1yftWI::before { - border-top-color: #rgb(var(--accentcolor)); -} -.theme-light.contentNarrowMedia-W7SHxH.topArrow-1B63md::before, -.theme-light .contentNarrowNoMedia-Il01H1.topArrow-1B63md::before, -.theme-light.contentWideNoMedia-22TIu6.topArrow-1B63md::before, -.theme-light .contentWideNoMedia-22TIu6.topArrow-1B63md::before { - border-bottom-color: #rgb(var(--accentcolor)); -} - .selectedBrand-1UKrSX { /* popout combobox selected brand */ background-color: rgb(var(--accentcolor)); } diff --git a/Themes/DiscordRecolor/DiscordRecolor.css b/Themes/DiscordRecolor/DiscordRecolor.css index 056e15b204..99bf0ad638 100644 --- a/Themes/DiscordRecolor/DiscordRecolor.css +++ b/Themes/DiscordRecolor/DiscordRecolor.css @@ -3113,52 +3113,6 @@ img[src='/assets/58957d928db6fb9d4658eb882f33d7bc.svg'] { /* ~~~~ 11. POPOUTS ~~~~ */ -#app-mount .popout-2iWAc- { - box-shadow: 0 0 1px rgba(0,0,0,.82), 0 1px 4px rgba(0,0,0,.1); -} -#app-mount .popoutRight-1veHKi.arrowAlignmentMiddle-NBGtsX::before { - border-right-color: var(--background-floating) !important; -} -#app-mount .popoutLeft-3aViER.arrowAlignmentMiddle-NBGtsX::before { - border-left-color: var(--background-floating) !important; -} -#app-mount .popoutBottom-2GAFPg.arrowAlignmentMiddle-NBGtsX::before, -#app-mount .popoutBottom-2GAFPg.arrowAlignmentTop-1yftWI::before, -#app-mount .popoutBottomLeft-1pG8B4.arrowAlignmentMiddle-NBGtsX::before, -#app-mount .popoutBottomLeft-1pG8B4.arrowAlignmentTop-1yftWI::before, -#app-mount .popoutBottomRight-2Rno5S.arrowAlignmentMiddle-NBGtsX::before, -#app-mount .popoutBottomRight-2Rno5S.arrowAlignmentTop-1yftWI::before { - border-bottom-color: var(--background-floating) !important; -} -#app-mount .popoutTop-3WSJtH::before, -#app-mount .popoutTopLeft-3B0mFf::before, -#app-mount .popoutTopRight-1lc8Mq::before { - border-top-color: rgba(0,0,0,.1) !important; -} -#app-mount .popoutTop-3WSJtH::after, -#app-mount .popoutTopLeft-3B0mFf::after, -#app-mount .popoutTopRight-1lc8Mq::after { - border-top-color: var(--background-floating) !important; -} -#app-mount .popout-xwjvsX.popoutRight-1veHKi.arrowAlignmentMiddle-NBGtsX:before { - border-right-color: var(--background-secondary) !important; -} -#app-mount .popout-xwjvsX.popoutLeft-3aViER.arrowAlignmentMiddle-NBGtsX:before { - border-left-color: var(--background-secondary) !important; -} -#app-mount .popout-xwjvsX.popoutBottom-2GAFPg.arrowAlignmentMiddle-NBGtsX:before, -#app-mount .popout-xwjvsX.popoutBottom-2GAFPg.arrowAlignmentTop-1yftWI:before, -#app-mount .popout-xwjvsX.popoutBottomLeft-1pG8B4.arrowAlignmentMiddle-NBGtsX:before, -#app-mount .popout-xwjvsX.popoutBottomLeft-1pG8B4.arrowAlignmentTop-1yftWI:before, -#app-mount .popout-xwjvsX.popoutBottomRight-2Rno5S.arrowAlignmentMiddle-NBGtsX:before, -#app-mount .popout-xwjvsX.popoutBottomRight-2Rno5S.arrowAlignmentTop-1yftWI:before { - border-bottom-color: var(--background-secondary) !important; -} -#app-mount .popout-xwjvsX.popoutTop-3WSJtH:after, -#app-mount .popout-xwjvsX.popoutTopLeft-3B0mFf:after, -#app-mount .popout-xwjvsX.popoutTopRight-1lc8Mq:after { - border-top-color: var(--background-secondary) !important; -} #app-mount .content-1nP7fx { background-color: var(--background-floating) !important; }