From 849686181672c9c5e030a878b7569946a27a273e Mon Sep 17 00:00:00 2001 From: Er2 Date: Mon, 11 Apr 2022 19:29:17 +0300 Subject: [PATCH] modular anti-nitro --- btfl.less | 3 ++ src/dimmer.less | 2 +- src/hide.less | 21 ----------- src/nitro.less | 35 +++++++++++++++++++ src/profile.less | 89 +++++++++++++++++++++++++++++++---------------- src/settings.less | 38 +++++++------------- src/ui.less | 7 ++-- 7 files changed, 115 insertions(+), 80 deletions(-) create mode 100644 src/nitro.less diff --git a/btfl.less b/btfl.less index fd3a2a0..f6d36f7 100644 --- a/btfl.less +++ b/btfl.less @@ -3,6 +3,8 @@ * Zlib License */ +@no-nitro: false; // DO NOT CHANGE! Comment src/nitro to disable anti-nitro + @round: 8px; @rounder: 16px; @roundest: 24px; // text area @@ -17,6 +19,7 @@ // Optional @import "src/hide"; @import "src/mobile"; +@import "src/nitro"; // Style @import "src/materials"; diff --git a/src/dimmer.less b/src/dimmer.less index a594d25..9721da8 100644 --- a/src/dimmer.less +++ b/src/dimmer.less @@ -26,7 +26,7 @@ div[class^="layer-"] div.theme-light, div[class^="downloadApps-"] { - .theme-dimmer(); + &:extend(.theme-dimmer all); div[class*="root-"] { background-color: var(--background-secondary); diff --git a/src/hide.less b/src/hide.less index a32abdf..c91986d 100644 --- a/src/hide.less +++ b/src/hide.less @@ -32,27 +32,6 @@ div[class^="nameTag-"], [class^="usernameInnerRow-"], // at settings { &:extend(.hide); } -// Nitro -[class^="marketing"], -[class*="tier"], -[class*="perks-"], -[class*="nitro"], -[class^="upsell"], -[class^="availabilityIndicator-"], -div[class^="serverBoostTabItem-"], -div[class*="hero"], -div[class*="premium"], -div[id*="premium"], -div[class*="goal"], -button[class^="shinyButton"], -[class*="giftButton"], -span[class^="questionMark-"], // at tag change -div[class^="characterCount-"] div[class^="root-"], // at many characters -[class^="clickableSticker-"], // stickers -nav[class^="privateChannels-"] div div // Nitro tab at DM - [data-list-item-id$="nitro"], -{ &:extend(.hide); } - // Suggestions button[class*="followButton-"], // at top in channels [class^="nowPlaying"], // in friends tab diff --git a/src/nitro.less b/src/nitro.less new file mode 100644 index 0000000..1836f5e --- /dev/null +++ b/src/nitro.less @@ -0,0 +1,35 @@ + +@no-nitro: true; +.nitro { &:extend(.hide); } + +[class^="marketing"], +[class*="tier"], +[class*="perks-"], +[class*="nitro"], +[class^="upsell"], +[class^="availabilityIndicator-"], +div[class^="serverBoostTabItem-"], +div[class*="hero"], +div[class*="premium"], +div[id*="premium"], +div[class*="goal"], +button[class^="shinyButton"], +[class*="giftButton"], +span[class^="questionMark-"], // at tag change +div[class^="characterCount-"] div[class^="root-"], // at many characters +[class^="clickableSticker-"], // stickers +nav[class^="privateChannels-"] div div // Nitro tab at DM + [data-list-item-id$="nitro"], +{ &:extend(.nitro); } + +#channels > ul { + div[class^="container-"] { + // boosts + &:extend(.nitro); + + // space + & + li { + padding-top: 0; + } + } +} diff --git a/src/profile.less b/src/profile.less index 45d5d7a..1dd59e4 100644 --- a/src/profile.less +++ b/src/profile.less @@ -1,11 +1,4 @@ -[class^="botTagVerified-"], -[class^="bannerContainer-"], -[class*="banner-"], -[class^="badgeList-"], -[class^="profileBadges-"], -{ &:extend(.hide); } - div[class^="accountProfileCard-"] div[class^="userInfo-"] { // settings justify-content: left; @@ -25,43 +18,79 @@ div[class^="accountProfileCard-"] div[class^="userInfo-"] { } } -div[class^="listItemContents-"] div[class^="userInfo"] { - padding-top: 0; - div[class^="avatar-"] { - top: 0; +.profile() when (@no-nitro = true) { + [class^="botTagVerified-"], + [class^="bannerContainer-"], + [class*="banner-"], + [class^="badgeList-"], + [class^="profileBadges-"], + { &:extend(.nitro); } + + div[class^="listItemContents-"] div[class^="userInfo"] { + padding-top: 0; + div[class^="avatar-"] { + top: 0; + } + } + + div[class^="userPopout-"], + div[class^="profileBannerPreview-"] { + div[class^="avatarWrapper"] { + top: 8px; // fix divider bug + } + + div[class^="headerTop-"] { + padding-top: 72px; // also fix divider bug + div[class^="headerText"] { + margin-left: 96px; // fix nickname + } + } + } + + div[class^="profileBanner"] div[class*="avatar"]:not([class^="imageUploaderInner"]) { + margin-left: -8px; + margin-top: -8px; + } +} +.profile(); + +// Profile card in settings +div[class^="accountProfileCard-"] { + div[class^="field-"]:nth-child(1) { + height: 0; + div[class^="constrainedRow-"] { + display: none; + } + button { + top: -48pt; + left: 300pt; + } } } -div[class^="userPopout-"] { - div[class^="avatarWrapper"] { - top: 8px; // fix divider bug +div[class^="banner-"] { + position: absolute; + width: inherit; + max-height: 84px; + &:extend(.rounder); + &[class*="popoutBanner"] { + position: relative; + max-height: 128px; + .bottom-border(); } - - div[class^="headerTop-"] { - padding-top: 72px; // also fix divider bug - } -} - -div[class^="profileBanner"] div[class*="avatar"]:not([class^="imageUploaderInner"]) { - margin-left: -8px; - margin-top: -8px; -} - -div[class^="headerTop-"] div[class^="headerText"] { - margin-left: 96px; // fix nickname } div[class^="avatarWrapper-"] { - margin-right: auto; // fix aligment (bottom of sidebar) + margin-right: auto; // make some space after avatar (sidebar at bottom) } +// Redesigned profile page header div[class^="nameTagWithCustomStatus-"], header div[class^="nameTagNoCustomStatus-"] { margin-bottom: 48px; // some space under avatar margin-left: 160px; // after avatar, not before } -// Redesigned profile page div[class^="focusLock-"]:not([aria-labelledby]) > div[class^="root-"][class*="small-"] { flex-direction: row; @@ -110,7 +139,7 @@ div[class^="focusLock-"]:not([aria-labelledby]) > div[class^="root-"][class*="sm margin-right: 0; border-bottom: unset; &:hover, &[class*="selected-"] { - border-right: 2px solid var(--interactive-active); + border-right: 2px solid var(--interactive-active) !important; } .top-border(); .left-border(@round); diff --git a/src/settings.less b/src/settings.less index c6c8076..8c98c97 100644 --- a/src/settings.less +++ b/src/settings.less @@ -51,15 +51,14 @@ div[aria-controls*="nitro"], div[aria-controls="library-inventory-tab"], div[aria-controls="subscriptions-tab"], div[aria-controls="billing-tab"], +div[aria-controls^="hypesquad"], +div[aria-controls="stickers-tab"], +{ &:extend(.nitro); } + div[aria-controls="keybinds-tab"], div[aria-controls="game-activity-tab"], -div[aria-controls^="hypesquad"], - -div[aria-controls="stickers-tab"], - div[aria-controls="analytics-tab"], div[aria-controls="partner-tab"], - { &:extend(.hide); } .horiz-tab(@cols: 2) { @@ -92,7 +91,7 @@ div[class^="baseLayout-"] { div[class^="customizationSection-"] { &:nth-child(2), &:nth-child(3) { - display: none; + &:extend(.nitro); } } } @@ -131,7 +130,7 @@ div[class^="baseLayout-"] { &:nth-child(3), &:nth-child(6), &:nth-child(7) - { display: none; } + { &:extend(.hide); } &:nth-child(4) { margin-top: @div-width * 2; @@ -141,20 +140,7 @@ div[class^="baseLayout-"] { #notifications-tab div[class^="children"] { div:nth-child(6) - { display: none; } -} - -div[class^="accountProfileCard-"] { - div[class^="field-"]:nth-child(1) { - height: 0; - div[class^="constrainedRow-"] { - display: none; - } - button { - top: -48pt; - left: 300pt; - } - } + { &:extend(.hide); } } #language-tab div[class^="children-"] { @@ -176,6 +162,7 @@ div[class^="accountProfileCard-"] { // Server settings #overview-tab div[class^="children-"] > div { + // system messages &:nth-child(3) { .horiz-tab(); @@ -183,14 +170,16 @@ div[class^="accountProfileCard-"] { & > :nth-child(2) { width: 100%; } - & > :nth-child(3) + & > :nth-child(3) // description { display: none; } } + // notification settings &:nth-child(4) > div > div:last-child { .horiz-tab(); } + // nitro features &:nth-child(5) > div > div:last-child { .horiz-tab(3); & > * { @@ -198,9 +187,8 @@ div[class^="accountProfileCard-"] { margin: 0; border: none; } - & > div:first-child div[class^="flexChild-"] { - display: none; - } + & > div:first-child div[class^="flexChild-"] + { display: none; } } } diff --git a/src/ui.less b/src/ui.less index 4073b94..e68ef06 100644 --- a/src/ui.less +++ b/src/ui.less @@ -24,9 +24,10 @@ div[class^="tabBarItem-"] { margin-right: 16px; padding: 4px 8px; - &:hover { - background-color: var(--interactive-hover); - color: var(--text-muted) !important; + &:hover, + &[class*="selected-"] { + background-color: var(--interactive-muted) !important; + color: var(--text-normal) !important; } }