From 6617e086e66fb69c7e760f0d3a2c3d3ffd2a83ba Mon Sep 17 00:00:00 2001 From: Leozard Date: Mon, 4 Sep 2023 22:12:15 +0800 Subject: [PATCH] more fixes --- lib/selectors/selectorPlaceholders.scss | 12 +++- main.scss | 2 +- src/pages/appDirectory.scss | 81 +++++++++++++++++++++++++ src/pages/serverProfile.scss | 9 --- src/settings/channelSettings.scss | 12 ++++ src/settings/serverSettings.scss | 76 +---------------------- 6 files changed, 104 insertions(+), 88 deletions(-) create mode 100644 src/pages/appDirectory.scss delete mode 100644 src/pages/serverProfile.scss diff --git a/lib/selectors/selectorPlaceholders.scss b/lib/selectors/selectorPlaceholders.scss index 58d80d288..0b3dd62ae 100644 --- a/lib/selectors/selectorPlaceholders.scss +++ b/lib/selectors/selectorPlaceholders.scss @@ -4490,6 +4490,9 @@ pre { .text-sm-medium-2-Xzsi { @extend %textSmallMedium !optional; } +.text-md-normal-2rFCH3 { + @extend %textMediumNormal !optional; +} .directoryContainer-z-0pgp { @extend %directoryContainer !optional; } @@ -4512,7 +4515,10 @@ pre { @extend %directorySearchBar !optional; } .category-qFAw-K.activeCategory-1iqXig { - @extend %directorySearchCategory !optional; + @extend %directorySearchCategoryActive !optional; +} +.category-3LanTP { + @extend %directoryAppCategory !optional; } .card-sX105p { @extend %directoryAppSupportServer !optional; @@ -4524,9 +4530,9 @@ pre { @extend %directoryAppCommand !optional; } .cardHeader-3tWAak { - @extend %directoryPremiumCardHeader !optional; + @extend %directoryAppPremiumCardHeader !optional; } -.priceAndButtonContainer-2g2UBN { +.benefitsContainer-xSjsOP { @extend %directoryAppPremiumContainer !optional; } .list-3ykg7W { diff --git a/main.scss b/main.scss index 82113e944..c8e12de6b 100644 --- a/main.scss +++ b/main.scss @@ -105,11 +105,11 @@ $version: '6.3.0'; @import 'src/modals/userModal'; // PAGES +@import 'src/pages/appDirectory'; @import 'src/pages/discover'; @import 'src/pages/forums'; @import 'src/pages/previewServer'; @import 'src/pages/serverBoost'; -@import 'src/pages/serverProfile'; @import 'src/pages/studentHub.scss'; // POPOUTS diff --git a/src/pages/appDirectory.scss b/src/pages/appDirectory.scss new file mode 100644 index 000000000..34c1a7fe0 --- /dev/null +++ b/src/pages/appDirectory.scss @@ -0,0 +1,81 @@ +/* APP DIRECTORY */ +%themeDark %directoryContainer { + background: transparent; + &:before { + content: ''; + @include stretch; + position: fixed; + z-index: -1; + background: cv('bg.app.img') cv('bg.app.pos') / cv('bg.app.size') cv('bg.app.repeat') cv('bg.app.attach'); + @include filters(cv('bg.app')); + } +} + +// HOME PAGE +%directoryCategory { + background: rgba(0,0,0,.4); + &:hover { + background: $hover-color; + } +} +%directoryCard { + background: rgba(0,0,0,.4); +} +%directoryListCard { + background: rgba(0,0,0,.4); + &%directoryCardClickable:hover { + background-color: hsla(0, 0%, 0%, 0.6); + color: #fff; + %textMediumNormal { + color: #fff; + } + } +} +%directoryFooter { + background: rgba(0,0,0,.4); +} + +// SEARCH +%themeDark { + %directorySearchBar { + background: hsla(0, 0%, 100%, 0.07); + border: none; + box-shadow: 0 0 0 2px hsla(0, 0%, 100%, 0.09); + &:focus-within { + box-shadow: 0 0 2px 2px $main-color; + transition: all 0.15s ease-in-out; + } + %input { + color: #fff; + box-shadow: none; + &::placeholder { + color: hsla(0, 0%, 100%, 0.3); + } + } + } +} +%directorySearchCategoryActive { + background: $main-color; +} + +// APP PAGE +%directoryAppCategory { + background-color: hsla(0, 0%, 100%, 0.1); + &:hover { + background-color: hsla(0, 0%, 100%, 0.15); + } +} +%directoryAppSupportServer { + background-color: hsla(0, 0%, 0%, 0.6); +} +%directoryAppCommandList, +%directoryAppPermissionList, +%directoryAppIntentList, +%directoryAppPremiumCardHeader, +%directoryAppPremiumContainer { + background: hsla(0, 0%, 0%, 0.4); +} +%directoryCommand { + background: transparent; + border: 1px solid $main-color; +} \ No newline at end of file diff --git a/src/pages/serverProfile.scss b/src/pages/serverProfile.scss deleted file mode 100644 index 5aa211926..000000000 --- a/src/pages/serverProfile.scss +++ /dev/null @@ -1,9 +0,0 @@ -// User profile redirect -.notice-5OG6bf { - background-color: transparent; -} - -// No Nitro -.upsellContainer-3qKRln { - background-color: transparent; -} \ No newline at end of file diff --git a/src/settings/channelSettings.scss b/src/settings/channelSettings.scss index ff1ee9ebc..7736e0dd3 100644 --- a/src/settings/channelSettings.scss +++ b/src/settings/channelSettings.scss @@ -80,6 +80,18 @@ background-color: hsla(0, 0%, 0%, 0.4); } +// ROLES/MEMBERS DROPDOWN +.container-1S70rv { + background-color: var(--popout-color); +} +.theme-dark .header-3i_Csh, +.theme-dark .container-1S70rv .sectionTag-28mLyE { + background-color: transparent; +} +.row-1Ib2uD.selected-1IWCoj { + background-color: hsla(0, 0%, 100%, .1); +} + // FORUMS .staticToolbar-x12NJC { background: transparent; diff --git a/src/settings/serverSettings.scss b/src/settings/serverSettings.scss index 78843a9f8..3b90cebea 100644 --- a/src/settings/serverSettings.scss +++ b/src/settings/serverSettings.scss @@ -367,78 +367,4 @@ %pruneMemberMenu { background-color: rgba(0, 0, 0, 0.5); border: hsla(0, 0%, 100%, 0.07); -} - -// APP DIRECTORY -%directoryContainer { - background: transparent; - &:before { - content: ''; - @include stretch; - position: fixed; - z-index: -1; - background: cv('bg.app.img') cv('bg.app.pos') / cv('bg.app.size') cv('bg.app.repeat') cv('bg.app.attach'); - @include filters(cv('bg.app')); - } -} -%directoryCategory { - background: rgba(0,0,0,.4); - &:hover { - background: $hover-color; - } -} -%directoryCard { - background: rgba(0,0,0,.4); -} -// list cards -%directoryListCard { - background: rgba(0,0,0,.4); - %directoryCardClickable &:hover { - background-color: hsla(0, 0%, 0%, 0.6); - } -} -// new to apps card -%directoryFooter { - background: rgba(0,0,0,.4); -} -%themeDark { - %directorySearchBar { - background-color: hsla(0, 0%, 0%, 0.3) !important; - border: none; - box-shadow: 0 0 0 2px hsla(0, 0%, 100%, 0.1); - margin-top: 2px; - &:focus-within { - box-shadow: 0 0 2px 2px $main-color; - transition: all 0.15s ease-in-out; - } - %input { - color: #fff; - box-shadow: none; - &::placeholder { - color: hsla(0, 0%, 100%, 0.3); - } - } - } -} -/*side categories*/ -%directorySearchCategory { - background: $main-color; -} -/*side support server card*/ -%directoryAppSupportServer, -/*privacy -> permissions container, data access*/ -%directoryAppPermissionList, -%directoryAppIntentList, -/*premium -> subscriptions*/ -%directoryPremiumCardHeader, -%directoryAppPremiumContainer { - background: rgba(0,0,0,.5); -} -/*general -> popular slash commands container*/ -%directoryAppCommandList { - background: rgba(0,0,0,.5); - %directoryAppCommand { - background: transparent; - border: 1px solid var(--main-color); - } -} +} \ No newline at end of file