diff --git a/btfl.less b/btfl.less index dae4f71..1109488 100644 --- a/btfl.less +++ b/btfl.less @@ -10,4 +10,3 @@ @import "src/people"; @import "src/fixes"; @import "src/style"; -@import "src/ui"; diff --git a/src/dimmer.less b/src/dimmer.less index a594d25..610bedb 100644 --- a/src/dimmer.less +++ b/src/dimmer.less @@ -1,3 +1,8 @@ +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + .theme-dimmer { --header-primary: #dedede; --header-secondary: #cacaca; diff --git a/src/fixes.less b/src/fixes.less index 5b21eeb..ee983d3 100644 --- a/src/fixes.less +++ b/src/fixes.less @@ -1,3 +1,8 @@ +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + // fix guild selector at left part ul[data-list-id="guildsnav"] div[class^="scroller-"] { display: flex; diff --git a/src/hide.less b/src/hide.less index 2c7acfc..5c2e45c 100644 --- a/src/hide.less +++ b/src/hide.less @@ -1,3 +1,8 @@ +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + // Site [class*="perksContainer-"], [class^="DocSearch"], // Algolia, f you @@ -15,7 +20,7 @@ div[class*="templatesList-"] button[class^="container-"] ~ *, // templates are r // Nicks li[class^="messageListItem-"] [class*="cozyMessage-"] [class^="username-"], // in message -:not([class^="headerText-"]) > div[class*="nameTag-"] [class^="username-"], // outside message +div[class*="nameTag-"] [class^="username-"], // outside message [class^="discrimBase-"], div[class^="discordTag-"] [class^="username-"], // friends tab @@ -45,6 +50,7 @@ nav[class^="privateChannels-"] div div // Nitro tab at DM // Suggestions button[class*="followButton-"], // at top in channels [class^="nowPlaying"], // in friends tab +[class^="applicationInstall"], // at bot profile div[class^="threadSuggestionBar-"], // create thread because many replies div[class^="welcomeCTA-"], // wave to say hi on server div[role="separator"]:not([id$="new-messages-bar"]), // aren't needed @@ -74,6 +80,7 @@ nav[class^="nav-"], // breaks emoji panel, fixed at fixes.less // Search nav > [class^="searchBar-"], [role^="tab"] > [class^="searchBar-"], +div[class^="quickswitcher-"], // Ctrl-K div[class^="toolbar-3_"] > :nth-child(3) ~ *:not([class^="search-"]), // Sidebar @@ -88,7 +95,7 @@ h2[class^="privateChannelsHeaderContainer"], // direct messages label div[class^="channelTextArea-"] div div > div[class^="buttons-"] > button, // gift button, f you -main form div div > div[class^="channelTextArea-"] div div > div[class^="buttons-"] // block all except emoji (and send button, if exists) +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 @@ -103,7 +110,6 @@ 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/mobile.less b/src/mobile.less index 079e707..7228545 100644 --- a/src/mobile.less +++ b/src/mobile.less @@ -1,3 +1,8 @@ +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + // TODO: comment this @media screen and (max-device-width: 800px) { diff --git a/src/people.less b/src/people.less index c3618de..a174912 100644 --- a/src/people.less +++ b/src/people.less @@ -1,4 +1,9 @@ -[class^="membersWrap-"] { +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + +aside[class^="membersWrap-"] { // make it shorter &, div[class^="members-"] { min-width: 48px; diff --git a/src/profile.less b/src/profile.less index abbde1e..08d5d1c 100644 --- a/src/profile.less +++ b/src/profile.less @@ -1,3 +1,8 @@ +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + div[class^="accountProfileCard-"] div[class^="userInfo-"] { // settings justify-content: left; diff --git a/src/settings.less b/src/settings.less index e507c6f..29a98ab 100644 --- a/src/settings.less +++ b/src/settings.less @@ -1,3 +1,8 @@ +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + // New sidebar in settings div[class^="standardSidebarView-"] { flex-direction: column; @@ -54,26 +59,6 @@ div[aria-controls="stickers-tab"], display: none; } -.horiz-tab(@cols: 2) { - @gap: @div-width * 2; - @el-width: calc(100% / @cols - @gap); - display: flex; - flex-flow: row wrap; - 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]) { @@ -107,14 +92,15 @@ div[class^="baseLayout-"] { } #appearance-tab div[class^="children-"] { - .horiz-tab(); + flex-flow: row wrap; + column-gap: @div-width * 2; & > div:first-child { width: 100%; } div[class^="marginTop8-"], div[class^="marginTop20-"] { - width: @el-width; + width: calc(50% - @div-width); div[class^="divider-"] { display: none; } @@ -152,28 +138,7 @@ div[class^="accountProfileCard-"] { } button { top: -48pt; - left: 300pt; + left: 360pt; } } } - -#language-tab div[class^="children-"] { - div div > div[role="radiogroup"] { - .horiz-tab(3); - & > div { - width: @el-width; - } - } -} - -#streamer-mode-tab div[class^="children-"] { - .horiz-tab(); - & > * { - width: @el-width; - &:nth-child(1), - &:nth-child(2) - { width: 100%; } - &:nth-child(3) - { display: none; } - } -} diff --git a/src/style.less b/src/style.less index 052b006..4ed5ce5 100644 --- a/src/style.less +++ b/src/style.less @@ -1,3 +1,8 @@ +/** DisKort + * (c) Er2 2022 + * Zlib License + */ + @round: 8px; @rounder: 16px; @roundest: 24px; // text area @@ -22,15 +27,53 @@ // Input div[class^="searchBox-"], - [class*="input"], + div[class*="input"], input[class^="inputDefault-"], div[class*="TextArea"], - textarea, //[class*="Text"], [class*="text"], { border-radius: @round !important; } +// Acrylic material +div[class^="focusLock-"] > div, +div[class^="avatar-"], +{ + background: unset !important; + border-color: transparent; +} + +div[class^="emojiPicker-"], +#emoji-picker-tab-panel div[class*="header-"], +div[class^="focusLock-"] > div, +[role="dialog"]:not([class^="focusLock-"]), +[role="menu"] { + + &, & > *, div[class^="body"] { + background: unset; + } + + &::before, &::after { + border-radius: @rounder; + position: absolute; + top: 0; bottom: 0; + left: 0; right: 0; + content: ""; + z-index: -1; + } + + &::before { + //background-color: var(--background-floating); + //opacity: 0.75; + backdrop-filter: blur(@round) saturate(125%); + } + &::after { + background-color: var(--background-floating); + background-image: url(data:image/png;base64,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); + opacity: 0.5; + } +} + // Rounder // Popouts [class^="authBox"], // login @@ -43,17 +86,13 @@ // UI elements [class^="checkboxWrapper-"], // checkbox div[class^="markup-"] pre code, // ```code``` - span[class^="spoiler"], - span.mention, - code.inline, - [class^="item-"], // in settings + div[class^="item-"], // in settings div[class^="group-"], // radiogroup div[class*="card"], div[class^="categoryItem-"] > *, // in Discovery div[class^="content-"] img[class^="image-"], // UI parts - div[class^="noticeRegion"] > div, // you have unsaved changes bottom bar [class^="resultsGroup-"], // search div[class^="auditLog-"], div[class^="auditLog-"] > div, @@ -62,13 +101,11 @@ div[class^="profileBanner"], div[class^="accountProfile"], - div[class^="quickswitcher-"] input, - div[class^="autocomplete-"], // input div[class^="pictureInPicture-"], div[class^="select-"], - div[class^="messagesWrapper-"] div:not([class*="Inner"]):not([class^="filename"]), + div[class^="messagesWrapper-"] div, div[class^="layer-"] > div[class^="container-"], div[class^="base-"] div[class^="content-"] > div:nth-child(2), @@ -122,7 +159,7 @@ div[class^="auditLog"] { } div[class^="messagesWrapper-"] -div[class^="message-"][class*="mentioned"] +div[class*="mentioned"] { .left-border(4px); } // title @@ -248,7 +285,7 @@ div[class^="chat-"] } [class^="sidebar"] header, -[class^="chat"] > section:not([class^="chat"]), +[class^="chat"] > section, [class^="container-"] > section { background-color: var(--background-tertiary) !important; } @@ -266,62 +303,4 @@ div[class^="chat-"] } } -// Acrylic material -div[class^="channelTextArea-"], -div[class^="quickswitcher-"] div[class^="scroll"], -div[class^="focusLock-"] > div, -div[class^="avatar-"], -{ - background: unset !important; - border-color: transparent; - 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^="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: inherit; - position: absolute; - top: 0; bottom: 0; - left: 0; right: 0; - content: ""; - z-index: -1; - } - - &::before { - backdrop-filter: blur(var(--acrylic-blur)) saturate(125%); - } - &::after { - background-color: var(--acrylic-color); - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAAUVBMVEWFhYWDg4N3d3dtbW17e3t1dXWBgYGHh4d5eXlzc3OLi4ubm5uVlZWPj4+NjY19fX2JiYl/f39ra2uRkZGZmZlpaWmXl5dvb29xcXGTk5NnZ2c8TV1mAAAAG3RSTlNAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEAvEOwtAAAFVklEQVR4XpWWB67c2BUFb3g557T/hRo9/WUMZHlgr4Bg8Z4qQgQJlHI4A8SzFVrapvmTF9O7dmYRFZ60YiBhJRCgh1FYhiLAmdvX0CzTOpNE77ME0Zty/nWWzchDtiqrmQDeuv3powQ5ta2eN0FY0InkqDD73lT9c9lEzwUNqgFHs9VQce3TVClFCQrSTfOiYkVJQBmpbq2L6iZavPnAPcoU0dSw0SUTqz/GtrGuXfbyyBniKykOWQWGqwwMA7QiYAxi+IlPdqo+hYHnUt5ZPfnsHJyNiDtnpJyayNBkF6cWoYGAMY92U2hXHF/C1M8uP/ZtYdiuj26UdAdQQSXQErwSOMzt/XWRWAz5GuSBIkwG1H3FabJ2OsUOUhGC6tK4EMtJO0ttC6IBD3kM0ve0tJwMdSfjZo+EEISaeTr9P3wYrGjXqyC1krcKdhMpxEnt5JetoulscpyzhXN5FRpuPHvbeQaKxFAEB6EN+cYN6xD7RYGpXpNndMmZgM5Dcs3YSNFDHUo2LGfZuukSWyUYirJAdYbF3MfqEKmjM+I2EfhA94iG3L7uKrR+GdWD73ydlIB+6hgref1QTlmgmbM3/LeX5GI1Ux1RWpgxpLuZ2+I+IjzZ8wqE4nilvQdkUdfhzI5QDWy+kw5Wgg2pGpeEVeCCA7b85BO3F9DzxB3cdqvBzWcmzbyMiqhzuYqtHRVG2y4x+KOlnyqla8AoWWpuBoYRxzXrfKuILl6SfiWCbjxoZJUaCBj1CjH7GIaDbc9kqBY3W/Rgjda1iqQcOJu2WW+76pZC9QG7M00dffe9hNnseupFL53r8F7YHSwJWUKP2q+k7RdsxyOB11n0xtOvnW4irMMFNV4H0uqwS5ExsmP9AxbDTc9JwgneAT5vTiUSm1E7BSflSt3bfa1tv8Di3R8n3Af7MNWzs49hmauE2wP+ttrq+AsWpFG2awvsuOqbipWHgtuvuaAE+A1Z/7gC9hesnr+7wqCwG8c5yAg3AL1fm8T9AZtp/bbJGwl1pNrE7RuOX7PeMRUERVaPpEs+yqeoSmuOlokqw49pgomjLeh7icHNlG19yjs6XXOMedYm5xH2YxpV2tc0Ro2jJfxC50ApuxGob7lMsxfTbeUv07TyYxpeLucEH1gNd4IKH2LAg5TdVhlCafZvpskfncCfx8pOhJzd76bJWeYFnFciwcYfubRc12Ip/ppIhA1/mSZ/RxjFDrJC5xifFjJpY2Xl5zXdguFqYyTR1zSp1Y9p+tktDYYSNflcxI0iyO4TPBdlRcpeqjK/piF5bklq77VSEaA+z8qmJTFzIWiitbnzR794USKBUaT0NTEsVjZqLaFVqJoPN9ODG70IPbfBHKK+/q/AWR0tJzYHRULOa4MP+W/HfGadZUbfw177G7j/OGbIs8TahLyynl4X4RinF793Oz+BU0saXtUHrVBFT/DnA3ctNPoGbs4hRIjTok8i+algT1lTHi4SxFvONKNrgQFAq2/gFnWMXgwffgYMJpiKYkmW3tTg3ZQ9Jq+f8XN+A5eeUKHWvJWJ2sgJ1Sop+wwhqFVijqWaJhwtD8MNlSBeWNNWTa5Z5kPZw5+LbVT99wqTdx29lMUH4OIG/D86ruKEauBjvH5xy6um/Sfj7ei6UUVk4AIl3MyD4MSSTOFgSwsH/QJWaQ5as7ZcmgBZkzjjU1UrQ74ci1gWBCSGHtuV1H2mhSnO3Wp/3fEV5a+4wz//6qy8JxjZsmxxy5+4w9CDNJY09T072iKG0EnOS0arEYgXqYnXcYHwjTtUNAcMelOd4xpkoqiTYICWFq0JSiPfPDQdnt+4/wuqcXY47QILbgAAAABJRU5ErkJggg==); - opacity: var(--acrylic-opacity); - } -} - @import "settings"; diff --git a/src/ui.less b/src/ui.less deleted file mode 100644 index 3d64bc6..0000000 --- a/src/ui.less +++ /dev/null @@ -1,15 +0,0 @@ -// UI element changes - -div[class^="slider-"] { - div[class^="track-"] { - div[class^="grabber-"] { - @half: (@rounder / 2); - width: @rounder; - height: @rounder; - border: none; - border-radius: @half; - margin-top: -@half; - margin-left: -@half; - } - } -}