Skip to content

Commit 2055a70

Browse files
Rajesh-Nagarajan-11Rajesh-Nagarajan-11
authored
Merge branch 'master' into mui-v7
2 parents 99b638b + f002990 commit 2055a70

File tree

11 files changed

+119
-5
lines changed

11 files changed

+119
-5
lines changed

‎src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ const CatalogFilterSidebar: React.FC<CatalogFilterSidebarProps> = ({
105105
</FiltersCardDiv>
106106
<FilterDrawerDiv>
107107
<CustomTooltip title="Filters" placement="bottom">
108-
<FilterButton variant="contained" onClick={handleDrawerOpen}>
108+
<FilterButton variant="contained" size="large" onClick={handleDrawerOpen}>
109109
<FilterAltIcon
110-
style={{ height: '28px', width: '28px' }}
110+
style={{ height: '25px', width: '25px' }}
111111
fill={theme.palette.text.default}
112112
/>
113113
</FilterButton>

‎src/custom/CatalogFilterSection/style.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export const FilterButton = styled(Button)(({ theme }) => ({
4040
'&:hover': {
4141
backgroundColor: theme.palette.background.default
4242
},
43-
height: '3.75rem',
4443
['@media (max-width:450px)']: {
4544
minWidth: '0px'
4645
}

‎src/custom/PerformersSection/PerformersToogleButton.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ const PerformersSectionButton: React.FC<PerformersSectionButtonProps> = ({ open,
2525
onClick={handleClick}
2626
size="large"
2727
style={{
28-
backgroundColor: open ? undefined : theme.palette.background.constant?.disabled
28+
backgroundColor: open ? undefined : theme.palette.background.constant?.disabled,
29+
whiteSpace: 'nowrap'
2930
}}
3031
>
3132
<TropyIcon style={{ height: '2rem', width: '2rem', marginRight: '10px' }} />

‎src/icons/CompareArrows/CompareArrowsIcon.tsx‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { DEFAULT_FILL_NONE, DEFAULT_HEIGHT, DEFAULT_WIDTH } from '../../constants/constants';
2+
import { IconProps } from '../types';
3+
4+
export const CompareArrowsIcon = ({
5+
width = DEFAULT_WIDTH,
6+
height = DEFAULT_HEIGHT,
7+
fill = DEFAULT_FILL_NONE,
8+
...props
9+
}: IconProps): JSX.Element => {
10+
return (
11+
<svg
12+
width={width}
13+
height={height}
14+
xmlns="http://www.w3.org/2000/svg"
15+
viewBox="0 0 24 24"
16+
data-testid="circle-icon-svg"
17+
{...props}
18+
>
19+
<path
20+
d="M9.01 14H2v2h7.01v3L13 15l-3.99-4zm5.98-1v-3H22V8h-7.01V5L11 9z"
21+
fill={fill}
22+
/>
23+
</svg>
24+
);
25+
};
26+
27+
export default CompareArrowsIcon;

‎src/icons/CompareArrows/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as CompareArrowsIcon } from './CompareArrowsIcon';

‎src/icons/GetApp/GetAppIcon.tsx‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { DEFAULT_HEIGHT, DEFAULT_WIDTH, DEFAULT_FILL_NONE } from '../../constants/constants';
2+
import { IconProps } from '../types';
3+
4+
export const GetAppIcon = ({
5+
width = DEFAULT_WIDTH,
6+
height = DEFAULT_HEIGHT,
7+
fill = DEFAULT_FILL_NONE,
8+
...props
9+
}: IconProps): JSX.Element => {
10+
return (
11+
<svg
12+
width={width}
13+
height={height}
14+
xmlns="http://www.w3.org/2000/svg"
15+
viewBox="0 0 24 24"
16+
{...props}
17+
>
18+
<path
19+
d="M19 9h-4V3H9v6H5l7 7zM5 18v2h14v-2z"
20+
fill={fill}
21+
/>
22+
</svg>
23+
);
24+
};
25+
export default GetAppIcon;

‎src/icons/GetApp/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as GetAppIcon } from './GetAppIcon';

‎src/icons/Github/GithubIcon.tsx‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ interface GithubIconProps {
22
height?: string | number;
33
width?: string | number;
44
fill?: string;
5+
orgIcon?: boolean;
6+
bgFill?: string;
7+
catFill?: string;
58
className?: string;
69
}
710

811
export default function GithubIcon({
912
height = '1.45rem',
1013
width = '1.45rem',
1114
fill = 'currentColor',
15+
orgIcon = false,
16+
bgFill = '#fff',
17+
catFill = '#000',
1218
className
1319
}: GithubIconProps) {
1420
return (
@@ -17,8 +23,32 @@ export default function GithubIcon({
1723
width={width}
1824
className={className}
1925
xmlns="http://www.w3.org/2000/svg"
20-
viewBox="60 60 280 280"
26+
viewBox={orgIcon ? "0 0 512 512" : "60 60 280 280"}
2127
>
28+
{orgIcon ? (
29+
<g>
30+
<path
31+
fill={bgFill}
32+
d="m512 257c0 120-84.101562 220.5-196 247.5l-30.601562-97.199219h-58.796876l-29.601562 97.199219c-111.898438-27-197-127.5-197-247.5 0-140.699219 115.300781-257 256-257s256 116.300781 256 257zm0 0"
33+
/>
34+
<path
35+
fill={bgFill}
36+
d="m512 257c0 120-84.101562 220.5-196 247.5l-30.601562-97.199219h-29.398438v-407.300781c140.699219 0 256 116.300781 256 257zm0 0"
37+
/>
38+
<path
39+
fill={catFill}
40+
d="m181.277344 430.058594c-6.078125 0-12.011719-.867188-17.828125-2.578125-15.128907-4.46875-27.421875-14.546875-36.546875-29.914063-4.160156-7.015625-8.496094-11.878906-13.605469-15.308594-5.027344-3.382812-9.039063-4.671874-13.273437-4.363281l-2.636719-29.882812c11.117187-.953125 21.753906 2.0625 32.59375 9.316406 8.832031 5.902344 16.257812 14.0625 22.71875 24.914063 5.304687 8.921874 11.410156 14.152343 19.25 16.46875 8.804687 2.589843 17.941406 1.507812 29.632812-3.472657l11.808594 27.566407c-11.296875 4.835937-21.929687 7.253906-32.113281 7.253906zm0 0"
41+
/>
42+
<path
43+
fill={catFill}
44+
d="m400.902344 287.300781c-10.503906 27.898438-36.902344 63.300781-103.800782 73.199219 8.699219 12.898438 19.199219 19.800781 18.898438 46.800781v97.199219c-19.199219 4.800781-39.300781 7.5-60 7.5s-39.800781-2.699219-59-7.5v-98.402344c0-26.699218 10.101562-34.199218 17.898438-45.597656-66.898438-9.902344-93.296876-45.300781-103.800782-73.199219-14.097656-37.203125-6.597656-83.402343 18.003906-112.800781.597657-.601562 1.5-2.101562 1.199219-3-11.402343-34.199219 2.398438-62.699219 3-65.699219 12.898438 3.898438 15-3.902343 56.699219 21.597657l7.199219 4.203124c3 1.796876 2.101562.597657 5.101562.597657 17.398438-4.800781 35.699219-7.5 53.699219-7.5 18.300781 0 36.300781 2.699219 54.597656 7.5l2.101563.300781s.597656 0 2.101562-.898438c51.898438-31.503906 50.097657-21.300781 64.195313-25.800781.300781 3 14.101562 31.796875 2.703125 65.699219-1.5 4.5 45 47.097656 19.203125 115.800781zm0 0"
45+
/>
46+
<path
47+
fill={catFill}
48+
d="m400.902344 287.300781c-10.503906 27.898438-36.902344 63.300781-103.800782 73.199219 8.699219 12.898438 19.199219 19.800781 18.898438 46.800781v97.199219c-19.199219 4.800781-39.300781 7.5-60 7.5v-387.300781c18.300781 0 36.300781 2.699219 54.601562 7.5l2.097657.300781s.601562 0 2.101562-.898438c51.898438-31.503906 50.097657-21.300781 64.199219-25.800781.300781 3 14.101562 31.796875 2.699219 65.699219-1.5 4.5 45 47.097656 19.203125 115.800781zm0 0"
49+
/>
50+
</g>
51+
) : (
2252
<path
2353
fill={fill}
2454
fillRule="evenodd"
@@ -30,6 +60,7 @@ export default function GithubIcon({
3060
c7.5,18.9,2.8,32.8,1.4,36.3c8.8,9.6,14.1,21.8,14.1,36.8c0,52.6-32,64.2-62.5,67.6c4.9,4.2,9.3,12.6,9.3,25.4
3161
c0,18.3-0.2,33.1-0.2,37.6c0,3.7,2.5,7.9,9.4,6.6c54.4-18.2,93.6-69.5,93.6-130C340.9,121.3,279.5,60,203.9,60z"
3262
/>
63+
)}
3364
</svg>
3465
);
3566
}

‎src/icons/IndeterminateCheckBox/IndeterminateCheckBoxIcon.tsx‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { DEFAULT_HEIGHT, DEFAULT_WIDTH, DEFAULT_FILL_NONE } from '../../constants/constants';
2+
import { IconProps } from '../types';
3+
4+
export const IndeterminateCheckBoxIcon = ({
5+
width = DEFAULT_WIDTH,
6+
height = DEFAULT_HEIGHT,
7+
fill = DEFAULT_FILL_NONE,
8+
...props
9+
}: IconProps): JSX.Element => {
10+
return (
11+
<svg
12+
width={width}
13+
height={height}
14+
xmlns="http://www.w3.org/2000/svg"
15+
viewBox="0 0 24 24"
16+
{...props}
17+
>
18+
<path
19+
d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2m-2 10H7v-2h10z"
20+
fill={fill}
21+
/>
22+
</svg>
23+
);
24+
};
25+
export default IndeterminateCheckBoxIcon;

‎src/icons/IndeterminateCheckBox/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as IndeterminateCheckBoxIcon } from './IndeterminateCheckBoxIcon';

0 commit comments

Comments
 (0)