Resolve merge conflicts

ReDI-School · Dec 6, 2024 · 482d866 · 482d866
2 parents 2e1db76 + 691f25f
commit 482d866
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/components/CategoryTabs/CategoryTabs.module.css b/src/components/CategoryTabs/CategoryTabs.module.css
@@ -10,12 +10,13 @@
   left: 0;
   right: 0;
   background-color: white;
-  z-index: 998;
+  z-index: 499;
   padding-top: 15px;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
 
 .categoryMenu {
+  z-index: 1;
   width: 95vw;
   display: flex;
   flex-direction: row;
@@ -29,7 +30,8 @@
   display: flex;
   justify-content: center;
   overflow: hidden;
-  position: relative;
+  /* position: relative; */
+  z-index: 1;
 }
 
 .filterButtonWrapper {

diff --git a/src/components/HeaderUserMenu/HeaderUserMenu.module.css b/src/components/HeaderUserMenu/HeaderUserMenu.module.css
@@ -1,4 +1,5 @@
 .headerContainer {
+  z-index:;
     position: relative;
     display: inline-block;  
   }

diff --git a/src/components/PriceRangeModal/PriceRangeModal.module.css b/src/components/PriceRangeModal/PriceRangeModal.module.css
@@ -5,8 +5,6 @@
   width: 100vw;
   height: 100vh;
   background-color: rgba(0, 0, 0, 0.6);
-  /* Semi-transparent black */
-  z-index: 1000;
 }
 
 .submitSection {