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.

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

Converted all the css into Tailwind css of Container component #1746

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
42bf6db
Converted all the css to tailwind css of ErrorDisplay page
subhajit20 Sep 18, 2023
827b21d
Converted all the css to tailwind css of ErrorDisplay page
subhajit20 Sep 18, 2023
dc7b10e
Converted all css to tailwind css
subhajit20 Sep 18, 2023
23a6499
Replace all styling with Tailwind
subhajit20 Sep 18, 2023
1055b07
Replace all styling with Tailwind
subhajit20 Sep 18, 2023
1299eac
Converted all the css into tailwind css of Badge component
subhajit20 Sep 19, 2023
71a9b5c
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
subhajit20 Sep 19, 2023
46f136d
Converted all the css into Tailwind css of Badge component
subhajit20 Sep 19, 2023
be04445
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
subhajit20 Sep 19, 2023
7462502
Update components/Badge/Badge.js
subhajit20 Sep 19, 2023
e67dbca
Fixed syntax error
subhajit20 Sep 19, 2023
b7ec44a
Merge remote-tracking branch 'origin/main' into subhajit20/Replace-al…
kylemh Sep 20, 2023
d371d87
resolve styling problems
kylemh Sep 20, 2023
44f4e1b
Convert all the css into tailwind css of SocialMedia component
subhajit20 Sep 21, 2023
1339530
Convert all the css into tailwind css of SocialMedia component
subhajit20 Sep 21, 2023
96d04fc
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
subhajit20 Sep 21, 2023
116d86b
Update components/SocialMedia/SocialMediaItem/SocialMediaItem.js
subhajit20 Sep 22, 2023
0e2a6d0
Convert all the css into tailwind css of SocialMedia component
subhajit20 Sep 22, 2023
b59594e
Converted all the css into tailwind css of Modal component
subhajit20 Sep 23, 2023
c377581
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
subhajit20 Sep 23, 2023
71dbf56
Converted all the css into tailwind css of Modal compononent
subhajit20 Sep 23, 2023
db5f1b7
Converted all the css into tailwind css of Modal compononent
subhajit20 Sep 23, 2023
cd9ceca
Converted all the css into tailwind css of Modal compononent
subhajit20 Sep 23, 2023
ed3a348
remove dumb lint rule
kylemh Sep 23, 2023
310f33d
integrate tailwind into Storybook
kylemh Sep 23, 2023
75d204b
update modal API and fix issue where modal would not render
kylemh Sep 23, 2023
b518d21
update snapshot tests
kylemh Sep 23, 2023
123b778
Converted all the css to into tailwind css of HeroBanner page
subhajit20 Sep 24, 2023
ce6ffa4
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
kylemh Sep 24, 2023
404c13b
add ability to use text-shadwo
kylemh Sep 24, 2023
73dabf6
add missing styles, update snapshot, and remove CSS modules file
kylemh Sep 24, 2023
b557f58
ensure fullViewportHeight always wins
kylemh Sep 24, 2023
da58c42
Converted all the css into Tailwind css of Drawer component
subhajit20 Sep 25, 2023
3d26cb7
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
subhajit20 Sep 25, 2023
b61249b
Converted all the css into tailwind css of Drawer component
subhajit20 Sep 26, 2023
c7f00f0
Converted all the css into Tailwind css of Drawer component
subhajit20 Sep 26, 2023
bf27753
Converted all the css into Tailwind css of Drawer component
subhajit20 Sep 26, 2023
9e988e9
Converted all the css into Tailwind css of Drawer component
subhajit20 Sep 28, 2023
451150a
Converted all the css into Tailwind css of Drawer component
subhajit20 Sep 29, 2023
27eb806
Converted all the css into Tailwind css of Drawer component
subhajit20 Sep 30, 2023
4ad49f8
Converted all the css into Tailwind css of Drawer component
subhajit20 Oct 9, 2023
db16325
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
kylemh Oct 9, 2023
c5c8784
Converted all the css into Tailwind css of Container component
subhajit20 Oct 11, 2023
72dc17b
Converted all the css into Tailwind css of Container component
subhajit20 Oct 11, 2023
c733983
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
subhajit20 Nov 4, 2023
1bc1e77
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
subhajit20 Nov 14, 2023
4c30d24
Merge branch 'main' into subhajit20/Replace-all-styling-with-Tailwind
kylemh Nov 14, 2023
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
18 changes: 13 additions & 5 deletions components/Container/Container.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { bool, node, number, oneOf, oneOfType, string } from 'prop-types';
import classNames from 'classnames';
import { getDataAttributes } from 'common/utils/prop-utils';
import styles from './Container.module.css';

