Skip to content

Commit

Permalink
Merge pull request #153 from Lioncat6/main
Browse files Browse the repository at this point in the history
Big hotfix
  • Loading branch information
Gibbu authored Dec 18, 2024
2 parents 78775a9 + 01e1a8b commit 96736f1
Show file tree
Hide file tree
Showing 23 changed files with 141 additions and 19 deletions.
1 change: 1 addition & 0 deletions src/addons/_verticaluserarea.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#app-mount {
--iconOffset: 0;
.guilds_a4d4d9 {
.tree_fea3ef {
outline: none !important;
Expand Down
7 changes: 6 additions & 1 deletion src/theme/app/_app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ body,
// Light more wanrning
html.theme-light {
.app_a01fb1::after {
content: 'SoftX is not build for Lightmode.\APlease switch to Dark mode in your Discord Appearance Settings.';
content: 'SoftX is not designed for Light Mode.\APlease switch to Dark mode in your Discord Appearance Settings.';
line-height: 1.5;
white-space: pre-wrap;
border-top: 1px solid var(--border);
Expand Down Expand Up @@ -59,3 +59,8 @@ html.theme-light {
content: 'SoftX v' var(--softx-version);
text-transform: none;
}

// theme loading screen
.container_e40c16 {
background-color: hsl(0deg 0% 10%);
}
8 changes: 5 additions & 3 deletions src/theme/app/_toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,11 @@
// Fix notice banner
.notice_b5000b {
border-radius: 0;
.closeButton_be03aa {
left: 15px;
}
}
.closeButton_be03aa {
left: 15px;
}

}

//fixed the shit -lion
Expand All @@ -184,3 +185,4 @@
.theme-dark .children_fc4f04:after {
background: transparent;
}

1 change: 1 addition & 0 deletions src/theme/chat/_container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
}

// Placeholder messages
.wrapper_cdfd51,
.wrapper_ba0ffb,
.wrapper_b75bb9 {
background: transparent;
Expand Down
3 changes: 0 additions & 3 deletions src/theme/chat/_textbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
rgb(var(--accent), 0.25);
}
}
.attachButtonInner_f298d4 {
margin-bottom: 5px;
}
.button_dd4f85 {
height: 100%;
// Gif Button
Expand Down
2 changes: 1 addition & 1 deletion src/theme/guilds/_server.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

// No icon, other buttons
.childWrapper_a6ce15,
.childWrapper_f90abb,
.circleIconButton_db6521 {
background: rgb(255 255 255 / 0.1);
}
Expand Down
5 changes: 5 additions & 0 deletions src/theme/members/_activity.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#app-mount {
.container_c64476.openOnHover_c64476 {
background-color: var(--fg-secondary);
}
}
1 change: 1 addition & 0 deletions src/theme/members/_index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@forward './container';
@forward './title';
@forward './member';
@forward './activity';
1 change: 1 addition & 0 deletions src/theme/modals/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
@forward './quickswitch';
@forward './boostperks';
@forward './status';
@forward './selectplan';
8 changes: 8 additions & 0 deletions src/theme/modals/_selectplan.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#app-mount {
.skuSelectModalHeader_f92df2, .skuSelectModalContent_f92df2 {
background-color: transparent;
}
.spinner_b0f29a{
background: transparent;
}
}
4 changes: 4 additions & 0 deletions src/theme/pages/_friends.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@
box-shadow: 0 0 calc(var(--glow-intensity) * 20px) calc(var(--glow-intensity) * 5px) rgb(var(--accent), 0.25);
}
}

.emptyCard_f02fcf {
background: var(--bg-tertiary);
}
}
1 change: 1 addition & 0 deletions src/theme/pages/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
@forward './serverdiscovery';
@forward './serverboost';
@forward './nitro';
@forward './shop';
5 changes: 4 additions & 1 deletion src/theme/pages/_nitro.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
.applicationStore_cecc86 {
background: transparent;
}
.scroller__244e5 {
.mainPageScroller_ed2e7b {
background: var(--bg-secondary);
}
.noFlipCardContainer_c21997.forceShadow_c21997 .card_c21997 {
background: var(--fg-secondary);
}
}
22 changes: 22 additions & 0 deletions src/theme/pages/_shop.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#app-mount {
.shopScroll_e77fa3 {
background-color: var(--bg-primary);

}
.darkCardBackground_c23530 {
background-color: var(--fg-secondary);
}
.shopCard_c23530 {
border-color: var(--fg-secondary);
}
.shopViewWrapper_e77fa3 .headerBar_d8354c {
background: var(--bg-primary) !important;
height: var(--toolbar-height);
padding-left: 24px;
padding-top: 7px;
}
.shop_e77fa3, .shop_ebba41, .pageWrapper_e77fa3 {
background: transparent;
}
}

17 changes: 17 additions & 0 deletions src/theme/popouts/_activity.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#app-mount {
.popout_a35965{
background: var(--bg-primary);
border-radius: 6px;
.popoutContentWrapper_a35965, .interactionsContainer_a35965 {
background: transparent;
}
.interactionsContainer_a35965 {
.replyInput_d0fc0d {
background: var(--fg-secondary);
.slateTextArea_e52116 {
padding-left: 16px;
}
}
}
}
}
6 changes: 4 additions & 2 deletions src/theme/popouts/_autocomplete.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@

