Merge pull request #103 from FedeIlLeone/main

Header bar and "x" buttons fixes
LuckFire · Sep 30, 2024 · 71dc7c5 · 71dc7c5
2 parents 034efca + 835673d
commit 71dc7c5
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 29 deletions.
diff --git a/clients/amoled-cord.theme.css b/clients/amoled-cord.theme.css
@@ -615,7 +615,7 @@ html.theme-dark .theme-light .root_f9a4c9,
 :is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .header_da6bd8 {
   background-color: var(--modal-background);
 }
-:is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .default_a467ac:not(:hover) {
+:is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .default_a467ac {
   background-color: var(--background-primary);
 }
 
@@ -862,11 +862,8 @@ html.theme-dark .theme-light .root_f9a4c9,
 :is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .searchBox_d83b4d .searchIcon_f69601, :is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .searchBox_d83b4d .closeIcon_f69601 {
   color: var(--interactive-normal);
 }
-:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .container_a56260 {
-  background-color: var(--background-primary) !important;
-}
-:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .contentContainer_a56260 {
-  background: linear-gradient(180deg, hsla(var(--black-hsl)/0.5) 0%, var(--background-primary) 257px) !important;
+:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .backdrop_accde0 {
+  background-color: var(--background-primary);
 }
 :is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .darkThemeGradient_f2bc91 {
   background: linear-gradient(0deg, var(--background-secondary-alt) 0%, hsla(var(--primary-800-hsl)/0.95) 20.31%, hsla(var(--primary-800-hsl)/0) 100%);
@@ -906,6 +903,10 @@ html.theme-dark .theme-light .root_f9a4c9,
   background-color: hsl(var(--primary-800-hsl)/0.85);
 }
 
+:is(.theme-dark, .theme-midnight) #app-mount .shop_e77fa3 .headerBarTransparentDarkBackground_d8354c {
+  background-color: hsl(var(--black-hsl)/0.8) !important;
+}
+
 :is(.theme-dark, .theme-midnight) #app-mount .popout_a35965 .interactionsContainerHeader_a35965 {
   border-top-color: var(--background-modifier-accent);
 }
@@ -996,7 +997,7 @@ html.theme-dark .theme-light .root_f9a4c9,
   background-color: var(--background-primary);
 }
 
-:is(.theme-dark, .theme-midnight) #app-mount .layers_d4b6c5 .default_a467ac:not(:hover) {
+:is(.theme-dark, .theme-midnight) #app-mount .layers_d4b6c5 .default_a467ac {
   background-color: var(--background-primary);
 }
 

diff --git a/clients/amoled-cord.user.css b/clients/amoled-cord.user.css
@@ -614,7 +614,7 @@
 	:is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .header_da6bd8 {
 	  background-color: var(--modal-background);
 	}
-	:is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .default_a467ac:not(:hover) {
+	:is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .default_a467ac {
 	  background-color: var(--background-primary);
 	}
 
@@ -861,11 +861,8 @@
 	:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .searchBox_d83b4d .searchIcon_f69601, :is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .searchBox_d83b4d .closeIcon_f69601 {
 	  color: var(--interactive-normal);
 	}
-	:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .container_a56260 {
-	  background-color: var(--background-primary) !important;
-	}
-	:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .contentContainer_a56260 {
-	  background: linear-gradient(180deg, hsla(var(--black-hsl)/0.5) 0%, var(--background-primary) 257px) !important;
+	:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .backdrop_accde0 {
+	  background-color: var(--background-primary);
 	}
 	:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .darkThemeGradient_f2bc91 {
 	  background: linear-gradient(0deg, var(--background-secondary-alt) 0%, hsla(var(--primary-800-hsl)/0.95) 20.31%, hsla(var(--primary-800-hsl)/0) 100%);
@@ -905,6 +902,10 @@
 	  background-color: hsl(var(--primary-800-hsl)/0.85);
 	}
 
+	:is(.theme-dark, .theme-midnight) #app-mount .shop_e77fa3 .headerBarTransparentDarkBackground_d8354c {
+	  background-color: hsl(var(--black-hsl)/0.8) !important;
+	}
+
 	:is(.theme-dark, .theme-midnight) #app-mount .popout_a35965 .interactionsContainerHeader_a35965 {
 	  border-top-color: var(--background-modifier-accent);
 	}
@@ -995,7 +996,7 @@
 	  background-color: var(--background-primary);
 	}
 
-	:is(.theme-dark, .theme-midnight) #app-mount .layers_d4b6c5 .default_a467ac:not(:hover) {
+	:is(.theme-dark, .theme-midnight) #app-mount .layers_d4b6c5 .default_a467ac {
 	  background-color: var(--background-primary);
 	}
 

