From 47a2207b65dec20ce9db1f08ed85786e67f1edd8 Mon Sep 17 00:00:00 2001 From: r41ph Date: Mon, 18 Nov 2024 11:52:01 +0000 Subject: [PATCH] style: APP-432 certificate footer update (#2523) Co-authored-by: blushi --- tailwind.css | 11 +++++ .../src/components/icons/ShareIcons.tsx | 9 +++- .../pages/Certificate/Certificate.styles.ts | 42 +++++++------------ .../src/pages/Certificate/Certificate.tsx | 27 ++++++------ 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/tailwind.css b/tailwind.css index c2b37ea870..e756e056e2 100644 --- a/tailwind.css +++ b/tailwind.css @@ -346,7 +346,18 @@ --sc-text-paragraph: var(--ac-neutral-200); } + /* + Custom CSS classes that mimic the behavior of some Tailwind + utility classes that currently don't work due to preflight being disabled. + See tailwind.common.js + */ .bg-transparent { background-color: transparent; } + .space-x-2 > * + * { + margin-left: 0.5rem; + } + .space-x-4 > * + * { + margin-left: 1rem; + } } diff --git a/web-components/src/components/icons/ShareIcons.tsx b/web-components/src/components/icons/ShareIcons.tsx index 32217f8520..cff3c78fcf 100644 --- a/web-components/src/components/icons/ShareIcons.tsx +++ b/web-components/src/components/icons/ShareIcons.tsx @@ -2,6 +2,7 @@ import { useState } from 'react'; import { useTheme } from '@mui/material'; import Grid from '@mui/material/Grid'; import { makeStyles } from 'tss-react/mui'; +import { cn } from 'web-components/src/utils/styles/cn'; import copyTextToClipboard from '../../utils/copy'; import Banner from '../banner'; @@ -70,17 +71,21 @@ export default function ShareIcons({ return ( <> - + diff --git a/web-marketplace/src/pages/Certificate/Certificate.styles.ts b/web-marketplace/src/pages/Certificate/Certificate.styles.ts index fdf1727af1..eb0b755787 100644 --- a/web-marketplace/src/pages/Certificate/Certificate.styles.ts +++ b/web-marketplace/src/pages/Certificate/Certificate.styles.ts @@ -15,28 +15,18 @@ export const useCertificateStyles = makeStyles<{ }, certificate: { margin: '0 auto', + maxWidth: theme.spacing(236), [theme.breakpoints.up('sm')]: { paddingTop: theme.spacing(25), }, - [theme.breakpoints.up('md')]: { - paddingRight: theme.spacing(60), - paddingLeft: theme.spacing(60), - }, - [theme.breakpoints.between(theme.breakpoints.values.tablet, 'lg')]: { - paddingRight: theme.spacing(30), - paddingLeft: theme.spacing(30), - }, - [theme.breakpoints.up('xl')]: { - maxWidth: theme.spacing(236), - paddingRight: 0, - paddingLeft: 0, + [theme.breakpoints.down('md')]: { + paddingRight: theme.spacing(10), + paddingLeft: theme.spacing(10), }, [theme.breakpoints.down('sm')]: { paddingTop: theme.spacing(10), - }, - [theme.breakpoints.down(theme.breakpoints.values.tablet)]: { - paddingRight: theme.spacing(4), - paddingLeft: theme.spacing(4), + paddingRight: theme.spacing(5), + paddingLeft: theme.spacing(5), }, '@media print': { padding: '0 !important', @@ -67,22 +57,23 @@ export const useCertificateStyles = makeStyles<{ }, share: { margin: '0 auto', + width: theme.spacing(236), + maxWidth: '100%', [theme.breakpoints.up('sm')]: { paddingTop: theme.spacing(21.25), paddingBottom: theme.spacing(23), - paddingRight: theme.spacing(60), - paddingLeft: theme.spacing(60), - }, - [theme.breakpoints.up('xl')]: { - maxWidth: theme.spacing(236), - paddingRight: 0, - paddingLeft: 0, + paddingRight: theme.spacing(10), + paddingLeft: theme.spacing(10), }, [theme.breakpoints.down('sm')]: { paddingTop: theme.spacing(9.25), paddingBottom: theme.spacing(20), - paddingRight: theme.spacing(10), - paddingLeft: theme.spacing(10), + paddingRight: theme.spacing(20), + paddingLeft: theme.spacing(20), + }, + [theme.breakpoints.up('md')]: { + paddingRight: theme.spacing(0), + paddingLeft: theme.spacing(0), }, }, shareTitle: { @@ -101,7 +92,6 @@ export const useCertificateStyles = makeStyles<{ [theme.breakpoints.down('sm')]: { fontSize: theme.spacing(3.5), height: theme.spacing(10), - marginTop: theme.spacing(7.5), paddingLeft: theme.spacing(10.5), paddingRight: theme.spacing(10.5), width: '100%', diff --git a/web-marketplace/src/pages/Certificate/Certificate.tsx b/web-marketplace/src/pages/Certificate/Certificate.tsx index 7f7d65d242..8b146cb348 100644 --- a/web-marketplace/src/pages/Certificate/Certificate.tsx +++ b/web-marketplace/src/pages/Certificate/Certificate.tsx @@ -11,6 +11,7 @@ import PrintIcon from 'web-components/src/components/icons/PrintIcon'; import ShareIcons from 'web-components/src/components/icons/ShareIcons'; import { Title } from 'web-components/src/components/typography'; import { LinkComponentType } from 'web-components/src/types/shared/linkComponentType'; +import { cn } from 'web-components/src/utils/styles/cn'; import { Link } from 'components/atoms'; import WithLoader from 'components/atoms/WithLoader'; @@ -75,26 +76,28 @@ function CertificatePage(): JSX.Element { {certificateData && ( - - - <Trans>Share</Trans> - + + <Trans>Share</Trans> + + - + window.print()} > {' '}