Skip to content

Commit e634c24

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/site/base-x-3.0.11
2 parents ca96d55 + c3539bc commit e634c24

File tree

5 files changed

+32
-26
lines changed

5 files changed

+32
-26
lines changed

src/custom/CatalogDetail/OverviewSection.tsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import MetricsDisplay from './MetricsDisplay';
77
import PatternInfo from './PatternInfo';
88
import SocialSharePopper from './SocialSharePopper';
99
import UserInfo from './UserInfo';
10-
import { ContentRow, DesignHeading, OverviewContainer } from './style';
10+
import { ContentRow, DesignHeading, OverviewContainer, OverviewContainerHeader } from './style';
1111
import { Class } from './types';
1212

1313
interface OverviewSectionProps {
@@ -50,15 +50,7 @@ const OverviewSection: React.FC<OverviewSectionProps> = ({
5050
}) => {
5151
return (
5252
<OverviewContainer>
53-
<div
54-
style={{
55-
display: 'flex',
56-
flexDirection: 'row',
57-
width: '100%',
58-
flexWrap: 'wrap',
59-
fontFamily: fontFamily || 'inherit'
60-
}}
61-
>
53+
<OverviewContainerHeader>
6254
<DesignHeading>{details?.name}</DesignHeading>
6355
<SocialSharePopper
6456
details={details}
@@ -70,7 +62,7 @@ const OverviewSection: React.FC<OverviewSectionProps> = ({
7062
showShareAction={showShareAction}
7163
handleShare={handleShare}
7264
/>
73-
</div>
65+
</OverviewContainerHeader>
7466
<Grid container spacing={2}>
7567
<Grid item lg={4} md={4} sm={12} xs={12}>
7668
<Grid container>

src/custom/CatalogDetail/style.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,18 @@ export const OverviewContainer = styled('div')(({ theme }) => ({
200200
borderRadius: '0.4rem'
201201
}));
202202

203+
export const OverviewContainerHeader = styled('div')(({ theme }) => ({
204+
display: 'flex',
205+
flexDirection: 'row',
206+
width: '100%',
207+
flexWrap: 'wrap',
208+
fontFamily: 'inherit',
209+
210+
[theme.breakpoints.down('sm')]: {
211+
flexDirection: 'column'
212+
}
213+
}));
214+
203215
export const DesignHeading = styled('h1')(({ theme }) => ({
204216
textAlign: 'left',
205217
margin: '0rem 0rem 2rem 0rem',

src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ const CatalogFilterSidebar: React.FC<CatalogFilterSidebarProps> = ({
141141
style={{
142142
height: '75vh',
143143
overflowY: 'auto',
144-
background: theme.palette.background.surfaces
144+
background: theme.palette.background.surfaces,
145+
padding: '0 16px'
145146
}}
146147
>
147148
<CatalogFilterSidebarState

src/custom/PerformersSection/PerformersSection.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
TropyIcon
1010
} from '../../icons';
1111
import { useTheme } from '../../theme';
12+
import { Carousel } from '../Carousel';
1213
import { Pattern } from '../CustomCatalog/CustomCard';
1314
import { ErrorBoundary } from '../ErrorBoundary';
1415
import { StateCardSekeleton } from './PerformersToogleButton';
@@ -284,6 +285,17 @@ const PerformersSection: React.FC<PerformersSectionProps> = ({
284285
</MainContainer>
285286
);
286287

288+
const statComponents = stats.map((stat, index) => (
289+
<StatCard
290+
key={`${stat.id}-${index}`}
291+
{...stat}
292+
onCardClick={onCardClick}
293+
onIconClick={onIconClick}
294+
onAuthorClick={onAuthorClick}
295+
onStatusClick={onStatusClick}
296+
/>
297+
));
298+
287299
return (
288300
<ErrorBoundary>
289301
<MainContainer>
@@ -299,17 +311,7 @@ const PerformersSection: React.FC<PerformersSectionProps> = ({
299311
</Title>
300312
<CardsContainer>
301313
{isLoading && <StateCardSekeleton />}
302-
{!isLoading &&
303-
stats.map((stat, index) => (
304-
<StatCard
305-
key={`${stat.id}-${index}`}
306-
{...stat}
307-
onCardClick={onCardClick}
308-
onIconClick={onIconClick}
309-
onAuthorClick={onAuthorClick}
310-
onStatusClick={onStatusClick}
311-
/>
312-
))}
314+
<Carousel items={statComponents} />
313315
</CardsContainer>
314316
</MainContainer>
315317
</ErrorBoundary>

src/custom/PerformersSection/styles.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,9 @@ export const UserNameText = styled(Typography)(({ theme }) => ({
222222

223223
export const CardsContainer = styled(Box)(({ theme }) => ({
224224
display: 'flex',
225-
gap: '18px',
225+
gap: '15px',
226226
width: '100%',
227-
overflowX: 'auto',
228-
padding: '18px',
227+
padding: '20px',
229228
background:
230229
theme.palette.mode === 'light'
231230
? theme.palette.background.default

0 commit comments

Comments
 (0)