Merge pull request #68 from FedeIlLeone/update

fix: Nitro page and theme-amoled class
LuckFire · Jan 29, 2024 · 4a8d336 · 4a8d336
2 parents 2dce567 + 0b1051e
commit 4a8d336
Show file tree

Hide file tree

Showing 60 changed files with 562 additions and 602 deletions.
diff --git a/clients/amoled-cord.theme.css b/clients/amoled-cord.theme.css
diff --git a/clients/amoled-cord.user.css b/clients/amoled-cord.user.css
diff --git a/src/amoled-cord.css b/src/amoled-cord.css
diff --git a/src/core/_variables.scss b/src/core/_variables.scss
@@ -78,7 +78,7 @@ html.theme-dark .theme-light .root_a28985,
     --background-modifier-hover: hsl(var(--primary-760-hsl)/0.4) !important;
     --background-modifier-selected: hsl(var(--primary-760-hsl)/0.6) !important;
     --background-nested-floating: var(--primary-830) !important;
-    --background-primary: #000000 !important;
+    --background-primary: var(--black-500) !important;
     --background-secondary: var(--primary-830) !important;
     --background-secondary-alt: var(--primary-800) !important;
     --background-tertiary: var(--primary-860) !important;
@@ -110,7 +110,7 @@ html.theme-dark .theme-light .root_a28985,
     --button-outline-primary-text: var(--white-500) !important;
     --button-outline-primary-text-active: var(--white-500) !important;
     --button-outline-primary-text-hover: var(--white-500) !important;
-    
+
     --button-secondary-background: var(--primary-700) !important;
     --button-secondary-background-active: var(--primary-600) !important;
     --button-secondary-background-disabled: var(--primary-700) !important;
@@ -126,7 +126,7 @@ html.theme-dark .theme-light .root_a28985,
     --deprecated-card-editable-bg: hsl(var(--primary-700-hsl)/0.3) !important;
     --deprecated-quickswitcher-input-background: var(--primary-400) !important;
     --deprecated-quickswitcher-input-placeholder: hsl(var(--white-500-hsl)/0.3) !important;
-    --deprecated-store-bg: var(--primary-600) !important;
+    --deprecated-store-bg: var(--black-500) !important;
     --deprecated-text-input-bg: var(--primary-700) !important;
     --deprecated-text-input-border: hsl(var(--black-500-hsl)/0.3) !important;
     --deprecated-text-input-border-disabled: var(--primary-700) !important;
@@ -137,7 +137,7 @@ html.theme-dark .theme-light .root_a28985,
     --forum-post-tag-background: hsl(var(--primary-660-hsl)/0.9) !important;
     --header-primary: var(--primary-130) !important;
     --header-secondary: var(--primary-345) !important;
-    --home-background: var(--primary-760) !important;
+    --home-background: var(--black-500) !important;
     --home-card-resting-border: hsl(var(--transparent-hsl)/0) !important;
     --info-danger-text: var(--white-500) !important;
     --info-help-text: var(--white-500) !important;
@@ -177,6 +177,7 @@ html.theme-dark .theme-light .root_a28985,
     --text-normal: var(--primary-300) !important;
     --textbox-markdown-syntax: var(--primary-360) !important;
     --user-profile-header-overflow-background: hsl(var(--primary-700-hsl)/0.5) !important;
+
     --elevation-stroke: 0 0 0 1px hsl(var(--primary-600-hsl)/0.15) !important;
     --elevation-low: 0 1px 0 hsl(var(--primary-630-hsl)/0.2),0 1.5px 0 hsl(var(--primary-600-hsl)/0.05),0 2px 0 hsl(var(--primary-630-hsl)/0.05) !important;
     --elevation-medium: 0 4px 4px hsl(var(--black-500-hsl)/0.16) !important;
@@ -197,9 +198,7 @@ html.theme-dark .theme-light .root_a28985,
     --search-popout-option-fade: linear-gradient(90deg,hsl(var(--primary-830-hsl)/0),hsl(var(--primary-830-hsl)/1) 80%) !important;
     --search-popout-option-fade-hover: linear-gradient(90deg,hsl(var(--primary-800-hsl)/0),var(--primary-800) 50%) !important;
 
