Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced all the css into tailwind css on FlatCard component #1788

Merged
merged 3 commits into from
Jan 17, 2024
Merged

Replaced all the css into tailwind css on FlatCard component #1788

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06eaa33
Replaced all the css into tailwind css on FlatCard component
subhajit20 Jan 5, 2024
c3e5e45
Replaced all the css into tailwind css on FlatCard component
subhajit20 Jan 14, 2024
9878dff
Replaced all the css into tailwind css on FlatCard component
subhajit20 Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions components/Cards/FlatCard/FlatCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import classNames from 'classnames';
import Image from 'next/image';
import { FLAT_CARD_IMAGE } from 'common/constants/testIDs';
import { getPlaceholder } from 'common/utils/next-utils';
import styles from './FlatCard.module.css';

FlatCard.propTypes = {
button: element,
Expand All @@ -28,16 +27,19 @@ function FlatCard({ button: Button, children, className, header, image }) {

return (
<article
className={classNames(styles.FlatCard, className, {
[styles.cardWithImage]: hasImage,
className={classNames('box-border my-6 mx-4 relative max-w-[400px]', className, {
'pt-14': hasImage,
})}
>
<div className={styles.borderContainer}>
{header && <div className={styles.header}>{header}</div>}
<div className="p-8 border-4 border-solid border-themePrimary">
{header && <div className="order-2 text-center">{header}</div>}

{hasImage && (
<div className={styles.rowCenter}>
<div data-testid={FLAT_CARD_IMAGE} className={styles.imageWrapper}>
<div className="flex justify-center">
<div
data-testid={FLAT_CARD_IMAGE}
className="border-solid border-themePrimary order-1 absolute -top-1 h-52 [&>img]:object-cover"
subhajit20 marked this conversation as resolved.
Show resolved Hide resolved
>
<Image
src={image.source}
alt={image.alt ?? ''}
Expand All @@ -50,11 +52,15 @@ function FlatCard({ button: Button, children, className, header, image }) {
</div>
)}

{header && <hr className={styles.divider} />}
{header && <hr className="w-10/12 border-1 border-solid border-themePrimary" />}
subhajit20 marked this conversation as resolved.
Show resolved Hide resolved

<div className={styles.children}>{children}</div>
<div>{children}</div>

{Button && <div className={styles.flatCardButton}>{Button}</div>}
{Button && (
<div className="text-center absolute left-0 right-0 -bottom-7 [&>button]:hover:bg-white [&>button]:hover:text-themeSecondary [&>button]:focus-visible:text-themePrimary [&>button]:focus-visible:bg-white [&>a]:hover:bg-white [&>a]:hover:text-themeSecondary [&>a]:focus-visible:bg-white [&>a]:focus-visible:text-themeSecondary ">
{Button}
</div>
)}
</div>
</article>
);
Expand Down
66 changes: 0 additions & 66 deletions components/Cards/FlatCard/FlatCard.module.css
View file
Open in desktop

This file was deleted.

22 changes: 9 additions & 13 deletions components/Cards/FlatCard/__tests__/__snapshots__/FlatCard.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

exports[`FlatCard should render with many props assigned 1`] = `
<article
className="FlatCard test-class"
className="box-border my-6 mx-4 relative max-w-[400px] test-class"
>
<div
className="borderContainer"
className="p-8 border-4 border-solid border-themePrimary"
>
<div
className="header"
className="order-2 text-center"
>
<h1>
Main heading
Expand All @@ -18,11 +18,9 @@ exports[`FlatCard should render with many props assigned 1`] = `
</h6>
</div>
<hr
className="divider"
className="w-10/12 border-1 border-solid border-themePrimary"
/>
<div
className="children"
>
<div>
<p>
Example content goes here
</p>
Expand All @@ -31,7 +29,7 @@ exports[`FlatCard should render with many props assigned 1`] = `
</p>
</div>
<div
className="flatCardButton"
className="text-center absolute left-0 right-0 -bottom-7 [&>button]:hover:bg-white [&>button]:hover:text-themeSecondary [&>button]:focus-visible:text-themePrimary [&>button]:focus-visible:bg-white [&>a]:hover:bg-white [&>a]:hover:text-themeSecondary [&>a]:focus-visible:bg-white [&>a]:focus-visible:text-themeSecondary "
>
<a
className="Button primary"
Expand All @@ -48,14 +46,12 @@ exports[`FlatCard should render with many props assigned 1`] = `

exports[`FlatCard should render with required props 1`] = `
<article
className="FlatCard"
className="box-border my-6 mx-4 relative max-w-[400px]"
>
<div
className="borderContainer"
className="p-8 border-4 border-solid border-themePrimary"
>
<div
className="children"
>
<div>
<p>
Example content goes here
</p>
Expand Down