Merge branch 'master' into update-navigation

layer5io · Oct 25, 2024 · 4775708 · 4775708
2 parents bc878c8 + 18e0aea
commit 4775708
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx b/src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx
@@ -100,7 +100,10 @@ const CatalogFilterSidebar: React.FC<CatalogFilterSidebarProps> = ({
       </FiltersCardDiv>
       <FilterDrawerDiv>
         <FilterButton variant="contained" onClick={handleDrawerOpen}>
-          <FilterAltIcon height="20" width="20" fill={theme.palette.text.default} />
+          <FilterAltIcon
+            style={{ height: '28px', width: '28px' }}
+            fill={theme.palette.text.default}
+          />
           <FilterText>Filters</FilterText>
         </FilterButton>
 

diff --git a/src/custom/CatalogFilterSection/style.tsx b/src/custom/CatalogFilterSection/style.tsx
@@ -37,7 +37,7 @@ export const FilterButton = styled(Button)(({ theme }) => ({
   '&:hover': {
     backgroundColor: theme.palette.background.default
   },
-  height: '3.5rem',
+  height: '3.75rem',
   ['@media (max-width:450px)']: {
     minWidth: '0px'
   }

diff --git a/src/custom/StyledSearchBar/style.tsx b/src/custom/StyledSearchBar/style.tsx
@@ -8,7 +8,8 @@ export const StyledSearchInput = styled(OutlinedInput)(({ style, theme }) => ({
     paddingLeft: '0.25rem'
   },
   display: 'flex',
-  backgroundColor: theme.palette.background.surfaces,
+  backgroundColor:
+    theme.palette.mode === 'light' ? theme.palette.common.white : theme.palette.background.surfaces,
   ...style
 }));
 

diff --git a/src/icons/Menu/MenuIcon.tsx b/src/icons/Menu/MenuIcon.tsx
@@ -1,7 +1,7 @@
 import { DEFAULT_FILL_NONE, DEFAULT_HEIGHT, DEFAULT_WIDTH } from '../../constants/constants';
 import { IconProps } from '../types';
 
-export const AddIcon = ({
+export const MenuIcon = ({
   width = DEFAULT_WIDTH,
   height = DEFAULT_HEIGHT,
   fill = DEFAULT_FILL_NONE,
@@ -13,12 +13,12 @@ export const AddIcon = ({
       height={height}
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24 24"
-      data-testid="add-icon-svg"
+      data-testid="menu-icon-svg"
       {...props}
     >
       <path fill={fill} d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path>
     </svg>
   );
 };
 
-export default AddIcon;
+export default MenuIcon;