-    --home-background: var(--primary-900) !important;
-
-    --dark-elevation-low: 0 1px 5px 0 hsl(var(--black-500-hsl)/0.3);
-    --dark-elevation-high: 0 2px 10px 0 hsl(var(--black-500-hsl)/0.2);
-    --dark-elevation-border: 0 0 0 1px hsl(var(--primary-700-hsl)/0.6);
+    --legacy-elevation-low: 0 1px 5px 0 hsl(var(--black-500-hsl)/0.3);
+    --legacy-elevation-high: 0 2px 10px 0 hsl(var(--black-500-hsl)/0.2);
+    --legacy-elevation-border: 0 0 0 1px hsl(var(--primary-700-hsl)/0.6);
 }
diff --git a/src/theme/app/_loading.scss b/src/theme/app/_loading.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) #app-mount .container__4bde3 {
+:is(.theme-dark, .theme-midnight) #app-mount .container__4bde3 {
     background-color: var(--background-primary);
 }
diff --git a/src/theme/app/_scrollerbar.scss b/src/theme/app/_scrollerbar.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled)  :is(
+:is(.theme-dark, .theme-midnight)  :is(
     .scroller__1f96e,
     .auto_a48086,
     .thin_b1c063,

diff --git a/src/theme/app/_sliders.scss b/src/theme/app/_sliders.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount {
+:is(.theme-dark, .theme-midnight) #app-mount {
     .bar_e58961 {
         background-color: var(--background-accent);
     }

diff --git a/src/theme/app/_toolbar.scss b/src/theme/app/_toolbar.scss
@@ -1,10 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .container__11d72 {
-    &.themed_b152d4 {
-        background: var(--background-primary);
-    }
-    .children__32014::after {
-        background: linear-gradient(90deg, var(--background-primary) 0, var(--background-primary)) !important;
-    }
+:is(.theme-dark, .theme-midnight) #app-mount .container__11d72 {
     [class*="searchBar"] {
         background-color: var(--background-secondary);
         .searchAnswer_b452e7,

diff --git a/src/theme/chat/_chatbox.scss b/src/theme/chat/_chatbox.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .chat__52833, .container_def45c {
+:is(.theme-dark, .theme-midnight) #app-mount .chat__52833, .container_def45c {
     .form__13a2c {
         .optionPill_f86b98 {
             background-color: var(--primary-730);

diff --git a/src/theme/chat/_container.scss b/src/theme/chat/_container.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .chat__52833 {
+:is(.theme-dark, .theme-midnight) #app-mount .chat__52833 {
     .wrapper_c727b6 {
         background-color: var(--background-tertiary);
     }

diff --git a/src/theme/chat/_forums.scss b/src/theme/chat/_forums.scss
@@ -1,33 +1,30 @@
-:is(.theme-dark, .theme-amoled) #app-mount .chat__52833 {
-    .container_b181b6 {
-        background-color: var(--background-primary);
-        .mainCard__8a660, .container__4abd7, .increasedActivityMainCard__916ed, .container__1b27a, .container_a4e239 {
-            background-color: var(--background-tertiary);
+:is(.theme-dark, .theme-midnight) #app-mount .container_b181b6 {
+    .mainCard__8a660, .container__4abd7, .increasedActivityMainCard__916ed, .container__1b27a, .container_a4e239 {
+        background-color: var(--background-tertiary);
+    }
+    .loadingCard_a6aa0a, .card__2c1e2 {
+        background-color: var(--background-tertiary);
+    }
+    .container_c24cbd {
+        &:hover {
+            background-color: var(--background-modifier-hover);
+        }
+        &:active {
+            background-color: var(--background-modifier-active);
         }
-        .loadingCard_a6aa0a, .card__2c1e2 {
-            background-color: var(--background-tertiary);
+        &.isOpen_d88bb6 {
+            background-color: var(--background-modifier-selected);
         }
-        .container_c24cbd {
-            &:hover {
-                background-color: var(--background-modifier-hover);
-            }
-            &:active {
-                background-color: var(--background-modifier-active);
-            }
-            &.isOpen_d88bb6 {
-                background-color: var(--background-modifier-selected);
-            }
-            .textContentFooter__5a630 {
-                background: transparent;
-            }
+        .textContentFooter__5a630 {
+            background: transparent;
+        }
+    }
+    .container__99b06, .container__15ddf {
+        &:active {
+            background-color: var(--background-modifier-active);
         }
-        .container__99b06, .container__15ddf {
-            &:active {
-                background-color: var(--background-modifier-active);
-            }
-            &.isOpen__8593d, &.isOpen__036bf {
-                background-color: var(--background-modifier-selected);
-            }
+        &.isOpen__8593d, &.isOpen__036bf {
+            background-color: var(--background-modifier-selected);
         }
     }
 }
diff --git a/src/theme/chat/_messages.scss b/src/theme/chat/_messages.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount {
+:is(.theme-dark, .theme-midnight) #app-mount {
     // Message Items
     .messageListItem__6a4fb:hover {
         background-color: rgba(255, 255, 255, 0.015);

diff --git a/src/theme/chat/_onboarding.scss b/src/theme/chat/_onboarding.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .chat__52833 {
+:is(.theme-dark, .theme-midnight) #app-mount .chat__52833 {
     // Roles
     .container__10dc7,
     .container__7590f,

diff --git a/src/theme/chat/_voice.scss b/src/theme/chat/_voice.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .chat__52833 {
+:is(.theme-dark, .theme-midnight) #app-mount .chat__52833 {
     .wrapper_bd2abe.minimum_ebf000 {
         background-color: var(--background-primary);
     }

diff --git a/src/theme/guilds/_folders.scss b/src/theme/guilds/_folders.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) .folder__17546.hover__043de {
+:is(.theme-dark, .theme-midnight) .folder__17546.hover__043de {
     background-color: var(--background-secondary-alt);
 }
diff --git a/src/theme/guilds/_items.scss b/src/theme/guilds/_items.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount {
+:is(.theme-dark, .theme-midnight) #app-mount {
     [class="wrapper_d281dd"] .childWrapper__01b9c,
     [class="circleIconButton_d8df29"] {
         background-color: var(--background-secondary-alt);

diff --git a/src/theme/inputs/_buttons.scss b/src/theme/inputs/_buttons.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount {
+:is(.theme-dark, .theme-midnight) #app-mount {
     .button__66e8c.buttonColor_a6eb73, .button__66e8c .buttonColor_a6eb73 {
         background-color: var(--button-secondary-background);
         &:hover {

diff --git a/src/theme/inputs/_keybinds.scss b/src/theme/inputs/_keybinds.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .key__06fe6 {
+:is(.theme-dark, .theme-midnight) #app-mount .key__06fe6 {
     box-shadow: inset 0 -4px 0 var(--primary-760);
     background-color: var(--primary-660);
 }
diff --git a/src/theme/members/_container.scss b/src/theme/members/_container.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) .container_b2ce9c {
+:is(.theme-dark, .theme-midnight) .container_b2ce9c {
     background-color: var(--background-primary);
 }
diff --git a/src/theme/members/_member.scss b/src/theme/members/_member.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount {
+:is(.theme-dark, .theme-midnight) #app-mount {
     .member_aa4760,
     .members__9f47b {
         background-color: var(--background-primary);

diff --git a/src/theme/modals/_accept-invite.scss b/src/theme/modals/_accept-invite.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     .contentWrapper__85d37 {
         background: var(--modal-background);
     }

diff --git a/src/theme/modals/_account-switcher.scss b/src/theme/modals/_account-switcher.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     .authBox__7196a {
         background-color: transparent;
     }

diff --git a/src/theme/modals/_add-join-server.scss b/src/theme/modals/_add-join-server.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) .theme-light .root_a28985 {
+:is(.theme-dark, .theme-midnight) .theme-light .root_a28985 {
     color: var(--primary-300);
 }
diff --git a/src/theme/modals/_delete.scss b/src/theme/modals/_delete.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     .message__04d9f {
         background-color: var(--background-primary);
     }

diff --git a/src/theme/modals/_generic.scss b/src/theme/modals/_generic.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     &.rootWithShadow__073a7 {
         box-shadow: var(--dark-elevation-border), var(--dark-elevation-high);
     }

diff --git a/src/theme/modals/_invite.scss b/src/theme/modals/_invite.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     .container__7712a {
         background-color: var(--input-background);
     }

diff --git a/src/theme/modals/_keybinds.scss b/src/theme/modals/_keybinds.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     .keyboardShortcutsModal__74c71 {
         background-color: var(--modal-background);
     }

diff --git a/src/theme/modals/_linked-roles.scss b/src/theme/modals/_linked-roles.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .modal_c01034 {
+:is(.theme-dark, .theme-midnight) #app-mount .modal_c01034 {
     .verifiedRoleHasRole__86f1d {
         background-color: var(--background-secondary);
         border-color: var(--background-secondary);

diff --git a/src/theme/modals/_modify-attachment.scss b/src/theme/modals/_modify-attachment.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     &.uploadModal_eae2a0 {
         background-color: var(--modal-background);
         .footer_ceda43 {

diff --git a/src/theme/modals/_notification-settings.scss b/src/theme/modals/_notification-settings.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     .cardPrimary_cb7a0e {
         background-color: var(--background-secondary);
     }

diff --git a/src/theme/modals/_onboarding.scss b/src/theme/modals/_onboarding.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .promptContent__63c03 {
+:is(.theme-dark, .theme-midnight) #app-mount .promptContent__63c03 {
     .optionButtonWrapper__4072c.selected__90dd8 {
         background-color: var(--background-secondary);
     }

diff --git a/src/theme/modals/_stickers.scss b/src/theme/modals/_stickers.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .root_a28985 {
+:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 {
     .previewDark__016ac {
         background-color: var(--background-primary);
     }

diff --git a/src/theme/pages/_active-now.scss b/src/theme/pages/_active-now.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .nowPlayingColumn_f5023f {
+:is(.theme-dark, .theme-midnight) #app-mount .nowPlayingColumn_f5023f {
     .separator_c2ecc6 {
         background-color: var(--background-secondary);
     }

diff --git a/src/theme/pages/_app-directory.scss b/src/theme/pages/_app-directory.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) #app-mount .directoryContainer_d3edd9 {
+:is(.theme-dark, .theme-midnight) #app-mount .directoryContainer_d3edd9 {
     background-color: var(--background-primary);
 }
diff --git a/src/theme/pages/_discovery.scss b/src/theme/pages/_discovery.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .content__4bf10 {
+:is(.theme-dark, .theme-midnight) #app-mount .content__4bf10 {
     .pageWrapper_fef757 {
         background-color: var(--background-primary);
     }

diff --git a/src/theme/pages/_members.scss b/src/theme/pages/_members.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .container_df3aa0 {
+:is(.theme-dark, .theme-midnight) #app-mount .page__0b66e {
     .mainTableContainer__5ffe0 {
         background-color: var(--background-tertiary);
     }

diff --git a/src/theme/pages/_server-guide.scss b/src/theme/pages/_server-guide.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount {
+:is(.theme-dark, .theme-midnight) #app-mount {
     .row__70f4c {
         background-color: var(--background-tertiary);
         &:hover {

diff --git a/src/theme/pages/_shop.scss b/src/theme/pages/_shop.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) #app-mount .shop_b31ed2 {
+:is(.theme-dark, .theme-midnight) #app-mount .shop_b31ed2 {
     background-color: var(--background-primary);
 }
diff --git a/src/theme/popouts/_add-game.scss b/src/theme/popouts/_add-game.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) #app-mount .addGamePopout_e4ca8f {
-    background-color: var(--background-primary);   
+:is(.theme-dark, .theme-midnight) #app-mount .addGamePopout_e4ca8f {
+    background-color: var(--background-primary);
 }
diff --git a/src/theme/popouts/_add-permissions.scss b/src/theme/popouts/_add-permissions.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .container_e84cda {
+:is(.theme-dark, .theme-midnight) #app-mount .container_e84cda {
     .header__02652, .autocompleteArrow__353a5 {
         background-color: var(--background-tertiary);
     }

diff --git a/src/theme/popouts/_autocomplete.scss b/src/theme/popouts/_autocomplete.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .autocomplete_df266d {
+:is(.theme-dark, .theme-midnight) #app-mount .autocomplete_df266d {
     background-color: var(--background-tertiary);
     .categoryHeader_f97a5f {
         background-color: var(--background-tertiary);

diff --git a/src/theme/popouts/_color-picker.scss b/src/theme/popouts/_color-picker.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .customColorPicker__3cb6a {
+:is(.theme-dark, .theme-midnight) #app-mount .customColorPicker__3cb6a {
     border: none;
     box-shadow: var(--dark-elevation-border), var(--dark-elevation-high);
     background-color: var(--background-tertiary);

diff --git a/src/theme/popouts/_content-warning.scss b/src/theme/popouts/_content-warning.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .contentWarningPopout__7d8c2 {
+:is(.theme-dark, .theme-midnight) #app-mount .contentWarningPopout__7d8c2 {
     background-color: var(--background-floating);
     .footer__36118 {
         background-color: var(--background-tertiary);

diff --git a/src/theme/popouts/_country-code.scss b/src/theme/popouts/_country-code.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) #app-mount .phoneFieldPopout__3e064 {
+:is(.theme-dark, .theme-midnight) #app-mount .phoneFieldPopout__3e064 {
     background-color: var(--background-floating);
 }
diff --git a/src/theme/popouts/_drawer.scss b/src/theme/popouts/_drawer.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .drawerSizingWrapper__30274 {
+:is(.theme-dark, .theme-midnight) #app-mount .drawerSizingWrapper__30274 {
     // Gifs
     .emptyHintCard_f3e81a {
         background-color: var(--background-primary);

diff --git a/src/theme/popouts/_generic.scss b/src/theme/popouts/_generic.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) #app-mount .container_d27846 {
+:is(.theme-dark, .theme-midnight) #app-mount .container_d27846 {
     background-color: var(--background-secondary);
 }
diff --git a/src/theme/popouts/_member-roles.scss b/src/theme/popouts/_member-roles.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .overflowRolesPopout__88ab9 {
+:is(.theme-dark, .theme-midnight) #app-mount .overflowRolesPopout__88ab9 {
     background-color: var(--background-floating);
     .overflowRolesPopoutArrow_f3db31 {
         background-color: var(--background-floating);

diff --git a/src/theme/popouts/_region-picker.scss b/src/theme/popouts/_region-picker.scss
@@ -1,3 +1,3 @@
-:is(.theme-dark, .theme-amoled) #app-mount .quickSelectPopout_c0cf80 {
+:is(.theme-dark, .theme-midnight) #app-mount .quickSelectPopout_c0cf80 {
     background-color: var(--background-floating);
 }
diff --git a/src/theme/popouts/_screenshare.scss b/src/theme/popouts/_screenshare.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .streamPreview__1846c {
+:is(.theme-dark, .theme-midnight) #app-mount .streamPreview__1846c {
     background-color: var(--background-secondary);
     .previewContainer_bb1924 {
         background-color: var(--background-secondary-alt);

diff --git a/src/theme/popouts/_search.scss b/src/theme/popouts/_search.scss
@@ -1,4 +1,4 @@
-:is(.theme-dark, .theme-amoled) #app-mount .layer_ec16dd {
+:is(.theme-dark, .theme-midnight) #app-mount .layer_ec16dd {
     .focused_f9cf2c {
         background-color: var(--background-secondary);
     }