From d62d991e87ebad7294025b32669e79348ce059fa Mon Sep 17 00:00:00 2001 From: Er2 Date: Sat, 9 Apr 2022 19:57:07 +0300 Subject: [PATCH] bugfixes --- src/hide.less | 3 ++- src/people.less | 2 +- src/settings.less | 26 ++++++++++++++++++++++---- src/style.less | 36 +++++++++++++++++++++++++++--------- 4 files changed, 52 insertions(+), 15 deletions(-) diff --git a/src/hide.less b/src/hide.less index eb6b98f..f581245 100644 --- a/src/hide.less +++ b/src/hide.less @@ -93,7 +93,7 @@ h2[class^="privateChannelsHeaderContainer"], // direct messages label div[class^="channelTextArea-"] div div > div[class^="buttons-"] > button, // gift button, f you -div[class^="channelTextArea-"] div div > div[class^="buttons-"] // block all except emoji (and send button, if exists) +main form div div > div[class^="channelTextArea-"] div div > div[class^="buttons-"] // block all except emoji (and send button, if exists) > div.expression-picker-chat-input-button:not(:nth-child(4)), div[class^="channelTextArea-"] > div[class^="scrollableContainer-"] // divider breaks redesigned text area @@ -108,6 +108,7 @@ section div[class^="children-"] div[class^="spacer-"], // to check div[class^="base-"] div[class^="children-"] div[class^="divider-"] ~ div:not([class^="tabBar-"]), div[class^="base-"] div[class^="children-"] div[class^="divider-"], div[class^="children-"]::after, // shadow at title +form::before, // message input shadow { all: unset !important; display: none !important; diff --git a/src/people.less b/src/people.less index a174912..1eea0ec 100644 --- a/src/people.less +++ b/src/people.less @@ -3,7 +3,7 @@ * Zlib License */ -aside[class^="membersWrap-"] { +[class^="membersWrap-"] { // make it shorter &, div[class^="members-"] { min-width: 48px; diff --git a/src/settings.less b/src/settings.less index 29a98ab..3ad04be 100644 --- a/src/settings.less +++ b/src/settings.less @@ -59,6 +59,25 @@ div[aria-controls="stickers-tab"], display: none; } +.horiz-tab() { + display: flex; + flex-flow: row wrap; + @gap: @div-width * 2; + column-gap: @gap; +} + +#my-account-tab > div { + .horiz-tab(); + div[class^="divider"] + { display: none; } + & > div:first-child { + width: 50%; + } + & > div:nth-child(3) { + width: calc(50% - @gap); + } +} + #profile-customization-tab div[class^="children"] div[class^="baseLayout-"] { & > div:not([class]) { @@ -92,15 +111,14 @@ div[class^="baseLayout-"] { } #appearance-tab div[class^="children-"] { - flex-flow: row wrap; - column-gap: @div-width * 2; + .horiz-tab(); & > div:first-child { width: 100%; } div[class^="marginTop8-"], div[class^="marginTop20-"] { - width: calc(50% - @div-width); + width: calc(50% - @gap); div[class^="divider-"] { display: none; } @@ -138,7 +156,7 @@ div[class^="accountProfileCard-"] { } button { top: -48pt; - left: 360pt; + left: 300pt; } } } diff --git a/src/style.less b/src/style.less index 507adc9..82b864b 100644 --- a/src/style.less +++ b/src/style.less @@ -253,7 +253,7 @@ div[class^="chat-"] } [class^="sidebar"] header, -[class^="chat"] > section, +[class^="chat"] > section:not([class^="chat"]), [class^="container-"] > section { background-color: var(--background-tertiary) !important; } @@ -272,6 +272,7 @@ div[class^="chat-"] } // Acrylic material +div[class^="channelTextArea-"], div[class^="quickswitcher-"] div[class^="scroll"], div[class^="focusLock-"] > div, div[class^="avatar-"], @@ -281,19 +282,38 @@ div[class^="avatar-"], scrollbar-color: var(--scrollbar-auto-scrollbar-color-track) transparent; } +div[class^="layers-"] { + & > div[class*="baseLayer"] { + opacity: 1 !important; + } + + & > div[class^="layer"]:not([class*="baseLayer"]) { + & > div[class] { + --acrylic-color: var(--background-primary); + } + &, & > div[class], div[class*="scroller"] { + background: unset; + } + } +} + +div[class^="layers-"] > div[class^="layer-"] > div[class], div[class^="channelHeader-"], -div[class^="emojiPicker-"], -#emoji-picker-tab-panel div[class*="header-"], +//div[class^="emojiPicker-"], +//#emoji-picker-tab-panel div[class*="header-"], div[class^="focusLock-"] > div, [role="dialog"]:not([class^="focusLock-"]), [role="menu"] { + --acrylic-blur: @round; + --acrylic-color: var(--background-floating); + --acrylic-opacity: 0.5; &, & > *, div[class^="body"] { background: unset; } &::before, &::after { - border-radius: @rounder; + border-radius: inherit; position: absolute; top: 0; bottom: 0; left: 0; right: 0; @@ -302,14 +322,12 @@ div[class^="focusLock-"] > div, } &::before { - //background-color: var(--background-floating); - //opacity: 0.75; - backdrop-filter: blur(@round) saturate(125%); + backdrop-filter: blur(var(--acrylic-blur)) saturate(125%); } &::after { - background-color: var(--background-floating); + background-color: var(--acrylic-color); background-image: url(data:image/png;base64,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); - opacity: 0.5; + opacity: var(--acrylic-opacity); } }