diff --git a/src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx b/src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx index 9b9291581..1fd35bd57 100644 --- a/src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx +++ b/src/custom/CatalogFilterSection/CatalogFilterSidebar.tsx @@ -38,6 +38,7 @@ export interface CatalogFilterSidebarProps { setData: (callback: (prevFilters: FilterValues) => FilterValues) => void; lists: FilterList[]; value?: FilterValues; + styleProps?: StyleProps; } export type FilterValues = Record; @@ -45,6 +46,7 @@ export type FilterValues = Record; export interface StyleProps { backgroundColor?: string; sectionTitleBackgroundColor?: string; + fontFamily?: string; } /** @@ -57,7 +59,8 @@ export interface StyleProps { const CatalogFilterSidebar: React.FC = ({ lists, setData, - value = {} + value = {}, + styleProps }) => { const theme = useTheme(); // Get the current theme const [openDrawer, setOpenDrawer] = useState(false); @@ -70,23 +73,29 @@ const CatalogFilterSidebar: React.FC = ({ setOpenDrawer(false); }, []); - const styleProps: StyleProps = { + const defaultStyleProps: StyleProps = { backgroundColor: theme.palette.mode === 'light' ? theme.palette.background.default : theme.palette.background.secondary, sectionTitleBackgroundColor: - theme.palette.mode === 'light' ? theme.palette.background.surfaces : darkTeal.main + theme.palette.mode === 'light' ? theme.palette.background.surfaces : darkTeal.main, + fontFamily: theme.typography.fontFamily + }; + + const appliedStyleProps = { + ...defaultStyleProps, + ...styleProps }; return ( <> - + @@ -126,7 +135,7 @@ const CatalogFilterSidebar: React.FC = ({ lists={lists} onApplyFilters={setData} value={value} - styleProps={styleProps} + styleProps={appliedStyleProps} /> diff --git a/src/custom/CatalogFilterSection/FilterSection.tsx b/src/custom/CatalogFilterSection/FilterSection.tsx index 2777fa38b..0696a6ed1 100644 --- a/src/custom/CatalogFilterSection/FilterSection.tsx +++ b/src/custom/CatalogFilterSection/FilterSection.tsx @@ -55,9 +55,11 @@ const FilterSection: React.FC = ({ <> onSectionToggle(filterKey)} - style={{ backgroundColor: styleProps.sectionTitleBackgroundColor }} + style={{ + backgroundColor: styleProps.sectionTitleBackgroundColor + }} > - + {(sectionDisplayName || filterKey).toUpperCase()} {openSections[filterKey] ? : } @@ -105,7 +107,7 @@ const FilterSection: React.FC = ({ {option.Icon && } - {option.label} + {option.label} {option.totalCount !== undefined && `(${option.totalCount || 0})`} diff --git a/src/custom/CatalogFilterSection/style.tsx b/src/custom/CatalogFilterSection/style.tsx index a6c1b983d..105a244ca 100644 --- a/src/custom/CatalogFilterSection/style.tsx +++ b/src/custom/CatalogFilterSection/style.tsx @@ -15,7 +15,8 @@ export const FiltersCardDiv = styled(Box)<{ styleProps: StyleProps }>(({ stylePr backgroundColor: styleProps.backgroundColor, ['@media (max-width:900px)']: { display: 'none' - } + }, + fontFamily: styleProps.fontFamily })); export const FilterDrawerDiv = styled('div')(() => ({ diff --git a/src/custom/CustomCatalog/custom-card.tsx b/src/custom/CustomCatalog/custom-card.tsx index 1f8351924..004f5079f 100644 --- a/src/custom/CustomCatalog/custom-card.tsx +++ b/src/custom/CustomCatalog/custom-card.tsx @@ -190,16 +190,7 @@ const CustomCatalogCard: React.FC = ({ <> {patternType} - - - {pattern.name} - + {pattern.name} )} diff --git a/src/custom/CustomCatalog/style.tsx b/src/custom/CustomCatalog/style.tsx index 863caa418..7e89b1905 100644 --- a/src/custom/CustomCatalog/style.tsx +++ b/src/custom/CustomCatalog/style.tsx @@ -134,20 +134,23 @@ export const MetricsCount = styled('p')(({ theme }) => ({ color: theme.palette.text.secondary, fontWeight: '600' })); -export const DesignName = styled(Typography)(({ theme }) => ({ +export const DesignName = styled(Typography)(() => ({ fontWeight: 'bold', textTransform: 'capitalize', - color: theme.palette.text.default, + color: '#000D12', fontSize: '1.125rem', marginTop: '2rem', - padding: '0rem 1rem', // "0rem 1.5rem" + padding: '0rem 1rem', position: 'relative', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', textAlign: 'center', - width: '100%' + width: '100%', + margin: '3rem 0 1.59rem 0', + fontFamily: 'inherit' })); + export const MetricsContainerFront = styled('div')(({ isDetailed }) => ({ display: 'flex', justifyContent: 'space-around',