diff --git a/src/amoled-cord.css b/src/amoled-cord.css
@@ -602,7 +602,7 @@ html.theme-dark .theme-light .root_f9a4c9,
 :is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .header_da6bd8 {
   background-color: var(--modal-background);
 }
-:is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .default_a467ac:not(:hover) {
+:is(.theme-dark, .theme-midnight) #app-mount .root_f9a4c9 .default_a467ac {
   background-color: var(--background-primary);
 }
 
@@ -849,11 +849,8 @@ html.theme-dark .theme-light .root_f9a4c9,
 :is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .searchBox_d83b4d .searchIcon_f69601, :is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .searchBox_d83b4d .closeIcon_f69601 {
   color: var(--interactive-normal);
 }
-:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .container_a56260 {
-  background-color: var(--background-primary) !important;
-}
-:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .contentContainer_a56260 {
-  background: linear-gradient(180deg, hsla(var(--black-hsl)/0.5) 0%, var(--background-primary) 257px) !important;
+:is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .backdrop_accde0 {
+  background-color: var(--background-primary);
 }
 :is(.theme-dark, .theme-midnight) #app-mount .content_a4d4d9 .darkThemeGradient_f2bc91 {
   background: linear-gradient(0deg, var(--background-secondary-alt) 0%, hsla(var(--primary-800-hsl)/0.95) 20.31%, hsla(var(--primary-800-hsl)/0) 100%);
@@ -893,6 +890,10 @@ html.theme-dark .theme-light .root_f9a4c9,
   background-color: hsl(var(--primary-800-hsl)/0.85);
 }
 
+:is(.theme-dark, .theme-midnight) #app-mount .shop_e77fa3 .headerBarTransparentDarkBackground_d8354c {
+  background-color: hsl(var(--black-hsl)/0.8) !important;
+}
+
 :is(.theme-dark, .theme-midnight) #app-mount .popout_a35965 .interactionsContainerHeader_a35965 {
   border-top-color: var(--background-modifier-accent);
 }
@@ -983,7 +984,7 @@ html.theme-dark .theme-light .root_f9a4c9,
   background-color: var(--background-primary);
 }
 
-:is(.theme-dark, .theme-midnight) #app-mount .layers_d4b6c5 .default_a467ac:not(:hover) {
+:is(.theme-dark, .theme-midnight) #app-mount .layers_d4b6c5 .default_a467ac {
   background-color: var(--background-primary);
 }
 

diff --git a/src/theme/modals/_notification-settings.scss b/src/theme/modals/_notification-settings.scss
@@ -2,7 +2,7 @@
     .header_da6bd8 {
         background-color: var(--modal-background);
     }
-    .default_a467ac:not(:hover) {
+    .default_a467ac {
         background-color: var(--background-primary);
     }
 }
diff --git a/src/theme/pages/_discovery.scss b/src/theme/pages/_discovery.scss
@@ -12,11 +12,8 @@
         }
     }
     // Quests
-    .container_a56260 {
-        background-color: var(--background-primary) !important;
-    }
-    .contentContainer_a56260 {
-        background: linear-gradient(180deg, hsla(var(--black-hsl)/0.5) 0%, var(--background-primary) 257px) !important;
+    .backdrop_accde0 {
+        background-color: var(--background-primary);
     }
     .darkThemeGradient_f2bc91 {
         background: linear-gradient(0deg, var(--background-secondary-alt) 0%, hsla(var(--primary-800-hsl)/0.95) 20.31%, hsla(var(--primary-800-hsl)/0) 100%);

diff --git a/src/theme/pages/_index.scss b/src/theme/pages/_index.scss
@@ -3,4 +3,5 @@
 @forward 'discovery';
 @forward 'members';
 @forward 'server-guide';
-@forward 'server-shop';
+@forward 'server-shop';
+@forward 'shop';
diff --git a/src/theme/pages/_shop.scss b/src/theme/pages/_shop.scss
@@ -0,0 +1,5 @@
+:is(.theme-dark, .theme-midnight) #app-mount .shop_e77fa3 {
+    .headerBarTransparentDarkBackground_d8354c {
+        background-color: hsl(var(--black-hsl)/0.8) !important;
+    }
+}
diff --git a/src/theme/settings/_content.scss b/src/theme/settings/_content.scss
@@ -1,5 +1,5 @@
 :is(.theme-dark, .theme-midnight) #app-mount .layers_d4b6c5 {
-    .default_a467ac:not(:hover) {
+    .default_a467ac {
         background-color: var(--background-primary);
     }
 }