Skip to content

Commit 4775708

Browse files
authored
Merge branch 'master' into update-navigation
2 parents bc878c8 + 18e0aea commit 4775708

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ const CatalogFilterSidebar: React.FC<CatalogFilterSidebarProps> = ({
100100
</FiltersCardDiv>
101101
<FilterDrawerDiv>
102102
<FilterButton variant="contained" onClick={handleDrawerOpen}>
103-
<FilterAltIcon height="20" width="20" fill={theme.palette.text.default} />
103+
<FilterAltIcon
104+
style={{ height: '28px', width: '28px' }}
105+
fill={theme.palette.text.default}
106+
/>
104107
<FilterText>Filters</FilterText>
105108
</FilterButton>
106109

src/custom/CatalogFilterSection/style.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const FilterButton = styled(Button)(({ theme }) => ({
3737
'&:hover': {
3838
backgroundColor: theme.palette.background.default
3939
},
40-
height: '3.5rem',
40+
height: '3.75rem',
4141
['@media (max-width:450px)']: {
4242
minWidth: '0px'
4343
}

src/custom/StyledSearchBar/style.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export const StyledSearchInput = styled(OutlinedInput)(({ style, theme }) => ({
88
paddingLeft: '0.25rem'
99
},
1010
display: 'flex',
11-
backgroundColor: theme.palette.background.surfaces,
11+
backgroundColor:
12+
theme.palette.mode === 'light' ? theme.palette.common.white : theme.palette.background.surfaces,
1213
...style
1314
}));
1415

src/icons/Menu/MenuIcon.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { DEFAULT_FILL_NONE, DEFAULT_HEIGHT, DEFAULT_WIDTH } from '../../constants/constants';
22
import { IconProps } from '../types';
33

4-
export const AddIcon = ({
4+
export const MenuIcon = ({
55
width = DEFAULT_WIDTH,
66
height = DEFAULT_HEIGHT,
77
fill = DEFAULT_FILL_NONE,
@@ -13,12 +13,12 @@ export const AddIcon = ({
1313
height={height}
1414
xmlns="http://www.w3.org/2000/svg"
1515
viewBox="0 0 24 24"
16-
data-testid="add-icon-svg"
16+
data-testid="menu-icon-svg"
1717
{...props}
1818
>
1919
<path fill={fill} d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path>
2020
</svg>
2121
);
2222
};
2323

24-
export default AddIcon;
24+
export default MenuIcon;

0 commit comments

Comments
 (0)