Container.propTypes = {
backgroundImageSource: string,
Expand Down Expand Up @@ -42,14 +41,23 @@ function Container({

return (
<div
className={classNames(className, styles.Container, styles[theme], {
[styles.fullViewportHeight]: isFullViewportHeight,
})}
className={classNames(
className,
'bg-center bg-no-repeat bg-cover flex items-center justify-center min-h-[250px] w-full fill-current',
theme === 'secondary' && 'bg-secondary text-white [& svg]:fill-white',
theme === 'gray' && 'bg-gray text-secondary',
theme === 'white' && 'bg-white text-secondary',
{
'min-h-screen': isFullViewportHeight,
},
)}
id={id}
style={dynamicBackgroundImage}
{...customDataAttributes}
>
<div className={styles.content}>{children}</div>
<div className="flex flex-col items-center justify-center my-14 mx-auto w-full max-w-[1400px] sm:w-[85%]">
{children}
</div>
</div>
);
}
Expand Down
58 changes: 0 additions & 58 deletions components/Container/Container.module.css

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

exports[`Container should render with many props assigned 1`] = `
<div
className="test-class Container white fullViewportHeight"
className="test-class bg-center bg-no-repeat bg-cover flex items-center justify-center min-h-[250px] w-full fill-current bg-white text-secondary min-h-screen"
style={
Object {
"backgroundImage": "linear-gradient(rgba(33, 48, 69, 0.65),rgba(33, 48, 69, 0.65)), url(https://operation-code-assets.s3.us-east-2.amazonaws.com/heroBanner/stock_family-2.jpg)",
}
}
>
<div
className="content"
className="flex flex-col items-center justify-center my-14 mx-auto w-full max-w-[1400px] sm:w-[85%]"
>
Test Children
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

exports[`Content should render with many props assigned 1`] = `
<div
className="Container secondary fullViewportHeight"
className="bg-center bg-no-repeat bg-cover flex items-center justify-center min-h-[250px] w-full fill-current bg-secondary text-white [& svg]:fill-white min-h-screen"
id="test-id"
>
<div
className="content"
className="flex flex-col items-center justify-center my-14 mx-auto w-full max-w-[1400px] sm:w-[85%]"
>
<div
className="headingContainer"
Expand Down Expand Up @@ -59,10 +59,10 @@ exports[`Content should render with many props assigned 1`] = `

exports[`Content should render with required props 1`] = `
<div
className="Container secondary"
className="bg-center bg-no-repeat bg-cover flex items-center justify-center min-h-[250px] w-full fill-current bg-secondary text-white [& svg]:fill-white"
>
<div
className="content"
className="flex flex-col items-center justify-center my-14 mx-auto w-full max-w-[1400px] sm:w-[85%]"
>
<div
className="flex justify-center items-center flex-wrap w-full [&>*]:m-4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

exports[`HeroBanner should render with many props assigned 1`] = `
<div
className="test pt-20 min-h-[60vh] text-shadow-[0_0_15px_#111111] Container secondary fullViewportHeight"
className="test pt-20 min-h-[60vh] text-shadow-[0_0_15px_#111111] bg-center bg-no-repeat bg-cover flex items-center justify-center min-h-[250px] w-full fill-current bg-secondary text-white [& svg]:fill-white min-h-screen"
style={
Object {
"backgroundImage": "linear-gradient(rgba(33, 48, 69, 0.65),rgba(33, 48, 69, 0.65)), url(https://operation-code-assets.s3.us-east-2.amazonaws.com/heroBanner/stock_family-2.jpg)",
}
}
>
<div
className="content"
className="flex flex-col items-center justify-center my-14 mx-auto w-full max-w-[1400px] sm:w-[85%]"
>
<h1
className="border-b-4 border-b-primary text-center mb-4"
Expand All @@ -25,10 +25,10 @@ exports[`HeroBanner should render with many props assigned 1`] = `

exports[`HeroBanner should render with required props 1`] = `
<div
className="pt-20 min-h-[60vh] text-shadow-[0_0_15px_#111111] min-h-[35vh] Container secondary"
className="pt-20 min-h-[60vh] text-shadow-[0_0_15px_#111111] min-h-[35vh] bg-center bg-no-repeat bg-cover flex items-center justify-center min-h-[250px] w-full fill-current bg-secondary text-white [& svg]:fill-white"
>
<div
className="content"
className="flex flex-col items-center justify-center my-14 mx-auto w-full max-w-[1400px] sm:w-[85%]"
>
<h1
className=""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

exports[`JoinSection should render 1`] = `
<div
className="Container white"
className="bg-center bg-no-repeat bg-cover flex items-center justify-center min-h-[250px] w-full fill-current bg-white text-secondary"
data-testid="Join Section"
>
<div
className="content"
className="flex flex-col items-center justify-center my-14 mx-auto w-full max-w-[1400px] sm:w-[85%]"
>
<div
className="headingContainer"
Expand Down
2 changes: 2 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ module.exports = {
themeGray: '#121212',
primary: '#3ed6f0',
secondary: '#252e3e',
gray: '#e2e2e2',
white: '#f7f7f7',
},
},
},
Expand Down