diff --git a/web/tailwind.config.cjs b/web/tailwind.config.cjs index 2155b90cc..7403a1b4b 100644 --- a/web/tailwind.config.cjs +++ b/web/tailwind.config.cjs @@ -486,7 +486,7 @@ module.exports = { transitionProperty: ['motion-safe'], gridTemplateColumns: { 'auto-fill-fr': `repeat(auto-fill, minmax(80px,1fr))`, - card: `repeat(auto-fill, minmax(min(100%, theme(spacing.card-minWidth)), theme(spacing.card-maxWidth)))`, + card: `repeat(auto-fill,minmax(min(100%,220px),400px))`, }, }, }, diff --git a/web/templates/magazine/Magazineroom.tsx b/web/templates/magazine/Magazineroom.tsx index 71c9e6285..fb9503282 100644 --- a/web/templates/magazine/Magazineroom.tsx +++ b/web/templates/magazine/Magazineroom.tsx @@ -35,9 +35,7 @@ const MagazineRoom = ({ pageData, slug }: MagazineIndexTemplateProps) => { const resultsRef = useRef(null) const [isLoading, setIsLoading] = useState(false) const router = useRouter() - const parentSlug = - (router.locale !== router.defaultLocale ? `/${router.locale}` : '') + - router.asPath.substring(router.asPath.indexOf('/'), router.asPath.lastIndexOf('/')) + const parentSlug = `${router.locale !== router.defaultLocale ? `/${router.locale}` : ''}${router.pathname}` const magazineList = useMemo(() => magazineArticles, [magazineArticles]) const pagedList = useMemo(() => chunkArray(magazineList, 12), [magazineList])