// Left side
.list_efd8e6 {
background-color: var(--bg-tertiary);
width: 55px;
.listItems_d53d65 {
margin: -16px -12px -8px;
margin: 0
}
.wrapper_efd8e6 {
width: 100% !important;
Expand Down Expand Up @@ -41,7 +43,7 @@
}
}
.section_efd8e6 {
margin-bottom: 0;
//margin-bottom: 0;
}
}

Expand Down
11 changes: 11 additions & 0 deletions src/theme/popouts/_bookmarks.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#app-mount {
.popoutContainer_a6fde8 {
background-color: var(--bg-secondary);
.messageContainer_a6fde8 {
background: var(--fg-secondary);
}
.container_cdf946 {
background: var(--bg-tertiary);
}
}
}
26 changes: 20 additions & 6 deletions src/theme/popouts/_emojipicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
box-shadow: none;
}
}
.wrapper_d8cdac,
.contentWrapper_af5dbb,
.emojiPicker_c6ee36 {
[class^='searchBar'],
.container_effbe2 {
.container_effbe2,
.container_c18ec9 {
background: var(--input-background);
border: 2px solid transparent;
border-radius: 6px;
Expand Down Expand Up @@ -61,6 +63,13 @@
}
}

.wrapper_d8cdac, .container_b56bbc {
background: var(--bg-primary);
border: 1px solid var(--border);
border-radius: 6px;
box-shadow: var(--shadow-lg);
}

.nav_af5dbb {
position: absolute;
padding: 0;
Expand Down Expand Up @@ -129,19 +138,25 @@
}
}

.wrapper_dc0b29 {
#sticker-picker-tab-panel .wrapper_ba23fe {
left: -1px;
top: 63px;
}

.contentWrapper_af5dbb .wrapper_ba23fe {
top: 64px;
border-top: 1px solid var(--border);
border-right: 1px solid var(--border);
background: transparent;
.listItems_d53d65 {
width: 100%;
margin: -8px;
}
.scroller_d53d65::-webkit-scrollbar {
display: none;
}
}
.categoryItemDefaultCategory_dfa278 {
.categoryItemDefaultCategory_dfa278, .stickerCategory_a7a485 {
width: 100%;
height: 48px;
padding: 0;
Expand All @@ -151,9 +166,9 @@
display: flex;
align-items: center;
justify-content: center;
&.categoryItemDefaultCategorySelected_dfa278 {
&.categoryItemDefaultCategorySelected_dfa278, &.stickerCategoryGenericSelected_a7a485, &.firstPartyCategorySelected_a7a485 {
background: rgb(var(--accent), 0.1);
.categoryIcon_dfa278 {
.categoryIcon_dfa278, .stickerCategoryGenericIcon_a7a485 {
color: rgb(var(--accent));
filter: drop-shadow(0 0 calc(var(--channel-glow-intensity) * 5px) rgb(var(--accent), 0.4));
}
Expand Down Expand Up @@ -239,6 +254,5 @@
.container_b56bbc,
.header_b56bbc {
background: var(--bg-primary);
background-color: transparent;
}
}
2 changes: 1 addition & 1 deletion src/theme/popouts/_inbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
min-height: fit-content;
.expanded_f0cd33 {
}
.expandedInboxHeader_f0cd33 {
.headerTitle_f0cd33 {
padding: 7px 10px 12px 10px;
}
.expandedTabSection_f0cd33 {
Expand Down
3 changes: 3 additions & 0 deletions src/theme/popouts/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@
@forward './statuspicker';
@forward './customstatus';
@forward './appsmenu';
@forward './soundboard';
@forward './activity';
@forward './bookmarks';
20 changes: 20 additions & 0 deletions src/theme/popouts/_soundboard.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#app-mount {
.soundButtonInteractiveRefresh_f40049 {
background: var(--fg-secondary);
}
.wrapper_ee8ca7 {
background: var(--bg-primary);
}
.header_d0dc1d {
background: var(--bg-tertiary);
}
.categoryList_ceda83 {
background: var(--bg-primary);
.scroller_d53d65 {
border-right: 1px solid var(--border);
&::-webkit-scrollbar {
display: none;
}
}
}
}
4 changes: 4 additions & 0 deletions src/theme/profile/_popout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,8 @@
background: var(--fg-primary) !important;
}
}
.loadingPopout_a8c724 {
background-color: var(--bg-tertiary);
border-radius: 5px;
}
}
2 changes: 1 addition & 1 deletion src/theme/sidebar/_container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.sidebar_a4d4d9 {
border-radius: 0;
background: var(--bg-primary);
width: var(--channels-width);
width: var(--channels-width) !important; //importanter than you, discord. -lc
border-right: 1px solid var(--border);
z-index: 1;
&.hidden_a4d4d9 {
Expand Down

0 comments on commit 96736f1

Please sign in to comment.